diff options
| -rw-r--r-- | pages/ord/checkout.html | 85 | 
1 files changed, 43 insertions, 42 deletions
| diff --git a/pages/ord/checkout.html b/pages/ord/checkout.html index 963ccf5..be11308 100644 --- a/pages/ord/checkout.html +++ b/pages/ord/checkout.html @@ -9,7 +9,7 @@  		<div class="container p-4">  			<!-- Hero Section-->  			<div class="py-5"> -				<h2>[L]Checkout form[/L]</h2> +				<h1>[L]Checkout form[/L]</h1>  				[if session logged_in]  				<p class="lead">[L]Please verify the information below and click the <b>'Place Order'</b> button to process your order.[/L]</p>  				[include include/checkout/login_form][/else][/if][if !variable NO_TAX_POPUP] @@ -17,52 +17,53 @@  				[edisplay show_label=1 show_var=0 keep=1]  			</div>  			<!-- End Hero section--> -			<div class="container"> - +			<div class="container my-4">  					<form action="[area href=@@MV_PAGE@@ secure=1]" method="POST" name="checkout">  						[form-session-id]  						<input type="hidden" name="mv_action" value="refresh"/> -						<div class="block"> +						<div class="container">  							<div class="block-header">  								<h4 class="d-flex justify-content-between align-items-center">[L]Order review[/L]</h4>  							</div> -							<ul class="list-group my-3"> -								<!-- Product Item --> -								[if items][then][item-list][item-calc] -								#Log("Checking master item $master"); -								$row_class = ++$count % 2 ?  'cartnorm' : 'cartalt'; -								my $item = '[item-increment]'; -								my $up = q{[item-data merchandising upsell_to]}; -								my $cr = q{[item-data merchandising cross_sell]}; -								$upsell_remove{'[item-code]'} = 1; -								$cross_remove{'[item-code]'} = 1; -								my %seen = ( '' => 1 ); -								$Scratch->{upsell} .= " $up" if $up; -								$Scratch->{cross_codes} .= " $cr" if $cr; -								my @up = split /\s+/, $Scratch->{upsell}; -								my @cr = split /\s+/, $Scratch->{cross_codes}; -								@up = grep  ( (!$seen{$_}++ && ! $upsell_remove{$_}), @up); -								@cr = grep  ( (!$seen{$_}++ && ! $cross_remove{$_}), @cr); -								$Scratch->{upsell} = join " ", @up; -								$Scratch->{cross_codes} = join " ", @cr; -								return; -								[/item-calc] -								<li class="list-group-item d-flex justify-content-between lh-sm"> -									<div> -										<a href="[area href="[item-sku]"]"><h6 class="my-0">[item-description]</h6></a> -										<small class="text-muted">[item-discount-price]</small> -										<small class="text-muted">x [item-quantity]</small> -									</div> -									<span class="text-muted">[item-discount-subtotal]</</span> -								</li> -								[/item-list] -								<!-- End of Product Item --> -								<li class="list-group-item d-flex justify-content-between"> -									<span>Subtotal</span> -									<strong>[subtotal]</strong> -								</li> -								[/then][/if] -							</ul> +							<div class="container my-2"> +								<ul class="list-group my-2"> +									<!-- Product Item --> +									[if items][then][item-list][item-calc] +									#Log("Checking master item $master"); +									$row_class = ++$count % 2 ?  'cartnorm' : 'cartalt'; +									my $item = '[item-increment]'; +									my $up = q{[item-data merchandising upsell_to]}; +									my $cr = q{[item-data merchandising cross_sell]}; +									$upsell_remove{'[item-code]'} = 1; +									$cross_remove{'[item-code]'} = 1; +									my %seen = ( '' => 1 ); +									$Scratch->{upsell} .= " $up" if $up; +									$Scratch->{cross_codes} .= " $cr" if $cr; +									my @up = split /\s+/, $Scratch->{upsell}; +									my @cr = split /\s+/, $Scratch->{cross_codes}; +									@up = grep  ( (!$seen{$_}++ && ! $upsell_remove{$_}), @up); +									@cr = grep  ( (!$seen{$_}++ && ! $cross_remove{$_}), @cr); +									$Scratch->{upsell} = join " ", @up; +									$Scratch->{cross_codes} = join " ", @cr; +									return; +									[/item-calc] +									<li class="list-group-item d-flex justify-content-between lh-sm"> +										<div> +											<a href="[area href="[item-sku]"]"><h6 class="my-0">[item-description]</h6></a> +											<small class="text-muted">[item-discount-price]</small> +											<small class="text-muted">x [item-quantity]</small> +										</div> +										<span class="text-muted">[item-discount-subtotal]</</span> +									</li> +									[/item-list] +									<!-- End of Product Item --> +									<li class="list-group-item d-flex justify-content-between"> +										<span>Subtotal</span> +										<strong>[subtotal]</strong> +									</li> +									[/then][/if] +								</ul> +							</div>  						</div>  						<!-- Shipping Address -->  						<div> @@ -81,7 +82,7 @@  								<h4 class="d-flex justify-content-between align-items-center">Delivery method</h4>  							</div>  							<!-- Delivery option--> -							<div class="block my-5"> +							<div class="container my-4">  								<div class="block-body">  									<div class="row">  										<div class="form-group col-md-6 d-flex align-items-center"> |