Implementing 2.7, more

fannie/batches/UNFI/load-classes/CorwinUploadPage.php fannie/batches/UNFI/load-classes/NealBrothersUploadPage.php fannie/batches/UNFI/load-classes/ONFCuploadPage.php fannie/mem/modules/AR_newer.php fannie/mem/modules/EquityRefund.php fannie/mem/modules/Prepay.php fannie/mem/modules/StoreCharge.php fannie/reports/DepartmentTop10/DepartmentTop10Report.php
flathat · Sep 20, 2017 · f65ee1c · f65ee1c
1 parent 79678ad
commit f65ee1c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/fannie/batches/UNFI/load-classes/CorwinUploadPage.php b/fannie/batches/UNFI/load-classes/CorwinUploadPage.php
@@ -174,7 +174,7 @@ public function preprocess()
     // preprocess
     }
 
-    function process_file($linedata)
+    public function process_file($linedata, $indexes)
     {
         global $FANNIE_OP_DB;
         //$this->results_details = "Begin process_file()";

diff --git a/fannie/batches/UNFI/load-classes/NealBrothersUploadPage.php b/fannie/batches/UNFI/load-classes/NealBrothersUploadPage.php
@@ -183,7 +183,7 @@ public function preprocess()
     // preprocess
     }
 
-    function process_file($linedata)
+    public function process_file($linedata, $indexes)
     {
         global $FANNIE_OP_DB;
         //$this->results_details = "Begin process_file()";

diff --git a/fannie/batches/UNFI/load-classes/ONFCuploadPage.php b/fannie/batches/UNFI/load-classes/ONFCuploadPage.php
@@ -179,7 +179,7 @@ public function preprocess()
     // preprocess
     }
 
-    function process_file($linedata)
+    public function process_file($linedata, $indexes)
     {
         global $FANNIE_OP_DB;
         //$this->results_details = "Begin process_file()";

diff --git a/fannie/mem/modules/AR_newer.php b/fannie/mem/modules/AR_newer.php
@@ -72,7 +72,7 @@ function ShowEditForm($memNum,$country="US")
 		return $ret;
 	}
 
-	function SaveFormData($memNum)
+	function SaveFormData($memNum, $json=array())
     {
 		global $FANNIE_ROOT;
 		$dbc = $this->db();

diff --git a/fannie/mem/modules/EquityRefund.php b/fannie/mem/modules/EquityRefund.php
@@ -134,7 +134,8 @@ function ShowEditForm($memNum,$country="US"){
 		return $ret;
 	}
 
-	function SaveFormData($memNum){
+    function SaveFormData($memNum, $json=array())
+    {
 		global $FANNIE_ROOT;
 		$dbc = $this->db();
 		if (!class_exists("CustdataModel")) {

diff --git a/fannie/mem/modules/Prepay.php b/fannie/mem/modules/Prepay.php
@@ -134,7 +134,8 @@ function ShowEditForm($memNum,$country="US"){
 		return $ret;
 	}
 
-	function SaveFormData($memNum){
+    function SaveFormData($memNum, $json=array())
+    {
 		global $FANNIE_ROOT;
 		$dbc = $this->db();
 		if (!class_exists("CustdataModel")) {

diff --git a/fannie/mem/modules/StoreCharge.php b/fannie/mem/modules/StoreCharge.php
@@ -254,7 +254,8 @@ function ShowEditForm($memNum,$country="US"){
 		return $ret;
 	}
 
-	function SaveFormData($memNum){
+    function SaveFormData($memNum, $json=array())
+    {
 		global $FANNIE_ROOT;
 		$dbc = $this->db();
 		if (!class_exists("CustdataModel")) {

diff --git a/fannie/reports/DepartmentTop10/DepartmentTop10Report.php b/fannie/reports/DepartmentTop10/DepartmentTop10Report.php
@@ -367,7 +367,7 @@ function fetch_report_data()
                             ($row['dollars'] - $row['cost']) / $row['qty']);
                          */
                         /* Markup as proportion: .nn or percent nn.nn */
-                        $markup = sprintf('%.2f', $row['qty'] == 0 ? 0 :
+                        $markup = sprintf('%.2f', $row['cost'] == 0 ? 0 :
                             (($row['dollars'] - $row['cost']) / $row['cost']) * $pp);
                         $record[] = $margin;
                         $record[] = $markup;
@@ -394,7 +394,8 @@ function fetch_report_data()
             number_format($deptTopRings,0),
             number_format($deptTopQuantity,2),
             sprintf('$%s', number_format($deptTopSales,2)),
-            sprintf('%.2f%%', (($deptTopSales/$deptTotalSales)*100)),
+            sprintf('%.2f%%', $deptTotalSales == 0 ? 0 :
+                (($deptTopSales/$deptTotalSales)*100)),
             "$sectionFooterLabel",'',''));
         $deptFooter['meta'] = FannieReportPage::META_BOLD;
         $ret[] = $deptFooter;
@@ -485,7 +486,7 @@ function fetch_report_data()
                                 ($row['dollars'] - $row['cost']) / $row['qty']);
                              */
                             /* Markup as proportion: .nn or percent nn.nn */
-                            $markup = sprintf('%.2f', $row['qty'] == 0 ? 0 :
+                            $markup = sprintf('%.2f', $row['cost'] == 0 ? 0 :
                                 (($row['dollars'] - $row['cost']) / $row['cost']) * $pp);
                             $record[] = $margin;
                             $record[] = $markup;
@@ -511,7 +512,8 @@ function fetch_report_data()
                 number_format($deptTopRings,0),
                 number_format($deptTopQuantity,2),
                 sprintf('$%s', number_format($deptTopSales,2)),
-                sprintf('%.2f%%', (($deptTopSales/$deptTotalSales)*100)),
+                sprintf('%.2f%%', $deptTotalSales == 0 ? 0 :
+                    (($deptTopSales/$deptTotalSales)*100)),
                 "$sectionFooterLabel",'',''));
             $deptFooter['meta'] = FannieReportPage::META_BOLD;
             $ret[] = $deptFooter;