X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fdispense.c;h=af40c37c5909e23cc7b665c4cb5a9147030b09cb;hb=f75c35bdf5e2c6c1104c22c32bd0d55ca16b52c9;hp=ae937937da528e4e1ccd2703d5e07509931e3c86;hpb=41eba5abceaa60bac8b33025f765d798f26e2062;p=tpg%2Fopendispense2.git

diff --git a/src/server/dispense.c b/src/server/dispense.c
index ae93793..af40c37 100644
--- a/src/server/dispense.c
+++ b/src/server/dispense.c
@@ -27,7 +27,7 @@ int DispenseItem(int User, tItem *Item)
 	// Subtract the balance
 	reason = mkstr("Dispense - %s:%i %s", handler->Name, Item->ID, Item->Name);
 	if( !reason )	reason = Item->Name;	// TODO: Should I instead return an error?
-	ret = Transfer( User, GetUserID(">sales"), Item->Price, reason);
+	ret = Transfer( User, GetUserID(COKEBANK_SALES_ACCT), Item->Price, reason);
 	free(reason);
 	if(ret)	return 2;	// 2: No balance
 	
@@ -40,14 +40,14 @@ int DispenseItem(int User, tItem *Item)
 		if(ret) {
 			Log_Error("Dispense failed after deducting cost (%s dispensing %s - %ic)",
 				username, Item->Name, Item->Price);
-			Transfer( GetUserID(">sales"), User, Item->Price, "rollback" );
+			Transfer( GetUserID(COKEBANK_SALES_ACCT), User, Item->Price, "rollback" );
 			free( username );
 			return -1;	// 1: Unkown Error again
 		}
 	}
 	
 	// And log that it happened
-	Log_Info("dispense %s (%s:%i) by %s [cost %i, balance %i cents]",
+	Log_Info("dispense '%s' (%s:%i) by %s [cost %i, balance %i cents]",
 		Item->Name, handler->Name, Item->ID,
 		username, Item->Price, GetBalance(User)
 		);
@@ -74,11 +74,14 @@ int DispenseGive(int SrcUser, int DestUser, int Ammount, const char *ReasonGiven
 	return 0;
 }
 
+/**
+ * \brief Add money to an account
+ */
 int DispenseAdd(int User, int ByUser, int Ammount, const char *ReasonGiven)
 {
 	 int	ret;
 	
-	ret = Transfer( GetUserID(">liability"), User, Ammount, ReasonGiven );
+	ret = Transfer( GetUserID(COKEBANK_DEBT_ACCT), User, Ammount, ReasonGiven );
 	
 	if(ret)	return 2;