From 3dd26b8259012fe6fb1298a907841410b0f4d744 Mon Sep 17 00:00:00 2001 From: IceToast Date: Tue, 28 Mar 2023 15:28:26 +0200 Subject: [PATCH] =?UTF-8?q?style:=20=F0=9F=92=84=20Change=20checkout=20pag?= =?UTF-8?q?e=20to=20two=20card=20design?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/default/sass/app.scss | 53 +--- themes/default/views/store/checkout.blade.php | 249 ++++++++++-------- 2 files changed, 140 insertions(+), 162 deletions(-) diff --git a/themes/default/sass/app.scss b/themes/default/sass/app.scss index 0ccc9f2f..61443fbd 100644 --- a/themes/default/sass/app.scss +++ b/themes/default/sass/app.scss @@ -6,66 +6,21 @@ @import "../css/adminlte.min.css"; @import "../css/slim.min.css"; -.gateway-container { - background-color: #ffffff; -} - -.checkout-gateway-radio { +.checkout-gateways { // make the radio button clickable cursor: pointer; - // center the radio button - display: flex; - justify-content: center; - align-items: center; -} -.checkout-gateway-radio-input { - // make radio button square and show a checkmark instead of a circle when selected - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - background-color: #fff; - border: 1px solid #d2d6de; - height: 20px; - width: 20px; - border-radius: 4px; - position: relative; - cursor: pointer; - outline: none; - // center the thing - margin: 0 auto; - - &:checked { - background-color: #fff; - border: 1px solid #d2d6de; - height: 20px; - width: 20px; - border-radius: 0; - position: relative; - cursor: pointer; - outline: none; - &:after { - content: ""; - position: absolute; - top: 0px; - left: 7px; - width: 5px; - height: 16px; - border: solid #3d6efe; - border-width: 0 2px 2px 0; - transform: rotate(45deg); - } + // add some space between all gateway divs bit the last one + &:not(:last-child) { + margin-bottom: 1rem; } } .checkout-gateway-label { // make the label clickable cursor: pointer; - // center the label display: flex; justify-content: start; align-items: center; - - margin: 2px 0; } diff --git a/themes/default/views/store/checkout.blade.php b/themes/default/views/store/checkout.blade.php index 72ddab0b..a6ca6886 100644 --- a/themes/default/views/store/checkout.blade.php +++ b/themes/default/views/store/checkout.blade.php @@ -24,132 +24,155 @@
- -
-
- -
- @csrf - @method('post') - -
- -
-
-

- {{ config('app.name', 'Laravel') }} - {{ __('Date') }}: - {{ Carbon\Carbon::now()->isoFormat('LL') }} + + @csrf + @method('post') +
+ @if (!$productIsFree) +
+
+
+

+ + Payment Methods

- -
- - -
-
- - - - - - - - - - - - - - - - - -
{{ __('Quantity') }}{{ __('Product') }}{{ __('Description') }}{{ __('Subtotal') }}
1{{ $product->quantity }} - {{ strtolower($product->type) == 'credits' ? $credits_display_name : $product->type }} - {{ $product->description }}{{ $product->formatToCurrency($product->price) }}
+
-
- -
- - -
- -
- @if (!$productIsFree) -

{{ __('Payment Methods') }}:

-
+ +
+
@foreach ($paymentGateways as $gateway) -
-
- -
-
- +
+
+ + + +
@endforeach
- @endif - -
- -
-

{{ __('Amount Due') }} - {{ Carbon\Carbon::now()->isoFormat('LL') }}

- -
- - @if ($discountpercent && $discountvalue) - - - - - @endif - - - - - - - - - - - - -
{{ __('Discount') }} ({{ $discountpercent }}%):{{ $product->formatToCurrency($discountvalue) }}
{{ __('Subtotal') }}:{{ $product->formatToCurrency($discountedprice) }}
{{ __('Tax') }} ({{ $taxpercent }}%):{{ $product->formatToCurrency($taxvalue) }}
{{ __('Total') }}:{{ $product->formatToCurrency($total) }}
- -
- - - -
-
- -
- - -
-
+ @endif +
+
+
+

+ + Checkout details +

+
+ +
+
    +
  • +
    +
    {{ __('Product details') }}
    +
    +
      +
    • + {{ __('Type') }} + {{ strtolower($product->type) == 'credits' ? $credits_display_name : $product->type }} +
      • +
    • + {{ __('Amount') }} + {{ $product->quantity }} +
      • +
    • + {{ __('Total Amount') }} + {{ $product->quantity }} +
      • +
    + +
    • + + + +
  • +
    +
    {{ __('Description') }}
    + + {{ $product->description }} + +
    +
    • +
  • +
    +
    {{ __('Pricing') }}
    +
    + +
      +
    • + {{ __('Subtotal') }} + + {{ $product->formatToCurrency($discountedprice) }} +
      • +
      + {{ __('Tax') }} + @if ($taxpercent > 0) + ({{ $taxpercent }}%): + @endif + + + + {{ $product->formatToCurrency($taxvalue) }} +
      + @if ($discountpercent && $discountvalue) +
      + {{ __('Discount') }} + ({{ $discountpercent }}%): + -{{ $product->formatToCurrency($discountvalue) }} +
      + @endif +
      +
      + {{ __('Total') }} + {{ $product->formatToCurrency($total) }} +
      + +
    +
    • +
+ + +
+
+
+
+
+

@endsection