Implement Refunds at purchase price and current price

Author: wgaylord

lua/ps2/client/cl_pointshop2view.lua

@@ -686,24 +686,24 @@ function Pointshop2View:fixDatabase( )
     self:controllerAction( "fixDatabase" )
 end
 
-function Pointshop2View:removeItem( itemClass, refund )
+function Pointshop2View:removeItem( itemClass, refund, refundCurrentValue )
     hook.Run( "PS2_PreReload" )
 
-    self:controllerTransaction( "removeItem", itemClass.className, refund )
+    self:controllerTransaction( "removeItem", itemClass.className, refund,refundCurrentValue)
     :Done( function( )
         KInventory.Items[itemClass.className] = nil
     end )
 end
 
-function Pointshop2View:removeItems( itemClasses, refund )
+function Pointshop2View:removeItems( itemClasses, refund,refundCurrentValue )
     hook.Run( "PS2_PreReload" )
 
     local classNames = {}
     for _, v in pairs( itemClasses ) do
         table.insert( classNames, v.className )
     end
 
-    self:controllerTransaction( "removeItems", classNames, refund )
+    self:controllerTransaction( "removeItems", classNames, refund,refundCurrentValue )
     :Done( function( removedNames )
         for _, className in pairs( removedNames ) do
             KInventory.Items[className] = nil

lua/ps2/client/tabs/management_tab/manage_items/content/cl_pointshop2content.lua

@@ -36,9 +36,12 @@ local function addEditMenu( panel, itemClass )
 
 		local btn = menu:AddOption( "Delete", function( )
 			Derma_Query( "Do you really want to permanently delete this item?", "Confirm",
-				/*"Yes and refund players", function( )
+				"Yes and refund players at pruchase price", function( )
 					Pointshop2View:getInstance( ):removeItem( itemClass, true )
-				end,*/
+				end,
+				"Yes and refund players at current price", function( )
+					Pointshop2View:getInstance( ):removeItem( itemClass, true, true )
+				end,
 				"Yes", function( )
 					Pointshop2View:getInstance( ):removeItem( itemClass )
 				end,

lua/ps2/server/sv_pointshopcontroller.lua

@@ -765,7 +765,7 @@ function Pointshop2Controller:sendPoints( ply, targetPly, points )
     --TODO: Send the targetPlayer a nice notification, similar to iten added
 end
 
-local function calculateRefundAmounts( itemsToRefund )
+local function calculateRefundAmounts( itemsToRefund, currentPrice )
     local refundsByPlayer = LibK._( itemsToRefund ):chain()
     :groupBy( function( item )
         return item.ownerId
@@ -783,24 +783,28 @@ local function calculateRefundAmounts( itemsToRefund )
     return refundsByPlayer
 end
 
-local function removeSingleItem( itemClass, refund )
+local function removeSingleItem( itemClass, refund, refundCurrentPrice )
     return Pointshop2.DB.DoQuery( Format( [[
         SELECT item.id, item.data, COALESCE(inventories.ownerId, ps2_equipmentslot.ownerId) AS ownerId, ps2_equipmentslot.slotName
         FROM kinv_items AS item
         LEFT JOIN inventories ON inventories.id = item.inventory_id
         LEFT JOIN ps2_equipmentslot ON ps2_equipmentslot.itemId = item.id
         WHERE item.itemClass = %s
-    ]], Pointshop2.DB.SQLStr( itemClass ) ) )
+    ]], Pointshop2.DB.SQLStr( itemClass.name ) ) )
         :Then( function( results )
             results = results or {}
             -- Deserialize purchaseData (this is usually done in LibK but we're querying manually)
             results = LibK._.map( results, function( row )
-                row.purchaseData = util.JSONToTable( row.data ).purchaseData
+                return row.purchaseData = util.JSONToTable( row.data ).purchaseData
             end )
 
             local refundPromise = Promise.Resolve()
             if refund then
-                local refundsByPlayer = calculateRefundAmounts( refund )
+                local currentPrice = false
+				if refundCurrentPrice then
+					currentPrice = table.Inherit(itemClass.static.Price, { points = 0, premiumPoints = 0 })
+				end
+                local refundsByPlayer = calculateRefundAmounts( refund, currentPrice )
                 -- Remove players that get refunded 0 points
                 local toRefund = LibK._( refundsByPlayer ):chain()
                     :entries( )
@@ -812,7 +816,7 @@ local function removeSingleItem( itemClass, refund )
 
                 -- Create a query for each player
                 refundPromise = Promise.Map( toRefund, function( entry )
-                    local ownerId, amountsToRefund = entry[0], entry[1]
+                    local ownerId, amountsToRefund = entry[1], entry[2]
                     return Pointshop2.DB.DoQuery( Format(
                         "UPDATE ps2_wallet SET points = points + %i, premiumPoints = premiumPoints + %i WHERE ownerId = %i",
                         amountsToRefund.points,
@@ -836,13 +840,13 @@ local function removeSingleItem( itemClass, refund )
         end )
 end
 
-function Pointshop2Controller:removeItem( ply, itemClassName, refund )
+function Pointshop2Controller:removeItem( ply, itemClassName, refund, refundCurrentPrice)
     local itemClass = Pointshop2.GetItemClassByName( itemClassName )
     if not itemClass then
         return Promise.Reject( "An item " .. itemClassName .. " doesn't exist!" )
     end
 
-    return removeSingleItem( itemClass, refund )
+    return removeSingleItem( itemClass, refund, refundCurrentPrice )
     :Then( function( )
         return self:moduleItemsChanged( )
     end )
@@ -851,7 +855,7 @@ function Pointshop2Controller:removeItem( ply, itemClassName, refund )
     end )
 end
 
-function Pointshop2Controller:removeItems( ply, itemClassNames, refund )
+function Pointshop2Controller:removeItems( ply, itemClassNames, refund, refundCurrentPrice )
     local itemClassses = LibK._.map( itemClassNames, function( itemClassName )
         local itemClass = Pointshop2.GetItemClassByName( itemClassName )
         if not itemClass then
@@ -862,7 +866,7 @@ function Pointshop2Controller:removeItems( ply, itemClassNames, refund )
 
     return Promise.Map( itemClassses, function( itemClass )
         local itemClassName = itemClass.className
-        return removeSingleItem( itemClass, refund ):Then( function( )
+        return removeSingleItem( itemClass, refund, refundCurrentPrice ):Then( function( )
             return itemClassName
         end )
     end ):Then( function( removedClassNames )