diff --git a/public/Forwarder/shipmentarrange.html b/public/Forwarder/shipmentarrange.html index 1ef64aa..67ade80 100644 --- a/public/Forwarder/shipmentarrange.html +++ b/public/Forwarder/shipmentarrange.html @@ -439,18 +439,19 @@ License: You must have a valid license purchased only from themeforest(the above 1 - Shipment
Details + Shipment Details
  • 2 - Shipment
    Status     + Consolidation
    • - - +
    +
    +
    @@ -460,124 +461,164 @@ License: You must have a valid license purchased only from themeforest(the above Your form validation is successful!

    Shipment arrangement details

    -
    - -
    - +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    + +
    + +
    +
    +
    +       

    Loading Venue

    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    +
    +
    -
    - -
    - +
    +
    +
    + +
    +
    +
    -
    -
    - -
    - + +
    +
    + +
    +
    +
    +
    -
    - -
    - + +
    +
    +
    + +
    +
    +
    -
    -
    - -
    - + +
    +
    + +
    +
    +
    +
    -
    - -
    - + +
    +
    +
    + +
    +
    +
    -
    -
    - -
    - + +
    +
    + +
    +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    + +
    -
    -
    - - Edit - Save - +
    + Edit + Next
    -
    +
    -

    Shipment arrangement status

    -
    - -
    - 02-08-2017 -
    -
    -
    - -
    - 123456 -
    -
    -
    - -
    - 123456 -
    -
    -
    - -
    - 03-08-2017 -
    -
    -
    - -
    - 03-08-2017 -
    -
    -
    - -
    - Port Klang -
    -
    -
    - -
    - xxxx -
    -
    - List Shipment + Select Order
    @@ -611,14 +652,29 @@ License: You must have a valid license purchased only from themeforest(the above +
    + +
    +
    +
    +
    +
    +
    +
    + + Back + Continue + + + Submit + +
    +
    +
    -
    -
    -
    -
    -
    - Submit - +
    +
    + Submit
    @@ -704,7 +760,7 @@ License: You must have a valid license purchased only from themeforest(the above
    - List Shipment + Consolidation
    @@ -743,21 +799,21 @@ License: You must have a valid license purchased only from themeforest(the above
    - Customs Interuption + Customs Examination

    -

    Customs Interuption Departure Port

    +

    Customs Examination Departure Port


    New ETD :

    New ETA :


    -

    Customs Inspection Arrival Port

    +

    Customs Examination Arrival Port


    Release Date :

    -
    +
    Submit
    @@ -1359,15 +1415,21 @@ License: You must have a valid license purchased only from themeforest(the above + + + + + - + + @@ -1383,22 +1445,18 @@ License: You must have a valid license purchased only from themeforest(the above var dataSet = [ - ["1"," CTN121 ","789ABC","01-08-2017","01-08-2017 ","05-08-2017 ","12345","Bangi
    Selangor","123456","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], - ["2"," CTN122 ","789ABC","01-08-2017","01-08-2017","01-08-2017","43657","Bangi
    Selangor","123456","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], - ["3"," CTN123 ","789ABC","01-08-2017","01-08-2017","01-08-2017","23532","Bangi
    Selangor","123456","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], - ["4"," CTN124 ","789ABC","01-08-2017","02-08-2017 ","04-08-2017 ","68679","Bangi
    Selangor","123456","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], - ["5"," CTN125 ","789ABC","01-08-2017","01-08-2017","01-08-2017","43665","Bangi
    Selangor","123456","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], - ["6"," CTN130 ","789ABC","01-08-2017","01-08-2017","01-08-2017","89706","Bangi
    Selangor","123456","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + ["1"," CTN121 ","789ABC","01-08-2017","01-08-2017 ","05-08-2017 ","12345","Driver Name:Bob
    Driver No:0123456789
    Contact Person:Ying
    Contact No:0112345678
    Venue:61250, Dongguan","Customs Examination ","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + ["2"," CTN122 ","789ABC","01-08-2017","01-08-2017","01-08-2017","43657","Driver Name:Bob
    Driver No:0123456789
    Contact Person:Ying
    Contact No:0112345678
    Venue:61250, Dongguan","Delivered","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + ["3"," CTN123 ","789ABC","01-08-2017","01-08-2017","01-08-2017","23532","Driver Name:Bob
    Driver No:0123456789
    Contact Person:Ying
    Contact No:0112345678
    Venue:86000, Hong Kong","Delivered","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + ["4"," CTN124 ","789ABC","01-08-2017","02-08-2017 ","04-08-2017 ","68679","Driver Name:Bob
    Driver No:0123456789
    Contact Person:Ying
    Contact No:0112345678
    Venue:61500, Guangzhou","Customs Examination ","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + ["5"," CTN125 ","789ABC","01-08-2017","01-08-2017","01-08-2017","43665","Driver Name:Bob
    Driver No:0123456789
    Contact Person:Ying
    Contact No:0112345678
    Venue:61500, Guangzhou","Delivered","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + ["6"," CTN130 ","789ABC","01-08-2017","01-08-2017","01-08-2017","89706","Driver Name:Bob
    Driver No:0123456789
    Contact Person:Ying
    Contact No:0112345678
    Venue:86000, Hong Kong","Delivered","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + // ["7"," CTN133 ","789ABC","01-08-2017","02-08-2017 ","04-08-2017 ","68679","Guangzhou","Customs Examination","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], + // ["8"," CTN135 ","789ABC","01-08-2017","01-08-2017 ","05-08-2017 ","12345","Dongguan","Customs Examination","03-07-2017","03-07-2017
    Delayed    ","Delivery Request Sent", "Not Completed"], ]; var dataSet2 = [ - // ["","1","03-08-2017","CTN56","00006","CIEF/0008","Bangi
    Selangor","CBM :
    Weight:
    Qty of Carton:"], - // ["","2","03-08-2017","CTN55","00005","CIEF/0007","Bangi
    Selangor","CBM :
    Weight:
    Qty of Carton:"], - // ["","3","03-08-2017","CTN54","00004","CIEF/0006","Bangi
    Selangor","CBM :
    Weight:
    Qty of Carton:"], - // ["","4","03-08-2017","CTN53","00003","CIEF/0005","Bangi
    Selangor","CBM :
    Weight:
    Qty of Carton:"], - // ["","5","03-08-2017","CTN52","00002","CIEF/0004","Bangi
    Selangor","CBM :
    Weight:
    Qty of Carton:"], - // ["","6","03-08-2017","CTN51","00001","CIEF/0003","Bangi
    Selangor","CBM :
    Weight:
    Qty of Carton:"] ]; @@ -1419,7 +1477,7 @@ License: You must have a valid license purchased only from themeforest(the above 'targets': [0] }, { - "targets": [ 8 ], + "targets": [ 9 ], "visible": false }], // scroller extension: http://datatables.net/extensions/scroller/ @@ -1470,7 +1528,7 @@ License: You must have a valid license purchased only from themeforest(the above { title: 'ETA
    ' }, { title: 'Order
    No
    ' }, { title: 'Loading
    Venue
    ' }, - // { title: 'Status
    ' }, + { title: 'Remark
    ' }, // { title: 'Stats' }, ], @@ -1950,7 +2008,7 @@ var FormWizard = function () { $('#form_wizard_1').find('.button-previous').hide(); $('#form_wizard_1 .button-submit').click(function () { - alert('Finished! Hope you like it :)'); + location.reload(); }).hide(); //apply validation on select2 dropdown value change, this only needed for chosen dropdown integration. diff --git a/public/Forwarder/trackorder.html b/public/Forwarder/trackorder.html index c372be4..ea6afc9 100644 --- a/public/Forwarder/trackorder.html +++ b/public/Forwarder/trackorder.html @@ -360,7 +360,8 @@ License: You must have a valid license purchased only from themeforest(the above
    - Milestone + Milestone     014587 : + GroupName
    diff --git a/public/Importer/trackorder.html b/public/Importer/trackorder.html index 6cee546..bb90bd3 100644 --- a/public/Importer/trackorder.html +++ b/public/Importer/trackorder.html @@ -338,8 +338,8 @@ License: You must have a valid license purchased only from themeforest(the above
    - Milestone     014587 + Milestone     014587 : + GroupName
    diff --git a/public/assets/pages/scripts/form-wizard.js b/public/assets/pages/scripts/form-wizard.js index d60f15b..ae3eec2 100644 --- a/public/assets/pages/scripts/form-wizard.js +++ b/public/assets/pages/scripts/form-wizard.js @@ -243,7 +243,6 @@ var FormWizard = function () { $('#form_wizard_1').find('.button-previous').hide(); $('#form_wizard_1 .button-submit').click(function () { - alert('Finished! Hope you like it :)'); }).hide(); //apply validation on select2 dropdown value change, this only needed for chosen dropdown integration.