Merge branch 'master' into sicepat

3 files changed, 286 insertions, 0 deletions

diff --git a/pages/member/account.html b/pages/member/account.html
new file mode 100644
index 0000000..9f5fe43
--- /dev/null
+++ b/pages/member/account.html
@@ -0,0 +1,65 @@
+@_TOP_@
+<!-- BEGIN CONTENT -->
+<div class="container p-4">
+	<!-- Hero Section-->
+	<div class="py-2">
+		<h1>[L]Account[/L]</h1>
+		[if session logged_in]
+		[edisplay show_label=1 show_var=0 keep=1]
+	</div>
+	<!-- End Hero section-->
+	<!-- Orders Section-->
+	<section>
+		<div class="block-header">
+			<h4 class="d-flex justify-content-between">Orders</h4>
+		</div>
+		<div class="container">
+			<div>
+				<table class="table table-borderless table-hover table-responsive-md">
+					<thead class="bg-light">
+						<tr>
+							<th class="py-4 text-uppercase text-sm">Order #</th>
+							<th class="py-4 text-uppercase text-sm">Date</th>
+							<th class="py-4 text-uppercase text-sm">Total</th>
+							<th class="py-4 text-uppercase text-sm">Status</th>
+							<th class="py-4 text-uppercase text-sm">Action</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<th class="py-4 align-middle">#12345</th>
+							<td class="py-4 align-middle">22/6/2017</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-light text-dark">Being prepared</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+						<tr>
+							<th class="py-4 align-middle"># 1734</th>
+							<td class="py-4 align-middle">7/5/2017</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-warning text-dark">Action needed</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+						<tr>
+							<th class="py-4 align-middle"># 1730</th>
+							<td class="py-4 align-middle">30/9/2016</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-success">Received</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+						<tr>
+							<th class="py-4 align-middle"># 1705</th>
+							<td class="py-4 align-middle">22/6/2016</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-danger">Cancelled</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</section>
+	<!-- Orders Section -->
+</div>
+
+__BOTTOM__
\ No newline at end of file
diff --git a/pages/member/order-detail.html b/pages/member/order-detail.html
new file mode 100644
index 0000000..01d55cf
--- /dev/null
+++ b/pages/member/order-detail.html
@@ -0,0 +1,156 @@
+@_TOP_@
+<!-- BEGIN CONTENT -->
+<div class="container p-4">
+	<!-- Hero Section-->
+	<div class="py-2">
+		<h1>[L]Order #1234[/L]</h1>
+		[if session logged_in]
+		[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]
+	</div>
+	<!-- End Hero Section -->
+
+	<!-- Order Info -->
+	<div class="card card-sm">
+		<div class="card-body bg-dark text-light">
+			<div class="row">
+				<div class="col-6 col-lg-6">
+
+					<!-- Heading -->
+					<h6 class="heading-xxxs text-muted">Waybill number:</h6>
+
+					<!-- Text -->
+					<p class="mb-lg-0 font-size-sm font-weight-bold">
+						673290789
+					</p>
+
+				</div>
+				<div class="col-6 col-lg-6">
+
+					<!-- Heading -->
+					<h6 class="heading-xxxs text-muted">Shipped date:</h6>
+
+					<!-- Text -->
+					<p class="mb-lg-0 font-size-sm font-weight-bold">
+						<time datetime="2019-10-01">
+							01 Oct, 2019
+						</time>
+					</p>
+				</div>
+				<div class="col-6 col-lg-6">
+
+					<!-- Heading -->
+					<h6 class="heading-xxxs text-muted">Status:</h6>
+
+					<!-- Text -->
+					<span class="badge bg-warning">
+						In Transit
+					</span>
+				</div>
+				<div class="col-6 col-lg-6">
+
+					<!-- Heading -->
+					<h6 class="heading-xxxs text-muted">Order Amount:</h6>
+
+					<!-- Text -->
+					<p class="mb-0 font-size-sm font-weight-bold">
+						$259.00
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- Order Info -->
+	<!-- Tracking Info -->
+	<div class="card card-sm">
+		<div class="card-body bg-light">
+			<div class="row">
+				<!-- Log lines -->
+				<!-- Status -->
+				<div class="col-6 col-lg-6">
+					<span class="badge rounded-pill bg-secondary">Order created</span>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Kamis, 3 Jun 2021 11:07 WIB
+					</p>
+				</div>
+				<!-- Comment -->
+				<div class="col-6 col-lg-6">
+					<h6 class="heading-xxxs text-muted">Order created by buyer.</h6>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Order created and waiting for payment
+					</p>
+				</div>
+				<!-- End of log lines -->
+				<!-- Log lines -->
+				<!-- Status -->
+				<div class="col-6 col-lg-6">
+					<span class="badge rounded-pill bg-secondary">Order paid</span>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Kamis, 3 Jun 2021 11:07 WIB
+					</p>
+				</div>
+				<!-- Comment -->
+				<div class="col-6 col-lg-6">
+					<h6 class="heading-xxxs text-muted">Order paid by buyer.</h6>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Payment completed and order is being prepared by seller.
+					</p>
+				</div>
+				<!-- End of log lines -->
+				<!-- Log lines -->
+				<!-- Status -->
+				<div class="col-6 col-lg-6">
+					<span class="badge rounded-pill bg-secondary">Waiting to be shipped</span>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Kamis, 3 Jun 2021 11:07 WIB
+					</p>
+				</div>
+				<!-- Comment -->
+				<div class="col-6 col-lg-6">
+					<h6 class="heading-xxxs text-muted">Request to pick up</h6>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Order is ready to be picked up by [courier name]. Order will be picked up before Sabtu, 3 Okt, pukul 08:50
+					</p>
+				</div>
+				<!-- End of log lines -->
+				<!-- Log lines -->
+				<!-- Status -->
+				<div class="col-6 col-lg-6">
+					<span class="badge rounded-pill bg-secondary">In transit</span>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Kamis, 3 Jun 2021 11:07 WIB
+					</p>
+				</div>
+				<!-- Comment -->
+				<div class="col-6 col-lg-6">
+					<h6 class="heading-xxxs text-muted">In transit</h6>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Pesanan Anda dalam proses pengiriman oleh kurir.
+					</p>
+				</div>
+				<!-- End of log lines -->
+				<!-- Log lines -->
+				<!-- Status -->
+				<div class="col-6 col-lg-6">
+					<span class="badge rounded-pill bg-secondary">In transit</span>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Kamis, 3 Jun 2021 11:07 WIB
+					</p>
+				</div>
+				<!-- Comment -->
+				<div class="col-6 col-lg-6">
+					<h6 class="heading-xxxs text-muted">In transit</h6>
+					<p class="mb-lg-0 font-size-sm text-muted">
+						Pesanan Anda dalam proses pengiriman oleh kurir.
+					</p>
+				</div>
+				<!-- End of log lines -->
+			</div>
+		</div>
+	</div>
+	<!-- End Tracking Info -->
+</div>
+<!-- END CONTENT -->
+__BOTTOM__
\ No newline at end of file
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_@
+<!-- BEGIN CONTENT -->
+<div class="container p-4">
+	<!-- Hero Section-->
+	<div class="py-2">
+		<h1>[L]Your Account[/L]</h1>
+		[if session logged_in]
+		[edisplay show_label=1 show_var=0 keep=1]
+	</div>
+	<!-- End Hero section-->
+	<!-- Orders Section-->
+	<section>
+		<div class="block-header">
+			<h4 class="d-flex justify-content-between">Orders</h4>
+		</div>
+		<div class="container">
+			<div>
+				<table class="table table-borderless table-hover table-responsive-md">
+					<thead class="bg-light">
+						<tr>
+							<th class="py-4 text-uppercase text-sm">Order #</th>
+							<th class="py-4 text-uppercase text-sm">Date</th>
+							<th class="py-4 text-uppercase text-sm">Total</th>
+							<th class="py-4 text-uppercase text-sm">Status</th>
+							<th class="py-4 text-uppercase text-sm">Action</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<th class="py-4 align-middle">#12345</th>
+							<td class="py-4 align-middle">22/6/2017</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-light text-dark">Being prepared</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+						<tr>
+							<th class="py-4 align-middle"># 1734</th>
+							<td class="py-4 align-middle">7/5/2017</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-warning text-dark">Action needed</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+						<tr>
+							<th class="py-4 align-middle"># 1730</th>
+							<td class="py-4 align-middle">30/9/2016</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-success">Received</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+						<tr>
+							<th class="py-4 align-middle"># 1705</th>
+							<td class="py-4 align-middle">22/6/2016</td>
+							<td class="py-4 align-middle">Rp150.000,00</td>
+							<td class="py-4 align-middle"><span class="badge p-2 text-uppercase bg-danger">Cancelled</span></td>
+							<td class="py-4 align-middle"><a class="btn btn-outline-dark btn-sm" href="customer-order.html">View</a></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</section>
+	<!-- Orders Section -->
+</div>
+
+__BOTTOM__
\ No newline at end of file