code

service/destination_delivery.class.php

@@ -1092,7 +1092,7 @@ class destination_delivery {
             if(!$is_new){
                 //状态变更时，发送邮件提醒 
                 $status = "Modify";
-                $data = common::excuteObjectSql("select *, TO_CHAR(delivery_date, 'Mon-DD-YYYY') as _delivery_date,
+                $data = common::excuteObjectSql("select *, TO_CHAR(delivery_date, 'Mon-DD-YYYY HH24:MI') as _delivery_date,
                         TO_CHAR(created_time, 'Mon-DD-YYYY') as _created_time,
                         TO_CHAR(update_time, 'Mon-DD-YYYY') as _update_time
                     from public.kln_destination_delivery where serial_no = '$serial_no'");
@@ -1103,7 +1103,7 @@ class destination_delivery {
                 }     
             } else {
                 $status = "Submit";
-                $data = common::excuteObjectSql("select *, TO_CHAR(delivery_date, 'Mon-DD-YYYY') as _delivery_date,
+                $data = common::excuteObjectSql("select *, TO_CHAR(delivery_date, 'Mon-DD-YYYY HH24:MI') as _delivery_date,
                         TO_CHAR(created_time, 'Mon-DD-YYYY') as _created_time,
                         TO_CHAR(update_time, 'Mon-DD-YYYY') as _update_time
                     from public.kln_destination_delivery where serial_no = '$serial_no'");
@@ -1174,7 +1174,7 @@ class destination_delivery {
             } else{
                 //状态变更时，发送邮件提醒 
                 $data = common::excuteObjectSql("select *, 
-                            TO_CHAR(delivery_date, 'Mon-DD-YYYY') as _delivery_date,
+                            TO_CHAR(delivery_date, 'Mon-DD-YYYY HH24:MI') as _delivery_date,
                             TO_CHAR(created_time, 'Mon-DD-YYYY') as _created_time,
                             TO_CHAR(update_time, 'Mon-DD-YYYY') as _update_time 
                         from public.kln_destination_delivery where serial_no = '$serial_no'");

utils/common.class.php

@@ -3825,13 +3825,14 @@ class common {
         }
 
         //邮件模板填充字段准备
+        //empty($address['contact_person']) ? "" : "Contact: ".$address['contact_person']."(".$address['contact_number'].")"
         $address = json_decode($data["delivery_address_detail"],true);
         $tplData = array("customer_email"=>$customer_email,
             "customer_name"=>$data['create_by'],
             "delivery_mode"=>$data['delivery_mode'],
             "delivery_date"=>$data['_delivery_date'],
-            "location_name"=>empty($address['contact_person']) ? "" : $address['contact_person'].":".$address['contact_number'],
-            "address_1"=>$address['address_1'],
+            "location_name"=>$address['address_1'],
+            "address_1"=>$data['delivery_address'],
             "contact"=>"",
             "kln_pic_email"=>$kln_pic_email,
             "booking_no" =>$data['booking_no'],
@@ -3844,6 +3845,7 @@ class common {
             "action_comments" =>$log['notes'],
             "link" =>$links,
             "consignee_name" =>$data['consignee'],
+            "special_requirements" =>$data['special_requirements'],
             "html_tr" =>$html_tr);
     
         $contents = common::excuteObjectSql("select subject, ra_content as content from ra_online_email_tpl where ra_type = 'Delivery_".$status."'");