From f954e34d87892ec6990e7b9357b4a888d9c1dab2 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Mon, 19 Jul 2021 22:21:57 +0700 Subject: Initial commit page/member/account --- pages/member/account.html | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pages/member/account.html (limited to 'pages/member') diff --git a/pages/member/account.html b/pages/member/account.html new file mode 100644 index 0000000..a8e60f1 --- /dev/null +++ b/pages/member/account.html @@ -0,0 +1,62 @@ +@_TOP_@ + +
+ +
+

[L]Account[/L]

+ [if session logged_in] + [edisplay show_label=1 show_var=0 keep=1] +
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Order #DateTotalStatusAction
#1234522/6/2017Rp150.000,00Being preparedView
# 17347/5/2017Rp150.000,00Action neededView
# 173030/9/2016Rp150.000,00ReceivedView
# 170522/6/2016Rp150.000,00CancelledView
+
+
+
+ +
+ +__BOTTOM__ \ No newline at end of file -- cgit v1.2.3 From da8021e054e3aac1e1df540838275fb8ac2f7f48 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Mon, 19 Jul 2021 22:28:20 +0700 Subject: add block-header & use proper badge bg --- pages/member/account.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pages/member') diff --git a/pages/member/account.html b/pages/member/account.html index a8e60f1..9f5fe43 100644 --- a/pages/member/account.html +++ b/pages/member/account.html @@ -10,6 +10,9 @@
+
+

Orders

+
@@ -27,28 +30,28 @@ - + - + - + - + -- cgit v1.2.3 From c30ec71812ffa31b8d7d995f2b9bab5c23d15312 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Mon, 19 Jul 2021 22:34:43 +0700 Subject: initial commit on service.html (orders as first component) --- pages/member/service.html | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 pages/member/service.html (limited to 'pages/member') diff --git a/pages/member/service.html b/pages/member/service.html new file mode 100644 index 0000000..3bd72d1 --- /dev/null +++ b/pages/member/service.html @@ -0,0 +1,65 @@ +@_TOP_@ + +
+ +
+

[L]Your Account[/L]

+ [if session logged_in] + [edisplay show_label=1 show_var=0 keep=1] +
+ + +
+
+

Orders

+
+
+
+
#12345 22/6/2017 Rp150.000,00Being preparedBeing prepared View
# 1734 7/5/2017 Rp150.000,00Action neededAction needed View
# 1730 30/9/2016 Rp150.000,00ReceivedReceived View
# 1705 22/6/2016 Rp150.000,00CancelledCancelled View
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Order #DateTotalStatusAction
#1234522/6/2017Rp150.000,00Being preparedView
# 17347/5/2017Rp150.000,00Action neededView
# 173030/9/2016Rp150.000,00ReceivedView
# 170522/6/2016Rp150.000,00CancelledView
+
+
+
+ + + +__BOTTOM__ \ No newline at end of file -- cgit v1.2.3 From ae3099af2119452f0351da6e3202ddb2acd04790 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 14:32:37 +0700 Subject: initial commit order-detail.html --- pages/member/order-detail.html | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 pages/member/order-detail.html (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html new file mode 100644 index 0000000..efec55c --- /dev/null +++ b/pages/member/order-detail.html @@ -0,0 +1,68 @@ +@_TOP_@ + +
+ +
+

[L]Order #1234[/L]

+ [if session logged_in] +

[L]Please verify the information below and click the 'Place Order' button to process your order.[/L]

[else] + [include include/checkout/login_form][/else][/if][if !variable NO_TAX_POPUP] + [include include/checkout/tax_popup][/if] + [edisplay show_label=1 show_var=0 keep=1] +
+ + + +
+
+
+
+ + +
Order No:
+ + +

+ 673290789 +

+ +
+
+ + +
Shipped date:
+ + +

+ +

+
+
+ + +
Status:
+ + +

+ In Transit +

+
+
+ + +
Order Amount:
+ + +

+ $259.00 +

+
+
+
+
+ +
+ +__BOTTOM__ \ No newline at end of file -- cgit v1.2.3 From f5b68454fbbf5cbe5889a7591641d417b2c450b1 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 14:34:01 +0700 Subject: remove unused text --- pages/member/order-detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index efec55c..e9e0a21 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -5,7 +5,7 @@

[L]Order #1234[/L]

[if session logged_in] -

[L]Please verify the information below and click the 'Place Order' button to process your order.[/L]

[else] + [else] [include include/checkout/login_form][/else][/if][if !variable NO_TAX_POPUP] [include include/checkout/tax_popup][/if] [edisplay show_label=1 show_var=0 keep=1] -- cgit v1.2.3 From b90e04daeaab208fb5f75814679581544dddc28c Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 14:41:07 +0700 Subject: use bg-dark text-light on order card --- pages/member/order-detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index e9e0a21..ec70778 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -14,7 +14,7 @@
-
+
-- cgit v1.2.3 From 1447185c61b94591755d8b67c0858ed42727c601 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 14:54:09 +0700 Subject: initial commit on tracking info --- pages/member/order-detail.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index ec70778..d539fe4 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -63,6 +63,21 @@
+ +
+
+
+
+ Order created + +

+ Kamis, 3 Jun 2021 11:07 WIB +

+
+
+
+
+
__BOTTOM__ \ No newline at end of file -- cgit v1.2.3 From f005e28f354cb97cdf0ce4cc6e3d0a5dc6c3c553 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 15:06:22 +0700 Subject: add tracking status --- pages/member/order-detail.html | 79 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index d539fe4..e823a84 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -67,13 +67,86 @@
+ +
- Order created - -

+ Order created +

+ Kamis, 3 Jun 2021 11:07 WIB +

+
+ +
+
Order created by buyer.
+

+ Order created and waiting for payment +

+
+ + + +
+ Order paid +

Kamis, 3 Jun 2021 11:07 WIB

+ +
+
Order paid by buyer.
+

+ Payment completed and order is being prepared by seller. +

+
+ + + +
+ Waiting to be shipped +

+ Kamis, 3 Jun 2021 11:07 WIB +

+
+ +
+
Request to pick up
+

+ Order is ready to be picked up by [courier name]. Order will be picked up before Sabtu, 3 Okt, pukul 08:50 +

+
+ + + +
+ In transit +

+ Kamis, 3 Jun 2021 11:07 WIB +

+
+ +
+
In transit
+

+ Pesanan Anda dalam proses pengiriman oleh kurir. +

+
+ + + +
+ In transit +

+ Kamis, 3 Jun 2021 11:07 WIB +

+
+ +
+
In transit
+

+ Pesanan Anda dalam proses pengiriman oleh kurir. +

+
+
-- cgit v1.2.3 From a275128876e8ae19c23cc0faf66194e05a99bdf4 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 15:13:41 +0700 Subject: change col-size --- pages/member/order-detail.html | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index e823a84..2acc610 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -16,7 +16,7 @@
-
+
Order No:
@@ -27,7 +27,7 @@

-
+
Shipped date:
@@ -39,7 +39,7 @@

-
+
Status:
@@ -49,7 +49,7 @@ In Transit

-
+
Order Amount:
@@ -69,14 +69,14 @@
-
+
Order created

Kamis, 3 Jun 2021 11:07 WIB

-
+
Order created by buyer.

Order created and waiting for payment @@ -85,14 +85,14 @@ -

+
Order paid

Kamis, 3 Jun 2021 11:07 WIB

-
+
Order paid by buyer.

Payment completed and order is being prepared by seller. @@ -101,14 +101,14 @@ -

+
Waiting to be shipped

Kamis, 3 Jun 2021 11:07 WIB

-
+
Request to pick up

Order is ready to be picked up by [courier name]. Order will be picked up before Sabtu, 3 Okt, pukul 08:50 @@ -117,14 +117,14 @@ -

+
In transit

Kamis, 3 Jun 2021 11:07 WIB

-
+
In transit

Pesanan Anda dalam proses pengiriman oleh kurir. @@ -133,14 +133,14 @@ -

+
In transit

Kamis, 3 Jun 2021 11:07 WIB

-
+
In transit

Pesanan Anda dalam proses pengiriman oleh kurir. -- cgit v1.2.3 From 0008dd7f42fcddd6c08d123ebf28589d1c0740e5 Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 15:15:33 +0700 Subject: change order number to waybill number --- pages/member/order-detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index 2acc610..095e5fc 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -19,7 +19,7 @@

-
Order No:
+
Waybill number:

-- cgit v1.2.3 From 952c859057a0d3ab391641f04e7354c09865acfe Mon Sep 17 00:00:00 2001 From: Anatasof Wirapraja Date: Wed, 21 Jul 2021 15:18:27 +0700 Subject: latest status now uses badge --- pages/member/order-detail.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pages/member') diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html index 095e5fc..01d55cf 100644 --- a/pages/member/order-detail.html +++ b/pages/member/order-detail.html @@ -45,9 +45,9 @@

Status:
-

+ In Transit -

+
-- cgit v1.2.3