X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fdispense.c;h=b0a59364e5c8ae63479e151adfbf66d3b8148157;hb=0e15ed888a4d398530a74a6b713414e649767358;hp=23e73afff8f524e284f3c2a7e151659a28a1ed6e;hpb=8948b2c5efc889714a73a861195e053190071df3;p=tpg%2Fopendispense2.git

diff --git a/src/server/dispense.c b/src/server/dispense.c
index 23e73af..b0a5936 100644
--- a/src/server/dispense.c
+++ b/src/server/dispense.c
@@ -8,6 +8,7 @@
  int	_GetMinBalance(int Account);
  int	_CanTransfer(int Source, int Destination, int Ammount);
  int	_Transfer(int Source, int Destination, int Ammount, const char *Reason);
+ int	_GetSalesAcct(tItem *Item);
 
 // === CODE ===
 /**
@@ -21,7 +22,9 @@ int DispenseItem(int ActualUser, int User, tItem *Item)
 	tHandler	*handler;
 	char	*username, *actualUsername;
 	
-	salesAcct = Bank_GetAcctByName(COKEBANK_SALES_ACCT);
+	handler = Item->Handler;
+	
+	salesAcct = _GetSalesAcct(Item);
 
 	// Check if the user can afford it
 	if( Item->Price && !_CanTransfer(User, salesAcct, Item->Price) )
@@ -29,7 +32,9 @@ int DispenseItem(int ActualUser, int User, tItem *Item)
 		return 2;	// 2: No balance
 	}
 	
-	handler = Item->Handler;
+	// HACK: Naming a slot "dead" disables it
+	if( strcmp(Item->Name, "dead") == 0 )
+		return 1;
 	
 	// Check if the dispense is possible
 	if( handler->CanDispense ) {
@@ -44,8 +49,8 @@ int DispenseItem(int ActualUser, int User, tItem *Item)
 	if( handler->DoDispense ) {
 		ret = handler->DoDispense( User, Item->ID );
 		if(ret) {
-			Log_Error("Dispense failed (%s dispensing '%s' - %ic)",
-				username, Item->Name, Item->Price);
+			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
 		}
@@ -73,6 +78,39 @@ int DispenseItem(int ActualUser, int User, tItem *Item)
 	return 0;	// 0: EOK
 }
 
+/**
+ * \brief Refund a dispense
+ */
+int DispenseRefund(int ActualUser, int DestUser, tItem *Item, int OverridePrice)
+{
+	 int	ret;
+	 int	src_acct, price;
+	char	*username, *actualUsername;
+
+	src_acct = _GetSalesAcct(Item);
+
+	if( OverridePrice > 0 )
+		price = OverridePrice;
+	else
+		price = Item->Price;
+
+	ret = _Transfer( src_acct, DestUser, price, "Refund");
+	if(ret)	return ret;
+
+	username = Bank_GetAcctName(DestUser);
+	actualUsername = Bank_GetAcctName(ActualUser);
+	
+	Log_Info("refund '%s' (%s:%i) to %s by %s [cost %i, balance %i]",
+		Item->Name, Item->Handler->Name, Item->ID,
+		username, actualUsername, price, Bank_GetBalance(DestUser)
+		);
+
+	free(username);
+	free(actualUsername);
+
+	return 0;
+}
+
 /**
  * \brief Give money from one user to another
  */
@@ -82,6 +120,10 @@ int DispenseGive(int ActualUser, int SrcUser, int DestUser, int Ammount, const c
 	char	*actualUsername;
 	char	*srcName, *dstName;
 	
+	// HACK: Naming a slot "dead" disables it (catch for snack)
+	if( strcmp(ReasonGiven, "dead") == 0 )
+		return 1;
+	
 	if( Ammount < 0 )	return 1;	// Um... negative give? Not on my watch!
 	
 	ret = _Transfer( SrcUser, DestUser, Ammount, ReasonGiven );
@@ -92,8 +134,8 @@ int DispenseGive(int ActualUser, int SrcUser, int DestUser, int Ammount, const c
 	srcName = Bank_GetAcctName(SrcUser);
 	dstName = Bank_GetAcctName(DestUser);
 	
-	Log_Info("give %i to %s from %s by %s [balances %i, %i] - %s",
-		Ammount, dstName, srcName, actualUsername,
+	Log_Info("give %i from %s to %s by %s [balances %i, %i] - %s",
+		Ammount, srcName, dstName, actualUsername,
 		Bank_GetBalance(SrcUser), Bank_GetBalance(DestUser),
 		ReasonGiven
 		);
@@ -105,6 +147,7 @@ int DispenseGive(int ActualUser, int SrcUser, int DestUser, int Ammount, const c
 	return 0;
 }
 
+#if 0 // Dead Code
 /**
  * \brief Move money from one user to another (Admin Only)
  */
@@ -126,8 +169,8 @@ int DispenseTransfer(int ActualUser, int SrcUser, int DestUser, int Ammount, con
 	srcName = Bank_GetAcctName(SrcUser);
 	dstName = Bank_GetAcctName(DestUser);
 	
-	Log_Info("move %i to %s from %s by %s [balances %i, %i] - %s",
-		Ammount, dstName, srcName, actualUsername,
+	Log_Info("move %i from %s to %s by %s [balances %i, %i] - %s",
+		Ammount, srcName, dstName, actualUsername,
 		Bank_GetBalance(SrcUser), Bank_GetBalance(DestUser),
 		ReasonGiven
 		);
@@ -138,6 +181,8 @@ int DispenseTransfer(int ActualUser, int SrcUser, int DestUser, int Ammount, con
 	
 	return 0;
 }
+#endif
+
 /**
  * \brief Add money to an account
  */
@@ -147,9 +192,9 @@ int DispenseAdd(int ActualUser, int User, int Ammount, const char *ReasonGiven)
 	char	*dstName, *byName;
 	
 #if DISPENSE_ADD_BELOW_MIN
-//	ret = _Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT), User, Ammount, ReasonGiven );
+	ret = _Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Ammount, ReasonGiven );
 #else
-	ret = Bank_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT), User, Ammount, ReasonGiven );
+	ret = Bank_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Ammount, ReasonGiven );
 #endif
 	if(ret)	return 2;
 	
@@ -171,7 +216,7 @@ int DispenseSet(int ActualUser, int User, int Balance, const char *ReasonGiven)
 	 int	curBal = Bank_GetBalance(User);
 	char	*byName, *dstName;
 	
-	_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT), User, Balance-curBal, ReasonGiven );
+	_Transfer( Bank_GetAcctByName(COKEBANK_DEBT_ACCT,1), User, Balance-curBal, ReasonGiven );
 	
 	byName = Bank_GetAcctName(ActualUser);
 	dstName = Bank_GetAcctName(User);
@@ -196,7 +241,7 @@ int DispenseDonate(int ActualUser, int User, int Ammount, const char *ReasonGive
 	
 	if( Ammount < 0 )	return 2;
 	
-	ret = _Transfer( User, Bank_GetAcctByName(COKEBANK_DEBT_ACCT), Ammount, ReasonGiven );
+	ret = _Transfer( User, Bank_GetAcctByName(COKEBANK_DONATE_ACCT,1), Ammount, ReasonGiven );
 	if(ret)	return 2;
 	
 	byName = Bank_GetAcctName(ActualUser);
@@ -212,6 +257,35 @@ int DispenseDonate(int ActualUser, int User, int Ammount, const char *ReasonGive
 	return 0;
 }
 
+int DispenseUpdateItem(int User, tItem *Item, const char *NewName, int NewPrice)
+{
+	char	*username;
+	
+	// Sanity checks
+	if( NewPrice < 0 )	return 2;
+	if( !Item )	return 2;
+	if( strlen(NewName) < 1 )	return 2;
+	
+	// Update the item
+	free(Item->Name);
+	Item->Name = strdup(NewName);
+	Item->Price = NewPrice;
+	
+	username = Bank_GetAcctName(User);
+	
+	Log_Info("item %s:%i updated to '%s' %i by %s",
+		Item->Handler->Name, Item->ID,
+		NewName, NewPrice, username
+		);
+	
+	free(username);
+	
+	// Update item file
+	Items_UpdateFile();
+	
+	return 0;
+}
+
 // --- Internal Functions ---
 int _GetMinBalance(int Account)
 {
@@ -234,10 +308,10 @@ int _GetMinBalance(int Account)
 	if( flags & USER_FLAG_INTERNAL )	return INT_MIN;
 	
 	// Admin to -$50
-	if( flags & USER_FLAG_ADMIN )	return -5000;
+//	if( flags & USER_FLAG_ADMIN )	return -5000;
 	
 	// Coke to -$20
-	if( flags & USER_FLAG_COKE )	return -2000;
+//	if( flags & USER_FLAG_COKE )	return -2000;
 	
 	// Anyone else, non-negative
 	return 0;
@@ -245,9 +319,12 @@ int _GetMinBalance(int Account)
 
 /**
  * \brief Check if a transfer is possible
+ * \return Boolean success
  */
 int _CanTransfer(int Source, int Destination, int Ammount)
 {
+	if( Bank_GetFlags(Source) & USER_FLAG_DISABLED )
+		return 0;
 	if( Ammount > 0 )
 	{
 		if( Bank_GetBalance(Source) - Ammount < _GetMinBalance(Source) )
@@ -267,3 +344,11 @@ int _Transfer(int Source, int Destination, int Ammount, const char *Reason)
 		return 1;
 	return Bank_Transfer(Source, Destination, Ammount, Reason);
 }
+
+int _GetSalesAcct(tItem *Item)
+{
+	char string[sizeof(COKEBANK_SALES_PREFIX)+strlen(Item->Handler->Name)];
+	strcpy(string, COKEBANK_SALES_PREFIX);
+	strcat(string, Item->Handler->Name);
+	return Bank_GetAcctByName(string, 1);
+}