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.0 #48

Merged
merged 39 commits into from
Jul 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7a4f890
Changed displayed images in second pack of images
Progi1984 Nov 5, 2019
1d33971
Migrated JS & CSS assets from files to NPM & Webpack
Progi1984 Nov 6, 2019
c7e5308
Build assets
Progi1984 Nov 6, 2019
37d0fb1
Permit to upload a SVG file as custom icon
Progi1984 Nov 8, 2019
2b4ebf8
Forced the compatibility to 1.7.7.0 (min)
Progi1984 Nov 8, 2019
b20d66c
Backwards compatibility for uploading a SVG
Progi1984 Nov 8, 2019
7dcc527
Fixed PrettyCI
Progi1984 Nov 8, 2019
dbea8c6
Added a template for PullRequest
Progi1984 Nov 8, 2019
e854bc9
Removed branch
Progi1984 Nov 8, 2019
be52808
Merge pull request #36 from Progi1984/addTemplatePR
Progi1984 Nov 14, 2019
04e880c
Merge pull request #35 from Progi1984/issue15939
PierreRambaud Nov 15, 2019
6e1920c
Merge pull request #34 from Progi1984/issue16010
PierreRambaud Nov 15, 2019
ebbcc45
Merge pull request #33 from Progi1984/issue16091
PierreRambaud Nov 15, 2019
f3ed7c4
Added the ability to remove a block
Progi1984 Nov 18, 2019
97585bb
Fixed PHP CS Fixer
Progi1984 Nov 18, 2019
a67811d
Fixed feedback from @PierreRambaud
Progi1984 Nov 18, 2019
e1cc115
Build assets
Progi1984 Nov 18, 2019
d89a627
Merge pull request #37 from Progi1984/issue15935
matks Dec 4, 2019
461221f
Update readme
Dec 31, 2019
ac856a9
Make license SPDX compliant
Dec 31, 2019
d65f086
Fix EOL of text files
mvorisek Jan 25, 2020
e0a6f32
Bump Symfony to 5.x
mvorisek Jan 25, 2020
32fecdf
Run CS fixer
mvorisek Jan 25, 2020
3237d43
Merge pull request #38 from mvorisek/add_symfony_5_support
PierreRambaud Feb 24, 2020
eaef564
Update readme to add multistore compatibility
marionf Feb 24, 2020
e83cf92
Fix bad license header for CategoryFetcher.php
matks Feb 24, 2020
8278f30
Merge pull request #42 from PrestaShop/matks-patch-2
PierreRambaud Feb 24, 2020
636f1b4
Merge pull request #41 from PrestaShop/marionf-multistore-compat
marionf Feb 25, 2020
f9f1e6a
change translation
matthieu-rolland Mar 30, 2020
b2412d4
Merge pull request #43 from PrestaShop/optimize-translation
PierreRambaud Mar 30, 2020
0a0b2d1
Add badges
matks Jun 22, 2020
2d85ab1
Fixed .gitignore
Progi1984 Jun 22, 2020
3811aa7
Bump version to 5.0.0
Progi1984 Jun 22, 2020
fbe571e
Merge pull request #46 from matks/add-badges
PierreRambaud Jun 22, 2020
6cfe671
Merge pull request #47 from Progi1984/improveProject
PierreRambaud Jul 6, 2020
c2d5ffc
Merge remote-tracking branch 'upstream/master' into fixConflictsMaster
Progi1984 Jul 8, 2020
e260a5d
Merge pull request #49 from Progi1984/fixConflictsMaster
PierreRambaud Jul 8, 2020
c0a87e8
Add title and description properties
cdefy Jul 9, 2020
20678a4
Merge pull request #50 from cdefy/master
Progi1984 Jul 13, 2020
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
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--
Thank you for contributing to the PrestaShop project!

Please take the time to edit the "Answers" rows with the necessary information.

Check out our contribution guidelines to find out how to complete it:
https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requests
-->

| Questions | Answers
| ------------- | -------------------------------------------------------
| Description? | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc.
| Type? | bug fix / improvement / new feature / refacto / critical
| BC breaks? | Does it break backward compatibility? yes/no
| Deprecations? | Does it deprecate an existing feature? yes/no
| Fixed ticket? | [Issue](https://github.com/PrestaShop/PrestaShop/issues), please write "Fixes #[issue number]" here.
| How to test? | Please indicate how to best verify that this PR is correct.

<!-- Click the form's "Preview" button to make sure the table is functional in GitHub. Thank you! -->
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.php_cs.cache
vendor
node_modules
vendor/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ jobs:
- composer install
- docker run -tid --rm -v ps-volume:/var/www/html --name temp-ps prestashop/prestashop:1.7.1.2
- docker exec -ti temp-ps rm -rf /var/www/html/modules/blockreassurance
- docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/blockreassurance -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/blockreassurance/tests/php/phpstan/phpstan.neon
- docker run --rm --volumes-from temp-ps -v $PWD:/var/www/html/modules/blockreassurance -e _PS_ROOT_DIR_=/var/www/html quetzacoalt/phpstan analyse --configuration=/var/www/html/modules/blockreassurance/tests/php/phpstan/phpstan.neon
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
# Customer reassurance block

[![Build Status](https://travis-ci.com/PrestaShop/blockreassurance.svg?branch=master)](https://travis-ci.com/PrestaShop/blockreassurance)
[![Latest Stable Version](https://poser.pugx.org/PrestaShop/blockreassurance/v)](//packagist.org/packages/PrestaShop/blockreassurance)
[![Total Downloads](https://poser.pugx.org/PrestaShop/blockreassurance/downloads)](//packagist.org/packages/PrestaShop/blockreassurance)
[![GitHub license](https://img.shields.io/github/license/PrestaShop/blockreassurance)](https://github.com/PrestaShop/blockreassurance/LICENSE.md)


## About

Adds an information block aimed at offering helpful information to reassure customers that your store is trustworthy.

## Multistore compatibility

This module is compatible with the multistore :heavy_check_mark: <br/>
It can be configured differently from one store to another.<br/>
It can be configured quickly in the same way on all stores thanks to the all shops context or the group of shops.<br/>
It can be activated on one store and deactivated on another

## Reporting issues

You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue].
Expand All @@ -23,6 +36,13 @@ npm install
composer install
```

## Usage

```
npm run dev # Watch js/css files for changes
npm run build # Build for production
```

## Contributing

PrestaShop modules are open source extensions to the [PrestaShop e-commerce platform][prestashop]. Everyone is welcome and even encouraged to contribute with their own improvements!
Expand Down
File renamed without changes
73 changes: 68 additions & 5 deletions views/css/back.css → _dev/back/back.scss
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,49 @@
background-color: #FAFBFC;
transition: background .3s;
}
.listing-body.ui-sortable {
.listing-body {
&.ui-sortable {
padding: 0;
}
.btn-group {
padding: 0;
.dropdown-toggle {
&:hover, &:focus {
text-decoration: none;
&:after {
color: #00aff0;
}
}
&:after {
color: #6c868e;
content: "more_vert";
font-family: "Material Icons";
font-weight: 400;
font-style: normal;
font-size: 1.5rem;
text-transform: none;
}
}
.dropdown-item {
color: #6c868e;
display: block;
padding: .375rem 1.5rem .375rem .938rem;
font-size: .875rem;
&:hover {
color: #fff !important;
background: #25b9d7 !important;
text-decoration: none !important;
}
.material-icons {
font-size: 1.125rem;
vertical-align: text-bottom;
padding-right: .5rem;
}
}
}
.status-toggle {
padding: .6rem 0;
}
}
.listing-row.row {
border-bottom: #BBCDD2 solid 1px;
Expand Down Expand Up @@ -277,9 +318,6 @@
.psre-add i {
font-size: 1.5em !important;
}
.psre-edit {
cursor: pointer;
}
/* Tab Content : Listing : Switch */
.switch-input {
background: #DA6E6E;
Expand Down Expand Up @@ -551,7 +589,7 @@
min-width: 100px;
width: 100px;
height: 81px;
background: url("../img/additional_module.png") no-repeat transparent;
background: url("additional_module.png") no-repeat transparent;
background-size: contain;
}
.module-addons-suggestion .suggestion-category-details {
Expand Down Expand Up @@ -600,3 +638,28 @@
display: inline-block;
}
}

/* 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;
}
}
Loading