Merge branch 'master' into sicepatsicepat

1 files changed, 26 insertions, 13 deletions

diff --git a/pages/query/order_detail.html b/pages/query/order_detail.html
index 01d55cf..47cab87 100644
--- a/pages/query/order_detail.html
+++ b/pages/query/order_detail.html
@@ -1,14 +1,27 @@
+[tmp members_only]1[/tmp]
+
 @_TOP_@
+
+[tmpn bounce_page]query/check_orders[/tmpn]
+[perl transactions]
+	my $on = $Session->{arg};
+	my $un = $Tag->data('transactions', 'username', $on);
+	if($un eq  $Session->{username}) {
+		delete $Scratch->{bounce_page};
+	}
+	else {
+		$Tag->warnings('Not your order!');
+	}
+	return;
+[/perl]
+[bounce page="[scratch bounce_page]" if="[scratch bounce_page]"]
+
 <!-- BEGIN CONTENT -->
+[loop list="[data session arg]"]
 <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]
+		<h1>[L]Order[/L] #[loop-data transactions order_number]</h1>
 	</div>
 	<!-- End Hero Section -->
 
@@ -23,19 +36,19 @@
 
 					<!-- Text -->
 					<p class="mb-lg-0 font-size-sm font-weight-bold">
-						673290789
+					[loop-data transactions tracking_number]
 					</p>
 
 				</div>
 				<div class="col-6 col-lg-6">
 
 					<!-- Heading -->
-					<h6 class="heading-xxxs text-muted">Shipped date:</h6>
+					<h6 class="heading-xxxs text-muted">[L]Order Date[/L]:</h6>
 
 					<!-- Text -->
 					<p class="mb-lg-0 font-size-sm font-weight-bold">
 						<time datetime="2019-10-01">
-							01 Oct, 2019
+							[convert-date fmt="%e %b %Y"][loop-data transactions order_date][/convert-date]
 						</time>
 					</p>
 				</div>
@@ -46,7 +59,7 @@
 
 					<!-- Text -->
 					<span class="badge bg-warning">
-						In Transit
+						[display table=transactions col=status type=display key="[loop-code]" applylocale=1]
 					</span>
 				</div>
 				<div class="col-6 col-lg-6">
@@ -56,7 +69,7 @@
 
 					<!-- Text -->
 					<p class="mb-0 font-size-sm font-weight-bold">
-						$259.00
+						[currency][loop-data transactions total_cost][/currency]
 					</p>
 				</div>
 			</div>
@@ -151,6 +164,6 @@
 		</div>
 	</div>
 	<!-- End Tracking Info -->
-</div>
+</div>[/loop]
 <!-- END CONTENT -->
-__BOTTOM__
\ No newline at end of file
+__BOTTOM__