code

service/ajax.class.php

@@ -380,10 +380,10 @@ class ajax {
                     $_reportStationType = $_REQUEST["_reportStationType"];
                             
                     if($_reportStationType == 'shippr_uncode'){
-                        $sqlWhere = " and shippr_uncode  = '$_reportRef'";
+                        $sqlWhere .= " and shippr_uncode  = '$_reportRef'";
                     }
                     if($_reportStationType == 'fport_of_loading_un'){
-                        $sqlWhere = " and fport_of_loading_un  = '$_reportRef'";
+                        $sqlWhere .= " and fport_of_loading_un  = '$_reportRef'";
                     }
                     if($_reportStationType == 'consignee_uncode'){
                         $sqlWhere .= " and  consignee_uncode = '$_reportRef'";

service/login.class.php

@@ -1240,7 +1240,9 @@ class login {
                 city as fd_city,
                 (select timezonecode from public.city_ports where ctrycitycode = LEFT(country, 2) || COALESCE(city_code,'') limit 1) as fd_timezone
             FROM ocean.contacts c WHERE o.final_desination::text = c.contact_id::text) fd ON true
-            where (lower(tracking_no) = '" . strtolower($reference_number) . "' 
+            where o.status::text <> 'Cancelled'::text AND o.bol_type::text <> 'BOOKING'::text AND o.bol_type::text <> 'QUOTE'::text AND o.iscts = true 
+                AND o.iscts IS NOT NULL 
+                AND (lower(tracking_no) = '" . strtolower($reference_number) . "' 
                 or lower(booking_no) = '" . strtolower($reference_number) . "'
                 or lower(h_bol) = '" . strtolower($reference_number) . "'
                 or lower(m_bol) = '" . strtolower($reference_number) . "'
@@ -1467,7 +1469,9 @@ class login {
                 city as fd_city,
                 (select timezonecode from public.city_ports where ctrycitycode = LEFT(country, 2) || COALESCE(city_code,'') limit 1) as fd_timezone
             FROM sfs.contacts c WHERE o.final_desination::text = c.contact_id::text) fd ON true
-        where (lower(tracking_no) = '" . strtolower($reference_number) . "' 
+        where o.status::text <> 'Cancelled'::text AND o.bol_type::text <> 'BOOKING'::text AND o.bol_type::text <> 'QUOTE'::text AND o.iscts = true 
+            AND o.iscts IS NOT NULL 
+            AND (lower(tracking_no) = '" . strtolower($reference_number) . "' 
             or lower(booking_no) = '" . strtolower($reference_number) . "'
             or lower(h_bol) = '" . strtolower($reference_number) . "'
             or lower(m_bol) = '" . strtolower($reference_number) . "'