diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..7209621 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,15 @@ +branches: + - master +name-template: v$NEXT_PATCH_VERSION +tag-template: v$NEXT_PATCH_VERSION +categories: + - title: 🚀 Improvements + label: enhancement + - title: 🐛 Bug Fixes + label: bug +change-template: '- #$NUMBER: $TITLE by @$AUTHOR' +template: | + # Changes + + $CHANGES + diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..5e4bd60 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,47 @@ +Academic Free License ("AFL") v. 3.0 + +This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work: + +Licensed under the Academic Free License version 3.0 + +1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following: + + a) to reproduce the Original Work in copies, either alone or as part of a collective work; + + b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work; + + c) to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License; + + d) to perform the Original Work publicly; and + + e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license. + +5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c). + +6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation. + +9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c). + +10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware. + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License. + +12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License. + +13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. + +15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You. + +16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process. diff --git a/README.md b/README.md new file mode 100644 index 0000000..23312de --- /dev/null +++ b/README.md @@ -0,0 +1,23 @@ +# Legal Compliance + +## About + +This module helps merchants in getting compliant with applicable e-commerce law. + +## Reporting issues + +You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue]. + +## Contributing + +PrestaShop modules are open source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements. + +If you want to contribute to this project, please read the [Contribution guidelines][contribution-guidelines] + +## License + +This module is released under the [Academic Free License 3.0][AFL-3.0] + +[report-issue]: https://github.com/PrestaShop/PrestaShop/issues/new/choose +[contribution-guidelines]: https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/project-modules/ +[AFL-3.0]: https://opensource.org/licenses/AFL-3.0 diff --git a/Readme.md b/Readme.md deleted file mode 100644 index e69de29..0000000 diff --git a/config.xml b/config.xml index c3c0752..ba9cd66 100644 --- a/config.xml +++ b/config.xml @@ -2,7 +2,7 @@ ps_legalcompliance - + diff --git a/entities/AeucCMSRoleEmailEntity.php b/entities/AeucCMSRoleEmailEntity.php index 1a28fff..8bee0da 100644 --- a/entities/AeucCMSRoleEmailEntity.php +++ b/entities/AeucCMSRoleEmailEntity.php @@ -38,8 +38,8 @@ class AeucCMSRoleEmailEntity extends ObjectModel 'table' => 'aeuc_cmsrole_email', 'primary' => 'id', 'fields' => array( - 'id_mail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), - 'id_cms_role' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), + 'id_mail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), + 'id_cms_role' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), ), ); @@ -64,7 +64,7 @@ public static function getIdEmailFromCMSRoleId($id_cms_role) $sql = ' SELECT `id_mail` FROM `'._DB_PREFIX_.AeucCMSRoleEmailEntity::$definition['table'].'` - WHERE `id_cms_role` = '.(int)$id_cms_role; + WHERE `id_cms_role` = '.(int) $id_cms_role; return Db::getInstance()->executeS($sql); } @@ -89,7 +89,7 @@ public static function getCMSRoleIdsFromIdMail($id_mail) $sql = ' SELECT DISTINCT(`id_cms_role`) FROM `'._DB_PREFIX_.AeucCMSRoleEmailEntity::$definition['table'].'` - WHERE `id_mail` = '.(int)$id_mail; + WHERE `id_mail` = '.(int) $id_mail; return Db::getInstance()->executeS($sql); } diff --git a/entities/AeucEmailEntity.php b/entities/AeucEmailEntity.php index 11167a5..1a582bb 100644 --- a/entities/AeucEmailEntity.php +++ b/entities/AeucEmailEntity.php @@ -40,9 +40,9 @@ class AeucEmailEntity extends ObjectModel 'table' => 'aeuc_email', 'primary' => 'id', 'fields' => array( - 'id_mail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), - 'filename' => array('type' => self::TYPE_STRING, 'required' => true, 'size' => 64), - 'display_name' => array('type' => self::TYPE_STRING, 'required' => true, 'size' => 64), + 'id_mail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'), + 'filename' => array('type' => self::TYPE_STRING, 'required' => true, 'size' => 64), + 'display_name' => array('type' => self::TYPE_STRING, 'required' => true, 'size' => 64), ), ); diff --git a/ps_legalcompliance.php b/ps_legalcompliance.php index 0230ee3..980cf48 100644 --- a/ps_legalcompliance.php +++ b/ps_legalcompliance.php @@ -35,8 +35,8 @@ use PrestaShop\PrestaShop\Core\Payment\PaymentOption; /* Include required entities */ -include_once dirname(__FILE__).'/entities/AeucCMSRoleEmailEntity.php'; -include_once dirname(__FILE__).'/entities/AeucEmailEntity.php'; +include_once __DIR__.'/entities/AeucCMSRoleEmailEntity.php'; +include_once __DIR__.'/entities/AeucEmailEntity.php'; class Ps_LegalCompliance extends Module { @@ -64,7 +64,7 @@ public function __construct(EntityManager $entity_manager, { $this->name = 'ps_legalcompliance'; $this->tab = 'administration'; - $this->version = '3.0.1'; + $this->version = '3.0.2'; $this->author = 'PrestaShop'; $this->need_instance = 0; $this->bootstrap = true; @@ -395,8 +395,8 @@ public function setLegalContentToOrderMails() if ($role_id_legal_notice) { foreach ($account_email_ids_to_set as $email_id) { $assoc_obj = new AeucCMSRoleEmailEntity(); - $assoc_obj->id_mail = (int)$email_id; - $assoc_obj->id_cms_role = (int)$role_id_legal_notice; + $assoc_obj->id_mail = (int) $email_id; + $assoc_obj->id_cms_role = (int) $role_id_legal_notice; $assoc_obj->save(); } } @@ -406,7 +406,7 @@ public function setLegalContentToOrderMails() public function unloadTables() { $state = true; - $sql = require dirname(__FILE__).'/install/sql_install.php'; + $sql = require __DIR__.'/install/sql_install.php'; foreach ($sql as $name => $v) { $state &= Db::getInstance()->execute('DROP TABLE IF EXISTS '.$name); } @@ -419,7 +419,7 @@ public function loadTables() $state = true; // Create module's table - $sql = require dirname(__FILE__).'/install/sql_install.php'; + $sql = require __DIR__.'/install/sql_install.php'; foreach ($sql as $s) { $state &= Db::getInstance()->execute($s); } @@ -795,8 +795,7 @@ public function hookTermsAndConditions($param) $link_conditions, $link_revocation ) - ->setIdentifier('terms-and-conditions') - ; + ->setIdentifier('terms-and-conditions'); $returned_terms_and_conditions[] = $termsAndConditions; } @@ -815,13 +814,12 @@ public function hookTermsAndConditions($param) 'Modules.Legalcompliance.Shop' ) ) - ->setIdentifier('virtual-products') - ; + ->setIdentifier('virtual-products'); $returned_terms_and_conditions[] = $termsAndConditions; } - if (sizeof($returned_terms_and_conditions) > 0) { + if (count($returned_terms_and_conditions) > 0) { return $returned_terms_and_conditions; } else { return false; @@ -834,11 +832,11 @@ public function hookDisplayCMSPrintButton($param) $this->context->smarty->assign('directPrint', Tools::getValue('content_only') != '1'); $cms_repository = $this->entity_manager->getRepository('CMS'); - $cms_current = $cms_repository->i10nFindOneById((int)Tools::getValue('id_cms'), - (int)$this->context->language->id, - (int)$this->context->shop->id); + $cms_current = $cms_repository->i10nFindOneById((int) Tools::getValue('id_cms'), + (int) $this->context->language->id, + (int) $this->context->shop->id); $cms_current_link = - $this->context->link->getCMSLink($cms_current, $cms_current->link_rewrite, (bool)Configuration::get('PS_SSL_ENABLED')); + $this->context->link->getCMSLink($cms_current, $cms_current->link_rewrite, (bool) Configuration::get('PS_SSL_ENABLED')); if (!strpos($cms_current_link, '?')) { $cms_current_link .= '?direct_print=1'; @@ -860,7 +858,7 @@ public function hookDisplayProductPriceBlock($param) $product = $param['product']; $hook_type = $param['type']; - if (! $product instanceof Product) { + if (!$product instanceof Product) { $product_repository = $this->entity_manager->getRepository('Product'); $product = $product_repository->findOne((int) $product['id_product']); } @@ -939,8 +937,12 @@ public function hookDisplayProductPriceBlock($param) $smartyVars['after_price'] = array(); $delivery_addtional_info = Configuration::get('AEUC_LABEL_DELIVERY_ADDITIONAL', (int) $context_id_lang); - if (trim($delivery_addtional_info) != '') { - $smartyVars['after_price']['delivery_str_i18n'] .= '*'; + if (trim($delivery_addtional_info) !== '') { + if (array_key_exists('delivery_str_i18n', $smartyVars['after_price'])) { + $smartyVars['after_price']['delivery_str_i18n'] .= '*'; + } else { + $smartyVars['after_price']['delivery_str_i18n'] = '*'; + } } return $this->dumpHookDisplayProductPriceBlock($smartyVars, $hook_type); @@ -992,7 +994,7 @@ public function hookDisplayCheckoutSubtotalDetails($param) if ('shipping' === $param['subtotal']['type'] && 0 === $param['subtotal']['amount']) { $cms_role_repository = $this->entity_manager->getRepository('CMSRole'); $cms_page_shipping_and_payment = $cms_role_repository->findOneByName(self::LEGAL_SHIP_PAY); - $link = $this->context->link->getCMSLink((int)$cms_page_shipping_and_payment->id_cms); + $link = $this->context->link->getCMSLink((int) $cms_page_shipping_and_payment->id_cms); $this->context->smarty->assign(array('link' => $link)); return $this->display(__FILE__, 'hookDisplayCartPriceBlock_shipping_details.tpl'); @@ -1007,7 +1009,7 @@ private function emptyTemplatesCache() private function dumpHookDisplayProductPriceBlock(array $smartyVars, $hook_type, $additional_cache_param = false) { - $cache_id = sha1($hook_type.$additional_cache_param); + $cache_id = sha1($hook_type.$additional_cache_param.$this->context->language->id); $this->context->smarty->assign(array('smartyVars' => $smartyVars)); $this->context->controller->addJS($this->_path.'views/js/fo_aeuc_tnc.js', true); $template = 'hookDisplayProductPriceBlock_'.$hook_type.'.tpl'; diff --git a/tests/Unit/AdvancedEUComplianceTest.php b/tests/Unit/AdvancedEUComplianceTest.php index b40ae4e..3e5cd26 100644 --- a/tests/Unit/AdvancedEUComplianceTest.php +++ b/tests/Unit/AdvancedEUComplianceTest.php @@ -26,25 +26,20 @@ namespace PrestaShop\PrestaShop\Tests\Unit; -use Advancedeucompliance; -use Hook; -use PHPUnit_Framework_TestCase; -use PrestaShop\PrestaShop\Tests\Helper\Module; use PrestaShop\PrestaShop\Tests\TestCase\UnitTestCase; -use RepositoryManager; -require_once(_PS_MODULE_DIR_.'advancedeucompliance/advancedeucompliance.php'); -require_once(_PS_ROOT_DIR_.'/tests/TestCase/UnitTestCase.php'); +require_once _PS_MODULE_DIR_.'advancedeucompliance/advancedeucompliance.php'; +require_once _PS_ROOT_DIR_.'/tests/TestCase/UnitTestCase.php'; class AdvancedEUComplianceTest extends UnitTestCase { - public function setup() + protected function setup() { parent::setUpCommonStaticMocks(); } - public function teardown() + protected function teardown() { parent::tearDownCommonStaticMocks(); } diff --git a/tests/Unit/DummyTest.php b/tests/Unit/DummyTest.php index ec3d58b..fc63e73 100644 --- a/tests/Unit/DummyTest.php +++ b/tests/Unit/DummyTest.php @@ -9,8 +9,8 @@ class DummyTest extends PHPUnit_Framework_TestCase { - public function test_Dummy() + public function testDummy() { - $this->assertTrue(true, "Everything works fine"); + $this->assertTrue(true, 'Everything works fine'); } } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index cc4d183..2e867c6 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -25,6 +25,6 @@ * International Registered Trademark & Property of PrestaShop SA */ $mainDir = dirname(__DIR__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; -require_once($mainDir.'config/defines.inc.php'); -require_once(_PS_CONFIG_DIR_.'autoload.php'); -require($mainDir.'tests/vendor/autoload.php'); +require_once $mainDir.'config/defines.inc.php'; +require_once _PS_CONFIG_DIR_.'autoload.php'; +require $mainDir.'tests/vendor/autoload.php'; diff --git a/translations/de.php b/translations/de.php deleted file mode 100644 index 091aaf0..0000000 --- a/translations/de.php +++ /dev/null @@ -1,99 +0,0 @@ -advancedeucompliance_d602cd3160dcb3b836420a2e5683cb0f'] = 'Europäische Rechtssicherheit'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_a0445c0b106a1b48b719fc6fd5a734e9'] = 'Das Modul hilft europäischen Händlern, ihren Shop rechtssicher zu machen.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_bb8956c67b82c7444a80c6b2433dd8b4'] = 'Soll dieses Modul wirklich deinstalliert werden?'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_3b528a3fe35bcd29ad2ab0e77fe01d4d'] = 'Neuer Hook konnte nicht installiert werden'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_cac77d4c7de337f13ad1e89a8cecbc7f'] = 'Lieferzeit: 1-2 Werktage'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_eeb992239a8454067cd7a47bbf0df359'] = 'Lieferzeit: 7-10 Werktage'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_f4a0d7cb0cd45214c8ca5912c970de13'] = 'inkl. MwSt.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_befcac0f9644a7abee43e69f49252ac4'] = 'zzgl. MwSt.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_272c87c1b60ba25f293fab358ba94a39'] = 'Um fortzufahren, müssen Sie unseren Allgemeinen Geschäftsbedingungen zustimmen!'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_2223d375913a9a3b4619a1ada82f8de7'] = 'Etwas ist schief gelaufen. Sollte dieses Problem bestehen bleiben, nehmen Sie bitte Kontakt mit uns auf.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_7219074549f88adb580bf5a6fe57c459'] = 'Wählen Sie zuerst eine Zahlungsart'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_c0bf28c9c2b9c95f01ff4fddfed71432'] = 'Bitte erst "Widerruf von Download-Artikeln" anklicken!'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_5da618e8e4b89c66fe86e32cdafde142'] = 'ab'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_9060587edeb01a63e3d3edc959678d1e'] = 'Vorher'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_89bea8045e50a337d8ce9849a4e1633c'] = 'ohne Versandkosten'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_ea21841da70e6405af19fabc4ff8bdd9'] = 'fehlend'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_1045f54e17e9e40c46a304888134f958'] = 'Nicht anzeigen'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_c80372d827bd1757101adff95d8dfdba'] = 'Ihr Template scheint mit diesem Modul nicht kompatibel zu sein; einige erforderliche Vorlagen fehlen. Möglicherweise werden sich einige Optionen nicht auswirken.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_fc724a540ce30b0b634163c922d60bed'] = 'Einstellungen erfolgreich gespeichert!'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_d6a0f3d55f2b3e58af0560ed0ef6925d'] = 'CMS-Seite konnte mit der E-Mail-Vorlage nicht verknüpft werden'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_cca40d516b6d8c0b9c0e8c88752f1710'] = 'Label "AGB mit Widerrufsrecht" kann erst aktiviert werden, nachdem der Link "%s" mit einer CMS-Seite verknüpft worden ist.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_169f26196195b1ba3e10dd34fda1e110'] = 'Label "Versandkosten" kann erst aktiviert werden, nachdem der Link "%s" mit einer CMS-Seite verknüpft worden ist.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_dce8bc104eff9adc2d0e580b008721ec'] = 'Die Aktivierung des "One-Page-Checkout" ist nicht möglich, da Ihr Template mit dieser Option nicht kompatibel ist.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_23e162ba6bf36c7560ebbc868d9e2552'] = 'Rechtliche Hinweise'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_98664ee75f74254b622a52d86a798ae3'] = 'Allgemeine Geschäftsbedingungen (AGB)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_93fb7e4d4616f108db46461360b7a6ae'] = 'Widerrufsrecht'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_01ed64f3ede93b663b4d78d2a0693f0a'] = 'Widerrufs-Formular'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_c5f29bb36f9158d2e00f5d4dc213a0ff'] = 'Datenschutz'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_b305968eb47e25015e2cebf313f70842'] = 'Umweltschutz-Hinweise'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_5fb4f05f62f9967052977077d783fc2d'] = 'Versand und Zahlung'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_3ad6cb6100190c8f81e99fd52debf7ef'] = 'Label-Optionen'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_7329102f476b0501e39cd50c8a315e63'] = 'Lieferzeit (auf Lager)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_ff080adc004c17d79d36a0734ae7a79e'] = 'Zeigt die geschätzte Lieferzeit für Lagerartikel an. Zur Deaktivierung einfach freilassen!'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_90c14df48f5356a782eae1d39c06a364'] = 'Lieferzeit (nicht vorrätig)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_e41b0b5a9329a0959e8ca1a792b8f2c4'] = 'Zeigt die geschätzte Lieferzeit für nicht vorrätige Artikel an. Zur Deaktivierung einfach freilassen.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_714157963f7f7548cd9cc3046a31d2de'] = 'Anzeige Streichpreis'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_5400b516956ae7625857f5c569316fba'] = 'Zeigt bei reduzierten Artikeln zusätzlich den Originalpreis mit Zusatz "Alter Preis" an.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Aktiviert'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_b9f5c797ebbf55adccdd8539a65a0241'] = 'Deaktiviert'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_cce448884153975b6d9fa2116eb7b388'] = 'Anzeige MwSt.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_1aabae15098e05b040516d060dbbbeae'] = 'Zeigt neben dem Preis einen Steuerzusatz an (zzgl./inkl. MwSt).'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_f85a64cf43eb446308f74902dff3173c'] = 'Anzeige Versandkosten'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_f32e9a020c62352cf6e76d11bec023ae'] = 'Zeigt zusätzlich zur Preisangabe einen Hinweis auf die Versandkosten an.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_a9db5438316b53034348d7f062353be3'] = 'Falls aktiviert, müssen die Versandkosten mit einer CMS-Seite weiter unten (Verwaltung rechtskonformer Inhalte) verknüpft werden. Das Label wird auf diesen Inhalt verlinken.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_8c40a45ecb794a6599a72de4eb12eedc'] = 'Anzeige Gewicht'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_1baebea50e8acd4658ba2938ea8c20a9'] = 'Produktgewicht anzeigen (wenn die Information verfügbar ist und das Produktgewicht 1 %s übersteigt).'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_b9ce94c1da6a209c8abf065f519137c3'] = 'Dezimalstellen Gewicht'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_6e93a6c4af0970a53ab3982a84932c46'] = 'Auswahl der Dezimalstellen der Gewichtsangabe (z.B. 1 %s für 0 Dezimalstellen, 1.01 %s für zwei Dezimalstellen)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_a5571962864b29d86785fffc9069d5ca'] = 'Wert darf nicht negativ sein.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_36351ad1d80323e91bdc6f69caee6775'] = 'Widerrufsrecht in den AGB'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_50c550b9c0a0d6d8d7477915de9d6152'] = 'Widerrufsrecht in die AGB einschließen.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_a9f8920ab987fd7707b4b449ccfdcece'] = 'Falls aktiviert, muss das Widerrufsrecht mit einer CMS-Seite weiter unten (Verwaltung rechtskonformer Inhalte) verknüpft sein.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_f4ced086e850fc06ff4267366382f5d6'] = 'Widerrufsrecht für virtuelle Artikel'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_6ed59df8fcbd3aa25f434da69c19b219'] = 'Pflicht-Checkbox einfügen, falls der Warenkorb virtuelle Artikel enthält. Stellen Sie so sicher, dass der Kunde weiß, dass ein virtueller Artikel nicht zurückgenommen wird.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_80df40c6f7d32d92794f167acf86e15d'] = '"Ab Preis"-Anzeige (falls Varianten vorhanden)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_583efcddb7e2e0d291d713e0126f091b'] = '"Ab"-Label auch vor dem Artikelpreis von Varianten einfügen'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_2c5d047df77f799f0140d5e1881edd04'] = 'Da sich Preise von Varianten unterscheiden können, zeigt dieses Label an, dass der Endpreis höher ausfallen kann.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_37eb73e30edec1d0255047fdc03d100c'] = 'Freitext 1 (über Bestellübersicht)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_4729572eaf20960774f5a54fb3aed100'] = 'Freitext über der Bestellübersicht anzeigen'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_492c147d1a4919a2db1c1753516ca621'] = 'Freitext 2 (unter Bestellübersicht)'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_308849b73a4e55db002c9d56f046911c'] = 'Freitext unter der Bestellübersicht anzeigen'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_98f770b0af18ca763421bac22b4b6805'] = 'Funktionen'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_307676a395a3e913b32733a2ddcf1449'] = 'Aktiviere "An einen Freund senden"'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_c57fc80fe284ea2b7fe0e32ee9f56a65'] = 'Vor Aktivierung sollten Sie sich vergewissern, ob die von diesem Feature versandten E-Mails unter den rechtlichen Bedingungen Ihres Landes nicht als unerwünschte Werbung gelten.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_01fcd16be34de91e8b570c662396e617'] = 'Falls aktiviert, erlaubt das Modul "An einen Freund senden" Ihren Kunden, Freunden eine E-Mail mit einem Link auf die Artikelseite zu senden.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_ea6af6c587b95c2434e8e159d5461ac5'] = 'Aktiviere "Nachbestellen"'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_ee856332afbbe0d52192231820caf0f1'] = 'Falls aktiviert, erlaubt die Option "Nachbestellen" Ihren Kunden, per Mausklick eine Bestellung aus der Bestell-Historie zu wiederholen.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_1fa508d743a9f464f8b4510257ca492a'] = 'Vor Aktivierung sollten Sie sich vergewissern, ob dies unter den rechtlichen Bedingungen Ihres Landes nicht als unaufgefordert zugesandte Ware angesehen wird.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_effd118ee85f0eb8f280a083b86e6f98'] = 'Aktiviere One-Page-Checkout'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_68f8c15bb85c5904c889bde3408ea84a'] = 'Der moduleigene One-Page-Checkout zeigt folgende Bereiche auf einen Blick: Liefer-/Rechnungsadresse, AGB-Zustimmung, Bestellübersicht, Button "Zahlungspflichtig bestellen".'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_dd38733b61226829fd0fd1afc6ac8048'] = 'Zur Rechtssicherheit gemäß EU-Verbraucherrechterichtlinie zeigt der durch das Modul modifizierte Checkout zusätzliche Informationen an (AGB, Zahlungsarten usw.) auf einer einzigen Seite an.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_cadebe42ec37a2654161a876bc11d52c'] = 'Anteiliger Steuersatz auf Versand und Verpackung'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_a2bfc699a0a4b724be41740c97c6b27b'] = 'MwSt. für Versand und Verpackung entsprechend der Steueranteile im Warenkorb berechnen.'; -$_MODULE['<{advancedeucompliance}prestashop>advancedeucompliance_fcc61e05767ec3f1864c2f78086a596c'] = '-- Zugehörige CMS-Seite auswählen --'; -$_MODULE['<{advancedeucompliance}prestashop>adminaeuccontroller_d602cd3160dcb3b836420a2e5683cb0f'] = 'Europäische Rechtssicherheit'; -$_MODULE['<{advancedeucompliance}prestashop>email_attachments_form_c49b8914d58716ebb70e35e5a08db6dd'] = 'Zusätzliche E-Mail-Inhalte'; -$_MODULE['<{advancedeucompliance}prestashop>email_attachments_form_72c086dfe3fe34e1cda54e47b83a635c'] = 'Legen Sie hier fest, bei welchen E-Mails zusätzliche Informationen aus der Verwaltung rechtskonformer Inhalte oben angefügt werden sollen.'; -$_MODULE['<{advancedeucompliance}prestashop>email_attachments_form_96103eb82bd7f00ef55fac85c2f0a410'] = 'Sie können für jede Shop-Mail separat festlegen, welche zusätzlichen Informationen übermittelt werden sollen.'; -$_MODULE['<{advancedeucompliance}prestashop>email_attachments_form_e29252902fd4eaee6279ea5b60bc9092'] = 'Alle E-Mail-Vorlagen'; -$_MODULE['<{advancedeucompliance}prestashop>email_attachments_form_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; -$_MODULE['<{advancedeucompliance}prestashop>legal_cms_manager_form_c47ab33401eaded8f1cb361a05f20e14'] = 'Verwaltung rechtskonformer Inhalte'; -$_MODULE['<{advancedeucompliance}prestashop>legal_cms_manager_form_baabc807d33968c7c0e73da60034f1c9'] = 'Die Rechtslage in Ihrem Land verpflichtet Sie unter Umständen zur Angabe besonderer rechtlicher Informationen gegenüber Ihren Kunden.'; -$_MODULE['<{advancedeucompliance}prestashop>legal_cms_manager_form_c23a3bdb62aa5bd2a4ee872c0058acaf'] = 'Bitte geben Sie zu jedem unten stehenden Thema die CMS-Seite an, die die benötigte Information enthält:'; -$_MODULE['<{advancedeucompliance}prestashop>legal_cms_manager_form_c9cc8cce247e49bae79f15173ce97354'] = 'Speichern'; -$_MODULE['<{advancedeucompliance}prestashop>legal_cms_manager_form_bc6cae5795433bf5d5052485128f080c'] = 'Neue CMS-Seite hinzufügen'; -$_MODULE['<{advancedeucompliance}prestashop>hookoverridetosdisplay_97abaa921b2270031573362f57aad4a4'] = 'Allgemeine Geschäftsbedingungen'; -$_MODULE['<{advancedeucompliance}prestashop>hookoverridetosdisplay_5594dc635672facca12fc9181139eb2a'] = 'Die [1]Allgemeinen Geschäftsbedingungen[/1] und das [2]Widerrufsrecht[/2] habe ich zur Kenntnis genommen und stimme ihnen uneingeschränkt zu.'; -$_MODULE['<{advancedeucompliance}prestashop>hookoverridetosdisplay_8dcb551200cf41821db4d82a9487f5f1'] = 'Ich habe die Allgemeinen Geschäftsbedingungen und das Widerrufsrecht zur Kenntnis genommen und stimme ihnen uneingeschränkt zu.'; -$_MODULE['<{advancedeucompliance}prestashop>hookoverridetosdisplay_34f1e293041593ba9867658178b3ec19'] = 'Ich habe die Allgemeinen Geschäftsbedingungen zur Kenntnis genommen und stimme uneingeschränkt zu. [1]Allgemeine Geschäftsbedingungen lesen [/1]'; -$_MODULE['<{advancedeucompliance}prestashop>hookoverridetosdisplay_5d98b28e551153416f32493f5dc27a1f'] = 'Mir ist bekannt, dass Download-Artikel weder zurückgesandt noch erstattet werden können.'; - - -return $_MODULE; diff --git a/upgrade/index.php b/upgrade/index.php index 2a40ec7..1d9e487 100644 --- a/upgrade/index.php +++ b/upgrade/index.php @@ -24,12 +24,12 @@ * International Registered Trademark & Property of PrestaShop SA */ -header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); -header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); -header("Cache-Control: no-store, no-cache, must-revalidate"); -header("Cache-Control: post-check=0, pre-check=0", false); -header("Pragma: no-cache"); +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); -header("Location: ../"); +header('Location: ../'); exit; diff --git a/upgrade/upgrade-1.5.1.php b/upgrade/upgrade-1.5.1.php index cb553a9..67cd20c 100644 --- a/upgrade/upgrade-1.5.1.php +++ b/upgrade/upgrade-1.5.1.php @@ -39,6 +39,6 @@ function upgrade_module_1_5_1($module) $new_hook->description = 'Hook to display payment options'; $new_hook->position = true; - return (bool)$new_hook->add() && - (bool)$module->registerModulesBackwardCompatHook(); + return (bool) $new_hook->add() && + (bool) $module->registerModulesBackwardCompatHook(); }