code

service/ocean_order.class.php

@@ -416,12 +416,12 @@ class ocean_order {
             $_sqlwhere = "1<>1";
             $filterTag_param = "1<>1";
             if (stripos($filterTag, "Created") !== FALSE) {
-                $_sqlwhere .= " or (m_iffbcf is not 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)";
-                $filterTag_param .= " or (m_iffbcf is not 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)";
+                $_sqlwhere .= " or ((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)";
+                $filterTag_param .= " or ((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)";
             }
             if (stripos($filterTag, "Cargo Received") !== FALSE) {
-                $_sqlwhere .= " or ((m_iffcpu is not null or m_iffrec is not null) and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffafd is null)";
-                $filterTag_param .= " or ((m_iffcpu is not null or m_iffrec is not null) and m_iffrec is null and m_iffdep is null and m_iffarr is null and m_iffafd is null)";
+                $_sqlwhere .= " or ((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)";
+                $filterTag_param .= " or ((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)";
             }
             if (stripos($filterTag, "Departure") !== FALSE) {
                 $_sqlwhere .= "or (m_iffdep is not null and m_iffarr is null and m_iffafd is null)";
@@ -467,15 +467,15 @@ class ocean_order {
             $incoterms = explode("<$>", $sql_all_status_data['incoterm_str']);
             $IncotermsList = array();
             foreach($incoterms as $terms){
-                if(!empty($terms['incoterms'])){
-                    $IncotermsList[] = array("name"=>$terms['incoterms'],"checked"=>false);
+                if(!empty($terms)){
+                    $IncotermsList[] = array("name"=>$terms,"checked"=>false);
                 }
             }
             $service = explode("<$>", $sql_all_status_data['service_str']);
             $ServiceList = array();
             foreach($service as $_service){
-                if(!empty($_service['service'])){
-                    $ServiceList[] = array("name"=>$_service['service'],"checked"=>false);
+                if(!empty($_service)){
+                    $ServiceList[] = array("name"=>$_service,"checked"=>false);
                 }
             }
             $rc = $sql_all_status_data['rc'];