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.

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

Release 5.1.3 #565

Merged
merged 159 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
473937e
stop using simonwep/pickr
leemyongpakvn Feb 4, 2023
aa9a535
stop using simonwep/pickr
leemyongpakvn Feb 4, 2023
97b4c6b
remove simonwep/pickr format
leemyongpakvn Feb 4, 2023
eadfcc0
use HTML input color instead of simonwep/pickr
leemyongpakvn Feb 4, 2023
b36ca5f
rebuild assets
leemyongpakvn Feb 4, 2023
bf7d793
Bump @babel/core from 7.20.12 to 7.21.0
dependabot[bot] Feb 21, 2023
dcbbaad
Bump eslint from 8.34.0 to 8.35.0
dependabot[bot] Feb 27, 2023
8a30220
Merge pull request #500 from PrestaShop/dependabot/npm_and_yarn/dev/e…
kpodemski Mar 3, 2023
91a69c6
Merge pull request #499 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski Mar 3, 2023
246206d
Please update actions to use Node.js 16
leemyongpakvn Mar 8, 2023
719ceb8
Bump style-loader from 3.3.1 to 3.3.2
dependabot[bot] Mar 14, 2023
3722628
Merge pull request #508 from PrestaShop/dependabot/npm_and_yarn/dev/s…
nicosomb Mar 14, 2023
235829f
Bump @babel/eslint-parser from 7.19.1 to 7.21.3
dependabot[bot] Mar 15, 2023
2b9ff8d
Merge pull request #509 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski Mar 15, 2023
3114873
Bump webpack from 5.75.0 to 5.76.0
dependabot[bot] Mar 15, 2023
d458265
Bump @babel/core from 7.21.0 to 7.21.3
dependabot[bot] Mar 15, 2023
cb6c7ed
Merge pull request #511 from PrestaShop/dependabot/npm_and_yarn/webpa…
kpodemski Mar 15, 2023
b6fb1e3
Merge pull request #510 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski Mar 15, 2023
5ded8fa
Bump eslint from 8.35.0 to 8.36.0
dependabot[bot] Mar 15, 2023
132f16b
Merge pull request #507 from PrestaShop/dependabot/npm_and_yarn/dev/e…
kpodemski Mar 15, 2023
cf6a60f
Bump webpack from 5.75.0 to 5.76.1
dependabot[bot] Mar 15, 2023
2219ead
Merge pull request #506 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski Mar 15, 2023
dbce4ed
Merge pull request #504 from leemyongpakvn/patch-1
kpodemski Mar 15, 2023
3e57f3e
Bump webpack from 5.76.1 to 5.76.2
dependabot[bot] Mar 16, 2023
94eeeb7
Merge pull request #512 from PrestaShop/dependabot/npm_and_yarn/dev/w…
nicosomb Mar 16, 2023
3206841
Bump mini-css-extract-plugin from 2.7.2 to 2.7.5
dependabot[bot] Mar 17, 2023
b2c8319
Merge pull request #513 from PrestaShop/dependabot/npm_and_yarn/dev/m…
kpodemski Mar 17, 2023
236c00c
Bump sass-loader from 13.2.0 to 13.2.1
dependabot[bot] Mar 20, 2023
e56df83
Merge pull request #515 from PrestaShop/dependabot/npm_and_yarn/dev/s…
nicosomb Mar 20, 2023
40fbbe4
update following current dev branch
leemyongpakvn Mar 23, 2023
9f7807e
Merge pull request #497 from leemyongpakvn/use-HMTL-input-color-inste…
kpodemski Mar 23, 2023
f264c1b
avoid duplicate material loading
Mar 23, 2023
b2f6550
correct material-icon syntax
Mar 23, 2023
93f66c4
rebuild assets
Mar 23, 2023
5dfd6ed
correct order
leemyongpakvn Mar 24, 2023
ae39ff0
add vue modules declaration
leemyongpakvn Mar 24, 2023
9f9731f
correct directory
leemyongpakvn Mar 24, 2023
0a5db4f
Merge pull request #518 from leemyongpakvn/remove-duplicated-material…
jolelievre Mar 28, 2023
d2f74ef
Bump sass-loader from 13.2.1 to 13.2.2
dependabot[bot] Mar 28, 2023
84c2993
Bump eslint from 8.36.0 to 8.37.0
dependabot[bot] Mar 29, 2023
8ab37e3
Merge pull request #520 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Mar 29, 2023
636f785
Use Organization Build Release Github Action
leemyongpakvn Mar 30, 2023
ac20292
Merge pull request #521 from leemyongpakvn/patch-1
SharakPL Mar 30, 2023
d16518b
Merge pull request #519 from PrestaShop/dependabot/npm_and_yarn/dev/s…
kpodemski Mar 31, 2023
75c5df0
Bump webpack from 5.76.2 to 5.77.0
dependabot[bot] Mar 31, 2023
385592d
Merge pull request #522 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski Mar 31, 2023
0dbfcdd
update phpdevtool to v4, phpcsfixer to v3
leemyongpakvn Apr 5, 2023
dd9f6b7
rename following phpcsfixer v3
leemyongpakvn Apr 5, 2023
4ff5189
update minimum php to 7.2.5
leemyongpakvn Apr 5, 2023
2cbff63
remove old platform
leemyongpakvn Apr 5, 2023
acb3f26
revert minimum PHP to 5.6.0
leemyongpakvn Apr 5, 2023
71d9fbe
Bump webpack from 5.77.0 to 5.78.0
dependabot[bot] Apr 6, 2023
69a6896
Merge pull request #525 from PrestaShop/dependabot/npm_and_yarn/dev/w…
matthieu-rolland Apr 6, 2023
b93b97d
Fix folder is_executable check on windows platform
bykivi Apr 20, 2023
42bda45
Merge pull request #524 from leemyongpakvn/update-phpdevtoolToV4-phpc…
kpodemski Apr 24, 2023
417f02c
PHP CS fixer code clean up
bykivi Apr 24, 2023
a554f0d
Update blockreassurance.php
bykivi Apr 25, 2023
64a5311
Bump @babel/core from 7.21.3 to 7.21.8
dependabot[bot] May 3, 2023
a33170a
Bump webpack from 5.78.0 to 5.82.0
dependabot[bot] May 4, 2023
50e8b18
Update blockreassurance.php
bykivi May 4, 2023
99b7a0a
Merge pull request #536 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski May 4, 2023
e55291d
Merge pull request #535 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski May 4, 2023
8244dc3
Bump webpack-cli from 5.0.1 to 5.0.2
dependabot[bot] May 4, 2023
f669f11
Bump @babel/eslint-parser from 7.21.3 to 7.21.8
dependabot[bot] May 4, 2023
11a90a6
Merge pull request #534 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski May 4, 2023
afbe3e3
Merge pull request #530 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski May 4, 2023
ed89190
Update blockreassurance.php
Hlavtox May 5, 2023
1de32a9
Update config.xml
Hlavtox May 5, 2023
a0beed2
Merge pull request #537 from Hlavtox/bump-513
Hlavtox May 5, 2023
a76fcd9
Bump webpack-cli from 5.0.2 to 5.1.0
dependabot[bot] May 8, 2023
381bc0a
Merge pull request #540 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski May 8, 2023
1a15b21
Bump eslint from 8.37.0 to 8.40.0
dependabot[bot] May 8, 2023
2da8702
Merge pull request #539 from PrestaShop/dependabot/npm_and_yarn/dev/e…
kpodemski May 8, 2023
67a778b
Update github actions to v3
leemyongpakvn May 9, 2023
c32aba9
Update action/checkout to v3.1 to solve save-stats warning
leemyongpakvn May 9, 2023
c3bdc08
Merge pull request #529 from bykivi/fix-is_executable-check-on-window…
kpodemski May 9, 2023
3b13302
Merge pull request #541 from leemyongpakvn/patch-1
kpodemski May 9, 2023
0dce2b7
Bump webpack from 5.82.0 to 5.82.1
dependabot[bot] May 11, 2023
78c0a22
Merge pull request #543 from PrestaShop/dependabot/npm_and_yarn/dev/w…
nicosomb May 12, 2023
24ac7ea
Bump webpack-cli from 5.1.0 to 5.1.1
dependabot[bot] May 12, 2023
42eddc1
Merge pull request #542 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski May 12, 2023
50eb461
keep both old saved and new chose SVG icons above Material icon
leemyongpakvn May 18, 2023
503402f
Bump css-loader from 6.7.3 to 6.7.4
dependabot[bot] May 19, 2023
f935ea9
Bump style-loader from 3.3.2 to 3.3.3
dependabot[bot] May 19, 2023
b7b1a3a
Merge pull request #547 from PrestaShop/dependabot/npm_and_yarn/dev/s…
nicosomb May 22, 2023
f02fc52
Merge pull request #546 from PrestaShop/dependabot/npm_and_yarn/dev/c…
nicosomb May 22, 2023
f7e0b29
Bump mini-css-extract-plugin from 2.7.5 to 2.7.6
dependabot[bot] May 22, 2023
8cc8084
Bump webpack from 5.82.1 to 5.83.1
dependabot[bot] May 22, 2023
4f23436
Merge pull request #548 from PrestaShop/dependabot/npm_and_yarn/dev/m…
kpodemski May 22, 2023
f7bff0a
Merge pull request #545 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski May 22, 2023
ea4f41e
Merge pull request #544 from leemyongpakvn/patch-2
nicosomb May 22, 2023
26412bf
Bump webpack from 5.83.1 to 5.84.1
dependabot[bot] May 26, 2023
9c11683
Merge pull request #553 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski May 26, 2023
164a1d0
Bump sass-loader from 13.2.2 to 13.3.0
dependabot[bot] May 26, 2023
e164945
Bump eslint from 8.40.0 to 8.41.0
dependabot[bot] May 26, 2023
d9942ea
Merge pull request #551 from PrestaShop/dependabot/npm_and_yarn/dev/s…
kpodemski May 26, 2023
0e6f46c
Merge pull request #549 from PrestaShop/dependabot/npm_and_yarn/dev/e…
kpodemski May 26, 2023
044bec3
Update README
justeen35 May 26, 2023
e69c86e
Merge pull request #554 from justeen35/link-site-fix
matks May 27, 2023
ebb3050
Bump sass-loader from 13.3.0 to 13.3.1
dependabot[bot] May 29, 2023
095324b
Bump @babel/core from 7.21.8 to 7.22.1
dependabot[bot] May 29, 2023
9f612b1
Merge pull request #557 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski May 29, 2023
2b69433
Merge pull request #556 from PrestaShop/dependabot/npm_and_yarn/dev/s…
kpodemski May 29, 2023
cd5ff4f
Bump eslint from 8.41.0 to 8.42.0
dependabot[bot] Jun 5, 2023
e249b8b
Merge pull request #559 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Jun 5, 2023
b059eb5
Bump webpack from 5.84.1 to 5.85.1
dependabot[bot] Jun 6, 2023
c4e307f
Merge pull request #561 from PrestaShop/dependabot/npm_and_yarn/dev/w…
mflasquin Jun 6, 2023
5e3a157
Bump webpack-cli from 5.1.1 to 5.1.4
dependabot[bot] Jun 8, 2023
3425ae3
Merge pull request #564 from PrestaShop/dependabot/npm_and_yarn/dev/w…
kpodemski Jun 8, 2023
d0227cb
Bump @babel/core from 7.22.1 to 7.22.5
dependabot[bot] Jun 9, 2023
4623d2f
Bump sass-loader from 13.3.1 to 13.3.2
dependabot[bot] Jun 12, 2023
e93c6cb
Merge pull request #568 from PrestaShop/dependabot/npm_and_yarn/dev/s…
matthieu-rolland Jun 12, 2023
56688e8
Merge pull request #567 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski Jun 13, 2023
55b42b7
Bump eslint from 8.42.0 to 8.43.0
dependabot[bot] Jun 19, 2023
319237d
Merge pull request #570 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Jun 20, 2023
e58d876
Bump webpack from 5.85.1 to 5.88.0
dependabot[bot] Jun 22, 2023
8193737
Merge pull request #571 from PrestaShop/dependabot/npm_and_yarn/dev/w…
mflasquin Jun 22, 2023
4b87052
Bump @babel/eslint-parser from 7.21.8 to 7.22.6
dependabot[bot] Jul 5, 2023
314c0e0
Merge pull request #575 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Jul 5, 2023
eee5b9d
Bump @babel/core from 7.22.5 to 7.22.6
dependabot[bot] Jul 5, 2023
b711377
Merge pull request #574 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Jul 5, 2023
bdd93fa
Bump eslint from 8.43.0 to 8.44.0
dependabot[bot] Jul 5, 2023
7131f51
Merge pull request #573 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Jul 5, 2023
fee16dd
Update README.md
florine2623 Jul 6, 2023
442802a
Bump babel-loader from 9.1.2 to 9.1.3
dependabot[bot] Jul 10, 2023
2b3332f
Merge pull request #579 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Jul 10, 2023
3cb01c9
Bump @babel/core from 7.22.6 to 7.22.9
dependabot[bot] Jul 13, 2023
09489cd
Bump webpack from 5.88.0 to 5.88.2
dependabot[bot] Jul 18, 2023
ec7332c
Merge pull request #583 from PrestaShop/dependabot/npm_and_yarn/dev/w…
mflasquin Jul 18, 2023
9eb410d
Bump eslint from 8.44.0 to 8.45.0
dependabot[bot] Jul 18, 2023
7447c3e
Merge pull request #582 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Jul 18, 2023
ebff654
Merge pull request #581 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Jul 18, 2023
cd3c7d3
Merge pull request #576 from PrestaShop/add-ps-compatibility
Hlavtox Jul 25, 2023
7147342
Bump eslint from 8.45.0 to 8.46.0
dependabot[bot] Jul 31, 2023
b7fc5e4
Merge pull request #584 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Aug 2, 2023
7371cdf
Bump @babel/eslint-parser from 7.22.6 to 7.22.10
dependabot[bot] Aug 8, 2023
b1b5806
Merge pull request #587 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Aug 8, 2023
5be6d7e
Bump @babel/core from 7.22.9 to 7.22.10
dependabot[bot] Aug 8, 2023
8371d01
Merge pull request #586 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Aug 10, 2023
e948de7
Bump eslint from 8.46.0 to 8.47.0
dependabot[bot] Aug 14, 2023
d992720
Merge pull request #588 from PrestaShop/dependabot/npm_and_yarn/dev/e…
matks Aug 14, 2023
7a632f2
Bump @babel/core from 7.22.10 to 7.22.11
dependabot[bot] Aug 25, 2023
b7bcd4d
Merge pull request #591 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Aug 25, 2023
6b053c2
Bump @babel/eslint-parser from 7.22.10 to 7.22.11
dependabot[bot] Aug 25, 2023
6e87097
Merge pull request #592 from PrestaShop/dependabot/npm_and_yarn/dev/b…
mflasquin Aug 25, 2023
59f96e6
Bump eslint from 8.47.0 to 8.48.0
dependabot[bot] Aug 28, 2023
d63551f
Merge pull request #593 from PrestaShop/dependabot/npm_and_yarn/dev/e…
mflasquin Aug 28, 2023
4edf89c
Bump eslint-plugin-import from 2.27.5 to 2.28.1
dependabot[bot] Aug 28, 2023
cc34098
Fix removing previous module directory in PHPStan tests
kpodemski Sep 1, 2023
9a06981
Bump @babel/core from 7.22.11 to 7.22.17
dependabot[bot] Sep 11, 2023
ab5c7cf
Merge pull request #598 from PrestaShop/dependabot/npm_and_yarn/dev/b…
nicosomb Sep 11, 2023
ef5ed05
Bump @babel/core from 7.22.17 to 7.22.20
dependabot[bot] Sep 18, 2023
d176535
Bump eslint from 8.48.0 to 8.50.0
dependabot[bot] Sep 25, 2023
d11e391
Merge pull request #601 from PrestaShop/dependabot/npm_and_yarn/dev/e…
kpodemski Sep 25, 2023
42aa6ba
Merge pull request #600 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski Sep 25, 2023
e5303e5
Bump @babel/eslint-parser from 7.22.11 to 7.22.15
dependabot[bot] Sep 25, 2023
a92bc59
Merge pull request #596 from PrestaShop/dependabot/npm_and_yarn/dev/b…
kpodemski Sep 25, 2023
18fff03
Merge pull request #589 from PrestaShop/dependabot/npm_and_yarn/dev/e…
kpodemski Sep 25, 2023
ee3434c
Merge pull request #594 from kpodemski/improved-phpstan-script
kpodemski Sep 26, 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
61 changes: 3 additions & 58 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,6 @@ name: Build
on: [push, pull_request]

jobs:
deploy:
name: build dependencies & create artifact
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.0.0
- name: Install composer dependencies
run: composer install --no-dev -o
- name: Clean-up project
uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0
- name: Prepare auto-index tool
run: |
composer global require prestashop/autoindex
- name: Generate index.php
run: |
~/.composer/vendor/bin/autoindex
- name: Create & upload artifact
uses: actions/upload-artifact@v1
with:
name: ${{ github.event.repository.name }}
path: ../
update_release_draft:
runs-on: ubuntu-latest
needs: [deploy]
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
steps:
- name: Download artifact
uses: actions/download-artifact@v1
with:
name: ${{ github.event.repository.name }}
- id: release_info
uses: toolmantim/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare for Release
run: |
cd ${{ github.event.repository.name }}
zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
- name: Clean existing assets
shell: bash
run: |
curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
for asset in $assets
do
bin/hub api -X DELETE $asset
done
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Publish to GitHub Release
uses: actions/upload-release-asset@v1.0.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release_info.outputs.upload_url }}
asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
build-and-release-draft:
name: Build & Release draft
uses: PrestaShop/.github/.github/workflows/build-release.yml@master
4 changes: 2 additions & 2 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
node-versions: [ '14', '16' ]
steps:
- name: Checkout
uses: actions/checkout@v2.0.0
- uses: actions/setup-node@v1
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-versions }}
- run: npm install
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.0.0
uses: actions/checkout@v3.1.0

- name: PHP syntax checker 5.6
uses: prestashop/github-action-php-lint/5.6@master
Expand Down Expand Up @@ -38,10 +38,10 @@ jobs:
php-version: '7.4'

- name: Checkout
uses: actions/checkout@v2.0.0
uses: actions/checkout@v3.1.0

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
Expand All @@ -50,7 +50,7 @@ jobs:
run: composer install

- name: Run PHP-CS-Fixer
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no --diff-format udiff
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no

# Run PHPStan against the module and a PrestaShop release
phpstan:
Expand All @@ -66,18 +66,18 @@ jobs:
php-version: '7.4'

- name: Checkout
uses: actions/checkout@v2.0.0
uses: actions/checkout@v3.1.0

# Add vendor folder in cache to make next builds faster
- name: Cache vendor folder
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}

# Add composer local folder in cache to make next builds faster
- name: Cache composer folder
uses: actions/cache@v1
uses: actions/cache@v3
with:
path: ~/.composer/cache
key: php-composer-cache
Expand Down
File renamed without changes.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

Connect with your visitors and reassure them about secure payment, free shipping or returns.

## Compatibility

PrestaShop: `1.7.0.0` or later

## Multistore compatibility

This module is compatible with the multistore :heavy_check_mark: <br/>
Expand Down Expand Up @@ -53,6 +57,6 @@ Just make sure to follow our [contribution guidelines][contribution-guidelines].
This module is released under the [Academic Free License 3.0][AFL-3.0]

[report-issue]: https://github.com/PrestaShop/PrestaShop/issues/new/choose
[prestashop]: https://www.prestashop.com/
[prestashop]: https://www.prestashop-project.org/
[contribution-guidelines]: https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/project-modules/
[AFL-3.0]: https://opensource.org/licenses/AFL-3.0
25 changes: 0 additions & 25 deletions _dev/back/back.scss
Original file line number Diff line number Diff line change
Expand Up @@ -596,28 +596,3 @@
#appearance .panel-body {
margin-top: 20px;
}

/* Pickr Override */
.pickr {
z-index: initial !important;

button.pcr-button {
width: 70%;
border: 1px solid #BBB;
height: 30px;
border-radius: 5px;
}
}

.pcr-app .pcr-interaction {
input {
font-size: 12px !important;
width: 26% !important;
}

.pcr-save {
background-color: #3bb7d7 !important;
height: 31px !important;
font-family: "Open Sans", Helvetica, Arial, sans-serif !important;
}
}
50 changes: 0 additions & 50 deletions _dev/back/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
*/
import Sortable from 'sortablejs';
import Pickr from '@simonwep/pickr';
import Vue from 'vue/dist/vue.min';

import 'material-design-icons/iconfont/material-icons.css';
import '@simonwep/pickr/dist/themes/classic.min.css';
import './back.scss';

window.Vue = Vue;
Expand Down Expand Up @@ -492,53 +489,6 @@ $(window).ready(() => {
});
}

// Tab Appearance
const pickrComponents = {
// Main components
preview: true,
opacity: false,
hue: true,

// Input / output Options
interaction: {
hex: false,
rgba: false,
hsla: false,
hsva: false,
cmyk: false,
input: true,
clear: false,
save: true,
},
};
const pickr1 = Pickr.create({
el: '.ps_colorpicker1',
default: window.psr_icon_color,
defaultRepresentation: 'HEX',
closeWithKey: 'Escape',
adjustableNumbers: true,
components: pickrComponents,
});
pickr1.on('change', () => {
const pickrColor = pickr1.getColor();
const hexaColor = pickrColor.toHEXA().toString();
$('.psr_icon_color').val(hexaColor);
});

const pickr2 = Pickr.create({
el: '.ps_colorpicker2',
default: window.psr_text_color,
defaultRepresentation: 'HEX',
closeWithKey: 'Escape',
adjustableNumbers: true,
components: pickrComponents,
});
pickr2.on('change', () => {
const pickrColor = pickr2.getColor();
const hexaColor = pickrColor.toHEXA().toString();
$('.psr_text_color').val(hexaColor);
});

// Tab Appearance : Save Color
$(document).on('click', '#saveConfiguration', () => {
const color1 = $('#color_1').val();
Expand Down
1 change: 1 addition & 0 deletions _dev/back/vue-plugins.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module 'vue/dist/vue.min';
6 changes: 3 additions & 3 deletions blockreassurance.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function __construct()
// Settings
$this->name = 'blockreassurance';
$this->tab = 'front_office_features';
$this->version = '5.1.2';
$this->version = '5.1.3';
$this->author = 'PrestaShop';
$this->need_instance = false;

Expand Down Expand Up @@ -245,8 +245,8 @@ public function loadAsset()
*/
private function folderUploadFilesHasGoodRights()
{
return is_writable($this->folder_file_upload)
&& is_executable($this->folder_file_upload);
// do not check is_executable on windows platform (https://www.php.net/manual/en/function.is-executable.php#refsect1-function.is-executable-notes)
return is_writable($this->folder_file_upload) && !(preg_match('/^[a-zA-Z]{1}\:{1}\\\\{1}/', $this->folder_file_upload) !== 1) || is_executable($this->folder_file_upload);
}

/**
Expand Down
7 changes: 2 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"php": ">=5.6.0"
},
"require-dev": {
"prestashop/php-dev-tools": "^3.4"
"prestashop/php-dev-tools": "^4.3"
},
"autoload": {
"psr-4": {
Expand All @@ -29,10 +29,7 @@
"preferred-install": "dist",
"classmap-authoritative": true,
"optimize-autoloader": true,
"prepend-autoloader": false,
"platform": {
"php": "5.6"
}
"prepend-autoloader": false
},
"scripts": {
"lint": [
Expand Down
Loading