diff --git a/webht/third_party/trippestOrderSync/controllers/api.php b/webht/third_party/trippestOrderSync/controllers/api.php index 26ca2b25..0f333e54 100644 --- a/webht/third_party/trippestOrderSync/controllers/api.php +++ b/webht/third_party/trippestOrderSync/controllers/api.php @@ -114,9 +114,8 @@ class Api extends CI_Controller { $vro['pick_up'] = $decode_MemoText['Pick up']; $vro['drop_off'] = $decode_MemoText['Drop off']; } else { - $memo_text_tmp = trim(strstr($poi->COLD_MemoText, "Pick Up From:")); - $vro['pick_up'] = trim(strstr($memo_text_tmp, "Drop Off:", true)); - $vro['drop_off'] = trim(strstr($memo_text_tmp, "Drop Off:")); + $vro['pick_up'] = trim(substr(strstr(strstr($poi->COLI_OrderDetailText, "Pick Up From:"), "\n", true), 13)); + $vro['drop_off'] = trim(substr(strstr(strstr($poi->COLI_OrderDetailText, "Drop Off:"), "\n" , true), 9)); } } } diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 2d55e17e..6a9fbeb5 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -1289,7 +1289,7 @@ class Orders_model extends CI_Model { { $order_info_sql = "SELECT GCI_SN,GCI_VendorOrderId,GCI_combineNo - ,COLI_SN,COLI_ID,COLD_SN,COLI_GroupCode,COLI_OPI_ID + ,COLI_SN,COLI_ID,COLD_SN,COLI_GroupCode,COLI_OPI_ID,COLI_OrderDetailText ,COLD_ServiceSN,COLD_PersonNum,COLD_ChildNum,COLD_StartDate,COLD_EndDate,cold.COLD_MemoText ,pag2.PAG2_Name ,poi.POI_Hotel,poi.POI_HotelAddress,poi.POI_HotelPhone