shish пре 2 година
родитељ
комит
4dd01347a1
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      app-ghs/controllers/OrderController.php
  2. 1 1
      biz-ghs/order/classes/OrderClass.php

+ 1 - 1
app-ghs/controllers/OrderController.php

@@ -2325,7 +2325,7 @@ class OrderController extends BaseController
                         'id' => $customId,
                         'name' => $custom['name'],
                         'mobile' => $custom['mobile'],
-                        'amount' => 0,
+                        'actPrice' => 0,
                         'num' => 0,
                         'carton' => 0,
                         'pack' => 0,

+ 1 - 1
biz-ghs/order/classes/OrderClass.php

@@ -2640,7 +2640,7 @@ XL;
             $objPHPExcel->getActiveSheet()->setCellValue('D' . $i, $custom['num']);
             $objPHPExcel->getActiveSheet()->setCellValue('E' . $i, $custom['orderPrice']);
             $objPHPExcel->getActiveSheet()->setCellValue('F' . $i, $custom['tkPrice']);
-            $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $custom['amount']);
+            $objPHPExcel->getActiveSheet()->setCellValue('G' . $i, $custom['actPrice']);
             $objPHPExcel->getActiveSheet()->setCellValue('H' . $i, $custom['carton']);
             $objPHPExcel->getActiveSheet()->setCellValue('I' . $i, $custom['pack']);
             $objPHPExcel->getActiveSheet()->setCellValue('J' . $i, $custom['freight']);