Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/controllers/order_finance.php

@@ -156,7 +156,7 @@ class Order_finance extends CI_Controller {
                 $report_tour_pvt = array();
                 $report_tour_pvt['ordernumber'] = $cpvt->coli_id;
                 $report_tour_pvt['tourCode']    = mb_substr($cpvt->PAG_Code, 0, 50);
-                $report_tour_pvt['tourname']    = mb_substr($cpvt->pag_name, 0, 200);
+                $report_tour_pvt['tourname']    = substr($cpvt->pag_name, 0, 200);
                 $report_tour_pvt['tourtime']    = $cpvt->startdate;
                 $report_tour_pvt['tourRSd']     = $cpvt->adult_num;
                 $report_tour_pvt['tourRSx']     = $cpvt->child_num;
@@ -190,7 +190,7 @@ class Order_finance extends CI_Controller {
                 $cost_c = array();
                 $cost_c['ordernumber'] = $cost->coli_id;
                 $cost_c['tourCode']    = mb_substr(implode(',', array_unique(array_map(function($ele){ return $ele->real_code; }, $cost->order_cost))), 0, 50);
-                $cost_c['tourname']    = mb_substr($cost->pag_name, 0, 200) ;
+                $cost_c['tourname']    = substr($cost->pag_name, 0, 200) ;
                 $cost_c['tourtime']    = $cost->startdate;
                 $cost_c['tourRSd']     = $cost->order_cost[0]->adult_num;
                 $cost_c['tourRSx']     = $cost->order_cost[0]->child_num;

webht/third_party/trippestOrderSync/models/orderFinance_model.php

@@ -276,9 +276,7 @@ class OrderFinance_model extends CI_Model {
                 // $update_sql = $this->HT->update_string('tourmanager.dbo.Report_Tour', $vrt, $where);
                 $this->HT->query($delete_sql);
             }
-            // else {
             $this->HT->insert('tourmanager.dbo.Report_Tour', $vrt);
-            // }
         }
         return TRUE;
     }