From 5153526403c81077b0702bed0d946c59e1f02b8b Mon Sep 17 00:00:00 2001 From: Nur Nadiah Nabilah Binti Hashinordin Date: Thu, 21 Sep 2017 16:20:45 +0800 Subject: [PATCH 1/3] latest all --- public/Forwarder/contactlist.html | 41 +----- public/Forwarder/custom.html | 11 +- public/Forwarder/profile2.html | 1 + public/Importer/chat.html | 3 +- public/Importer/contactlist.html | 162 +++++++---------------- public/Importer/index.html | 3 +- public/Importer/notice.html | 3 +- public/Importer/opendraft.html | 3 +- public/Importer/orderdetails.html | 3 +- public/Importer/payment.html | 3 +- public/Importer/profile.html | 3 +- public/Importer/profile2.html | 12 +- public/Importer/purchaseorder.html | 3 +- public/Importer/purchaseorder2.html | 3 +- public/Importer/shippingorder.html | 3 +- public/Importer/shippingorderstatus.html | 3 +- public/Importer/team.html | 3 +- public/Importer/team2.html | 3 +- 18 files changed, 92 insertions(+), 174 deletions(-) diff --git a/public/Forwarder/contactlist.html b/public/Forwarder/contactlist.html index 5f2a10a..fe90c75 100644 --- a/public/Forwarder/contactlist.html +++ b/public/Forwarder/contactlist.html @@ -389,44 +389,7 @@ License: You must have a valid license purchased only from themeforest(the above
-
-
- - - - - - -
-
-
+
@@ -445,7 +408,7 @@ License: You must have a valid license purchased only from themeforest(the above diff --git a/public/Forwarder/custom.html b/public/Forwarder/custom.html index 11e2bd8..d6fb313 100644 --- a/public/Forwarder/custom.html +++ b/public/Forwarder/custom.html @@ -476,10 +476,9 @@
- -
- + @@ -982,10 +981,14 @@ + + + + diff --git a/public/Forwarder/profile2.html b/public/Forwarder/profile2.html index 73571cd..b8d865b 100644 --- a/public/Forwarder/profile2.html +++ b/public/Forwarder/profile2.html @@ -309,6 +309,7 @@ License: You must have a valid license purchased only from themeforest(the above
Forwarder
diff --git a/public/Importer/chat.html b/public/Importer/chat.html index 98765a2..fccb8cf 100644 --- a/public/Importer/chat.html +++ b/public/Importer/chat.html @@ -120,6 +120,7 @@
+ ...
    @@ -142,7 +143,7 @@
- ... +
diff --git a/public/Importer/contactlist.html b/public/Importer/contactlist.html index f149bcb..bebc688 100644 --- a/public/Importer/contactlist.html +++ b/public/Importer/contactlist.html @@ -159,8 +159,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
+ ...
- +
...
@@ -391,100 +355,100 @@ License: You must have a valid license purchased only from themeforest(the above @@ -492,43 +456,7 @@ License: You must have a valid license purchased only from themeforest(the above
-
-
- - - - - - -
-
+
@@ -549,73 +477,73 @@ License: You must have a valid license purchased only from themeforest(the above
diff --git a/public/Importer/index.html b/public/Importer/index.html index d2231d5..13cb0d4 100644 --- a/public/Importer/index.html +++ b/public/Importer/index.html @@ -113,8 +113,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
+ ...
    diff --git a/public/Importer/notice.html b/public/Importer/notice.html index 18931bf..9613909 100644 --- a/public/Importer/notice.html +++ b/public/Importer/notice.html @@ -95,8 +95,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
    + ...
      diff --git a/public/Importer/opendraft.html b/public/Importer/opendraft.html index 85404f3..d5b0323 100644 --- a/public/Importer/opendraft.html +++ b/public/Importer/opendraft.html @@ -80,8 +80,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
      + ...
        diff --git a/public/Importer/orderdetails.html b/public/Importer/orderdetails.html index 5c6e9e8..833a0b4 100644 --- a/public/Importer/orderdetails.html +++ b/public/Importer/orderdetails.html @@ -96,8 +96,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
        + ...
          diff --git a/public/Importer/payment.html b/public/Importer/payment.html index 84be50f..dcb8f54 100644 --- a/public/Importer/payment.html +++ b/public/Importer/payment.html @@ -81,8 +81,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
          + ...
            diff --git a/public/Importer/profile.html b/public/Importer/profile.html index e0958ca..d7032cc 100644 --- a/public/Importer/profile.html +++ b/public/Importer/profile.html @@ -96,8 +96,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
            + ...
              diff --git a/public/Importer/profile2.html b/public/Importer/profile2.html index 2c15855..42b40b4 100644 --- a/public/Importer/profile2.html +++ b/public/Importer/profile2.html @@ -94,8 +94,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
              + ...
                @@ -265,6 +266,7 @@ License: You must have a valid license purchased only from themeforest(the above
                Forwarder
              @@ -1025,6 +1027,14 @@ License: You must have a valid license purchased only from themeforest(the above }else{ $(this).text("Add as Friend"); } + }); + $( ".btn-share" ).click(function() { + var msg = $(this).text(); + if(msg == "Share"){ + $(this).text("Shared"); + }else{ + $(this).text("Share"); + } }); function myFunction() { var x = document.getElementById('myDIV'); diff --git a/public/Importer/purchaseorder.html b/public/Importer/purchaseorder.html index d641da9..5d1c7e4 100644 --- a/public/Importer/purchaseorder.html +++ b/public/Importer/purchaseorder.html @@ -113,8 +113,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
              + ...
                diff --git a/public/Importer/purchaseorder2.html b/public/Importer/purchaseorder2.html index e9fc3c2..f46f530 100644 --- a/public/Importer/purchaseorder2.html +++ b/public/Importer/purchaseorder2.html @@ -65,8 +65,9 @@ - ... +
                + ...
                  diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html index 42e8edf..1e2264e 100644 --- a/public/Importer/shippingorder.html +++ b/public/Importer/shippingorder.html @@ -109,8 +109,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
                  + ...
                    diff --git a/public/Importer/shippingorderstatus.html b/public/Importer/shippingorderstatus.html index c537161..765e043 100644 --- a/public/Importer/shippingorderstatus.html +++ b/public/Importer/shippingorderstatus.html @@ -116,8 +116,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
                    + ...
                      diff --git a/public/Importer/team.html b/public/Importer/team.html index 5f47d1c..fb48fa8 100644 --- a/public/Importer/team.html +++ b/public/Importer/team.html @@ -103,8 +103,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
                      + ...
                        diff --git a/public/Importer/team2.html b/public/Importer/team2.html index 53c99c7..0e84f9e 100644 --- a/public/Importer/team2.html +++ b/public/Importer/team2.html @@ -97,8 +97,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
                        + ...
                          From aec2a44cdd1a50e47959810cd9cb97a09212661f Mon Sep 17 00:00:00 2001 From: Hazirah Nabilah Date: Thu, 21 Sep 2017 16:27:40 +0800 Subject: [PATCH 2/3] log out button deleted --- public/Importer/shippingorder.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/public/Importer/shippingorder.html b/public/Importer/shippingorder.html index 556fdff..6de2284 100644 --- a/public/Importer/shippingorder.html +++ b/public/Importer/shippingorder.html @@ -136,11 +136,7 @@ License: You must have a valid license purchased only from themeforest(the above -
                        • - - - -
                          • +
                        From 9ffd25c05b779fdad3a610b6bff53a8db97bf185 Mon Sep 17 00:00:00 2001 From: Hazirah Nabilah Date: Thu, 21 Sep 2017 17:02:17 +0800 Subject: [PATCH 3/3] chat update21/9 --- public/Forwarder/chat.html | 5 +- public/Forwarder/decisionmaking.html | 1920 --------------------- public/Forwarder/shippingorderstatus.html | 390 +++-- public/Importer/chat.html | 16 +- 4 files changed, 271 insertions(+), 2060 deletions(-) delete mode 100644 public/Forwarder/decisionmaking.html diff --git a/public/Forwarder/chat.html b/public/Forwarder/chat.html index 9c544ec..f9b3edc 100644 --- a/public/Forwarder/chat.html +++ b/public/Forwarder/chat.html @@ -1010,12 +1010,11 @@
                      - -
                      +
                      +
                      -
              diff --git a/public/Forwarder/decisionmaking.html b/public/Forwarder/decisionmaking.html deleted file mode 100644 index 93c21c1..0000000 --- a/public/Forwarder/decisionmaking.html +++ /dev/null @@ -1,1920 +0,0 @@ - - - - - - - - - - - - IZYIM | Decision Making - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
              - - - - - - -

              Decision Making -

              - - - -
              -
              -
              -
              -
              - - - -
              - - - -
              -
              -
              -
              -
              -
              - - - -
- +
...
 		- Linda Wong + Linda Wong - 0123456789 + 0123456789
- +
...
 - Edris Karim + Edris Karim - 0123456789 + 0123456789
- +
...
 		- Azrin Hamidi + Azrin Hamidi - 0123456789 + 0123456789
- +
...
 		- Kuhanraj Balan + Kuhanraj Balan - 0123456789 + 0123456789
- +
...
 		- Dia Audia + Dia Audia - 0123456789 + 0123456789
- +
...
 		- Belly Goh + Belly Goh - 0123456789 + 0123456789
- +
...
 		- Zamani Hashim + Zamani Hashim - 0123456789 + 0123456789
- -
...
+ +
...
 		- Alpha Shipping Co + Alpha Shipping Co - Linda Wong + Linda Wong
- -
...
+ +
...
 		- Maersk Sdn Bhd + Maersk Sdn Bhd - Edris Karim + Edris Karim
- -
...
+ +
...
 		- Msco Sdn Bhd + Msco Sdn Bhd - Azrin Hamidi + Azrin Hamidi
- -
...
+ +
...
 		- Cosco Sdn Bhd + Cosco Sdn Bhd - Kuhanraj Balan + Kuhanraj Balan
- -
...
+ +
...
 		- Deep Sea Shipping Logistic Sdn Bhd + Deep Sea Shipping Logistic Sdn Bhd - Dia Audia + Dia Audia
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NoTotal Ctn (nominal)Measurement (nominal)Weight (nominal)Total Ctn (actual)Measurement (actual)Weight (actual)Photo Reference
1440x40x4010kg 4 40 x 40 x 40 9.8kg -
- - -
-
2440x40x4010kg 4 40 x 40 x 40 9.8kg -
- - -
-
3440x40x4010kg 4 40 x 40 x 40 9.8kg -
- -
-
-
- - -
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- -
-
-
-

Staff

-
    -
  • -
    - 8 -
    - ... -
    -

    Bob Nilson

    -
    Project Manager
    -
    -
    • -
  • - ... -
    -

    Nick Larson

    -
    Art Director
    -
    -
    • -
  • -
    - 3 -
    - ... -
    -

    Deon Hubert

    -
    CTO
    -
    -
    • -
  • - ... -
    -

    Ella Wong

    -
    CEO
    -
    -
    • -
-

Customers

-
    -
  • -
    - 2 -
    - ... -
    -

    Lara Kunis

    -
    CEO, Loop Inc
    -
    Last seen 03:10 AM
    -
    -
    • -
  • -
    - new -
    - ... -
    -

    Ernie Kyllonen

    -
    Project Manager, -
    SmartBizz PTL
    -
    -
    • -
  • - ... -
    -

    Lisa Stone

    -
    CTO, Keort Inc
    -
    Last seen 13:10 PM
    -
    -
    • -
  • -
    - 7 -
    - ... -
    -

    Deon Portalatin

    -
    CFO, H&D LTD
    -
    -
    • -
  • - ... -
    -

    Irina Savikova

    -
    CEO, Tizda Motors Inc
    -
    -
    • -
  • -
    - 4 -
    - ... -
    -

    Maria Gomez

    -
    Manager, Infomatic Inc
    -
    Last seen 03:10 AM
    -
    -
    • -
-
-
-
-
- - Back -
-
-
- -
- - Bob Nilson - 20:15 - When could you send me the report ? -
-
-
- -
- - Ella Wong - 20:15 - Its almost done. I will be sending it shortly -
-
-
- -
- - Bob Nilson - 20:15 - Alright. Thanks! :) -
-
-
- -
- - Ella Wong - 20:16 - You are most welcome. Sorry for the delay. -
-
-
- -
- - Bob Nilson - 20:17 - No probs. Just take your time :) -
-
-
- -
- - Ella Wong - 20:40 - Alright. I just emailed it to you. -
-
-
- -
- - Bob Nilson - 20:17 - Great! Thanks. Will check it right away. -
-
-
- -
- - Ella Wong - 20:40 - Please let me know if you have any comment. -
-
-
- -
- - Bob Nilson - 20:17 - Sure. I will check and buzz you if anything needs to be corrected. -
-
-
-
-
- -
- -
-
-
-
-
-
-
-
-

General

- -

System

- -
-
-
-
-

General Settings

-
    -
  • Enable Notifications -
    • -
  • Allow Tracking -
    • -
  • Log Errors -
    • -
  • Auto Sumbit Issues -
    • -
  • Enable SMS Alerts -
    • -
-

System Settings

-
    -
  • Security Level - -
    • -
  • Failed Email Attempts -
    • -
  • Secondary SMTP Port -
    • -
  • Notify On System Error -
    • -
  • Notify On SMTP Error -
    • -
-
- -
-
-
-
-
-
- - - - - - - -
-
- -
-
-
-

Staff

-
    -
  • -
    - 8 -
    - ... -
    -

    Bob Nilson

    -
    Project Manager
    -
    -
    • -
  • - ... -
    -

    Nick Larson

    -
    Art Director
    -
    -
    • -
  • -
    - 3 -
    - ... -
    -

    Deon Hubert

    -
    CTO
    -
    -
    • -
  • - ... -
    -

    Ella Wong

    -
    CEO
    -
    -
    • -
-

Customers

-
    -
  • -
    - 2 -
    - ... -
    -

    Lara Kunis

    -
    CEO, Loop Inc
    -
    Last seen 03:10 AM
    -
    -
    • -
  • -
    - new -
    - ... -
    -

    Ernie Kyllonen

    -
    Project Manager, -
    SmartBizz PTL
    -
    -
    • -
  • - ... -
    -

    Lisa Stone

    -
    CTO, Keort Inc
    -
    Last seen 13:10 PM
    -
    -
    • -
  • -
    - 7 -
    - ... -
    -

    Deon Portalatin

    -
    CFO, H&D LTD
    -
    -
    • -
  • - ... -
    -

    Irina Savikova

    -
    CEO, Tizda Motors Inc
    -
    -
    • -
  • -
    - 4 -
    - ... -
    -

    Maria Gomez

    -
    Manager, Infomatic Inc
    -
    Last seen 03:10 AM
    -
    -
    • -
-
-
-
-
- - Back -
-
-
- -
- - Bob Nilson - 20:15 - When could you send me the report ? -
-
-
- -
- - Ella Wong - 20:15 - Its almost done. I will be sending it shortly -
-
-
- -
- - Bob Nilson - 20:15 - Alright. Thanks! :) -
-
-
- -
- - Ella Wong - 20:16 - You are most welcome. Sorry for the delay. -
-
-
- -
- - Bob Nilson - 20:17 - No probs. Just take your time :) -
-
-
- -
- - Ella Wong - 20:40 - Alright. I just emailed it to you. -
-
-
- -
- - Bob Nilson - 20:17 - Great! Thanks. Will check it right away. -
-
-
- -
- - Ella Wong - 20:40 - Please let me know if you have any comment. -
-
-
- -
- - Bob Nilson - 20:17 - Sure. I will check and buzz you if anything needs to be corrected. -
-
-
-
-
- -
- -
-
-
-
-
-
-
-
-

General

- -

System

- -
-
-
-
-

General Settings

-
    -
  • Enable Notifications -
    • -
  • Allow Tracking -
    • -
  • Log Errors -
    • -
  • Auto Sumbit Issues -
    • -
  • Enable SMS Alerts -
    • -
-

System Settings

-
    -
  • Security Level - -
    • -
  • Failed Email Attempts -
    • -
  • Secondary SMTP Port -
    • -
  • Notify On System Error -
    • -
  • Notify On SMTP Error -
    • -
-
- -
-
-
-
-
-
- - - - -
-
Copyright © 2017 IZYIM.COM -
- -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/public/Forwarder/shippingorderstatus.html b/public/Forwarder/shippingorderstatus.html index c87061a..a6a5705 100644 --- a/public/Forwarder/shippingorderstatus.html +++ b/public/Forwarder/shippingorderstatus.html @@ -60,13 +60,16 @@ License: You must have a valid license purchased only from themeforest(the above margin-right: -100%; } } + .dropdown-menu{ + min-width: 100px; + } .table td, .table th { - font-size: 10px; + font-size: 12px; text-align:center; vertical-align: middle; } .table thead tr th{ - font-size: 10px; + font-size: 12px; text-align:center; vertical-align: middle; } @@ -113,8 +116,9 @@ License: You must have a valid license purchased only from themeforest(the above - ... +
+ ... - -
  • - - - Track Order - - -
    • -
  • - - - Custom Declaration - - -
    • -
  • - - - Messenger - - -
  • Open Draft
    • + +
  • @@ -296,7 +263,7 @@ License: You must have a valid license purchased only from themeforest(the above
  • - Shipping Order + Purchase Order
    • @@ -315,9 +282,7 @@ License: You must have a valid license purchased only from themeforest(the above
    Shipping Order Status
    - - Create New - +
    @@ -356,100 +321,51 @@ License: You must have a valid license purchased only from themeforest(the above
    - +
    - - - - + @@ -461,13 +377,14 @@ License: You must have a valid license purchased only from themeforest(the above - + @@ -479,12 +396,14 @@ License: You must have a valid license purchased only from themeforest(the above - + @@ -496,12 +415,14 @@ License: You must have a valid license purchased only from themeforest(the above - + @@ -513,7 +434,9 @@ License: You must have a valid license purchased only from themeforest(the above @@ -554,20 +477,221 @@ License: You must have a valid license purchased only from themeforest(the above
    -
    - - -
    -

    Add New Item

    -
    -
    -

    asdjhdiufhweui

    +
    +
    +
    + Packing List
    +
    +
    + + + + + + +
    +
    +
    +
    +
    +
    No Order No
    +     		Order No
    -
      -
    •  Delivered
      • -
    •  Failed
      • -
    •  Cancel
      • -
    		Date
    -
      -
    • -
      - -
      to
      - -
      -
    • -
    +     		Marking
    +     		Marking
    -
      -
    •  Bob Supply Warehouse
      • -
    •  Tom Warehouse
      • -
    +     		Supplier
    -
      -
    •  MYR
      • -
    •  RMB
      • -
    		Warehouse Name
    +     		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 14
    - +

    2
    		 012546 02-07-2017 17
    -

    3
    		 015423 01-07-2017 11
    -

    4
    		 011254 01-07-2017 19
    -

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    No Product NameModelUOMQtyCMBWeightPhotoRemark
    HeightWeightDepthCrossNett
    1 Television CS110 Unit 10 12 15121215
    2 Tire CS251 Unit 20 12 15121215
    3 Chair CS486 Unit 5 12 15121215
    4 Table CS125 Unit 5 12 15121215
    +
    +
    +
    + - + +