Skip to content

Commit f9d8f53

Browse files
authored
Merge pull request #448 from PrestaShop/develop
Release 0.1.4
2 parents be85a07 + ad06c93 commit f9d8f53

File tree

7 files changed

+36
-15
lines changed

7 files changed

+36
-15
lines changed

.github/workflows/build.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,35 @@ jobs:
2727
- name: Build assets
2828
run: npm run build
2929

30-
- name: Remove dependencies
31-
run: rm node_modules/ .github/ .git/ -rf
30+
- name: Remove unuseful data
31+
run: |
32+
rm .git/ -rf
33+
rm .github/ -rf
34+
rm .storybook/ -rf
35+
rm node_modules/ -rf
36+
rm src/ -rf
37+
rm stories/ -rf
38+
rm types/ -rf
39+
rm webpack/ -rf
40+
rm .editorconfig
41+
rm .eslintignore
42+
rm .eslintrc.js
43+
rm .gitignore
44+
rm .stylelintignore
45+
rm .stylelintrc
46+
rm babel.config.js
47+
rm jest.config.js
48+
rm package-lock.json
49+
rm package.json
50+
rm postcss.config.js
51+
rm tsconfig.json
52+
rm webpack.config.js
3253
3354
- name: Create & Upload artifact
3455
uses: actions/upload-artifact@v1
3556
with:
3657
name: ${{ github.event.repository.name }}
37-
path: ../
58+
path: ./
3859
update_release_draft:
3960
runs-on: ubuntu-latest
4061
needs: [deploy]

src/js/pages/checkout.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const initCheckout = () => {
2929
responsiveStep?.classList.remove('d-none');
3030
}
3131

32-
content.classList.add('js-current-step');
32+
content.classList.add('js-current-step', 'step--current');
3333
};
3434

3535
actionButtons.forEach((button) => {

src/js/theme.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ initEmitter();
3232
$(() => {
3333
const {prestashop, Theme: {events}} = window;
3434

35-
// @TODO: Fix this on core.js side inside a major version of PrestaShop instead of minor
36-
// For reference: https://github.com/PrestaShop/hummingbird/pull/418#discussion_r1061938669
37-
document.querySelectorAll<HTMLInputElement>('[name="token"]').forEach((el) => {
38-
el.value = prestashop.static_token;
39-
});
40-
4135
initProductBehavior();
4236
initQuickview();
4337
initCheckout();

templates/checkout/_partials/steps/checkout-step.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
'step--reachable' => $step_is_reachable,
1313
'step--complete' => $step_is_complete && !$step_is_current,
1414
'js-current-step' => $step_is_current,
15-
'active' => $step_is_current
15+
'active' => $step_is_current,
16+
'show' => $step_is_current
1617
]|classnames} mb-5"
18+
role = "tabpanel"
1719
>
1820
<div class="step__title js-step-title">
1921
<h1 class="step__title-left h3">

templates/checkout/_partials/steps/shipping.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<div class="row align-items-center">
3535
{if $carrier.logo}
3636
<div class="col-md-4 carrier__logo">
37-
<img src="{$carrier.logo}" class="rounded" alt="{$carrier.name}" loading="lazy" />
37+
<img src="{$carrier.logo}" class="rounded img-fluid" alt="{$carrier.name}" loading="lazy" />
3838
</div>
3939
{/if}
4040

templates/checkout/checkout-steps.tpl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
{block name='checkout_steps'}
1212
<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">
13-
<ul class="{$componentName}__list nav nav-tabs border-0 row mb-0 d-none d-md-flex">
13+
<ul class="{$componentName}__list nav nav-tabs border-0 row mb-0 d-none d-md-flex" role="tablist">
1414
<li
1515
class="{$componentName}__item nav-item js-step-item text-center col-3"
1616
data-step="checkout-personal-information-step"
@@ -23,6 +23,7 @@
2323
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
2424
data-bs-toggle="tab"
2525
data-bs-target="#checkout-personal-information-step"
26+
role="tab"
2627
>
2728
{l s='Personal Information' d='Shop.Theme.Checkout'}
2829
</button>
@@ -40,6 +41,7 @@
4041
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
4142
data-bs-toggle="tab"
4243
data-bs-target="#checkout-addresses-step"
44+
role="tab"
4345
>
4446
{l s='Addresses' d='Shop.Theme.Checkout'}
4547
</button>
@@ -57,6 +59,7 @@
5759
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
5860
data-bs-toggle="tab"
5961
data-bs-target="#checkout-delivery-step"
62+
role="tab"
6063
>
6164
{l s='Shipping method' d='Shop.Theme.Checkout'}
6265
</button>
@@ -74,6 +77,7 @@
7477
class="{$componentName}__text nav-link w-100 bg-transparent btn p-0 border-0 mb-0"
7578
data-bs-toggle="tab"
7679
data-bs-target="#checkout-payment-step"
80+
role="tab"
7781
>
7882
{l s='Payment' d='Shop.Theme.Checkout'}
7983
</button>

templates/checkout/checkout.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
<div class="container">
2121
<div class="row">
2222

23-
<div class="cart-grid-body tab-content col-lg-7 order-1 order-lg-0">
23+
<div class="cart-grid-body tab-content col-lg-7">
2424
{block name='checkout_process'}
2525
{render file='checkout/checkout-process.tpl' ui=$checkout_process}
2626
{/block}
2727
</div>
28-
<div class="cart-grid-right col-lg-5 order-0 order-lg-1">
28+
<div class="cart-grid-right col-lg-5">
2929
<div class="accordion">
3030
<div class="accordion-item bg-transparent">
3131
<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">

0 commit comments

Comments
 (0)