code

service/ocean_booking.class.php

@@ -319,7 +319,7 @@ class ocean_booking {
         from ocean o
             LEFT JOIN LATERAL ( SELECT shippr_uncode,shipper_city,
                 consignee_uncode,consignee_city,
-                fport_of_loading_uncode,mport_of_discharge_uncode
+                fport_of_loading_uncode,mport_of_discharge_uncode,po_no as _po_no
             FROM public.online_booking ob WHERE o.serial_no::text = ob.serial_no::text) ob ON true
             LEFT JOIN LATERAL ( SELECT company as cn_company,
                 address_1 as cn_address_1,
@@ -553,7 +553,7 @@ class ocean_booking {
         $vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['m_vessel']);
         $voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['m_voyage']);
         $basicInfo = array("bookingNo." =>$ocean['booking_no'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['carrier_booking'],
-            "PO_NO" =>$ocean['po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
+            "PO_NO" =>$ocean['_po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
             "Incoterm" =>$ocean['incoterms'],"Service_Type" =>$ocean['service']);
         $data["basicInfo"] = $basicInfo;    
 

service/ocean_order.class.php

@@ -1154,7 +1154,7 @@ class ocean_order {
             LEFT JOIN LATERAL ( SELECT tracking_no as _tracking_no,shippr_uncode,shipper_city,
                     consignee_uncode,consignee_city,incoterms,
                     fport_of_loading_un,mport_of_discharge_un,
-                    place_of_receipt_un,place_of_delivery_un,
+                    place_of_receipt_un,place_of_delivery_un,po_no as _po_no,
                     CASE
                         WHEN ((m_iffbcf is not null or m_iffbcf is null) and m_iffcpu is null and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffafd is null) THEN 'Created'::text
                         WHEN ((m_iffcpu is not null or m_iffrec is not null) and m_iffdep is null and m_iffarr is null and m_iffafd is null) THEN 'Cargo Received'::text
@@ -1319,7 +1319,7 @@ class ocean_order {
         $vessel = utils::outDisplayForMerge($ocean['f_vessel'],$ocean['m_vessel']);
         $voyage = utils::outDisplayForMerge($ocean['f_voyage'],$ocean['m_voyage']);
         $basicInfo = array("MAWB/MBL No." =>$ocean['m_bol'],"HAWB/HBOL" => $ocean['h_bol'],"Carrier_Booking_No" =>$ocean['booking_no'],
-            "PO_NO" =>$ocean['po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
+            "PO_NO" =>$ocean['_po_no'],"Vessel/Airline" =>$vessel,"Voyage/Filght" =>$voyage,
             "Incoterm" =>$ocean['incoterms'],"Service_Type" =>$ocean['service']);
         $data['basicInfo'] = $basicInfo;