Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Partially fix checkout tabs #446

Merged
merged 2 commits into from
Jan 31, 2023
Merged

Partially fix checkout tabs #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61010cc
Add missing data to tab switcher
Hlavtox Jan 30, 2023
6d4353b
Remove order switch
Hlavtox Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/js/pages/checkout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const initCheckout = () => {
responsiveStep?.classList.remove('d-none');
}

content.classList.add('js-current-step');
content.classList.add('js-current-step', 'step--current');
};

actionButtons.forEach((button) => {
Expand Down
4 changes: 3 additions & 1 deletion templates/checkout/_partials/steps/checkout-step.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
'step--reachable' => $step_is_reachable,
'step--complete' => $step_is_complete && !$step_is_current,
'js-current-step' => $step_is_current,
'active' => $step_is_current
'active' => $step_is_current,
'show' => $step_is_current
]|classnames} mb-5"
role = "tabpanel"
>
<div class="step__title js-step-title">
<h1 class="step__title-left h3">
Expand Down
6 changes: 5 additions & 1 deletion templates/checkout/checkout-steps.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

{block name='checkout_steps'}
<div class="{$componentName} bg-light py-2 {if isset($notifications) && $hasNotifications}mb-2 mb-lg-4{else}mb-3 mb-lg-5{/if} py-md-4">
<ul class="{$componentName}__list nav nav-tabs border-0 row mb-0 d-none d-md-flex">
<ul class="{$componentName}__list nav nav-tabs border-0 row mb-0 d-none d-md-flex" role="tablist">
<li
class="{$componentName}__item nav-item js-step-item text-center col-3"
data-step="checkout-personal-information-step"
Expand All @@ -23,6 +23,7 @@
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
data-bs-toggle="tab"
data-bs-target="#checkout-personal-information-step"
role="tab"
>
{l s='Personal Information' d='Shop.Theme.Checkout'}
</button>
Expand All @@ -40,6 +41,7 @@
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
data-bs-toggle="tab"
data-bs-target="#checkout-addresses-step"
role="tab"
>
{l s='Addresses' d='Shop.Theme.Checkout'}
</button>
Expand All @@ -57,6 +59,7 @@
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
data-bs-toggle="tab"
data-bs-target="#checkout-delivery-step"
role="tab"
>
{l s='Shipping method' d='Shop.Theme.Checkout'}
</button>
Expand All @@ -74,6 +77,7 @@
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
data-bs-toggle="tab"
data-bs-target="#checkout-payment-step"
role="tab"
>
{l s='Payment' d='Shop.Theme.Checkout'}
</button>
Expand Down
4 changes: 2 additions & 2 deletions templates/checkout/checkout.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
<div class="container">
<div class="row">

<div class="cart-grid-body tab-content col-lg-7 order-1 order-lg-0">
<div class="cart-grid-body tab-content col-lg-7">
{block name='checkout_process'}
{render file='checkout/checkout-process.tpl' ui=$checkout_process}
{/block}
</div>
<div class="cart-grid-right col-lg-5 order-0 order-lg-1">
<div class="cart-grid-right col-lg-5">
<div class="accordion">
<div class="accordion-item bg-transparent">
<button class="accordion-button collapsed px-0 mb-3 d-flex d-lg-none bg-transparent" type="button" data-bs-target="#js-checkout-summary" data-bs-toggle="collapse" aria-expanded="false">
Expand Down