code

main_new_version.php

@@ -463,7 +463,7 @@ switch ($action) {
 	    	            WHEN dd.status is null THEN 'Created'::text
 	    	            ELSE dd.status::text
 		            END AS status,
-                    dd.act_date,dd.description
+                    dd.act_date,dd.description,dd.timezone,dd.act_time
                     FROM public.online_ocean 
                     left join LATERAL (select case when a.code='IFFBCF' then 'Created'
                                     when a.code='IFFCPU' then 'Cargo Received'
@@ -471,7 +471,7 @@ switch ($action) {
                                     when a.code='IFFDEP' then 'Departed'
                                     when a.code='IFFARR' then 'Arrived'
                                     when a.code='IFFAFD' then 'Completed'
-                                    else 'Created' END as status,act_date,description
+                                    else 'Created' END as status,act_date,act_time,description,timezone
                             from  ocean_milestone a 
                     where a.serial_no=online_ocean.serial_no 
                         and a.code in (select regexp_split_to_table('IFFBCF,IFFCPU,IFFREC,IFFDEP,IFFARR,IFFAFD', ','))
@@ -501,6 +501,8 @@ switch ($action) {
                     "type"=>$value['status'],
                     "Arrived"=>$Arrived,
                     "Time"=>$value["act_date"],
+                    "act_time" =>$value["act_time"],
+                    "timezone"=>$value["timezone"],
                     "_schemas"=>$value["_schemas"],
                     "a" =>common::deCode($value['serial_no'], 'E'));
             }

service/ocean_booking.class.php

@@ -213,20 +213,20 @@ class ocean_booking {
 
             //前端数据返回，不管有无数据
             if (!empty($_POST["filterTag"])) {
-                $tagsList = array(array("name"=>"All","number"=>$rc,"type"=>"all","checked"=>utils::in_array('All', $_POST["filterTag"])? true : false),
-                array("name"=>"Created","number"=>$Creatd,"type"=>"created","checked"=>utils::in_array('Created', $_POST["filterTag"])? true : false),
-                array("name"=>"Confirmed","number"=>$Confirmed,"type"=>"confirmed","checked"=>utils::in_array('Confirmed', $_POST["filterTag"])? true : false),
-                array("name"=>"Cancelled","number"=>$Concelled,"type"=>"cancelled","checked"=>utils::in_array('Cancelled', $_POST["filterTag"])? true : false));
+                $tagsList = array(array("name"=>"All","number"=>intval($rc),"type"=>"all","checked"=>utils::in_array('All', $_POST["filterTag"])? true : false),
+                array("name"=>"Created","number"=>intval($Creatd),"type"=>"created","checked"=>utils::in_array('Created', $_POST["filterTag"])? true : false),
+                array("name"=>"Confirmed","number"=>intval($Confirmed),"type"=>"confirmed","checked"=>utils::in_array('Confirmed', $_POST["filterTag"])? true : false),
+                array("name"=>"Cancelled","number"=>intval($Concelled),"type"=>"cancelled","checked"=>utils::in_array('Cancelled', $_POST["filterTag"])? true : false));
             }else{
                 //初始，前端有选择着带入选择
-                $tagsList = array(array("name"=>"All","number"=>$rc,"type"=>"all","checked"=>true),
-                array("name"=>"Created","number"=>$Creatd,"type"=>"created","checked"=>false),
-                array("name"=>"Confirmed","number"=>$Confirmed,"type"=>"confirmed","checked"=>false),
-                array("name"=>"Cancelled","number"=>$Concelled,"type"=>"cancelled","checked"=>false));
+                $tagsList = array(array("name"=>"All","number"=>intval($rc),"type"=>"all","checked"=>true),
+                array("name"=>"Created","number"=>intval($Creatd),"type"=>"created","checked"=>false),
+                array("name"=>"Confirmed","number"=>intval($Confirmed),"type"=>"confirmed","checked"=>false),
+                array("name"=>"Cancelled","number"=>intval($Concelled),"type"=>"cancelled","checked"=>false));
             }
 
             $TransportList = array(
-                array("name"=>"Ocean Freight","number"=>$rc,"checked"=>false,"icon"=>"#icon-icon_ocean_b"));
+                array("name"=>"Ocean Freight","number"=>intval($rc),"checked"=>false,"icon"=>"#icon-icon_ocean_b"));
 
             //现在下载交给前端，后台预先只返回全部字段的列,
             $allColumn = column::getInstance()->getDisplayColumnAllReomveDefault('Booking_Search');
@@ -313,7 +313,7 @@ class ocean_booking {
         if($_schemas == 'public'){
             $_schemas = "ocean";
         }
-        $sql = "SELECT o.serial_no, o.booking_no as _booking_no, o.* ,sh.*, cn.* ,aa.*,dd.* from ocean o
+        $sql = "SELECT o.booking_no as _booking_no, o.* ,sh.*, cn.* ,aa.*,dd.* from ocean o
             LEFT JOIN LATERAL ( SELECT company as cn_company,
                 address_1 as cn_address_1,
                 address_2 as cn_address_2,

service/ocean_order.class.php

@@ -465,24 +465,24 @@ class ocean_order {
             error_log("online_ocean_count_Completed_SQL: ".$sql);
             
             if (!empty($_POST["filterTag"])) {
-                $tagsList = array(array("name"=>"All","number"=>$rc,"type"=>"all","checked"=>utils::in_array('All', $_POST["filterTag"])? true : false),
-                array("name"=>"Created","number"=>$Created,"type"=>"created","checked"=>utils::in_array('Created', $_POST["filterTag"])? true : false),
-                array("name"=>"Cargo Received","number"=>$Cargo_Received,"type"=>"cargo_received","checked"=>utils::in_array('Cargo Received', $_POST["filterTag"])? true : false),
-                array("name"=>"Departure","number"=>$Departed,"type"=>"departure","checked"=>utils::in_array('Departure', $_POST["filterTag"])? true : false),
-                array("name"=>"Arrived","number"=>$Arrived,"type"=>"arrived","checked"=>utils::in_array('Arrived', $_POST["filterTag"])? true : false),
-                array("name"=>"Completed","number"=>$Completed,"type"=>"completed","checked"=>utils::in_array('Completed', $_POST["filterTag"])? true : false));
+                $tagsList = array(array("name"=>"All","number"=>intval($rc),"type"=>"all","checked"=>utils::in_array('All', $_POST["filterTag"])? true : false),
+                array("name"=>"Created","number"=>intval($Created),"type"=>"created","checked"=>utils::in_array('Created', $_POST["filterTag"])? true : false),
+                array("name"=>"Cargo Received","number"=>intval($Cargo_Received),"type"=>"cargo_received","checked"=>utils::in_array('Cargo Received', $_POST["filterTag"])? true : false),
+                array("name"=>"Departure","number"=>intval($Departed),"type"=>"departure","checked"=>utils::in_array('Departure', $_POST["filterTag"])? true : false),
+                array("name"=>"Arrived","number"=>intval($Arrived),"type"=>"arrived","checked"=>utils::in_array('Arrived', $_POST["filterTag"])? true : false),
+                array("name"=>"Completed","number"=>intval($Completed),"type"=>"completed","checked"=>utils::in_array('Completed', $_POST["filterTag"])? true : false));
             }else{
                 //初始，前端有选择着带入选择
-                $tagsList = array(array("name"=>"All","number"=>$rc,"type"=>"all","checked"=> true ),
-                array("name"=>"Created","number"=>$Created,"type"=>"created","checked"=> false),
-                array("name"=>"Cargo Received","number"=>$Cargo_Received,"type"=>"cargo_received","checked"=> false),
-                array("name"=>"Departure","number"=>$Departed,"type"=>"departure","checked"=> false),
-                array("name"=>"Arrived","number"=>$Arrived,"type"=>"arrived","checked"=> false),
-                array("name"=>"Completed","number"=>$Completed,"type"=>"completed","checked"=>false));
+                $tagsList = array(array("name"=>"All","number"=>intval($rc),"type"=>"all","checked"=> true ),
+                array("name"=>"Created","number"=>intval($Created),"type"=>"created","checked"=> false),
+                array("name"=>"Cargo Received","number"=>intval($Cargo_Received),"type"=>"cargo_received","checked"=> false),
+                array("name"=>"Departure","number"=>intval($Departed),"type"=>"departure","checked"=> false),
+                array("name"=>"Arrived","number"=>intval($Arrived),"type"=>"arrived","checked"=> false),
+                array("name"=>"Completed","number"=>intval($Completed),"type"=>"completed","checked"=>false));
             }
 
             $TransportList = array(
-                array("name"=>"Ocean Freight","number"=>$rc,"checked"=>false,"icon"=>"#icon-icon_ocean_b"));
+                array("name"=>"Ocean Freight","number"=>intval($rc),"checked"=>false,"icon"=>"#icon-icon_ocean_b"));
 
             //现在下载交给前端，后台预先只返回全部字段的列,
             $allColumn = column::getInstance()->getDisplayColumnAllReomveDefault('Ocean_Search');

utils/common.class.php

@@ -123,7 +123,7 @@ class common {
                             ['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'; // is ajax request?
             //暂时这么写，放开action = main的查询是为了在没有登录时获取信息。
             //tools是为了避免查询的用户，没有配置tools权限，但是新版mark_save需要进入
-            if($action == "main" || $action == "tools"){
+            if($action == "main" || $action == "tools" || $action == "save_layout"){
                 return;
             }
             if (!isset($_SESSION['ONLINE_USER'])) {
@@ -1309,7 +1309,10 @@ class common {
                     "value" =>$orgin['num'],
                     "textcolor" =>"#FFF");
             }
-            $toporigin[] = array("name"=>$orgin['shippr_uncode'],"value"=>$orgin['num'],"color"=>common::getItemStyle("top",$i));
+            if($toporiginType == "shippr_uncode"){
+                
+            }
+            $toporigin[] = array("name"=>$orgin['shippr_uncode'],"city_name"=>"","value"=>$orgin['num'],"color"=>common::getItemStyle("top",$i));
             $origiNunMax = $origiNunMax < $orgin['num'] ? $orgin['num'] : $origiNunMax;
         }