Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity

Fixed #5676: Sum cost by quantity
snipe · Dec 2, 2021 · cae62fd · cae62fd
2 parents 4c2d47e + 9381ba2
commit cae62fd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
@@ -102,7 +102,7 @@ public static function dataTableLayout()
                 'searchable' => true,
                 'sortable' => true,
                 'title' => trans('general.purchase_cost'),
-                'footerFormatter' => 'sumFormatter',
+                'footerFormatter' => 'sumFormatterQuantity',
                 'class' => 'text-right',
             ], [
                 'field' => 'order_number',

diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
@@ -101,7 +101,7 @@ public static function dataTableLayout()
                 'sortable' => true,
                 'title' => trans('general.purchase_cost'),
                 'visible' => true,
-                'footerFormatter' => 'sumFormatter',
+                'footerFormatter' => 'sumFormatterQuantity',
                 'class' => 'text-right',
             ],
         ];

diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
@@ -113,7 +113,7 @@ public static function dataTableLayout()
                 'sortable' => true,
                 'title' => trans('general.purchase_cost'),
                 'visible' => true,
-                'footerFormatter' => 'sumFormatter',
+                'footerFormatter' => 'sumFormatterQuantity',
                 'class' => 'text-right',
             ], [
                 'field' => 'change',

diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
@@ -136,7 +136,7 @@ public static function dataTableLayout()
                 'sortable' => true,
                 'visible' => false,
                 'title' => trans('general.purchase_cost'),
-                'footerFormatter' => 'sumFormatter',
+                'footerFormatter' => 'sumFormatterQuantity',
                 'class' => 'text-right',
             ], [
                 'field' => 'purchase_order',

diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
@@ -653,6 +653,31 @@ function sumFormatter(data) {
         return 'not an array';
     }
 
+    function sumFormatterQuantity(data){
+        if(Array.isArray(data)) {
+            
+            // Prevents issues on page load where data is an empty array
+            if(data[0] == undefined){
+                return 0.00
+            }
+            // Check that we are actually trying to sum cost from a table
+            // that has a quantity column. We must perform this check to
+            // support licences which use seats instead of qty
+            if('qty' in data[0]) {
+                var multiplier = 'qty';
+            } else if('seats' in data[0]) {
+                var multiplier = 'seats';
+            } else {
+                return 'no quantity';
+            }
+            var total_sum = data.reduce(function(sum, row) {
+                return (sum) + (cleanFloat(row["purchase_cost"])*row[multiplier] || 0);
+            }, 0);
+            return numberWithCommas(total_sum.toFixed(2));
+        }
+        return 'not an array';
+    }
+
     function numberWithCommas(value) {
         if ((value) && ("{{$snipeSettings->digit_separator}}" == "1.234,56")){
             var parts = value.toString().split(".");