From 782a880a27f63e441272a22886bb236d4fec99dc Mon Sep 17 00:00:00 2001 From: Syed Amir Date: Fri, 11 Aug 2017 11:38:12 +0800 Subject: [PATCH] shipment and delivery arrangement repair --- Forwarder/deliveryarrange.html | 94 +++++++++++++------ Forwarder/shipmentarrange.html | 164 +++++++++++++-------------------- 2 files changed, 130 insertions(+), 128 deletions(-) diff --git a/Forwarder/deliveryarrange.html b/Forwarder/deliveryarrange.html index ba65c25..6c47902 100644 --- a/Forwarder/deliveryarrange.html +++ b/Forwarder/deliveryarrange.html @@ -141,14 +141,14 @@ License: You must have a valid license purchased only from themeforest(the above font: normal normal normal 14px/1 FontAwesome; font-size: 14px; text-rendering: auto; - } + } .media-object-4 { - width: 35px; - position: right ; - margin-left: 63%; - margin-top:0.7%; - } - + width: 35px; + position: right ; + margin-left: 63%; + margin-top:0.7%; + } + @@ -173,8 +173,7 @@ License: You must have a valid license purchased only from themeforest(the above - ... - + ...
- + @@ -579,7 +578,7 @@ Vehicle No: WAA 123 C
- + Send
@@ -593,6 +592,40 @@ Vehicle No: WAA 123 C + + @@ -1206,14 +1239,14 @@ Vehicle No: WAA 123 C var dataSet = [ - ["1","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00006 5","CIEF/0008","CTN56","Bangi
Selangor","123456","03-07-2017","03-07-2017
Delayed","Delivery Request Sent", "Not Completed"], - ["2","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00005 ","CIEF/0007","CTN56","Bangi
Selangor","123456","02-07-2017","02-07-2017","Delivery Request Sent", "Not Completed"], - ["3","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00004 ","CIEF/0006","CTN56","Bangi
Selangor","123456","01-07-2017","01-07-2017
Delayed","Delivery Request Sent", "Not Completed"], - ["4","03-07-2017","Vehicle No:JNY1122
Contact Person:Handsome
Contact No: 012345689"," 00003 5","CIEF/0005","CTN56","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], - ["5","10-07-2017","Vehicle No:JLK3333
Contact Person:Hantam
Contact No: 012345689"," 00002 5","CIEF/0004","CTN56","Bangi
Selangor","123456","29-06-2017","29-06-2017","Delivery Request Refused", "Not Completed"], - ["6","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], - ["7","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"], - ["8","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"] + ["1","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00006 5","CIEF/0008","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","03-07-2017","03-07-2017
Delayed","Delivery Request Sent", "Not Completed"], + ["2","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00005 ","CIEF/0007","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","02-07-2017","02-07-2017","Delivery Request Sent", "Not Completed"], + ["3","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00004 ","CIEF/0006","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","01-07-2017","01-07-2017
Delayed","Delivery Request Sent", "Not Completed"], + ["4","03-07-2017","Vehicle No:JNY1122
Contact Person:Handsome
Contact No: 012345689"," 00003 5","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], + ["5","03-07-2017","Vehicle No:JNY1122
Contact Person:Hantam
Contact No: 012345689"," 00002 5","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], + ["6","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Accepted
Fail to Deliver
", "Not Completed"], + ["7","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"], + ["8","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"] ]; var dataSet2 = [ @@ -1243,7 +1276,7 @@ Vehicle No: WAA 123 C 'targets': [0] }, { - "targets": [ 11 ], + "targets": [ 12 ], "visible": false }], // scroller extension: http://datatables.net/extensions/scroller/ @@ -1292,16 +1325,17 @@ Vehicle No: WAA 123 C { title: 'Order No
' }, { title: 'Customer
Code
' }, { title: 'Shipment
No
' }, - { title: 'Area
State
' }, - { title: 'Container No
' }, - { title: 'ETD
' }, - { title: 'ETA
' }, - { title: 'Status
' }, + { title: 'Customer
Details
' }, + { title: 'Area
State
' }, + { title: 'Container No
' }, + { title: 'ETD
' }, + { title: 'ETA
' }, + { title: 'Status
' }, { title: 'Stats' }, ], initComplete: function () { - configFilter(this, [1, 2,3, 4,5,6,7,8,9,10]); + configFilter(this, [1, 2,3, 4,5,6,7,8,9,10,11]); } }); @@ -1357,12 +1391,12 @@ Vehicle No: WAA 123 C configFilter(this, [ 2,3, 4,5,6,7,8]); } }); - table1.columns( 11 ).search( 'Not Completed' ).draw(); + table1.columns( 12 ).search( 'Not Completed' ).draw(); $('.asdasd').on('switchChange.bootstrapSwitch', function (event, state) { if(state == true){ - table1.columns( 11 ).search( 'Not Completed' ).draw(); + table1.columns( 12 ).search( 'Not Completed' ).draw(); }else{ - table1.columns( 11 ).search( 'Completed' ).draw(); + table1.columns( 12 ).search( 'Completed' ).draw(); } @@ -1600,4 +1634,4 @@ Vehicle No: WAA 123 C - \ No newline at end of file + diff --git a/Forwarder/shipmentarrange.html b/Forwarder/shipmentarrange.html index 7c271d2..c50da12 100644 --- a/Forwarder/shipmentarrange.html +++ b/Forwarder/shipmentarrange.html @@ -141,14 +141,14 @@ License: You must have a valid license purchased only from themeforest(the above font: normal normal normal 14px/1 FontAwesome; font-size: 14px; text-rendering: auto; - } + } .media-object-4 { - width: 35px; - position: right ; - margin-left: 63%; - margin-top:0.7%; - } - + width: 35px; + position: right ; + margin-left: 63%; + margin-top:0.7%; + } + @@ -173,8 +173,7 @@ License: You must have a valid license purchased only from themeforest(the above - ... - + ...
- + @@ -433,7 +432,6 @@ License: You must have a valid license purchased only from themeforest(the above
-
Shipment Details
@@ -486,6 +484,8 @@ License: You must have a valid license purchased only from themeforest(the above
+ +

@@ -505,12 +505,10 @@ ETA: 05-07-2017 Shipment No: 013-3456789 Contact Person: Ciku Contact Person No: 0123456789 - -* Kindly proceed to the messenger to confirm
- + Send
@@ -524,6 +522,40 @@ Contact Person No: 0123456789 + + @@ -1137,14 +1169,14 @@ Contact Person No: 0123456789 var dataSet = [ - ["1","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00006 5","CIEF/0008","CTN56","Bangi
Selangor","123456","03-07-2017","03-07-2017
Delayed","Delivery Request Sent", "Not Completed"], - ["2","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00005 ","CIEF/0007","CTN56","Bangi
Selangor","123456","02-07-2017","02-07-2017","Delivery Request Sent", "Not Completed"], - ["3","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00004 ","CIEF/0006","CTN56","Bangi
Selangor","123456","01-07-2017","01-07-2017
Delayed","Delivery Request Sent", "Not Completed"], - ["4","03-07-2017","Vehicle No:JNY1122
Contact Person:Handsome
Contact No: 012345689"," 00003 5","CIEF/0005","CTN56","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Shipment Failed
", "Not Completed"], - ["5","10-07-2017","Vehicle No:JLK3333
Contact Person:Hantam
Contact No: 012345689"," 00002 5","CIEF/0004","CTN56","Bangi
Selangor","123456","29-06-2017","29-06-2017","Delivery Request Refused", "Not Completed"], - ["6","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Accepted
Shipment Failed
", "Not Completed"], - ["7","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"], - ["8","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"] + ["1","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00006 5","CIEF/0008","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","03-07-2017","03-07-2017
Delayed","Delivery Request Sent", "Not Completed"], + ["2","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00005 ","CIEF/0007","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","02-07-2017","02-07-2017","Delivery Request Sent", "Not Completed"], + ["3","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00004 ","CIEF/0006","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","01-07-2017","01-07-2017
Delayed","Delivery Request Sent", "Not Completed"], + ["4","03-07-2017","Vehicle No:JNY1122
Contact Person:Handsome
Contact No: 012345689"," 00003 5","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Ship
", "Not Completed"], + ["5","03-07-2017","Vehicle No:JNY1122
Contact Person:Hantam
Contact No: 012345689"," 00002 5","CIEF/0005","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","30-06-2017","30-06-2017
Delayed","Delivery Request Accepted
Fail to Ship
", "Not Completed"], + ["6","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Accepted
Fail to Ship
", "Not Completed"], + ["7","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"], + ["8","03-07-2017","Vehicle No:JKB1111
Contact Person:Samad
Contact No: 012345689"," 00001 5","CIEF/0003","CTN56","Address: 7-7-17, Apartment Intana Ria 2, Jalan 7/4, Seksyen 7
Contact No: 0123456789","Bangi
Selangor","123456","28-06-2017","28-06-2017","Delivery Request Completed", "Completed"] ]; var dataSet2 = [ @@ -1174,7 +1206,7 @@ Contact Person No: 0123456789 'targets': [0] }, { - "targets": [ 11 ], + "targets": [ 12 ], "visible": false }], // scroller extension: http://datatables.net/extensions/scroller/ @@ -1223,16 +1255,17 @@ Contact Person No: 0123456789 { title: 'Order No
' }, { title: 'Customer
Code
' }, { title: 'Shipment
No
' }, - { title: 'Area
State
' }, - { title: 'Container No
' }, - { title: 'ETD
' }, - { title: 'ETA
' }, - { title: 'Status
' }, + { title: 'Customer
Details
' }, + { title: 'Area
State
' }, + { title: 'Container No
' }, + { title: 'ETD
' }, + { title: 'ETA
' }, + { title: 'Status
' }, { title: 'Stats' }, ], initComplete: function () { - configFilter(this, [1, 2,3, 4,5,6,7,8,9,10]); + configFilter(this, [1, 2,3, 4,5,6,7,8,9,10,11]); } }); @@ -1288,12 +1321,12 @@ Contact Person No: 0123456789 configFilter(this, [ 2,3, 4,5,6,7,8]); } }); - table1.columns( 11 ).search( 'Not Completed' ).draw(); + table1.columns( 12 ).search( 'Not Completed' ).draw(); $('.asdasd').on('switchChange.bootstrapSwitch', function (event, state) { if(state == true){ - table1.columns( 11 ).search( 'Not Completed' ).draw(); + table1.columns( 12 ).search( 'Not Completed' ).draw(); }else{ - table1.columns( 11 ).search( 'Completed' ).draw(); + table1.columns( 12 ).search( 'Completed' ).draw(); } @@ -1397,46 +1430,6 @@ Contact Person No: 0123456789 }); }, 50); } - $('#warehouse').change(function(){ - var warehouse = $('#warehouse').val(); - if(warehouse == "WHA"){ - var new_warehouse = "Block 3730, Persiaran Apec, 63000 Cyberjaya, Selangor, Malaysia"; - var new_city = "Cyberjaya"; - var new_state = "Selangor"; - var new_contact = "Aaron Aziz"; - var new_contactno = "0123456789"; - }else if(warehouse == "WHB"){ - var new_warehouse = "70 McCullough Dr, New Castle, 19720 Delaware, United State of America"; - var new_city = "New Castle"; - var new_state = "Delaware"; - var new_contact = "Aliff Aziz"; - var new_contactno = "0123456789"; - }else if(warehouse == "WHC"){ - var new_warehouse = "96-100 Beaconsfield St., Silverwater, Sydney, 2128 New South Wales, Australia"; - var new_city = "Sydney"; - var new_state = "New South Wales"; - var new_contact = "Selkom"; - var new_contactno = "0123456789"; - }else if(warehouse == "WHD"){ - var new_warehouse = "Room I, 9F No.288 South ZhongShan Rd, 210005 Nanjing, JiangSu, China"; - var new_city = "Nanjing"; - var new_state = "JiangSu"; - var new_contact = "Ahmad Albab"; - var new_contactno = "0123456789"; - } - $("textarea#address").val(new_warehouse); - $("input#state").val(new_state); - $("input#city").val(new_city); - $("input#contact").val(new_contact); - $("input#contactno").val(new_contactno); - - var addr = $("textarea#address").val(); - var ctc = $("input#contact").val(); - var ctcno = $("input#contactno").val(); - var new_message = "CIEF Delivery Message \n\n Order no : <> \n Self Collect Status : Ready \n Warehouse Address: " + addr + "\n Contact Person : " + ctc + " (" + ctcno + ") \n\n * Kindly proceed to the messenger to confirm"; - $("textarea#message").val(new_message); - - }); var modalFilterArray = {}; //User to show the filter modal function showFilter(e, index) { @@ -1500,35 +1493,10 @@ Contact Person No: 0123456789 $('#mask').hide(); $('.modalFilter').hide(); } - function show_hide(val){ - var drop_val = val.value; - if(drop_val == 1 || drop_val == 3){ - document.getElementById("own_transport").style.display = ""; - document.getElementById("courier").style.display = "none"; - document.getElementById("self_collect").style.display = "none"; - }else if(drop_val == 2){ - document.getElementById("courier").style.display = ""; - document.getElementById("own_transport").style.display = "none"; - document.getElementById("self_collect").style.display = "none"; - }else if(drop_val == 4){ - document.getElementById("self_collect").style.display = ""; - document.getElementById("courier").style.display = "none"; - document.getElementById("own_transport").style.display = "none"; - var addr = $("textarea#address").val(); - var ctc = $("input#contact").val(); - var ctcno = $("input#contactno").val(); - var new_message = "CIEF Delivery Message \n\n Order no : <> \n Self Collect Status : Ready \n Warehouse Address: " + addr + "\n Contact Person : " + ctc + " (" + ctcno + ") \n\n * Kindly proceed to the messenger to confirm"; - $("textarea#message").val(new_message); - }else{ - document.getElementById("self_collect").style.display = "none"; - document.getElementById("courier").style.display = "none"; - document.getElementById("own_transport").style.display = "none"; - } - } - \ No newline at end of file +