Merge pull request #1084 from rit-construct-makerspace/main

Accidentally forgot the sign on a value

Author: cowsed

server/src/integrations/currency/transactions.ts

@@ -80,10 +80,12 @@ export async function UpdateTransaction(transactionID: number, deltaCents: numbe
     const lastCharges = await TransactionRepo.getLastChargesForTransactionById(transactionID);
     if (lastCharges != undefined) {
         console.log("Have history", lastCharges);
-        const amountAlreadyCharged = (lastCharges.atrium?.amount ?? 0) + (lastCharges.credit?.amount ?? 0)
-        if (centsToCharge + -amountAlreadyCharged > 0){
+        // If we have charged the user money last time, this will be negative
+        // If it is positive, we have somehow paid them
+        const deltaForThisTransaction = (lastCharges.atrium?.amount ?? 0) + (lastCharges.credit?.amount ?? 0)
+        if (centsToCharge + deltaForThisTransaction > 0){
             // recharge would give the user money (something fishy)
-            console.error(`Currency: Caught fraudulent refund before refund. Not gonna refund it. Probably needs manual rectification. tid: ${transactionID} asking for ${centsToCharge}, only ever spent ${-amountAlreadyCharged}`)
+            console.error(`Currency: Caught fraudulent refund before refund. Not gonna refund it. Probably needs manual rectification. tid: ${transactionID} asking for ${centsToCharge}, only ever spent ${-deltaForThisTransaction}`)
             return false;
         }
         const res = await Currency.refundChargeGroup(lastCharges, parent, entryId);
@@ -92,7 +94,7 @@ export async function UpdateTransaction(transactionID: number, deltaCents: numbe
             return res
         }
         // update amount to charge based on how much was already refunded/spent
-        centsToCharge = amountAlreadyCharged + centsToCharge;
+        centsToCharge = deltaForThisTransaction + centsToCharge;
     }
     if (centsToCharge > 0){
         console.error(`Currency: Illegal attempt to refund more than spent: tid:${transactionID}, tried to adjust ${centsToCharge} with reason ${reason}`)