code

service/destination_delivery.class.php

@@ -849,6 +849,7 @@ class destination_delivery {
                 }
                 $result[$index]['ctnrSize'] = $output;
             }
+            $result['tmp_search'] = common::deCode($search_calendar_sql, 'E');
             common::echo_json_encode(200,$result);
             exit();
         }

service/ocean_order.class.php

@@ -2462,9 +2462,9 @@ class ocean_order {
 
         //delivery
         $order_from = $_REQUEST['_schemas'];
-        $deliverySql = "with aa as (SELECT o.serial_no, o.master_base_number from $order_from.ocean o WHERE o.serial_no='".$ocean["serial_no"]."'),             
+        $deliverySql = "with aa as (SELECT o.serial_no, o.master_base_number,o.manifest_type from $order_from.ocean o WHERE o.serial_no='".$ocean["serial_no"]."'),             
                             h as (select * from station_data.do_header h 
-                                where (h.serial_no in (select serial_no from aa) or h.serial_no in (select master_base_number from aa))
+                                where (h.serial_no in (select serial_no from aa) or h.serial_no in (select master_base_number from aa where lower(aa.manifest_type) <> 'gpe'))
                                       and COALESCE(h.serial_no) <> '' 
                                       and COALESCE(h.void_by,'') = '')