From 3763c44f56d6fef75369e66b0a49f225684fb6a6 Mon Sep 17 00:00:00 2001
From: Syed Amir <sydjb93@gmail.com>
Date: Tue, 26 Sep 2017 14:39:59 +0800
Subject: [PATCH 1/2] what the heck

---
 public/Forwarder/deliveryarrange.html | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/public/Forwarder/deliveryarrange.html b/public/Forwarder/deliveryarrange.html
index 5f7c170..23265b8 100644
--- a/public/Forwarder/deliveryarrange.html
+++ b/public/Forwarder/deliveryarrange.html
@@ -587,21 +587,31 @@ License: You must have a valid license purchased only from themeforest(the above
 										<div class="form">
 											<div class="row">
 												<div class="col-md-12">
-														<h5>Message</h5>
+														<h5>Notification</h5>
 														<hr>
 													<div class="form-group">
 														<div class="row">
 															<div class="col-md-10">
 																<textarea id="message" class="form-control" rows="10">
-CIEF Delivery Message
+CIEF Delivery Notification
 
-Order No: <<order_no>> 
-Delivery Date: 03-07-2017
-Driver Name: Bob 
-Driver Contact No: 013-3456789
-Vehicle No: WAA 123 C
+Delivery Request:
+Order No.: #[ORDER NO]
+From Supplier: #[SUPPLIER NAME]
+Total Qty : #[TOTAL] #[UOM]
+Total CBM : #[TOTAL CBM]
+EDD : #[DATE] (Anytime)
+?? EDD = Estimated Delivery Date
+Delivery Date : [DATE]
+Courier Co. : [COURIER SERVICE NAME]
+Tracking No. : [TRACKING NO.]
 
-* Kindly proceed to the messenger to confirm
+Pls confirm the delivery date confirm your warehouse is available.
+* Pls confirm your warehouse manpower is ready and all equipment are ready as well. Exp: Forklift, Troly & etc.
+
+Thank You Very Much.
+
+[Forwarder Company Name]
 </textarea>
 															</div>
 															<div class="col-md-2">

From 02d926fa3be3dc22113e7acf7cf6a25bf593b4d9 Mon Sep 17 00:00:00 2001
From: Syed Amir <sydjb93@gmail.com>
Date: Tue, 26 Sep 2017 14:44:49 +0800
Subject: [PATCH 2/2] what the heck

---
 public/Forwarder/deliveryarrange.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/Forwarder/deliveryarrange.html b/public/Forwarder/deliveryarrange.html
index 914bc79..336523b 100644
--- a/public/Forwarder/deliveryarrange.html
+++ b/public/Forwarder/deliveryarrange.html
@@ -598,7 +598,6 @@ License: You must have a valid license purchased only from themeforest(the above
 														<div class="row">
 															<div class="col-md-10">
 																<textarea id="message" class="form-control" rows="10">
-=======
 Delivery Request
 
 Order No: #[ORDER NO]