From 9ea6f06697631c2dc94819f0192deef44e2cefcd Mon Sep 17 00:00:00 2001 From: Syed Amir Date: Wed, 13 Sep 2017 10:02:57 +0800 Subject: [PATCH 1/8] qweqwe --- public/Forwarder/warehousenote.html | 2 +- public/Forwarder/wrn2.html | 2 +- public/Forwarder/wrn3.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/Forwarder/warehousenote.html b/public/Forwarder/warehousenote.html index df97824..1c56735 100644 --- a/public/Forwarder/warehousenote.html +++ b/public/Forwarder/warehousenote.html @@ -1761,4 +1761,4 @@ function findTotal(){ - \ No newline at end of file + \ No newline at end of file diff --git a/public/Forwarder/wrn2.html b/public/Forwarder/wrn2.html index 0696528..c0bd17c 100644 --- a/public/Forwarder/wrn2.html +++ b/public/Forwarder/wrn2.html @@ -1747,4 +1747,4 @@ function findTotal(){ - \ No newline at end of file + \ No newline at end of file diff --git a/public/Forwarder/wrn3.html b/public/Forwarder/wrn3.html index f276353..f480470 100644 --- a/public/Forwarder/wrn3.html +++ b/public/Forwarder/wrn3.html @@ -1786,4 +1786,4 @@ function findTotal4(){ - \ No newline at end of file + \ No newline at end of file From ea15575f91bc8da10e5d1313212784d3d78aa96f Mon Sep 17 00:00:00 2001 From: Hazirah Nabilah Date: Wed, 13 Sep 2017 15:11:39 +0800 Subject: [PATCH 2/8] chat done --- public/Forwarder/chat.html | 7 +- public/Importer/shippingorder.html | 2 +- public/Importer/testing.html | 712 +++++++++++++++++++++++++++++ 3 files changed, 714 insertions(+), 7 deletions(-) create mode 100644 public/Importer/testing.html diff --git a/public/Forwarder/chat.html b/public/Forwarder/chat.html index ddd73f2..51d85b4 100644 --- a/public/Forwarder/chat.html +++ b/public/Forwarder/chat.html @@ -1004,12 +1004,7 @@ -
-
Required Answer
-
- Yes / No
- Accept / Decline
-
+
diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html index 9a808d4..6763751 100644 --- a/public/Importer/shippingorder.html +++ b/public/Importer/shippingorder.html @@ -706,7 +706,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { }) -
+ \ No newline at end of file diff --git a/public/Importer/testing.html b/public/Importer/testing.html new file mode 100644 index 0000000..6763751 --- /dev/null +++ b/public/Importer/testing.html @@ -0,0 +1,712 @@ + + + + + + + + + + + + IZYIM | Shipping Order + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + + + + + + ... +
+ +
+ +
+ +
+ + +
+ + +
+ +
+ + + +
+ + + + + + + + + +
+ +
+ + +
+ +
+ +
+
    +
  • + Home + +
    • +
  • + Dashboard +
    • +
+
+ + +

SHIPPING ORDER

+
+
+
+
+
+ Order Status
+
+
+ + + + + + +
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+

List Forwarder

+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ Back + Next +
+
+
+
+
+
+
+
+
+ + Details Goods +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Export HS CodeExport Stock DescBrandModel NoImport HS CodeQty of ItemQty of CartonQty of PalletMeasurement of CartonMeasurement of PalletWeight of CartonWeight of Pallet
Hello Hello
Hello Hello
Hello Hello
Hello Hello
+ + Add +
+
+
+
+
+ +
+
+
+ Back + Finish +
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + +
+ +
+ +
+
+ + + +
+ + + + + + +
+ + + + +
+
Copyright © 2017 IZYIM.COM +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 1d9b634e500660cbdf3873cbb5afabc6d9467629 Mon Sep 17 00:00:00 2001 From: Hazirah Nabilah Date: Wed, 13 Sep 2017 16:38:13 +0800 Subject: [PATCH 3/8] so5 --- public/Forwarder/chat.html | 2 +- public/Forwarder/contactlist.html | 2 +- public/Forwarder/deliveryarrange.html | 2 +- public/Forwarder/index.html | 2 +- public/Forwarder/notice.html | 2 +- public/Forwarder/profile.html | 2 +- public/Forwarder/purchaseorder.html | 2 +- public/Forwarder/shipmentarrange.html | 2 +- public/Forwarder/shippingorderstatus.html | 627 ++++++++++++++++++++++ public/Forwarder/team.html | 2 +- public/Forwarder/trackorder.html | 2 +- public/Forwarder/updatecurrency.html | 2 +- public/Forwarder/warehousenote.html | 2 +- 13 files changed, 639 insertions(+), 12 deletions(-) create mode 100644 public/Forwarder/shippingorderstatus.html diff --git a/public/Forwarder/chat.html b/public/Forwarder/chat.html index 51d85b4..2d92290 100644 --- a/public/Forwarder/chat.html +++ b/public/Forwarder/chat.html @@ -238,7 +238,7 @@
  • - + Shipping Order diff --git a/public/Forwarder/contactlist.html b/public/Forwarder/contactlist.html index 5867808..331f81c 100644 --- a/public/Forwarder/contactlist.html +++ b/public/Forwarder/contactlist.html @@ -285,7 +285,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/deliveryarrange.html b/public/Forwarder/deliveryarrange.html index 86468c2..b6a34cc 100644 --- a/public/Forwarder/deliveryarrange.html +++ b/public/Forwarder/deliveryarrange.html @@ -294,7 +294,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/index.html b/public/Forwarder/index.html index 850ae10..559a929 100644 --- a/public/Forwarder/index.html +++ b/public/Forwarder/index.html @@ -229,7 +229,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/notice.html b/public/Forwarder/notice.html index 3cf84d5..e8b3f5c 100644 --- a/public/Forwarder/notice.html +++ b/public/Forwarder/notice.html @@ -212,7 +212,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/profile.html b/public/Forwarder/profile.html index bfa16c0..10d0ea3 100644 --- a/public/Forwarder/profile.html +++ b/public/Forwarder/profile.html @@ -213,7 +213,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/purchaseorder.html b/public/Forwarder/purchaseorder.html index 485dac5..c85c11e 100644 --- a/public/Forwarder/purchaseorder.html +++ b/public/Forwarder/purchaseorder.html @@ -229,7 +229,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/shipmentarrange.html b/public/Forwarder/shipmentarrange.html index ad3032c..267531b 100644 --- a/public/Forwarder/shipmentarrange.html +++ b/public/Forwarder/shipmentarrange.html @@ -267,7 +267,7 @@
  • - + Shipping Order diff --git a/public/Forwarder/shippingorderstatus.html b/public/Forwarder/shippingorderstatus.html new file mode 100644 index 0000000..8f0422f --- /dev/null +++ b/public/Forwarder/shippingorderstatus.html @@ -0,0 +1,627 @@ + + + + + + + + + + + + IZYIM | Order Status + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + +
    + + + + + + + + + + ... +
    + +
    + +
    + +
    + + +
    + + +
    + +
    + + + +
    + + + + + + + + + + +
    + + +
    + +
    + +
    + +
    + + +

    +

    + + + +
    +
    + +
    +
    +
    + Shipping Order Status
    +
    + + Create New + +
    + + + + + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No Order No
    + +
      +
    •  Delivered
      • +
    •  Failed
      • +
    •  Cancel
      • +
    +     		Date
    + +
      +
    • +
      + +
      to
      + +
      +
    • +
    +     		Marking
    + +
      +
    •  Bob Supply Warehouse
      • +
    •  Tom Warehouse
      • +
    +     		Supplier
    + +
      +
    •  MYR
      • +
    •  RMB
      • +
    +     		Warehouse Name
    + +
      +
    •  (RMB)18,000
      • +
    •  (RMB)12,000
      • +
    •  (MYR)21,000
      • +
    •  (MYR)10,000
      • +
    +     		Total CBM
    + +
      +
    •  (RMB)18,000
      • +
    •  (RMB)12,000
      • +
    •  (MYR)21,000
      • +
    •  (MYR)10,000
      • +
    +     		Total Weight
    + +
      +
    •  (RMB)18,000
      • +
    •  (RMB)12,000
      • +
    •  (MYR)21,000
      • +
    •  (MYR)10,000
      • +
    +     		Total Carton
    + +
      +
    •  (RMB)18,000
      • +
    •  (RMB)12,000
      • +
    •  (MYR)21,000
      • +
    •  (MYR)10,000
      • +
    +     		Action
    + +
      +
    •  Actions
      • +
    +
    1
    		 001254 03-07-2017 CIEF/001254 Infinite co. Bob Supply Warehouse
    Venue:61250, Hong Kong    		 451cm 123kg 14
    +
    + +

    +
    2
    		 012546 02-07-2017 ABC/001254 Inspirit co. Bob Supply Warehouse
    Venue:61250, Hong Kong    		 321cm 123kg 17
    +
    + +

    +
    3
    		 015423 01-07-2017 CIEF/001254 Indynamic co. Bob Supply Warehouse
    Venue:61250, Hong Kong    		 321cm 123kg 11
    +
    + +

    +
    4
    		 011254 01-07-2017 CIEF/001254 Indinite co. Tom Warehouse
    Venue:61250, Dongguan    		 321cm 245kg 19
    +
    + +

    +
    + + +
    +
    +
    + +
    +
    + + +
    + +
    + + + + +
    + + +
    +
    Copyright © 2017 IZYIM.COM +
    + +
    +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/Forwarder/team.html b/public/Forwarder/team.html index 50c2bee..5d00560 100644 --- a/public/Forwarder/team.html +++ b/public/Forwarder/team.html @@ -223,7 +223,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/trackorder.html b/public/Forwarder/trackorder.html index 0452428..6afe947 100644 --- a/public/Forwarder/trackorder.html +++ b/public/Forwarder/trackorder.html @@ -211,7 +211,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/updatecurrency.html b/public/Forwarder/updatecurrency.html index af45430..505104a 100644 --- a/public/Forwarder/updatecurrency.html +++ b/public/Forwarder/updatecurrency.html @@ -212,7 +212,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - + Shipping Order diff --git a/public/Forwarder/warehousenote.html b/public/Forwarder/warehousenote.html index 1c56735..f4a9780 100644 --- a/public/Forwarder/warehousenote.html +++ b/public/Forwarder/warehousenote.html @@ -305,7 +305,7 @@
  • - + Shipping Order From 47516591105ac1d693246fbe0848709bd8262983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?GEGULA=EF=BF=BD?= Date: Thu, 14 Sep 2017 12:09:25 +0800 Subject: [PATCH 4/8] hjhhjt --- public/Importer/purchaseorder.html | 32 +++++------ public/Importer/purchaseorder2.html | 82 +++++++++++++++-------------- 2 files changed, 59 insertions(+), 55 deletions(-) diff --git a/public/Importer/purchaseorder.html b/public/Importer/purchaseorder.html index c99903b..1824b8a 100644 --- a/public/Importer/purchaseorder.html +++ b/public/Importer/purchaseorder.html @@ -331,14 +331,6 @@ License: You must have a valid license purchased only from themeforest(the above
  •  Failed
  •  Cancel
    • - - SO Status
    - -
      -
    •  Complete
      • -
    •  Incomplete
      • -
    Date
    +
      +
    •  Complete
      • +
    •  Incomplete
      • +
    Action
    @@ -407,11 +407,11 @@ License: You must have a valid license purchased only from themeforest(the above
    2
    45678 - Complete 02-07-2017 - Bob Supply Warehouse
    Venue:61250, Hong Kong + Homemade Market
    Venue:61250, Hong Kong (MYR)21,000 Amended + Complete
    @@ -421,11 +421,11 @@ License: You must have a valid license purchased only from themeforest(the above
    3
    90123 - Incomplete 01-07-2017 - Bob Supply Warehouse
    Venue:61250, Hong Kong + Talent Cloud Sdn Bhd
    Venue:61250, Hong Kong (MYR)18,000 Canceled + Incomplete
    @@ -435,11 +435,11 @@ License: You must have a valid license purchased only from themeforest(the above
    4
    99814 - Complete 01-07-2017 - Tom Warehouse
    Venue:61250, Dongguan + Serv Sdn Bhd
    Venue:61250, Dongguan (MYR)10,000 Canceled + Complete
    diff --git a/public/Importer/purchaseorder2.html b/public/Importer/purchaseorder2.html index 1dd5a10..a66e2db 100644 --- a/public/Importer/purchaseorder2.html +++ b/public/Importer/purchaseorder2.html @@ -242,7 +242,7 @@ 1 - Choose
    Forwarder     + Buyer &
    Forwarder
  • @@ -265,20 +265,17 @@
    • -

    List Forwarder

    +
    +
    + +      List Forwarder +
    +
    +
    -
    +
    +
    + +      Buyer Details +
    +
    +
    @@ -377,35 +381,17 @@
    - Details Seller + Seller Details
    - +
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    @@ -424,11 +410,20 @@
    +
    +
    +
    +
    + +
    +
    +
    +
    - +
    @@ -437,12 +432,26 @@
    - +
    +
    +
    +
    + +
    + +
    +
    +
    +
    -
      -
    •  Complete
      • -
    •  Incomplete
      • -
    - - Date
    + Date
      @@ -392,15 +387,15 @@ License: You must have a valid license purchased only from themeforest(the above
    - Seller
    -
    •  Bob Supply Warehouse
    •  Tom Warehouse
    - - Total
    + + Total
      @@ -418,83 +413,92 @@ License: You must have a valid license purchased only from themeforest(the above
    •  Amended
    - Action
    - -
      -
    •  Actions
      • -
    - + SO Status
    + +
      +
    •  Complete
      • +
    •  Incomplete
      • +
    + + Action
    + +
      +
    •  Actions
      • +
    + - + - +
    1
    12345 - Incomplete 03-07-2017 - Tom Warehouse
    Venue:61250, Dongguan + CIEF Worldwide Sdn Bhd
    Venue:61250, Dongguan (MYR)12,000 Amended -
    + Incomplete +
    - +

    - +
    2
    45678 - Complete 02-07-2017 - Bob Supply Warehouse
    Venue:61250, Hong Kong - (MYR)21,000 + Homemade Market
    Venue:61250, Hong Kong + (MYR)21,000 Amended + Complete
    - +

    3
    90123 - Incomplete 01-07-2017 - Bob Supply Warehouse
    Venue:61250, Hong Kong + Talent Cloud Sdn Bhd
    Venue:61250, Hong Kong (MYR)18,000 Canceled + Incomplete
    - +

    4
    99814 - Complete - 01-07-2017 - Tom Warehouse
    Venue:61250, Dongguan + 01-07-2017 + Serv Sdn Bhd
    Venue:61250, Dongguan (MYR)10,000 Canceled + Complete
    - +

    - +
    +
    From 16baa07a553d17a249032cde0f1682a96183c555 Mon Sep 17 00:00:00 2001 From: Hazirah Nabilah Date: Thu, 14 Sep 2017 14:54:42 +0800 Subject: [PATCH 8/8] so6 --- public/Importer/shippingorder.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html index 28a8605..128c01e 100644 --- a/public/Importer/shippingorder.html +++ b/public/Importer/shippingorder.html @@ -342,6 +342,29 @@ License: You must have a valid license purchased only from themeforest(the above