Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/TulanduoApi.php

@@ -734,11 +734,11 @@ class TulanduoApi extends CI_Controller
         $output_text = "Got order operations from TuLanDuo:" . $detail_jsonResp->orderDetail->orderId . ". " . $coli_id;
         log_message('error', $output_text);
         echo $output_text;
-        // if (strval($order->isHistory) === '1') {
+        if (strval($order->isHistory) === '1') {
-        //     require_once('order_finance.php');
+            require_once('order_finance.php');
-        //     $vendor_class = new Order_finance();
+            $vendor_class = new Order_finance();
-        //     $vendor_class->single_order_report($coli_sn);
+            $vendor_class->single_order_report($coli_sn);
-        // }
+        }
         return;
     }
 

webht/third_party/trippestOrderSync/controllers/vendor_money.php

@@ -338,6 +338,7 @@ class Vendor_money extends CI_Controller {
                     $row_tmp[$col_mean] = $val;
                 }
                 if (isset($row_tmp['group_name']) && !empty($row_tmp['group_name'])) {
+                    $row_tmp['group_name'] = trim_str(trim($row_tmp['group_name']));
                     $xls_data[] = $row_tmp;
                 }
             }