Merge pull request #48 from PrestaShop/dev

Release 5.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -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! -->

.gitignore

@@ -1,2 +1,3 @@
 .php_cs.cache
-vendor
+node_modules
+vendor/

.travis.yml

@@ -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

README.md

@@ -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]. 
@@ -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!

views/css/back.css → _dev/back/back.scss

@@ -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;
@@ -277,9 +318,6 @@
 .psre-add i {
     font-size: 1.5em !important;
 }
-.psre-edit {
-    cursor: pointer;
-}
 /* Tab Content : Listing : Switch */
 .switch-input {
     background: #DA6E6E;
@@ -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 {
@@ -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;
+  }
+}