diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index eb16626..28ba23f 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -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 diff --git a/MailAlert.php b/MailAlert.php index 6503a9f..a8e3574 100644 --- a/MailAlert.php +++ b/MailAlert.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ class MailAlert extends ObjectModel { @@ -170,16 +164,16 @@ public static function getMailAlerts($id_customer, $id_lang, Shop $shop = null) public static function sendCustomerAlert($id_product, $id_product_attribute) { $link = new Link(); - $context = Context::getContext()->cloneContext(); + $context = Context::getContext(); $id_product = (int) $id_product; $id_product_attribute = (int) $id_product_attribute; - $customers = self::getCustomers($id_product, $id_product_attribute); + $current_shop = $context->shop->id; + $customers = self::getCustomers($id_product, $id_product_attribute, $current_shop); foreach ($customers as $customer) { $id_shop = (int) $customer['id_shop']; $id_lang = (int) $customer['id_lang']; $context->shop->id = $id_shop; - $context->language->id = $id_lang; $product = new Product($id_product, false, $id_lang, $id_shop); $product_name = Product::getProductName($product->id, $id_product_attribute, $id_lang); @@ -255,6 +249,7 @@ public static function sendCustomerAlert($id_product, $id_product_attribute) $id_shop ); } + $context->shop->id = $current_shop; } /* @@ -306,13 +301,17 @@ public static function getProductAttributeCombination($id_product_attribute, $id /* * Get customers waiting for alert on the specified product/product attribute + * in shop `$id_shop` and if the shop group shares the stock in all shops of the shop group */ - public static function getCustomers($id_product, $id_product_attribute) + public static function getCustomers($id_product, $id_product_attribute, $id_shop) { $sql = ' - SELECT id_customer, customer_email, id_shop, id_lang - FROM `' . _DB_PREFIX_ . self::$definition['table'] . '` - WHERE `id_product` = ' . (int) $id_product . ' AND `id_product_attribute` = ' . (int) $id_product_attribute; + SELECT mc.id_customer, mc.customer_email, mc.id_shop, mc.id_lang + FROM `' . _DB_PREFIX_ . self::$definition['table'] . '` mc + INNER JOIN `' . _DB_PREFIX_ . 'shop` s on s.id_shop = mc.id_shop + INNER JOIN `' . _DB_PREFIX_ . 'shop_group` sg on s.id_shop_group = sg.id_shop_group and (s.id_shop = ' . (int) $id_shop . ' or sg.share_stock = 1) + INNER JOIN `' . _DB_PREFIX_ . 'shop` s2 on s2.id_shop = mc.id_shop and s2.id_shop = ' . (int) $id_shop . ' + WHERE mc.`id_product` = ' . (int) $id_product . ' AND mc.`id_product_attribute` = ' . (int) $id_product_attribute; return Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->executeS($sql); } diff --git a/README.md b/README.md index 93b90fe..a0c67ed 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,21 @@ Make your everyday life easier, handle mail alerts about stock and orders, addressed to you as well as your customers. +## Compatibility + +PrestaShop: `1.7.6.0` or later + ## Multistore compatibility This module is partially compatible with the multistore feature. Some of its options might not be available. +## How to test + +Link to specs : https://docs.prestashop-project.org/functional-documentation/functional-documentation/ux-ui/back-office/improve/modules/configure-mail-alerts-ps_mailalerts + +Configure Customer notifications and Merchant notifications +Add stock to product, edit an order, place an order, remove stock from product, set threshold for a product. 
Check that the emails are well sent + ## Reporting issues You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue]. diff --git a/composer.json b/composer.json index 565b92e..0645997 100644 --- a/composer.json +++ b/composer.json @@ -1,26 +1,27 @@ { - "name": "prestashop/ps_emailalerts", - "description": "PrestaShop module ps_emailalerts", - "homepage": "https://github.com/PrestaShop/ps_emailalerts", - "license": "AFL-3.0", - "authors": [ - { - "name": "PrestaShop SA", - "email": "contact@prestashop.com" - } - ], - "require": { - "php": ">=5.6" - }, - "require-dev": { - "prestashop/php-dev-tools": "^3.16" - }, - "config": { - "platform": { - "php": "5.6.0" + "name": "prestashop/ps_emailalerts", + "description": "PrestaShop module ps_emailalerts", + "homepage": "https://github.com/PrestaShop/ps_emailalerts", + "license": "AFL-3.0", + "authors": [ + { + "name": "PrestaShop SA", + "email": "contact@prestashop.com" + } + ], + "require": { + "php": ">=5.6" }, - "preferred-install": "dist", - "prepend-autoloader": false - }, - "type": "prestashop-module" -} + "require-dev": { + "prestashop/php-dev-tools": "^3.16" + }, + "config": { + "platform": { + "php": "5.6.0" + }, + "preferred-install": "dist", + "prepend-autoloader": false + }, + "type": "prestashop-module", + "author": "PrestaShop" +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index ce76e25..c597df5 100644 --- a/composer.lock +++ b/composer.lock @@ -1669,5 +1669,5 @@ "platform-overrides": { "php": "5.6.0" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/config.xml b/config.xml index 56237a6..7c53c83 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_emailalerts - + diff --git a/controllers/front/account.php b/controllers/front/account.php index 1dc7db8..98e4304 100644 --- a/controllers/front/account.php +++ b/controllers/front/account.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ /** diff --git a/controllers/front/actions.php b/controllers/front/actions.php index 69abb49..6b08724 100644 --- a/controllers/front/actions.php +++ b/controllers/front/actions.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ /** @@ -95,7 +89,7 @@ public function processAdd() } elseif (Validate::isEmail((string) Tools::getValue('customer_email'))) { $customer_email = (string) Tools::getValue('customer_email'); $customer = $context->customer->getByEmail($customer_email); - $id_customer = (isset($customer->id) && ($customer->id != null)) ? (int) $customer->id : null; + $id_customer = (isset($customer->id) && ($customer->id != null)) ? (int) $customer->id : 0; } else { exit(json_encode( [ diff --git a/controllers/front/index.php b/controllers/front/index.php index b7d9ae0..296d682 100644 --- a/controllers/front/index.php +++ b/controllers/front/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/controllers/index.php b/controllers/index.php index b7d9ae0..296d682 100644 --- a/controllers/index.php +++ b/controllers/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/index.php b/index.php index b7d9ae0..296d682 100644 --- a/index.php +++ b/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/js/admin/ps_emailalerts.js b/js/admin/ps_emailalerts.js index 6903d22..ab54da3 100644 --- a/js/admin/ps_emailalerts.js +++ b/js/admin/ps_emailalerts.js @@ -1,26 +1,20 @@ /** - * 2007-2022 PrestaShop. + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA * * NOTICE OF LICENSE * - * This source file is subject to the Academic Free License 3.0 (AFL-3.0) - * that is bundled with this package in the file LICENSE.txt. + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. * It is also available through the world-wide-web at this URL: * https://opensource.org/licenses/AFL-3.0 * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade PrestaShop to newer - * versions in the future. If you wish to customize PrestaShop for your - * needs please refer to http://www.prestashop.com for more information. - * - * @author PrestaShop SA - * @copyright 2007-2022 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ $(document).on('ready', function() { diff --git a/js/index.php b/js/index.php index b7d9ae0..296d682 100644 --- a/js/index.php +++ b/js/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/js/mailalerts.js b/js/mailalerts.js index bc7dfe6..dc8dad0 100644 --- a/js/mailalerts.js +++ b/js/mailalerts.js @@ -1,26 +1,20 @@ /** - * 2007-2020 PrestaShop. + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA * * NOTICE OF LICENSE * - * This source file is subject to the Academic Free License 3.0 (AFL-3.0) - * that is bundled with this package in the file LICENSE.txt. + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. * It is also available through the world-wide-web at this URL: * https://opensource.org/licenses/AFL-3.0 * If you did not receive a copy of the license and are unable to * obtain it through the world-wide-web, please send an email * to license@prestashop.com so we can send you a copy immediately. * - * DISCLAIMER - * - * Do not edit or add to this file if you wish to upgrade PrestaShop to newer - * versions in the future. If you wish to customize PrestaShop for your - * needs please refer to http://www.prestashop.com for more information. - * - * @author PrestaShop SA - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ function addNotification(productId, productAttributeId) { diff --git a/mails/en/index.php b/mails/en/index.php index b7d9ae0..296d682 100644 --- a/mails/en/index.php +++ b/mails/en/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/mails/index.php b/mails/index.php index b7d9ae0..296d682 100644 --- a/mails/index.php +++ b/mails/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/ps_emailalerts.php b/ps_emailalerts.php index 0ecebae..d9ad178 100644 --- a/ps_emailalerts.php +++ b/ps_emailalerts.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_CAN_LOAD_FILES_')) { exit; @@ -63,7 +57,7 @@ public function __construct() { $this->name = 'ps_emailalerts'; $this->tab = 'administration'; - $this->version = '2.4.1'; + $this->version = '2.4.2'; $this->author = 'PrestaShop'; $this->need_instance = 0; @@ -436,13 +430,13 @@ public function hookActionValidateOrder($params) foreach ($customization[Product::CUSTOMIZE_TEXTFIELD] as $text) { $customization_text .= $text['name'] . ': ' . $text['value'] . '
'; } + $customization_text .= '---
'; } if (isset($customization[Product::CUSTOMIZE_FILE])) { $customization_text .= count($customization[Product::CUSTOMIZE_FILE]) . ' ' . $this->trans('image(s)', [], 'Modules.Emailalerts.Admin') . '
'; + $customization_text .= '---
'; } - - $customization_text .= '---
'; } if (method_exists('Tools', 'rtrimString')) { $customization_text = Tools::rtrimString($customization_text, '---
'); diff --git a/translations/index.php b/translations/index.php index b7d9ae0..296d682 100644 --- a/translations/index.php +++ b/translations/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/upgrade/index.php b/upgrade/index.php index b7d9ae0..296d682 100644 --- a/upgrade/index.php +++ b/upgrade/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/upgrade/install-2.1.0.php b/upgrade/install-2.1.0.php index 9054f83..d245168 100644 --- a/upgrade/install-2.1.0.php +++ b/upgrade/install-2.1.0.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/upgrade/install-2.3.4.php b/upgrade/install-2.3.4.php index 875483a..94148ec 100644 --- a/upgrade/install-2.3.4.php +++ b/upgrade/install-2.3.4.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/upgrade/upgrade-2.3.1.php b/upgrade/upgrade-2.3.1.php index bd82ba0..31af8f6 100644 --- a/upgrade/upgrade-2.3.1.php +++ b/upgrade/upgrade-2.3.1.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/upgrade/upgrade-2.3.3.php b/upgrade/upgrade-2.3.3.php index 5cef047..5d171f6 100644 --- a/upgrade/upgrade-2.3.3.php +++ b/upgrade/upgrade-2.3.3.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/upgrade/upgrade-2.4.0.php b/upgrade/upgrade-2.4.0.php index 62c5940..5522cd0 100644 --- a/upgrade/upgrade-2.4.0.php +++ b/upgrade/upgrade-2.4.0.php @@ -1,27 +1,21 @@ - * @copyright 2007-2022 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/upgrade/upgrade-2.4.1.php b/upgrade/upgrade-2.4.1.php index a3541f8..2caf0d1 100644 --- a/upgrade/upgrade-2.4.1.php +++ b/upgrade/upgrade-2.4.1.php @@ -1,27 +1,21 @@ - * @copyright 2007-2022 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ if (!defined('_PS_VERSION_')) { exit; diff --git a/views/index.php b/views/index.php index b7d9ae0..296d682 100644 --- a/views/index.php +++ b/views/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl index 6c8d625..1dbde81 100644 --- a/views/templates/admin/_configure/helpers/form/form.tpl +++ b/views/templates/admin/_configure/helpers/form/form.tpl @@ -1,27 +1,21 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *} {extends file="helpers/form/form.tpl"} diff --git a/views/templates/admin/_configure/helpers/form/index.php b/views/templates/admin/_configure/helpers/form/index.php index b7d9ae0..296d682 100644 --- a/views/templates/admin/_configure/helpers/form/index.php +++ b/views/templates/admin/_configure/helpers/form/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/admin/_configure/helpers/index.php b/views/templates/admin/_configure/helpers/index.php index b7d9ae0..296d682 100644 --- a/views/templates/admin/_configure/helpers/index.php +++ b/views/templates/admin/_configure/helpers/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/admin/_configure/index.php b/views/templates/admin/_configure/index.php index b7d9ae0..296d682 100644 --- a/views/templates/admin/_configure/index.php +++ b/views/templates/admin/_configure/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/admin/index.php b/views/templates/admin/index.php index b7d9ae0..296d682 100644 --- a/views/templates/admin/index.php +++ b/views/templates/admin/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/front/index.php b/views/templates/front/index.php index b7d9ae0..296d682 100644 --- a/views/templates/front/index.php +++ b/views/templates/front/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/front/mailalerts-account-line.tpl b/views/templates/front/mailalerts-account-line.tpl index 7455e1a..a3cb50e 100644 --- a/views/templates/front/mailalerts-account-line.tpl +++ b/views/templates/front/mailalerts-account-line.tpl @@ -1,27 +1,21 @@ -{* -* 2007-2016 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *} diff --git a/views/templates/front/mailalerts-account.tpl b/views/templates/front/mailalerts-account.tpl index 0e990a7..b7feb52 100644 --- a/views/templates/front/mailalerts-account.tpl +++ b/views/templates/front/mailalerts-account.tpl @@ -1,27 +1,21 @@ -{* -* 2007-2016 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *} {extends file='customer/page.tpl'} {block name='page_title'} diff --git a/views/templates/hook/index.php b/views/templates/hook/index.php index b7d9ae0..296d682 100644 --- a/views/templates/hook/index.php +++ b/views/templates/hook/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); diff --git a/views/templates/hook/my-account-footer.tpl b/views/templates/hook/my-account-footer.tpl index 096ca3f..ee116c5 100644 --- a/views/templates/hook/my-account-footer.tpl +++ b/views/templates/hook/my-account-footer.tpl @@ -1,27 +1,21 @@ -{* -* 2007-2016 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *}
  • {l s='My alerts' d='Modules.Emailalerts.Shop'} diff --git a/views/templates/hook/my-account.tpl b/views/templates/hook/my-account.tpl index 096ca3f..ee116c5 100644 --- a/views/templates/hook/my-account.tpl +++ b/views/templates/hook/my-account.tpl @@ -1,27 +1,21 @@ -{* -* 2007-2016 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *}
  • {l s='My alerts' d='Modules.Emailalerts.Shop'} diff --git a/views/templates/hook/product.tpl b/views/templates/hook/product.tpl index 5db4984..64588e4 100644 --- a/views/templates/hook/product.tpl +++ b/views/templates/hook/product.tpl @@ -1,27 +1,21 @@ -{* -* 2007-2015 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2015 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} +{** + * Copyright since 2007 PrestaShop SA and Contributors + * PrestaShop is an International Registered Trademark & Property of PrestaShop SA + * + * NOTICE OF LICENSE + * + * This source file is subject to the Academic Free License version 3.0 + * that is bundled with this package in the file LICENSE.md. + * It is also available through the world-wide-web at this URL: + * https://opensource.org/licenses/AFL-3.0 + * If you did not receive a copy of the license and are unable to + * obtain it through the world-wide-web, please send an email + * to license@prestashop.com so we can send you a copy immediately. + * + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 + *}
    diff --git a/views/templates/index.php b/views/templates/index.php index b7d9ae0..296d682 100644 --- a/views/templates/index.php +++ b/views/templates/index.php @@ -1,27 +1,21 @@ - * @copyright 2007-2020 PrestaShop SA - * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) - * International Registered Trademark & Property of PrestaShop SA + * @author PrestaShop SA and Contributors + * @copyright Since 2007 PrestaShop SA and Contributors + * @license https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0 */ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');