From 6f07afb8df95ac290085d57da3ea83f1b490c6bc Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Tue, 3 Apr 2018 14:22:28 +0800 Subject: [PATCH 1/5] spelling error --- arrangements-delivery_arrangements2.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arrangements-delivery_arrangements2.html b/arrangements-delivery_arrangements2.html index f018929..1c380be 100644 --- a/arrangements-delivery_arrangements2.html +++ b/arrangements-delivery_arrangements2.html @@ -110,7 +110,7 @@ 12/03/2018 Inhouse Services KED1726 - Appoinment Cancel + Appointment Cancel From 2d56496f7dbece2654a8a8ec1dcb2cec9029a928 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Wed, 4 Apr 2018 09:52:47 +0800 Subject: [PATCH 2/5] add list item --- arrangements-warehouse_receive_note1.1.2.html | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/arrangements-warehouse_receive_note1.1.2.html b/arrangements-warehouse_receive_note1.1.2.html index ce26926..7c142a8 100644 --- a/arrangements-warehouse_receive_note1.1.2.html +++ b/arrangements-warehouse_receive_note1.1.2.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • @@ -175,21 +172,46 @@ Decision Request Details
    -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - +
    + + + + + + + + + + +
    +
    +
    +
    + +   + +
    +
    +
    +
    +
    +
    + +   + +
    +
    +
    +
    +
    +
    + +   + +
    +
    +
    +
    From 1c6fd4d8bb704eea49003019d86547ba498904f0 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Wed, 4 Apr 2018 10:11:45 +0800 Subject: [PATCH 3/5] change custom examination to grey --- arrangements-shipment_arrangements1.1.html | 2 +- arrangements-warehouse_receive_note1.4.html | 1 + arrangements-warehouse_receive_note11.2.html | 1 + ...ements-warehouse_receive_note_review1.html | 2 +- ...ents-warehouse_receive_note_review3.1.html | 57 +++++--- ...ements-warehouse_receive_note_review3.html | 131 ------------------ css/global.style.css | 8 ++ 7 files changed, 53 insertions(+), 149 deletions(-) delete mode 100644 arrangements-warehouse_receive_note_review3.html diff --git a/arrangements-shipment_arrangements1.1.html b/arrangements-shipment_arrangements1.1.html index b898336..cf2a9a5 100644 --- a/arrangements-shipment_arrangements1.1.html +++ b/arrangements-shipment_arrangements1.1.html @@ -334,7 +334,7 @@
    - Custom Examination + Custom Examination Submit
    diff --git a/arrangements-warehouse_receive_note1.4.html b/arrangements-warehouse_receive_note1.4.html index 1dfa28b..ef92a59 100644 --- a/arrangements-warehouse_receive_note1.4.html +++ b/arrangements-warehouse_receive_note1.4.html @@ -111,6 +111,7 @@
    +
    diff --git a/arrangements-warehouse_receive_note11.2.html b/arrangements-warehouse_receive_note11.2.html index e5b36c2..3dce55b 100644 --- a/arrangements-warehouse_receive_note11.2.html +++ b/arrangements-warehouse_receive_note11.2.html @@ -117,6 +117,7 @@
    +
    diff --git a/arrangements-warehouse_receive_note_review1.html b/arrangements-warehouse_receive_note_review1.html index b6a18bf..0e1113d 100644 --- a/arrangements-warehouse_receive_note_review1.html +++ b/arrangements-warehouse_receive_note_review1.html @@ -104,7 +104,7 @@
    Edit - Details + List Item
    diff --git a/arrangements-warehouse_receive_note_review3.1.html b/arrangements-warehouse_receive_note_review3.1.html index a578be5..71b8f44 100644 --- a/arrangements-warehouse_receive_note_review3.1.html +++ b/arrangements-warehouse_receive_note_review3.1.html @@ -171,28 +171,53 @@ Decision Request Details
    -
    -
    -
    - -
    - -
    - -
    -
    - -
    - -
    - +
    + + + + + + + + + + +
    +
    +
    +
    + +   + +
    +
    +
    +
    +
    +
    + +   + +
    +
    +
    +
    +
    +
    + +   + +
    +
    +
    +
    -
    +
    diff --git a/arrangements-warehouse_receive_note_review3.html b/arrangements-warehouse_receive_note_review3.html deleted file mode 100644 index 4663154..0000000 --- a/arrangements-warehouse_receive_note_review3.html +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - AzureUI - WAREHOUSE RECEIVE NOTE - - - - - - - -
    - - -
    - -
    -
    - -
    - -

    Warehouse Receive Note

    -
    - - - -
    -
    - - -
    -
    -
    -
    - List of Items -
    - -
    -
    - - - - Item 1 - -
    -
    - - - - Item 2 - -
    -
    - - - - Item 3 - -
    - -
    - -
    - Edit -
    -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/css/global.style.css b/css/global.style.css index e234280..15d76a6 100644 --- a/css/global.style.css +++ b/css/global.style.css @@ -976,6 +976,14 @@ select.form-element{ box-shadow: none; } +.button.grey{ + background-color: #ced3d0; + color: #FFF; + border-color:transparent; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} .sweet-check{ height: 30px; width: 60px; From 6c05bbf06c736230584249b67cfc37d5f372f09a Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Wed, 4 Apr 2018 10:19:08 +0800 Subject: [PATCH 4/5] cadd delivery done (blue), delivery failed (red), cancel (red), sent (green) --- arrangements-delivery_arrangements2.html | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/arrangements-delivery_arrangements2.html b/arrangements-delivery_arrangements2.html index 1c380be..fe649d9 100644 --- a/arrangements-delivery_arrangements2.html +++ b/arrangements-delivery_arrangements2.html @@ -102,17 +102,33 @@ 12/03/2018 Inhouse Services KED1726 - Appointment Sent + Delivery Done
    12/03/2018 - Inhouse Services + Courier Services KED1726 - Appointment Cancel + Delivery Failed
    +
    + + 12/03/2018 + Outsource Services + KED1726 + Delivery Cancel + +
    +
    + + 12/03/2018 + Inhouse Services + KED1726 + Delivery Sent + +
    From 23df9291e3d1de8d2840be961cb7e129f0e9436d Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Wed, 4 Apr 2018 10:28:17 +0800 Subject: [PATCH 5/5] remove custom again --- arrangements-delivery_arrangements1.2.html | 3 --- arrangements-delivery_arrangements1.html | 3 --- arrangements-delivery_arrangements2.html | 3 --- arrangements-shipment_arrangements1.html | 3 --- arrangements-shipment_arrangements2.html | 5 +---- arrangements-warehouse_receive_note1.1.html | 5 +---- arrangements-warehouse_receive_note1.3.html | 5 +---- arrangements-warehouse_receive_note1.html | 3 --- arrangements-warehouse_receive_note2.html | 3 --- create-shipping-order-S1.html | 3 --- create-shipping-order-S2.html | 3 --- element-MTracker.html | 3 --- element-wizard.html | 3 --- example-element.html | 3 --- home.html | 3 --- meter-order-details.html | 5 +---- meter-progress-trackers.html | 5 +---- shipping-order.html | 5 +---- 18 files changed, 6 insertions(+), 60 deletions(-) diff --git a/arrangements-delivery_arrangements1.2.html b/arrangements-delivery_arrangements1.2.html index f24ba27..260609e 100644 --- a/arrangements-delivery_arrangements1.2.html +++ b/arrangements-delivery_arrangements1.2.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/arrangements-delivery_arrangements1.html b/arrangements-delivery_arrangements1.html index 69cbf76..f29f88b 100644 --- a/arrangements-delivery_arrangements1.html +++ b/arrangements-delivery_arrangements1.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/arrangements-delivery_arrangements2.html b/arrangements-delivery_arrangements2.html index fe649d9..1413d7a 100644 --- a/arrangements-delivery_arrangements2.html +++ b/arrangements-delivery_arrangements2.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/arrangements-shipment_arrangements1.html b/arrangements-shipment_arrangements1.html index 0f483e9..aab67ab 100644 --- a/arrangements-shipment_arrangements1.html +++ b/arrangements-shipment_arrangements1.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/arrangements-shipment_arrangements2.html b/arrangements-shipment_arrangements2.html index 50a0557..0734942 100644 --- a/arrangements-shipment_arrangements2.html +++ b/arrangements-shipment_arrangements2.html @@ -41,10 +41,7 @@ - -
  • - Custom Declaration -
    • +
  • Messenger
    • diff --git a/arrangements-warehouse_receive_note1.1.html b/arrangements-warehouse_receive_note1.1.html index f895fb3..dd55ddb 100644 --- a/arrangements-warehouse_receive_note1.1.html +++ b/arrangements-warehouse_receive_note1.1.html @@ -41,10 +41,7 @@ - -
  • - Custom Declaration -
    • +
  • Messenger
    • diff --git a/arrangements-warehouse_receive_note1.3.html b/arrangements-warehouse_receive_note1.3.html index 2a3bddb..ff5e2c3 100644 --- a/arrangements-warehouse_receive_note1.3.html +++ b/arrangements-warehouse_receive_note1.3.html @@ -41,10 +41,7 @@ - -
  • - Custom Declaration -
    • +
  • Messenger
    • diff --git a/arrangements-warehouse_receive_note1.html b/arrangements-warehouse_receive_note1.html index 83edef9..77f60ac 100644 --- a/arrangements-warehouse_receive_note1.html +++ b/arrangements-warehouse_receive_note1.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/arrangements-warehouse_receive_note2.html b/arrangements-warehouse_receive_note2.html index 0dc8bed..7f9daab 100644 --- a/arrangements-warehouse_receive_note2.html +++ b/arrangements-warehouse_receive_note2.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/create-shipping-order-S1.html b/create-shipping-order-S1.html index 52f6119..4fd978c 100644 --- a/create-shipping-order-S1.html +++ b/create-shipping-order-S1.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/create-shipping-order-S2.html b/create-shipping-order-S2.html index 05b586c..b0e77df 100644 --- a/create-shipping-order-S2.html +++ b/create-shipping-order-S2.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/element-MTracker.html b/element-MTracker.html index 11235ce..10369c5 100644 --- a/element-MTracker.html +++ b/element-MTracker.html @@ -42,9 +42,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/element-wizard.html b/element-wizard.html index 9801a38..e26f7dc 100644 --- a/element-wizard.html +++ b/element-wizard.html @@ -44,9 +44,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/example-element.html b/example-element.html index 8862855..fa3f0ab 100644 --- a/example-element.html +++ b/example-element.html @@ -41,9 +41,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/home.html b/home.html index 0a0d4f7..d6a0ecf 100644 --- a/home.html +++ b/home.html @@ -339,9 +339,6 @@
  • Shipping Order
    • -
  • - Custom Declaration -
  • Messenger
    • diff --git a/meter-order-details.html b/meter-order-details.html index 893bbdc..f74489c 100644 --- a/meter-order-details.html +++ b/meter-order-details.html @@ -41,10 +41,7 @@ - -
  • - Custom Declaration -
    • +
  • Messenger
    • diff --git a/meter-progress-trackers.html b/meter-progress-trackers.html index bf91649..4e4aeb0 100644 --- a/meter-progress-trackers.html +++ b/meter-progress-trackers.html @@ -41,10 +41,7 @@ - -
  • - Custom Declaration -
    • +
  • Messenger
    • diff --git a/shipping-order.html b/shipping-order.html index b0a6663..7b4aefa 100644 --- a/shipping-order.html +++ b/shipping-order.html @@ -42,10 +42,7 @@ - -
  • - Custom Declaration -
    • +
  • Messenger