// Get username for debugging
username = Bank_GetAcctName(User);
+ // Ordering: Pay, Drop. Worst case requires a refund, other ordering leads to drops when payment fails.
+
+ // Take away money
+ if( Item->Price )
+ {
+ char *reason;
+ reason = mkstr("Dispense - %s:%i %s", handler->Name, Item->ID, Item->Name);
+ if( _Transfer( User, salesAcct, Item->Price, reason ) != 0 ) {
+ Log_Error("Dispense failed (%s dispensing %s:%i '%s') - Cokebank error!",
+ username, Item->Handler->Name, Item->ID, Item->Name);
+ free(reason);
+ free( username );
+ return -1; // -1: Unknown error
+ }
+ free(reason);
+ }
+
// Actually do the dispense
if( handler->DoDispense ) {
ret = handler->DoDispense( User, Item->ID );
Log_Error("Dispense failed (%s dispensing %s:%i '%s')",
username, Item->Handler->Name, Item->ID, Item->Name);
free( username );
- return -1; // 1: Unknown Error again
+ return -1; // -1: Unknown Error
}
}
- // Take away money
- if( Item->Price )
- {
- char *reason;
- reason = mkstr("Dispense - %s:%i %s", handler->Name, Item->ID, Item->Name);
- _Transfer( User, salesAcct, Item->Price, reason );
- free(reason);
- }
-
actualUsername = Bank_GetAcctName(ActualUser);
// And log that it happened
char *dstName, *byName;
#if DISPENSE_ADD_BELOW_MIN
- ret = _Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Ammount, ReasonGiven );
+ ret = _Transfer( Bank_GetAcctByName(COKEBANK_ADDSRC_ACCT,1), User, Ammount, ReasonGiven );
#else
- ret = Bank_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Ammount, ReasonGiven );
+ ret = Bank_Transfer( Bank_GetAcctByName(COKEBANK_ADDSRC_ACCT,1), User, Ammount, ReasonGiven );
#endif
if(ret) return 2;
return 0;
}
-int DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven)
+int DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven, int *OrigBalance)
{
int curBal = Bank_GetBalance(User);
char *byName, *dstName;
- _Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Balance-curBal, ReasonGiven );
+ if( Bank_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Balance-curBal, ReasonGiven ) )
+ return -1;
byName = Bank_GetAcctName(ActualUser);
dstName = Bank_GetAcctName(User);
- Log_Info("set balance of %s to %i by %s [balance %i] - %s",
- dstName, Balance, byName, Bank_GetBalance(User), ReasonGiven
+ Log_Info("set balance of %s to %i by %s [was %i, balance %i] - %s",
+ dstName, Balance, byName, curBal, Bank_GetBalance(User), ReasonGiven
);
+ *OrigBalance = curBal;
free(byName);
free(dstName);