|
@@ -1375,9 +1375,9 @@ class tools {
|
|
|
else ''
|
|
else ''
|
|
|
end as ctnr_desc,
|
|
end as ctnr_desc,
|
|
|
|
|
|
|
|
- ccc.order_from,ccc.h_bol,ccc.transport_mode
|
|
|
|
|
|
|
+ ccc.order_from,ccc.h_bol,ccc.transport_mode,ccc.m_bol
|
|
|
from public.kln_notifiation_info ni
|
|
from public.kln_notifiation_info ni
|
|
|
- left join LATERAL (select oo.h_bol,oo.transport_mode,oo.order_from
|
|
|
|
|
|
|
+ left join LATERAL (select oo.h_bol,oo.transport_mode,oo.order_from,oo.m_bol
|
|
|
from public.kln_ocean oo
|
|
from public.kln_ocean oo
|
|
|
where oo.serial_no = ni.serial_no limit 1) ccc on true
|
|
where oo.serial_no = ni.serial_no limit 1) ccc on true
|
|
|
where lower(ni.user_login) in ('".strtolower(_getLoginName())."','all_user')
|
|
where lower(ni.user_login) in ('".strtolower(_getLoginName())."','all_user')
|
|
@@ -1454,7 +1454,7 @@ class tools {
|
|
|
"isRead"=>!empty($mInfo["is_send_message"]) ? true : false,
|
|
"isRead"=>!empty($mInfo["is_send_message"]) ? true : false,
|
|
|
"title"=>"Milestone Update",
|
|
"title"=>"Milestone Update",
|
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
|
- "no"=>$mInfo["h_bol"],
|
|
|
|
|
|
|
+ "no"=>!empty($mInfo["h_bol"]) ? $mInfo["h_bol"] : $mInfo["m_bol"],
|
|
|
"tag"=>$mInfo["milestone_description"],
|
|
"tag"=>$mInfo["milestone_description"],
|
|
|
"location"=>$mInfo["milestone_locations"],
|
|
"location"=>$mInfo["milestone_locations"],
|
|
|
"timezone"=>$mInfo["milestone_timezone"],
|
|
"timezone"=>$mInfo["milestone_timezone"],
|
|
@@ -1467,6 +1467,7 @@ class tools {
|
|
|
"id"=>$mInfo["id"],
|
|
"id"=>$mInfo["id"],
|
|
|
"insert_date_format"=>'',
|
|
"insert_date_format"=>'',
|
|
|
"rules_type"=>$mInfo["notifiation_type"],
|
|
"rules_type"=>$mInfo["notifiation_type"],
|
|
|
|
|
+ "is_display_hbol"=>!empty($mInfo["h_bol"]),
|
|
|
"info"=>new stdClass());
|
|
"info"=>new stdClass());
|
|
|
|
|
|
|
|
if ($mInfo["frequency_type"] == "Daily"){
|
|
if ($mInfo["frequency_type"] == "Daily"){
|
|
@@ -1599,7 +1600,7 @@ class tools {
|
|
|
"isRead"=>!empty($mInfo["is_send_message"]) ? true : false,
|
|
"isRead"=>!empty($mInfo["is_send_message"]) ? true : false,
|
|
|
"title"=>$title,
|
|
"title"=>$title,
|
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
|
- "no"=>$mInfo["h_bol"],
|
|
|
|
|
|
|
+ "no"=>!empty($mInfo["h_bol"]) ? $mInfo["h_bol"] : $mInfo["m_bol"],
|
|
|
"tag"=>$mInfo["delay_name"],
|
|
"tag"=>$mInfo["delay_name"],
|
|
|
"location"=>$outsideLocation,
|
|
"location"=>$outsideLocation,
|
|
|
"timezone"=>$mInfo["delay_timezone"],
|
|
"timezone"=>$mInfo["delay_timezone"],
|
|
@@ -1612,6 +1613,7 @@ class tools {
|
|
|
"id"=>$mInfo["id"],
|
|
"id"=>$mInfo["id"],
|
|
|
"insert_date_format"=>'',
|
|
"insert_date_format"=>'',
|
|
|
"rules_type"=>$mInfo["notifiation_type"],
|
|
"rules_type"=>$mInfo["notifiation_type"],
|
|
|
|
|
+ "is_display_hbol"=>!empty($mInfo["h_bol"]),
|
|
|
"info"=>array("route"=>$route,
|
|
"info"=>array("route"=>$route,
|
|
|
"leg"=>$leg,
|
|
"leg"=>$leg,
|
|
|
"etdOrdeparturNum"=>0,
|
|
"etdOrdeparturNum"=>0,
|
|
@@ -1667,7 +1669,7 @@ class tools {
|
|
|
"isRead"=>!empty($mInfo["is_send_message"]) ? true : false,
|
|
"isRead"=>!empty($mInfo["is_send_message"]) ? true : false,
|
|
|
"title"=>$title,
|
|
"title"=>$title,
|
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
"mode"=>$mInfo["transport_mode"] == 'sea' ? "Ocean Freight": "Air Freight",
|
|
|
- "no"=>$mInfo["h_bol"],
|
|
|
|
|
|
|
+ "no"=>!empty($mInfo["h_bol"]) ? $mInfo["h_bol"] : $mInfo["m_bol"],
|
|
|
"tag"=>$mInfo["date_change_name"],
|
|
"tag"=>$mInfo["date_change_name"],
|
|
|
"location"=>"",
|
|
"location"=>"",
|
|
|
"timezone"=>$mInfo["date_change_timezone"],
|
|
"timezone"=>$mInfo["date_change_timezone"],
|
|
@@ -1680,6 +1682,7 @@ class tools {
|
|
|
"id"=>$mInfo["id"],
|
|
"id"=>$mInfo["id"],
|
|
|
"insert_date_format"=>'',
|
|
"insert_date_format"=>'',
|
|
|
"rules_type"=>$mInfo["notifiation_type"],
|
|
"rules_type"=>$mInfo["notifiation_type"],
|
|
|
|
|
+ "is_display_hbol"=>!empty($mInfo["h_bol"]),
|
|
|
"info"=>array("route"=>$route,
|
|
"info"=>array("route"=>$route,
|
|
|
"leg"=>$leg,
|
|
"leg"=>$leg,
|
|
|
"etdOrdeparturNum"=>0,
|
|
"etdOrdeparturNum"=>0,
|
