Version Notes
Download this release
Release Info
Developer | Team FireGento |
Extension | FireGento_MageSetup |
Version | 2.2.1 |
Comparing to | |
See all releases |
Code changes from version 2.1.0 to 2.2.1
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php +10 -7
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php +3 -2
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php +22 -21
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php +6 -4
- app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php +5 -4
- app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price/Abstract.php +5 -3
- app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php +50 -8
- app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price/Abstract.php +12 -3
- app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php +64 -2
- app/code/community/FireGento/MageSetup/Block/Checkout/Information.php +3 -2
- app/code/community/FireGento/MageSetup/Block/Customer/Account/Agreements.php +16 -9
- app/code/community/FireGento/MageSetup/Block/Ga.php +0 -56
- app/code/community/FireGento/MageSetup/Block/Imprint/Content.php +21 -7
- app/code/community/FireGento/MageSetup/Block/Imprint/Field.php +4 -3
- app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php +133 -133
- app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php +61 -2
- app/code/community/FireGento/MageSetup/Helper/Data.php +5 -3
- app/code/community/FireGento/MageSetup/Model/Config.php +15 -7
- app/code/community/FireGento/MageSetup/Model/Newsletter/Observer.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Observer.php +405 -351
- app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Setup.php +5 -4
- app/code/community/FireGento/MageSetup/Model/Setup/Abstract.php +5 -3
- app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php +14 -12
- app/code/community/FireGento/MageSetup/Model/Setup/Cms.php +51 -11
- app/code/community/FireGento/MageSetup/Model/Setup/Email.php +14 -3
- app/code/community/FireGento/MageSetup/Model/Setup/Systemconfig.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Setup/Tax.php +12 -7
- app/code/community/FireGento/MageSetup/Model/Source/AgreementType.php +5 -2
- app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Source/RevocationProductType.php +95 -0
- app/code/community/FireGento/MageSetup/Model/Source/Tax/CustomerTaxClass.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php +5 -7
- app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php +8 -5
- app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php +8 -5
- app/code/community/FireGento/MageSetup/Model/Source/Tax/ProductTaxClass.php +3 -2
- app/code/community/FireGento/MageSetup/Model/Tax/Config.php +13 -34
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content.php +121 -0
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/expectations/testGetEmail.yaml +4 -0
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/expectations/testGetWeb.yaml +4 -0
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/fixtures/generalImprint.yaml +4 -0
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/providers/testGetEmail.yaml +4 -0
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/providers/testGetWeb.yaml +4 -0
- app/code/community/FireGento/MageSetup/Test/Config/Main.php +66 -4
- app/code/community/FireGento/MageSetup/Test/Config/Main/expectations/testModuleConfig.yaml +1 -1
- app/code/community/FireGento/MageSetup/Test/Model/Observer.php +96 -0
- app/code/community/FireGento/MageSetup/Test/Model/Observer/fixtures/testGoogleAnonymizationDisabled.yaml +5 -0
- app/code/community/FireGento/MageSetup/Test/Model/Observer/fixtures/testGoogleAnonymizationEnabled.yaml +5 -0
- app/code/community/FireGento/MageSetup/Test/Model/Source/AgreementType.php +2 -2
- app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType.php +2 -2
- app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType/expectations/testToOptionArray.yaml +1 -4
- app/code/community/FireGento/MageSetup/Test/features/product_list.feature +4 -4
- app/code/community/FireGento/MageSetup/Test/features/product_view.feature +4 -4
- app/code/community/FireGento/MageSetup/controllers/{MagesetupController.php → Adminhtml/MagesetupController.php} +4 -3
- app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php +3 -2
- app/code/community/FireGento/MageSetup/controllers/FrontendController.php +3 -2
- app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.0-2.0.1.php +2 -2
- app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.1-2.0.2.php +2 -2
- app/code/community/FireGento/MageSetup/etc/adminhtml.xml +24 -5
- app/code/community/FireGento/MageSetup/etc/at/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/at/tax.xml +6 -5
- app/code/community/FireGento/MageSetup/etc/ch/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/ch/tax.xml +5 -4
- app/code/community/FireGento/MageSetup/etc/config.xml +45 -74
- app/code/community/FireGento/MageSetup/etc/de/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/de/tax.xml +6 -5
- app/code/community/FireGento/MageSetup/etc/default/agreement.xml +22 -1
- app/code/community/FireGento/MageSetup/etc/default/cms.xml +14 -1
- app/code/community/FireGento/MageSetup/etc/default/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml +4 -1
- app/code/community/FireGento/MageSetup/etc/default/tax.xml +3 -2
- app/code/community/FireGento/MageSetup/etc/es/tax.xml +171 -0
- app/code/community/FireGento/MageSetup/etc/fr/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/fr/tax.xml +41 -16
- app/code/community/FireGento/MageSetup/etc/gb/tax.xml +3 -2
- app/code/community/FireGento/MageSetup/etc/it/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/it/tax.xml +12 -11
- app/code/community/FireGento/MageSetup/etc/nl/tax.xml +7 -3
- app/code/community/FireGento/MageSetup/etc/pl/email.xml +495 -0
- app/code/community/FireGento/MageSetup/etc/pl/tax.xml +190 -0
- app/code/community/FireGento/MageSetup/etc/ro/email.xml +495 -0
- app/code/community/FireGento/MageSetup/etc/ro/tax.xml +171 -0
- app/code/community/FireGento/MageSetup/etc/ru/cms.xml +2 -1
- app/code/community/FireGento/MageSetup/etc/ru/email.xml +51 -1
- app/code/community/FireGento/MageSetup/etc/ru/tax.xml +2 -1
- app/code/community/FireGento/MageSetup/etc/system.xml +21 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-install-0.5.0.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php +1 -1
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php +2 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-2.1.1-2.2.0.php +81 -0
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-2.2.0-2.2.1.php +47 -0
- app/design/adminhtml/default/default/layout/magesetup.xml +3 -8
- app/design/adminhtml/default/default/template/magesetup/extensions.phtml +0 -144
- app/design/adminhtml/default/default/template/magesetup/form.phtml +5 -3
- app/design/adminhtml/default/default/template/magesetup/notifications.phtml +1 -1
- app/design/frontend/base/default/layout/magesetup.xml +57 -9
- app/design/frontend/base/default/template/magesetup/checkout/additional.phtml +4 -2
- app/design/frontend/base/default/template/magesetup/checkout/multishipping/agreements.phtml +1 -1
- app/design/frontend/base/default/template/magesetup/checkout/multishipping/overview.phtml +2 -1
- app/design/frontend/base/default/template/magesetup/checkout/onepage/agreements.phtml +4 -2
- app/design/frontend/base/default/template/magesetup/checkout/onepage/review/item.phtml +242 -0
- app/design/frontend/base/default/template/magesetup/customer/form/tc-confirmation.phtml +1 -1
- app/design/frontend/base/default/template/magesetup/delivery_time.phtml +1 -1
- app/{code/community/FireGento/MageSetup/etc/ru/systemconfig.xml → design/frontend/base/default/template/magesetup/footer/links.phtml} +7 -17
- app/design/frontend/base/default/template/magesetup/imprint/address.phtml +1 -1
- app/design/frontend/base/default/template/magesetup/imprint/bank.phtml +1 -1
- app/design/frontend/base/default/template/magesetup/imprint/communication.phtml +8 -4
- app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml +8 -4
- app/design/frontend/base/default/template/magesetup/imprint/legal.phtml +1 -1
- app/design/frontend/base/default/template/magesetup/imprint/tax.phtml +1 -1
- app/design/frontend/base/default/template/magesetup/price_info.phtml +8 -8
- app/design/frontend/base/default/template/magesetup/shipping.phtml +1 -1
- app/design/frontend/rwd/default/template/magesetup/footer/links.phtml +6 -0
- app/etc/modules/FireGento_MageSetup.xml +2 -1
- app/locale/de_CH/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/de_CH/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/de_CH/template/magesetup/block/revocation.html +8 -1
- app/locale/de_CH/template/magesetup/block/revocation_form.html +51 -0
- app/locale/de_CH/template/magesetup/page/revocation_form.html +4 -0
- app/locale/de_DE/FireGento_MageSetup.csv +19 -10
- app/locale/de_DE/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/de_DE/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/de_DE/template/magesetup/block/business_terms.html +5 -0
- app/locale/de_DE/template/magesetup/block/revocation.html +8 -1
- app/locale/de_DE/template/magesetup/block/revocation_form.html +51 -0
- app/locale/de_DE/template/magesetup/page/revocation_form.html +4 -0
- app/locale/en_US/FireGento_MageSetup.csv +2 -1
- app/locale/en_US/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/en_US/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/en_US/template/magesetup/block/revocation.html +8 -1
- app/locale/en_US/template/magesetup/block/revocation_form.html +51 -0
- app/locale/en_US/template/magesetup/page/revocation_form.html +4 -0
- app/locale/fr_CH/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/fr_CH/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/fr_CH/template/magesetup/block/revocation.html +8 -1
- app/locale/fr_CH/template/magesetup/block/revocation_form.html +51 -0
- app/locale/fr_CH/template/magesetup/page/revocation_form.html +4 -0
- app/locale/fr_FR/FireGento_MageSetup.csv +85 -84
- app/locale/fr_FR/template/magesetup/agreement/business_terms.html +1 -1
- app/locale/fr_FR/template/magesetup/agreement/revocation.html +2 -2
- app/locale/fr_FR/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/fr_FR/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/fr_FR/template/magesetup/block/business_terms.html +2 -6
- app/locale/fr_FR/template/magesetup/block/revocation.html +9 -2
- app/locale/fr_FR/template/magesetup/block/revocation_form.html +51 -0
- app/locale/fr_FR/template/magesetup/page/404.html +4 -4
- app/locale/fr_FR/template/magesetup/page/business_terms.html +2 -2
- app/locale/fr_FR/template/magesetup/page/imprint.html +2 -12
- app/locale/fr_FR/template/magesetup/page/order.html +2 -36
- app/locale/fr_FR/template/magesetup/page/payment.html +3 -23
- app/locale/fr_FR/template/magesetup/page/privacy.html +2 -22
- app/locale/fr_FR/template/magesetup/page/revocation.html +2 -2
- app/locale/fr_FR/template/magesetup/page/revocation_form.html +4 -0
- app/locale/fr_FR/template/magesetup/page/shipping.html +1 -1
- app/locale/it_IT/FireGento_MageSetup.csv +113 -113
- app/locale/it_IT/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/it_IT/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/it_IT/template/magesetup/block/revocation.html +8 -1
- app/locale/it_IT/template/magesetup/block/revocation_form.html +51 -0
- app/locale/it_IT/template/magesetup/page/business_terms.html +2 -2
- app/locale/it_IT/template/magesetup/page/imprint.html +1 -1
- app/locale/it_IT/template/magesetup/page/order.html +0 -10
- app/locale/it_IT/template/magesetup/page/revocation.html +1 -1
- app/locale/it_IT/template/magesetup/page/revocation_form.html +4 -0
- app/locale/pl_PL/template/magesetup/agreement/business_terms.html +3 -0
- app/locale/pl_PL/template/magesetup/agreement/revocation.html +3 -0
- app/locale/pl_PL/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/pl_PL/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/pl_PL/template/magesetup/block/business_terms.html +7 -0
- app/locale/pl_PL/template/magesetup/block/revocation.html +8 -0
- app/locale/pl_PL/template/magesetup/block/revocation_form.html +53 -0
- app/locale/pl_PL/template/magesetup/page/404.html +12 -0
- app/locale/pl_PL/template/magesetup/page/business_terms.html +4 -0
- app/locale/pl_PL/template/magesetup/page/imprint.html +22 -0
- app/locale/pl_PL/template/magesetup/page/order.html +6 -0
- app/locale/pl_PL/template/magesetup/page/payment.html +6 -0
- app/locale/pl_PL/template/magesetup/page/privacy.html +6 -0
- app/locale/pl_PL/template/magesetup/page/revocation.html +4 -0
- app/locale/pl_PL/template/magesetup/page/revocation_form.html +4 -0
- app/locale/pl_PL/template/magesetup/page/shipping.html +6 -0
- app/locale/ro_RO/template/magesetup/agreement/business_terms.html +3 -0
- app/locale/ro_RO/template/magesetup/agreement/revocation.html +3 -0
- app/locale/ro_RO/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/ro_RO/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/ro_RO/template/magesetup/block/business_terms.html +7 -0
- app/locale/ro_RO/template/magesetup/block/revocation.html +8 -0
- app/locale/ro_RO/template/magesetup/block/revocation_form.html +53 -0
- app/locale/ro_RO/template/magesetup/page/404.html +9 -0
- app/locale/ro_RO/template/magesetup/page/business_terms.html +4 -0
- app/locale/ro_RO/template/magesetup/page/imprint.html +22 -0
- app/locale/ro_RO/template/magesetup/page/order.html +6 -0
- app/locale/ro_RO/template/magesetup/page/payment.html +6 -0
- app/locale/ro_RO/template/magesetup/page/privacy.html +6 -0
- app/locale/ro_RO/template/magesetup/page/revocation.html +4 -0
- app/locale/ro_RO/template/magesetup/page/revocation_form.html +4 -0
- app/locale/ro_RO/template/magesetup/page/shipping.html +4 -0
- app/locale/ru_RU/FireGento_MageSetup.csv +1 -1
- app/locale/ru_RU/template/magesetup/agreement/revocation_digital.html +2 -0
- app/locale/ru_RU/template/magesetup/agreement/revocation_service.html +2 -0
- app/locale/ru_RU/template/magesetup/block/revocation.html +8 -1
- app/locale/ru_RU/template/magesetup/block/revocation_form.html +51 -0
- app/locale/ru_RU/template/magesetup/page/revocation_form.html +4 -0
- package.xml +5 -5
- skin/frontend/base/default/css/magesetup/checkout.css +63 -14
- skin/frontend/base/default/css/magesetup/default.css +19 -0
- skin/frontend/rwd/default/css/magesetup/checkout.css +91 -0
- skin/frontend/rwd/default/css/magesetup/default.css +21 -0
app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.4.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Displays a form with some options to setup things
|
25 |
*
|
@@ -107,7 +108,7 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
107 |
{
|
108 |
$options = Mage::getSingleton('adminhtml/system_config_source_locale')->toOptionArray();
|
109 |
foreach ($options as $key => $value) {
|
110 |
-
$filePath = Mage::getBaseDir('locale')
|
111 |
if (!file_exists($filePath)) {
|
112 |
unset($options[$key]);
|
113 |
}
|
@@ -125,7 +126,7 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
125 |
{
|
126 |
$options = Mage::getSingleton('adminhtml/system_config_source_locale')->toOptionArray();
|
127 |
foreach ($options as $key => $value) {
|
128 |
-
$filePath = Mage::getBaseDir('locale')
|
129 |
if (!file_exists($filePath)) {
|
130 |
unset($options[$key]);
|
131 |
}
|
@@ -190,7 +191,8 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
190 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
191 |
if ($taxClass->class_type != 'PRODUCT'
|
192 |
|| $taxClass->execute != 1
|
193 |
-
|| strpos($identifier, 'shipping') === 0
|
|
|
194 |
continue;
|
195 |
}
|
196 |
|
@@ -220,7 +222,7 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
220 |
|
221 |
// If the given file does not exist, use the default file
|
222 |
if (!file_exists($configFile)) {
|
223 |
-
$configFile = $moduleDir. DS . 'default' . DS . 'tax.xml';
|
224 |
}
|
225 |
|
226 |
$xml = new SimpleXMLElement(file_get_contents($configFile));
|
@@ -229,7 +231,8 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
229 |
$taxClasses = $xml->default->magesetup->tax_classes->default;
|
230 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
231 |
if ($taxClass->class_type != 'CUSTOMER'
|
232 |
-
|| $taxClass->execute != 1
|
|
|
233 |
continue;
|
234 |
}
|
235 |
$countryTaxClasses[$countryId][(string)$taxClass->class_id] = (string)$taxClass->class_name;
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.4.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Displays a form with some options to setup things
|
26 |
*
|
108 |
{
|
109 |
$options = Mage::getSingleton('adminhtml/system_config_source_locale')->toOptionArray();
|
110 |
foreach ($options as $key => $value) {
|
111 |
+
$filePath = Mage::getBaseDir('locale') . DS . $value['value'] . DS . 'template' . DS . 'email';
|
112 |
if (!file_exists($filePath)) {
|
113 |
unset($options[$key]);
|
114 |
}
|
126 |
{
|
127 |
$options = Mage::getSingleton('adminhtml/system_config_source_locale')->toOptionArray();
|
128 |
foreach ($options as $key => $value) {
|
129 |
+
$filePath = Mage::getBaseDir('locale') . DS . $value['value'] . DS . 'template' . DS . 'magesetup';
|
130 |
if (!file_exists($filePath)) {
|
131 |
unset($options[$key]);
|
132 |
}
|
191 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
192 |
if ($taxClass->class_type != 'PRODUCT'
|
193 |
|| $taxClass->execute != 1
|
194 |
+
|| strpos($identifier, 'shipping') === 0
|
195 |
+
) {
|
196 |
continue;
|
197 |
}
|
198 |
|
222 |
|
223 |
// If the given file does not exist, use the default file
|
224 |
if (!file_exists($configFile)) {
|
225 |
+
$configFile = $moduleDir . DS . 'default' . DS . 'tax.xml';
|
226 |
}
|
227 |
|
228 |
$xml = new SimpleXMLElement(file_get_contents($configFile));
|
231 |
$taxClasses = $xml->default->magesetup->tax_classes->default;
|
232 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
233 |
if ($taxClass->class_type != 'CUSTOMER'
|
234 |
+
|| $taxClass->execute != 1
|
235 |
+
) {
|
236 |
continue;
|
237 |
}
|
238 |
$countryTaxClasses[$countryId][(string)$taxClass->class_id] = (string)$taxClass->class_name;
|
app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Newsletter Subscriber Status Grid Container
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Newsletter Subscriber Status Grid Container
|
26 |
*
|
app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Newsletter Subscriber Status Grid
|
25 |
*
|
@@ -64,35 +65,35 @@ class FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status_Grid
|
|
64 |
protected function _prepareColumns()
|
65 |
{
|
66 |
$this->addColumn('subscriber', array(
|
67 |
-
'header'
|
68 |
-
'index'
|
69 |
-
'type'
|
70 |
-
'width'
|
71 |
));
|
72 |
|
73 |
$this->addColumn('email', array(
|
74 |
-
'header'
|
75 |
-
'index'
|
76 |
));
|
77 |
|
78 |
$this->addColumn('status', array(
|
79 |
-
'header'
|
80 |
-
'index'
|
81 |
-
'width'
|
82 |
-
'type'
|
83 |
-
'options'
|
84 |
-
Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE
|
85 |
-
Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED
|
86 |
Mage_Newsletter_Model_Subscriber::STATUS_UNSUBSCRIBED => Mage::helper('newsletter')->__('Unsubscribed'),
|
87 |
-
Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED
|
88 |
)
|
89 |
));
|
90 |
|
91 |
$this->addColumn('created_at', array(
|
92 |
-
'header'
|
93 |
-
'index'
|
94 |
-
'type'
|
95 |
-
'width'
|
96 |
));
|
97 |
|
98 |
return parent::_prepareColumns();
|
@@ -105,7 +106,7 @@ class FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status_Grid
|
|
105 |
*/
|
106 |
public function getGridUrl()
|
107 |
{
|
108 |
-
return $this->getUrl('*/*/grid', array('_current'=> true));
|
109 |
}
|
110 |
|
111 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Newsletter Subscriber Status Grid
|
26 |
*
|
65 |
protected function _prepareColumns()
|
66 |
{
|
67 |
$this->addColumn('subscriber', array(
|
68 |
+
'header' => Mage::helper('newsletter')->__('ID'),
|
69 |
+
'index' => 'subscriber',
|
70 |
+
'type' => 'int',
|
71 |
+
'width' => '75px'
|
72 |
));
|
73 |
|
74 |
$this->addColumn('email', array(
|
75 |
+
'header' => Mage::helper('newsletter')->__('Email'),
|
76 |
+
'index' => 'email'
|
77 |
));
|
78 |
|
79 |
$this->addColumn('status', array(
|
80 |
+
'header' => Mage::helper('newsletter')->__('Status'),
|
81 |
+
'index' => 'status',
|
82 |
+
'width' => '150px',
|
83 |
+
'type' => 'options',
|
84 |
+
'options' => array(
|
85 |
+
Mage_Newsletter_Model_Subscriber::STATUS_NOT_ACTIVE => Mage::helper('newsletter')->__('Not Activated'),
|
86 |
+
Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED => Mage::helper('newsletter')->__('Subscribed'),
|
87 |
Mage_Newsletter_Model_Subscriber::STATUS_UNSUBSCRIBED => Mage::helper('newsletter')->__('Unsubscribed'),
|
88 |
+
Mage_Newsletter_Model_Subscriber::STATUS_UNCONFIRMED => Mage::helper('newsletter')->__('Unconfirmed'),
|
89 |
)
|
90 |
));
|
91 |
|
92 |
$this->addColumn('created_at', array(
|
93 |
+
'header' => Mage::helper('adminhtml')->__('Created At'),
|
94 |
+
'index' => 'created_at',
|
95 |
+
'type' => 'datetime',
|
96 |
+
'width' => '150px'
|
97 |
));
|
98 |
|
99 |
return parent::_prepareColumns();
|
106 |
*/
|
107 |
public function getGridUrl()
|
108 |
{
|
109 |
+
return $this->getUrl('*/*/grid', array('_current' => true));
|
110 |
}
|
111 |
|
112 |
/**
|
app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.4.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Displays MageSetup notifications
|
25 |
*
|
@@ -34,7 +35,8 @@ class FireGento_MageSetup_Block_Adminhtml_Notifications extends Mage_Adminhtml_B
|
|
34 |
*/
|
35 |
protected function _construct()
|
36 |
{
|
37 |
-
|
|
|
38 |
}
|
39 |
|
40 |
/**
|
@@ -54,7 +56,7 @@ class FireGento_MageSetup_Block_Adminhtml_Notifications extends Mage_Adminhtml_B
|
|
54 |
*/
|
55 |
public function getManageUrl()
|
56 |
{
|
57 |
-
return $this->getUrl('
|
58 |
}
|
59 |
|
60 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.4.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Displays MageSetup notifications
|
26 |
*
|
35 |
*/
|
36 |
protected function _construct()
|
37 |
{
|
38 |
+
parent::_construct();
|
39 |
+
$this->addData(array('cache_lifetime' => null));
|
40 |
}
|
41 |
|
42 |
/**
|
56 |
*/
|
57 |
public function getManageUrl()
|
58 |
{
|
59 |
+
return $this->getUrl('magesetup/magesetup');
|
60 |
}
|
61 |
|
62 |
/**
|
app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Enhanced block for product price display of bundle products. Contains the normal price.phtml
|
25 |
* rendering and additionally a configured static block.
|
@@ -83,7 +84,7 @@ class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price
|
|
83 |
return '';
|
84 |
}
|
85 |
|
86 |
-
$locale
|
87 |
$taxRate = Zend_Locale_Format::toFloat($this->getTaxRate(), array('locale' => $locale));
|
88 |
|
89 |
return $this->__('%s%%', $taxRate);
|
@@ -132,7 +133,7 @@ class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price
|
|
132 |
if (is_null($taxPercent)) {
|
133 |
$taxClassId = $product->getTaxClassId();
|
134 |
if ($taxClassId) {
|
135 |
-
$request
|
136 |
$taxPercent = Mage::getSingleton('tax/calculation')->getRate($request->setProductClassId($taxClassId));
|
137 |
}
|
138 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Enhanced block for product price display of bundle products. Contains the normal price.phtml
|
26 |
* rendering and additionally a configured static block.
|
84 |
return '';
|
85 |
}
|
86 |
|
87 |
+
$locale = Mage::app()->getLocale()->getLocaleCode();
|
88 |
$taxRate = Zend_Locale_Format::toFloat($this->getTaxRate(), array('locale' => $locale));
|
89 |
|
90 |
return $this->__('%s%%', $taxRate);
|
133 |
if (is_null($taxPercent)) {
|
134 |
$taxClassId = $product->getTaxClassId();
|
135 |
if ($taxClassId) {
|
136 |
+
$request = Mage::getSingleton('tax/calculation')->getRateRequest(null, null, null, null);
|
137 |
$taxPercent = Mage::getSingleton('tax/calculation')->getRate($request->setProductClassId($taxClassId));
|
138 |
}
|
139 |
}
|
app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price/Abstract.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
@@ -30,7 +30,9 @@
|
|
30 |
*/
|
31 |
|
32 |
// @codingStandardsIgnoreStart
|
33 |
-
if (Mage::getConfig()->getModuleConfig('Sitewards_B2BProfessional')->is('active', 'true')
|
|
|
|
|
34 |
|
35 |
abstract class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price_Abstract
|
36 |
extends Sitewards_B2BProfessional_Block_Price
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
30 |
*/
|
31 |
|
32 |
// @codingStandardsIgnoreStart
|
33 |
+
if (Mage::getConfig()->getModuleConfig('Sitewards_B2BProfessional')->is('active', 'true')
|
34 |
+
&& version_compare(Mage::getConfig()->getModuleConfig('Sitewards_B2BProfessional')->version, '2.1.0', '<=')
|
35 |
+
) {
|
36 |
|
37 |
abstract class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price_Abstract
|
38 |
extends Sitewards_B2BProfessional_Block_Price
|
app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Enhanced block for product price display of all products in spite of bundles (got own block!).
|
25 |
* Contains the normal price.phtml rendering and additionally a configured static block.
|
@@ -39,6 +40,24 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
39 |
'dermodpro/bcp/catalog/product/view/tierprices.phtml'
|
40 |
);
|
41 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
42 |
/**
|
43 |
* Add content of template block below price html if defined in config
|
44 |
*
|
@@ -60,6 +79,7 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
60 |
->setFormattedTaxRate($this->getFormattedTaxRate())
|
61 |
->setIsIncludingTax($this->isIncludingTax())
|
62 |
->setIsIncludingShippingCosts($this->isIncludingShippingCosts())
|
|
|
63 |
->setIsShowShippingLink($this->isShowShippingLink())
|
64 |
->setIsShowWeightInfo($this->getIsShowWeightInfo())
|
65 |
->setFormattedWeight($this->getFormattedWeight())
|
@@ -71,7 +91,7 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
71 |
Mage::dispatchEvent('magesetup_after_product_price',
|
72 |
array(
|
73 |
'html_obj' => $htmlObject,
|
74 |
-
'block'
|
75 |
)
|
76 |
);
|
77 |
|
@@ -97,7 +117,8 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
97 |
|
98 |
$pathInfo = Mage::app()->getRequest()->getPathInfo();
|
99 |
if (strpos($pathInfo, 'catalog/category/view') !== false
|
100 |
-
|| strpos($pathInfo, 'catalogsearch/result') !== false
|
|
|
101 |
if ($this->getProduct()->getDeliveryTime()) {
|
102 |
$html = '<p class="delivery-time">';
|
103 |
$html .= $this->__('Delivery Time') . ': ' . $this->getProduct()->getDeliveryTime();
|
@@ -114,7 +135,7 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
114 |
*/
|
115 |
public function getTaxRate()
|
116 |
{
|
117 |
-
$taxRateKey = 'tax_rate_'
|
118 |
if (!$this->getData($taxRateKey)) {
|
119 |
$this->setData($taxRateKey, $this->_loadTaxCalculationRate($this->getProduct()));
|
120 |
}
|
@@ -135,7 +156,7 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
135 |
return '';
|
136 |
}
|
137 |
|
138 |
-
$locale
|
139 |
$taxRate = Zend_Locale_Format::toFloat($this->getTaxRate(), array('locale' => $locale));
|
140 |
|
141 |
return $this->__('%s%%', $taxRate);
|
@@ -149,7 +170,8 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
149 |
public function isIncludingTax()
|
150 |
{
|
151 |
if (!$this->getData('is_including_tax')) {
|
152 |
-
$
|
|
|
153 |
}
|
154 |
|
155 |
return $this->getData('is_including_tax');
|
@@ -201,7 +223,14 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
201 |
if (is_null($taxPercent)) {
|
202 |
$taxClassId = $product->getTaxClassId();
|
203 |
if ($taxClassId) {
|
204 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
205 |
$taxPercent = Mage::getSingleton('tax/calculation')->getRate($request->setProductClassId($taxClassId));
|
206 |
}
|
207 |
}
|
@@ -233,6 +262,19 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
233 |
return floatval($this->getProduct()->getWeight()) . ' ' . Mage::getStoreConfig('catalog/price/weight_unit');
|
234 |
}
|
235 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
236 |
/**
|
237 |
* Translate block sentence
|
238 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Enhanced block for product price display of all products in spite of bundles (got own block!).
|
26 |
* Contains the normal price.phtml rendering and additionally a configured static block.
|
40 |
'dermodpro/bcp/catalog/product/view/tierprices.phtml'
|
41 |
);
|
42 |
|
43 |
+
/**
|
44 |
+
* Add the tierprice default templates
|
45 |
+
*
|
46 |
+
* @return FireGento_MageSetup_Block_Catalog_Product_Price
|
47 |
+
*/
|
48 |
+
protected function _beforeToHtml()
|
49 |
+
{
|
50 |
+
$templatesNode = Mage::getConfig()->getNode('magesetup/price/tierprice_default_templates');
|
51 |
+
if ($templatesNode) {
|
52 |
+
$templates = $templatesNode->asArray();
|
53 |
+
foreach ($templates as $template) {
|
54 |
+
$this->addTierpriceDefaultTemplate($template);
|
55 |
+
}
|
56 |
+
}
|
57 |
+
|
58 |
+
return parent::_beforeToHtml();
|
59 |
+
}
|
60 |
+
|
61 |
/**
|
62 |
* Add content of template block below price html if defined in config
|
63 |
*
|
79 |
->setFormattedTaxRate($this->getFormattedTaxRate())
|
80 |
->setIsIncludingTax($this->isIncludingTax())
|
81 |
->setIsIncludingShippingCosts($this->isIncludingShippingCosts())
|
82 |
+
->setPriceDisplayType(Mage::helper('tax')->getPriceDisplayType())
|
83 |
->setIsShowShippingLink($this->isShowShippingLink())
|
84 |
->setIsShowWeightInfo($this->getIsShowWeightInfo())
|
85 |
->setFormattedWeight($this->getFormattedWeight())
|
91 |
Mage::dispatchEvent('magesetup_after_product_price',
|
92 |
array(
|
93 |
'html_obj' => $htmlObject,
|
94 |
+
'block' => $this,
|
95 |
)
|
96 |
);
|
97 |
|
117 |
|
118 |
$pathInfo = Mage::app()->getRequest()->getPathInfo();
|
119 |
if (strpos($pathInfo, 'catalog/category/view') !== false
|
120 |
+
|| strpos($pathInfo, 'catalogsearch/result') !== false
|
121 |
+
) {
|
122 |
if ($this->getProduct()->getDeliveryTime()) {
|
123 |
$html = '<p class="delivery-time">';
|
124 |
$html .= $this->__('Delivery Time') . ': ' . $this->getProduct()->getDeliveryTime();
|
135 |
*/
|
136 |
public function getTaxRate()
|
137 |
{
|
138 |
+
$taxRateKey = 'tax_rate_' . $this->getProduct()->getId();
|
139 |
if (!$this->getData($taxRateKey)) {
|
140 |
$this->setData($taxRateKey, $this->_loadTaxCalculationRate($this->getProduct()));
|
141 |
}
|
156 |
return '';
|
157 |
}
|
158 |
|
159 |
+
$locale = Mage::app()->getLocale()->getLocaleCode();
|
160 |
$taxRate = Zend_Locale_Format::toFloat($this->getTaxRate(), array('locale' => $locale));
|
161 |
|
162 |
return $this->__('%s%%', $taxRate);
|
170 |
public function isIncludingTax()
|
171 |
{
|
172 |
if (!$this->getData('is_including_tax')) {
|
173 |
+
$includesTax = Mage::helper('tax')->priceIncludesTax();
|
174 |
+
$this->setData('is_including_tax', $includesTax);
|
175 |
}
|
176 |
|
177 |
return $this->getData('is_including_tax');
|
223 |
if (is_null($taxPercent)) {
|
224 |
$taxClassId = $product->getTaxClassId();
|
225 |
if ($taxClassId) {
|
226 |
+
$storeId = Mage::app()->getStore()->getId();
|
227 |
+
$groupId = Mage::getSingleton('customer/session')->getCustomerGroupId();
|
228 |
+
$group = Mage::getModel('customer/group')->load($groupId);
|
229 |
+
$customerTaxClassId = $group->getData('tax_class_id');
|
230 |
+
|
231 |
+
/* @var $calculation Mage_Tax_Model_Calculation */
|
232 |
+
$calculation = Mage::getSingleton('tax/calculation');
|
233 |
+
$request = $calculation->getRateRequest(null, null, $customerTaxClassId, $storeId);
|
234 |
$taxPercent = Mage::getSingleton('tax/calculation')->getRate($request->setProductClassId($taxClassId));
|
235 |
}
|
236 |
}
|
262 |
return floatval($this->getProduct()->getWeight()) . ' ' . Mage::getStoreConfig('catalog/price/weight_unit');
|
263 |
}
|
264 |
|
265 |
+
/**
|
266 |
+
* Add a tierprice default template
|
267 |
+
*
|
268 |
+
* @param string $template Template
|
269 |
+
* @return FireGento_MageSetup_Block_Catalog_Product_Price
|
270 |
+
*/
|
271 |
+
public function addTierpriceDefaultTemplate($template)
|
272 |
+
{
|
273 |
+
$this->_tierPriceDefaultTemplates[] = $template;
|
274 |
+
|
275 |
+
return $this;
|
276 |
+
}
|
277 |
+
|
278 |
/**
|
279 |
* Translate block sentence
|
280 |
*
|
app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price/Abstract.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Enhanced block for product price display of all products in spite of bundles (got own block!).
|
25 |
* Contains the normal price.phtml rendering and additionally a configured static block.
|
@@ -32,7 +33,7 @@
|
|
32 |
// @codingStandardsIgnoreStart
|
33 |
if (
|
34 |
Mage::getConfig()->getModuleConfig('Sitewards_B2BProfessional')->is('active', 'true')
|
35 |
-
&& version_compare
|
36 |
) {
|
37 |
|
38 |
abstract class FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
@@ -49,6 +50,14 @@ if (
|
|
49 |
|
50 |
}
|
51 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
52 |
} else {
|
53 |
|
54 |
abstract class FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Enhanced block for product price display of all products in spite of bundles (got own block!).
|
26 |
* Contains the normal price.phtml rendering and additionally a configured static block.
|
33 |
// @codingStandardsIgnoreStart
|
34 |
if (
|
35 |
Mage::getConfig()->getModuleConfig('Sitewards_B2BProfessional')->is('active', 'true')
|
36 |
+
&& version_compare(Mage::getConfig()->getModuleConfig('Sitewards_B2BProfessional')->version, '2.1.0', '<=')
|
37 |
) {
|
38 |
|
39 |
abstract class FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
50 |
|
51 |
}
|
52 |
|
53 |
+
} elseif (Mage::getConfig()->getModuleConfig('OrganicInternet_SimpleConfigurableProducts')->is('active', 'true')) {
|
54 |
+
|
55 |
+
abstract class FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
56 |
+
extends OrganicInternet_SimpleConfigurableProducts_Catalog_Block_Product_Price
|
57 |
+
{
|
58 |
+
|
59 |
+
}
|
60 |
+
|
61 |
} else {
|
62 |
|
63 |
abstract class FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
app/code/community/FireGento/MageSetup/Block/Checkout/Agreements.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Block to display agreements on checkout.
|
25 |
*
|
@@ -40,6 +41,7 @@ class FireGento_MageSetup_Block_Checkout_Agreements extends Mage_Checkout_Block_
|
|
40 |
if (!Mage::getStoreConfigFlag('checkout/options/enable_agreements')) {
|
41 |
$agreements = array();
|
42 |
} else {
|
|
|
43 |
$agreements = parent::getAgreements();
|
44 |
if ($this->_getCustomerSession()->isLoggedIn()) {
|
45 |
$agreements->addFieldToFilter('agreement_type', array('in' => array(
|
@@ -53,12 +55,43 @@ class FireGento_MageSetup_Block_Checkout_Agreements extends Mage_Checkout_Block_
|
|
53 |
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
|
54 |
)));
|
55 |
}
|
|
|
|
|
56 |
}
|
|
|
57 |
$this->setAgreements($agreements);
|
58 |
}
|
|
|
59 |
return $this->getData('agreements');
|
60 |
}
|
61 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
62 |
/**
|
63 |
* Retrieve the customer session
|
64 |
*
|
@@ -68,4 +101,33 @@ class FireGento_MageSetup_Block_Checkout_Agreements extends Mage_Checkout_Block_
|
|
68 |
{
|
69 |
return Mage::getSingleton('customer/session');
|
70 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
71 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Block to display agreements on checkout.
|
26 |
*
|
41 |
if (!Mage::getStoreConfigFlag('checkout/options/enable_agreements')) {
|
42 |
$agreements = array();
|
43 |
} else {
|
44 |
+
/** @var Mage_Checkout_Model_Resource_Agreement_Collection $agreements */
|
45 |
$agreements = parent::getAgreements();
|
46 |
if ($this->_getCustomerSession()->isLoggedIn()) {
|
47 |
$agreements->addFieldToFilter('agreement_type', array('in' => array(
|
55 |
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
|
56 |
)));
|
57 |
}
|
58 |
+
|
59 |
+
$this->_addRevocationProductTypesFilter($agreements);
|
60 |
}
|
61 |
+
|
62 |
$this->setAgreements($agreements);
|
63 |
}
|
64 |
+
|
65 |
return $this->getData('agreements');
|
66 |
}
|
67 |
|
68 |
+
/**
|
69 |
+
* Display only those checkout agreements which match the product in cart
|
70 |
+
*
|
71 |
+
* @param Mage_Checkout_Model_Resource_Agreement_Collection $agreements
|
72 |
+
*/
|
73 |
+
protected function _addRevocationProductTypesFilter($agreements)
|
74 |
+
{
|
75 |
+
/** @var $productCollection Mage_Catalog_Model_Resource_Product_Collection */
|
76 |
+
$productCollection = Mage::getResourceModel('catalog/product_collection')
|
77 |
+
->addAttributeToFilter('entity_id', array('in' => $this->_getProductIdsInQuote()))
|
78 |
+
->joinAttribute('revocation_product_type', 'catalog_product/revocation_product_type', 'entity_id', null, 'left')
|
79 |
+
->addAttributeToSelect('revocation_product_type');
|
80 |
+
|
81 |
+
$revocationProductTypes = array(FireGento_MageSetup_Model_Source_RevocationProductType::REVOCATION_PRODUCT_TYPE_ALL => FireGento_MageSetup_Model_Source_RevocationProductType::REVOCATION_PRODUCT_TYPE_ALL);
|
82 |
+
$defaultRevocationProductType = Mage::getStoreConfig('checkout/options/default_revocation_product_type');
|
83 |
+
|
84 |
+
foreach ($productCollection->getColumnValues('revocation_product_type') as $revocationProductType) {
|
85 |
+
if ($revocationProductType) {
|
86 |
+
$revocationProductTypes[$revocationProductType] = $revocationProductType;
|
87 |
+
} else {
|
88 |
+
$revocationProductTypes[$defaultRevocationProductType] = $defaultRevocationProductType;
|
89 |
+
}
|
90 |
+
}
|
91 |
+
|
92 |
+
$agreements->addFieldToFilter('revocation_product_type', array('in' => $revocationProductTypes));
|
93 |
+
}
|
94 |
+
|
95 |
/**
|
96 |
* Retrieve the customer session
|
97 |
*
|
101 |
{
|
102 |
return Mage::getSingleton('customer/session');
|
103 |
}
|
104 |
+
|
105 |
+
/**
|
106 |
+
* Retrieve the customer quote
|
107 |
+
*
|
108 |
+
* @return Mage_Sales_Model_Quote Customer Quote
|
109 |
+
*/
|
110 |
+
protected function _getQuote()
|
111 |
+
{
|
112 |
+
return Mage::getSingleton('checkout/session')->getQuote();
|
113 |
+
}
|
114 |
+
|
115 |
+
/**
|
116 |
+
* @return array
|
117 |
+
*/
|
118 |
+
protected function _getProductIdsInQuote()
|
119 |
+
{
|
120 |
+
$productIds = array();
|
121 |
+
foreach ($this->_getQuote()->getAllItems() as $item) {
|
122 |
+
/** @var Mage_Sales_Model_Quote_Item $item */
|
123 |
+
|
124 |
+
if ($item->getParentItemId()) {
|
125 |
+
continue;
|
126 |
+
}
|
127 |
+
|
128 |
+
$productIds[] = $item->getProductId();
|
129 |
+
}
|
130 |
+
|
131 |
+
return $productIds;
|
132 |
+
}
|
133 |
}
|
app/code/community/FireGento/MageSetup/Block/Checkout/Information.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Block to enable ip anonymization for german tracking.
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Block to enable ip anonymization for german tracking.
|
26 |
*
|
app/code/community/FireGento/MageSetup/Block/Customer/Account/Agreements.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Block to display agreements on customer registration.
|
25 |
*
|
@@ -36,12 +37,18 @@ class FireGento_MageSetup_Block_Customer_Account_Agreements extends Mage_Checkou
|
|
36 |
*/
|
37 |
public function getAgreements()
|
38 |
{
|
39 |
-
|
40 |
-
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
|
|
|
46 |
|
|
|
|
|
|
|
|
|
|
|
47 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Block to display agreements on customer registration.
|
26 |
*
|
37 |
*/
|
38 |
public function getAgreements()
|
39 |
{
|
40 |
+
if (!$this->hasAgreements()) {
|
41 |
+
$agreements = Mage::getModel('checkout/agreement')->getCollection()
|
42 |
+
->addStoreFilter(Mage::app()->getStore()->getId())
|
43 |
+
->addFieldToFilter('is_active', 1)
|
44 |
+
->addFieldToFilter('agreement_type', array('in' => array(
|
45 |
+
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CUSTOMER,
|
46 |
+
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
|
47 |
+
)));
|
48 |
|
49 |
+
$this->setAgreements($agreements);
|
50 |
+
}
|
51 |
+
|
52 |
+
return $this->getData('agreements');
|
53 |
+
}
|
54 |
}
|
app/code/community/FireGento/MageSetup/Block/Ga.php
DELETED
@@ -1,56 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* This file is part of a FireGento e.V. module.
|
4 |
-
*
|
5 |
-
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
-
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
-
* published by the Free Software Foundation.
|
8 |
-
*
|
9 |
-
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
-
*
|
13 |
-
* PHP version 5
|
14 |
-
*
|
15 |
-
* @category FireGento
|
16 |
-
* @package FireGento_MageSetup
|
17 |
-
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
-
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version $Id:$
|
21 |
-
* @since 0.1.0
|
22 |
-
*/
|
23 |
-
/**
|
24 |
-
* Block to enable ip anonymization for german tracking.
|
25 |
-
*
|
26 |
-
* @category FireGento
|
27 |
-
* @package FireGento_MageSetup
|
28 |
-
* @author FireGento Team <team@firegento.com>
|
29 |
-
*/
|
30 |
-
class FireGento_MageSetup_Block_Ga extends Mage_GoogleAnalytics_Block_Ga
|
31 |
-
{
|
32 |
-
const CONFIG_GOOGLE_ANALYTICS_IP_ANONYMIZATION = 'google/analytics/ip_anonymization';
|
33 |
-
|
34 |
-
/**
|
35 |
-
* Prepare and return block's html output
|
36 |
-
*
|
37 |
-
* @return string Google Analytics JS Tracking Code
|
38 |
-
*/
|
39 |
-
protected function _toHtml()
|
40 |
-
{
|
41 |
-
$html = parent::_toHtml();
|
42 |
-
if (!Mage::getStoreConfigFlag( self::CONFIG_GOOGLE_ANALYTICS_IP_ANONYMIZATION )) {
|
43 |
-
return $html;
|
44 |
-
}
|
45 |
-
|
46 |
-
$matches = array();
|
47 |
-
$setAccountExpression = '/_gaq\.push\(\[\'_setAccount\', \'[a-zA-Z0-9-_]+\'\]\);\n/';
|
48 |
-
$append = '_gaq.push([\'_gat._anonymizeIp\']);';
|
49 |
-
|
50 |
-
if (preg_match_all($setAccountExpression, $html, $matches) && count($matches) && count($matches[0])) {
|
51 |
-
$html = preg_replace($setAccountExpression, $matches[0][0] . $append . "\n", $html);
|
52 |
-
}
|
53 |
-
|
54 |
-
return $html;
|
55 |
-
}
|
56 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/code/community/FireGento/MageSetup/Block/Imprint/Content.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Block to retrieve data from imprint config.
|
25 |
*
|
@@ -71,14 +72,14 @@ class FireGento_MageSetup_Block_Imprint_Content extends Mage_Core_Block_Template
|
|
71 |
* @param bool $checkForProtocol Flag if website url should be checked for http(s) protocol
|
72 |
* @return string Website URL
|
73 |
*/
|
74 |
-
public function getWeb($checkForProtocol=false)
|
75 |
{
|
76 |
$web = $this->getData('web');
|
77 |
if ($checkForProtocol && strlen(trim($web))) {
|
78 |
if (strpos($web, 'http://') === false
|
79 |
&& strpos($web, 'https://') === false
|
80 |
) {
|
81 |
-
$web = 'http://'
|
82 |
}
|
83 |
}
|
84 |
|
@@ -100,6 +101,7 @@ class FireGento_MageSetup_Block_Imprint_Content extends Mage_Core_Block_Template
|
|
100 |
/**
|
101 |
* Try to limit spam by generating a javascript email link
|
102 |
*
|
|
|
103 |
* @return string
|
104 |
*/
|
105 |
public function getEmail($antispam = false)
|
@@ -107,22 +109,34 @@ class FireGento_MageSetup_Block_Imprint_Content extends Mage_Core_Block_Template
|
|
107 |
$email = $this->getData('email');
|
108 |
$parts = explode('@', $email);
|
109 |
|
110 |
-
if (!$antispam) {
|
111 |
-
|
|
|
|
|
|
|
|
|
|
|
112 |
|
113 |
$html = '<a href="#" onclick="javascript:toRecipient();">';
|
114 |
-
$html .= $parts[0] .'<span
|
115 |
$html .= '</a>';
|
116 |
$html .= $this->getEmailJs($parts);
|
117 |
|
118 |
return $html;
|
119 |
}
|
120 |
|
|
|
|
|
|
|
|
|
|
|
|
|
121 |
public function getEmailJs($parts)
|
122 |
{
|
123 |
$js = <<<JS
|
124 |
<script>function toRecipient(){var m = '$parts[0]';m += '@';m += '$parts[1]';location.href= "mailto:"+m;}</script>
|
125 |
JS;
|
|
|
126 |
return $js;
|
127 |
}
|
128 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Block to retrieve data from imprint config.
|
26 |
*
|
72 |
* @param bool $checkForProtocol Flag if website url should be checked for http(s) protocol
|
73 |
* @return string Website URL
|
74 |
*/
|
75 |
+
public function getWeb($checkForProtocol = false)
|
76 |
{
|
77 |
$web = $this->getData('web');
|
78 |
if ($checkForProtocol && strlen(trim($web))) {
|
79 |
if (strpos($web, 'http://') === false
|
80 |
&& strpos($web, 'https://') === false
|
81 |
) {
|
82 |
+
$web = 'http://' . $web;
|
83 |
}
|
84 |
}
|
85 |
|
101 |
/**
|
102 |
* Try to limit spam by generating a javascript email link
|
103 |
*
|
104 |
+
* @param boolean true
|
105 |
* @return string
|
106 |
*/
|
107 |
public function getEmail($antispam = false)
|
109 |
$email = $this->getData('email');
|
110 |
$parts = explode('@', $email);
|
111 |
|
112 |
+
if (!$antispam) {
|
113 |
+
return $email;
|
114 |
+
}
|
115 |
+
|
116 |
+
if (count($parts) == 0) {
|
117 |
+
return;
|
118 |
+
}
|
119 |
|
120 |
$html = '<a href="#" onclick="javascript:toRecipient();">';
|
121 |
+
$html .= $parts[0] . '<span class="no-display">nospamplease</span>@<span class="no-display">nospamplease</span>' . $parts[1];
|
122 |
$html .= '</a>';
|
123 |
$html .= $this->getEmailJs($parts);
|
124 |
|
125 |
return $html;
|
126 |
}
|
127 |
|
128 |
+
/**
|
129 |
+
* Generate JS code
|
130 |
+
*
|
131 |
+
* @param $parts
|
132 |
+
* @return string
|
133 |
+
*/
|
134 |
public function getEmailJs($parts)
|
135 |
{
|
136 |
$js = <<<JS
|
137 |
<script>function toRecipient(){var m = '$parts[0]';m += '@';m += '$parts[1]';location.href= "mailto:"+m;}</script>
|
138 |
JS;
|
139 |
+
|
140 |
return $js;
|
141 |
}
|
142 |
}
|
app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Block to retrieve data from imprint config field.
|
25 |
*
|
@@ -42,4 +43,4 @@ class FireGento_MageSetup_Block_Imprint_Field extends FireGento_MageSetup_Block_
|
|
42 |
|
43 |
return $this->getData($this->getValue());
|
44 |
}
|
45 |
-
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Block to retrieve data from imprint config field.
|
26 |
*
|
43 |
|
44 |
return $this->getData($this->getValue());
|
45 |
}
|
46 |
+
}
|
app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php
CHANGED
@@ -1,133 +1,133 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* This file is part of a FireGento e.V. module.
|
4 |
-
*
|
5 |
-
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
-
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
-
* published by the Free Software Foundation.
|
8 |
-
*
|
9 |
-
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
-
*
|
13 |
-
* PHP version 5
|
14 |
-
*
|
15 |
-
* @category FireGento
|
16 |
-
* @package FireGento_MageSetup
|
17 |
-
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
-
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
-
* @since 1.0.5
|
22 |
-
*/
|
23 |
-
|
24 |
-
|
25 |
-
*
|
26 |
-
*
|
27 |
-
* @
|
28 |
-
* @
|
29 |
-
|
30 |
-
|
31 |
-
|
32 |
-
|
33 |
-
|
34 |
-
|
35 |
-
|
36 |
-
|
37 |
-
|
38 |
-
|
39 |
-
|
40 |
-
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
*
|
46 |
-
|
47 |
-
|
48 |
-
|
49 |
-
|
50 |
-
|
51 |
-
|
52 |
-
|
53 |
-
|
54 |
-
|
55 |
-
|
56 |
-
|
57 |
-
|
58 |
-
|
59 |
-
|
60 |
-
|
61 |
-
|
62 |
-
|
63 |
-
|
64 |
-
|
65 |
-
|
66 |
-
|
67 |
-
|
68 |
-
|
69 |
-
|
70 |
-
|
71 |
-
|
72 |
-
|
73 |
-
|
74 |
-
|
75 |
-
|
76 |
-
|
77 |
-
|
78 |
-
|
79 |
-
|
80 |
-
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
-
|
96 |
-
|
97 |
-
|
98 |
-
|
99 |
-
|
100 |
-
|
101 |
-
*
|
102 |
-
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
|
107 |
-
|
108 |
-
$
|
109 |
-
|
110 |
-
|
111 |
-
|
112 |
-
|
113 |
-
$value = $attribute->getFrontend()->getValue($product);
|
114 |
-
if (!$product->hasData($attribute->getAttributeCode()) || (string)
|
115 |
-
$value = '';
|
116 |
-
} elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
|
117 |
-
$value = Mage::app()->getStore()->convertPrice($value, true);
|
118 |
-
}
|
119 |
-
|
120 |
-
if (is_string($value) && strlen($value)) {
|
121 |
-
$data[$attribute->getAttributeCode()] = array(
|
122 |
-
'label' => $attribute->getStoreLabel(),
|
123 |
-
'value' => $value,
|
124 |
-
'print_value' => $value,
|
125 |
-
'code' => $attribute->getAttributeCode()
|
126 |
-
);
|
127 |
-
}
|
128 |
-
}
|
129 |
-
}
|
130 |
-
|
131 |
-
return $data;
|
132 |
-
}
|
133 |
-
}
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 1.0.5
|
22 |
+
*/
|
23 |
+
|
24 |
+
/**
|
25 |
+
* Changed product configuration to add product attributes on checkout
|
26 |
+
*
|
27 |
+
* @category FireGento
|
28 |
+
* @package FireGento_MageSetup
|
29 |
+
* @author FireGento Team <team@firegento.com>
|
30 |
+
*/
|
31 |
+
class FireGento_MageSetup_Helper_Catalog_Product_Configuration
|
32 |
+
extends Mage_Catalog_Helper_Product_Configuration
|
33 |
+
{
|
34 |
+
/**
|
35 |
+
* @var array
|
36 |
+
*/
|
37 |
+
protected $_finished = array();
|
38 |
+
|
39 |
+
/**
|
40 |
+
* @var array
|
41 |
+
*/
|
42 |
+
protected $_products = array();
|
43 |
+
|
44 |
+
/**
|
45 |
+
* @var array
|
46 |
+
*/
|
47 |
+
protected $_attributes = array();
|
48 |
+
|
49 |
+
/**
|
50 |
+
* Merge Attributes
|
51 |
+
*
|
52 |
+
* @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item Quote item
|
53 |
+
* @return array Custom Options
|
54 |
+
*/
|
55 |
+
public function getCustomOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item)
|
56 |
+
{
|
57 |
+
$optionsParent = parent::getCustomOptions($item);
|
58 |
+
$optionsSelf = $this->_getAttributes($item);
|
59 |
+
$options = array_merge($optionsSelf, $optionsParent);
|
60 |
+
|
61 |
+
return $options;
|
62 |
+
}
|
63 |
+
|
64 |
+
/**
|
65 |
+
* Get the product for the current quote item
|
66 |
+
*
|
67 |
+
* @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item Quote item
|
68 |
+
* @return Mage_Catalog_Model_Product Product Model
|
69 |
+
*/
|
70 |
+
protected function _getProduct($item)
|
71 |
+
{
|
72 |
+
return $item->getProduct();
|
73 |
+
}
|
74 |
+
|
75 |
+
/**
|
76 |
+
* Retrieve the product attributes
|
77 |
+
*
|
78 |
+
* @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item Quote item
|
79 |
+
* @return array Attributes
|
80 |
+
*/
|
81 |
+
protected function _getAttributes($item)
|
82 |
+
{
|
83 |
+
$itemId = $item->getId();
|
84 |
+
if (!isset($this->_finished[$itemId])) {
|
85 |
+
$this->_finished[$itemId] = true;
|
86 |
+
$product = $this->_getProduct($item);
|
87 |
+
$this->_attributes[$itemId] = $this->_getAdditionalData($product);
|
88 |
+
}
|
89 |
+
|
90 |
+
if (count($this->_attributes[$itemId]) > 0) {
|
91 |
+
return $this->_attributes[$itemId];
|
92 |
+
}
|
93 |
+
|
94 |
+
return array();
|
95 |
+
}
|
96 |
+
|
97 |
+
/**
|
98 |
+
* Retrieve the attributes which are visible on the checkout page
|
99 |
+
*
|
100 |
+
* @param Mage_Catalog_Model_Product $product Product Model
|
101 |
+
* @return array Addition data as array
|
102 |
+
*/
|
103 |
+
protected function _getAdditionalData(Mage_Catalog_Model_Product $product)
|
104 |
+
{
|
105 |
+
$data = array();
|
106 |
+
|
107 |
+
$attributes = $product->getAttributes();
|
108 |
+
foreach ($attributes as $attribute) {
|
109 |
+
if ($attribute->getIsVisibleOnCheckout()) {
|
110 |
+
if (in_array($attribute->getFrontendInput(), array('select', 'multiselect')) && !$product->getData($attribute->getAttributeCode())) {
|
111 |
+
continue;
|
112 |
+
}
|
113 |
+
$value = $attribute->getFrontend()->getValue($product);
|
114 |
+
if (!$product->hasData($attribute->getAttributeCode()) || (string)$value == '') {
|
115 |
+
$value = '';
|
116 |
+
} elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
|
117 |
+
$value = Mage::app()->getStore()->convertPrice($value, true);
|
118 |
+
}
|
119 |
+
|
120 |
+
if (is_string($value) && strlen($value)) {
|
121 |
+
$data[$attribute->getAttributeCode()] = array(
|
122 |
+
'label' => $attribute->getStoreLabel(),
|
123 |
+
'value' => $value,
|
124 |
+
'print_value' => $value,
|
125 |
+
'code' => $attribute->getAttributeCode()
|
126 |
+
);
|
127 |
+
}
|
128 |
+
}
|
129 |
+
}
|
130 |
+
|
131 |
+
return $data;
|
132 |
+
}
|
133 |
+
}
|
app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Rewrite to fetch required agreement ids.
|
25 |
*
|
@@ -67,6 +68,8 @@ class FireGento_MageSetup_Helper_Checkout_Data
|
|
67 |
)));
|
68 |
}
|
69 |
|
|
|
|
|
70 |
$this->_agreements = $agreements->getAllIds();
|
71 |
}
|
72 |
}
|
@@ -83,4 +86,60 @@ class FireGento_MageSetup_Helper_Checkout_Data
|
|
83 |
{
|
84 |
return Mage::getSingleton('customer/session');
|
85 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
86 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Rewrite to fetch required agreement ids.
|
26 |
*
|
68 |
)));
|
69 |
}
|
70 |
|
71 |
+
$this->_addRevocationProductTypesFilter($agreements);
|
72 |
+
|
73 |
$this->_agreements = $agreements->getAllIds();
|
74 |
}
|
75 |
}
|
86 |
{
|
87 |
return Mage::getSingleton('customer/session');
|
88 |
}
|
89 |
+
|
90 |
+
/**
|
91 |
+
* Display only those checkout agreements which match the product in cart
|
92 |
+
*
|
93 |
+
* @param Mage_Checkout_Model_Resource_Agreement_Collection $agreements
|
94 |
+
*/
|
95 |
+
protected function _addRevocationProductTypesFilter($agreements)
|
96 |
+
{
|
97 |
+
/** @var $productCollection Mage_Catalog_Model_Resource_Product_Collection */
|
98 |
+
$productCollection = Mage::getResourceModel('catalog/product_collection')
|
99 |
+
->addAttributeToFilter('entity_id', array('in' => $this->_getProductIdsInQuote()))
|
100 |
+
->joinAttribute('revocation_product_type', 'catalog_product/revocation_product_type', 'entity_id', null, 'left')
|
101 |
+
->addAttributeToSelect('revocation_product_type');
|
102 |
+
|
103 |
+
$revocationProductTypes = array(FireGento_MageSetup_Model_Source_RevocationProductType::REVOCATION_PRODUCT_TYPE_ALL => FireGento_MageSetup_Model_Source_RevocationProductType::REVOCATION_PRODUCT_TYPE_ALL);
|
104 |
+
$defaultRevocationProductType = Mage::getStoreConfig('checkout/options/default_revocation_product_type');
|
105 |
+
|
106 |
+
foreach ($productCollection->getColumnValues('revocation_product_type') as $revocationProductType) {
|
107 |
+
if ($revocationProductType) {
|
108 |
+
$revocationProductTypes[$revocationProductType] = $revocationProductType;
|
109 |
+
} else {
|
110 |
+
$revocationProductTypes[$defaultRevocationProductType] = $defaultRevocationProductType;
|
111 |
+
}
|
112 |
+
}
|
113 |
+
|
114 |
+
$agreements->addFieldToFilter('revocation_product_type', array('in' => $revocationProductTypes));
|
115 |
+
}
|
116 |
+
|
117 |
+
/**
|
118 |
+
* Retrieve the customer quote
|
119 |
+
*
|
120 |
+
* @return Mage_Sales_Model_Quote Customer Quote
|
121 |
+
*/
|
122 |
+
protected function _getQuote()
|
123 |
+
{
|
124 |
+
return Mage::getSingleton('checkout/session')->getQuote();
|
125 |
+
}
|
126 |
+
|
127 |
+
/**
|
128 |
+
* @return array
|
129 |
+
*/
|
130 |
+
protected function _getProductIdsInQuote()
|
131 |
+
{
|
132 |
+
$productIds = array();
|
133 |
+
foreach ($this->_getQuote()->getAllItems() as $item) {
|
134 |
+
/** @var Mage_Sales_Model_Quote_Item $item */
|
135 |
+
|
136 |
+
if ($item->getParentItemId()) {
|
137 |
+
continue;
|
138 |
+
}
|
139 |
+
|
140 |
+
$productIds[] = $item->getProductId();
|
141 |
+
}
|
142 |
+
|
143 |
+
return $productIds;
|
144 |
+
}
|
145 |
}
|
app/code/community/FireGento/MageSetup/Helper/Data.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Dummy data helper for translation issues.
|
25 |
*
|
@@ -78,6 +79,7 @@ class FireGento_MageSetup_Helper_Data extends Mage_Core_Helper_Abstract
|
|
78 |
}
|
79 |
}
|
80 |
asort($availableCountries);
|
|
|
81 |
return $availableCountries;
|
82 |
}
|
83 |
|
@@ -109,7 +111,7 @@ class FireGento_MageSetup_Helper_Data extends Mage_Core_Helper_Abstract
|
|
109 |
*/
|
110 |
public function setIsInitialized($isInitialized = true)
|
111 |
{
|
112 |
-
$isInitialized
|
113 |
Mage::getModel('eav/entity_setup', 'core_setup')->setConfigData('magesetup/is_initialized', $isInitialized);
|
114 |
Mage::app()->getCacheInstance()->cleanType('config');
|
115 |
Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => 'config'));
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Dummy data helper for translation issues.
|
26 |
*
|
79 |
}
|
80 |
}
|
81 |
asort($availableCountries);
|
82 |
+
|
83 |
return $availableCountries;
|
84 |
}
|
85 |
|
111 |
*/
|
112 |
public function setIsInitialized($isInitialized = true)
|
113 |
{
|
114 |
+
$isInitialized = (bool)$isInitialized ? '1' : '0';
|
115 |
Mage::getModel('eav/entity_setup', 'core_setup')->setConfigData('magesetup/is_initialized', $isInitialized);
|
116 |
Mage::app()->getCacheInstance()->cleanType('config');
|
117 |
Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => 'config'));
|
app/code/community/FireGento/MageSetup/Model/Config.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Config class
|
25 |
*
|
@@ -29,7 +30,7 @@
|
|
29 |
*/
|
30 |
class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
31 |
{
|
32 |
-
const CACHE_ID
|
33 |
const CACHE_TAG = 'magesetup_config';
|
34 |
|
35 |
/**
|
@@ -42,7 +43,7 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
42 |
*
|
43 |
* @param string|Varien_Simplexml_Element $sourceData XML Source Data
|
44 |
*/
|
45 |
-
public function __construct($sourceData=null)
|
46 |
{
|
47 |
$this->setCacheId(self::CACHE_ID);
|
48 |
$this->setCacheTags(array(self::CACHE_TAG));
|
@@ -59,6 +60,7 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
59 |
public function setCountry($country)
|
60 |
{
|
61 |
$this->_country = $country;
|
|
|
62 |
return $this;
|
63 |
}
|
64 |
|
@@ -72,6 +74,7 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
72 |
if (empty($this->_country)) {
|
73 |
$this->_country = strtolower(Mage::getStoreConfig('general/country/default'));
|
74 |
}
|
|
|
75 |
return $this->_country;
|
76 |
}
|
77 |
|
@@ -96,7 +99,12 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
96 |
$config = Mage::getConfig();
|
97 |
|
98 |
// Load additional config files
|
99 |
-
$
|
|
|
|
|
|
|
|
|
|
|
100 |
$this->_addConfigFile('email.xml', $mergeConfig);
|
101 |
$this->_addConfigFile('systemconfig.xml', $mergeConfig);
|
102 |
$this->_addConfigFile('agreement.xml', $mergeConfig);
|
@@ -117,7 +125,7 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
117 |
* @param string $fileName File to load
|
118 |
* @param Mage_Core_Model_Config_Base $mergeConfig Global config for merging
|
119 |
*/
|
120 |
-
protected function _addConfigFile($fileName, $mergeConfig)
|
121 |
{
|
122 |
$config = Mage::getConfig();
|
123 |
$configFile = $config->getModuleDir('etc', 'FireGento_MageSetup') . DS . $this->getCountry() . DS . $fileName;
|
@@ -130,7 +138,7 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
130 |
// Load the given config file
|
131 |
if (file_exists($configFile)) {
|
132 |
if ($mergeConfig->loadFile($configFile)) {
|
133 |
-
$config->extend($mergeConfig,
|
134 |
}
|
135 |
}
|
136 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Config class
|
26 |
*
|
30 |
*/
|
31 |
class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
32 |
{
|
33 |
+
const CACHE_ID = 'magesetup_config';
|
34 |
const CACHE_TAG = 'magesetup_config';
|
35 |
|
36 |
/**
|
43 |
*
|
44 |
* @param string|Varien_Simplexml_Element $sourceData XML Source Data
|
45 |
*/
|
46 |
+
public function __construct($sourceData = null)
|
47 |
{
|
48 |
$this->setCacheId(self::CACHE_ID);
|
49 |
$this->setCacheTags(array(self::CACHE_TAG));
|
60 |
public function setCountry($country)
|
61 |
{
|
62 |
$this->_country = $country;
|
63 |
+
|
64 |
return $this;
|
65 |
}
|
66 |
|
74 |
if (empty($this->_country)) {
|
75 |
$this->_country = strtolower(Mage::getStoreConfig('general/country/default'));
|
76 |
}
|
77 |
+
|
78 |
return $this->_country;
|
79 |
}
|
80 |
|
99 |
$config = Mage::getConfig();
|
100 |
|
101 |
// Load additional config files
|
102 |
+
if ($config->getNode('global/magesetup/additional_files')) {
|
103 |
+
foreach ($config->getNode('global/magesetup/additional_files')->asCanonicalArray() as $file) {
|
104 |
+
$this->_addConfigFile($file['filename'], $mergeConfig, (array_key_exists('overwrite', $file) && (bool)$file['overwrite'] === false ? false : true));
|
105 |
+
}
|
106 |
+
}
|
107 |
+
$this->_addConfigFile('cms.xml', $mergeConfig, false);
|
108 |
$this->_addConfigFile('email.xml', $mergeConfig);
|
109 |
$this->_addConfigFile('systemconfig.xml', $mergeConfig);
|
110 |
$this->_addConfigFile('agreement.xml', $mergeConfig);
|
125 |
* @param string $fileName File to load
|
126 |
* @param Mage_Core_Model_Config_Base $mergeConfig Global config for merging
|
127 |
*/
|
128 |
+
protected function _addConfigFile($fileName, $mergeConfig, $overwrite = true)
|
129 |
{
|
130 |
$config = Mage::getConfig();
|
131 |
$configFile = $config->getModuleDir('etc', 'FireGento_MageSetup') . DS . $this->getCountry() . DS . $fileName;
|
138 |
// Load the given config file
|
139 |
if (file_exists($configFile)) {
|
140 |
if ($mergeConfig->loadFile($configFile)) {
|
141 |
+
$config->extend($mergeConfig, $overwrite);
|
142 |
}
|
143 |
}
|
144 |
}
|
app/code/community/FireGento/MageSetup/Model/Newsletter/Observer.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Observer class
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Observer class
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Subscriber Status Model
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Subscriber Status Model
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Observer.php
CHANGED
@@ -1,351 +1,405 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* This file is part of a FireGento e.V. module.
|
4 |
-
*
|
5 |
-
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
-
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
-
* published by the Free Software Foundation.
|
8 |
-
*
|
9 |
-
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
-
*
|
13 |
-
* PHP version 5
|
14 |
-
*
|
15 |
-
* @category FireGento
|
16 |
-
* @package FireGento_MageSetup
|
17 |
-
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
-
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
-
* @since 0.2.0
|
22 |
-
*/
|
23 |
-
|
24 |
-
|
25 |
-
*
|
26 |
-
*
|
27 |
-
* @
|
28 |
-
* @
|
29 |
-
|
30 |
-
|
31 |
-
|
32 |
-
|
33 |
-
|
34 |
-
|
35 |
-
|
36 |
-
*
|
37 |
-
*
|
38 |
-
*
|
39 |
-
|
40 |
-
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
$
|
46 |
-
$
|
47 |
-
|
48 |
-
|
49 |
-
|
50 |
-
|
51 |
-
|
52 |
-
|
53 |
-
|
54 |
-
'
|
55 |
-
|
56 |
-
|
57 |
-
|
58 |
-
|
59 |
-
|
60 |
-
|
61 |
-
|
62 |
-
|
63 |
-
|
64 |
-
|
65 |
-
*
|
66 |
-
*
|
67 |
-
*
|
68 |
-
*
|
69 |
-
*
|
70 |
-
*
|
71 |
-
|
72 |
-
|
73 |
-
|
74 |
-
|
75 |
-
|
76 |
-
|
77 |
-
|
78 |
-
|
79 |
-
|
80 |
-
|
81 |
-
|
82 |
-
|
83 |
-
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
*
|
95 |
-
*
|
96 |
-
|
97 |
-
|
98 |
-
|
99 |
-
|
100 |
-
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
|
107 |
-
|
108 |
-
|
109 |
-
*
|
110 |
-
*
|
111 |
-
|
112 |
-
|
113 |
-
|
114 |
-
|
115 |
-
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
// Set Meta
|
122 |
-
$
|
123 |
-
|
124 |
-
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
|
130 |
-
|
131 |
-
|
132 |
-
|
133 |
-
|
134 |
-
|
135 |
-
|
136 |
-
if (empty($description)) {
|
137 |
-
$description = $
|
138 |
-
}
|
139 |
-
if (
|
140 |
-
$
|
141 |
-
|
142 |
-
|
143 |
-
|
144 |
-
|
145 |
-
|
146 |
-
|
147 |
-
|
148 |
-
|
149 |
-
|
150 |
-
|
151 |
-
|
152 |
-
|
153 |
-
*
|
154 |
-
|
155 |
-
|
156 |
-
|
157 |
-
|
158 |
-
|
159 |
-
|
160 |
-
|
161 |
-
|
162 |
-
|
163 |
-
|
164 |
-
|
165 |
-
|
166 |
-
|
167 |
-
|
168 |
-
*
|
169 |
-
*
|
170 |
-
|
171 |
-
|
172 |
-
|
173 |
-
|
174 |
-
|
175 |
-
|
176 |
-
|
177 |
-
|
178 |
-
|
179 |
-
|
180 |
-
|
181 |
-
|
182 |
-
|
183 |
-
|
184 |
-
|
185 |
-
|
186 |
-
|
187 |
-
|
188 |
-
|
189 |
-
|
190 |
-
|
191 |
-
$
|
192 |
-
|
193 |
-
|
194 |
-
|
195 |
-
|
196 |
-
|
197 |
-
|
198 |
-
|
199 |
-
|
200 |
-
|
201 |
-
|
202 |
-
|
203 |
-
$
|
204 |
-
|
205 |
-
|
206 |
-
|
207 |
-
|
208 |
-
|
209 |
-
|
210 |
-
|
211 |
-
|
212 |
-
|
213 |
-
|
214 |
-
|
215 |
-
|
216 |
-
|
217 |
-
*
|
218 |
-
|
219 |
-
|
220 |
-
|
221 |
-
|
222 |
-
|
223 |
-
|
224 |
-
|
225 |
-
|
226 |
-
|
227 |
-
|
228 |
-
|
229 |
-
|
230 |
-
|
231 |
-
|
232 |
-
|
233 |
-
|
234 |
-
|
235 |
-
|
236 |
-
|
237 |
-
*
|
238 |
-
*
|
239 |
-
*
|
240 |
-
|
241 |
-
|
242 |
-
|
243 |
-
|
244 |
-
|
245 |
-
|
246 |
-
|
247 |
-
|
248 |
-
$
|
249 |
-
$
|
250 |
-
|
251 |
-
|
252 |
-
|
253 |
-
|
254 |
-
|
255 |
-
|
256 |
-
|
257 |
-
|
258 |
-
),
|
259 |
-
|
260 |
-
|
261 |
-
|
262 |
-
'
|
263 |
-
|
264 |
-
|
265 |
-
|
266 |
-
|
267 |
-
|
268 |
-
|
269 |
-
|
270 |
-
|
271 |
-
'
|
272 |
-
'
|
273 |
-
|
274 |
-
|
275 |
-
|
276 |
-
|
277 |
-
$
|
278 |
-
|
279 |
-
|
280 |
-
|
281 |
-
|
282 |
-
|
283 |
-
|
284 |
-
|
285 |
-
|
286 |
-
|
287 |
-
|
288 |
-
|
289 |
-
|
290 |
-
|
291 |
-
|
292 |
-
|
293 |
-
|
294 |
-
|
295 |
-
|
296 |
-
|
297 |
-
|
298 |
-
|
299 |
-
|
300 |
-
|
301 |
-
|
302 |
-
|
303 |
-
|
304 |
-
|
305 |
-
|
306 |
-
|
307 |
-
|
308 |
-
|
309 |
-
|
310 |
-
|
311 |
-
|
312 |
-
|
313 |
-
->
|
314 |
-
|
315 |
-
|
316 |
-
|
317 |
-
|
318 |
-
|
319 |
-
|
320 |
-
|
321 |
-
|
322 |
-
|
323 |
-
*
|
324 |
-
*
|
325 |
-
|
326 |
-
|
327 |
-
|
328 |
-
|
329 |
-
|
330 |
-
|
331 |
-
|
332 |
-
$
|
333 |
-
|
334 |
-
|
335 |
-
|
336 |
-
|
337 |
-
|
338 |
-
|
339 |
-
|
340 |
-
|
341 |
-
|
342 |
-
|
343 |
-
|
344 |
-
|
345 |
-
|
346 |
-
|
347 |
-
|
348 |
-
|
349 |
-
|
350 |
-
|
351 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 0.2.0
|
22 |
+
*/
|
23 |
+
|
24 |
+
/**
|
25 |
+
* Observer class
|
26 |
+
*
|
27 |
+
* @category FireGento
|
28 |
+
* @package FireGento_MageSetup
|
29 |
+
* @author FireGento Team <team@firegento.com>
|
30 |
+
*/
|
31 |
+
class FireGento_MageSetup_Model_Observer
|
32 |
+
{
|
33 |
+
const CONFIG_GOOGLE_ANALYTICS_IP_ANONYMIZATION = 'google/analytics/ip_anonymization';
|
34 |
+
|
35 |
+
/**
|
36 |
+
* Add "Visible on Checkout Review on Front-end" Option to Attribute Settings
|
37 |
+
*
|
38 |
+
* Event: <adminhtml_catalog_product_attribute_edit_prepare_form>
|
39 |
+
*
|
40 |
+
* @param Varien_Event_Observer $observer Observer
|
41 |
+
* @return FireGento_MageSetup_Model_Observer Observer
|
42 |
+
*/
|
43 |
+
public function addIsVisibleOnCheckoutOption(Varien_Event_Observer $observer)
|
44 |
+
{
|
45 |
+
$event = $observer->getEvent();
|
46 |
+
$form = $event->getForm();
|
47 |
+
|
48 |
+
$fieldset = $form->getElement('front_fieldset');
|
49 |
+
$source = Mage::getModel('adminhtml/system_config_source_yesno')->toOptionArray();
|
50 |
+
$fieldset->addField(
|
51 |
+
'is_visible_on_checkout',
|
52 |
+
'select',
|
53 |
+
array(
|
54 |
+
'name' => 'is_visible_on_checkout',
|
55 |
+
'label' => Mage::helper('magesetup')->__('Visible in Checkout'),
|
56 |
+
'title' => Mage::helper('magesetup')->__('Visible in Checkout'),
|
57 |
+
'values' => $source,
|
58 |
+
)
|
59 |
+
);
|
60 |
+
|
61 |
+
return $this;
|
62 |
+
}
|
63 |
+
|
64 |
+
/**
|
65 |
+
* Filters all agreements
|
66 |
+
*
|
67 |
+
* Filters all agreements against the Magento template filter. This enables the Magento
|
68 |
+
* administrator define a cms static block as the content of the checkout agreements..
|
69 |
+
*
|
70 |
+
* Event: <core_block_abstract_to_html_before>
|
71 |
+
*
|
72 |
+
* @param Varien_Event_Observer $observer Observer
|
73 |
+
* @return FireGento_MageSetup_Model_Observer Observer
|
74 |
+
*/
|
75 |
+
public function filterAgreements(Varien_Event_Observer $observer)
|
76 |
+
{
|
77 |
+
$block = $observer->getEvent()->getBlock();
|
78 |
+
if ($block->getType() == 'checkout/agreements') {
|
79 |
+
if ($agreements = $block->getAgreements()) {
|
80 |
+
$collection = new Varien_Data_Collection();
|
81 |
+
foreach ($agreements as $agreement) {
|
82 |
+
$agreement->setData('content', $this->_filterString($agreement->getData('content')));
|
83 |
+
$agreement->setData('checkbox_text', $this->_filterString($agreement->getData('checkbox_text')));
|
84 |
+
$collection->addItem($agreement);
|
85 |
+
}
|
86 |
+
$observer->getEvent()->getBlock()->setAgreements($collection);
|
87 |
+
}
|
88 |
+
}
|
89 |
+
|
90 |
+
return $this;
|
91 |
+
}
|
92 |
+
|
93 |
+
/**
|
94 |
+
* Calls the Magento template filter to transform {{block type="cms/block" block_id="xyz"}}
|
95 |
+
* into the specific html code
|
96 |
+
*
|
97 |
+
* @param string $string Agreement to filter
|
98 |
+
* @return string Processed String
|
99 |
+
*/
|
100 |
+
protected function _filterString($string)
|
101 |
+
{
|
102 |
+
$processor = Mage::getModel('cms/template_filter');
|
103 |
+
$string = $processor->filter($string);
|
104 |
+
|
105 |
+
return $string;
|
106 |
+
}
|
107 |
+
|
108 |
+
/**
|
109 |
+
* Auto-Generates the meta information of a product.
|
110 |
+
* Event: <catalog_product_save_before>
|
111 |
+
*
|
112 |
+
* @param Varien_Event_Observer $observer Observer
|
113 |
+
* @return FireGento_MageSetup_Model_Observer Observer
|
114 |
+
*/
|
115 |
+
public function autogenerateMetaInformation(Varien_Event_Observer $observer)
|
116 |
+
{
|
117 |
+
/* @var $product Mage_Catalog_Model_Product */
|
118 |
+
$product = $observer->getEvent()->getProduct();
|
119 |
+
|
120 |
+
if ($product->getData('meta_autogenerate') == 1) {
|
121 |
+
// Set Meta Title
|
122 |
+
$product->setMetaTitle($product->getName());
|
123 |
+
|
124 |
+
// Set Meta Keywords
|
125 |
+
$keywords = $this->_getCategoryKeywords($product);
|
126 |
+
if (!empty($keywords)) {
|
127 |
+
if (mb_strlen($keywords) > 255) {
|
128 |
+
$remainder = '';
|
129 |
+
$keywords = Mage::helper('core/string')->truncate($keywords, 255, '', $remainder, false);
|
130 |
+
}
|
131 |
+
$product->setMetaKeyword($keywords);
|
132 |
+
}
|
133 |
+
|
134 |
+
// Set Meta Description
|
135 |
+
$description = $product->getShortDescription();
|
136 |
+
if (empty($description)) {
|
137 |
+
$description = $product->getDescription();
|
138 |
+
}
|
139 |
+
if (empty($description)) {
|
140 |
+
$description = $keywords;
|
141 |
+
}
|
142 |
+
if (mb_strlen($description) > 255) {
|
143 |
+
$remainder = '';
|
144 |
+
$description = Mage::helper('core/string')->truncate($description, 255, '...', $remainder, false);
|
145 |
+
}
|
146 |
+
$product->setMetaDescription($description);
|
147 |
+
}
|
148 |
+
|
149 |
+
return $this;
|
150 |
+
}
|
151 |
+
|
152 |
+
/**
|
153 |
+
* Get the categories of the current product
|
154 |
+
*
|
155 |
+
* @param Mage_Catalog_Model_Product $product Product
|
156 |
+
* @return array Categories
|
157 |
+
*/
|
158 |
+
protected function _getCategoryKeywords($product)
|
159 |
+
{
|
160 |
+
$categories = $product->getCategoryIds();
|
161 |
+
$categoryArr = $this->_fetchCategoryNames($categories);
|
162 |
+
$keywords = $this->_buildKeywords($categoryArr);
|
163 |
+
|
164 |
+
return $keywords;
|
165 |
+
}
|
166 |
+
|
167 |
+
/**
|
168 |
+
* Fetches all category names via category path; adds first the assigned
|
169 |
+
* categories and second all categories via path.
|
170 |
+
*
|
171 |
+
* @param array $categories Category Ids
|
172 |
+
* @return array Categories
|
173 |
+
*/
|
174 |
+
protected function _fetchCategoryNames($categories)
|
175 |
+
{
|
176 |
+
$return = array(
|
177 |
+
'assigned' => array(),
|
178 |
+
'path' => array()
|
179 |
+
);
|
180 |
+
|
181 |
+
foreach ($categories as $categoryId) {
|
182 |
+
// Check if category was already added
|
183 |
+
if (array_key_exists($categoryId, $return['assigned'])
|
184 |
+
|| array_key_exists($categoryId, $return['path'])
|
185 |
+
) {
|
186 |
+
return;
|
187 |
+
}
|
188 |
+
|
189 |
+
/* @var $category Mage_Catalog_Model_Category */
|
190 |
+
$category = Mage::getModel('catalog/category')->load($categoryId);
|
191 |
+
$return['assigned'][$categoryId] = $category->getName();
|
192 |
+
|
193 |
+
// Fetch path ids and remove the first two (base and root category)
|
194 |
+
$path = $category->getPath();
|
195 |
+
$pathIds = explode('/', $path);
|
196 |
+
array_shift($pathIds);
|
197 |
+
array_shift($pathIds);
|
198 |
+
|
199 |
+
// Fetch the names from path categories
|
200 |
+
if (count($pathIds) > 0) {
|
201 |
+
foreach ($pathIds as $pathId) {
|
202 |
+
if (!array_key_exists($pathId, $return['assigned'])
|
203 |
+
&& !array_key_exists($pathId, $return['path'])
|
204 |
+
) {
|
205 |
+
/* @var $pathCategory Mage_Catalog_Model_Category */
|
206 |
+
$pathCategory = Mage::getModel('catalog/category')->load($pathId);
|
207 |
+
$return['path'][$pathId] = $pathCategory->getName();
|
208 |
+
}
|
209 |
+
}
|
210 |
+
}
|
211 |
+
}
|
212 |
+
|
213 |
+
return $return;
|
214 |
+
}
|
215 |
+
|
216 |
+
/**
|
217 |
+
* Processes the category array and generates a string
|
218 |
+
*
|
219 |
+
* @param array $categoryTypes Categories
|
220 |
+
* @return string Keywords
|
221 |
+
*/
|
222 |
+
protected function _buildKeywords($categoryTypes)
|
223 |
+
{
|
224 |
+
if (!$categoryTypes) {
|
225 |
+
return '';
|
226 |
+
}
|
227 |
+
|
228 |
+
$keywords = array();
|
229 |
+
foreach ($categoryTypes as $categories) {
|
230 |
+
$keywords[] = implode(', ', $categories);
|
231 |
+
}
|
232 |
+
|
233 |
+
return implode(', ', $keywords);
|
234 |
+
}
|
235 |
+
|
236 |
+
/**
|
237 |
+
* Add "Required" and "Visible on Custom Creation" Option to Checkout Agreements
|
238 |
+
*
|
239 |
+
* Event: <adminhtml_block_html_before>
|
240 |
+
*
|
241 |
+
* @param Varien_Event_Observer $observer Observer
|
242 |
+
* @return FireGento_MageSetup_Model_Observer Observer
|
243 |
+
*/
|
244 |
+
public function addOptionsForAgreements(Varien_Event_Observer $observer)
|
245 |
+
{
|
246 |
+
$block = $observer->getEvent()->getBlock();
|
247 |
+
if ($block instanceof Mage_Adminhtml_Block_Checkout_Agreement_Edit_Form) {
|
248 |
+
$helper = Mage::helper('magesetup');
|
249 |
+
$form = $block->getForm();
|
250 |
+
|
251 |
+
/** @var Varien_Data_Form_Element_Fieldset $fieldset */
|
252 |
+
$fieldset = $form->getElement('base_fieldset');
|
253 |
+
|
254 |
+
$form->getElement('content')->setRequired(false);
|
255 |
+
|
256 |
+
$fieldset->addField('is_required', 'select', array(
|
257 |
+
'label' => $helper->__('Required'),
|
258 |
+
'title' => $helper->__('Required'),
|
259 |
+
'note' => $helper->__('Display Checkbox on Frontend'),
|
260 |
+
'name' => 'is_required',
|
261 |
+
'required' => true,
|
262 |
+
'options' => array(
|
263 |
+
'1' => $helper->__('Yes'),
|
264 |
+
'0' => $helper->__('No'),
|
265 |
+
),
|
266 |
+
));
|
267 |
+
|
268 |
+
$fieldset->addField('agreement_type', 'select', array(
|
269 |
+
'label' => $helper->__('Display on'),
|
270 |
+
'title' => $helper->__('Display on'),
|
271 |
+
'note' => $helper->__('Require Confirmation on Customer Registration and/or Checkout'),
|
272 |
+
'name' => 'agreement_type',
|
273 |
+
'required' => true,
|
274 |
+
'options' => Mage::getSingleton('magesetup/source_agreementType')->getOptionArray(),
|
275 |
+
));
|
276 |
+
|
277 |
+
$fieldset->addField('revocation_product_type', 'select', array(
|
278 |
+
'label' => $helper->__('Display for following Revocation Product Types'),
|
279 |
+
'title' => $helper->__('Display for following Revocation Product Types'),
|
280 |
+
'note' => $helper->__('Will only be displayed if at least one product of the selected type is in cart'),
|
281 |
+
'name' => 'revocation_product_type',
|
282 |
+
'required' => false,
|
283 |
+
'options' => Mage::getSingleton('magesetup/source_revocationProductType')->getOptionArray(),
|
284 |
+
));
|
285 |
+
|
286 |
+
Mage::dispatchEvent('magesetup_adminhtml_checkout_agreement_edit_form', array(
|
287 |
+
'form' => $form,
|
288 |
+
'fieldset' => $fieldset,
|
289 |
+
));
|
290 |
+
|
291 |
+
$model = Mage::registry('checkout_agreement');
|
292 |
+
$form->setValues($model->getData());
|
293 |
+
$block->setForm($form);
|
294 |
+
}
|
295 |
+
|
296 |
+
return $this;
|
297 |
+
}
|
298 |
+
|
299 |
+
/**
|
300 |
+
* Get required agreements on custom registration
|
301 |
+
*
|
302 |
+
* @return array Customer agreement ids
|
303 |
+
*/
|
304 |
+
protected function _getCustomerCreateAgreements()
|
305 |
+
{
|
306 |
+
$ids = Mage::getModel('checkout/agreement')->getCollection()
|
307 |
+
->addStoreFilter(Mage::app()->getStore()->getId())
|
308 |
+
->addFieldToFilter('is_active', 1)
|
309 |
+
->addFieldToFilter('agreement_type', array('in' => array(
|
310 |
+
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CUSTOMER,
|
311 |
+
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
|
312 |
+
)))// Only get Required Elements
|
313 |
+
->getAllIds();
|
314 |
+
|
315 |
+
return $ids;
|
316 |
+
}
|
317 |
+
|
318 |
+
/**
|
319 |
+
* Check if there are required agreements for the customer registration
|
320 |
+
* and validate them if applicable.
|
321 |
+
*
|
322 |
+
* Event: <controller_action_predispatch_customer_account_createpost>
|
323 |
+
*
|
324 |
+
* @param Varien_Event_Observer $observer Observer
|
325 |
+
*/
|
326 |
+
public function customerCreatePreDispatch(Varien_Event_Observer $observer)
|
327 |
+
{
|
328 |
+
$requiredAgreements = $this->_getCustomerCreateAgreements();
|
329 |
+
$controller = $observer->getEvent()->getControllerAction();
|
330 |
+
$postedAgreements = array_keys($controller->getRequest()->getPost('agreement', array()));
|
331 |
+
|
332 |
+
if ($diff = array_diff($requiredAgreements, $postedAgreements)) {
|
333 |
+
$session = Mage::getSingleton('customer/session');
|
334 |
+
$session->addException(
|
335 |
+
new Mage_Customer_Exception('Cannot create customer: agreements not confirmed'),
|
336 |
+
Mage::helper('magesetup')->__('Agreements not confirmed.')
|
337 |
+
);
|
338 |
+
|
339 |
+
$controller->getResponse()->setRedirect(Mage::getUrl('*/*/create', array('_secure' => true)));
|
340 |
+
$controller->setFlag(
|
341 |
+
$controller->getRequest()->getActionName(),
|
342 |
+
Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH,
|
343 |
+
true
|
344 |
+
);
|
345 |
+
}
|
346 |
+
}
|
347 |
+
|
348 |
+
/**
|
349 |
+
* add product attributes to quote items collection
|
350 |
+
*
|
351 |
+
* @magentoEvent sales_quote_config_get_product_attributes
|
352 |
+
*
|
353 |
+
* @param Varien_Event_Observer $observer Observer
|
354 |
+
*/
|
355 |
+
public function addProductAttributesToQuoteItems(Varien_Event_Observer $observer)
|
356 |
+
{
|
357 |
+
$cacheTag = 'magesetup_quote_attributes';
|
358 |
+
if (Mage::app()->useCache('eav') && Mage::app()->loadCache($cacheTag)) {
|
359 |
+
foreach (explode(',', Mage::app()->loadCache($cacheTag)) as $_cacheRow) {
|
360 |
+
$observer->getAttributes()->setData($_cacheRow, '');
|
361 |
+
}
|
362 |
+
} else {
|
363 |
+
$collection = Mage::getResourceModel('catalog/product_attribute_collection')
|
364 |
+
->setItemObjectClass('catalog/resource_eav_attribute')
|
365 |
+
->addFieldToFilter('additional_table.is_visible_on_checkout', 1);
|
366 |
+
$attrList = array();
|
367 |
+
foreach ($collection as $_attribute) {
|
368 |
+
$attrList[] = $_attribute->getAttributeCode();
|
369 |
+
$observer->getAttributes()->setData($_attribute->getAttributeCode(), '');
|
370 |
+
}
|
371 |
+
Mage::app()->saveCache(implode(',', $attrList), $cacheTag, array('eav'), false);
|
372 |
+
}
|
373 |
+
}
|
374 |
+
|
375 |
+
/**
|
376 |
+
* Compatibility for Magento < 1.9
|
377 |
+
*
|
378 |
+
* @magentoEvent core_block_abstract_to_html_after
|
379 |
+
*
|
380 |
+
* @param Varien_Event_Observer $observer Observer
|
381 |
+
*/
|
382 |
+
public function setGAAnonymizerCode(Varien_Event_Observer $observer)
|
383 |
+
{
|
384 |
+
$block = $observer->getEvent()->getBlock();
|
385 |
+
if ($block instanceof Mage_GoogleAnalytics_Block_Ga && version_compare(Mage::getVersion(), '1.9', '<=')) {
|
386 |
+
$transport = $observer->getEvent()->getTransport();
|
387 |
+
|
388 |
+
$html = $transport->getHtml();
|
389 |
+
|
390 |
+
if (!Mage::getStoreConfigFlag(self::CONFIG_GOOGLE_ANALYTICS_IP_ANONYMIZATION)) {
|
391 |
+
return;
|
392 |
+
}
|
393 |
+
|
394 |
+
$matches = array();
|
395 |
+
$setAccountExpression = '/_gaq\.push\(\[\'_setAccount\', \'[a-zA-Z0-9-_]+\'\]\);\n/';
|
396 |
+
$append = '_gaq.push([\'_gat._anonymizeIp\']);';
|
397 |
+
|
398 |
+
if (preg_match_all($setAccountExpression, $html, $matches) && count($matches) && count($matches[0])) {
|
399 |
+
$html = preg_replace($setAccountExpression, $matches[0][0] . $append . "\n", $html);
|
400 |
+
}
|
401 |
+
|
402 |
+
$transport->setHtml($html);
|
403 |
+
}
|
404 |
+
}
|
405 |
+
}
|
app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Subscriber Status Resource Model
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Subscriber Status Resource Model
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Subscriber Status Resource Collection Model
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Subscriber Status Resource Collection Model
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Setup.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class
|
25 |
*
|
@@ -37,7 +38,7 @@ class FireGento_MageSetup_Model_Setup extends Mage_Core_Model_Abstract
|
|
37 |
* @param bool $notify Flag if admin notifications should be added
|
38 |
* @return FireGento_MageSetup_Model_Setup Setup Model
|
39 |
*/
|
40 |
-
public function setup($params = array(), $notify=false)
|
41 |
{
|
42 |
if (!isset($params['country'])) {
|
43 |
Mage::throwException(
|
@@ -162,7 +163,7 @@ class FireGento_MageSetup_Model_Setup extends Mage_Core_Model_Abstract
|
|
162 |
'overwrite_emails' => false,
|
163 |
'tax' => true,
|
164 |
'product_tax_class_target' => $productTaxClassTargets,
|
165 |
-
'customer_tax_class_target'
|
166 |
);
|
167 |
}
|
168 |
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class
|
26 |
*
|
38 |
* @param bool $notify Flag if admin notifications should be added
|
39 |
* @return FireGento_MageSetup_Model_Setup Setup Model
|
40 |
*/
|
41 |
+
public function setup($params = array(), $notify = false)
|
42 |
{
|
43 |
if (!isset($params['country'])) {
|
44 |
Mage::throwException(
|
163 |
'overwrite_emails' => false,
|
164 |
'tax' => true,
|
165 |
'product_tax_class_target' => $productTaxClassTargets,
|
166 |
+
'customer_tax_class_target' => $customerTaxClassTargets,
|
167 |
);
|
168 |
}
|
169 |
|
app/code/community/FireGento/MageSetup/Model/Setup/Abstract.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class
|
25 |
*
|
@@ -68,7 +69,7 @@ class FireGento_MageSetup_Model_Setup_Abstract extends Mage_Core_Model_Abstract
|
|
68 |
public function setConfigData($configPath, $value, $storeId = null)
|
69 |
{
|
70 |
$setup = $this->_getSetup();
|
71 |
-
if (is_null($storeId)) {
|
72 |
$setup->setConfigData($configPath, $value);
|
73 |
} else {
|
74 |
$setup->setConfigData($configPath, $value, 'stores', $storeId);
|
@@ -154,6 +155,7 @@ class FireGento_MageSetup_Model_Setup_Abstract extends Mage_Core_Model_Abstract
|
|
154 |
if (!$this->_getData('country_id')) {
|
155 |
$this->setData('country_id', Mage::registry('setup_country'));
|
156 |
}
|
|
|
157 |
return $this->_getData('country_id');
|
158 |
}
|
159 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class
|
26 |
*
|
69 |
public function setConfigData($configPath, $value, $storeId = null)
|
70 |
{
|
71 |
$setup = $this->_getSetup();
|
72 |
+
if (is_null($storeId) || $storeId == 0) {
|
73 |
$setup->setConfigData($configPath, $value);
|
74 |
} else {
|
75 |
$setup->setConfigData($configPath, $value, 'stores', $storeId);
|
155 |
if (!$this->_getData('country_id')) {
|
156 |
$this->setData('country_id', Mage::registry('setup_country'));
|
157 |
}
|
158 |
+
|
159 |
return $this->_getData('country_id');
|
160 |
}
|
161 |
}
|
app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class for Checkout Agreements
|
25 |
*
|
@@ -73,7 +74,7 @@ class FireGento_MageSetup_Model_Setup_Agreements extends FireGento_MageSetup_Mod
|
|
73 |
* @param int|null $storeId Store Id
|
74 |
* @return void
|
75 |
*/
|
76 |
-
protected function _createAgreement($agreementData, $locale, $override=true, $storeId = null)
|
77 |
{
|
78 |
if (!is_array($agreementData)) {
|
79 |
return;
|
@@ -104,14 +105,15 @@ class FireGento_MageSetup_Model_Setup_Agreements extends FireGento_MageSetup_Mod
|
|
104 |
$templateContent = preg_replace('#\{\*.*\*\}#suU', '', $templateContent);
|
105 |
|
106 |
$agreementData = array(
|
107 |
-
'name'
|
108 |
-
'content'
|
109 |
-
'checkbox_text'
|
110 |
-
'is_active'
|
111 |
-
'is_html'
|
112 |
-
'is_required'
|
113 |
-
'agreement_type'
|
114 |
-
'
|
|
|
115 |
);
|
116 |
|
117 |
/* @var $agreement Mage_Checkout_Model_Agreement */
|
@@ -120,7 +122,7 @@ class FireGento_MageSetup_Model_Setup_Agreements extends FireGento_MageSetup_Mod
|
|
120 |
$agreement = Mage::getModel('checkout/agreement');
|
121 |
}
|
122 |
|
123 |
-
if (!(int)
|
124 |
$agreement->setData($agreementData)->save();
|
125 |
}
|
126 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class for Checkout Agreements
|
26 |
*
|
74 |
* @param int|null $storeId Store Id
|
75 |
* @return void
|
76 |
*/
|
77 |
+
protected function _createAgreement($agreementData, $locale, $override = true, $storeId = null)
|
78 |
{
|
79 |
if (!is_array($agreementData)) {
|
80 |
return;
|
105 |
$templateContent = preg_replace('#\{\*.*\*\}#suU', '', $templateContent);
|
106 |
|
107 |
$agreementData = array(
|
108 |
+
'name' => $name,
|
109 |
+
'content' => $templateContent,
|
110 |
+
'checkbox_text' => $checkboxText,
|
111 |
+
'is_active' => $agreementData['is_active'],
|
112 |
+
'is_html' => $agreementData['is_html'],
|
113 |
+
'is_required' => $agreementData['is_required'],
|
114 |
+
'agreement_type' => $agreementData['agreement_type'],
|
115 |
+
'revocation_product_type' => isset($agreementData['revocation_product_type']) ? $agreementData['revocation_product_type'] : '',
|
116 |
+
'stores' => $storeId ? $storeId : 0,
|
117 |
);
|
118 |
|
119 |
/* @var $agreement Mage_Checkout_Model_Agreement */
|
122 |
$agreement = Mage::getModel('checkout/agreement');
|
123 |
}
|
124 |
|
125 |
+
if (!(int)$agreement->getId() || $override) {
|
126 |
$agreement->setData($agreementData)->save();
|
127 |
}
|
128 |
}
|
app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class for CMS pages and blocks
|
25 |
*
|
@@ -71,6 +72,40 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
71 |
}
|
72 |
}
|
73 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
74 |
/**
|
75 |
* Get pages/default from config file
|
76 |
*
|
@@ -78,7 +113,10 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
78 |
*/
|
79 |
protected function _getConfigPages()
|
80 |
{
|
81 |
-
|
|
|
|
|
|
|
82 |
}
|
83 |
|
84 |
/**
|
@@ -105,6 +143,7 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
105 |
if (!isset($this->_footerLinks[$storeId])) {
|
106 |
return array();
|
107 |
}
|
|
|
108 |
return $this->_footerLinks[$storeId];
|
109 |
}
|
110 |
|
@@ -124,7 +163,7 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
124 |
}
|
125 |
|
126 |
$data = array(
|
127 |
-
'stores'
|
128 |
'is_active' => 1,
|
129 |
);
|
130 |
|
@@ -137,6 +176,7 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
137 |
|
138 |
if (preg_match('/<!--@title\s*(.*?)\s*@-->/u', $templateContent, $matches)) {
|
139 |
$data['title'] = $matches[1];
|
|
|
140 |
$templateContent = str_replace($matches[0], '', $templateContent);
|
141 |
}
|
142 |
|
@@ -169,7 +209,7 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
169 |
$data['page_id'] = $page->getId();
|
170 |
}
|
171 |
|
172 |
-
if (!(int)
|
173 |
$page->addData($data);
|
174 |
$page->save();
|
175 |
}
|
@@ -180,7 +220,7 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
180 |
|
181 |
if ($pageData['footerlink'] == 1) {
|
182 |
$this->_footerLinks[$storeId][] = array(
|
183 |
-
'title'
|
184 |
'target' => $data['identifier'],
|
185 |
);
|
186 |
}
|
@@ -251,7 +291,7 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
251 |
if ($footerLinksCounter == count($this->_getFooterLinks($storeId))) {
|
252 |
$class = 'last';
|
253 |
}
|
254 |
-
$footerLinksHtml .= '<li class="'
|
255 |
$footerLinksHtml .= '<a href="{{store url="' . $target . '"}}">' . $title . '</a></li>';
|
256 |
}
|
257 |
|
@@ -298,11 +338,11 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
298 |
}
|
299 |
|
300 |
$data = array(
|
301 |
-
'title'
|
302 |
'identifier' => 'footer_links',
|
303 |
-
'content'
|
304 |
-
'stores'
|
305 |
-
'is_active'
|
306 |
);
|
307 |
|
308 |
if ($storeId) {
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class for CMS pages and blocks
|
26 |
*
|
72 |
}
|
73 |
}
|
74 |
|
75 |
+
/**
|
76 |
+
* Sort Config Nodes based on values of a given tagname, defaults to <position>
|
77 |
+
*
|
78 |
+
* @param array $nodes
|
79 |
+
* @param string $sortTag
|
80 |
+
*
|
81 |
+
* @return array Config Nodes
|
82 |
+
*/
|
83 |
+
protected function _sortConfigNodes(array $nodes, $sortTag = 'position')
|
84 |
+
{
|
85 |
+
$i = 0;
|
86 |
+
foreach ($nodes as &$node) {
|
87 |
+
if (array_key_exists($sortTag, $node) && !is_null($node[$sortTag]) && $node[$sortTag] > $i) {
|
88 |
+
$i = $node[$sortTag];
|
89 |
+
}
|
90 |
+
}
|
91 |
+
foreach ($nodes as &$node) {
|
92 |
+
if (!array_key_exists($sortTag, $node) || is_null($node[$sortTag])) {
|
93 |
+
$i += 10;
|
94 |
+
$node[$sortTag] = (string)$i;
|
95 |
+
}
|
96 |
+
}
|
97 |
+
|
98 |
+
uasort($nodes, function ($a, $b) {
|
99 |
+
if ($a['position'] == $b['position']) {
|
100 |
+
return 0;
|
101 |
+
}
|
102 |
+
|
103 |
+
return ($a['position'] < $b['position']) ? -1 : 1;
|
104 |
+
});
|
105 |
+
|
106 |
+
return $nodes;
|
107 |
+
}
|
108 |
+
|
109 |
/**
|
110 |
* Get pages/default from config file
|
111 |
*
|
113 |
*/
|
114 |
protected function _getConfigPages()
|
115 |
{
|
116 |
+
$configPages = $this->_getConfigNode('pages', 'default');
|
117 |
+
$configPages = $this->_sortConfigNodes($configPages);
|
118 |
+
|
119 |
+
return $configPages;
|
120 |
}
|
121 |
|
122 |
/**
|
143 |
if (!isset($this->_footerLinks[$storeId])) {
|
144 |
return array();
|
145 |
}
|
146 |
+
|
147 |
return $this->_footerLinks[$storeId];
|
148 |
}
|
149 |
|
163 |
}
|
164 |
|
165 |
$data = array(
|
166 |
+
'stores' => $storeId ? $storeId : 0,
|
167 |
'is_active' => 1,
|
168 |
);
|
169 |
|
176 |
|
177 |
if (preg_match('/<!--@title\s*(.*?)\s*@-->/u', $templateContent, $matches)) {
|
178 |
$data['title'] = $matches[1];
|
179 |
+
$data['content_heading'] = $matches[1];
|
180 |
$templateContent = str_replace($matches[0], '', $templateContent);
|
181 |
}
|
182 |
|
209 |
$data['page_id'] = $page->getId();
|
210 |
}
|
211 |
|
212 |
+
if (!(int)$page->getId() || $override) {
|
213 |
$page->addData($data);
|
214 |
$page->save();
|
215 |
}
|
220 |
|
221 |
if ($pageData['footerlink'] == 1) {
|
222 |
$this->_footerLinks[$storeId][] = array(
|
223 |
+
'title' => $data['title'],
|
224 |
'target' => $data['identifier'],
|
225 |
);
|
226 |
}
|
291 |
if ($footerLinksCounter == count($this->_getFooterLinks($storeId))) {
|
292 |
$class = 'last';
|
293 |
}
|
294 |
+
$footerLinksHtml .= '<li class="' . $class . '">';
|
295 |
$footerLinksHtml .= '<a href="{{store url="' . $target . '"}}">' . $title . '</a></li>';
|
296 |
}
|
297 |
|
338 |
}
|
339 |
|
340 |
$data = array(
|
341 |
+
'title' => 'Footer Links',
|
342 |
'identifier' => 'footer_links',
|
343 |
+
'content' => $this->_createFooterLinksContent($storeId),
|
344 |
+
'stores' => $storeId ? $storeId : 0,
|
345 |
+
'is_active' => '1',
|
346 |
);
|
347 |
|
348 |
if ($storeId) {
|
app/code/community/FireGento/MageSetup/Model/Setup/Email.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class for transaction emails
|
25 |
*
|
@@ -152,7 +153,7 @@ class FireGento_MageSetup_Model_Setup_Email extends FireGento_MageSetup_Model_Se
|
|
152 |
protected function _getLocaleEmailPath($locale)
|
153 |
{
|
154 |
if (!isset($this->_localeTemplatePath[$locale])) {
|
155 |
-
$_localeTemplatePath =
|
156 |
$this->_localeTemplatePath[$locale] = Mage::getBaseDir() . DS . $_localeTemplatePath;
|
157 |
|
158 |
if (!is_dir($this->_localeTemplatePath[$locale])) {
|
@@ -179,8 +180,14 @@ class FireGento_MageSetup_Model_Setup_Email extends FireGento_MageSetup_Model_Se
|
|
179 |
{
|
180 |
$origTemplateText = $templateText;
|
181 |
$lastPos = strripos($templateText, '</table>');
|
|
|
|
|
|
|
182 |
$part = substr($templateText, 0, $lastPos);
|
183 |
$penultimatePos = strripos($part, '</table>');
|
|
|
|
|
|
|
184 |
$templateText = substr($templateText, 0, $penultimatePos);
|
185 |
foreach ($blocks as $block) {
|
186 |
$templateText .= $block;
|
@@ -210,6 +217,10 @@ class FireGento_MageSetup_Model_Setup_Email extends FireGento_MageSetup_Model_Se
|
|
210 |
$blocks[] = $configFooters['revocation'];
|
211 |
}
|
212 |
|
|
|
|
|
|
|
|
|
213 |
return $blocks;
|
214 |
}
|
215 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class for transaction emails
|
26 |
*
|
153 |
protected function _getLocaleEmailPath($locale)
|
154 |
{
|
155 |
if (!isset($this->_localeTemplatePath[$locale])) {
|
156 |
+
$_localeTemplatePath = 'app' . DS . 'locale' . DS . $locale . DS . 'template' . DS . 'email' . DS;
|
157 |
$this->_localeTemplatePath[$locale] = Mage::getBaseDir() . DS . $_localeTemplatePath;
|
158 |
|
159 |
if (!is_dir($this->_localeTemplatePath[$locale])) {
|
180 |
{
|
181 |
$origTemplateText = $templateText;
|
182 |
$lastPos = strripos($templateText, '</table>');
|
183 |
+
if ($lastPos === false) {
|
184 |
+
return $origTemplateText;
|
185 |
+
}
|
186 |
$part = substr($templateText, 0, $lastPos);
|
187 |
$penultimatePos = strripos($part, '</table>');
|
188 |
+
if ($penultimatePos === false) {
|
189 |
+
return $origTemplateText;
|
190 |
+
}
|
191 |
$templateText = substr($templateText, 0, $penultimatePos);
|
192 |
foreach ($blocks as $block) {
|
193 |
$templateText .= $block;
|
217 |
$blocks[] = $configFooters['revocation'];
|
218 |
}
|
219 |
|
220 |
+
if ($emailData['add_revocation_form'] == 1) {
|
221 |
+
$blocks[] = $configFooters['revocation_form'];
|
222 |
+
}
|
223 |
+
|
224 |
return $blocks;
|
225 |
}
|
226 |
}
|
app/code/community/FireGento/MageSetup/Model/Setup/Systemconfig.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class for Tax Settings
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class for Tax Settings
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Setup class for Tax Settings
|
25 |
*
|
@@ -94,14 +95,14 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
94 |
foreach ($calculation->attributes() as $attribute => $values) {
|
95 |
switch ($attribute) {
|
96 |
case 'tax_rate':
|
97 |
-
if (isset($taxRates[(string)
|
98 |
-
$rule->setTaxRate($taxRates[(string)
|
99 |
}
|
100 |
break;
|
101 |
case 'tax_customer_class':
|
102 |
case 'tax_product_class':
|
103 |
$classes = array();
|
104 |
-
foreach (explode(',', (string)
|
105 |
if (isset($taxClasses[$value])) {
|
106 |
$classes[] = $taxClasses[$value];
|
107 |
}
|
@@ -132,6 +133,7 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
132 |
if (Mage::helper('magesetup')->isCountryInEU($this->getCountryId())) {
|
133 |
return Mage::helper('magesetup')->getEUCountries();
|
134 |
}
|
|
|
135 |
return array(strtoupper($this->getCountryId()));
|
136 |
}
|
137 |
|
@@ -154,6 +156,7 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
154 |
protected function _createTaxClass($taxClassData)
|
155 |
{
|
156 |
$this->_insertIntoTable('tax/tax_class', $taxClassData);
|
|
|
157 |
return $this->_lastInsertId('tax/tax_class');
|
158 |
}
|
159 |
|
@@ -203,8 +206,8 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
203 |
foreach (Mage::app()->getStores() as $storeId => $store) {
|
204 |
$bind = array(
|
205 |
'tax_calculation_rate_id' => $rateId,
|
206 |
-
'store_id'
|
207 |
-
'value'
|
208 |
);
|
209 |
$this->_insertIntoTable('tax/tax_calculation_rate_title', $bind);
|
210 |
}
|
@@ -221,6 +224,7 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
221 |
public function _getConfigTaxCalculations()
|
222 |
{
|
223 |
$configData = $this->getConfigData();
|
|
|
224 |
return $configData->xpath('//tax_calculation_rules/default/*');
|
225 |
}
|
226 |
|
@@ -362,6 +366,7 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
362 |
protected function _lastInsertId($table)
|
363 |
{
|
364 |
$tableName = $this->_getTable($table);
|
|
|
365 |
return $this->_getConnection()->lastInsertId($tableName);
|
366 |
}
|
367 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Setup class for Tax Settings
|
26 |
*
|
95 |
foreach ($calculation->attributes() as $attribute => $values) {
|
96 |
switch ($attribute) {
|
97 |
case 'tax_rate':
|
98 |
+
if (isset($taxRates[(string)$values])) {
|
99 |
+
$rule->setTaxRate($taxRates[(string)$values]);
|
100 |
}
|
101 |
break;
|
102 |
case 'tax_customer_class':
|
103 |
case 'tax_product_class':
|
104 |
$classes = array();
|
105 |
+
foreach (explode(',', (string)$values) as $value) {
|
106 |
if (isset($taxClasses[$value])) {
|
107 |
$classes[] = $taxClasses[$value];
|
108 |
}
|
133 |
if (Mage::helper('magesetup')->isCountryInEU($this->getCountryId())) {
|
134 |
return Mage::helper('magesetup')->getEUCountries();
|
135 |
}
|
136 |
+
|
137 |
return array(strtoupper($this->getCountryId()));
|
138 |
}
|
139 |
|
156 |
protected function _createTaxClass($taxClassData)
|
157 |
{
|
158 |
$this->_insertIntoTable('tax/tax_class', $taxClassData);
|
159 |
+
|
160 |
return $this->_lastInsertId('tax/tax_class');
|
161 |
}
|
162 |
|
206 |
foreach (Mage::app()->getStores() as $storeId => $store) {
|
207 |
$bind = array(
|
208 |
'tax_calculation_rate_id' => $rateId,
|
209 |
+
'store_id' => $storeId,
|
210 |
+
'value' => $label,
|
211 |
);
|
212 |
$this->_insertIntoTable('tax/tax_calculation_rate_title', $bind);
|
213 |
}
|
224 |
public function _getConfigTaxCalculations()
|
225 |
{
|
226 |
$configData = $this->getConfigData();
|
227 |
+
|
228 |
return $configData->xpath('//tax_calculation_rules/default/*');
|
229 |
}
|
230 |
|
366 |
protected function _lastInsertId($table)
|
367 |
{
|
368 |
$tableName = $this->_getTable($table);
|
369 |
+
|
370 |
return $this->_getConnection()->lastInsertId($tableName);
|
371 |
}
|
372 |
}
|
app/code/community/FireGento/MageSetup/Model/Source/AgreementType.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Source model for attribute "agreement_type"
|
25 |
*
|
@@ -42,6 +43,7 @@ class FireGento_MageSetup_Model_Source_AgreementType
|
|
42 |
public function toOptionArray()
|
43 |
{
|
44 |
$helper = Mage::helper('magesetup');
|
|
|
45 |
return array(
|
46 |
array(
|
47 |
'value' => self::AGREEMENT_TYPE_CHECKOUT,
|
@@ -73,6 +75,7 @@ class FireGento_MageSetup_Model_Source_AgreementType
|
|
73 |
foreach ($this->toOptionArray() as $option) {
|
74 |
$options[$option['value']] = $option['label'];
|
75 |
}
|
|
|
76 |
return $options;
|
77 |
}
|
78 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Source model for attribute "agreement_type"
|
26 |
*
|
43 |
public function toOptionArray()
|
44 |
{
|
45 |
$helper = Mage::helper('magesetup');
|
46 |
+
|
47 |
return array(
|
48 |
array(
|
49 |
'value' => self::AGREEMENT_TYPE_CHECKOUT,
|
75 |
foreach ($this->toOptionArray() as $option) {
|
76 |
$options[$option['value']] = $option['label'];
|
77 |
}
|
78 |
+
|
79 |
return $options;
|
80 |
}
|
81 |
}
|
app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* CMS Source model for configuration dropdown of CMS static blocks
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* CMS Source model for configuration dropdown of CMS static blocks
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* CMS Source model for configuration dropdown of CMS pages
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* CMS Source model for configuration dropdown of CMS pages
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Source/RevocationProductType.php
ADDED
@@ -0,0 +1,95 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 2.2.0
|
22 |
+
*/
|
23 |
+
|
24 |
+
/**
|
25 |
+
* Source model for attribute "revocation_product_type"
|
26 |
+
*
|
27 |
+
* @category FireGento
|
28 |
+
* @package FireGento_MageSetup
|
29 |
+
* @author FireGento Team <team@firegento.com>
|
30 |
+
*/
|
31 |
+
class FireGento_MageSetup_Model_Source_RevocationProductType extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
32 |
+
{
|
33 |
+
const REVOCATION_PRODUCT_TYPE_DEFAULT = '';
|
34 |
+
const REVOCATION_PRODUCT_TYPE_ALL = '';
|
35 |
+
const REVOCATION_PRODUCT_TYPE_GOODS = 'goods';
|
36 |
+
const REVOCATION_PRODUCT_TYPE_DIGITAL = 'digital';
|
37 |
+
const REVOCATION_PRODUCT_TYPE_SERVICE = 'service';
|
38 |
+
|
39 |
+
/**
|
40 |
+
* Options getter
|
41 |
+
*
|
42 |
+
* @return array Product types as option array
|
43 |
+
*/
|
44 |
+
public function toOptionArray()
|
45 |
+
{
|
46 |
+
$helper = Mage::helper('magesetup');
|
47 |
+
|
48 |
+
return array(
|
49 |
+
array(
|
50 |
+
'value' => self::REVOCATION_PRODUCT_TYPE_GOODS,
|
51 |
+
'label' => $helper->__('Delivery of Goods')
|
52 |
+
),
|
53 |
+
array(
|
54 |
+
'value' => self::REVOCATION_PRODUCT_TYPE_DIGITAL,
|
55 |
+
'label' => $helper->__('Digital Content')
|
56 |
+
),
|
57 |
+
array(
|
58 |
+
'value' => self::REVOCATION_PRODUCT_TYPE_SERVICE,
|
59 |
+
'label' => $helper->__('Service')
|
60 |
+
),
|
61 |
+
);
|
62 |
+
}
|
63 |
+
|
64 |
+
/**
|
65 |
+
* Options getter
|
66 |
+
*
|
67 |
+
* @return array Product types as option array
|
68 |
+
*/
|
69 |
+
public function getAllOptions()
|
70 |
+
{
|
71 |
+
$options = array_merge(array(array(
|
72 |
+
'value' => self::REVOCATION_PRODUCT_TYPE_DEFAULT,
|
73 |
+
'label' => Mage::helper('magesetup')->__('Default (Configuration)'),
|
74 |
+
)), $this->toOptionArray());
|
75 |
+
|
76 |
+
return $options;
|
77 |
+
}
|
78 |
+
|
79 |
+
/**
|
80 |
+
* Retrieve all product types as option hash
|
81 |
+
*
|
82 |
+
* @return array Product Types as option hash
|
83 |
+
*/
|
84 |
+
public function getOptionArray()
|
85 |
+
{
|
86 |
+
$options = array(
|
87 |
+
self::REVOCATION_PRODUCT_TYPE_ALL => Mage::helper('magesetup')->__('All')
|
88 |
+
);
|
89 |
+
foreach ($this->toOptionArray() as $option) {
|
90 |
+
$options[$option['value']] = $option['label'];
|
91 |
+
}
|
92 |
+
|
93 |
+
return $options;
|
94 |
+
}
|
95 |
+
}
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/CustomerTaxClass.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Tax Source model for existing customer tax classes
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Tax Source model for existing customer tax classes
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.2.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* CMS Source model for configuration dropdown of CMS pages
|
25 |
*
|
@@ -37,19 +38,16 @@ class FireGento_MageSetup_Model_Source_Tax_DynamicType
|
|
37 |
public function toOptionArray()
|
38 |
{
|
39 |
$helper = Mage::helper('magesetup');
|
|
|
40 |
return array(
|
41 |
array(
|
42 |
'value' => 0,
|
43 |
'label' => $helper->__('No dynamic shipping tax caluclation')
|
44 |
),
|
45 |
array(
|
46 |
-
'value' => FireGento_MageSetup_Model_Tax_Config::
|
47 |
'label' => $helper->__('Use the highest product tax')
|
48 |
),
|
49 |
-
array(
|
50 |
-
'value' => FireGento_MageSetup_Model_Tax_Config::USE_TAX_DEPENDING_ON_PRODUCT_VALUES,
|
51 |
-
'label' => $helper->__('Use the tax rate of products that make up the biggest amount')
|
52 |
-
),
|
53 |
);
|
54 |
}
|
55 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.2.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* CMS Source model for configuration dropdown of CMS pages
|
26 |
*
|
38 |
public function toOptionArray()
|
39 |
{
|
40 |
$helper = Mage::helper('magesetup');
|
41 |
+
|
42 |
return array(
|
43 |
array(
|
44 |
'value' => 0,
|
45 |
'label' => $helper->__('No dynamic shipping tax caluclation')
|
46 |
),
|
47 |
array(
|
48 |
+
'value' => FireGento_MageSetup_Model_Tax_Config::USE_HIGHEST_TAX_ON_PRODUCTS,
|
49 |
'label' => $helper->__('Use the highest product tax')
|
50 |
),
|
|
|
|
|
|
|
|
|
51 |
);
|
52 |
}
|
53 |
}
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Tax Source model for new customer tax classes, possibly not created yet
|
25 |
*
|
@@ -51,7 +52,8 @@ class FireGento_MageSetup_Model_Source_Tax_NewCustomerTaxClass
|
|
51 |
$taxClasses = $this->_getConfigNode('tax_classes', 'default');
|
52 |
foreach ($taxClasses as $identifier => $taxClass) {
|
53 |
if ($taxClass['class_type'] != 'CUSTOMER'
|
54 |
-
|| $taxClass['execute'] != 1
|
|
|
55 |
continue;
|
56 |
}
|
57 |
|
@@ -60,7 +62,7 @@ class FireGento_MageSetup_Model_Source_Tax_NewCustomerTaxClass
|
|
60 |
'label' => $taxClass['class_name'],
|
61 |
);
|
62 |
}
|
63 |
-
array_unshift($this->_options, array('value' => '', 'label' =>''));
|
64 |
}
|
65 |
|
66 |
return $this->_options;
|
@@ -87,7 +89,8 @@ class FireGento_MageSetup_Model_Source_Tax_NewCustomerTaxClass
|
|
87 |
$taxClasses = $this->_getConfigNode('tax_classes', 'default');
|
88 |
foreach ($taxClasses as $identifier => $taxClass) {
|
89 |
if ($taxClass['class_type'] != 'CUSTOMER'
|
90 |
-
|| $taxClass['execute'] != 1
|
|
|
91 |
continue;
|
92 |
}
|
93 |
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Tax Source model for new customer tax classes, possibly not created yet
|
26 |
*
|
52 |
$taxClasses = $this->_getConfigNode('tax_classes', 'default');
|
53 |
foreach ($taxClasses as $identifier => $taxClass) {
|
54 |
if ($taxClass['class_type'] != 'CUSTOMER'
|
55 |
+
|| $taxClass['execute'] != 1
|
56 |
+
) {
|
57 |
continue;
|
58 |
}
|
59 |
|
62 |
'label' => $taxClass['class_name'],
|
63 |
);
|
64 |
}
|
65 |
+
array_unshift($this->_options, array('value' => '', 'label' => ''));
|
66 |
}
|
67 |
|
68 |
return $this->_options;
|
89 |
$taxClasses = $this->_getConfigNode('tax_classes', 'default');
|
90 |
foreach ($taxClasses as $identifier => $taxClass) {
|
91 |
if ($taxClass['class_type'] != 'CUSTOMER'
|
92 |
+
|| $taxClass['execute'] != 1
|
93 |
+
) {
|
94 |
continue;
|
95 |
}
|
96 |
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Tax Source model for new product tax classes, possibly not created yet
|
25 |
*
|
@@ -52,7 +53,8 @@ class FireGento_MageSetup_Model_Source_Tax_NewProductTaxClass
|
|
52 |
foreach ($taxClasses as $identifier => $taxClass) {
|
53 |
if ($taxClass['class_type'] != 'PRODUCT'
|
54 |
|| $taxClass['execute'] != 1
|
55 |
-
|| strpos($identifier, 'shipping') === 0
|
|
|
56 |
continue;
|
57 |
}
|
58 |
|
@@ -61,7 +63,7 @@ class FireGento_MageSetup_Model_Source_Tax_NewProductTaxClass
|
|
61 |
'label' => $taxClass['class_name'],
|
62 |
);
|
63 |
}
|
64 |
-
array_unshift($this->_options, array('value' => '', 'label' =>''));
|
65 |
}
|
66 |
|
67 |
return $this->_options;
|
@@ -89,7 +91,8 @@ class FireGento_MageSetup_Model_Source_Tax_NewProductTaxClass
|
|
89 |
foreach ($taxClasses as $identifier => $taxClass) {
|
90 |
if ($taxClass['class_type'] != 'PRODUCT'
|
91 |
|| $taxClass['execute'] != 1
|
92 |
-
|| strpos($identifier, 'shipping') === 0
|
|
|
93 |
continue;
|
94 |
}
|
95 |
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Tax Source model for new product tax classes, possibly not created yet
|
26 |
*
|
53 |
foreach ($taxClasses as $identifier => $taxClass) {
|
54 |
if ($taxClass['class_type'] != 'PRODUCT'
|
55 |
|| $taxClass['execute'] != 1
|
56 |
+
|| strpos($identifier, 'shipping') === 0
|
57 |
+
) {
|
58 |
continue;
|
59 |
}
|
60 |
|
63 |
'label' => $taxClass['class_name'],
|
64 |
);
|
65 |
}
|
66 |
+
array_unshift($this->_options, array('value' => '', 'label' => ''));
|
67 |
}
|
68 |
|
69 |
return $this->_options;
|
91 |
foreach ($taxClasses as $identifier => $taxClass) {
|
92 |
if ($taxClass['class_type'] != 'PRODUCT'
|
93 |
|| $taxClass['execute'] != 1
|
94 |
+
|| strpos($identifier, 'shipping') === 0
|
95 |
+
) {
|
96 |
continue;
|
97 |
}
|
98 |
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/ProductTaxClass.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Tax Source model for product tax classes
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Tax Source model for product tax classes
|
26 |
*
|
app/code/community/FireGento/MageSetup/Model/Tax/Config.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Tax config model with new shipping tax class calculation
|
25 |
*
|
@@ -30,8 +31,7 @@
|
|
30 |
class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
|
31 |
{
|
32 |
const XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX = 'tax/classes/shipping_tax_on_product_tax';
|
33 |
-
const
|
34 |
-
const USE_TAX_DEPENDING_ON_PRODUCT_VALUES = 2;
|
35 |
|
36 |
/**
|
37 |
* Get tax class id specified for shipping tax estimation based on highest product
|
@@ -67,7 +67,7 @@ class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
|
|
67 |
if (!Mage::getStoreConfigFlag(self::XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX, $store)
|
68 |
|| count($quoteItems) == 0
|
69 |
) {
|
70 |
-
$taxClassId = (int)
|
71 |
|
72 |
return $taxClassId;
|
73 |
}
|
@@ -81,37 +81,16 @@ class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
|
|
81 |
continue;
|
82 |
}
|
83 |
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
// sum up all product values grouped by the tax class id
|
88 |
-
if (isset($taxClassSums[$item->getTaxClassId()])) {
|
89 |
-
$taxClassSums[$item->getTaxClassId()] += $item->getPriceInclTax() * $item->getQty();
|
90 |
-
} else {
|
91 |
-
$taxClassSums[$item->getTaxClassId()] = $item->getPriceInclTax() * $item->getQty();
|
92 |
-
}
|
93 |
-
} else {
|
94 |
-
$taxPercent = $this->_loadTaxCalculationRate($item);
|
95 |
-
if (is_float($taxPercent) && !in_array($taxPercent, $taxClassIds)) {
|
96 |
-
$taxClassIds[$taxPercent] = $item->getTaxClassId();
|
97 |
-
}
|
98 |
}
|
99 |
}
|
100 |
|
101 |
-
|
102 |
-
|
103 |
-
) {
|
104 |
-
|
105 |
-
arsort($taxClassSums);
|
106 |
-
if (count($taxClassSums)) {
|
107 |
-
$highestTaxRate = key($taxClassSums);
|
108 |
-
}
|
109 |
-
} else {
|
110 |
-
// Get the highest tax rate
|
111 |
-
ksort($taxClassIds);
|
112 |
-
if (count($taxClassIds)) {
|
113 |
-
$highestTaxRate = array_pop($taxClassIds);
|
114 |
-
}
|
115 |
}
|
116 |
|
117 |
if (!$highestTaxRate || is_null($highestTaxRate)) {
|
@@ -120,7 +99,7 @@ class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
|
|
120 |
$taxClassId = $highestTaxRate;
|
121 |
}
|
122 |
|
123 |
-
return (int)
|
124 |
}
|
125 |
|
126 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Tax config model with new shipping tax class calculation
|
26 |
*
|
31 |
class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
|
32 |
{
|
33 |
const XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX = 'tax/classes/shipping_tax_on_product_tax';
|
34 |
+
const USE_HIGHEST_TAX_ON_PRODUCTS = 1;
|
|
|
35 |
|
36 |
/**
|
37 |
* Get tax class id specified for shipping tax estimation based on highest product
|
67 |
if (!Mage::getStoreConfigFlag(self::XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX, $store)
|
68 |
|| count($quoteItems) == 0
|
69 |
) {
|
70 |
+
$taxClassId = (int)Mage::getStoreConfig(self::CONFIG_XML_PATH_SHIPPING_TAX_CLASS, $store);
|
71 |
|
72 |
return $taxClassId;
|
73 |
}
|
81 |
continue;
|
82 |
}
|
83 |
|
84 |
+
$taxPercent = $this->_loadTaxCalculationRate($item);
|
85 |
+
if (is_float($taxPercent) && !in_array($taxPercent, $taxClassIds)) {
|
86 |
+
$taxClassIds[$taxPercent] = $item->getTaxClassId();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
87 |
}
|
88 |
}
|
89 |
|
90 |
+
// Get the highest tax rate
|
91 |
+
ksort($taxClassIds);
|
92 |
+
if (count($taxClassIds)) {
|
93 |
+
$highestTaxRate = array_pop($taxClassIds);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
94 |
}
|
95 |
|
96 |
if (!$highestTaxRate || is_null($highestTaxRate)) {
|
99 |
$taxClassId = $highestTaxRate;
|
100 |
}
|
101 |
|
102 |
+
return (int)$taxClassId;
|
103 |
}
|
104 |
|
105 |
/**
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content.php
ADDED
@@ -0,0 +1,121 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 2.0.0
|
22 |
+
*/
|
23 |
+
/**
|
24 |
+
* PHPUnit Test Class
|
25 |
+
*
|
26 |
+
* @category FireGento
|
27 |
+
* @package FireGento_MageSetup
|
28 |
+
* @author FireGento Team <team@firegento.com>
|
29 |
+
*/
|
30 |
+
class FireGento_MageSetup_Test_Block_Imprint_Content extends EcomDev_PHPUnit_Test_Case
|
31 |
+
{
|
32 |
+
/**
|
33 |
+
* @var FireGento_MageSetup_Block_Imprint_Content
|
34 |
+
*/
|
35 |
+
protected $_block;
|
36 |
+
|
37 |
+
/**
|
38 |
+
* Set up test class
|
39 |
+
*/
|
40 |
+
protected function setUp()
|
41 |
+
{
|
42 |
+
parent::setUp();
|
43 |
+
$this->_block = $this->app()->getLayout()->createBlock('magesetup/imprint_content');
|
44 |
+
}
|
45 |
+
|
46 |
+
/**
|
47 |
+
* @test
|
48 |
+
*/
|
49 |
+
public function testInstance()
|
50 |
+
{
|
51 |
+
$this->assertInstanceOf('FireGento_MageSetup_Block_Imprint_Content', $this->_block);
|
52 |
+
}
|
53 |
+
|
54 |
+
/**
|
55 |
+
* @test
|
56 |
+
* @loadFixture generalImprint
|
57 |
+
*/
|
58 |
+
public function testSetStoreId()
|
59 |
+
{
|
60 |
+
$this->_block->setStoreId(1);
|
61 |
+
$this->assertEquals('DE', $this->_block->getData('country'));
|
62 |
+
}
|
63 |
+
|
64 |
+
/**
|
65 |
+
* @test
|
66 |
+
*/
|
67 |
+
public function testGetStoreIdWithoutOrder()
|
68 |
+
{
|
69 |
+
$this->assertNull($this->_block->getStoreId());
|
70 |
+
}
|
71 |
+
|
72 |
+
/**
|
73 |
+
* @test
|
74 |
+
* @loadFixture generalImprint
|
75 |
+
* @dataProvider dataProvider
|
76 |
+
* @loadExpectations
|
77 |
+
*/
|
78 |
+
public function testGetWeb($checkForProtocol)
|
79 |
+
{
|
80 |
+
$this->assertEquals($this->expected('auto')->getResult(), $this->_block->getWeb($checkForProtocol));
|
81 |
+
}
|
82 |
+
|
83 |
+
/**
|
84 |
+
* @test
|
85 |
+
* @loadFixture generalImprint
|
86 |
+
*/
|
87 |
+
public function testGetCountry()
|
88 |
+
{
|
89 |
+
$this->assertEquals('Germany', $this->_block->getCountry());
|
90 |
+
}
|
91 |
+
|
92 |
+
/**
|
93 |
+
* @test
|
94 |
+
* @loadFixture generalImprint
|
95 |
+
* @dataProvider dataProvider
|
96 |
+
* @loadExpectations
|
97 |
+
*/
|
98 |
+
public function testGetEmail($antispam)
|
99 |
+
{
|
100 |
+
$this->assertEquals($this->expected('auto')->getResult(), $this->_block->getEmail($antispam));
|
101 |
+
}
|
102 |
+
|
103 |
+
/**
|
104 |
+
* @test
|
105 |
+
*/
|
106 |
+
public function testGetEmailJs()
|
107 |
+
{
|
108 |
+
$parts = array(
|
109 |
+
'foo',
|
110 |
+
'bar.com'
|
111 |
+
);
|
112 |
+
|
113 |
+
$expectedJs = <<<JS
|
114 |
+
<script>function toRecipient(){var m = 'foo';m += '@';m += 'bar.com';location.href= "mailto:"+m;}</script>
|
115 |
+
JS;
|
116 |
+
$this->assertEquals(
|
117 |
+
$expectedJs,
|
118 |
+
$this->_block->getEmailJs($parts)
|
119 |
+
);
|
120 |
+
}
|
121 |
+
}
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/expectations/testGetEmail.yaml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
testWithoutAntispam:
|
2 |
+
result: foo@bar.com
|
3 |
+
testWithAntispam:
|
4 |
+
result: <a href="#" onclick="javascript:toRecipient();">foo<span class="no-display">nospamplease</span>@<span class="no-display">nospamplease</span>bar.com</a><script>function toRecipient(){var m = 'foo';m += '@';m += 'bar.com';location.href= "mailto:"+m;}</script>
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/expectations/testGetWeb.yaml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
testWithoutProtocolCheck:
|
2 |
+
result: firegento.com
|
3 |
+
testWithProtocolCheck:
|
4 |
+
result: http://firegento.com
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/fixtures/generalImprint.yaml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
config:
|
2 |
+
default/general/imprint/email: foo@bar.com
|
3 |
+
default/general/imprint/country: DE
|
4 |
+
default/general/imprint/web: firegento.com
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/providers/testGetEmail.yaml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
testWithoutAntispam:
|
2 |
+
antispam: 0
|
3 |
+
testWithAntispam:
|
4 |
+
antispam: 1
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/providers/testGetWeb.yaml
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
testWithoutProtocolCheck:
|
2 |
+
checkForProtocol: 0
|
3 |
+
testWithProtocolCheck:
|
4 |
+
checkForProtocol: 1
|
app/code/community/FireGento/MageSetup/Test/Config/Main.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 2.0.0
|
22 |
*/
|
23 |
/**
|
@@ -117,11 +117,73 @@ class FireGento_MageSetup_Test_Config_Main extends EcomDev_PHPUnit_Test_Case_Con
|
|
117 |
*/
|
118 |
public function testRewrites()
|
119 |
{
|
120 |
-
$this->assertBlockAlias('googleanalytics/ga', 'FireGento_MageSetup_Block_Ga');
|
121 |
-
|
122 |
$this->assertHelperAlias('catalog/product_configuration', 'FireGento_MageSetup_Helper_Catalog_Product_Configuration');
|
123 |
$this->assertHelperAlias('checkout/data', 'FireGento_MageSetup_Helper_Checkout_Data');
|
124 |
|
125 |
$this->assertModelAlias('tax/config', 'FireGento_MageSetup_Model_Tax_Config');
|
126 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
127 |
}
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 2.0.0
|
22 |
*/
|
23 |
/**
|
117 |
*/
|
118 |
public function testRewrites()
|
119 |
{
|
|
|
|
|
120 |
$this->assertHelperAlias('catalog/product_configuration', 'FireGento_MageSetup_Helper_Catalog_Product_Configuration');
|
121 |
$this->assertHelperAlias('checkout/data', 'FireGento_MageSetup_Helper_Checkout_Data');
|
122 |
|
123 |
$this->assertModelAlias('tax/config', 'FireGento_MageSetup_Model_Tax_Config');
|
124 |
}
|
125 |
+
|
126 |
+
/**
|
127 |
+
* @test
|
128 |
+
*/
|
129 |
+
public function testSetupResource()
|
130 |
+
{
|
131 |
+
$this->assertSetupResourceDefined('FireGento_MageSetup', 'magesetup_setup');
|
132 |
+
$this->assertSetupResourceExists('FireGento_MageSetup', 'magesetup_setup');
|
133 |
+
}
|
134 |
+
|
135 |
+
/**
|
136 |
+
* @test
|
137 |
+
*/
|
138 |
+
public function testEventObserver()
|
139 |
+
{
|
140 |
+
// Global event observers
|
141 |
+
$this->assertEventObserverDefined(
|
142 |
+
'global',
|
143 |
+
'catalog_product_save_before',
|
144 |
+
'magesetup/observer',
|
145 |
+
'autogenerateMetaInformation'
|
146 |
+
);
|
147 |
+
$this->assertEventObserverDefined(
|
148 |
+
'global',
|
149 |
+
'newsletter_subscriber_save_after',
|
150 |
+
'magesetup/newsletter_observer',
|
151 |
+
'saveSubscriberStatusHistory'
|
152 |
+
);
|
153 |
+
|
154 |
+
// Frontend event observers
|
155 |
+
$this->assertEventObserverDefined(
|
156 |
+
'frontend',
|
157 |
+
'core_block_abstract_to_html_before',
|
158 |
+
'magesetup/observer',
|
159 |
+
'filterAgreements'
|
160 |
+
);
|
161 |
+
$this->assertEventObserverDefined(
|
162 |
+
'frontend',
|
163 |
+
'controller_action_predispatch_customer_account_createpost',
|
164 |
+
'magesetup/observer',
|
165 |
+
'customerCreatePreDispatch'
|
166 |
+
);
|
167 |
+
$this->assertEventObserverDefined(
|
168 |
+
'frontend',
|
169 |
+
'core_block_abstract_to_html_after',
|
170 |
+
'magesetup/observer',
|
171 |
+
'setGAAnonymizerCode'
|
172 |
+
);
|
173 |
+
|
174 |
+
// Adminhtml event observers
|
175 |
+
$this->assertEventObserverDefined(
|
176 |
+
'adminhtml',
|
177 |
+
'adminhtml_catalog_product_attribute_edit_prepare_form',
|
178 |
+
'magesetup/observer',
|
179 |
+
'addIsVisibleOnCheckoutOption'
|
180 |
+
);
|
181 |
+
$this->assertEventObserverDefined(
|
182 |
+
'adminhtml',
|
183 |
+
'adminhtml_block_html_before',
|
184 |
+
'magesetup/observer',
|
185 |
+
'addOptionsForAgreements'
|
186 |
+
);
|
187 |
+
|
188 |
+
}
|
189 |
}
|
app/code/community/FireGento/MageSetup/Test/Config/Main/expectations/testModuleConfig.yaml
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
module:
|
2 |
-
version: 2.
|
3 |
code_pool: community
|
1 |
module:
|
2 |
+
version: 2.2.0
|
3 |
code_pool: community
|
app/code/community/FireGento/MageSetup/Test/Model/Observer.php
ADDED
@@ -0,0 +1,96 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 2.0.0
|
22 |
+
*/
|
23 |
+
/**
|
24 |
+
* PHPUnit Test Class
|
25 |
+
*
|
26 |
+
* @category FireGento
|
27 |
+
* @package FireGento_MageSetup
|
28 |
+
* @author FireGento Team <team@firegento.com>
|
29 |
+
*/
|
30 |
+
class FireGento_MageSetup_Test_Model_Observer extends EcomDev_PHPUnit_Test_Case
|
31 |
+
{
|
32 |
+
/**
|
33 |
+
* @var FireGento_MageSetup_Model_Observer
|
34 |
+
*/
|
35 |
+
protected $_model;
|
36 |
+
|
37 |
+
/**
|
38 |
+
* Set up test class
|
39 |
+
*/
|
40 |
+
protected function setUp()
|
41 |
+
{
|
42 |
+
parent::setUp();
|
43 |
+
|
44 |
+
$this->_model = Mage::getModel('magesetup/observer');
|
45 |
+
}
|
46 |
+
|
47 |
+
/**
|
48 |
+
* @test
|
49 |
+
*/
|
50 |
+
public function testInstance()
|
51 |
+
{
|
52 |
+
$this->assertInstanceOf('FireGento_MageSetup_Model_Observer', $this->_model);
|
53 |
+
}
|
54 |
+
|
55 |
+
/**
|
56 |
+
* @test
|
57 |
+
* @loadFixture testGoogleAnonymizationEnabled
|
58 |
+
*/
|
59 |
+
public function testGoogleAnonymizationEnabled()
|
60 |
+
{
|
61 |
+
$block = self::app()->getLayout()->createBlock('googleanalytics/ga')->setTemplate('googleanalytics/ga.phtml');
|
62 |
+
$transport = new Varien_Object();
|
63 |
+
$transport->setHtml($block->toHtml());
|
64 |
+
|
65 |
+
$event = new Varien_Event();
|
66 |
+
$event->setData('block', $block);
|
67 |
+
$event->setData('transport', $transport);
|
68 |
+
$observer = new Varien_Event_Observer();
|
69 |
+
$observer->setEvent($event);
|
70 |
+
|
71 |
+
$this->_model->setGAAnonymizerCode($observer);
|
72 |
+
|
73 |
+
$this->assertContains('_anonymizeIp', $observer->getEvent()->getTransport()->getHtml());
|
74 |
+
}
|
75 |
+
|
76 |
+
/**
|
77 |
+
* @test
|
78 |
+
* @loadFixture testGoogleAnonymizationDisabled
|
79 |
+
*/
|
80 |
+
public function testGoogleAnonymizationDisabled()
|
81 |
+
{
|
82 |
+
$block = $this->app()->getLayout()->createBlock('googleanalytics/ga')->setTemplate('googleanalytics/ga.phtml');
|
83 |
+
$transport = new Varien_Object();
|
84 |
+
$transport->setHtml($block->toHtml());
|
85 |
+
|
86 |
+
$event = new Varien_Event();
|
87 |
+
$event->setData('block', $block);
|
88 |
+
$event->setData('transport', $transport);
|
89 |
+
$observer = new Varien_Event_Observer();
|
90 |
+
$observer->setEvent($event);
|
91 |
+
|
92 |
+
$this->_model->setGAAnonymizerCode($observer);
|
93 |
+
|
94 |
+
$this->assertNotContains('_anonymizeIp', $observer->getEvent()->getTransport()->getHtml());
|
95 |
+
}
|
96 |
+
}
|
app/code/community/FireGento/MageSetup/Test/Model/Observer/fixtures/testGoogleAnonymizationDisabled.yaml
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
config:
|
2 |
+
default/google/analytics/active: 1
|
3 |
+
default/google/analytics/account: UA-XXXXXXX
|
4 |
+
default/google/analytics/anonymization: 0
|
5 |
+
default/google/analytics/ip_anonymization: 0
|
app/code/community/FireGento/MageSetup/Test/Model/Observer/fixtures/testGoogleAnonymizationEnabled.yaml
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
config:
|
2 |
+
default/google/analytics/active: 1
|
3 |
+
default/google/analytics/account: UA-XXXXXXX
|
4 |
+
default/google/analytics/anonymization: 1
|
5 |
+
default/google/analytics/ip_anonymization: 1
|
app/code/community/FireGento/MageSetup/Test/Model/Source/AgreementType.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 2.0.0
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 2.0.0
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 2.0.0
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 2.0.0
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType/expectations/testToOptionArray.yaml
CHANGED
@@ -4,7 +4,4 @@ result:
|
|
4 |
label: "No dynamic shipping tax caluclation"
|
5 |
-
|
6 |
value: 1
|
7 |
-
label: "Use the highest product tax"
|
8 |
-
-
|
9 |
-
value: 2
|
10 |
-
label: "Use the tax rate of products that make up the biggest amount"
|
4 |
label: "No dynamic shipping tax caluclation"
|
5 |
-
|
6 |
value: 1
|
7 |
+
label: "Use the highest product tax"
|
|
|
|
|
|
app/code/community/FireGento/MageSetup/Test/features/product_list.feature
CHANGED
@@ -7,19 +7,19 @@ Feature: Product List
|
|
7 |
Given I set config value for "catalog/price/cms_page_shipping" to "" in "default" scope
|
8 |
And the cache is clean
|
9 |
When I am on "/furniture.html"
|
10 |
-
Then I should not see text "Inkl. 19%
|
11 |
-
Then I should see text "Inkl. 19%
|
12 |
|
13 |
Scenario: Tax Rate with not included shipping cost link
|
14 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
15 |
And I set config value for "catalog/price/including_shipping_costs" to "0" in "default" scope
|
16 |
And the cache is clean
|
17 |
When I am on "/furniture.html"
|
18 |
-
Then I should see text "Inkl. 19%
|
19 |
|
20 |
Scenario: Tax Rate with included shipping cost link
|
21 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
22 |
And I set config value for "catalog/price/including_shipping_costs" to "1" in "default" scope
|
23 |
And the cache is clean
|
24 |
When I am on "/furniture.html"
|
25 |
-
Then I should see text "Inkl. 19%
|
7 |
Given I set config value for "catalog/price/cms_page_shipping" to "" in "default" scope
|
8 |
And the cache is clean
|
9 |
When I am on "/furniture.html"
|
10 |
+
Then I should not see text "Inkl. 19% USt., zzgl. Versandkosten"
|
11 |
+
Then I should see text "Inkl. 19% USt."
|
12 |
|
13 |
Scenario: Tax Rate with not included shipping cost link
|
14 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
15 |
And I set config value for "catalog/price/including_shipping_costs" to "0" in "default" scope
|
16 |
And the cache is clean
|
17 |
When I am on "/furniture.html"
|
18 |
+
Then I should see text "Inkl. 19% USt., zzgl. Versandkosten"
|
19 |
|
20 |
Scenario: Tax Rate with included shipping cost link
|
21 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
22 |
And I set config value for "catalog/price/including_shipping_costs" to "1" in "default" scope
|
23 |
And the cache is clean
|
24 |
When I am on "/furniture.html"
|
25 |
+
Then I should see text "Inkl. 19% USt., inkl. Versandkosten"
|
app/code/community/FireGento/MageSetup/Test/features/product_view.feature
CHANGED
@@ -7,19 +7,19 @@ Feature: Product List
|
|
7 |
Given I set config value for "catalog/price/cms_page_shipping" to "" in "default" scope
|
8 |
And the cache is clean
|
9 |
When I am on "/ottoman.html"
|
10 |
-
Then I should not see text "Inkl. 19%
|
11 |
-
Then I should see text "Inkl. 19%
|
12 |
|
13 |
Scenario: Tax Rate with not included shipping cost link
|
14 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
15 |
And I set config value for "catalog/price/including_shipping_costs" to "0" in "default" scope
|
16 |
And the cache is clean
|
17 |
When I am on "/ottoman.html"
|
18 |
-
Then I should see text "Inkl. 19%
|
19 |
|
20 |
Scenario: Tax Rate with included shipping cost link
|
21 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
22 |
And I set config value for "catalog/price/including_shipping_costs" to "1" in "default" scope
|
23 |
And the cache is clean
|
24 |
When I am on "/ottoman.html"
|
25 |
-
Then I should see text "Inkl. 19%
|
7 |
Given I set config value for "catalog/price/cms_page_shipping" to "" in "default" scope
|
8 |
And the cache is clean
|
9 |
When I am on "/ottoman.html"
|
10 |
+
Then I should not see text "Inkl. 19% USt., zzgl. Versandkosten"
|
11 |
+
Then I should see text "Inkl. 19% USt."
|
12 |
|
13 |
Scenario: Tax Rate with not included shipping cost link
|
14 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
15 |
And I set config value for "catalog/price/including_shipping_costs" to "0" in "default" scope
|
16 |
And the cache is clean
|
17 |
When I am on "/ottoman.html"
|
18 |
+
Then I should see text "Inkl. 19% USt., zzgl. Versandkosten"
|
19 |
|
20 |
Scenario: Tax Rate with included shipping cost link
|
21 |
Given I set config value for "catalog/price/cms_page_shipping" to "lieferung" in "default" scope
|
22 |
And I set config value for "catalog/price/including_shipping_costs" to "1" in "default" scope
|
23 |
And the cache is clean
|
24 |
When I am on "/ottoman.html"
|
25 |
+
Then I should see text "Inkl. 19% USt., inkl. Versandkosten"
|
app/code/community/FireGento/MageSetup/controllers/{MagesetupController.php → Adminhtml/MagesetupController.php}
RENAMED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Adminhtml Controller for dislaying a form for some actions
|
25 |
*
|
@@ -27,7 +28,7 @@
|
|
27 |
* @package FireGento_MageSetup
|
28 |
* @author FireGento Team <team@firegento.com>
|
29 |
*/
|
30 |
-
class
|
31 |
{
|
32 |
/**
|
33 |
* Basic action: setup form
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Adminhtml Controller for dislaying a form for some actions
|
26 |
*
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Adminhtml_MagesetupController extends Mage_Adminhtml_Controller_Action
|
32 |
{
|
33 |
/**
|
34 |
* Basic action: setup form
|
app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.1.4
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Newsletter Subscriber Status Adminhtml Controller
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.1.4
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Newsletter Subscriber Status Adminhtml Controller
|
26 |
*
|
app/code/community/FireGento/MageSetup/controllers/FrontendController.php
CHANGED
@@ -15,11 +15,12 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
|
|
23 |
/**
|
24 |
* Adminhtml Controller for dislaying a form for some actions
|
25 |
*
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
+
|
24 |
/**
|
25 |
* Adminhtml Controller for dislaying a form for some actions
|
26 |
*
|
app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.0-2.0.1.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 2.0.1
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 2.0.1
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.0.1-2.0.2.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 2.0.1
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 2.0.1
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/etc/adminhtml.xml
CHANGED
@@ -14,25 +14,44 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
22 |
<menu>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
23 |
<newsletter>
|
24 |
<children>
|
25 |
<subscriber_status translate="title" module="magesetup">
|
26 |
<title>Newsletter Subscribers Status History</title>
|
27 |
-
<action>magesetup/
|
28 |
</subscriber_status>
|
29 |
-
|
30 |
-
|
31 |
-
|
|
|
32 |
<acl>
|
33 |
<resources>
|
34 |
<admin>
|
35 |
<children>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
36 |
<newsletter>
|
37 |
<children>
|
38 |
<subscriber_status translate="title" module="magesetup">
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
23 |
<menu>
|
24 |
+
<system>
|
25 |
+
<children>
|
26 |
+
<magesetup translate="title">
|
27 |
+
<title>MageSetup</title>
|
28 |
+
<sort_order>10</sort_order>
|
29 |
+
<action>magesetup/magesetup</action>
|
30 |
+
</magesetup>
|
31 |
+
</children>
|
32 |
+
</system>
|
33 |
<newsletter>
|
34 |
<children>
|
35 |
<subscriber_status translate="title" module="magesetup">
|
36 |
<title>Newsletter Subscribers Status History</title>
|
37 |
+
<action>magesetup/newsletter/</action>
|
38 |
</subscriber_status>
|
39 |
+
</children>
|
40 |
+
</newsletter>
|
41 |
+
</menu>
|
42 |
+
|
43 |
<acl>
|
44 |
<resources>
|
45 |
<admin>
|
46 |
<children>
|
47 |
+
<system>
|
48 |
+
<children>
|
49 |
+
<magesetup translate="title">
|
50 |
+
<title>MageSetup</title>
|
51 |
+
<sort_order>11</sort_order>
|
52 |
+
</magesetup>
|
53 |
+
</children>
|
54 |
+
</system>
|
55 |
<newsletter>
|
56 |
<children>
|
57 |
<subscriber_status translate="title" module="magesetup">
|
app/code/community/FireGento/MageSetup/etc/at/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/at/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -41,7 +42,7 @@
|
|
41 |
</products_reduced_tax>
|
42 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
43 |
tax_customer_class="customers_companies_no_vat"
|
44 |
-
tax_product_class="
|
45 |
<execute>1</execute>
|
46 |
<code>Ust.-befreite Unternehmen kaufen voll- und ermäßigtbesteuerte Artikel</code>
|
47 |
<priority>2</priority>
|
@@ -110,7 +111,7 @@
|
|
110 |
<execute>1</execute>
|
111 |
<tax_region_id>0</tax_region_id>
|
112 |
<tax_postcode>*</tax_postcode>
|
113 |
-
<label>
|
114 |
<rate>20</rate>
|
115 |
</tax_calculation_rate_1>
|
116 |
|
@@ -118,7 +119,7 @@
|
|
118 |
<execute>1</execute>
|
119 |
<tax_region_id>0</tax_region_id>
|
120 |
<tax_postcode>*</tax_postcode>
|
121 |
-
<label>reduzierte
|
122 |
<rate>10</rate>
|
123 |
</tax_calculation_rate_2>
|
124 |
|
@@ -126,7 +127,7 @@
|
|
126 |
<execute>1</execute>
|
127 |
<tax_region_id>0</tax_region_id>
|
128 |
<tax_postcode>*</tax_postcode>
|
129 |
-
<label>ohne
|
130 |
<rate>0</rate>
|
131 |
</tax_calculation_rate_3>
|
132 |
</default>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
42 |
</products_reduced_tax>
|
43 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
44 |
tax_customer_class="customers_companies_no_vat"
|
45 |
+
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
46 |
<execute>1</execute>
|
47 |
<code>Ust.-befreite Unternehmen kaufen voll- und ermäßigtbesteuerte Artikel</code>
|
48 |
<priority>2</priority>
|
111 |
<execute>1</execute>
|
112 |
<tax_region_id>0</tax_region_id>
|
113 |
<tax_postcode>*</tax_postcode>
|
114 |
+
<label>USt.</label>
|
115 |
<rate>20</rate>
|
116 |
</tax_calculation_rate_1>
|
117 |
|
119 |
<execute>1</execute>
|
120 |
<tax_region_id>0</tax_region_id>
|
121 |
<tax_postcode>*</tax_postcode>
|
122 |
+
<label>reduzierte USt.</label>
|
123 |
<rate>10</rate>
|
124 |
</tax_calculation_rate_2>
|
125 |
|
127 |
<execute>1</execute>
|
128 |
<tax_region_id>0</tax_region_id>
|
129 |
<tax_postcode>*</tax_postcode>
|
130 |
+
<label>ohne USt.</label>
|
131 |
<rate>0</rate>
|
132 |
</tax_calculation_rate_3>
|
133 |
</default>
|
app/code/community/FireGento/MageSetup/etc/ch/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/ch/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -43,7 +44,7 @@
|
|
43 |
tax_customer_class="customers_companies_no_vat"
|
44 |
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1">
|
45 |
<execute>1</execute>
|
46 |
-
<code>
|
47 |
<priority>2</priority>
|
48 |
<position>0</position>
|
49 |
</products_no_vat>
|
@@ -91,14 +92,14 @@
|
|
91 |
<customers_companies>
|
92 |
<execute>1</execute>
|
93 |
<class_id>6</class_id>
|
94 |
-
<class_name>
|
95 |
<class_type>CUSTOMER</class_type>
|
96 |
<default>0</default>
|
97 |
</customers_companies>
|
98 |
<customers_companies_no_vat>
|
99 |
<execute>1</execute>
|
100 |
<class_id>7</class_id>
|
101 |
-
<class_name>
|
102 |
<class_type>CUSTOMER</class_type>
|
103 |
<default>0</default>
|
104 |
</customers_companies_no_vat>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
44 |
tax_customer_class="customers_companies_no_vat"
|
45 |
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1">
|
46 |
<execute>1</execute>
|
47 |
+
<code>MwSt.-befreite Unternehmen kaufen voll- und ermäßigtbesteuerte Artikel</code>
|
48 |
<priority>2</priority>
|
49 |
<position>0</position>
|
50 |
</products_no_vat>
|
92 |
<customers_companies>
|
93 |
<execute>1</execute>
|
94 |
<class_id>6</class_id>
|
95 |
+
<class_name>MwSt.-pflichtige Unternehmen</class_name>
|
96 |
<class_type>CUSTOMER</class_type>
|
97 |
<default>0</default>
|
98 |
</customers_companies>
|
99 |
<customers_companies_no_vat>
|
100 |
<execute>1</execute>
|
101 |
<class_id>7</class_id>
|
102 |
+
<class_name>MwSt.-befreite Unternehmen</class_name>
|
103 |
<class_type>CUSTOMER</class_type>
|
104 |
<default>0</default>
|
105 |
</customers_companies_no_vat>
|
app/code/community/FireGento/MageSetup/etc/config.xml
CHANGED
@@ -14,14 +14,15 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
22 |
<modules>
|
23 |
<FireGento_MageSetup>
|
24 |
-
<version>2.1
|
25 |
</FireGento_MageSetup>
|
26 |
</modules>
|
27 |
<global>
|
@@ -29,11 +30,6 @@
|
|
29 |
<magesetup>
|
30 |
<class>FireGento_MageSetup_Block</class>
|
31 |
</magesetup>
|
32 |
-
<googleanalytics>
|
33 |
-
<rewrite>
|
34 |
-
<ga>FireGento_MageSetup_Block_Ga</ga>
|
35 |
-
</rewrite>
|
36 |
-
</googleanalytics>
|
37 |
</blocks>
|
38 |
<helpers>
|
39 |
<magesetup>
|
@@ -96,17 +92,29 @@
|
|
96 |
</magesetup_observer>
|
97 |
</observers>
|
98 |
</newsletter_subscriber_save_after>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
99 |
</events>
|
100 |
<magesetup>
|
101 |
<available_countries>
|
102 |
<at />
|
103 |
<ch />
|
104 |
<de />
|
|
|
105 |
<fr />
|
106 |
<gb />
|
107 |
<it />
|
108 |
<nl />
|
109 |
<ru />
|
|
|
|
|
110 |
</available_countries>
|
111 |
</magesetup>
|
112 |
<locale>
|
@@ -149,15 +157,6 @@
|
|
149 |
</magesetup_observer>
|
150 |
</observers>
|
151 |
</core_block_abstract_to_html_before>
|
152 |
-
<checkout_cart_update_items_after>
|
153 |
-
<observers>
|
154 |
-
<recalculate_dynamic_shipping_tax>
|
155 |
-
<type>singleton</type>
|
156 |
-
<class>FireGento_MageSetup_Model_Observer</class>
|
157 |
-
<method>recollectAfterQuoteItemUpdate</method>
|
158 |
-
</recalculate_dynamic_shipping_tax>
|
159 |
-
</observers>
|
160 |
-
</checkout_cart_update_items_after>
|
161 |
<controller_action_predispatch_customer_account_createpost>
|
162 |
<observers>
|
163 |
<magesetup_observer>
|
@@ -167,6 +166,15 @@
|
|
167 |
</magesetup_observer>
|
168 |
</observers>
|
169 |
</controller_action_predispatch_customer_account_createpost>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
170 |
</events>
|
171 |
<routers>
|
172 |
<magesetup>
|
@@ -195,44 +203,6 @@
|
|
195 |
</FireGento_MageSetup>
|
196 |
</modules>
|
197 |
</translate>
|
198 |
-
<menu>
|
199 |
-
<system>
|
200 |
-
<children>
|
201 |
-
<magesetup translate="title">
|
202 |
-
<title>MageSetup</title>
|
203 |
-
<sort_order>11</sort_order>
|
204 |
-
<children>
|
205 |
-
<setup>
|
206 |
-
<title>Setup</title>
|
207 |
-
<action>adminhtml/magesetup</action>
|
208 |
-
<sort_order>10</sort_order>
|
209 |
-
</setup>
|
210 |
-
<recommended_extensions>
|
211 |
-
<title>Recommended Extensions</title>
|
212 |
-
<action>adminhtml/magesetup/extensions</action>
|
213 |
-
<sort_order>15</sort_order>
|
214 |
-
</recommended_extensions>
|
215 |
-
</children>
|
216 |
-
</magesetup>
|
217 |
-
</children>
|
218 |
-
</system>
|
219 |
-
</menu>
|
220 |
-
<acl>
|
221 |
-
<resources>
|
222 |
-
<admin>
|
223 |
-
<children>
|
224 |
-
<system>
|
225 |
-
<children>
|
226 |
-
<magesetup translate="title">
|
227 |
-
<title>MageSetup</title>
|
228 |
-
<sort_order>11</sort_order>
|
229 |
-
</magesetup>
|
230 |
-
</children>
|
231 |
-
</system>
|
232 |
-
</children>
|
233 |
-
</admin>
|
234 |
-
</resources>
|
235 |
-
</acl>
|
236 |
<events>
|
237 |
<adminhtml_catalog_product_attribute_edit_prepare_form>
|
238 |
<observers>
|
@@ -256,13 +226,16 @@
|
|
256 |
</adminhtml>
|
257 |
<admin>
|
258 |
<routers>
|
259 |
-
<
|
|
|
260 |
<args>
|
|
|
|
|
261 |
<modules>
|
262 |
-
<FireGento_MageSetup
|
263 |
</modules>
|
264 |
</args>
|
265 |
-
</
|
266 |
</routers>
|
267 |
</admin>
|
268 |
<default>
|
@@ -276,21 +249,28 @@
|
|
276 |
</catalog>
|
277 |
<general>
|
278 |
<imprint>
|
279 |
-
<shop_name>
|
280 |
-
<company_first>
|
281 |
<zip>12345</zip>
|
282 |
-
<street>
|
283 |
-
<city>
|
284 |
<email>info@example.com</email>
|
285 |
</imprint>
|
286 |
</general>
|
287 |
<checkout>
|
288 |
<options>
|
289 |
-
<additional_information><![CDATA[Beim Versand ins Nicht-EU-Ausland können zusätzlich Zölle, Steuern und Gebühren entstehen.]]></additional_information
|
|
|
|
|
290 |
<cart>
|
291 |
<hide_shipping>1</hide_shipping>
|
292 |
</cart>
|
293 |
</checkout>
|
|
|
|
|
|
|
|
|
|
|
294 |
<customer>
|
295 |
<create_account>
|
296 |
<avoid_tc>Yes</avoid_tc>
|
@@ -309,8 +289,7 @@ Tel: {{var telephone}}
|
|
309 |
{{depend fax}}Fax: {{var fax}}
|
310 |
{{/depend}}
|
311 |
]]></text>
|
312 |
-
<oneline>
|
313 |
-
<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var postcode}} {{var city}}, {{var country}}]]></oneline>
|
314 |
<html><![CDATA[
|
315 |
{{depend company}}{{var company}}<br />{{/depend}}
|
316 |
{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}<br/>
|
@@ -336,15 +315,9 @@ Tel: {{var telephone}}
|
|
336 |
{{depend telephone}}Tel: {{var telephone}}{{/depend}}|
|
337 |
{{depend fax}}<br/>Fax: {{var fax}}{{/depend}}|
|
338 |
]]></pdf>
|
339 |
-
<js_template
|
340 |
-
<title>Javascript Template</title>
|
341 |
-
<defaultFormat>
|
342 |
-
<![CDATA[#{company}<br/>#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{postcode} #{city}<br/>#{country_id}<br/>Tel: #{telephone}<br/>Fax: #{fax}]]>
|
343 |
-
</defaultFormat>
|
344 |
-
</js_template>
|
345 |
</address_templates>
|
346 |
</customer>
|
347 |
-
|
348 |
<url>
|
349 |
<convert>
|
350 |
<char0228>
|
@@ -377,14 +350,12 @@ Tel: {{var telephone}}
|
|
377 |
</char0220>
|
378 |
</convert>
|
379 |
</url>
|
380 |
-
|
381 |
<general>
|
382 |
<country>
|
383 |
-
<eu_countries>AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HU,HR,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB</eu_countries>
|
384 |
</country>
|
385 |
</general>
|
386 |
</default>
|
387 |
-
|
388 |
<phpunit>
|
389 |
<suite>
|
390 |
<modules>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
23 |
<modules>
|
24 |
<FireGento_MageSetup>
|
25 |
+
<version>2.2.1</version>
|
26 |
</FireGento_MageSetup>
|
27 |
</modules>
|
28 |
<global>
|
30 |
<magesetup>
|
31 |
<class>FireGento_MageSetup_Block</class>
|
32 |
</magesetup>
|
|
|
|
|
|
|
|
|
|
|
33 |
</blocks>
|
34 |
<helpers>
|
35 |
<magesetup>
|
92 |
</magesetup_observer>
|
93 |
</observers>
|
94 |
</newsletter_subscriber_save_after>
|
95 |
+
<sales_quote_config_get_product_attributes>
|
96 |
+
<observers>
|
97 |
+
<magesetup_observer>
|
98 |
+
<class>magesetup/observer</class>
|
99 |
+
<type>singleton</type>
|
100 |
+
<method>addProductAttributesToQuoteItems</method>
|
101 |
+
</magesetup_observer>
|
102 |
+
</observers>
|
103 |
+
</sales_quote_config_get_product_attributes>
|
104 |
</events>
|
105 |
<magesetup>
|
106 |
<available_countries>
|
107 |
<at />
|
108 |
<ch />
|
109 |
<de />
|
110 |
+
<es />
|
111 |
<fr />
|
112 |
<gb />
|
113 |
<it />
|
114 |
<nl />
|
115 |
<ru />
|
116 |
+
<pl />
|
117 |
+
<ro />
|
118 |
</available_countries>
|
119 |
</magesetup>
|
120 |
<locale>
|
157 |
</magesetup_observer>
|
158 |
</observers>
|
159 |
</core_block_abstract_to_html_before>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
160 |
<controller_action_predispatch_customer_account_createpost>
|
161 |
<observers>
|
162 |
<magesetup_observer>
|
166 |
</magesetup_observer>
|
167 |
</observers>
|
168 |
</controller_action_predispatch_customer_account_createpost>
|
169 |
+
<core_block_abstract_to_html_after>
|
170 |
+
<observers>
|
171 |
+
<magesetup_observer>
|
172 |
+
<class>magesetup/observer</class>
|
173 |
+
<type>model</type>
|
174 |
+
<method>setGAAnonymizerCode</method>
|
175 |
+
</magesetup_observer>
|
176 |
+
</observers>
|
177 |
+
</core_block_abstract_to_html_after>
|
178 |
</events>
|
179 |
<routers>
|
180 |
<magesetup>
|
203 |
</FireGento_MageSetup>
|
204 |
</modules>
|
205 |
</translate>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
206 |
<events>
|
207 |
<adminhtml_catalog_product_attribute_edit_prepare_form>
|
208 |
<observers>
|
226 |
</adminhtml>
|
227 |
<admin>
|
228 |
<routers>
|
229 |
+
<magesetup>
|
230 |
+
<use>admin</use>
|
231 |
<args>
|
232 |
+
<module>FireGento_MageSetup</module>
|
233 |
+
<frontName>magesetup</frontName>
|
234 |
<modules>
|
235 |
+
<FireGento_MageSetup after="Mage_Adminhtml">FireGento_MageSetup_Adminhtml</FireGento_MageSetup>
|
236 |
</modules>
|
237 |
</args>
|
238 |
+
</magesetup>
|
239 |
</routers>
|
240 |
</admin>
|
241 |
<default>
|
249 |
</catalog>
|
250 |
<general>
|
251 |
<imprint>
|
252 |
+
<shop_name>Any Store</shop_name>
|
253 |
+
<company_first>Any Company Inc.</company_first>
|
254 |
<zip>12345</zip>
|
255 |
+
<street>123 Anywhere Street</street>
|
256 |
+
<city>Anytown</city>
|
257 |
<email>info@example.com</email>
|
258 |
</imprint>
|
259 |
</general>
|
260 |
<checkout>
|
261 |
<options>
|
262 |
+
<additional_information><![CDATA[Beim Versand ins Nicht-EU-Ausland können zusätzlich Zölle, Steuern und Gebühren entstehen.]]></additional_information>
|
263 |
+
<default_revocation_product_type>goods</default_revocation_product_type>
|
264 |
+
</options>
|
265 |
<cart>
|
266 |
<hide_shipping>1</hide_shipping>
|
267 |
</cart>
|
268 |
</checkout>
|
269 |
+
<sales>
|
270 |
+
<reorder>
|
271 |
+
<hide_sidebar_box>1</hide_sidebar_box>
|
272 |
+
</reorder>
|
273 |
+
</sales>
|
274 |
<customer>
|
275 |
<create_account>
|
276 |
<avoid_tc>Yes</avoid_tc>
|
289 |
{{depend fax}}Fax: {{var fax}}
|
290 |
{{/depend}}
|
291 |
]]></text>
|
292 |
+
<oneline><![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var postcode}} {{var city}}, {{var country}}]]></oneline>
|
|
|
293 |
<html><![CDATA[
|
294 |
{{depend company}}{{var company}}<br />{{/depend}}
|
295 |
{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}<br/>
|
315 |
{{depend telephone}}Tel: {{var telephone}}{{/depend}}|
|
316 |
{{depend fax}}<br/>Fax: {{var fax}}{{/depend}}|
|
317 |
]]></pdf>
|
318 |
+
<js_template><![CDATA[#{company}<br/>#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{postcode} #{city}<br/>#{country_id}<br/>Tel: #{telephone}<br/>Fax: #{fax}]]></js_template>
|
|
|
|
|
|
|
|
|
|
|
319 |
</address_templates>
|
320 |
</customer>
|
|
|
321 |
<url>
|
322 |
<convert>
|
323 |
<char0228>
|
350 |
</char0220>
|
351 |
</convert>
|
352 |
</url>
|
|
|
353 |
<general>
|
354 |
<country>
|
355 |
+
<eu_countries>AT,BE,BG,CY,CZ,DE,DK,EE,FI,FR,DE,GR,HU,HR,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB</eu_countries>
|
356 |
</country>
|
357 |
</general>
|
358 |
</default>
|
|
|
359 |
<phpunit>
|
360 |
<suite>
|
361 |
<modules>
|
app/code/community/FireGento/MageSetup/etc/de/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/de/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -41,7 +42,7 @@
|
|
41 |
</products_reduced_tax>
|
42 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
43 |
tax_customer_class="customers_companies_no_vat"
|
44 |
-
tax_product_class="
|
45 |
<execute>1</execute>
|
46 |
<code>Ust.-befreite Unternehmen kaufen voll- und ermäßigtbesteuerte Artikel</code>
|
47 |
<priority>2</priority>
|
@@ -110,7 +111,7 @@
|
|
110 |
<execute>1</execute>
|
111 |
<tax_region_id>0</tax_region_id>
|
112 |
<tax_postcode>*</tax_postcode>
|
113 |
-
<label>
|
114 |
<rate>19</rate>
|
115 |
</tax_calculation_rate_1>
|
116 |
|
@@ -118,7 +119,7 @@
|
|
118 |
<execute>1</execute>
|
119 |
<tax_region_id>0</tax_region_id>
|
120 |
<tax_postcode>*</tax_postcode>
|
121 |
-
<label>reduzierte
|
122 |
<rate>7</rate>
|
123 |
</tax_calculation_rate_2>
|
124 |
|
@@ -126,7 +127,7 @@
|
|
126 |
<execute>1</execute>
|
127 |
<tax_region_id>0</tax_region_id>
|
128 |
<tax_postcode>*</tax_postcode>
|
129 |
-
<label>ohne
|
130 |
<rate>0</rate>
|
131 |
</tax_calculation_rate_3>
|
132 |
</default>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
42 |
</products_reduced_tax>
|
43 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
44 |
tax_customer_class="customers_companies_no_vat"
|
45 |
+
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
46 |
<execute>1</execute>
|
47 |
<code>Ust.-befreite Unternehmen kaufen voll- und ermäßigtbesteuerte Artikel</code>
|
48 |
<priority>2</priority>
|
111 |
<execute>1</execute>
|
112 |
<tax_region_id>0</tax_region_id>
|
113 |
<tax_postcode>*</tax_postcode>
|
114 |
+
<label>USt.</label>
|
115 |
<rate>19</rate>
|
116 |
</tax_calculation_rate_1>
|
117 |
|
119 |
<execute>1</execute>
|
120 |
<tax_region_id>0</tax_region_id>
|
121 |
<tax_postcode>*</tax_postcode>
|
122 |
+
<label>reduzierte USt.</label>
|
123 |
<rate>7</rate>
|
124 |
</tax_calculation_rate_2>
|
125 |
|
127 |
<execute>1</execute>
|
128 |
<tax_region_id>0</tax_region_id>
|
129 |
<tax_postcode>*</tax_postcode>
|
130 |
+
<label>ohne USt.</label>
|
131 |
<rate>0</rate>
|
132 |
</tax_calculation_rate_3>
|
133 |
</default>
|
app/code/community/FireGento/MageSetup/etc/default/agreement.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -40,6 +41,26 @@
|
|
40 |
<agreement_type>0</agreement_type>
|
41 |
<filename>magesetup/agreement/revocation.html</filename>
|
42 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
43 |
</default>
|
44 |
</agreements>
|
45 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
41 |
<agreement_type>0</agreement_type>
|
42 |
<filename>magesetup/agreement/revocation.html</filename>
|
43 |
</revocation>
|
44 |
+
|
45 |
+
<revocation_digital>
|
46 |
+
<execute>1</execute>
|
47 |
+
<is_active>1</is_active>
|
48 |
+
<is_html>1</is_html>
|
49 |
+
<is_required>1</is_required>
|
50 |
+
<agreement_type>0</agreement_type>
|
51 |
+
<filename>magesetup/agreement/revocation_digital.html</filename>
|
52 |
+
<revocation_product_type>digital</revocation_product_type>
|
53 |
+
</revocation_digital>
|
54 |
+
|
55 |
+
<revocation_service>
|
56 |
+
<execute>1</execute>
|
57 |
+
<is_active>1</is_active>
|
58 |
+
<is_html>1</is_html>
|
59 |
+
<is_required>1</is_required>
|
60 |
+
<agreement_type>0</agreement_type>
|
61 |
+
<filename>magesetup/agreement/revocation_service.html</filename>
|
62 |
+
<revocation_product_type>service</revocation_product_type>
|
63 |
+
</revocation_service>
|
64 |
</default>
|
65 |
</agreements>
|
66 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/default/cms.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -71,6 +72,12 @@
|
|
71 |
<filename>magesetup/page/revocation.html</filename>
|
72 |
<footerlink>1</footerlink>
|
73 |
</magesetup_revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
74 |
</default>
|
75 |
</pages>
|
76 |
|
@@ -88,6 +95,12 @@
|
|
88 |
<filename>magesetup/block/revocation.html</filename>
|
89 |
</revocation>
|
90 |
|
|
|
|
|
|
|
|
|
|
|
|
|
91 |
<footerlinks>
|
92 |
<execute>1</execute>
|
93 |
<identifier>footer_links</identifier>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
72 |
<filename>magesetup/page/revocation.html</filename>
|
73 |
<footerlink>1</footerlink>
|
74 |
</magesetup_revocation>
|
75 |
+
|
76 |
+
<magesetup_revocation_form>
|
77 |
+
<execute>1</execute>
|
78 |
+
<filename>magesetup/page/revocation_form.html</filename>
|
79 |
+
<footerlink>0</footerlink>
|
80 |
+
</magesetup_revocation_form>
|
81 |
</default>
|
82 |
</pages>
|
83 |
|
95 |
<filename>magesetup/block/revocation.html</filename>
|
96 |
</revocation>
|
97 |
|
98 |
+
<revocation_form>
|
99 |
+
<execute>1</execute>
|
100 |
+
<identifier>revocation_form</identifier>
|
101 |
+
<filename>magesetup/block/revocation_form.html</filename>
|
102 |
+
</revocation_form>
|
103 |
+
|
104 |
<footerlinks>
|
105 |
<execute>1</execute>
|
106 |
<identifier>footer_links</identifier>
|
app/code/community/FireGento/MageSetup/etc/default/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -26,6 +27,8 @@
|
|
26 |
<customer__create_account__confirm>0</customer__create_account__confirm>
|
27 |
<newsletter__subscription__confirm>1</newsletter__subscription__confirm>
|
28 |
<catalog__price__display_block_below_price>1</catalog__price__display_block_below_price>
|
|
|
|
|
29 |
</default>
|
30 |
</system_config>
|
31 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
27 |
<customer__create_account__confirm>0</customer__create_account__confirm>
|
28 |
<newsletter__subscription__confirm>1</newsletter__subscription__confirm>
|
29 |
<catalog__price__display_block_below_price>1</catalog__price__display_block_below_price>
|
30 |
+
<general__region__state_required>CA,US</general__region__state_required>
|
31 |
+
<sales__reorder__allow>0</sales__reorder__allow>
|
32 |
</default>
|
33 |
</system_config>
|
34 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/default/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -41,7 +42,7 @@
|
|
41 |
</products_reduced_tax>
|
42 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
43 |
tax_customer_class="customers_companies_no_vat"
|
44 |
-
tax_product_class="
|
45 |
<execute>1</execute>
|
46 |
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
47 |
<priority>2</priority>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
42 |
</products_reduced_tax>
|
43 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
44 |
tax_customer_class="customers_companies_no_vat"
|
45 |
+
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
46 |
<execute>1</execute>
|
47 |
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
48 |
<priority>2</priority>
|
app/code/community/FireGento/MageSetup/etc/es/tax.xml
ADDED
@@ -0,0 +1,171 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* This file is part of a FireGento e.V. module.
|
5 |
+
*
|
6 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
7 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
8 |
+
* published by the Free Software Foundation.
|
9 |
+
*
|
10 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
11 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
12 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
13 |
+
*
|
14 |
+
* @category FireGento
|
15 |
+
* @package FireGento_MageSetup
|
16 |
+
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
+
*/
|
21 |
+
-->
|
22 |
+
<config>
|
23 |
+
<default>
|
24 |
+
<magesetup>
|
25 |
+
<tax_calculation_rules>
|
26 |
+
<default>
|
27 |
+
<products_full_tax tax_rate="tax_calculation_rate_1"
|
28 |
+
tax_customer_class="customers_end_users,customers_companies"
|
29 |
+
tax_product_class="products_rate_1,shipping_rate_1">
|
30 |
+
<execute>1</execute>
|
31 |
+
<code>Customers buy Products with full Tax</code>
|
32 |
+
<priority>1</priority>
|
33 |
+
<position>0</position>
|
34 |
+
</products_full_tax>
|
35 |
+
<products_reduced_tax tax_rate="tax_calculation_rate_2"
|
36 |
+
tax_customer_class="customers_end_users,customers_companies"
|
37 |
+
tax_product_class="products_rate_2,shipping_rate_2">
|
38 |
+
<execute>1</execute>
|
39 |
+
<code>Customers buy Products with reduced Tax</code>
|
40 |
+
<priority>2</priority>
|
41 |
+
<position>0</position>
|
42 |
+
</products_reduced_tax>
|
43 |
+
<products_no_vat tax_rate="tax_calculation_rate_3"
|
44 |
+
tax_customer_class="customers_companies_no_vat"
|
45 |
+
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
46 |
+
<execute>1</execute>
|
47 |
+
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
48 |
+
<priority>2</priority>
|
49 |
+
<position>0</position>
|
50 |
+
</products_no_vat>
|
51 |
+
</default>
|
52 |
+
</tax_calculation_rules>
|
53 |
+
|
54 |
+
<tax_classes>
|
55 |
+
<default>
|
56 |
+
<products_rate_1>
|
57 |
+
<execute>1</execute>
|
58 |
+
<class_id>1</class_id>
|
59 |
+
<class_name>Products with full Tax</class_name>
|
60 |
+
<class_type>PRODUCT</class_type>
|
61 |
+
<default>1</default>
|
62 |
+
</products_rate_1>
|
63 |
+
<products_rate_2>
|
64 |
+
<execute>1</execute>
|
65 |
+
<class_id>2</class_id>
|
66 |
+
<class_name>Products with reduced Tax</class_name>
|
67 |
+
<class_type>PRODUCT</class_type>
|
68 |
+
<default>0</default>
|
69 |
+
</products_rate_2>
|
70 |
+
<shipping_rate_1>
|
71 |
+
<execute>1</execute>
|
72 |
+
<class_id>3</class_id>
|
73 |
+
<class_name>Shipping with full Tax</class_name>
|
74 |
+
<class_type>PRODUCT</class_type>
|
75 |
+
<default>0</default>
|
76 |
+
</shipping_rate_1>
|
77 |
+
<shipping_rate_2>
|
78 |
+
<execute>1</execute>
|
79 |
+
<class_id>4</class_id>
|
80 |
+
<class_name>Shipping with reduced Tax</class_name>
|
81 |
+
<class_type>PRODUCT</class_type>
|
82 |
+
<default>0</default>
|
83 |
+
</shipping_rate_2>
|
84 |
+
<customers_end_users>
|
85 |
+
<execute>1</execute>
|
86 |
+
<class_id>5</class_id>
|
87 |
+
<class_name>End Customers</class_name>
|
88 |
+
<class_type>CUSTOMER</class_type>
|
89 |
+
<default>1</default>
|
90 |
+
</customers_end_users>
|
91 |
+
<customers_companies>
|
92 |
+
<execute>1</execute>
|
93 |
+
<class_id>6</class_id>
|
94 |
+
<class_name>Taxable Companies</class_name>
|
95 |
+
<class_type>CUSTOMER</class_type>
|
96 |
+
<default>0</default>
|
97 |
+
</customers_companies>
|
98 |
+
<customers_companies_no_vat>
|
99 |
+
<execute>1</execute>
|
100 |
+
<class_id>7</class_id>
|
101 |
+
<class_name>Non-Taxable Companies</class_name>
|
102 |
+
<class_type>CUSTOMER</class_type>
|
103 |
+
<default>1</default>
|
104 |
+
</customers_companies_no_vat>
|
105 |
+
</default>
|
106 |
+
</tax_classes>
|
107 |
+
|
108 |
+
<tax_calculation_rates>
|
109 |
+
<default>
|
110 |
+
<tax_calculation_rate_1>
|
111 |
+
<execute>1</execute>
|
112 |
+
<tax_region_id>0</tax_region_id>
|
113 |
+
<tax_postcode>*</tax_postcode>
|
114 |
+
<label>VAT</label>
|
115 |
+
<rate>21</rate>
|
116 |
+
</tax_calculation_rate_1>
|
117 |
+
|
118 |
+
<tax_calculation_rate_2>
|
119 |
+
<execute>1</execute>
|
120 |
+
<tax_region_id>0</tax_region_id>
|
121 |
+
<tax_postcode>*</tax_postcode>
|
122 |
+
<label>reduced VAT</label>
|
123 |
+
<rate>10</rate>
|
124 |
+
</tax_calculation_rate_2>
|
125 |
+
|
126 |
+
<tax_calculation_rate_3>
|
127 |
+
<execute>1</execute>
|
128 |
+
<tax_region_id>0</tax_region_id>
|
129 |
+
<tax_postcode>*</tax_postcode>
|
130 |
+
<label>without VAT</label>
|
131 |
+
<rate>0</rate>
|
132 |
+
</tax_calculation_rate_3>
|
133 |
+
</default>
|
134 |
+
|
135 |
+
</tax_calculation_rates>
|
136 |
+
|
137 |
+
<tax_config>
|
138 |
+
<default>
|
139 |
+
<general__country__default>ES</general__country__default>
|
140 |
+
<tax__classes__shipping_tax_class>3</tax__classes__shipping_tax_class>
|
141 |
+
<tax__calculation__based_on>billing</tax__calculation__based_on>
|
142 |
+
<tax__calculation__price_includes_tax>1</tax__calculation__price_includes_tax>
|
143 |
+
<tax__calculation__shipping_includes_tax>1</tax__calculation__shipping_includes_tax>
|
144 |
+
<tax__calculation__apply_after_discount>1</tax__calculation__apply_after_discount>
|
145 |
+
<tax__calculation__discount_tax>1</tax__calculation__discount_tax>
|
146 |
+
<tax__defaults__country>ES</tax__defaults__country>
|
147 |
+
<tax__defaults__region></tax__defaults__region>
|
148 |
+
<tax__defaults__postcode>1234</tax__defaults__postcode>
|
149 |
+
<tax__display__type>2</tax__display__type>
|
150 |
+
<tax__display__shipping>2</tax__display__shipping>
|
151 |
+
<tax__cart_display__subtotal>2</tax__cart_display__subtotal>
|
152 |
+
<tax__cart_display__full_summary>1</tax__cart_display__full_summary>
|
153 |
+
<tax__cart_display__shipping>2</tax__cart_display__shipping>
|
154 |
+
<tax__cart_display__price>2</tax__cart_display__price>
|
155 |
+
<tax__cart_display__zero_tax>1</tax__cart_display__zero_tax>
|
156 |
+
<tax__cart_display__grandtotal>0</tax__cart_display__grandtotal>
|
157 |
+
<tax__sales_display__price>2</tax__sales_display__price>
|
158 |
+
<tax__sales_display__subtotal>2</tax__sales_display__subtotal>
|
159 |
+
<tax__sales_display__shipping>2</tax__sales_display__shipping>
|
160 |
+
<tax__sales_display__grandtotal>0</tax__sales_display__grandtotal>
|
161 |
+
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
162 |
+
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
163 |
+
<shipping__origin__country_id>ES</shipping__origin__country_id>
|
164 |
+
<shipping__origin__region_id></shipping__origin__region_id>
|
165 |
+
<shipping__origin__postcode>12345</shipping__origin__postcode>
|
166 |
+
<shipping__origin__city>Anytown</shipping__origin__city>
|
167 |
+
</default>
|
168 |
+
</tax_config>
|
169 |
+
</magesetup>
|
170 |
+
</default>
|
171 |
+
</config>
|
app/code/community/FireGento/MageSetup/etc/fr/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/fr/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -36,7 +37,7 @@
|
|
36 |
tax_customer_class="customers_end_consumers,customers_companies"
|
37 |
tax_product_class="products_rate_2">
|
38 |
<execute>1</execute>
|
39 |
-
<code>Clients achètent les produits au taux réduit de
|
40 |
<priority>1</priority>
|
41 |
<position>0</position>
|
42 |
</products_rate_2>
|
@@ -51,13 +52,22 @@
|
|
51 |
</products_rate_3>
|
52 |
|
53 |
<products_rate_4 tax_rate="tax_calculation_rate_4"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
54 |
tax_customer_class="customers_companies_no_vat"
|
55 |
-
tax_product_class="products_rate_1,products_rate_2,products_rate_3,shipping">
|
56 |
<execute>1</execute>
|
57 |
<code>Entreprises non-assujetties à la TVA achètent les produits au taux plein (TVA nominale) et au taux réduit (TVA réduite)</code>
|
58 |
<priority>1</priority>
|
59 |
<position>0</position>
|
60 |
-
</
|
61 |
</default>
|
62 |
</tax_calculation_rules>
|
63 |
|
@@ -66,14 +76,14 @@
|
|
66 |
<products_rate_1>
|
67 |
<execute>1</execute>
|
68 |
<class_id>1</class_id>
|
69 |
-
<class_name>Produits au taux plein de
|
70 |
<class_type>PRODUCT</class_type>
|
71 |
<default>1</default>
|
72 |
</products_rate_1>
|
73 |
<products_rate_2>
|
74 |
<execute>1</execute>
|
75 |
<class_id>2</class_id>
|
76 |
-
<class_name>Produits au taux réduit de
|
77 |
<class_type>PRODUCT</class_type>
|
78 |
<default>0</default>
|
79 |
</products_rate_2>
|
@@ -84,9 +94,16 @@
|
|
84 |
<class_type>PRODUCT</class_type>
|
85 |
<default>0</default>
|
86 |
</products_rate_3>
|
87 |
-
<
|
88 |
<execute>1</execute>
|
89 |
<class_id>4</class_id>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
90 |
<class_name>Livraison avec TVA à taux plein</class_name>
|
91 |
<class_type>PRODUCT</class_type>
|
92 |
<default>0</default>
|
@@ -94,21 +111,21 @@
|
|
94 |
|
95 |
<customers_end_consumers>
|
96 |
<execute>1</execute>
|
97 |
-
<class_id>
|
98 |
<class_name>Clients finaux</class_name>
|
99 |
<class_type>CUSTOMER</class_type>
|
100 |
<default>1</default>
|
101 |
</customers_end_consumers>
|
102 |
<customers_companies>
|
103 |
<execute>1</execute>
|
104 |
-
<class_id>
|
105 |
<class_name>Entreprises assujetties à la TVA</class_name>
|
106 |
<class_type>CUSTOMER</class_type>
|
107 |
<default>0</default>
|
108 |
</customers_companies>
|
109 |
<customers_companies_no_vat>
|
110 |
<execute>1</execute>
|
111 |
-
<class_id>
|
112 |
<class_name>Entreprises non-assujetties à la TVA</class_name>
|
113 |
<class_type>CUSTOMER</class_type>
|
114 |
<default>0</default>
|
@@ -122,16 +139,16 @@
|
|
122 |
<execute>1</execute>
|
123 |
<tax_region_id>0</tax_region_id>
|
124 |
<tax_postcode>*</tax_postcode>
|
125 |
-
<label>TVA de
|
126 |
-
<rate>
|
127 |
</tax_calculation_rate_1>
|
128 |
|
129 |
<tax_calculation_rate_2>
|
130 |
<execute>1</execute>
|
131 |
<tax_region_id>0</tax_region_id>
|
132 |
<tax_postcode>*</tax_postcode>
|
133 |
-
<label>TVA réduite de
|
134 |
-
<rate>
|
135 |
</tax_calculation_rate_2>
|
136 |
|
137 |
<tax_calculation_rate_3>
|
@@ -143,12 +160,20 @@
|
|
143 |
</tax_calculation_rate_3>
|
144 |
|
145 |
<tax_calculation_rate_4>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
146 |
<execute>1</execute>
|
147 |
<tax_region_id>0</tax_region_id>
|
148 |
<tax_postcode>*</tax_postcode>
|
149 |
<label>Sans TVA</label>
|
150 |
<rate>0</rate>
|
151 |
-
</
|
152 |
</default>
|
153 |
</tax_calculation_rates>
|
154 |
|
@@ -179,7 +204,7 @@
|
|
179 |
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
180 |
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
181 |
<shipping__origin__country_id>FR</shipping__origin__country_id>
|
182 |
-
<shipping__origin__region_id
|
183 |
<shipping__origin__postcode>12345</shipping__origin__postcode>
|
184 |
<shipping__origin__city>Ma Ville</shipping__origin__city>
|
185 |
</default>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
37 |
tax_customer_class="customers_end_consumers,customers_companies"
|
38 |
tax_product_class="products_rate_2">
|
39 |
<execute>1</execute>
|
40 |
+
<code>Clients achètent les produits au taux réduit de 10%</code>
|
41 |
<priority>1</priority>
|
42 |
<position>0</position>
|
43 |
</products_rate_2>
|
52 |
</products_rate_3>
|
53 |
|
54 |
<products_rate_4 tax_rate="tax_calculation_rate_4"
|
55 |
+
tax_customer_class="customers_end_consumers,customers_companies"
|
56 |
+
tax_product_class="products_rate_4">
|
57 |
+
<execute>1</execute>
|
58 |
+
<code>Clients achètent les produits au taux réduit de 2.1%</code>
|
59 |
+
<priority>1</priority>
|
60 |
+
<position>0</position>
|
61 |
+
</products_rate_4>
|
62 |
+
|
63 |
+
<products_rate_5 tax_rate="tax_calculation_rate_5"
|
64 |
tax_customer_class="customers_companies_no_vat"
|
65 |
+
tax_product_class="products_rate_1,products_rate_2,products_rate_3,products_rate_4,shipping">
|
66 |
<execute>1</execute>
|
67 |
<code>Entreprises non-assujetties à la TVA achètent les produits au taux plein (TVA nominale) et au taux réduit (TVA réduite)</code>
|
68 |
<priority>1</priority>
|
69 |
<position>0</position>
|
70 |
+
</products_rate_5>
|
71 |
</default>
|
72 |
</tax_calculation_rules>
|
73 |
|
76 |
<products_rate_1>
|
77 |
<execute>1</execute>
|
78 |
<class_id>1</class_id>
|
79 |
+
<class_name>Produits au taux plein de 20%</class_name>
|
80 |
<class_type>PRODUCT</class_type>
|
81 |
<default>1</default>
|
82 |
</products_rate_1>
|
83 |
<products_rate_2>
|
84 |
<execute>1</execute>
|
85 |
<class_id>2</class_id>
|
86 |
+
<class_name>Produits au taux réduit de 10%</class_name>
|
87 |
<class_type>PRODUCT</class_type>
|
88 |
<default>0</default>
|
89 |
</products_rate_2>
|
94 |
<class_type>PRODUCT</class_type>
|
95 |
<default>0</default>
|
96 |
</products_rate_3>
|
97 |
+
<products_rate_4>
|
98 |
<execute>1</execute>
|
99 |
<class_id>4</class_id>
|
100 |
+
<class_name>Produits au taux réduit de 2.1%</class_name>
|
101 |
+
<class_type>PRODUCT</class_type>
|
102 |
+
<default>0</default>
|
103 |
+
</products_rate_4>
|
104 |
+
<shipping>
|
105 |
+
<execute>1</execute>
|
106 |
+
<class_id>5</class_id>
|
107 |
<class_name>Livraison avec TVA à taux plein</class_name>
|
108 |
<class_type>PRODUCT</class_type>
|
109 |
<default>0</default>
|
111 |
|
112 |
<customers_end_consumers>
|
113 |
<execute>1</execute>
|
114 |
+
<class_id>6</class_id>
|
115 |
<class_name>Clients finaux</class_name>
|
116 |
<class_type>CUSTOMER</class_type>
|
117 |
<default>1</default>
|
118 |
</customers_end_consumers>
|
119 |
<customers_companies>
|
120 |
<execute>1</execute>
|
121 |
+
<class_id>7</class_id>
|
122 |
<class_name>Entreprises assujetties à la TVA</class_name>
|
123 |
<class_type>CUSTOMER</class_type>
|
124 |
<default>0</default>
|
125 |
</customers_companies>
|
126 |
<customers_companies_no_vat>
|
127 |
<execute>1</execute>
|
128 |
+
<class_id>8</class_id>
|
129 |
<class_name>Entreprises non-assujetties à la TVA</class_name>
|
130 |
<class_type>CUSTOMER</class_type>
|
131 |
<default>0</default>
|
139 |
<execute>1</execute>
|
140 |
<tax_region_id>0</tax_region_id>
|
141 |
<tax_postcode>*</tax_postcode>
|
142 |
+
<label>TVA de 20%</label>
|
143 |
+
<rate>20</rate>
|
144 |
</tax_calculation_rate_1>
|
145 |
|
146 |
<tax_calculation_rate_2>
|
147 |
<execute>1</execute>
|
148 |
<tax_region_id>0</tax_region_id>
|
149 |
<tax_postcode>*</tax_postcode>
|
150 |
+
<label>TVA réduite de 10%</label>
|
151 |
+
<rate>10</rate>
|
152 |
</tax_calculation_rate_2>
|
153 |
|
154 |
<tax_calculation_rate_3>
|
160 |
</tax_calculation_rate_3>
|
161 |
|
162 |
<tax_calculation_rate_4>
|
163 |
+
<execute>1</execute>
|
164 |
+
<tax_region_id>0</tax_region_id>
|
165 |
+
<tax_postcode>*</tax_postcode>
|
166 |
+
<label>TVA réduite de 2.1%</label>
|
167 |
+
<rate>2.1</rate>
|
168 |
+
</tax_calculation_rate_4>
|
169 |
+
|
170 |
+
<tax_calculation_rate_5>
|
171 |
<execute>1</execute>
|
172 |
<tax_region_id>0</tax_region_id>
|
173 |
<tax_postcode>*</tax_postcode>
|
174 |
<label>Sans TVA</label>
|
175 |
<rate>0</rate>
|
176 |
+
</tax_calculation_rate_5>
|
177 |
</default>
|
178 |
</tax_calculation_rates>
|
179 |
|
204 |
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
205 |
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
206 |
<shipping__origin__country_id>FR</shipping__origin__country_id>
|
207 |
+
<shipping__origin__region_id></shipping__origin__region_id>
|
208 |
<shipping__origin__postcode>12345</shipping__origin__postcode>
|
209 |
<shipping__origin__city>Ma Ville</shipping__origin__city>
|
210 |
</default>
|
app/code/community/FireGento/MageSetup/etc/gb/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -41,7 +42,7 @@
|
|
41 |
</products_reduced_tax>
|
42 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
43 |
tax_customer_class="customers_companies_no_vat"
|
44 |
-
tax_product_class="
|
45 |
<execute>1</execute>
|
46 |
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
47 |
<priority>2</priority>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
42 |
</products_reduced_tax>
|
43 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
44 |
tax_customer_class="customers_companies_no_vat"
|
45 |
+
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
46 |
<execute>1</execute>
|
47 |
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
48 |
<priority>2</priority>
|
app/code/community/FireGento/MageSetup/etc/it/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/it/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -27,7 +28,7 @@
|
|
27 |
tax_customer_class="customers_end_users,customers_companies"
|
28 |
tax_product_class="products_rate_1,shipping">
|
29 |
<execute>1</execute>
|
30 |
-
<code>IVA
|
31 |
<priority>1</priority>
|
32 |
<position>0</position>
|
33 |
</products_rate_1>
|
@@ -62,7 +63,7 @@
|
|
62 |
<products_rate_1>
|
63 |
<execute>1</execute>
|
64 |
<class_id>1</class_id>
|
65 |
-
<class_name>IVA
|
66 |
<class_type>PRODUCT</class_type>
|
67 |
<default>1</default>
|
68 |
</products_rate_1>
|
@@ -117,8 +118,8 @@
|
|
117 |
<execute>1</execute>
|
118 |
<tax_region_id>0</tax_region_id>
|
119 |
<tax_postcode>*</tax_postcode>
|
120 |
-
<label>IVA
|
121 |
-
<rate>
|
122 |
</tax_calculation_rate_1>
|
123 |
|
124 |
<tax_calculation_rate_2>
|
@@ -149,15 +150,15 @@
|
|
149 |
|
150 |
<tax_config>
|
151 |
<default>
|
152 |
-
<general__country__default>
|
153 |
<tax__classes__shipping_tax_class>4</tax__classes__shipping_tax_class>
|
154 |
<tax__calculation__based_on>billing</tax__calculation__based_on>
|
155 |
<tax__calculation__price_includes_tax>1</tax__calculation__price_includes_tax>
|
156 |
<tax__calculation__shipping_includes_tax>1</tax__calculation__shipping_includes_tax>
|
157 |
<tax__calculation__apply_after_discount>1</tax__calculation__apply_after_discount>
|
158 |
<tax__calculation__discount_tax>1</tax__calculation__discount_tax>
|
159 |
-
<tax__defaults__country>
|
160 |
-
<tax__defaults__region
|
161 |
<tax__defaults__postcode>12345</tax__defaults__postcode>
|
162 |
<tax__display__type>2</tax__display__type>
|
163 |
<tax__display__shipping>2</tax__display__shipping>
|
@@ -173,10 +174,10 @@
|
|
173 |
<tax__sales_display__grandtotal>0</tax__sales_display__grandtotal>
|
174 |
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
175 |
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
176 |
-
<shipping__origin__country_id>
|
177 |
-
<shipping__origin__region_id
|
178 |
<shipping__origin__postcode>12345</shipping__origin__postcode>
|
179 |
-
<shipping__origin__city>
|
180 |
</default>
|
181 |
</tax_config>
|
182 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
28 |
tax_customer_class="customers_end_users,customers_companies"
|
29 |
tax_product_class="products_rate_1,shipping">
|
30 |
<execute>1</execute>
|
31 |
+
<code>IVA 22%</code>
|
32 |
<priority>1</priority>
|
33 |
<position>0</position>
|
34 |
</products_rate_1>
|
63 |
<products_rate_1>
|
64 |
<execute>1</execute>
|
65 |
<class_id>1</class_id>
|
66 |
+
<class_name>IVA 22%</class_name>
|
67 |
<class_type>PRODUCT</class_type>
|
68 |
<default>1</default>
|
69 |
</products_rate_1>
|
118 |
<execute>1</execute>
|
119 |
<tax_region_id>0</tax_region_id>
|
120 |
<tax_postcode>*</tax_postcode>
|
121 |
+
<label>IVA 22%</label>
|
122 |
+
<rate>22</rate>
|
123 |
</tax_calculation_rate_1>
|
124 |
|
125 |
<tax_calculation_rate_2>
|
150 |
|
151 |
<tax_config>
|
152 |
<default>
|
153 |
+
<general__country__default>IT</general__country__default>
|
154 |
<tax__classes__shipping_tax_class>4</tax__classes__shipping_tax_class>
|
155 |
<tax__calculation__based_on>billing</tax__calculation__based_on>
|
156 |
<tax__calculation__price_includes_tax>1</tax__calculation__price_includes_tax>
|
157 |
<tax__calculation__shipping_includes_tax>1</tax__calculation__shipping_includes_tax>
|
158 |
<tax__calculation__apply_after_discount>1</tax__calculation__apply_after_discount>
|
159 |
<tax__calculation__discount_tax>1</tax__calculation__discount_tax>
|
160 |
+
<tax__defaults__country>IT</tax__defaults__country>
|
161 |
+
<tax__defaults__region></tax__defaults__region>
|
162 |
<tax__defaults__postcode>12345</tax__defaults__postcode>
|
163 |
<tax__display__type>2</tax__display__type>
|
164 |
<tax__display__shipping>2</tax__display__shipping>
|
174 |
<tax__sales_display__grandtotal>0</tax__sales_display__grandtotal>
|
175 |
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
176 |
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
177 |
+
<shipping__origin__country_id>IT</shipping__origin__country_id>
|
178 |
+
<shipping__origin__region_id></shipping__origin__region_id>
|
179 |
<shipping__origin__postcode>12345</shipping__origin__postcode>
|
180 |
+
<shipping__origin__city>Anytown</shipping__origin__city>
|
181 |
</default>
|
182 |
</tax_config>
|
183 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/nl/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -41,7 +42,7 @@
|
|
41 |
</products_reduced_tax>
|
42 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
43 |
tax_customer_class="customers_companies_no_vat"
|
44 |
-
tax_product_class="
|
45 |
<execute>1</execute>
|
46 |
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
47 |
<priority>2</priority>
|
@@ -85,18 +86,21 @@
|
|
85 |
<class_id>5</class_id>
|
86 |
<class_name>End Customers</class_name>
|
87 |
<class_type>CUSTOMER</class_type>
|
|
|
88 |
</customers_end_users>
|
89 |
<customers_companies>
|
90 |
<execute>1</execute>
|
91 |
<class_id>6</class_id>
|
92 |
<class_name>Taxable Companies</class_name>
|
93 |
<class_type>CUSTOMER</class_type>
|
|
|
94 |
</customers_companies>
|
95 |
<customers_companies_no_vat>
|
96 |
<execute>1</execute>
|
97 |
<class_id>7</class_id>
|
98 |
<class_name>Non-Taxable Companies</class_name>
|
99 |
<class_type>CUSTOMER</class_type>
|
|
|
100 |
</customers_companies_no_vat>
|
101 |
</default>
|
102 |
</tax_classes>
|
@@ -159,7 +163,7 @@
|
|
159 |
<shipping__origin__country_id>NL</shipping__origin__country_id>
|
160 |
<shipping__origin__region_id></shipping__origin__region_id>
|
161 |
<shipping__origin__postcode>1234</shipping__origin__postcode>
|
162 |
-
<shipping__origin__city>
|
163 |
</default>
|
164 |
</tax_config>
|
165 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
42 |
</products_reduced_tax>
|
43 |
<products_no_vat tax_rate="tax_calculation_rate_3"
|
44 |
tax_customer_class="customers_companies_no_vat"
|
45 |
+
tax_product_class="products_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
46 |
<execute>1</execute>
|
47 |
<code>Non-taxable Companies buy Products with full and reduced Tax</code>
|
48 |
<priority>2</priority>
|
86 |
<class_id>5</class_id>
|
87 |
<class_name>End Customers</class_name>
|
88 |
<class_type>CUSTOMER</class_type>
|
89 |
+
<default>1</default>
|
90 |
</customers_end_users>
|
91 |
<customers_companies>
|
92 |
<execute>1</execute>
|
93 |
<class_id>6</class_id>
|
94 |
<class_name>Taxable Companies</class_name>
|
95 |
<class_type>CUSTOMER</class_type>
|
96 |
+
<default>0</default>
|
97 |
</customers_companies>
|
98 |
<customers_companies_no_vat>
|
99 |
<execute>1</execute>
|
100 |
<class_id>7</class_id>
|
101 |
<class_name>Non-Taxable Companies</class_name>
|
102 |
<class_type>CUSTOMER</class_type>
|
103 |
+
<default>1</default>
|
104 |
</customers_companies_no_vat>
|
105 |
</default>
|
106 |
</tax_classes>
|
163 |
<shipping__origin__country_id>NL</shipping__origin__country_id>
|
164 |
<shipping__origin__region_id></shipping__origin__region_id>
|
165 |
<shipping__origin__postcode>1234</shipping__origin__postcode>
|
166 |
+
<shipping__origin__city>Anytown</shipping__origin__city>
|
167 |
</default>
|
168 |
</tax_config>
|
169 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/pl/email.xml
ADDED
@@ -0,0 +1,495 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* This file is part of the FIREGENTO project.
|
5 |
+
*
|
6 |
+
* FireGento_MageSetup is free software; you can redistribute it and/or
|
7 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
8 |
+
* published by the Free Software Foundation.
|
9 |
+
*
|
10 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
11 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
12 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
13 |
+
*
|
14 |
+
* PHP version 5
|
15 |
+
*
|
16 |
+
* @category FireGento
|
17 |
+
* @package FireGento_MageSetup
|
18 |
+
* @author FireGento Team <team@firegento.com>
|
19 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.de). All rights served.
|
20 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
21 |
+
* @version 2.2.1
|
22 |
+
* @since 0.1.0
|
23 |
+
*/
|
24 |
+
-->
|
25 |
+
<config>
|
26 |
+
<default>
|
27 |
+
<magesetup>
|
28 |
+
<emails>
|
29 |
+
<default>
|
30 |
+
<admin_password_new>
|
31 |
+
<execute>1</execute>
|
32 |
+
<template_code>Nowe hasło administratora</template_code>
|
33 |
+
<template_type>2</template_type>
|
34 |
+
<template_file>admin_password_new.html</template_file>
|
35 |
+
<config_data_path>admin/emails/forgot_email_template</config_data_path>
|
36 |
+
<add_footer>0</add_footer>
|
37 |
+
<add_business_terms>0</add_business_terms>
|
38 |
+
<add_revocation>0</add_revocation>
|
39 |
+
</admin_password_new>
|
40 |
+
|
41 |
+
<admin_password_reset_confirmation>
|
42 |
+
<execute>1</execute>
|
43 |
+
<template_code>Resetowanie hasła administratora</template_code>
|
44 |
+
<template_type>2</template_type>
|
45 |
+
<template_file>admin_password_reset_confirmation.html</template_file>
|
46 |
+
<config_data_path>admin/emails/forgot_email_template</config_data_path>
|
47 |
+
<add_footer>0</add_footer>
|
48 |
+
<add_business_terms>0</add_business_terms>
|
49 |
+
<add_revocation>0</add_revocation>
|
50 |
+
</admin_password_reset_confirmation>
|
51 |
+
|
52 |
+
<currency_update_warning>
|
53 |
+
<execute>1</execute>
|
54 |
+
<template_code>zmiana waluty</template_code>
|
55 |
+
<template_type>1</template_type>
|
56 |
+
<template_file>currency_update_warning.html</template_file>
|
57 |
+
<config_data_path>currency/import/error_email_template</config_data_path>
|
58 |
+
<add_footer>0</add_footer>
|
59 |
+
<add_business_terms>0</add_business_terms>
|
60 |
+
<add_revocation>0</add_revocation>
|
61 |
+
</currency_update_warning>
|
62 |
+
|
63 |
+
<account_new>
|
64 |
+
<execute>1</execute>
|
65 |
+
<template_code>Załóż konto</template_code>
|
66 |
+
<template_type>2</template_type>
|
67 |
+
<template_file>account_new.html</template_file>
|
68 |
+
<config_data_path>customer/create_account/email_template</config_data_path>
|
69 |
+
<add_footer>1</add_footer>
|
70 |
+
<add_business_terms>0</add_business_terms>
|
71 |
+
<add_revocation>0</add_revocation>
|
72 |
+
</account_new>
|
73 |
+
|
74 |
+
<customer_password_remind_email_template>
|
75 |
+
<execute>1</execute>
|
76 |
+
<template_code>Przypomnienie hasła</template_code>
|
77 |
+
<template_type>2</template_type>
|
78 |
+
<template_file>password_new.html</template_file>
|
79 |
+
<config_data_path>customer/password/remind_email_template</config_data_path>
|
80 |
+
<add_footer>1</add_footer>
|
81 |
+
<add_business_terms>0</add_business_terms>
|
82 |
+
<add_revocation>0</add_revocation>
|
83 |
+
</customer_password_remind_email_template>
|
84 |
+
|
85 |
+
<account_new_confirmation>
|
86 |
+
<execute>1</execute>
|
87 |
+
<template_code>Załóż aktywacji konta</template_code>
|
88 |
+
<template_type>2</template_type>
|
89 |
+
<template_file>account_new_confirmation.html</template_file>
|
90 |
+
<config_data_path>customer/create_account/email_confirmation_template</config_data_path>
|
91 |
+
<add_footer>1</add_footer>
|
92 |
+
<add_business_terms>0</add_business_terms>
|
93 |
+
<add_revocation>0</add_revocation>
|
94 |
+
</account_new_confirmation>
|
95 |
+
|
96 |
+
<account_new_confirmed>
|
97 |
+
<execute>1</execute>
|
98 |
+
<template_code>Załóż konto potwierdzenie</template_code>
|
99 |
+
<template_type>2</template_type>
|
100 |
+
<template_file>account_new_confirmed.html</template_file>
|
101 |
+
<config_data_path>customer/create_account/email_confirmed_template</config_data_path>
|
102 |
+
<add_footer>1</add_footer>
|
103 |
+
<add_business_terms>0</add_business_terms>
|
104 |
+
<add_revocation>0</add_revocation>
|
105 |
+
</account_new_confirmed>
|
106 |
+
|
107 |
+
<password_new>
|
108 |
+
<execute>1</execute>
|
109 |
+
<template_code>Nowe hasło</template_code>
|
110 |
+
<template_type>2</template_type>
|
111 |
+
<template_file>password_new.html</template_file>
|
112 |
+
<config_data_path>customer/password/forgot_email_template</config_data_path>
|
113 |
+
<add_footer>1</add_footer>
|
114 |
+
<add_business_terms>0</add_business_terms>
|
115 |
+
<add_revocation>0</add_revocation>
|
116 |
+
</password_new>
|
117 |
+
|
118 |
+
<account_password_reset_confirmation>
|
119 |
+
<execute>1</execute>
|
120 |
+
<template_code>Resetowanie hasła konta klienta Potwierdzenie</template_code>
|
121 |
+
<template_type>2</template_type>
|
122 |
+
<template_file>account_password_reset_confirmation.html</template_file>
|
123 |
+
<config_data_path>customer/password/forgot_email_template</config_data_path>
|
124 |
+
<add_footer>1</add_footer>
|
125 |
+
<add_business_terms>0</add_business_terms>
|
126 |
+
<add_revocation>0</add_revocation>
|
127 |
+
</account_password_reset_confirmation>
|
128 |
+
|
129 |
+
<order_new>
|
130 |
+
<execute>1</execute>
|
131 |
+
<template_code>nowy zamówienie</template_code>
|
132 |
+
<template_type>2</template_type>
|
133 |
+
<template_file>sales/order_new.html</template_file>
|
134 |
+
<config_data_path>sales_email/order/template</config_data_path>
|
135 |
+
<add_footer>1</add_footer>
|
136 |
+
<add_business_terms>1</add_business_terms>
|
137 |
+
<add_revocation>1</add_revocation>
|
138 |
+
</order_new>
|
139 |
+
|
140 |
+
<order_new_guest>
|
141 |
+
<execute>1</execute>
|
142 |
+
<template_code>Nowe zamówienia gości</template_code>
|
143 |
+
<template_type>2</template_type>
|
144 |
+
<template_file>sales/order_new_guest.html</template_file>
|
145 |
+
<config_data_path>sales_email/order/guest_template</config_data_path>
|
146 |
+
<add_footer>1</add_footer>
|
147 |
+
<add_business_terms>1</add_business_terms>
|
148 |
+
<add_revocation>1</add_revocation>
|
149 |
+
</order_new_guest>
|
150 |
+
|
151 |
+
<order_update>
|
152 |
+
<execute>1</execute>
|
153 |
+
<template_code>Zamówienie lub czas aktualizacji</template_code>
|
154 |
+
<template_type>2</template_type>
|
155 |
+
<template_file>sales/order_update.html</template_file>
|
156 |
+
<config_data_path>sales_email/order_comment/template</config_data_path>
|
157 |
+
<add_footer>1</add_footer>
|
158 |
+
<add_business_terms>0</add_business_terms>
|
159 |
+
<add_revocation>0</add_revocation>
|
160 |
+
</order_update>
|
161 |
+
|
162 |
+
<order_update_guest>
|
163 |
+
<execute>1</execute>
|
164 |
+
<template_code>Czas aktualizacji Zamówienie lub pensjonat</template_code>
|
165 |
+
<template_type>2</template_type>
|
166 |
+
<template_file>sales/order_update_guest.html</template_file>
|
167 |
+
<config_data_path>sales_email/order_comment/guest_template</config_data_path>
|
168 |
+
<add_footer>1</add_footer>
|
169 |
+
<add_business_terms>0</add_business_terms>
|
170 |
+
<add_revocation>0</add_revocation>
|
171 |
+
</order_update_guest>
|
172 |
+
|
173 |
+
<invoice_new>
|
174 |
+
<execute>1</execute>
|
175 |
+
<template_code>Nowe konto</template_code>
|
176 |
+
<template_type>2</template_type>
|
177 |
+
<template_file>sales/invoice_new.html</template_file>
|
178 |
+
<config_data_path>sales_email/invoice/template</config_data_path>
|
179 |
+
<add_footer>1</add_footer>
|
180 |
+
<add_business_terms>0</add_business_terms>
|
181 |
+
<add_revocation>0</add_revocation>
|
182 |
+
</invoice_new>
|
183 |
+
|
184 |
+
<invoice_new_guest>
|
185 |
+
<execute>1</execute>
|
186 |
+
<template_code>Nowa ustawa gości</template_code>
|
187 |
+
<template_type>2</template_type>
|
188 |
+
<template_file>sales/invoice_new_guest.html</template_file>
|
189 |
+
<config_data_path>sales_email/invoice/guest_template</config_data_path>
|
190 |
+
<add_footer>1</add_footer>
|
191 |
+
<add_business_terms>0</add_business_terms>
|
192 |
+
<add_revocation>0</add_revocation>
|
193 |
+
</invoice_new_guest>
|
194 |
+
|
195 |
+
<invoice_update>
|
196 |
+
<execute>1</execute>
|
197 |
+
<template_code>aktualizacja konto</template_code>
|
198 |
+
<template_type>2</template_type>
|
199 |
+
<template_file>sales/invoice_update.html</template_file>
|
200 |
+
<config_data_path>sales_email/invoice_comment/template</config_data_path>
|
201 |
+
<add_footer>1</add_footer>
|
202 |
+
<add_business_terms>0</add_business_terms>
|
203 |
+
<add_revocation>0</add_revocation>
|
204 |
+
</invoice_update>
|
205 |
+
|
206 |
+
<invoice_update_guest>
|
207 |
+
<execute>1</execute>
|
208 |
+
<template_code>Aktualizacja Gość konto</template_code>
|
209 |
+
<template_type>2</template_type>
|
210 |
+
<template_file>sales/invoice_update_guest.html</template_file>
|
211 |
+
<config_data_path>sales_email/invoice_comment/guest_template</config_data_path>
|
212 |
+
<add_footer>1</add_footer>
|
213 |
+
<add_business_terms>0</add_business_terms>
|
214 |
+
<add_revocation>0</add_revocation>
|
215 |
+
</invoice_update_guest>
|
216 |
+
|
217 |
+
<creditmemo_new>
|
218 |
+
<execute>1</execute>
|
219 |
+
<template_code>Nowy kredyt</template_code>
|
220 |
+
<template_type>2</template_type>
|
221 |
+
<template_file>sales/creditmemo_new.html</template_file>
|
222 |
+
<config_data_path>sales_email/creditmemo/template</config_data_path>
|
223 |
+
<add_footer>1</add_footer>
|
224 |
+
<add_business_terms>0</add_business_terms>
|
225 |
+
<add_revocation>0</add_revocation>
|
226 |
+
</creditmemo_new>
|
227 |
+
|
228 |
+
<creditmemo_new_guest>
|
229 |
+
<execute>1</execute>
|
230 |
+
<template_code>Nowy gość kredytowej</template_code>
|
231 |
+
<template_type>2</template_type>
|
232 |
+
<template_file>sales/creditmemo_new_guest.html</template_file>
|
233 |
+
<config_data_path>sales_email/creditmemo/guest_template</config_data_path>
|
234 |
+
<add_footer>1</add_footer>
|
235 |
+
<add_business_terms>0</add_business_terms>
|
236 |
+
<add_revocation>0</add_revocation>
|
237 |
+
</creditmemo_new_guest>
|
238 |
+
|
239 |
+
<creditmemo_update>
|
240 |
+
<execute>1</execute>
|
241 |
+
<template_code>aktualizacja kredytowej</template_code>
|
242 |
+
<template_type>2</template_type>
|
243 |
+
<template_file>sales/creditmemo_update.html</template_file>
|
244 |
+
<config_data_path>sales_email/creditmemo_comment/template</config_data_path>
|
245 |
+
<add_footer>1</add_footer>
|
246 |
+
<add_business_terms>0</add_business_terms>
|
247 |
+
<add_revocation>0</add_revocation>
|
248 |
+
</creditmemo_update>
|
249 |
+
|
250 |
+
<creditmemo_update_guest>
|
251 |
+
<execute>1</execute>
|
252 |
+
<template_code>Aktualizacja kredytowej gości</template_code>
|
253 |
+
<template_type>2</template_type>
|
254 |
+
<template_file>sales/creditmemo_update_guest.html</template_file>
|
255 |
+
<config_data_path>sales_email/creditmemo_comment/guest_template</config_data_path>
|
256 |
+
<add_footer>1</add_footer>
|
257 |
+
<add_business_terms>0</add_business_terms>
|
258 |
+
<add_revocation>0</add_revocation>
|
259 |
+
</creditmemo_update_guest>
|
260 |
+
|
261 |
+
<shipment_new>
|
262 |
+
<execute>1</execute>
|
263 |
+
<template_code>Nowa dostawa</template_code>
|
264 |
+
<template_type>2</template_type>
|
265 |
+
<template_file>sales/shipment_new.html</template_file>
|
266 |
+
<config_data_path>sales_email/shipment/template</config_data_path>
|
267 |
+
<add_footer>1</add_footer>
|
268 |
+
<add_business_terms>0</add_business_terms>
|
269 |
+
<add_revocation>0</add_revocation>
|
270 |
+
</shipment_new>
|
271 |
+
|
272 |
+
<shipment_new_guest>
|
273 |
+
<execute>1</execute>
|
274 |
+
<template_code>Nowa dostawa gość</template_code>
|
275 |
+
<template_type>2</template_type>
|
276 |
+
<template_file>sales/shipment_new_guest.html</template_file>
|
277 |
+
<config_data_path>sales_email/shipment/guest_template</config_data_path>
|
278 |
+
<add_footer>1</add_footer>
|
279 |
+
<add_business_terms>0</add_business_terms>
|
280 |
+
<add_revocation>0</add_revocation>
|
281 |
+
</shipment_new_guest>
|
282 |
+
|
283 |
+
<shipment_update>
|
284 |
+
<execute>1</execute>
|
285 |
+
<template_code>Dostawa aktualizacji</template_code>
|
286 |
+
<template_type>2</template_type>
|
287 |
+
<template_file>sales/shipment_update.html</template_file>
|
288 |
+
<config_data_path>sales_email/shipment_comment/template</config_data_path>
|
289 |
+
<add_footer>1</add_footer>
|
290 |
+
<add_business_terms>0</add_business_terms>
|
291 |
+
<add_revocation>0</add_revocation>
|
292 |
+
</shipment_update>
|
293 |
+
|
294 |
+
<shipment_update_guest>
|
295 |
+
<execute>1</execute>
|
296 |
+
<template_code>Dostawa aktualizowane gości</template_code>
|
297 |
+
<template_type>2</template_type>
|
298 |
+
<template_file>sales/shipment_update_guest.html</template_file>
|
299 |
+
<config_data_path>sales_email/shipment_comment/guest_template</config_data_path>
|
300 |
+
<add_footer>1</add_footer>
|
301 |
+
<add_business_terms>0</add_business_terms>
|
302 |
+
<add_revocation>0</add_revocation>
|
303 |
+
</shipment_update_guest>
|
304 |
+
|
305 |
+
<payment_failed>
|
306 |
+
<execute>1</execute>
|
307 |
+
<template_code>Płatność Failed</template_code>
|
308 |
+
<template_type>2</template_type>
|
309 |
+
<template_file>payment_failed.html</template_file>
|
310 |
+
<config_data_path>checkout/payment_failed/template</config_data_path>
|
311 |
+
<add_footer>0</add_footer>
|
312 |
+
<add_business_terms>0</add_business_terms>
|
313 |
+
<add_revocation>0</add_revocation>
|
314 |
+
</payment_failed>
|
315 |
+
|
316 |
+
<log_clean_warning>
|
317 |
+
<execute>1</execute>
|
318 |
+
<template_code>Zaloguj ostrzeżenia ogrodnicze</template_code>
|
319 |
+
<template_type>1</template_type>
|
320 |
+
<template_file>log_clean_warning.html</template_file>
|
321 |
+
<config_data_path>system/log/error_email_template</config_data_path>
|
322 |
+
<add_footer>0</add_footer>
|
323 |
+
<add_business_terms>0</add_business_terms>
|
324 |
+
<add_revocation>0</add_revocation>
|
325 |
+
</log_clean_warning>
|
326 |
+
|
327 |
+
<newsletter_subscr_confirm>
|
328 |
+
<execute>1</execute>
|
329 |
+
<template_code>Znak newslettera Potwierdzenie</template_code>
|
330 |
+
<template_type>2</template_type>
|
331 |
+
<template_file>newsletter_subscr_confirm.html</template_file>
|
332 |
+
<config_data_path>newsletter/subscription/confirm_email_template</config_data_path>
|
333 |
+
<add_footer>1</add_footer>
|
334 |
+
<add_business_terms>0</add_business_terms>
|
335 |
+
<add_revocation>0</add_revocation>
|
336 |
+
</newsletter_subscr_confirm>
|
337 |
+
|
338 |
+
<newsletter_subscr_success>
|
339 |
+
<execute>1</execute>
|
340 |
+
<template_code>Newsletter Zapisz się sukcesem</template_code>
|
341 |
+
<template_type>2</template_type>
|
342 |
+
<template_file>newsletter_subscr_success.html</template_file>
|
343 |
+
<config_data_path>newsletter/subscription/success_email_template</config_data_path>
|
344 |
+
<add_footer>1</add_footer>
|
345 |
+
<add_business_terms>0</add_business_terms>
|
346 |
+
<add_revocation>0</add_revocation>
|
347 |
+
</newsletter_subscr_success>
|
348 |
+
|
349 |
+
<newsletter_unsub_success>
|
350 |
+
<execute>1</execute>
|
351 |
+
<template_code>Sukces Wypisanie z biuletynu</template_code>
|
352 |
+
<template_type>2</template_type>
|
353 |
+
<template_file>newsletter_unsub_success.html</template_file>
|
354 |
+
<config_data_path>newsletter/subscription/un_email_template</config_data_path>
|
355 |
+
<add_footer>1</add_footer>
|
356 |
+
<add_business_terms>0</add_business_terms>
|
357 |
+
<add_revocation>0</add_revocation>
|
358 |
+
</newsletter_unsub_success>
|
359 |
+
|
360 |
+
<wishlist_share>
|
361 |
+
<execute>1</execute>
|
362 |
+
<template_code>Użyj wspólnego Lista życzeń</template_code>
|
363 |
+
<template_type>2</template_type>
|
364 |
+
<template_file>wishlist_share.html</template_file>
|
365 |
+
<config_data_path>wishlist/email/email_template</config_data_path>
|
366 |
+
<add_footer>0</add_footer>
|
367 |
+
<add_business_terms>0</add_business_terms>
|
368 |
+
<add_revocation>0</add_revocation>
|
369 |
+
</wishlist_share>
|
370 |
+
|
371 |
+
<product_share>
|
372 |
+
<execute>1</execute>
|
373 |
+
<template_code>Wyślij produkt znajomemu</template_code>
|
374 |
+
<template_type>2</template_type>
|
375 |
+
<template_file>product_share.html</template_file>
|
376 |
+
<config_data_path>sendfriend/email/template</config_data_path>
|
377 |
+
<add_footer>1</add_footer>
|
378 |
+
<add_business_terms>0</add_business_terms>
|
379 |
+
<add_revocation>0</add_revocation>
|
380 |
+
</product_share>
|
381 |
+
|
382 |
+
<contact_form>
|
383 |
+
<execute>1</execute>
|
384 |
+
<template_code>kontakt</template_code>
|
385 |
+
<template_type>1</template_type>
|
386 |
+
<template_file>contact_form.html</template_file>
|
387 |
+
<config_data_path>contacts/email/email_template</config_data_path>
|
388 |
+
<add_footer>0</add_footer>
|
389 |
+
<add_business_terms>0</add_business_terms>
|
390 |
+
<add_revocation>0</add_revocation>
|
391 |
+
</contact_form>
|
392 |
+
|
393 |
+
<sitemap_generate_warning>
|
394 |
+
<execute>1</execute>
|
395 |
+
<template_code>Ostrzeżenia witryny generacji</template_code>
|
396 |
+
<template_type>1</template_type>
|
397 |
+
<template_file>sitemap_generate_warning.html</template_file>
|
398 |
+
<config_data_path>sitemap/generate/error_email_template</config_data_path>
|
399 |
+
<add_footer>0</add_footer>
|
400 |
+
<add_business_terms>0</add_business_terms>
|
401 |
+
<add_revocation>0</add_revocation>
|
402 |
+
</sitemap_generate_warning>
|
403 |
+
|
404 |
+
<product_stock_alert>
|
405 |
+
<execute>1</execute>
|
406 |
+
<template_code>Produkt dostępny</template_code>
|
407 |
+
<template_type>2</template_type>
|
408 |
+
<template_file>product_stock_alert.html</template_file>
|
409 |
+
<config_data_path>catalog/productalert/email_stock_template</config_data_path>
|
410 |
+
<add_footer>0</add_footer>
|
411 |
+
<add_business_terms>0</add_business_terms>
|
412 |
+
<add_revocation>0</add_revocation>
|
413 |
+
</product_stock_alert>
|
414 |
+
|
415 |
+
<product_price_alert>
|
416 |
+
<execute>1</execute>
|
417 |
+
<template_code>Zmiany cen produktów</template_code>
|
418 |
+
<template_type>2</template_type>
|
419 |
+
<template_file>product_price_alert.html</template_file>
|
420 |
+
<config_data_path>catalog/productalert/email_price_template</config_data_path>
|
421 |
+
<add_footer>0</add_footer>
|
422 |
+
<add_business_terms>0</add_business_terms>
|
423 |
+
<add_revocation>0</add_revocation>
|
424 |
+
</product_price_alert>
|
425 |
+
|
426 |
+
<product_alert_cron_error>
|
427 |
+
<execute>1</execute>
|
428 |
+
<template_code>Produkt błąd Cron</template_code>
|
429 |
+
<template_type>2</template_type>
|
430 |
+
<template_file>product_alert_cron_error.html</template_file>
|
431 |
+
<config_data_path>catalog/productalert_cron/error_email_template</config_data_path>
|
432 |
+
<add_footer>0</add_footer>
|
433 |
+
<add_business_terms>0</add_business_terms>
|
434 |
+
<add_revocation>0</add_revocation>
|
435 |
+
</product_alert_cron_error>
|
436 |
+
|
437 |
+
<enterprise_invitation>
|
438 |
+
<execute>1</execute>
|
439 |
+
<template_code>Zaproszenie klienta [zaproszenie]</template_code>
|
440 |
+
<template_type>2</template_type>
|
441 |
+
<template_file>enterprise_invitation.html</template_file>
|
442 |
+
<config_data_path>enterprise_invitation/email/template</config_data_path>
|
443 |
+
<add_footer>0</add_footer>
|
444 |
+
<add_business_terms>0</add_business_terms>
|
445 |
+
<add_revocation>0</add_revocation>
|
446 |
+
</enterprise_invitation>
|
447 |
+
|
448 |
+
<token>
|
449 |
+
<execute>1</execute>
|
450 |
+
<template_code>OAuth Reklamowe zmiany</template_code>
|
451 |
+
<template_type>2</template_type>
|
452 |
+
<template_file>token.html</template_file>
|
453 |
+
<config_data_path>oauth/email/template</config_data_path>
|
454 |
+
<add_footer>0</add_footer>
|
455 |
+
<add_business_terms>0</add_business_terms>
|
456 |
+
<add_revocation>0</add_revocation>
|
457 |
+
</token>
|
458 |
+
</default>
|
459 |
+
</emails>
|
460 |
+
<email_footers>
|
461 |
+
<default>
|
462 |
+
<footer>
|
463 |
+
<![CDATA[
|
464 |
+
<tr>
|
465 |
+
<td>
|
466 |
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/email_footer.phtml"}}
|
467 |
+
</td>
|
468 |
+
</tr>
|
469 |
+
]]>
|
470 |
+
</footer>
|
471 |
+
<business_terms>
|
472 |
+
<![CDATA[
|
473 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
474 |
+
<tr>
|
475 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
476 |
+
{{block type="cms/block" block_id="business_terms"}}
|
477 |
+
</td>
|
478 |
+
</tr>
|
479 |
+
]]>
|
480 |
+
</business_terms>
|
481 |
+
<revocation>
|
482 |
+
<![CDATA[
|
483 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
484 |
+
<tr>
|
485 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
486 |
+
{{block type="cms/block" block_id="revocation"}}
|
487 |
+
</td>
|
488 |
+
</tr>
|
489 |
+
]]>
|
490 |
+
</revocation>
|
491 |
+
</default>
|
492 |
+
</email_footers>
|
493 |
+
</magesetup>
|
494 |
+
</default>
|
495 |
+
</config>
|
app/code/community/FireGento/MageSetup/etc/pl/tax.xml
ADDED
@@ -0,0 +1,190 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* This file is part of the FIREGENTO project.
|
5 |
+
*
|
6 |
+
* FireGento_MageSetup is free software; you can redistribute it and/or
|
7 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
8 |
+
* published by the Free Software Foundation.
|
9 |
+
*
|
10 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
11 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
12 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
13 |
+
*
|
14 |
+
* PHP version 5
|
15 |
+
*
|
16 |
+
* @category FireGento
|
17 |
+
* @package FireGento_MageSetup
|
18 |
+
* @author FireGento Team <team@firegento.com>
|
19 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.de). All rights served.
|
20 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
21 |
+
* @version 2.2.1
|
22 |
+
* @since 0.1.0
|
23 |
+
*/
|
24 |
+
-->
|
25 |
+
<config>
|
26 |
+
<default>
|
27 |
+
<magesetup>
|
28 |
+
<tax_calculation_rules>
|
29 |
+
<default>
|
30 |
+
<products_rate_1 tax_rate="tax_calculation_rate_1"
|
31 |
+
tax_customer_class="customers_end_consumers,customers_companies"
|
32 |
+
tax_product_class="products_rate_1,shipping">
|
33 |
+
<execute>1</execute>
|
34 |
+
<code>Klienci kupują produkty w pełnej wysokości (nominalna VAT)</code>
|
35 |
+
<priority>1</priority>
|
36 |
+
<position>0</position>
|
37 |
+
</products_rate_1>
|
38 |
+
|
39 |
+
<products_rate_2 tax_rate="tax_calculation_rate_2"
|
40 |
+
tax_customer_class="customers_end_consumers,customers_companies"
|
41 |
+
tax_product_class="products_rate_2">
|
42 |
+
<execute>1</execute>
|
43 |
+
<code>Klienci kupują produkty w obniżonej stawki 8%</code>
|
44 |
+
<priority>1</priority>
|
45 |
+
<position>0</position>
|
46 |
+
</products_rate_2>
|
47 |
+
|
48 |
+
<products_rate_3 tax_rate="tax_calculation_rate_3"
|
49 |
+
tax_customer_class="customers_end_consumers,customers_companies"
|
50 |
+
tax_product_class="products_rate_3">
|
51 |
+
<execute>1</execute>
|
52 |
+
<code>Klienci kupują produkty w obniżonej stawki 5%</code>
|
53 |
+
<priority>1</priority>
|
54 |
+
<position>0</position>
|
55 |
+
</products_rate_3>
|
56 |
+
|
57 |
+
<products_rate_4 tax_rate="tax_calculation_rate_4"
|
58 |
+
tax_customer_class="customers_companies_no_vat"
|
59 |
+
tax_product_class="products_rate_1,products_rate_2,products_rate_3,shipping">
|
60 |
+
<execute>1</execute>
|
61 |
+
<code>Firmy nie podlegające produktów VAT kupna w pełnej wysokości (nominalna VAT) oraz obniżonej stawki (VAT zmniejszona)</code>
|
62 |
+
<priority>1</priority>
|
63 |
+
<position>0</position>
|
64 |
+
</products_rate_4>
|
65 |
+
</default>
|
66 |
+
</tax_calculation_rules>
|
67 |
+
|
68 |
+
<tax_classes>
|
69 |
+
<default>
|
70 |
+
<products_rate_1>
|
71 |
+
<execute>1</execute>
|
72 |
+
<class_id>1</class_id>
|
73 |
+
<class_name>Produkty do pełnej stawki 23%</class_name>
|
74 |
+
<class_type>PRODUCT</class_type>
|
75 |
+
<default>1</default>
|
76 |
+
</products_rate_1>
|
77 |
+
<products_rate_2>
|
78 |
+
<execute>1</execute>
|
79 |
+
<class_id>2</class_id>
|
80 |
+
<class_name>Dla obniżonej stawki 8%</class_name>
|
81 |
+
<class_type>PRODUCT</class_type>
|
82 |
+
<default>0</default>
|
83 |
+
</products_rate_2>
|
84 |
+
<products_rate_3>
|
85 |
+
<execute>1</execute>
|
86 |
+
<class_id>3</class_id>
|
87 |
+
<class_name>Obniżoną stawką 5%</class_name>
|
88 |
+
<class_type>PRODUCT</class_type>
|
89 |
+
<default>0</default>
|
90 |
+
</products_rate_3>
|
91 |
+
<shipping>
|
92 |
+
<execute>1</execute>
|
93 |
+
<class_id>4</class_id>
|
94 |
+
<class_name>Dostawa z VAT w pełnej wysokości</class_name>
|
95 |
+
<class_type>PRODUCT</class_type>
|
96 |
+
<default>0</default>
|
97 |
+
</shipping>
|
98 |
+
|
99 |
+
<customers_end_consumers>
|
100 |
+
<execute>1</execute>
|
101 |
+
<class_id>5</class_id>
|
102 |
+
<class_name>klienci końcowi</class_name>
|
103 |
+
<class_type>CUSTOMER</class_type>
|
104 |
+
</customers_end_consumers>
|
105 |
+
<customers_companies>
|
106 |
+
<execute>1</execute>
|
107 |
+
<class_id>6</class_id>
|
108 |
+
<class_name>Przedsiębiorstwa podlegające VAT</class_name>
|
109 |
+
<class_type>CUSTOMER</class_type>
|
110 |
+
</customers_companies>
|
111 |
+
<customers_companies_no_vat>
|
112 |
+
<execute>1</execute>
|
113 |
+
<class_id>7</class_id>
|
114 |
+
<class_name>Firmy nie podlegające VAT</class_name>
|
115 |
+
<class_type>CUSTOMER</class_type>
|
116 |
+
</customers_companies_no_vat>
|
117 |
+
</default>
|
118 |
+
</tax_classes>
|
119 |
+
|
120 |
+
<tax_calculation_rates>
|
121 |
+
<default>
|
122 |
+
<tax_calculation_rate_1>
|
123 |
+
<execute>1</execute>
|
124 |
+
<tax_region_id>0</tax_region_id>
|
125 |
+
<tax_postcode>*</tax_postcode>
|
126 |
+
<label>23% VAT</label>
|
127 |
+
<rate>19.6</rate>
|
128 |
+
</tax_calculation_rate_1>
|
129 |
+
|
130 |
+
<tax_calculation_rate_2>
|
131 |
+
<execute>1</execute>
|
132 |
+
<tax_region_id>0</tax_region_id>
|
133 |
+
<tax_postcode>*</tax_postcode>
|
134 |
+
<label>Zmniejszona 8% VAT</label>
|
135 |
+
<rate>7</rate>
|
136 |
+
</tax_calculation_rate_2>
|
137 |
+
|
138 |
+
<tax_calculation_rate_3>
|
139 |
+
<execute>1</execute>
|
140 |
+
<tax_region_id>0</tax_region_id>
|
141 |
+
<tax_postcode>*</tax_postcode>
|
142 |
+
<label>Obniżona stawka podatku VAT w wysokości 5%</label>
|
143 |
+
<rate>5.5</rate>
|
144 |
+
</tax_calculation_rate_3>
|
145 |
+
|
146 |
+
<tax_calculation_rate_4>
|
147 |
+
<execute>1</execute>
|
148 |
+
<tax_region_id>0</tax_region_id>
|
149 |
+
<tax_postcode>*</tax_postcode>
|
150 |
+
<label>bez VAT</label>
|
151 |
+
<rate>0</rate>
|
152 |
+
</tax_calculation_rate_4>
|
153 |
+
</default>
|
154 |
+
</tax_calculation_rates>
|
155 |
+
|
156 |
+
<tax_config>
|
157 |
+
<default>
|
158 |
+
<general__country__default>PL</general__country__default>
|
159 |
+
<tax__classes__shipping_tax_class>3</tax__classes__shipping_tax_class>
|
160 |
+
<tax__calculation__based_on>billing</tax__calculation__based_on>
|
161 |
+
<tax__calculation__price_includes_tax>1</tax__calculation__price_includes_tax>
|
162 |
+
<tax__calculation__shipping_includes_tax>1</tax__calculation__shipping_includes_tax>
|
163 |
+
<tax__calculation__apply_after_discount>1</tax__calculation__apply_after_discount>
|
164 |
+
<tax__calculation__discount_tax>1</tax__calculation__discount_tax>
|
165 |
+
<tax__defaults__country>PL</tax__defaults__country>
|
166 |
+
<tax__defaults__region></tax__defaults__region>
|
167 |
+
<tax__defaults__postcode>12345</tax__defaults__postcode>
|
168 |
+
<tax__display__type>2</tax__display__type>
|
169 |
+
<tax__display__shipping>2</tax__display__shipping>
|
170 |
+
<tax__cart_display__subtotal>2</tax__cart_display__subtotal>
|
171 |
+
<tax__cart_display__full_summary>1</tax__cart_display__full_summary>
|
172 |
+
<tax__cart_display__shipping>2</tax__cart_display__shipping>
|
173 |
+
<tax__cart_display__price>2</tax__cart_display__price>
|
174 |
+
<tax__cart_display__zero_tax>1</tax__cart_display__zero_tax>
|
175 |
+
<tax__cart_display__grandtotal>0</tax__cart_display__grandtotal>
|
176 |
+
<tax__sales_display__price>2</tax__sales_display__price>
|
177 |
+
<tax__sales_display__subtotal>2</tax__sales_display__subtotal>
|
178 |
+
<tax__sales_display__shipping>2</tax__sales_display__shipping>
|
179 |
+
<tax__sales_display__grandtotal>0</tax__sales_display__grandtotal>
|
180 |
+
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
181 |
+
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
182 |
+
<shipping__origin__country_id>PL</shipping__origin__country_id>
|
183 |
+
<shipping__origin__region_id>79</shipping__origin__region_id>
|
184 |
+
<shipping__origin__postcode>12345</shipping__origin__postcode>
|
185 |
+
<shipping__origin__city>Warsawa</shipping__origin__city>
|
186 |
+
</default>
|
187 |
+
</tax_config>
|
188 |
+
</magesetup>
|
189 |
+
</default>
|
190 |
+
</config>
|
app/code/community/FireGento/MageSetup/etc/ro/email.xml
ADDED
@@ -0,0 +1,495 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* This file is part of the FIREGENTO project.
|
5 |
+
*
|
6 |
+
* FireGento_MageSetup is free software; you can redistribute it and/or
|
7 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
8 |
+
* published by the Free Software Foundation.
|
9 |
+
*
|
10 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
11 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
12 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
13 |
+
*
|
14 |
+
* PHP version 5
|
15 |
+
*
|
16 |
+
* @category FireGento
|
17 |
+
* @package FireGento_MageSetup
|
18 |
+
* @author FireGento Team <team@firegento.com>
|
19 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.de). All rights served.
|
20 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
21 |
+
* @version 2.2.1
|
22 |
+
* @since 0.1.0
|
23 |
+
*/
|
24 |
+
-->
|
25 |
+
<config>
|
26 |
+
<default>
|
27 |
+
<magesetup>
|
28 |
+
<emails>
|
29 |
+
<default>
|
30 |
+
<admin_password_new>
|
31 |
+
<execute>1</execute>
|
32 |
+
<template_code>Parolă nouă pentru administrator</template_code>
|
33 |
+
<template_type>2</template_type>
|
34 |
+
<template_file>admin_password_new.html</template_file>
|
35 |
+
<config_data_path>admin/emails/forgot_email_template</config_data_path>
|
36 |
+
<add_footer>0</add_footer>
|
37 |
+
<add_business_terms>0</add_business_terms>
|
38 |
+
<add_revocation>0</add_revocation>
|
39 |
+
</admin_password_new>
|
40 |
+
|
41 |
+
<admin_password_reset_confirmation>
|
42 |
+
<execute>1</execute>
|
43 |
+
<template_code>Resetează parola pentru administrator</template_code>
|
44 |
+
<template_type>2</template_type>
|
45 |
+
<template_file>admin_password_reset_confirmation.html</template_file>
|
46 |
+
<config_data_path>admin/emails/forgot_email_template</config_data_path>
|
47 |
+
<add_footer>0</add_footer>
|
48 |
+
<add_business_terms>0</add_business_terms>
|
49 |
+
<add_revocation>0</add_revocation>
|
50 |
+
</admin_password_reset_confirmation>
|
51 |
+
|
52 |
+
<currency_update_warning>
|
53 |
+
<execute>1</execute>
|
54 |
+
<template_code>Actualizarea valutei</template_code>
|
55 |
+
<template_type>1</template_type>
|
56 |
+
<template_file>currency_update_warning.html</template_file>
|
57 |
+
<config_data_path>currency/import/error_email_template</config_data_path>
|
58 |
+
<add_footer>0</add_footer>
|
59 |
+
<add_business_terms>0</add_business_terms>
|
60 |
+
<add_revocation>0</add_revocation>
|
61 |
+
</currency_update_warning>
|
62 |
+
|
63 |
+
<account_new>
|
64 |
+
<execute>1</execute>
|
65 |
+
<template_code>Cont nou</template_code>
|
66 |
+
<template_type>2</template_type>
|
67 |
+
<template_file>account_new.html</template_file>
|
68 |
+
<config_data_path>customer/create_account/email_template</config_data_path>
|
69 |
+
<add_footer>1</add_footer>
|
70 |
+
<add_business_terms>0</add_business_terms>
|
71 |
+
<add_revocation>0</add_revocation>
|
72 |
+
</account_new>
|
73 |
+
|
74 |
+
<customer_password_remind_email_template>
|
75 |
+
<execute>1</execute>
|
76 |
+
<template_code>Restabilirea parolei</template_code>
|
77 |
+
<template_type>2</template_type>
|
78 |
+
<template_file>password_new.html</template_file>
|
79 |
+
<config_data_path>customer/password/remind_email_template</config_data_path>
|
80 |
+
<add_footer>1</add_footer>
|
81 |
+
<add_business_terms>0</add_business_terms>
|
82 |
+
<add_revocation>0</add_revocation>
|
83 |
+
</customer_password_remind_email_template>
|
84 |
+
|
85 |
+
<account_new_confirmation>
|
86 |
+
<execute>1</execute>
|
87 |
+
<template_code>Confirmare cont nou</template_code>
|
88 |
+
<template_type>2</template_type>
|
89 |
+
<template_file>account_new_confirmation.html</template_file>
|
90 |
+
<config_data_path>customer/create_account/email_confirmation_template</config_data_path>
|
91 |
+
<add_footer>1</add_footer>
|
92 |
+
<add_business_terms>0</add_business_terms>
|
93 |
+
<add_revocation>0</add_revocation>
|
94 |
+
</account_new_confirmation>
|
95 |
+
|
96 |
+
<account_new_confirmed>
|
97 |
+
<execute>1</execute>
|
98 |
+
<template_code>Cont nou confirmat</template_code>
|
99 |
+
<template_type>2</template_type>
|
100 |
+
<template_file>account_new_confirmed.html</template_file>
|
101 |
+
<config_data_path>customer/create_account/email_confirmed_template</config_data_path>
|
102 |
+
<add_footer>1</add_footer>
|
103 |
+
<add_business_terms>0</add_business_terms>
|
104 |
+
<add_revocation>0</add_revocation>
|
105 |
+
</account_new_confirmed>
|
106 |
+
|
107 |
+
<password_new>
|
108 |
+
<execute>1</execute>
|
109 |
+
<template_code>Parolă nouă</template_code>
|
110 |
+
<template_type>2</template_type>
|
111 |
+
<template_file>password_new.html</template_file>
|
112 |
+
<config_data_path>customer/password/forgot_email_template</config_data_path>
|
113 |
+
<add_footer>1</add_footer>
|
114 |
+
<add_business_terms>0</add_business_terms>
|
115 |
+
<add_revocation>0</add_revocation>
|
116 |
+
</password_new>
|
117 |
+
|
118 |
+
<account_password_reset_confirmation>
|
119 |
+
<execute>1</execute>
|
120 |
+
<template_code>Confirmare resetare parolă</template_code>
|
121 |
+
<template_type>2</template_type>
|
122 |
+
<template_file>account_password_reset_confirmation.html</template_file>
|
123 |
+
<config_data_path>customer/password/forgot_email_template</config_data_path>
|
124 |
+
<add_footer>1</add_footer>
|
125 |
+
<add_business_terms>0</add_business_terms>
|
126 |
+
<add_revocation>0</add_revocation>
|
127 |
+
</account_password_reset_confirmation>
|
128 |
+
|
129 |
+
<order_new>
|
130 |
+
<execute>1</execute>
|
131 |
+
<template_code>Comandă nouă</template_code>
|
132 |
+
<template_type>2</template_type>
|
133 |
+
<template_file>sales/order_new.html</template_file>
|
134 |
+
<config_data_path>sales_email/order/template</config_data_path>
|
135 |
+
<add_footer>1</add_footer>
|
136 |
+
<add_business_terms>1</add_business_terms>
|
137 |
+
<add_revocation>1</add_revocation>
|
138 |
+
</order_new>
|
139 |
+
|
140 |
+
<order_new_guest>
|
141 |
+
<execute>1</execute>
|
142 |
+
<template_code>Comandă nouă oaspete</template_code>
|
143 |
+
<template_type>2</template_type>
|
144 |
+
<template_file>sales/order_new_guest.html</template_file>
|
145 |
+
<config_data_path>sales_email/order/guest_template</config_data_path>
|
146 |
+
<add_footer>1</add_footer>
|
147 |
+
<add_business_terms>1</add_business_terms>
|
148 |
+
<add_revocation>1</add_revocation>
|
149 |
+
</order_new_guest>
|
150 |
+
|
151 |
+
<order_update>
|
152 |
+
<execute>1</execute>
|
153 |
+
<template_code>Actualizare comandă</template_code>
|
154 |
+
<template_type>2</template_type>
|
155 |
+
<template_file>sales/order_update.html</template_file>
|
156 |
+
<config_data_path>sales_email/order_comment/template</config_data_path>
|
157 |
+
<add_footer>1</add_footer>
|
158 |
+
<add_business_terms>0</add_business_terms>
|
159 |
+
<add_revocation>0</add_revocation>
|
160 |
+
</order_update>
|
161 |
+
|
162 |
+
<order_update_guest>
|
163 |
+
<execute>1</execute>
|
164 |
+
<template_code>Actualizare comandă oaspete</template_code>
|
165 |
+
<template_type>2</template_type>
|
166 |
+
<template_file>sales/order_update_guest.html</template_file>
|
167 |
+
<config_data_path>sales_email/order_comment/guest_template</config_data_path>
|
168 |
+
<add_footer>1</add_footer>
|
169 |
+
<add_business_terms>0</add_business_terms>
|
170 |
+
<add_revocation>0</add_revocation>
|
171 |
+
</order_update_guest>
|
172 |
+
|
173 |
+
<invoice_new>
|
174 |
+
<execute>1</execute>
|
175 |
+
<template_code>Factură nouă</template_code>
|
176 |
+
<template_type>2</template_type>
|
177 |
+
<template_file>sales/invoice_new.html</template_file>
|
178 |
+
<config_data_path>sales_email/invoice/template</config_data_path>
|
179 |
+
<add_footer>1</add_footer>
|
180 |
+
<add_business_terms>0</add_business_terms>
|
181 |
+
<add_revocation>0</add_revocation>
|
182 |
+
</invoice_new>
|
183 |
+
|
184 |
+
<invoice_new_guest>
|
185 |
+
<execute>1</execute>
|
186 |
+
<template_code>Factură nouă oaspete</template_code>
|
187 |
+
<template_type>2</template_type>
|
188 |
+
<template_file>sales/invoice_new_guest.html</template_file>
|
189 |
+
<config_data_path>sales_email/invoice/guest_template</config_data_path>
|
190 |
+
<add_footer>1</add_footer>
|
191 |
+
<add_business_terms>0</add_business_terms>
|
192 |
+
<add_revocation>0</add_revocation>
|
193 |
+
</invoice_new_guest>
|
194 |
+
|
195 |
+
<invoice_update>
|
196 |
+
<execute>1</execute>
|
197 |
+
<template_code>Actualizare factură</template_code>
|
198 |
+
<template_type>2</template_type>
|
199 |
+
<template_file>sales/invoice_update.html</template_file>
|
200 |
+
<config_data_path>sales_email/invoice_comment/template</config_data_path>
|
201 |
+
<add_footer>1</add_footer>
|
202 |
+
<add_business_terms>0</add_business_terms>
|
203 |
+
<add_revocation>0</add_revocation>
|
204 |
+
</invoice_update>
|
205 |
+
|
206 |
+
<invoice_update_guest>
|
207 |
+
<execute>1</execute>
|
208 |
+
<template_code>Actualizare factură oaspete</template_code>
|
209 |
+
<template_type>2</template_type>
|
210 |
+
<template_file>sales/invoice_update_guest.html</template_file>
|
211 |
+
<config_data_path>sales_email/invoice_comment/guest_template</config_data_path>
|
212 |
+
<add_footer>1</add_footer>
|
213 |
+
<add_business_terms>0</add_business_terms>
|
214 |
+
<add_revocation>0</add_revocation>
|
215 |
+
</invoice_update_guest>
|
216 |
+
|
217 |
+
<creditmemo_new>
|
218 |
+
<execute>1</execute>
|
219 |
+
<template_code>Retur nou</template_code>
|
220 |
+
<template_type>2</template_type>
|
221 |
+
<template_file>sales/creditmemo_new.html</template_file>
|
222 |
+
<config_data_path>sales_email/creditmemo/template</config_data_path>
|
223 |
+
<add_footer>1</add_footer>
|
224 |
+
<add_business_terms>0</add_business_terms>
|
225 |
+
<add_revocation>0</add_revocation>
|
226 |
+
</creditmemo_new>
|
227 |
+
|
228 |
+
<creditmemo_new_guest>
|
229 |
+
<execute>1</execute>
|
230 |
+
<template_code>Retur nou oaspete</template_code>
|
231 |
+
<template_type>2</template_type>
|
232 |
+
<template_file>sales/creditmemo_new_guest.html</template_file>
|
233 |
+
<config_data_path>sales_email/creditmemo/guest_template</config_data_path>
|
234 |
+
<add_footer>1</add_footer>
|
235 |
+
<add_business_terms>0</add_business_terms>
|
236 |
+
<add_revocation>0</add_revocation>
|
237 |
+
</creditmemo_new_guest>
|
238 |
+
|
239 |
+
<creditmemo_update>
|
240 |
+
<execute>1</execute>
|
241 |
+
<template_code>Actualizare retur</template_code>
|
242 |
+
<template_type>2</template_type>
|
243 |
+
<template_file>sales/creditmemo_update.html</template_file>
|
244 |
+
<config_data_path>sales_email/creditmemo_comment/template</config_data_path>
|
245 |
+
<add_footer>1</add_footer>
|
246 |
+
<add_business_terms>0</add_business_terms>
|
247 |
+
<add_revocation>0</add_revocation>
|
248 |
+
</creditmemo_update>
|
249 |
+
|
250 |
+
<creditmemo_update_guest>
|
251 |
+
<execute>1</execute>
|
252 |
+
<template_code>Actualizare retur oaspete</template_code>
|
253 |
+
<template_type>2</template_type>
|
254 |
+
<template_file>sales/creditmemo_update_guest.html</template_file>
|
255 |
+
<config_data_path>sales_email/creditmemo_comment/guest_template</config_data_path>
|
256 |
+
<add_footer>1</add_footer>
|
257 |
+
<add_business_terms>0</add_business_terms>
|
258 |
+
<add_revocation>0</add_revocation>
|
259 |
+
</creditmemo_update_guest>
|
260 |
+
|
261 |
+
<shipment_new>
|
262 |
+
<execute>1</execute>
|
263 |
+
<template_code>Livrare nouă</template_code>
|
264 |
+
<template_type>2</template_type>
|
265 |
+
<template_file>sales/shipment_new.html</template_file>
|
266 |
+
<config_data_path>sales_email/shipment/template</config_data_path>
|
267 |
+
<add_footer>1</add_footer>
|
268 |
+
<add_business_terms>0</add_business_terms>
|
269 |
+
<add_revocation>0</add_revocation>
|
270 |
+
</shipment_new>
|
271 |
+
|
272 |
+
<shipment_new_guest>
|
273 |
+
<execute>1</execute>
|
274 |
+
<template_code>Livrare nouă oaspete</template_code>
|
275 |
+
<template_type>2</template_type>
|
276 |
+
<template_file>sales/shipment_new_guest.html</template_file>
|
277 |
+
<config_data_path>sales_email/shipment/guest_template</config_data_path>
|
278 |
+
<add_footer>1</add_footer>
|
279 |
+
<add_business_terms>0</add_business_terms>
|
280 |
+
<add_revocation>0</add_revocation>
|
281 |
+
</shipment_new_guest>
|
282 |
+
|
283 |
+
<shipment_update>
|
284 |
+
<execute>1</execute>
|
285 |
+
<template_code>Actualizare livrare</template_code>
|
286 |
+
<template_type>2</template_type>
|
287 |
+
<template_file>sales/shipment_update.html</template_file>
|
288 |
+
<config_data_path>sales_email/shipment_comment/template</config_data_path>
|
289 |
+
<add_footer>1</add_footer>
|
290 |
+
<add_business_terms>0</add_business_terms>
|
291 |
+
<add_revocation>0</add_revocation>
|
292 |
+
</shipment_update>
|
293 |
+
|
294 |
+
<shipment_update_guest>
|
295 |
+
<execute>1</execute>
|
296 |
+
<template_code>Actualizare livrare oaspete</template_code>
|
297 |
+
<template_type>2</template_type>
|
298 |
+
<template_file>sales/shipment_update_guest.html</template_file>
|
299 |
+
<config_data_path>sales_email/shipment_comment/guest_template</config_data_path>
|
300 |
+
<add_footer>1</add_footer>
|
301 |
+
<add_business_terms>0</add_business_terms>
|
302 |
+
<add_revocation>0</add_revocation>
|
303 |
+
</shipment_update_guest>
|
304 |
+
|
305 |
+
<payment_failed>
|
306 |
+
<execute>1</execute>
|
307 |
+
<template_code>Plată eșuată</template_code>
|
308 |
+
<template_type>2</template_type>
|
309 |
+
<template_file>payment_failed.html</template_file>
|
310 |
+
<config_data_path>checkout/payment_failed/template</config_data_path>
|
311 |
+
<add_footer>0</add_footer>
|
312 |
+
<add_business_terms>0</add_business_terms>
|
313 |
+
<add_revocation>0</add_revocation>
|
314 |
+
</payment_failed>
|
315 |
+
|
316 |
+
<log_clean_warning>
|
317 |
+
<execute>1</execute>
|
318 |
+
<template_code>Log Clean Warning</template_code>
|
319 |
+
<template_type>1</template_type>
|
320 |
+
<template_file>log_clean_warning.html</template_file>
|
321 |
+
<config_data_path>system/log/error_email_template</config_data_path>
|
322 |
+
<add_footer>0</add_footer>
|
323 |
+
<add_business_terms>0</add_business_terms>
|
324 |
+
<add_revocation>0</add_revocation>
|
325 |
+
</log_clean_warning>
|
326 |
+
|
327 |
+
<newsletter_subscr_confirm>
|
328 |
+
<execute>1</execute>
|
329 |
+
<template_code>Confirmare abonament buletin informativ</template_code>
|
330 |
+
<template_type>2</template_type>
|
331 |
+
<template_file>newsletter_subscr_confirm.html</template_file>
|
332 |
+
<config_data_path>newsletter/subscription/confirm_email_template</config_data_path>
|
333 |
+
<add_footer>1</add_footer>
|
334 |
+
<add_business_terms>0</add_business_terms>
|
335 |
+
<add_revocation>0</add_revocation>
|
336 |
+
</newsletter_subscr_confirm>
|
337 |
+
|
338 |
+
<newsletter_subscr_success>
|
339 |
+
<execute>1</execute>
|
340 |
+
<template_code>Abonare buletin informativ reușită</template_code>
|
341 |
+
<template_type>2</template_type>
|
342 |
+
<template_file>newsletter_subscr_success.html</template_file>
|
343 |
+
<config_data_path>newsletter/subscription/success_email_template</config_data_path>
|
344 |
+
<add_footer>1</add_footer>
|
345 |
+
<add_business_terms>0</add_business_terms>
|
346 |
+
<add_revocation>0</add_revocation>
|
347 |
+
</newsletter_subscr_success>
|
348 |
+
|
349 |
+
<newsletter_unsub_success>
|
350 |
+
<execute>1</execute>
|
351 |
+
<template_code>Dezabonare buletin informativ reușită</template_code>
|
352 |
+
<template_type>2</template_type>
|
353 |
+
<template_file>newsletter_unsub_success.html</template_file>
|
354 |
+
<config_data_path>newsletter/subscription/un_email_template</config_data_path>
|
355 |
+
<add_footer>1</add_footer>
|
356 |
+
<add_business_terms>0</add_business_terms>
|
357 |
+
<add_revocation>0</add_revocation>
|
358 |
+
</newsletter_unsub_success>
|
359 |
+
|
360 |
+
<wishlist_share>
|
361 |
+
<execute>1</execute>
|
362 |
+
<template_code>Distribuie lista de preferințe</template_code>
|
363 |
+
<template_type>2</template_type>
|
364 |
+
<template_file>wishlist_share.html</template_file>
|
365 |
+
<config_data_path>wishlist/email/email_template</config_data_path>
|
366 |
+
<add_footer>0</add_footer>
|
367 |
+
<add_business_terms>0</add_business_terms>
|
368 |
+
<add_revocation>0</add_revocation>
|
369 |
+
</wishlist_share>
|
370 |
+
|
371 |
+
<product_share>
|
372 |
+
<execute>1</execute>
|
373 |
+
<template_code>Trimite produsul unui prieten</template_code>
|
374 |
+
<template_type>2</template_type>
|
375 |
+
<template_file>product_share.html</template_file>
|
376 |
+
<config_data_path>sendfriend/email/template</config_data_path>
|
377 |
+
<add_footer>1</add_footer>
|
378 |
+
<add_business_terms>0</add_business_terms>
|
379 |
+
<add_revocation>0</add_revocation>
|
380 |
+
</product_share>
|
381 |
+
|
382 |
+
<contact_form>
|
383 |
+
<execute>1</execute>
|
384 |
+
<template_code>Formular de contact</template_code>
|
385 |
+
<template_type>1</template_type>
|
386 |
+
<template_file>contact_form.html</template_file>
|
387 |
+
<config_data_path>contacts/email/email_template</config_data_path>
|
388 |
+
<add_footer>0</add_footer>
|
389 |
+
<add_business_terms>0</add_business_terms>
|
390 |
+
<add_revocation>0</add_revocation>
|
391 |
+
</contact_form>
|
392 |
+
|
393 |
+
<sitemap_generate_warning>
|
394 |
+
<execute>1</execute>
|
395 |
+
<template_code>Harta site-ului a generat un avertizment</template_code>
|
396 |
+
<template_type>1</template_type>
|
397 |
+
<template_file>sitemap_generate_warning.html</template_file>
|
398 |
+
<config_data_path>sitemap/generate/error_email_template</config_data_path>
|
399 |
+
<add_footer>0</add_footer>
|
400 |
+
<add_business_terms>0</add_business_terms>
|
401 |
+
<add_revocation>0</add_revocation>
|
402 |
+
</sitemap_generate_warning>
|
403 |
+
|
404 |
+
<product_stock_alert>
|
405 |
+
<execute>1</execute>
|
406 |
+
<template_code>Avertisment stoc produse</template_code>
|
407 |
+
<template_type>2</template_type>
|
408 |
+
<template_file>product_stock_alert.html</template_file>
|
409 |
+
<config_data_path>catalog/productalert/email_stock_template</config_data_path>
|
410 |
+
<add_footer>0</add_footer>
|
411 |
+
<add_business_terms>0</add_business_terms>
|
412 |
+
<add_revocation>0</add_revocation>
|
413 |
+
</product_stock_alert>
|
414 |
+
|
415 |
+
<product_price_alert>
|
416 |
+
<execute>1</execute>
|
417 |
+
<template_code>Avertisment preț produse</template_code>
|
418 |
+
<template_type>2</template_type>
|
419 |
+
<template_file>product_price_alert.html</template_file>
|
420 |
+
<config_data_path>catalog/productalert/email_price_template</config_data_path>
|
421 |
+
<add_footer>0</add_footer>
|
422 |
+
<add_business_terms>0</add_business_terms>
|
423 |
+
<add_revocation>0</add_revocation>
|
424 |
+
</product_price_alert>
|
425 |
+
|
426 |
+
<product_alert_cron_error>
|
427 |
+
<execute>1</execute>
|
428 |
+
<template_code>Avertisment produse eroare Cron</template_code>
|
429 |
+
<template_type>2</template_type>
|
430 |
+
<template_file>product_alert_cron_error.html</template_file>
|
431 |
+
<config_data_path>catalog/productalert_cron/error_email_template</config_data_path>
|
432 |
+
<add_footer>0</add_footer>
|
433 |
+
<add_business_terms>0</add_business_terms>
|
434 |
+
<add_revocation>0</add_revocation>
|
435 |
+
</product_alert_cron_error>
|
436 |
+
|
437 |
+
<enterprise_invitation>
|
438 |
+
<execute>1</execute>
|
439 |
+
<template_code>Invitație</template_code>
|
440 |
+
<template_type>2</template_type>
|
441 |
+
<template_file>enterprise_invitation.html</template_file>
|
442 |
+
<config_data_path>enterprise_invitation/email/template</config_data_path>
|
443 |
+
<add_footer>0</add_footer>
|
444 |
+
<add_business_terms>0</add_business_terms>
|
445 |
+
<add_revocation>0</add_revocation>
|
446 |
+
</enterprise_invitation>
|
447 |
+
|
448 |
+
<token>
|
449 |
+
<execute>1</execute>
|
450 |
+
<template_code>Jeton OAuth</template_code>
|
451 |
+
<template_type>2</template_type>
|
452 |
+
<template_file>token.html</template_file>
|
453 |
+
<config_data_path>oauth/email/template</config_data_path>
|
454 |
+
<add_footer>0</add_footer>
|
455 |
+
<add_business_terms>0</add_business_terms>
|
456 |
+
<add_revocation>0</add_revocation>
|
457 |
+
</token>
|
458 |
+
</default>
|
459 |
+
</emails>
|
460 |
+
<email_footers>
|
461 |
+
<default>
|
462 |
+
<footer>
|
463 |
+
<![CDATA[
|
464 |
+
<tr>
|
465 |
+
<td>
|
466 |
+
{{block type="magesetup/imprint_content" template="magesetup/imprint/email_footer.phtml"}}
|
467 |
+
</td>
|
468 |
+
</tr>
|
469 |
+
]]>
|
470 |
+
</footer>
|
471 |
+
<business_terms>
|
472 |
+
<![CDATA[
|
473 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
474 |
+
<tr>
|
475 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
476 |
+
{{block type="cms/block" block_id="business_terms"}}
|
477 |
+
</td>
|
478 |
+
</tr>
|
479 |
+
]]>
|
480 |
+
</business_terms>
|
481 |
+
<revocation>
|
482 |
+
<![CDATA[
|
483 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
484 |
+
<tr>
|
485 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
486 |
+
{{block type="cms/block" block_id="revocation"}}
|
487 |
+
</td>
|
488 |
+
</tr>
|
489 |
+
]]>
|
490 |
+
</revocation>
|
491 |
+
</default>
|
492 |
+
</email_footers>
|
493 |
+
</magesetup>
|
494 |
+
</default>
|
495 |
+
</config>
|
app/code/community/FireGento/MageSetup/etc/ro/tax.xml
ADDED
@@ -0,0 +1,171 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?xml version="1.0"?>
|
2 |
+
<!--
|
3 |
+
/**
|
4 |
+
* This file is part of the FIREGENTO project.
|
5 |
+
*
|
6 |
+
* FireGento_MageSetup is free software; you can redistribute it and/or
|
7 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
8 |
+
* published by the Free Software Foundation.
|
9 |
+
*
|
10 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
11 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
12 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
13 |
+
*
|
14 |
+
* PHP version 5
|
15 |
+
*
|
16 |
+
* @category FireGento
|
17 |
+
* @package FireGento_MageSetup
|
18 |
+
* @author FireGento Team <team@firegento.com>
|
19 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.de). All rights served.
|
20 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
21 |
+
* @version 2.2.1
|
22 |
+
* @since 0.1.0
|
23 |
+
*/
|
24 |
+
-->
|
25 |
+
<config>
|
26 |
+
<default>
|
27 |
+
<magesetup>
|
28 |
+
<tax_calculation_rules>
|
29 |
+
<default>
|
30 |
+
<products_full_tax tax_rate="tax_calculation_rate_1"
|
31 |
+
tax_customer_class="customers_end_users,customers_companies"
|
32 |
+
tax_product_class="products_rate_1,shipping_rate_1">
|
33 |
+
<execute>1</execute>
|
34 |
+
<code>Clientii cumpara produse cu fiscal complet</code>
|
35 |
+
<priority>1</priority>
|
36 |
+
<position>0</position>
|
37 |
+
</products_full_tax>
|
38 |
+
<products_reduced_tax tax_rate="tax_calculation_rate_2"
|
39 |
+
tax_customer_class="customers_end_users,customers_companies"
|
40 |
+
tax_product_class="products_rate_2,shipping_rate_2">
|
41 |
+
<execute>1</execute>
|
42 |
+
<code>Clientii cumpara produse cu taxe reduse</code>
|
43 |
+
<priority>2</priority>
|
44 |
+
<position>0</position>
|
45 |
+
</products_reduced_tax>
|
46 |
+
<products_no_vat tax_rate="tax_calculation_rate_3"
|
47 |
+
tax_customer_class="customers_companies_no_vat"
|
48 |
+
tax_product_class="product_rate_1,products_rate_2,shipping_rate_1,shipping_rate_2">
|
49 |
+
<execute>1</execute>
|
50 |
+
<code>Companiile neimpozabile cumpăra produse cu fiscal complet și redus</code>
|
51 |
+
<priority>2</priority>
|
52 |
+
<position>0</position>
|
53 |
+
</products_no_vat>
|
54 |
+
</default>
|
55 |
+
</tax_calculation_rules>
|
56 |
+
|
57 |
+
<tax_classes>
|
58 |
+
<default>
|
59 |
+
<products_rate_1>
|
60 |
+
<execute>1</execute>
|
61 |
+
<class_id>1</class_id>
|
62 |
+
<class_name>Produse cu fiscal complet</class_name>
|
63 |
+
<class_type>PRODUCT</class_type>
|
64 |
+
<default>1</default>
|
65 |
+
</products_rate_1>
|
66 |
+
<products_rate_2>
|
67 |
+
<execute>1</execute>
|
68 |
+
<class_id>2</class_id>
|
69 |
+
<class_name>Produse cu taxe reduse</class_name>
|
70 |
+
<class_type>PRODUCT</class_type>
|
71 |
+
<default>0</default>
|
72 |
+
</products_rate_2>
|
73 |
+
<shipping_rate_1>
|
74 |
+
<execute>1</execute>
|
75 |
+
<class_id>3</class_id>
|
76 |
+
<class_name>Transport cu fiscal complet</class_name>
|
77 |
+
<class_type>PRODUCT</class_type>
|
78 |
+
<default>0</default>
|
79 |
+
</shipping_rate_1>
|
80 |
+
<shipping_rate_2>
|
81 |
+
<execute>1</execute>
|
82 |
+
<class_id>4</class_id>
|
83 |
+
<class_name>Transport cu taxe reduse</class_name>
|
84 |
+
<class_type>PRODUCT</class_type>
|
85 |
+
<default>0</default>
|
86 |
+
</shipping_rate_2>
|
87 |
+
<customers_end_users>
|
88 |
+
<execute>1</execute>
|
89 |
+
<class_id>5</class_id>
|
90 |
+
<class_name>clienții finali</class_name>
|
91 |
+
<class_type>CUSTOMER</class_type>
|
92 |
+
</customers_end_users>
|
93 |
+
<customers_companies>
|
94 |
+
<execute>1</execute>
|
95 |
+
<class_id>6</class_id>
|
96 |
+
<class_name>Companiile impozabile</class_name>
|
97 |
+
<class_type>CUSTOMER</class_type>
|
98 |
+
</customers_companies>
|
99 |
+
<customers_companies_no_vat>
|
100 |
+
<execute>1</execute>
|
101 |
+
<class_id>7</class_id>
|
102 |
+
<class_name>Companiile neimpozabile</class_name>
|
103 |
+
<class_type>CUSTOMER</class_type>
|
104 |
+
</customers_companies_no_vat>
|
105 |
+
</default>
|
106 |
+
</tax_classes>
|
107 |
+
|
108 |
+
<tax_calculation_rates>
|
109 |
+
<default>
|
110 |
+
<tax_calculation_rate_1>
|
111 |
+
<execute>1</execute>
|
112 |
+
<tax_region_id>0</tax_region_id>
|
113 |
+
<tax_postcode>*</tax_postcode>
|
114 |
+
<label>TVA</label>
|
115 |
+
<rate>24</rate>
|
116 |
+
</tax_calculation_rate_1>
|
117 |
+
|
118 |
+
<tax_calculation_rate_2>
|
119 |
+
<execute>1</execute>
|
120 |
+
<tax_region_id>0</tax_region_id>
|
121 |
+
<tax_postcode>*</tax_postcode>
|
122 |
+
<label>reduse de TVA</label>
|
123 |
+
<rate>9</rate>
|
124 |
+
</tax_calculation_rate_2>
|
125 |
+
|
126 |
+
<tax_calculation_rate_3>
|
127 |
+
<execute>1</execute>
|
128 |
+
<tax_region_id>0</tax_region_id>
|
129 |
+
<tax_postcode>*</tax_postcode>
|
130 |
+
<label>fără TVA</label>
|
131 |
+
<rate>0</rate>
|
132 |
+
</tax_calculation_rate_3>
|
133 |
+
</default>
|
134 |
+
|
135 |
+
</tax_calculation_rates>
|
136 |
+
|
137 |
+
<tax_config>
|
138 |
+
<default>
|
139 |
+
<general__country__default>RO</general__country__default>
|
140 |
+
<tax__classes__shipping_tax_class>3</tax__classes__shipping_tax_class>
|
141 |
+
<tax__calculation__based_on>billing</tax__calculation__based_on>
|
142 |
+
<tax__calculation__price_includes_tax>1</tax__calculation__price_includes_tax>
|
143 |
+
<tax__calculation__shipping_includes_tax>1</tax__calculation__shipping_includes_tax>
|
144 |
+
<tax__calculation__apply_after_discount>1</tax__calculation__apply_after_discount>
|
145 |
+
<tax__calculation__discount_tax>1</tax__calculation__discount_tax>
|
146 |
+
<tax__defaults__country>RO</tax__defaults__country>
|
147 |
+
<tax__defaults__region></tax__defaults__region>
|
148 |
+
<tax__defaults__postcode>000000</tax__defaults__postcode>
|
149 |
+
<tax__display__type>2</tax__display__type>
|
150 |
+
<tax__display__shipping>2</tax__display__shipping>
|
151 |
+
<tax__cart_display__subtotal>2</tax__cart_display__subtotal>
|
152 |
+
<tax__cart_display__full_summary>1</tax__cart_display__full_summary>
|
153 |
+
<tax__cart_display__shipping>2</tax__cart_display__shipping>
|
154 |
+
<tax__cart_display__price>2</tax__cart_display__price>
|
155 |
+
<tax__cart_display__zero_tax>1</tax__cart_display__zero_tax>
|
156 |
+
<tax__cart_display__grandtotal>0</tax__cart_display__grandtotal>
|
157 |
+
<tax__sales_display__price>2</tax__sales_display__price>
|
158 |
+
<tax__sales_display__subtotal>2</tax__sales_display__subtotal>
|
159 |
+
<tax__sales_display__shipping>2</tax__sales_display__shipping>
|
160 |
+
<tax__sales_display__grandtotal>0</tax__sales_display__grandtotal>
|
161 |
+
<tax__sales_display__full_summary>1</tax__sales_display__full_summary>
|
162 |
+
<tax__sales_display__zero_tax>1</tax__sales_display__zero_tax>
|
163 |
+
<shipping__origin__country_id>RO</shipping__origin__country_id>
|
164 |
+
<shipping__origin__region_id></shipping__origin__region_id>
|
165 |
+
<shipping__origin__postcode>000000</shipping__origin__postcode>
|
166 |
+
<shipping__origin__city>Bucuresti</shipping__origin__city>
|
167 |
+
</default>
|
168 |
+
</tax_config>
|
169 |
+
</magesetup>
|
170 |
+
</default>
|
171 |
+
</config>
|
app/code/community/FireGento/MageSetup/etc/ru/cms.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
app/code/community/FireGento/MageSetup/etc/ru/email.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -32,6 +33,7 @@
|
|
32 |
<add_footer>0</add_footer>
|
33 |
<add_business_terms>0</add_business_terms>
|
34 |
<add_revocation>0</add_revocation>
|
|
|
35 |
</admin_password_new>
|
36 |
|
37 |
<admin_password_reset_confirmation>
|
@@ -43,6 +45,7 @@
|
|
43 |
<add_footer>0</add_footer>
|
44 |
<add_business_terms>0</add_business_terms>
|
45 |
<add_revocation>0</add_revocation>
|
|
|
46 |
</admin_password_reset_confirmation>
|
47 |
|
48 |
<currency_update_warning>
|
@@ -54,6 +57,7 @@
|
|
54 |
<add_footer>0</add_footer>
|
55 |
<add_business_terms>0</add_business_terms>
|
56 |
<add_revocation>0</add_revocation>
|
|
|
57 |
</currency_update_warning>
|
58 |
|
59 |
<account_new>
|
@@ -65,6 +69,7 @@
|
|
65 |
<add_footer>1</add_footer>
|
66 |
<add_business_terms>0</add_business_terms>
|
67 |
<add_revocation>0</add_revocation>
|
|
|
68 |
</account_new>
|
69 |
|
70 |
<customer_password_remind_email_template>
|
@@ -76,6 +81,7 @@
|
|
76 |
<add_footer>1</add_footer>
|
77 |
<add_business_terms>0</add_business_terms>
|
78 |
<add_revocation>0</add_revocation>
|
|
|
79 |
</customer_password_remind_email_template>
|
80 |
|
81 |
<account_new_confirmation>
|
@@ -87,6 +93,7 @@
|
|
87 |
<add_footer>1</add_footer>
|
88 |
<add_business_terms>0</add_business_terms>
|
89 |
<add_revocation>0</add_revocation>
|
|
|
90 |
</account_new_confirmation>
|
91 |
|
92 |
<account_new_confirmed>
|
@@ -98,6 +105,7 @@
|
|
98 |
<add_footer>1</add_footer>
|
99 |
<add_business_terms>0</add_business_terms>
|
100 |
<add_revocation>0</add_revocation>
|
|
|
101 |
</account_new_confirmed>
|
102 |
|
103 |
<password_new>
|
@@ -109,6 +117,7 @@
|
|
109 |
<add_footer>1</add_footer>
|
110 |
<add_business_terms>0</add_business_terms>
|
111 |
<add_revocation>0</add_revocation>
|
|
|
112 |
</password_new>
|
113 |
|
114 |
<account_password_reset_confirmation>
|
@@ -120,6 +129,7 @@
|
|
120 |
<add_footer>1</add_footer>
|
121 |
<add_business_terms>0</add_business_terms>
|
122 |
<add_revocation>0</add_revocation>
|
|
|
123 |
</account_password_reset_confirmation>
|
124 |
|
125 |
<order_new>
|
@@ -131,6 +141,7 @@
|
|
131 |
<add_footer>1</add_footer>
|
132 |
<add_business_terms>1</add_business_terms>
|
133 |
<add_revocation>1</add_revocation>
|
|
|
134 |
</order_new>
|
135 |
|
136 |
<order_new_guest>
|
@@ -142,6 +153,7 @@
|
|
142 |
<add_footer>1</add_footer>
|
143 |
<add_business_terms>1</add_business_terms>
|
144 |
<add_revocation>1</add_revocation>
|
|
|
145 |
</order_new_guest>
|
146 |
|
147 |
<order_update>
|
@@ -153,6 +165,7 @@
|
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>0</add_business_terms>
|
155 |
<add_revocation>0</add_revocation>
|
|
|
156 |
</order_update>
|
157 |
|
158 |
<order_update_guest>
|
@@ -164,6 +177,7 @@
|
|
164 |
<add_footer>1</add_footer>
|
165 |
<add_business_terms>0</add_business_terms>
|
166 |
<add_revocation>0</add_revocation>
|
|
|
167 |
</order_update_guest>
|
168 |
|
169 |
<invoice_new>
|
@@ -175,6 +189,7 @@
|
|
175 |
<add_footer>1</add_footer>
|
176 |
<add_business_terms>0</add_business_terms>
|
177 |
<add_revocation>0</add_revocation>
|
|
|
178 |
</invoice_new>
|
179 |
|
180 |
<invoice_new_guest>
|
@@ -186,6 +201,7 @@
|
|
186 |
<add_footer>1</add_footer>
|
187 |
<add_business_terms>0</add_business_terms>
|
188 |
<add_revocation>0</add_revocation>
|
|
|
189 |
</invoice_new_guest>
|
190 |
|
191 |
<invoice_update>
|
@@ -197,6 +213,7 @@
|
|
197 |
<add_footer>1</add_footer>
|
198 |
<add_business_terms>0</add_business_terms>
|
199 |
<add_revocation>0</add_revocation>
|
|
|
200 |
</invoice_update>
|
201 |
|
202 |
<invoice_update_guest>
|
@@ -208,6 +225,7 @@
|
|
208 |
<add_footer>1</add_footer>
|
209 |
<add_business_terms>0</add_business_terms>
|
210 |
<add_revocation>0</add_revocation>
|
|
|
211 |
</invoice_update_guest>
|
212 |
|
213 |
<creditmemo_new>
|
@@ -219,6 +237,7 @@
|
|
219 |
<add_footer>1</add_footer>
|
220 |
<add_business_terms>0</add_business_terms>
|
221 |
<add_revocation>0</add_revocation>
|
|
|
222 |
</creditmemo_new>
|
223 |
|
224 |
<creditmemo_new_guest>
|
@@ -230,6 +249,7 @@
|
|
230 |
<add_footer>1</add_footer>
|
231 |
<add_business_terms>0</add_business_terms>
|
232 |
<add_revocation>0</add_revocation>
|
|
|
233 |
</creditmemo_new_guest>
|
234 |
|
235 |
<creditmemo_update>
|
@@ -241,6 +261,7 @@
|
|
241 |
<add_footer>1</add_footer>
|
242 |
<add_business_terms>0</add_business_terms>
|
243 |
<add_revocation>0</add_revocation>
|
|
|
244 |
</creditmemo_update>
|
245 |
|
246 |
<creditmemo_update_guest>
|
@@ -252,6 +273,7 @@
|
|
252 |
<add_footer>1</add_footer>
|
253 |
<add_business_terms>0</add_business_terms>
|
254 |
<add_revocation>0</add_revocation>
|
|
|
255 |
</creditmemo_update_guest>
|
256 |
|
257 |
<shipment_new>
|
@@ -263,6 +285,7 @@
|
|
263 |
<add_footer>1</add_footer>
|
264 |
<add_business_terms>0</add_business_terms>
|
265 |
<add_revocation>0</add_revocation>
|
|
|
266 |
</shipment_new>
|
267 |
|
268 |
<shipment_new_guest>
|
@@ -274,6 +297,7 @@
|
|
274 |
<add_footer>1</add_footer>
|
275 |
<add_business_terms>0</add_business_terms>
|
276 |
<add_revocation>0</add_revocation>
|
|
|
277 |
</shipment_new_guest>
|
278 |
|
279 |
<shipment_update>
|
@@ -285,6 +309,7 @@
|
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
|
|
288 |
</shipment_update>
|
289 |
|
290 |
<shipment_update_guest>
|
@@ -296,6 +321,7 @@
|
|
296 |
<add_footer>1</add_footer>
|
297 |
<add_business_terms>0</add_business_terms>
|
298 |
<add_revocation>0</add_revocation>
|
|
|
299 |
</shipment_update_guest>
|
300 |
|
301 |
<payment_failed>
|
@@ -307,6 +333,7 @@
|
|
307 |
<add_footer>0</add_footer>
|
308 |
<add_business_terms>0</add_business_terms>
|
309 |
<add_revocation>0</add_revocation>
|
|
|
310 |
</payment_failed>
|
311 |
|
312 |
<log_clean_warning>
|
@@ -318,6 +345,7 @@
|
|
318 |
<add_footer>0</add_footer>
|
319 |
<add_business_terms>0</add_business_terms>
|
320 |
<add_revocation>0</add_revocation>
|
|
|
321 |
</log_clean_warning>
|
322 |
|
323 |
<newsletter_subscr_confirm>
|
@@ -329,6 +357,7 @@
|
|
329 |
<add_footer>1</add_footer>
|
330 |
<add_business_terms>0</add_business_terms>
|
331 |
<add_revocation>0</add_revocation>
|
|
|
332 |
</newsletter_subscr_confirm>
|
333 |
|
334 |
<newsletter_subscr_success>
|
@@ -340,6 +369,7 @@
|
|
340 |
<add_footer>1</add_footer>
|
341 |
<add_business_terms>0</add_business_terms>
|
342 |
<add_revocation>0</add_revocation>
|
|
|
343 |
</newsletter_subscr_success>
|
344 |
|
345 |
<newsletter_unsub_success>
|
@@ -351,6 +381,7 @@
|
|
351 |
<add_footer>1</add_footer>
|
352 |
<add_business_terms>0</add_business_terms>
|
353 |
<add_revocation>0</add_revocation>
|
|
|
354 |
</newsletter_unsub_success>
|
355 |
|
356 |
<wishlist_share>
|
@@ -362,6 +393,7 @@
|
|
362 |
<add_footer>0</add_footer>
|
363 |
<add_business_terms>0</add_business_terms>
|
364 |
<add_revocation>0</add_revocation>
|
|
|
365 |
</wishlist_share>
|
366 |
|
367 |
<product_share>
|
@@ -373,6 +405,7 @@
|
|
373 |
<add_footer>1</add_footer>
|
374 |
<add_business_terms>0</add_business_terms>
|
375 |
<add_revocation>0</add_revocation>
|
|
|
376 |
</product_share>
|
377 |
|
378 |
<contact_form>
|
@@ -384,6 +417,7 @@
|
|
384 |
<add_footer>0</add_footer>
|
385 |
<add_business_terms>0</add_business_terms>
|
386 |
<add_revocation>0</add_revocation>
|
|
|
387 |
</contact_form>
|
388 |
|
389 |
<sitemap_generate_warning>
|
@@ -395,6 +429,7 @@
|
|
395 |
<add_footer>0</add_footer>
|
396 |
<add_business_terms>0</add_business_terms>
|
397 |
<add_revocation>0</add_revocation>
|
|
|
398 |
</sitemap_generate_warning>
|
399 |
|
400 |
<product_stock_alert>
|
@@ -406,6 +441,7 @@
|
|
406 |
<add_footer>0</add_footer>
|
407 |
<add_business_terms>0</add_business_terms>
|
408 |
<add_revocation>0</add_revocation>
|
|
|
409 |
</product_stock_alert>
|
410 |
|
411 |
<product_price_alert>
|
@@ -417,6 +453,7 @@
|
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
|
|
420 |
</product_price_alert>
|
421 |
|
422 |
<product_alert_cron_error>
|
@@ -428,6 +465,7 @@
|
|
428 |
<add_footer>0</add_footer>
|
429 |
<add_business_terms>0</add_business_terms>
|
430 |
<add_revocation>0</add_revocation>
|
|
|
431 |
</product_alert_cron_error>
|
432 |
|
433 |
<enterprise_invitation>
|
@@ -439,6 +477,7 @@
|
|
439 |
<add_footer>0</add_footer>
|
440 |
<add_business_terms>0</add_business_terms>
|
441 |
<add_revocation>0</add_revocation>
|
|
|
442 |
</enterprise_invitation>
|
443 |
|
444 |
<token>
|
@@ -450,6 +489,7 @@
|
|
450 |
<add_footer>0</add_footer>
|
451 |
<add_business_terms>0</add_business_terms>
|
452 |
<add_revocation>0</add_revocation>
|
|
|
453 |
</token>
|
454 |
</default>
|
455 |
</emails>
|
@@ -484,6 +524,16 @@
|
|
484 |
</tr>
|
485 |
]]>
|
486 |
</revocation>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</default>
|
488 |
</email_footers>
|
489 |
</magesetup>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
33 |
<add_footer>0</add_footer>
|
34 |
<add_business_terms>0</add_business_terms>
|
35 |
<add_revocation>0</add_revocation>
|
36 |
+
<add_revocation_form>0</add_revocation_form>
|
37 |
</admin_password_new>
|
38 |
|
39 |
<admin_password_reset_confirmation>
|
45 |
<add_footer>0</add_footer>
|
46 |
<add_business_terms>0</add_business_terms>
|
47 |
<add_revocation>0</add_revocation>
|
48 |
+
<add_revocation_form>0</add_revocation_form>
|
49 |
</admin_password_reset_confirmation>
|
50 |
|
51 |
<currency_update_warning>
|
57 |
<add_footer>0</add_footer>
|
58 |
<add_business_terms>0</add_business_terms>
|
59 |
<add_revocation>0</add_revocation>
|
60 |
+
<add_revocation_form>0</add_revocation_form>
|
61 |
</currency_update_warning>
|
62 |
|
63 |
<account_new>
|
69 |
<add_footer>1</add_footer>
|
70 |
<add_business_terms>0</add_business_terms>
|
71 |
<add_revocation>0</add_revocation>
|
72 |
+
<add_revocation_form>0</add_revocation_form>
|
73 |
</account_new>
|
74 |
|
75 |
<customer_password_remind_email_template>
|
81 |
<add_footer>1</add_footer>
|
82 |
<add_business_terms>0</add_business_terms>
|
83 |
<add_revocation>0</add_revocation>
|
84 |
+
<add_revocation_form>0</add_revocation_form>
|
85 |
</customer_password_remind_email_template>
|
86 |
|
87 |
<account_new_confirmation>
|
93 |
<add_footer>1</add_footer>
|
94 |
<add_business_terms>0</add_business_terms>
|
95 |
<add_revocation>0</add_revocation>
|
96 |
+
<add_revocation_form>0</add_revocation_form>
|
97 |
</account_new_confirmation>
|
98 |
|
99 |
<account_new_confirmed>
|
105 |
<add_footer>1</add_footer>
|
106 |
<add_business_terms>0</add_business_terms>
|
107 |
<add_revocation>0</add_revocation>
|
108 |
+
<add_revocation_form>0</add_revocation_form>
|
109 |
</account_new_confirmed>
|
110 |
|
111 |
<password_new>
|
117 |
<add_footer>1</add_footer>
|
118 |
<add_business_terms>0</add_business_terms>
|
119 |
<add_revocation>0</add_revocation>
|
120 |
+
<add_revocation_form>0</add_revocation_form>
|
121 |
</password_new>
|
122 |
|
123 |
<account_password_reset_confirmation>
|
129 |
<add_footer>1</add_footer>
|
130 |
<add_business_terms>0</add_business_terms>
|
131 |
<add_revocation>0</add_revocation>
|
132 |
+
<add_revocation_form>0</add_revocation_form>
|
133 |
</account_password_reset_confirmation>
|
134 |
|
135 |
<order_new>
|
141 |
<add_footer>1</add_footer>
|
142 |
<add_business_terms>1</add_business_terms>
|
143 |
<add_revocation>1</add_revocation>
|
144 |
+
<add_revocation_form>1</add_revocation_form>
|
145 |
</order_new>
|
146 |
|
147 |
<order_new_guest>
|
153 |
<add_footer>1</add_footer>
|
154 |
<add_business_terms>1</add_business_terms>
|
155 |
<add_revocation>1</add_revocation>
|
156 |
+
<add_revocation_form>1</add_revocation_form>
|
157 |
</order_new_guest>
|
158 |
|
159 |
<order_update>
|
165 |
<add_footer>1</add_footer>
|
166 |
<add_business_terms>0</add_business_terms>
|
167 |
<add_revocation>0</add_revocation>
|
168 |
+
<add_revocation_form>0</add_revocation_form>
|
169 |
</order_update>
|
170 |
|
171 |
<order_update_guest>
|
177 |
<add_footer>1</add_footer>
|
178 |
<add_business_terms>0</add_business_terms>
|
179 |
<add_revocation>0</add_revocation>
|
180 |
+
<add_revocation_form>0</add_revocation_form>
|
181 |
</order_update_guest>
|
182 |
|
183 |
<invoice_new>
|
189 |
<add_footer>1</add_footer>
|
190 |
<add_business_terms>0</add_business_terms>
|
191 |
<add_revocation>0</add_revocation>
|
192 |
+
<add_revocation_form>0</add_revocation_form>
|
193 |
</invoice_new>
|
194 |
|
195 |
<invoice_new_guest>
|
201 |
<add_footer>1</add_footer>
|
202 |
<add_business_terms>0</add_business_terms>
|
203 |
<add_revocation>0</add_revocation>
|
204 |
+
<add_revocation_form>0</add_revocation_form>
|
205 |
</invoice_new_guest>
|
206 |
|
207 |
<invoice_update>
|
213 |
<add_footer>1</add_footer>
|
214 |
<add_business_terms>0</add_business_terms>
|
215 |
<add_revocation>0</add_revocation>
|
216 |
+
<add_revocation_form>0</add_revocation_form>
|
217 |
</invoice_update>
|
218 |
|
219 |
<invoice_update_guest>
|
225 |
<add_footer>1</add_footer>
|
226 |
<add_business_terms>0</add_business_terms>
|
227 |
<add_revocation>0</add_revocation>
|
228 |
+
<add_revocation_form>0</add_revocation_form>
|
229 |
</invoice_update_guest>
|
230 |
|
231 |
<creditmemo_new>
|
237 |
<add_footer>1</add_footer>
|
238 |
<add_business_terms>0</add_business_terms>
|
239 |
<add_revocation>0</add_revocation>
|
240 |
+
<add_revocation_form>0</add_revocation_form>
|
241 |
</creditmemo_new>
|
242 |
|
243 |
<creditmemo_new_guest>
|
249 |
<add_footer>1</add_footer>
|
250 |
<add_business_terms>0</add_business_terms>
|
251 |
<add_revocation>0</add_revocation>
|
252 |
+
<add_revocation_form>0</add_revocation_form>
|
253 |
</creditmemo_new_guest>
|
254 |
|
255 |
<creditmemo_update>
|
261 |
<add_footer>1</add_footer>
|
262 |
<add_business_terms>0</add_business_terms>
|
263 |
<add_revocation>0</add_revocation>
|
264 |
+
<add_revocation_form>0</add_revocation_form>
|
265 |
</creditmemo_update>
|
266 |
|
267 |
<creditmemo_update_guest>
|
273 |
<add_footer>1</add_footer>
|
274 |
<add_business_terms>0</add_business_terms>
|
275 |
<add_revocation>0</add_revocation>
|
276 |
+
<add_revocation_form>0</add_revocation_form>
|
277 |
</creditmemo_update_guest>
|
278 |
|
279 |
<shipment_new>
|
285 |
<add_footer>1</add_footer>
|
286 |
<add_business_terms>0</add_business_terms>
|
287 |
<add_revocation>0</add_revocation>
|
288 |
+
<add_revocation_form>0</add_revocation_form>
|
289 |
</shipment_new>
|
290 |
|
291 |
<shipment_new_guest>
|
297 |
<add_footer>1</add_footer>
|
298 |
<add_business_terms>0</add_business_terms>
|
299 |
<add_revocation>0</add_revocation>
|
300 |
+
<add_revocation_form>0</add_revocation_form>
|
301 |
</shipment_new_guest>
|
302 |
|
303 |
<shipment_update>
|
309 |
<add_footer>1</add_footer>
|
310 |
<add_business_terms>0</add_business_terms>
|
311 |
<add_revocation>0</add_revocation>
|
312 |
+
<add_revocation_form>0</add_revocation_form>
|
313 |
</shipment_update>
|
314 |
|
315 |
<shipment_update_guest>
|
321 |
<add_footer>1</add_footer>
|
322 |
<add_business_terms>0</add_business_terms>
|
323 |
<add_revocation>0</add_revocation>
|
324 |
+
<add_revocation_form>0</add_revocation_form>
|
325 |
</shipment_update_guest>
|
326 |
|
327 |
<payment_failed>
|
333 |
<add_footer>0</add_footer>
|
334 |
<add_business_terms>0</add_business_terms>
|
335 |
<add_revocation>0</add_revocation>
|
336 |
+
<add_revocation_form>0</add_revocation_form>
|
337 |
</payment_failed>
|
338 |
|
339 |
<log_clean_warning>
|
345 |
<add_footer>0</add_footer>
|
346 |
<add_business_terms>0</add_business_terms>
|
347 |
<add_revocation>0</add_revocation>
|
348 |
+
<add_revocation_form>0</add_revocation_form>
|
349 |
</log_clean_warning>
|
350 |
|
351 |
<newsletter_subscr_confirm>
|
357 |
<add_footer>1</add_footer>
|
358 |
<add_business_terms>0</add_business_terms>
|
359 |
<add_revocation>0</add_revocation>
|
360 |
+
<add_revocation_form>0</add_revocation_form>
|
361 |
</newsletter_subscr_confirm>
|
362 |
|
363 |
<newsletter_subscr_success>
|
369 |
<add_footer>1</add_footer>
|
370 |
<add_business_terms>0</add_business_terms>
|
371 |
<add_revocation>0</add_revocation>
|
372 |
+
<add_revocation_form>0</add_revocation_form>
|
373 |
</newsletter_subscr_success>
|
374 |
|
375 |
<newsletter_unsub_success>
|
381 |
<add_footer>1</add_footer>
|
382 |
<add_business_terms>0</add_business_terms>
|
383 |
<add_revocation>0</add_revocation>
|
384 |
+
<add_revocation_form>0</add_revocation_form>
|
385 |
</newsletter_unsub_success>
|
386 |
|
387 |
<wishlist_share>
|
393 |
<add_footer>0</add_footer>
|
394 |
<add_business_terms>0</add_business_terms>
|
395 |
<add_revocation>0</add_revocation>
|
396 |
+
<add_revocation_form>0</add_revocation_form>
|
397 |
</wishlist_share>
|
398 |
|
399 |
<product_share>
|
405 |
<add_footer>1</add_footer>
|
406 |
<add_business_terms>0</add_business_terms>
|
407 |
<add_revocation>0</add_revocation>
|
408 |
+
<add_revocation_form>0</add_revocation_form>
|
409 |
</product_share>
|
410 |
|
411 |
<contact_form>
|
417 |
<add_footer>0</add_footer>
|
418 |
<add_business_terms>0</add_business_terms>
|
419 |
<add_revocation>0</add_revocation>
|
420 |
+
<add_revocation_form>0</add_revocation_form>
|
421 |
</contact_form>
|
422 |
|
423 |
<sitemap_generate_warning>
|
429 |
<add_footer>0</add_footer>
|
430 |
<add_business_terms>0</add_business_terms>
|
431 |
<add_revocation>0</add_revocation>
|
432 |
+
<add_revocation_form>0</add_revocation_form>
|
433 |
</sitemap_generate_warning>
|
434 |
|
435 |
<product_stock_alert>
|
441 |
<add_footer>0</add_footer>
|
442 |
<add_business_terms>0</add_business_terms>
|
443 |
<add_revocation>0</add_revocation>
|
444 |
+
<add_revocation_form>0</add_revocation_form>
|
445 |
</product_stock_alert>
|
446 |
|
447 |
<product_price_alert>
|
453 |
<add_footer>0</add_footer>
|
454 |
<add_business_terms>0</add_business_terms>
|
455 |
<add_revocation>0</add_revocation>
|
456 |
+
<add_revocation_form>0</add_revocation_form>
|
457 |
</product_price_alert>
|
458 |
|
459 |
<product_alert_cron_error>
|
465 |
<add_footer>0</add_footer>
|
466 |
<add_business_terms>0</add_business_terms>
|
467 |
<add_revocation>0</add_revocation>
|
468 |
+
<add_revocation_form>0</add_revocation_form>
|
469 |
</product_alert_cron_error>
|
470 |
|
471 |
<enterprise_invitation>
|
477 |
<add_footer>0</add_footer>
|
478 |
<add_business_terms>0</add_business_terms>
|
479 |
<add_revocation>0</add_revocation>
|
480 |
+
<add_revocation_form>0</add_revocation_form>
|
481 |
</enterprise_invitation>
|
482 |
|
483 |
<token>
|
489 |
<add_footer>0</add_footer>
|
490 |
<add_business_terms>0</add_business_terms>
|
491 |
<add_revocation>0</add_revocation>
|
492 |
+
<add_revocation_form>0</add_revocation_form>
|
493 |
</token>
|
494 |
</default>
|
495 |
</emails>
|
524 |
</tr>
|
525 |
]]>
|
526 |
</revocation>
|
527 |
+
<revocation_form>
|
528 |
+
<![CDATA[
|
529 |
+
<tr><td style="border-bottom:2px solid #eee;"> </td></tr>
|
530 |
+
<tr>
|
531 |
+
<td style="font:9px/1em Verdana, Arial, Helvetica, sans-serif;">
|
532 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
533 |
+
</td>
|
534 |
+
</tr>
|
535 |
+
]]>
|
536 |
+
</revocation_form>
|
537 |
</default>
|
538 |
</email_footers>
|
539 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/ru/tax.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
app/code/community/FireGento/MageSetup/etc/system.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
@@ -161,6 +162,14 @@
|
|
161 |
<show_in_website>1</show_in_website>
|
162 |
<show_in_store>1</show_in_store>
|
163 |
</telephone>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
164 |
<fax translate="label">
|
165 |
<label>Fax</label>
|
166 |
<frontend_type>text</frontend_type>
|
@@ -368,6 +377,16 @@
|
|
368 |
<groups>
|
369 |
<options>
|
370 |
<fields>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
371 |
<display_additional_information translate="label,comment" module="magesetup">
|
372 |
<label>Display Additional Information</label>
|
373 |
<comment>Display content from text field below at the checkout confirm page directly above
|
@@ -453,7 +472,7 @@
|
|
453 |
<shipping_tax_on_product_tax translate="label,comment" module="magesetup">
|
454 |
<label>Dynamic Shipping Tax Class Calculation</label>
|
455 |
<comment>
|
456 |
-
<![CDATA[
|
457 |
<frontend_type>select</frontend_type>
|
458 |
<source_model>magesetup/source_tax_dynamicType</source_model>
|
459 |
<sort_order>11</sort_order>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
162 |
<show_in_website>1</show_in_website>
|
163 |
<show_in_store>1</show_in_store>
|
164 |
</telephone>
|
165 |
+
<telephone_additional translate="label">
|
166 |
+
<label>Supplementary Information for Telephone</label>
|
167 |
+
<frontend_type>text</frontend_type>
|
168 |
+
<sort_order>65</sort_order>
|
169 |
+
<show_in_default>1</show_in_default>
|
170 |
+
<show_in_website>1</show_in_website>
|
171 |
+
<show_in_store>1</show_in_store>
|
172 |
+
</telephone_additional>
|
173 |
<fax translate="label">
|
174 |
<label>Fax</label>
|
175 |
<frontend_type>text</frontend_type>
|
377 |
<groups>
|
378 |
<options>
|
379 |
<fields>
|
380 |
+
<default_revocation_product_type translate="label">
|
381 |
+
<label>Default Revocation Product Type (for extra checkout agreements)</label>
|
382 |
+
<comment>Display extra checkout agreements for Digital Goods and Services</comment>
|
383 |
+
<frontend_type>select</frontend_type>
|
384 |
+
<source_model>magesetup/source_revocationProductType</source_model>
|
385 |
+
<sort_order>490</sort_order>
|
386 |
+
<show_in_default>1</show_in_default>
|
387 |
+
<show_in_website>1</show_in_website>
|
388 |
+
<show_in_store>1</show_in_store>
|
389 |
+
</default_revocation_product_type>
|
390 |
<display_additional_information translate="label,comment" module="magesetup">
|
391 |
<label>Display Additional Information</label>
|
392 |
<comment>Display content from text field below at the checkout confirm page directly above
|
472 |
<shipping_tax_on_product_tax translate="label,comment" module="magesetup">
|
473 |
<label>Dynamic Shipping Tax Class Calculation</label>
|
474 |
<comment>
|
475 |
+
<![CDATA[<b>ATTENTION:</b> This setting overwrites the "Tax Class for Shipping" setting above!]]></comment>
|
476 |
<frontend_type>select</frontend_type>
|
477 |
<source_model>magesetup/source_tax_dynamicType</source_model>
|
478 |
<sort_order>11</sort_order>
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-install-0.5.0.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.0.5
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.0.5
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.0.7
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.0.7
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 1.0.7
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 1.0.7
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.4-1.2.0.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.0-1.2.1.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php
CHANGED
@@ -15,7 +15,7 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
* @since 0.1.0
|
21 |
*/
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
* @since 0.1.0
|
21 |
*/
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.2-1.2.3.php
CHANGED
@@ -15,9 +15,9 @@
|
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
-
* @version
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
15 |
* @category FireGento
|
16 |
* @package FireGento_MageSetup
|
17 |
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
* @since 0.1.0
|
22 |
*/
|
23 |
/**
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-2.1.1-2.2.0.php
ADDED
@@ -0,0 +1,81 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 0.1.0
|
22 |
+
*/
|
23 |
+
/**
|
24 |
+
* Setup script; Adds the revocation_product_type attribute for products
|
25 |
+
*
|
26 |
+
* @category FireGento
|
27 |
+
* @package FireGento_MageSetup
|
28 |
+
* @author FireGento Team <team@firegento.com>
|
29 |
+
*/
|
30 |
+
|
31 |
+
/** @var $installer Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
|
32 |
+
$installer = $this;
|
33 |
+
$installer->startSetup();
|
34 |
+
|
35 |
+
$installer->addAttribute(
|
36 |
+
'catalog_product',
|
37 |
+
'revocation_product_type',
|
38 |
+
array(
|
39 |
+
'label' => 'Revocation Product Type (for extra checkout agreements)',
|
40 |
+
'input' => 'select',
|
41 |
+
'source' => 'magesetup/source_revocationProductType',
|
42 |
+
'required' => false,
|
43 |
+
'user_defined' => true,
|
44 |
+
'default' => '',
|
45 |
+
'group' => 'Prices',
|
46 |
+
'global' => Mage_Catalog_Model_Resource_Eav_Attribute::SCOPE_STORE,
|
47 |
+
'visible' => true,
|
48 |
+
'filterable' => false,
|
49 |
+
'searchable' => false,
|
50 |
+
'comparable' => false,
|
51 |
+
'visible_on_front' => false,
|
52 |
+
'visible_in_advanced_search' => false,
|
53 |
+
'used_in_product_listing' => false,
|
54 |
+
'is_html_allowed_on_front' => false,
|
55 |
+
'sort_order' => 200,
|
56 |
+
)
|
57 |
+
);
|
58 |
+
|
59 |
+
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
60 |
+
|
61 |
+
$installer->run("
|
62 |
+
ALTER TABLE `{$installer->getTable('checkout/agreement')}`
|
63 |
+
ADD `revocation_product_type` VARCHAR( 255 ) NOT NULL COMMENT 'Revocation Product Type'
|
64 |
+
");
|
65 |
+
|
66 |
+
} else {
|
67 |
+
|
68 |
+
$installer->getConnection()->addColumn(
|
69 |
+
$installer->getTable('checkout/agreement'),
|
70 |
+
'revocation_product_type',
|
71 |
+
array(
|
72 |
+
'type' => Varien_Db_Ddl_Table::TYPE_TEXT,
|
73 |
+
'length' => 255,
|
74 |
+
'nullable' => false,
|
75 |
+
'default' => '',
|
76 |
+
'comment' => 'Revocation Product Type'
|
77 |
+
)
|
78 |
+
);
|
79 |
+
}
|
80 |
+
|
81 |
+
$installer->endSetup();
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-2.2.0-2.2.1.php
ADDED
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* PHP version 5
|
14 |
+
*
|
15 |
+
* @category FireGento
|
16 |
+
* @package FireGento_MageSetup
|
17 |
+
* @author FireGento Team <team@firegento.com>
|
18 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
* @version 2.2.1
|
21 |
+
* @since 0.1.0
|
22 |
+
*/
|
23 |
+
/**
|
24 |
+
* Setup script; Adds the revocation_product_type attribute for products
|
25 |
+
*
|
26 |
+
* @category FireGento
|
27 |
+
* @package FireGento_MageSetup
|
28 |
+
* @author FireGento Team <team@firegento.com>
|
29 |
+
*/
|
30 |
+
|
31 |
+
/** @var $installer Mage_Catalog_Model_Resource_Eav_Mysql4_Setup */
|
32 |
+
$installer = $this;
|
33 |
+
$installer->startSetup();
|
34 |
+
|
35 |
+
$bind = array('value' => 1);
|
36 |
+
$where = array(
|
37 |
+
'path = ?' => FireGento_MageSetup_Model_Tax_Config::XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX,
|
38 |
+
'value = ?' => '2'
|
39 |
+
);
|
40 |
+
|
41 |
+
$result = $installer->getConnection()->update(
|
42 |
+
$installer->getTable('core/config_data'),
|
43 |
+
$bind,
|
44 |
+
$where
|
45 |
+
);
|
46 |
+
|
47 |
+
$installer->endSetup();
|
app/design/adminhtml/default/default/layout/magesetup.xml
CHANGED
@@ -14,7 +14,7 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
*/
|
20 |
-->
|
@@ -24,14 +24,9 @@
|
|
24 |
<block type="magesetup/adminhtml_notifications" name="magesetup_notifications" template="magesetup/notifications.phtml" before="-" />
|
25 |
</reference>
|
26 |
</default>
|
27 |
-
<
|
28 |
<reference name="content">
|
29 |
<block type="magesetup/adminhtml_magesetup" name="magesetup.index" template="magesetup/form.phtml"/>
|
30 |
</reference>
|
31 |
-
</
|
32 |
-
<adminhtml_magesetup_extensions>
|
33 |
-
<reference name="content">
|
34 |
-
<block type="adminhtml/template" name="magesetup.extensions" template="magesetup/extensions.phtml"/>
|
35 |
-
</reference>
|
36 |
-
</adminhtml_magesetup_extensions>
|
37 |
</layout>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
*/
|
20 |
-->
|
24 |
<block type="magesetup/adminhtml_notifications" name="magesetup_notifications" template="magesetup/notifications.phtml" before="-" />
|
25 |
</reference>
|
26 |
</default>
|
27 |
+
<magesetup_magesetup_index>
|
28 |
<reference name="content">
|
29 |
<block type="magesetup/adminhtml_magesetup" name="magesetup.index" template="magesetup/form.phtml"/>
|
30 |
</reference>
|
31 |
+
</magesetup_magesetup_index>
|
|
|
|
|
|
|
|
|
|
|
32 |
</layout>
|
app/design/adminhtml/default/default/template/magesetup/extensions.phtml
DELETED
@@ -1,144 +0,0 @@
|
|
1 |
-
<?php
|
2 |
-
/**
|
3 |
-
* This file is part of a FireGento e.V. module.
|
4 |
-
*
|
5 |
-
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
-
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
-
* published by the Free Software Foundation.
|
8 |
-
*
|
9 |
-
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
-
*
|
13 |
-
* @category FireGento
|
14 |
-
* @package FireGento_MageSetup
|
15 |
-
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
-
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
-
*/
|
19 |
-
?>
|
20 |
-
<?php
|
21 |
-
/**
|
22 |
-
* @var $this Mage_Adminhtml_Block_Template
|
23 |
-
*/
|
24 |
-
?>
|
25 |
-
<div class="content-header">
|
26 |
-
<h3><?php echo $this->__('Recommended Extensions') ?></h3>
|
27 |
-
<p class="form-buttons"></p>
|
28 |
-
</div>
|
29 |
-
|
30 |
-
<div class="entry-edit">
|
31 |
-
<div class="entry-edit-head">
|
32 |
-
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Recommended Extensions') ?></h4>
|
33 |
-
<div class="form-buttons"></div>
|
34 |
-
</div>
|
35 |
-
<div class="fieldset fieldset-wide" id="group_fields7">
|
36 |
-
<div class="hor-scroll">
|
37 |
-
<table cellspacing="0" class="form-list">
|
38 |
-
<tbody>
|
39 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('German Language Pack') ?></strong></td></tr>
|
40 |
-
<tr>
|
41 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
42 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2317/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2317/</a></td>
|
43 |
-
</tr>
|
44 |
-
<tr>
|
45 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
46 |
-
<td class="value">http://connect20.magentocommerce.com/community/Locale_Mage_community_de_DE</td>
|
47 |
-
</tr>
|
48 |
-
<tr><td colspan="2"> </td></tr>
|
49 |
-
|
50 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('FireGento PDF') ?></strong></td></tr>
|
51 |
-
<tr>
|
52 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
53 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/pdf-9999.html" target="_blank">http://www.magentocommerce.com/magento-connect/pdf-9999.html</a></td>
|
54 |
-
</tr>
|
55 |
-
<tr>
|
56 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
57 |
-
<td class="value">http://connect20.magentocommerce.com/community/FireGento_Pdf</td>
|
58 |
-
</tr>
|
59 |
-
<tr><td colspan="2"> </td></tr>
|
60 |
-
|
61 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('Base Price') ?></strong></td></tr>
|
62 |
-
<tr>
|
63 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
64 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2897/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2897/</a></td>
|
65 |
-
</tr>
|
66 |
-
<tr>
|
67 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
68 |
-
<td class="value">http://connect20.magentocommerce.com/community/DerModPro_BasePrice</td>
|
69 |
-
</tr>
|
70 |
-
<tr><td colspan="2"> </td></tr>
|
71 |
-
|
72 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('Newsletter Unsubscription for Guests, Double Opt In for registered Customers') ?></strong></td></tr>
|
73 |
-
<tr>
|
74 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
75 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/15534/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/15534/</a></td>
|
76 |
-
</tr>
|
77 |
-
<tr>
|
78 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
79 |
-
<td class="value">http://connect20.magentocommerce.com/community/Loewenstark_Newsletter</td>
|
80 |
-
</tr>
|
81 |
-
<tr><td colspan="2"> </td></tr>
|
82 |
-
</tbody>
|
83 |
-
</table>
|
84 |
-
</div>
|
85 |
-
</div>
|
86 |
-
</div>
|
87 |
-
|
88 |
-
<div class="entry-edit">
|
89 |
-
<div class="entry-edit-head">
|
90 |
-
<h4 class="icon-head head-edit-form fieldset-legend"><?php echo $this->__('Popular Payment Methods') ?></h4>
|
91 |
-
<div class="form-buttons"></div>
|
92 |
-
</div>
|
93 |
-
<div class="fieldset fieldset-wide" id="group_fields7">
|
94 |
-
<div class="hor-scroll">
|
95 |
-
<table cellspacing="0" class="form-list">
|
96 |
-
<tbody>
|
97 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('Debit Payment') ?></strong></td></tr>
|
98 |
-
<tr>
|
99 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
100 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2606/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2606/</a></td>
|
101 |
-
</tr>
|
102 |
-
<tr>
|
103 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
104 |
-
<td class="value">http://connect20.magentocommerce.com/community/DebitPayment</td>
|
105 |
-
</tr>
|
106 |
-
<tr><td colspan="2"> </td></tr>
|
107 |
-
|
108 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('Cash on Delivery') ?></strong></td></tr>
|
109 |
-
<tr>
|
110 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
111 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2360/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2360/</a></td>
|
112 |
-
</tr>
|
113 |
-
<tr>
|
114 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
115 |
-
<td class="value">http://connect20.magentocommerce.com/community/CashOnDelivery</td>
|
116 |
-
</tr>
|
117 |
-
<tr><td colspan="2"> </td></tr>
|
118 |
-
|
119 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('Bank Payment') ?></strong></td></tr>
|
120 |
-
<tr>
|
121 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
122 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2298/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/2298/</a></td>
|
123 |
-
</tr>
|
124 |
-
<tr>
|
125 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
126 |
-
<td class="value">http://connect20.magentocommerce.com/community/BankPayment</td>
|
127 |
-
</tr>
|
128 |
-
<tr><td colspan="2"> </td></tr>
|
129 |
-
|
130 |
-
<tr><td class="value" colspan="2"><strong><?php echo $this->__('Invoice Payment') ?></strong></td></tr>
|
131 |
-
<tr>
|
132 |
-
<td class="label"><label for="name"><?php echo $this->__('MagentoConnect') ?></label></td>
|
133 |
-
<td class="value"><a href="http://www.magentocommerce.com/magento-connect/catalog/product/view/id/17239/s/invoice-6810/" target="_blank">http://www.magentocommerce.com/magento-connect/catalog/product/view/id/17239/s/invoice-6810/</a></td>
|
134 |
-
</tr>
|
135 |
-
<tr>
|
136 |
-
<td class="label"><label for="name"><?php echo $this->__('Extension Key') ?></label></td>
|
137 |
-
<td class="value">http://connect20.magentocommerce.com/community/InvoicePayment</td>
|
138 |
-
</tr>
|
139 |
-
<tr><td colspan="2"> </td></tr>
|
140 |
-
</tbody>
|
141 |
-
</table>
|
142 |
-
</div>
|
143 |
-
</div>
|
144 |
-
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/adminhtml/default/default/template/magesetup/form.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -185,7 +185,8 @@
|
|
185 |
<td class="value">
|
186 |
<select name="cms_locale[default]" id="select_cms_locale">
|
187 |
<?php foreach($this->getLocaleOptionsForCmsContent() as $_option): ?>
|
188 |
-
|
|
|
189 |
<?php endforeach; ?>
|
190 |
</select>
|
191 |
</td>
|
@@ -248,7 +249,8 @@
|
|
248 |
<td class="value">
|
249 |
<select name="email_locale[default]" id="select_email_locale">
|
250 |
<?php foreach($this->getLocaleOptionsForEmailTemplates() as $_option): ?>
|
251 |
-
|
|
|
252 |
<?php endforeach; ?>
|
253 |
</select>
|
254 |
</td>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
185 |
<td class="value">
|
186 |
<select name="cms_locale[default]" id="select_cms_locale">
|
187 |
<?php foreach($this->getLocaleOptionsForCmsContent() as $_option): ?>
|
188 |
+
<?php $isSelected = ($_option['value'] == Mage::app()->getLocale()->getLocaleCode()) ?>
|
189 |
+
<option value="<?php echo $_option['value'] ?>"<?php if ($isSelected): ?> selected="selected"<?php endif ?>><?php echo $_option['label']; ?></option>
|
190 |
<?php endforeach; ?>
|
191 |
</select>
|
192 |
</td>
|
249 |
<td class="value">
|
250 |
<select name="email_locale[default]" id="select_email_locale">
|
251 |
<?php foreach($this->getLocaleOptionsForEmailTemplates() as $_option): ?>
|
252 |
+
<?php $isSelected = ($_option['value'] == Mage::app()->getLocale()->getLocaleCode()) ?>
|
253 |
+
<option value="<?php echo $_option['value'] ?>"<?php if ($isSelected): ?> selected="selected"<?php endif ?>><?php echo $_option['label']; ?></option>
|
254 |
<?php endforeach; ?>
|
255 |
</select>
|
256 |
</td>
|
app/design/adminhtml/default/default/template/magesetup/notifications.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/layout/magesetup.xml
CHANGED
@@ -14,7 +14,7 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
*/
|
20 |
-->
|
@@ -304,6 +304,20 @@
|
|
304 |
</tag_customer_view>
|
305 |
|
306 |
<default>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
307 |
<reference name="wishlist_sidebar">
|
308 |
<action method="addPriceBlockType">
|
309 |
<type>simple</type>
|
@@ -405,14 +419,6 @@
|
|
405 |
</reference>
|
406 |
</catalog_product_view>
|
407 |
|
408 |
-
<reference name="product.clone_prices">
|
409 |
-
<action method="addPriceBlockType">
|
410 |
-
<type>bundle</type>
|
411 |
-
<block>magesetup/bundle_catalog_product_price</block>
|
412 |
-
<template>bundle/catalog/product/view/price.phtml</template>
|
413 |
-
</action>
|
414 |
-
</reference>
|
415 |
-
|
416 |
<PRODUCT_TYPE_simple>
|
417 |
<reference name="product.info.simple.extra">
|
418 |
<block type="catalog/product_view_type_simple" name="magesetup.deliverytime"
|
@@ -448,6 +454,23 @@
|
|
448 |
</reference>
|
449 |
</PRODUCT_TYPE_downloadable>
|
450 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
451 |
<!--
|
452 |
Changes for Button Loesung
|
453 |
-->
|
@@ -483,6 +506,11 @@
|
|
483 |
<action method="unsetChild">
|
484 |
<alias>agreements</alias>
|
485 |
</action>
|
|
|
|
|
|
|
|
|
|
|
486 |
</reference>
|
487 |
<reference name="checkout.onepage.review.info.items.before">
|
488 |
<block type="magesetup/checkout_agreements" name="magesetup.checkout.agreements" as="agreements"
|
@@ -494,6 +522,26 @@
|
|
494 |
</reference>
|
495 |
</checkout_onepage_review>
|
496 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
497 |
<checkout_multishipping_overview>
|
498 |
<reference name="head">
|
499 |
<action method="addCss">
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
*/
|
20 |
-->
|
304 |
</tag_customer_view>
|
305 |
|
306 |
<default>
|
307 |
+
<reference name="head">
|
308 |
+
<action method="addCss">
|
309 |
+
<stylesheet>css/magesetup/default.css</stylesheet>
|
310 |
+
</action>
|
311 |
+
</reference>
|
312 |
+
<reference name="footer">
|
313 |
+
<block type="core/template" name="cms_footer_links" before="footer_links" after="cms_footer_links_sm" template="magesetup/footer/links.phtml">
|
314 |
+
<!--
|
315 |
+
The content of this block is taken from the database by its block_id.
|
316 |
+
You can manage it in admin CMS -> Static Blocks
|
317 |
+
-->
|
318 |
+
<action method="setBlockId"><block_id>footer_links</block_id></action>
|
319 |
+
</block>
|
320 |
+
</reference>
|
321 |
<reference name="wishlist_sidebar">
|
322 |
<action method="addPriceBlockType">
|
323 |
<type>simple</type>
|
419 |
</reference>
|
420 |
</catalog_product_view>
|
421 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
422 |
<PRODUCT_TYPE_simple>
|
423 |
<reference name="product.info.simple.extra">
|
424 |
<block type="catalog/product_view_type_simple" name="magesetup.deliverytime"
|
454 |
</reference>
|
455 |
</PRODUCT_TYPE_downloadable>
|
456 |
|
457 |
+
<PRODUCT_TYPE_bundle>
|
458 |
+
<reference name="product.clone_prices">
|
459 |
+
<action method="addPriceBlockType">
|
460 |
+
<type>bundle</type>
|
461 |
+
<block>magesetup/bundle_catalog_product_price</block>
|
462 |
+
<template>bundle/catalog/product/view/price.phtml</template>
|
463 |
+
</action>
|
464 |
+
</reference>
|
465 |
+
<reference name="product.info">
|
466 |
+
<action method="addPriceBlockType">
|
467 |
+
<type>bundle</type>
|
468 |
+
<block>magesetup/bundle_catalog_product_price</block>
|
469 |
+
<template>bundle/catalog/product/price.phtml</template>
|
470 |
+
</action>
|
471 |
+
</reference>
|
472 |
+
</PRODUCT_TYPE_bundle>
|
473 |
+
|
474 |
<!--
|
475 |
Changes for Button Loesung
|
476 |
-->
|
506 |
<action method="unsetChild">
|
507 |
<alias>agreements</alias>
|
508 |
</action>
|
509 |
+
<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
510 |
+
<action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
511 |
+
<action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
512 |
+
<action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
513 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
514 |
</reference>
|
515 |
<reference name="checkout.onepage.review.info.items.before">
|
516 |
<block type="magesetup/checkout_agreements" name="magesetup.checkout.agreements" as="agreements"
|
522 |
</reference>
|
523 |
</checkout_onepage_review>
|
524 |
|
525 |
+
<paypal_express_review>
|
526 |
+
<reference name="paypal.express.review.details">
|
527 |
+
<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
528 |
+
<action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
529 |
+
<action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
530 |
+
<action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
531 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
532 |
+
</reference>
|
533 |
+
</paypal_express_review>
|
534 |
+
|
535 |
+
<paypal_express_review_details>
|
536 |
+
<reference name="paypal.express.review.details">
|
537 |
+
<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
538 |
+
<action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
539 |
+
<action method="addItemRender"><type>configurable</type><block>checkout/cart_item_renderer_configurable</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
540 |
+
<action method="addItemRender"><type>bundle</type><block>bundle/checkout_cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
541 |
+
<action method="addItemRender"><type>downloadable</type><block>downloadable/checkout_cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
542 |
+
</reference>
|
543 |
+
</paypal_express_review_details>
|
544 |
+
|
545 |
<checkout_multishipping_overview>
|
546 |
<reference name="head">
|
547 |
<action method="addCss">
|
app/design/frontend/base/default/template/magesetup/checkout/additional.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -24,6 +24,8 @@
|
|
24 |
?>
|
25 |
<?php if ($additional = $this->getCheckoutAdditionalInformation()): ?>
|
26 |
<div class="additional-information">
|
27 |
-
|
|
|
|
|
28 |
</div>
|
29 |
<?php endif; ?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
24 |
?>
|
25 |
<?php if ($additional = $this->getCheckoutAdditionalInformation()): ?>
|
26 |
<div class="additional-information">
|
27 |
+
<div class="info">
|
28 |
+
<?php echo $additional ?>
|
29 |
+
</div>
|
30 |
</div>
|
31 |
<?php endif; ?>
|
app/design/frontend/base/default/template/magesetup/checkout/multishipping/agreements.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/template/magesetup/checkout/multishipping/overview.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -28,6 +28,7 @@
|
|
28 |
</div>
|
29 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
30 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" onsubmit="return showLoader();">
|
|
|
31 |
<?php echo $this->getChildHtml('agreements') ?>
|
32 |
|
33 |
<div class="col2-set">
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
28 |
</div>
|
29 |
<?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
|
30 |
<form action="<?php echo $this->getPostActionUrl() ?>" method="post" onsubmit="return showLoader();">
|
31 |
+
<?php echo $this->getBlockHtml('formkey'); ?>
|
32 |
<?php echo $this->getChildHtml('agreements') ?>
|
33 |
|
34 |
<div class="col2-set">
|
app/design/frontend/base/default/template/magesetup/checkout/onepage/agreements.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -38,7 +38,9 @@ $agreements = $this->getAgreements();
|
|
38 |
<input type="checkbox" id="agreement-<?php echo $agreement->getId()?>" name="agreement[<?php echo $agreement->getId()?>]" value="1" title="<?php echo $this->htmlEscape($agreement->getCheckboxText()) ?>" class="checkbox" />
|
39 |
<?php endif; ?>
|
40 |
<label <?php if($agreement->getIsRequired()): ?>for="agreement-<?php echo $agreement->getId()?>"<?php endif; ?>><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $this->escapeHtml($agreement->getCheckboxText()) ?></label>
|
41 |
-
|
|
|
|
|
42 |
</p>
|
43 |
</li>
|
44 |
<?php endforeach ?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
38 |
<input type="checkbox" id="agreement-<?php echo $agreement->getId()?>" name="agreement[<?php echo $agreement->getId()?>]" value="1" title="<?php echo $this->htmlEscape($agreement->getCheckboxText()) ?>" class="checkbox" />
|
39 |
<?php endif; ?>
|
40 |
<label <?php if($agreement->getIsRequired()): ?>for="agreement-<?php echo $agreement->getId()?>"<?php endif; ?>><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $this->escapeHtml($agreement->getCheckboxText()) ?></label>
|
41 |
+
<?php if (trim($agreement->getContent())): ?>
|
42 |
+
<a href="<?php echo $helper->getAgreementUrl($agreement) ?>" onclick="window.open(this.href, '', 'width=600,height=600,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes').focus(); return false;"><?php echo $this->__('[Show]') ?></a>
|
43 |
+
<?php endif ?>
|
44 |
</p>
|
45 |
</li>
|
46 |
<?php endforeach ?>
|
app/design/frontend/base/default/template/magesetup/checkout/onepage/review/item.phtml
ADDED
@@ -0,0 +1,242 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* This file is part of a FireGento e.V. module.
|
4 |
+
*
|
5 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
6 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
7 |
+
* published by the Free Software Foundation.
|
8 |
+
*
|
9 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
10 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
11 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
12 |
+
*
|
13 |
+
* @category FireGento
|
14 |
+
* @package FireGento_MageSetup
|
15 |
+
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
+
*/
|
19 |
+
?>
|
20 |
+
<?php
|
21 |
+
/**
|
22 |
+
* @var $this Mage_Checkout_Block_Cart_Item_Renderer
|
23 |
+
*/
|
24 |
+
?>
|
25 |
+
<?php $_item = $this->getItem()?>
|
26 |
+
<tr>
|
27 |
+
<td>
|
28 |
+
<h3 class="product-name">
|
29 |
+
<?php if ($this->getProductUrl()): ?><a href="<?php echo $this->getProductUrl() ?>"><?php endif ?>
|
30 |
+
<?php echo $this->escapeHtml($this->getProductName()) ?>
|
31 |
+
<?php if ($this->getProductUrl()): ?></a><?php endif ?>
|
32 |
+
</h3>
|
33 |
+
<?php if ($_options = $this->getOptionList()):?>
|
34 |
+
<dl class="item-options">
|
35 |
+
<?php foreach ($_options as $_option) : ?>
|
36 |
+
<?php $_formatedOptionValue = $this->getFormatedOptionValue($_option) ?>
|
37 |
+
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
|
38 |
+
<dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="truncated"<?php endif; ?>><?php echo $_formatedOptionValue['value'] ?>
|
39 |
+
<?php if (isset($_formatedOptionValue['full_view'])): ?>
|
40 |
+
<div class="truncated_full_value">
|
41 |
+
<dl class="item-options">
|
42 |
+
<dt><?php echo $this->escapeHtml($_option['label']) ?></dt>
|
43 |
+
<dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
|
44 |
+
</dl>
|
45 |
+
</div>
|
46 |
+
<?php endif; ?>
|
47 |
+
</dd>
|
48 |
+
<?php endforeach; ?>
|
49 |
+
</dl>
|
50 |
+
<?php endif;?>
|
51 |
+
<?php if ($addtInfoBlock = $this->getProductAdditionalInformationBlock()):?>
|
52 |
+
<?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
|
53 |
+
<?php endif;?>
|
54 |
+
</td>
|
55 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
56 |
+
<td class="a-right">
|
57 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
58 |
+
<span class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
59 |
+
<?php else: ?>
|
60 |
+
<span class="cart-price">
|
61 |
+
<?php endif; ?>
|
62 |
+
|
63 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
64 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?>
|
65 |
+
<?php else: ?>
|
66 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()) ?>
|
67 |
+
<?php endif; ?>
|
68 |
+
|
69 |
+
</span>
|
70 |
+
|
71 |
+
|
72 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
73 |
+
|
74 |
+
<div class="cart-tax-info" id="eunit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
|
75 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
76 |
+
<small>
|
77 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
78 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
79 |
+
<?php endforeach; ?>
|
80 |
+
</small>
|
81 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
82 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
83 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
84 |
+
<?php endforeach; ?>
|
85 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
86 |
+
<small>
|
87 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
88 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
89 |
+
<?php endforeach; ?>
|
90 |
+
</small>
|
91 |
+
<?php endif; ?>
|
92 |
+
</div>
|
93 |
+
|
94 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
95 |
+
<div class="cart-tax-total" onclick="taxToggle('eunit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
96 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getCalculationPrice()+$_item->getWeeeTaxAppliedAmount()+$_item->getWeeeTaxDisposition()); ?></span>
|
97 |
+
</div>
|
98 |
+
<?php endif; ?>
|
99 |
+
<?php endif; ?>
|
100 |
+
</td>
|
101 |
+
<?php endif; ?>
|
102 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
103 |
+
<td>
|
104 |
+
<?php $_incl = $this->helper('checkout')->getPriceInclTax($_item); ?>
|
105 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
106 |
+
<span class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
107 |
+
<?php else: ?>
|
108 |
+
<span class="cart-price">
|
109 |
+
<?php endif; ?>
|
110 |
+
|
111 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
112 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?>
|
113 |
+
<?php else: ?>
|
114 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxDisposition()) ?>
|
115 |
+
<?php endif; ?>
|
116 |
+
|
117 |
+
</span>
|
118 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
119 |
+
|
120 |
+
<div class="cart-tax-info" id="unit-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
|
121 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
122 |
+
<small>
|
123 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
124 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount'],true,true); ?></span><br />
|
125 |
+
<?php endforeach; ?>
|
126 |
+
</small>
|
127 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
128 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
129 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></small></span><br />
|
130 |
+
<?php endforeach; ?>
|
131 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
132 |
+
<small>
|
133 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
134 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['amount_incl_tax'],true,true); ?></span><br />
|
135 |
+
<?php endforeach; ?>
|
136 |
+
</small>
|
137 |
+
<?php endif; ?>
|
138 |
+
</div>
|
139 |
+
|
140 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
141 |
+
<div class="cart-tax-total" onclick="taxToggle('unit-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
142 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedAmount()); ?></span>
|
143 |
+
</div>
|
144 |
+
<?php endif; ?>
|
145 |
+
<?php endif; ?>
|
146 |
+
</td>
|
147 |
+
<?php endif; ?>
|
148 |
+
<td class="a-center"><?php echo $_item->getQty() ?></td>
|
149 |
+
<?php if ($this->helper('tax')->displayCartPriceExclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
150 |
+
<td class="a-right">
|
151 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
152 |
+
<span class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
153 |
+
<?php else: ?>
|
154 |
+
<span class="cart-price">
|
155 |
+
<?php endif; ?>
|
156 |
+
|
157 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
158 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?>
|
159 |
+
<?php else: ?>
|
160 |
+
<?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()) ?>
|
161 |
+
<?php endif; ?>
|
162 |
+
|
163 |
+
</span>
|
164 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
165 |
+
|
166 |
+
<div class="cart-tax-info" id="esubtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
|
167 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
168 |
+
<small>
|
169 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
170 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
171 |
+
<?php endforeach; ?>
|
172 |
+
</small>
|
173 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
174 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
175 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
176 |
+
<?php endforeach; ?>
|
177 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
178 |
+
<small>
|
179 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
180 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
181 |
+
<?php endforeach; ?>
|
182 |
+
</small>
|
183 |
+
<?php endif; ?>
|
184 |
+
</div>
|
185 |
+
|
186 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
187 |
+
<div class="cart-tax-total" onclick="taxToggle('esubtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
188 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_item->getRowTotal()+$_item->getWeeeTaxAppliedRowAmount()+$_item->getWeeeTaxRowDisposition()); ?></span>
|
189 |
+
</div>
|
190 |
+
<?php endif; ?>
|
191 |
+
<?php endif; ?>
|
192 |
+
</td>
|
193 |
+
<?php endif; ?>
|
194 |
+
<?php if ($this->helper('tax')->displayCartPriceInclTax() || $this->helper('tax')->displayCartBothPrices()): ?>
|
195 |
+
<td>
|
196 |
+
<?php $_incl = $this->helper('checkout')->getSubtotalInclTax($_item); ?>
|
197 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
198 |
+
<span class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
199 |
+
<?php else: ?>
|
200 |
+
<span class="cart-price">
|
201 |
+
<?php endif; ?>
|
202 |
+
|
203 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, array(0, 1, 4), 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
204 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?>
|
205 |
+
<?php else: ?>
|
206 |
+
<?php echo $this->helper('checkout')->formatPrice($_incl-$_item->getWeeeTaxRowDisposition()) ?>
|
207 |
+
<?php endif; ?>
|
208 |
+
|
209 |
+
</span>
|
210 |
+
|
211 |
+
|
212 |
+
<?php if (Mage::helper('weee')->getApplied($_item)): ?>
|
213 |
+
|
214 |
+
<div class="cart-tax-info" id="subtotal-item-tax-details<?php echo $_item->getId(); ?>" style="display:none;">
|
215 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 1, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
216 |
+
<small>
|
217 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
218 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount'],true,true); ?></span><br />
|
219 |
+
<?php endforeach; ?>
|
220 |
+
</small>
|
221 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
222 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
223 |
+
<span class="nobr"><small><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></small></span><br />
|
224 |
+
<?php endforeach; ?>
|
225 |
+
<?php elseif (Mage::helper('weee')->typeOfDisplay($_item, 4, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
226 |
+
<small>
|
227 |
+
<?php foreach (Mage::helper('weee')->getApplied($_item) as $tax): ?>
|
228 |
+
<span class="nobr"><?php echo $tax['title']; ?>: <?php echo Mage::helper('checkout')->formatPrice($tax['row_amount_incl_tax'],true,true); ?></span><br />
|
229 |
+
<?php endforeach; ?>
|
230 |
+
</small>
|
231 |
+
<?php endif; ?>
|
232 |
+
</div>
|
233 |
+
|
234 |
+
<?php if (Mage::helper('weee')->typeOfDisplay($_item, 2, 'sales') && $_item->getWeeeTaxAppliedAmount()): ?>
|
235 |
+
<div class="cart-tax-total" onclick="taxToggle('subtotal-item-tax-details<?php echo $_item->getId(); ?>', this, 'cart-tax-total-expanded');">
|
236 |
+
<span class="nobr"><?php echo Mage::helper('weee')->__('Total incl. tax'); ?>:<br /> <?php echo $this->helper('checkout')->formatPrice($_incl+$_item->getWeeeTaxAppliedRowAmount()); ?></span>
|
237 |
+
</div>
|
238 |
+
<?php endif; ?>
|
239 |
+
<?php endif; ?>
|
240 |
+
</td>
|
241 |
+
<?php endif; ?>
|
242 |
+
</tr>
|
app/design/frontend/base/default/template/magesetup/customer/form/tc-confirmation.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/template/magesetup/delivery_time.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/{code/community/FireGento/MageSetup/etc/ru/systemconfig.xml → design/frontend/base/default/template/magesetup/footer/links.phtml}
RENAMED
@@ -1,5 +1,4 @@
|
|
1 |
-
<?
|
2 |
-
<!--
|
3 |
/**
|
4 |
* This file is part of a FireGento e.V. module.
|
5 |
*
|
@@ -14,20 +13,11 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
*/
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
-
|
25 |
-
<default>
|
26 |
-
<customer__create_account__confirm>0</customer__create_account__confirm>
|
27 |
-
<newsletter__subscription__confirm>1</newsletter__subscription__confirm>
|
28 |
-
<catalog__price__display_block_below_price>0</catalog__price__display_block_below_price>
|
29 |
-
</default>
|
30 |
-
</system_config>
|
31 |
-
</magesetup>
|
32 |
-
</default>
|
33 |
-
</config>
|
1 |
+
<?php
|
|
|
2 |
/**
|
3 |
* This file is part of a FireGento e.V. module.
|
4 |
*
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
+
?>
|
20 |
+
<?php
|
21 |
+
/* @var $this Mage_Core_Block_Template */
|
22 |
+
?>
|
23 |
+
<?php echo $this->getLayout()->createBlock('cms/block')->setBlockId($this->getBlockId())->toHtml() ?>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/design/frontend/base/default/template/magesetup/imprint/address.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/template/magesetup/imprint/bank.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/template/magesetup/imprint/communication.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -23,12 +23,16 @@
|
|
23 |
*/
|
24 |
?>
|
25 |
<?php if (strlen(trim($this->getTelephone()))): ?>
|
26 |
-
<?php echo $this->__('Telephone') ?>: <?php echo $this->getTelephone()
|
|
|
|
|
|
|
|
|
27 |
<?php endif ?>
|
28 |
<?php if (strlen(trim($this->getFax()))): ?>
|
29 |
-
<?php echo $this->__('Fax') ?>: <?php echo $this->getFax() ?><br />
|
30 |
<?php endif ?>
|
31 |
<?php if (strlen(trim($this->getWeb()))): ?>
|
32 |
-
<?php echo $this->__('Web') ?>: <a href="<?php echo $this->getWeb(true) ?>" title="<?php echo $this->getCompanyFirst() ?>"><?php echo $this->getWeb() ?></a><br />
|
33 |
<?php endif ?>
|
34 |
<?php echo $this->__('E-Mail') ?>: <?php echo $this->getEmail(true) ?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
23 |
*/
|
24 |
?>
|
25 |
<?php if (strlen(trim($this->getTelephone()))): ?>
|
26 |
+
<?php echo $this->__('Telephone') ?>: <?php echo $this->getTelephone() ?>
|
27 |
+
<?php if (strlen(trim($this->getTelephoneAdditional()))): ?>
|
28 |
+
(<?php echo $this->getTelephoneAdditional() ?>)
|
29 |
+
<?php endif ?>
|
30 |
+
<br />
|
31 |
<?php endif ?>
|
32 |
<?php if (strlen(trim($this->getFax()))): ?>
|
33 |
+
<?php echo $this->__('Fax') ?>: <?php echo $this->getFax() ?><br />
|
34 |
<?php endif ?>
|
35 |
<?php if (strlen(trim($this->getWeb()))): ?>
|
36 |
+
<?php echo $this->__('Web') ?>: <a href="<?php echo $this->getWeb(true) ?>" title="<?php echo $this->getCompanyFirst() ?>"><?php echo $this->getWeb() ?></a><br />
|
37 |
<?php endif ?>
|
38 |
<?php echo $this->__('E-Mail') ?>: <?php echo $this->getEmail(true) ?>
|
app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -35,13 +35,17 @@
|
|
35 |
|
36 |
<p>
|
37 |
<?php if (strlen(trim($this->getTelephone()))): ?>
|
38 |
-
<?php echo $this->__('Telephone') ?>: <?php echo $this->getTelephone()
|
|
|
|
|
|
|
|
|
39 |
<?php endif ?>
|
40 |
<?php if (strlen(trim($this->getFax()))): ?>
|
41 |
-
|
42 |
<?php endif ?>
|
43 |
<?php if (strlen(trim($this->getWeb()))): ?>
|
44 |
-
|
45 |
<?php endif ?>
|
46 |
<?php echo $this->__('E-Mail') ?>: <?php echo $this->getEmail(false) ?>
|
47 |
</p>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
35 |
|
36 |
<p>
|
37 |
<?php if (strlen(trim($this->getTelephone()))): ?>
|
38 |
+
<?php echo $this->__('Telephone') ?>: <?php echo $this->getTelephone() ?>
|
39 |
+
<?php if (strlen(trim($this->getTelephoneAdditional()))): ?>
|
40 |
+
(<?php echo $this->getTelephoneAdditional() ?>)
|
41 |
+
<?php endif ?>
|
42 |
+
<br />
|
43 |
<?php endif ?>
|
44 |
<?php if (strlen(trim($this->getFax()))): ?>
|
45 |
+
<?php echo $this->__('Fax') ?>: <?php echo $this->getFax() ?><br />
|
46 |
<?php endif ?>
|
47 |
<?php if (strlen(trim($this->getWeb()))): ?>
|
48 |
+
<?php echo $this->__('Web') ?>: <a href="http://<?php echo $this->getWeb() ?>" title="<?php echo $this->getCompanyFirst() ?>"><?php echo $this->getWeb() ?></a><br />
|
49 |
<?php endif ?>
|
50 |
<?php echo $this->__('E-Mail') ?>: <?php echo $this->getEmail(false) ?>
|
51 |
</p>
|
app/design/frontend/base/default/template/magesetup/imprint/legal.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/template/magesetup/imprint/tax.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/base/default/template/magesetup/price_info.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
@@ -24,19 +24,19 @@
|
|
24 |
?>
|
25 |
<?php $shippingCostUrl = Mage::helper( 'magesetup' )->getShippingCostUrl() ?>
|
26 |
<?php if( !empty( $shippingCostUrl ) && $this->getIsShowShippingLink() ): ?>
|
27 |
-
<?php if( $this->
|
28 |
<?php if( $this->getIsIncludingShippingCosts() ): ?>
|
29 |
<span class="tax-details"><?php echo $this->__( 'Excl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'incl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
30 |
<?php else: ?>
|
31 |
<span class="tax-details"><?php echo $this->__( 'Excl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'excl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
32 |
<?php endif ?>
|
33 |
-
<?php elseif( $this->
|
34 |
<?php if( $this->getIsIncludingShippingCosts() ): ?>
|
35 |
<span class="tax-details"><?php echo $this->__( 'Incl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'incl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
36 |
<?php else: ?>
|
37 |
<span class="tax-details"><?php echo $this->__( 'Incl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'excl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
38 |
<?php endif ?>
|
39 |
-
<?php elseif( $this->
|
40 |
<?php if( $this->getIsIncludingShippingCosts() ): ?>
|
41 |
<span class="tax-details"><?php echo $this->__('incl. <a href="%s">Shipping Cost</a>', $shippingCostUrl) ?></span>
|
42 |
<?php else: ?>
|
@@ -47,9 +47,9 @@
|
|
47 |
(<?php echo $this->__('Shipping Weight %s', $this->getFormattedWeight()) ?>)
|
48 |
<?php endif ?>
|
49 |
<?php else: ?>
|
50 |
-
<?php if( $this->
|
51 |
-
|
52 |
-
<?php elseif( $this->
|
53 |
-
|
54 |
<?php endif ?>
|
55 |
<?php endif ?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
24 |
?>
|
25 |
<?php $shippingCostUrl = Mage::helper( 'magesetup' )->getShippingCostUrl() ?>
|
26 |
<?php if( !empty( $shippingCostUrl ) && $this->getIsShowShippingLink() ): ?>
|
27 |
+
<?php if( $this->getPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_EXCLUDING_TAX ): ?>
|
28 |
<?php if( $this->getIsIncludingShippingCosts() ): ?>
|
29 |
<span class="tax-details"><?php echo $this->__( 'Excl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'incl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
30 |
<?php else: ?>
|
31 |
<span class="tax-details"><?php echo $this->__( 'Excl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'excl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
32 |
<?php endif ?>
|
33 |
+
<?php elseif( $this->getPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_INCLUDING_TAX ): ?>
|
34 |
<?php if( $this->getIsIncludingShippingCosts() ): ?>
|
35 |
<span class="tax-details"><?php echo $this->__( 'Incl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'incl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
36 |
<?php else: ?>
|
37 |
<span class="tax-details"><?php echo $this->__( 'Incl. %s Tax', $this->getFormattedTaxRate() ) ?><span class="tax-separator">, </span><span class="shipping-cost-details"><?php echo $this->__( 'excl. <a href="%s">Shipping Cost</a>', $shippingCostUrl ) ?></span></span>
|
38 |
<?php endif ?>
|
39 |
+
<?php elseif( $this->getPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_BOTH ): ?>
|
40 |
<?php if( $this->getIsIncludingShippingCosts() ): ?>
|
41 |
<span class="tax-details"><?php echo $this->__('incl. <a href="%s">Shipping Cost</a>', $shippingCostUrl) ?></span>
|
42 |
<?php else: ?>
|
47 |
(<?php echo $this->__('Shipping Weight %s', $this->getFormattedWeight()) ?>)
|
48 |
<?php endif ?>
|
49 |
<?php else: ?>
|
50 |
+
<?php if( $this->getPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_EXCLUDING_TAX ): ?>
|
51 |
+
<span class="tax-details"><?php echo $this->__( 'Excl. %s Tax', $this->getFormattedTaxRate() ) ?></span>
|
52 |
+
<?php elseif( $this->getPriceDisplayType() == Mage_Tax_Model_Config::DISPLAY_TYPE_INCLUDING_TAX ): ?>
|
53 |
+
<span class="tax-details"><?php echo $this->__( 'Incl. %s Tax', $this->getFormattedTaxRate() ) ?></span>
|
54 |
<?php endif ?>
|
55 |
<?php endif ?>
|
app/design/frontend/base/default/template/magesetup/shipping.phtml
CHANGED
@@ -13,7 +13,7 @@
|
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
13 |
* @category FireGento
|
14 |
* @package FireGento_MageSetup
|
15 |
* @author FireGento Team <team@firegento.com>
|
16 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
17 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
18 |
*/
|
19 |
?>
|
app/design/frontend/rwd/default/template/magesetup/footer/links.phtml
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php /* @var $this Mage_Core_Block_Template */ ?>
|
2 |
+
<div class="links">
|
3 |
+
<div class="block-title"><strong><span><?php echo Mage::helper('magesetup')->__('Links') ?></span></strong></div>
|
4 |
+
<?php echo $this->getLayout()->createBlock('cms/block')->setBlockId($this->getBlockId())->toHtml() ?>
|
5 |
+
</div>
|
6 |
+
|
app/etc/modules/FireGento_MageSetup.xml
CHANGED
@@ -14,8 +14,9 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
|
|
19 |
*/
|
20 |
-->
|
21 |
<config>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
+
* @version 2.2.1
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
app/locale/de_CH/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Widerrufsbelehrung für Digitale Inhalte @-->
|
2 |
+
<!--@checkbox_text Ich stimme ausdrücklich zu, dass Sie vor Ablauf der Widerrufsfrist mit der Ausführung des Vertrages beginnen. Mir ist bekannt, dass ich durch diese Zustimmung mit Beginn der Ausführung des Vertrages mein Widerrufsrecht verliere. @-->
|
app/locale/de_CH/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Widerrufsbelehrung für Dienstleistungen @-->
|
2 |
+
<!--@checkbox_text Ich bin einverstanden und verlange ausdrücklich, dass Sie vor Ende der Widerrufsfrist mit der Ausführung der beauftragten Dienstleistung beginnen. Mir ist bekannt, dass ich bei vollständiger Vertragserfüllung durch Sie mein Widerrufrecht verliere. @-->
|
app/locale/de_CH/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
<!--@title Widerrufsbelehrung @-->
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<!--@title Widerrufsbelehrung @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Fügen Sie hier Ihre Widerrufsbelehrung ein. Vermeiden Sie widersprüchliche Angaben zum Widerrufsrecht auf weiteren Infoseiten.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ACHTUNG: Ab/seit dem 13.06.2014 entfällt die Option Rückgaberecht aufgrund des Inkrafttretens der Verbraucherrechterichtlinie VRRL.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='widerrufsformular'}}">Muster-Widerrufsformular</a></p>
|
app/locale/de_CH/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Muster-Widerrufsformular</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
Nach neuem Recht muss der Verbraucher außerdem vor Abgabe seiner Bestellung über das Muster-Widerrufsformular informiert werden. Dieses ist nicht zu verwechseln mit Widerrufsbelehrung und muss unabhängig von der Art der Belehrung stets verwendet werden. Außerdem muss das Widerrufsformular dem Verbraucher auf einem dauerhaften Datenträger zur Verfügung gestellt werden. Es bietet sich an, dieses unterhalb der Widerrufsbelehrung mit aufzuführen, sodass der Verbraucher die Widerrufsbelehrung und das Widerrufs-Formular zusammen in einem Dokument erhält.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
An<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
per Fax an: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
oder per E-Mail an: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
Hiermit widerrufe(n) ich/wir<sup>*</sup> den von mir/uns<sup>*</sup> abgeschlossenen Vertrag über den Kauf der folgenden Waren<sup>*</sup> / die Erbringung der folgenden Dienstleistung<sup>*</sup>
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Bestellt am<sup>*</sup>/ erhalten am<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Name des/der Verbraucher(s)
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
Anschrift des/der Verbraucher(s)
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Unterschrift des/der Verbraucher(s) <em>(nur bei Mitteilung auf Papier)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Datum
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> Unzutreffendes streichen.
|
51 |
+
</p>
|
app/locale/de_CH/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<!--@identifier widerrufsformular @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/de_DE/FireGento_MageSetup.csv
CHANGED
@@ -6,9 +6,9 @@
|
|
6 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Zeige ""inkl. Versandkosten"" statt ""zzgl. Versandkosten"""
|
7 |
"No Page","Keine Seite"
|
8 |
"No Block","Kein Block"
|
9 |
-
"Incl. Tax","Inkl.
|
10 |
-
"Incl. %s Tax","Inkl. %s
|
11 |
-
"Excl. %s Tax","Zzgl. %s
|
12 |
"excl. <a href=""%s"">Shipping Cost</a>","zzgl. <a href=""%s"">Versandkosten</a>"
|
13 |
"incl. <a href=""%s"">Shipping Cost</a>","inkl. <a href=""%s"">Versandkosten</a>"
|
14 |
"Display Product Weight below Price","Produktgewicht unterhalb der Preise darstellen"
|
@@ -67,23 +67,22 @@
|
|
67 |
"IBAN","IBAN"
|
68 |
"Clearing","Clearing"
|
69 |
"Register court","Registergericht"
|
70 |
-
"Register number","
|
71 |
"SWIFT","SWIFT"
|
72 |
"BIC/SWIFT","BIC/SWIFT"
|
73 |
"Tax number","Steuernummer"
|
74 |
"Telephone","Telefon"
|
|
|
75 |
"Web","Web"
|
76 |
-
"VAT-ID","USt.
|
77 |
-
"Company 1","
|
78 |
-
"Company 2","
|
79 |
"Street","Straße"
|
80 |
"Zip","PLZ"
|
81 |
"City","Ort"
|
82 |
"Telephone","Telefon"
|
83 |
"Tax number","Steuernummer"
|
84 |
-
"Register court","Zuständiges Gericht"
|
85 |
"Financial office","Zuständiges Finanzamt"
|
86 |
-
"Register number","HRB Nummer"
|
87 |
"Reference for business rules (physician, physician...)","Verweis auf berufliche Regelungen (z.B. für Ärzte, Apotheker)"
|
88 |
"Authority (ECG)","Behörde gem. ECG (E-Commerce-Gesetz)"
|
89 |
"Shareholdings","Beteiligungen"
|
@@ -102,7 +101,7 @@
|
|
102 |
"Ensures that the ip address of the customers doesnt get involved into the tracking", "Stellt sicher das die IP Adresse der Kunden beim Tracking nicht mit übertragen werden (Datenschutz)"
|
103 |
|
104 |
"Dynamic Shipping Tax Class Calculation","Dynamische Berechnung der Versand-Steuerklasse"
|
105 |
-
"
|
106 |
|
107 |
"Shipping from","Versand aus"
|
108 |
"This setting is base for the tax rate setup!","Diese Einstellung wird für das Setup der Steuereinstellungen verwendet!"
|
@@ -141,6 +140,16 @@
|
|
141 |
"On customer registration and on checkout","In der Kundenregistrierung und im Checkout"
|
142 |
"Nowhere","Nirgendwo"
|
143 |
"Agreements not confirmed.","Bedingungen wurden nicht bestätigt."
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
144 |
|
145 |
"German Language Pack","Deutsches Sprachpaket"
|
146 |
"Base Price","Grundpreis-Modul (PAngV)"
|
6 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Zeige ""inkl. Versandkosten"" statt ""zzgl. Versandkosten"""
|
7 |
"No Page","Keine Seite"
|
8 |
"No Block","Kein Block"
|
9 |
+
"Incl. Tax","Inkl. USt."
|
10 |
+
"Incl. %s Tax","Inkl. %s USt."
|
11 |
+
"Excl. %s Tax","Zzgl. %s USt."
|
12 |
"excl. <a href=""%s"">Shipping Cost</a>","zzgl. <a href=""%s"">Versandkosten</a>"
|
13 |
"incl. <a href=""%s"">Shipping Cost</a>","inkl. <a href=""%s"">Versandkosten</a>"
|
14 |
"Display Product Weight below Price","Produktgewicht unterhalb der Preise darstellen"
|
67 |
"IBAN","IBAN"
|
68 |
"Clearing","Clearing"
|
69 |
"Register court","Registergericht"
|
70 |
+
"Register number","Registernummer"
|
71 |
"SWIFT","SWIFT"
|
72 |
"BIC/SWIFT","BIC/SWIFT"
|
73 |
"Tax number","Steuernummer"
|
74 |
"Telephone","Telefon"
|
75 |
+
"Supplementary Information for Telephone","Zusatzinformation für Telefon"
|
76 |
"Web","Web"
|
77 |
+
"VAT-ID","USt-IdNr."
|
78 |
+
"Company 1","Unternehmensbezeichnung 1"
|
79 |
+
"Company 2","Unternehmensbezeichnung 2"
|
80 |
"Street","Straße"
|
81 |
"Zip","PLZ"
|
82 |
"City","Ort"
|
83 |
"Telephone","Telefon"
|
84 |
"Tax number","Steuernummer"
|
|
|
85 |
"Financial office","Zuständiges Finanzamt"
|
|
|
86 |
"Reference for business rules (physician, physician...)","Verweis auf berufliche Regelungen (z.B. für Ärzte, Apotheker)"
|
87 |
"Authority (ECG)","Behörde gem. ECG (E-Commerce-Gesetz)"
|
88 |
"Shareholdings","Beteiligungen"
|
101 |
"Ensures that the ip address of the customers doesnt get involved into the tracking", "Stellt sicher das die IP Adresse der Kunden beim Tracking nicht mit übertragen werden (Datenschutz)"
|
102 |
|
103 |
"Dynamic Shipping Tax Class Calculation","Dynamische Berechnung der Versand-Steuerklasse"
|
104 |
+
"<b>ATTENTION:</b> This setting overwrites the ""Tax Class for Shipping"" setting above!","<b>ACHTUNG:</b> Diese Einstellung überschreibt die Einstellung ""Steuerklasse für den Versand"" darüber."
|
105 |
|
106 |
"Shipping from","Versand aus"
|
107 |
"This setting is base for the tax rate setup!","Diese Einstellung wird für das Setup der Steuereinstellungen verwendet!"
|
140 |
"On customer registration and on checkout","In der Kundenregistrierung und im Checkout"
|
141 |
"Nowhere","Nirgendwo"
|
142 |
"Agreements not confirmed.","Bedingungen wurden nicht bestätigt."
|
143 |
+
"Revocation Product Type (for extra checkout agreements)","Produkttyp für Widerrufsrecht"
|
144 |
+
"Default Revocation Product Type (for extra checkout agreements)","Standard-Produkttyp für Widerrufsrecht"
|
145 |
+
"Display extra checkout agreements for Digital Goods and Services","Zusätzliche Bestellbedingungen werden für Digitale Inhalte und Dienstleistungen angezeigt"
|
146 |
+
"Default (Configuration)","Standardwert (Konfiguration)"
|
147 |
+
"Delivery of Goods","Warenlieferung"
|
148 |
+
"Digital Content","Digitaler Inhalt"
|
149 |
+
"Service","Dienstleistung"
|
150 |
+
"Display for following Revocation Product Types","Für folgende Produkttypen anzeigen"
|
151 |
+
"Will only be displayed if at least one product of the selected type is in cart","Wird nur angezeigt, wenn sich mindestens ein Produkt des gewählten Typs im Warenkorb befindet."
|
152 |
+
"All","Alle"
|
153 |
|
154 |
"German Language Pack","Deutsches Sprachpaket"
|
155 |
"Base Price","Grundpreis-Modul (PAngV)"
|
app/locale/de_DE/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Widerrufsbelehrung für Digitale Inhalte @-->
|
2 |
+
<!--@checkbox_text Ich stimme ausdrücklich zu, dass Sie vor Ablauf der Widerrufsfrist mit der Ausführung des Vertrages beginnen. Mir ist bekannt, dass ich durch diese Zustimmung mit Beginn der Ausführung des Vertrages mein Widerrufsrecht verliere. @-->
|
app/locale/de_DE/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Widerrufsbelehrung für Dienstleistungen @-->
|
2 |
+
<!--@checkbox_text Ich bin einverstanden und verlange ausdrücklich, dass Sie vor Ende der Widerrufsfrist mit der Ausführung der beauftragten Dienstleistung beginnen. Mir ist bekannt, dass ich bei vollständiger Vertragserfüllung durch Sie mein Widerrufrecht verliere. @-->
|
app/locale/de_DE/template/magesetup/block/business_terms.html
CHANGED
@@ -1,2 +1,7 @@
|
|
1 |
<!--@title AGB @-->
|
|
|
|
|
|
|
|
|
|
|
2 |
<h2><i>Fügen Sie hier Ihre Allgemeinen Geschäftsbedingungen ein.</i></h2>
|
1 |
<!--@title AGB @-->
|
2 |
+
<p>Nutzen Sie den folgenden Code, um die Widerrufsbelehrung in Ihren AGB zu nutzen:</p>
|
3 |
+
|
4 |
+
{{block type="cms/block" block_id="revocation"}}
|
5 |
+
|
6 |
+
|
7 |
<h2><i>Fügen Sie hier Ihre Allgemeinen Geschäftsbedingungen ein.</i></h2>
|
app/locale/de_DE/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
<!--@title Widerrufsbelehrung @-->
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<!--@title Widerrufsbelehrung @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Fügen Sie hier Ihre Widerrufsbelehrung ein. Vermeiden Sie widersprüchliche Angaben zum Widerrufsrecht auf weiteren Infoseiten.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ACHTUNG: Ab/seit dem 13.06.2014 entfällt die Option Rückgaberecht aufgrund des Inkrafttretens der Verbraucherrechterichtlinie VRRL.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='widerrufsformular'}}">Muster-Widerrufsformular</a></p>
|
app/locale/de_DE/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Muster-Widerrufsformular</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
Nach neuem Recht muss der Verbraucher außerdem vor Abgabe seiner Bestellung über das Muster-Widerrufsformular informiert werden. Dieses ist nicht zu verwechseln mit Widerrufsbelehrung und muss unabhängig von der Art der Belehrung stets verwendet werden. Außerdem muss das Widerrufsformular dem Verbraucher auf einem dauerhaften Datenträger zur Verfügung gestellt werden. Es bietet sich an, dieses unterhalb der Widerrufsbelehrung mit aufzuführen, sodass der Verbraucher die Widerrufsbelehrung und das Widerrufs-Formular zusammen in einem Dokument erhält.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
An<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
per Fax an: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
oder per E-Mail an: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
Hiermit widerrufe(n) ich/wir<sup>*</sup> den von mir/uns<sup>*</sup> abgeschlossenen Vertrag über den Kauf der folgenden Waren<sup>*</sup> / die Erbringung der folgenden Dienstleistung<sup>*</sup>
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Bestellt am<sup>*</sup>/ erhalten am<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Name des/der Verbraucher(s)
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
Anschrift des/der Verbraucher(s)
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Unterschrift des/der Verbraucher(s) <em>(nur bei Mitteilung auf Papier)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Datum
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> Unzutreffendes streichen.
|
51 |
+
</p>
|
app/locale/de_DE/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<!--@identifier widerrufsformular @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/en_US/FireGento_MageSetup.csv
CHANGED
@@ -72,6 +72,7 @@
|
|
72 |
"BIC/SWIFT","BIC/SWIFT"
|
73 |
"Tax number","Tax number"
|
74 |
"Telephone","Telephone"
|
|
|
75 |
"Web","Web"
|
76 |
"VAT-ID","VAT-ID"
|
77 |
"Company 1","Company 1"
|
@@ -102,7 +103,7 @@
|
|
102 |
"Ensures that the ip address of the customers doesnt get involved into the tracking","Ensures that the ip address of the customers doesnt get involved into the tracking"
|
103 |
|
104 |
"Dynamic Shipping Tax Class Calculation","Dynamic Shipping Tax Class Calculation"
|
105 |
-
"
|
106 |
|
107 |
"Shipping from","Shipping from"
|
108 |
"This setting is base for the tax rate setup!","This setting is base for the tax rate setup!"
|
72 |
"BIC/SWIFT","BIC/SWIFT"
|
73 |
"Tax number","Tax number"
|
74 |
"Telephone","Telephone"
|
75 |
+
"Supplementary Information for Telephone","Supplementary Information for Telephone"
|
76 |
"Web","Web"
|
77 |
"VAT-ID","VAT-ID"
|
78 |
"Company 1","Company 1"
|
103 |
"Ensures that the ip address of the customers doesnt get involved into the tracking","Ensures that the ip address of the customers doesnt get involved into the tracking"
|
104 |
|
105 |
"Dynamic Shipping Tax Class Calculation","Dynamic Shipping Tax Class Calculation"
|
106 |
+
"<b>ATTENTION:</b> This setting overwrites the ""Tax Class for Shipping"" setting above!","<b>ATTENTION:</b> This setting overwrites the ""Tax Class for Shipping"" setting above!"
|
107 |
|
108 |
"Shipping from","Shipping from"
|
109 |
"This setting is base for the tax rate setup!","This setting is base for the tax rate setup!"
|
app/locale/en_US/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Digital Goods @-->
|
2 |
+
<!--@checkbox_text I consent to the starting of the supply of the digital content during the legal cooling off period and I acknowledge that my right to cancel the contract will be lost with this consent to start the supply of the digital content. @-->
|
app/locale/en_US/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Services @-->
|
2 |
+
<!--@checkbox_text I expressly request you to start the service during the legal cooling off period and acknowledge that my right to cancel the contract will be lost once the contract has been fully performed. I recognize that I will have to pay for the services provided if I cancel the contract despite my express request to start the service within the legal cooling off period. @-->
|
app/locale/en_US/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
<!--@title Revocation @-->
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<!--@title Revocation @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Please insert your Declaration of Revocation here. Avoid conflicting information on the right of withdrawal on other info pages.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ATTENTION: From / since June 13th 2014 the return policy option is canceled due to the adoption of the Consumer Rights Directive VRRL.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='revocation_form'}}">Sample Revocation Form</a></p>
|
app/locale/en_US/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Withdrawal Form @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Model withdrawal form</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
According to recent right the consumer has to be informed about the withdrawal form before placing his order. Not to be confused with the withdrawal declaration and needs to be used independently of the declaration. Furhtermore the withdrawal form has to be provided to the consumer on a durable medium. It is appropriate to place this form beneath the withdrawal declaration so that the counsumer receives the withdrawal declaration and the withdrawal form in one document.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
To<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
by fax to: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
or by email to: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
I/ We<sup>*</sup> revoke the concluded me/ us contract for the purchase of the following products/ the provision of the following service<sup>*</sup>.
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Order date<sup>*</sup>/ received date<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Name of the consumer
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
Address of the consumer
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Signature of the consumer <em>(only required for communication on paper)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Date
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> Please remove if not applicable.
|
51 |
+
</p>
|
app/locale/en_US/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<!--@identifier revocation_form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/fr_CH/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Digital Goods @-->
|
2 |
+
<!--@checkbox_text I consent to the starting of the supply of the digital content during the legal cooling off period and I acknowledge that my right to cancel the contract will be lost with this consent to start the supply of the digital content. @-->
|
app/locale/fr_CH/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Services @-->
|
2 |
+
<!--@checkbox_text I expressly request you to start the service during the legal cooling off period and acknowledge that my right to cancel the contract will be lost once the contract has been fully performed. I recognize that I will have to pay for the services provided if I cancel the contract despite my express request to start the service within the legal cooling off period. @-->
|
app/locale/fr_CH/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
<!--@title Conditions de retour @-->
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<!--@title Conditions de retour @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Remplissez ici vos conditions de retour.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ATTENTION: From / since June 13th 2014 the return policy option is canceled due to the adoption of the Consumer Rights Directive VRRL.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='revocation_form'}}">Sample Revocation Form</a></p>
|
app/locale/fr_CH/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Withdrawal Form @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Model withdrawal form</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
According to recent right the consumer has to be informed about the withdrawal form before placing his order. Not to be confused with the withdrawal declaration and needs to be used independently of the declaration. Furhtermore the withdrawal form has to be provided to the consumer on a durable medium. It is appropriate to place this form beneath the withdrawal declaration so that the counsumer receives the withdrawal declaration and the withdrawal form in one document.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
To<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
by fax to: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
or by email to: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
I/ We<sup>*</sup> revoke the concluded me/ us contract for the purchase of the following products/ the provision of the following service<sup>*</sup>.
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Order date<sup>*</sup>/ received date<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Name of the consumer
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
Address of the consumer
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Signature of the consumer <em>(only required for communication on paper)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Date
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> Please remove if not applicable.
|
51 |
+
</p>
|
app/locale/fr_CH/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<!--@identifier revocation_form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/fr_FR/FireGento_MageSetup.csv
CHANGED
@@ -1,74 +1,77 @@
|
|
1 |
-
"Display Block below Price","Afficher le
|
2 |
-
"Display tax info and shipping cost link below the price on all pages","Afficher le lien des informations de taxe et de
|
3 |
-
"Display Delivery time on Category Pages","Afficher le délai de livraison
|
4 |
-
"CMS Page for Shipping Info","
|
5 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Afficher ""incl. les frais de livraison"" au lieu ""excl. les frais de livraison"""
|
6 |
"No Page","Pas de page"
|
7 |
-
"No Block","Pas
|
8 |
-
"Incl. Tax","
|
9 |
-
"Incl. %s Tax","
|
10 |
-
"Excl. %s Tax","
|
11 |
-
"excl. <a href=""%s"">Shipping Cost</a>","
|
12 |
-
"incl. <a href=""%s"">Shipping Cost</a>","
|
13 |
-
"Display Product Weight below Price","
|
14 |
-
"Unit for Product Weight","Unité pour le poids
|
15 |
"e.g. g, kg, lb, ...","expl. g, kg, lb, ..."
|
16 |
"Shipping Weight %s","Poids de la livraison %s"
|
17 |
|
18 |
-
"If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Si vous
|
19 |
-
"Skip installation","
|
20 |
"MageSetup has been installed.","MageSetup a été installé."
|
21 |
-
"Click <a href=""%s"">here</a> to set up your pages, blocks, emails and tax settings.","Cliquez <a href=""%s"">ici</a
|
22 |
-
"Please choose the requested setups:","
|
23 |
"Run MageSetup","Lancer MageSetup"
|
24 |
-
"Update System Config Settings","Mettre à jour les réglages
|
25 |
-
"i.e. newsletter confirmation, account confirmation, ..","expl. confirmation de
|
26 |
-
"Create CMS Pages and Blocks","Créer les pages CMS et
|
27 |
-
"i.e. shipping, conditions, revocation","expl.
|
28 |
-
"Create Checkout Agreements","Créer
|
29 |
-
"Conditions","
|
30 |
-
"Display Checkbox on Frontend","
|
31 |
-
"Require Confirmation on Customer Registration and/or Checkout","
|
32 |
-
"Language Package for CMS Pages/Blocks/Agreements","Paquet de
|
33 |
-
"Create Email Templates","Créer
|
34 |
-
"German Email Templates","
|
35 |
-
"Configure Tax","
|
36 |
-
"Shipping from Germany","Livraison depuis l'
|
37 |
-
"All tax settings will be overwritten!","Tous les réglages de taxes seront
|
38 |
-
"Update Product Tax Classes","Mettre à jour les classes de taxe"
|
|
|
39 |
"Old","Ancien"
|
40 |
"New","Nouveau"
|
41 |
-
"
|
|
|
42 |
|
43 |
-
"MageSetup: CMS Blocks and Pages have been created.","MageSetup: les
|
44 |
-
"MageSetup: Checkout Agreements have been created.","MageSetup: les
|
45 |
-
"MageSetup: Email Templates have been created.","MageSetup: les modèles d'
|
46 |
-
"MageSetup: Tax Settings have been created.","MageSetup: les réglages de taxe ont
|
47 |
-
"MageSetup: Product Tax Classes have been updated.","MageSetup:
|
48 |
-
"MageSetup: System Config Settings have been updated.","MageSetup: les réglages de la configuration système ont été
|
49 |
|
50 |
"Imprint","Mentions légales"
|
51 |
"Account","Numéro de compte"
|
52 |
-
"Account owner","
|
53 |
"Bank number","Numéro de la banque"
|
54 |
-
"Bank name","
|
55 |
-
"CEO","
|
56 |
-
"Owner","
|
57 |
-
"Responsible according to § 5 TMG","
|
58 |
-
"Responsible for content","
|
59 |
-
"Responsible for content address","
|
60 |
"Responsible in the interests of the press law","Attaché de presse"
|
61 |
-
"E-Mail","
|
62 |
"Fax","Fax"
|
63 |
"Financial office","Bureau des finances"
|
64 |
"IBAN","IBAN"
|
65 |
"Clearing","Clearing"
|
66 |
"Register court","Tribunal de commerce"
|
67 |
-
"Register number","Numéro
|
68 |
"SWIFT","SWIFT"
|
69 |
"BIC/SWIFT","BIC/SWIFT"
|
70 |
"Tax number","Numéro de TVA"
|
71 |
"Telephone","Téléphone"
|
|
|
72 |
"Web","Web"
|
73 |
"VAT-ID","Numéro de TVA"
|
74 |
"Company 1","Société 1"
|
@@ -80,67 +83,65 @@
|
|
80 |
"Authority (ECG)","Autorité acc. ECG (loi E-Commerce)"
|
81 |
"Shareholdings","Investissements"
|
82 |
"Editorial Concept","Concept éditorial"
|
83 |
-
"relevant for Austrian shops","
|
|
|
|
|
84 |
|
85 |
"%s%%","%s%%"
|
86 |
|
87 |
-
"Recommended Extensions","Extensions
|
88 |
"Popular Payment Methods","Méthodes de paiement populaires"
|
89 |
"Ip anonymization", "Anonymisation de l'adresse IP"
|
90 |
-
"Ensures that the ip address of the customers doesnt get involved into the tracking",
|
91 |
|
92 |
-
"Dynamic Shipping Tax Class Calculation","Calculation dynamique de la classe de taxe
|
93 |
-
"
|
94 |
|
95 |
-
"Germany","Allemagne"
|
96 |
-
"Austria","Autriche"
|
97 |
-
"Switzerland","Suisse"
|
98 |
-
"Russia","Russie"
|
99 |
-
"France","France"
|
100 |
"Shipping from","Livraison depuis"
|
101 |
-
"This setting is base for the tax rate setup!","Ce réglage
|
102 |
|
103 |
"[Show]","[Afficher]"
|
104 |
-
"Visible in Checkout","Visible dans le processus
|
105 |
|
106 |
-
"Display Additional Information","
|
107 |
-
"Display content from text field below at the checkout confirm page directly above the checkout button","
|
108 |
|
109 |
"Directory ""%s"" not found. Locale not installed?","Dossier ""%s"" non trouvé. Est-ce que le paquet de langue a été installé correctement?"
|
110 |
"Default Setting","Réglage par défaut"
|
111 |
"Use Default Setting","Utiliser le réglage par défaut"
|
112 |
-
"Select Locale","
|
113 |
-
"Create Transational Email Templates to be managed in the Magento admin area","
|
114 |
"Language Package for Email Templates","Paquet de langue pour les modèles d'email"
|
115 |
-
"If your desired locale is missing, please check if it installed.","Si le paquet de langue
|
116 |
-
"If your desired locale is missing, it is not supported yet by MageSetup.","Si le paquet de langue
|
117 |
|
118 |
-
"Configuration Settings","Réglages de la configuration"
|
119 |
"CMS Settings","Réglages CMS"
|
120 |
-
"Email Settings","Réglages
|
121 |
-
"Tax Settings","Réglages
|
122 |
|
123 |
"Delivery Time","Délai de livraison"
|
124 |
"Shipping Costs","Frais de livraison"
|
125 |
-
"Hide estimated shipping costs in cart","Cacher les frais de livraison dans le panier d'achat"
|
126 |
-
"Replace with a link to the shipping costs cms page","Remplacer avec un lien vers
|
127 |
-
"Here you find information regarding the shipping costs.","Vous trouverez
|
128 |
-
"Hide box ""Last Ordered Items""","Cacher la boite ""
|
|
|
129 |
|
130 |
-
"Display on","Afficher
|
131 |
-
"On checkout (Magento Default)","
|
132 |
-
"On customer registration (or on checkout, if customer not registered before)","Pendant
|
133 |
-
"On customer registration and on checkout","Pendant
|
134 |
"Nowhere","Nulle part"
|
135 |
-
"Agreements not confirmed.","
|
136 |
|
137 |
-
"German Language Pack","
|
138 |
-
"Base Price","
|
139 |
-
"Newsletter Unsubscription for Guests, Double Opt In for registered Customers","Désinscription à la newsletter pour les
|
140 |
-
"Debit Payment","
|
141 |
-
"Cash on Delivery","Contre-
|
142 |
-
"Bank Payment","
|
143 |
"Invoice Payment","Facture"
|
144 |
"Extension Key","Extension Key"
|
145 |
"MagentoConnect","MagentoConnect"
|
146 |
-
"Bank Information","
|
1 |
+
"Display Block below Price","Afficher le bloc sous le prix"
|
2 |
+
"Display tax info and shipping cost link below the price on all pages","Afficher le lien avec des informations de taxe et coût de livraision sous le prix sur toutes les pages"
|
3 |
+
"Display Delivery time on Category Pages","Afficher le délai de livraison sur les pages de catégorie"
|
4 |
+
"CMS Page for Shipping Info","CMS page pour les informations de livraison"
|
5 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Afficher ""incl. les frais de livraison"" au lieu ""excl. les frais de livraison"""
|
6 |
"No Page","Pas de page"
|
7 |
+
"No Block","Pas de bloc"
|
8 |
+
"Incl. Tax","Taxe comprise"
|
9 |
+
"Incl. %s Tax","%s taxe inclut"
|
10 |
+
"Excl. %s Tax","%s taxe exclut"
|
11 |
+
"excl. <a href=""%s"">Shipping Cost</a>","<a href=""%s"">Coût de livraison</a> exclut"
|
12 |
+
"incl. <a href=""%s"">Shipping Cost</a>","<a href=""%s"">Coût de livraison</a> compris"
|
13 |
+
"Display Product Weight below Price","Afficher le poids du produit sous le prix"
|
14 |
+
"Unit for Product Weight","Unité de mesure pour le poids des produits"
|
15 |
"e.g. g, kg, lb, ...","expl. g, kg, lb, ..."
|
16 |
"Shipping Weight %s","Poids de la livraison %s"
|
17 |
|
18 |
+
"If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Si vous sohaitez ajouter plus de vues de magasin (expl. langue multiple), vous devez le faire avant l'envoi de ce formulaire."
|
19 |
+
"Skip installation","Passez l'installation"
|
20 |
"MageSetup has been installed.","MageSetup a été installé."
|
21 |
+
"Click <a href=""%s"">here</a> to set up your pages, blocks, emails and tax settings.","Cliquez <a href=""%s"">ici</a> pour modifier vos pages, blocs, courriels et réglage de taxe."
|
22 |
+
"Please choose the requested setups:","Choisissez les réglages souhaités:"
|
23 |
"Run MageSetup","Lancer MageSetup"
|
24 |
+
"Update System Config Settings","Mettre à jour les réglages de la configuration système"
|
25 |
+
"i.e. newsletter confirmation, account confirmation, ..", "expl. confirmation de newsletter, confirmation de création de compte, ..."
|
26 |
+
"Create CMS Pages and Blocks","Créer les pages CMS et blocs"
|
27 |
+
"i.e. shipping, conditions, revocation","expl. livraisons, conditions, révocation"
|
28 |
+
"Create Checkout Agreements","Créer des conditions de vente"
|
29 |
+
"Conditions","Conditions"
|
30 |
+
"Display Checkbox on Frontend","Afficher les checkbox en Frontend"
|
31 |
+
"Require Confirmation on Customer Registration and/or Checkout","Demander une confirmation lors de la création d'un compte client et/ou lors du processus d'achat"
|
32 |
+
"Language Package for CMS Pages/Blocks/Agreements","Paquet de langues pour les pages/blocs/conventions CMS"
|
33 |
+
"Create Email Templates","Créer des modèles d'email"
|
34 |
+
"German Email Templates","Modèles d'email Allemand"
|
35 |
+
"Configure Tax","Configurer les taxes"
|
36 |
+
"Shipping from Germany","Livraison depuis l'Allemagne"
|
37 |
+
"All tax settings will be overwritten!","Tous les réglages de taxes seront écrasés!"
|
38 |
+
"Update Product Tax Classes","Mettre à jour les classes de taxe produit"
|
39 |
+
"Update Customer Tax Classes","Mettre à jour les classes de taxe client"
|
40 |
"Old","Ancien"
|
41 |
"New","Nouveau"
|
42 |
+
"No tax","Pas de taxe"
|
43 |
+
"Newsletter Subscribers Status History", "Historique des statuts des abonnés à la newsletter"
|
44 |
|
45 |
+
"MageSetup: CMS Blocks and Pages have been created.","MageSetup: les blocs et pages CMS ont été créés."
|
46 |
+
"MageSetup: Checkout Agreements have been created.","MageSetup: les conventions de vente ont été créés."
|
47 |
+
"MageSetup: Email Templates have been created.","MageSetup: les modèles d'email ont été créés."
|
48 |
+
"MageSetup: Tax Settings have been created.","MageSetup: les réglages de taxe ont été créés."
|
49 |
+
"MageSetup: Product Tax Classes have been updated.","MageSetup: les classes de taxe produit ont été créés."
|
50 |
+
"MageSetup: System Config Settings have been updated.","MageSetup: les réglages de la configuration système ont été créés."
|
51 |
|
52 |
"Imprint","Mentions légales"
|
53 |
"Account","Numéro de compte"
|
54 |
+
"Account owner","Titulaire du compte"
|
55 |
"Bank number","Numéro de la banque"
|
56 |
+
"Bank name","Numéro de la banque"
|
57 |
+
"CEO","Gérant"
|
58 |
+
"Owner","Titulaire"
|
59 |
+
"Responsible according to § 5 TMG","Le responsable conforme au §5 TMG (lois allemandes)"
|
60 |
+
"Responsible for content","Le rédacteur en chef"
|
61 |
+
"Responsible for content address","Le responsable des liens de contenu"
|
62 |
"Responsible in the interests of the press law","Attaché de presse"
|
63 |
+
"E-Mail","Courriel"
|
64 |
"Fax","Fax"
|
65 |
"Financial office","Bureau des finances"
|
66 |
"IBAN","IBAN"
|
67 |
"Clearing","Clearing"
|
68 |
"Register court","Tribunal de commerce"
|
69 |
+
"Register number","Numéro de Siret"
|
70 |
"SWIFT","SWIFT"
|
71 |
"BIC/SWIFT","BIC/SWIFT"
|
72 |
"Tax number","Numéro de TVA"
|
73 |
"Telephone","Téléphone"
|
74 |
+
"Supplementary Information for Telephone","Informations complémentaires pour Téléphone"
|
75 |
"Web","Web"
|
76 |
"VAT-ID","Numéro de TVA"
|
77 |
"Company 1","Société 1"
|
83 |
"Authority (ECG)","Autorité acc. ECG (loi E-Commerce)"
|
84 |
"Shareholdings","Investissements"
|
85 |
"Editorial Concept","Concept éditorial"
|
86 |
+
"relevant for Austrian shops","Important pour les boutiques Autrichiennes"
|
87 |
+
"Bank number","Numéro de la banque"
|
88 |
+
"Bank name","Nom de la banque"
|
89 |
|
90 |
"%s%%","%s%%"
|
91 |
|
92 |
+
"Recommended Extensions","Extensions recommandés"
|
93 |
"Popular Payment Methods","Méthodes de paiement populaires"
|
94 |
"Ip anonymization", "Anonymisation de l'adresse IP"
|
95 |
+
"Ensures that the ip address of the customers doesnt get involved into the tracking","Il assure que l'adresse IP du client ne va pas être transmettre au tracker (protection des donn?es)"
|
96 |
|
97 |
+
"Dynamic Shipping Tax Class Calculation","Calculation dynamique de la classe de taxe livraison"
|
98 |
+
"<b>ATTENTION:</b> This setting overwrites the ""Tax Class for Shipping"" setting above!", "<b>ATTENTION:</b> ce réglage écrase le réglage ""Classe de taxe de livraison"" ci-dessus!"
|
99 |
|
|
|
|
|
|
|
|
|
|
|
100 |
"Shipping from","Livraison depuis"
|
101 |
+
"This setting is base for the tax rate setup!","Ce réglage est la base pour le réglage du taux de la taxe!"
|
102 |
|
103 |
"[Show]","[Afficher]"
|
104 |
+
"Visible in Checkout","Visible dans le processus d'achat"
|
105 |
|
106 |
+
"Display Additional Information","Afficher les informations complémentaires"
|
107 |
+
"Display content from text field below at the checkout confirm page directly above the checkout button","Afficher le contenu du champ de texte ci-dessous dans la page de la confirmation d'achat (directamente au-dessus du bouton d'achat)"
|
108 |
|
109 |
"Directory ""%s"" not found. Locale not installed?","Dossier ""%s"" non trouvé. Est-ce que le paquet de langue a été installé correctement?"
|
110 |
"Default Setting","Réglage par défaut"
|
111 |
"Use Default Setting","Utiliser le réglage par défaut"
|
112 |
+
"Select Locale","Paquet de langue choisi"
|
113 |
+
"Create Transational Email Templates to be managed in the Magento admin area", "Créer les modèles d'email transactionnels pouvant être modifié à partir de la partie administration de Magento"
|
114 |
"Language Package for Email Templates","Paquet de langue pour les modèles d'email"
|
115 |
+
"If your desired locale is missing, please check if it installed.","Si le paquet de langue souhaité est manquant, veuillez vérifier que le paquet est correctement installé."
|
116 |
+
"If your desired locale is missing, it is not supported yet by MageSetup.","Si le paquet de langue souhaité est manquant, c'est qu'il n'est pas encore supporté par MageSetup"
|
117 |
|
118 |
+
"Configuration Settings", "Réglages de la configuration"
|
119 |
"CMS Settings","Réglages CMS"
|
120 |
+
"Email Settings","Réglages du courriel"
|
121 |
+
"Tax Settings","Réglages de taxe"
|
122 |
|
123 |
"Delivery Time","Délai de livraison"
|
124 |
"Shipping Costs","Frais de livraison"
|
125 |
+
"Hide estimated shipping costs in cart","Cacher les estimations des frais de livraison dans le panier d'achat"
|
126 |
+
"Replace with a link to the shipping costs cms page","Remplacer avec un lien vers une page CMS "frais de livraison""
|
127 |
+
"Here you find information regarding the shipping costs.","Vous trouverez les informations concernant les frais de livraison ici."
|
128 |
+
"Hide box ""Last Ordered Items""","Cacher la boite ""les derniers articles commandés"""
|
129 |
+
"Tax Settings","Réglages de taxe"
|
130 |
|
131 |
+
"Display on","Afficher sur"
|
132 |
+
"On checkout (Magento Default)","Dans le processus d'achat (Par défaut dans Magento)"
|
133 |
+
"On customer registration (or on checkout, if customer not registered before)","Pendant la création d'un compte client (ou pendant le prossesus d'achat si le client n'est pas enregistré)"
|
134 |
+
"On customer registration and on checkout","Pendant la création d'un compte client ou dans le prossesus d'achat"
|
135 |
"Nowhere","Nulle part"
|
136 |
+
"Agreements not confirmed.","Conditions ne sont pas confirmées."
|
137 |
|
138 |
+
"German Language Pack","Pack de langue allemand"
|
139 |
+
"Base Price","Prix de base"
|
140 |
+
"Newsletter Unsubscription for Guests, Double Opt In for registered Customers","Désinscription à la newsletter pour les invités, Double Opt-In pour les clients enregistrés"
|
141 |
+
"Debit Payment","Prélèvement automatique"
|
142 |
+
"Cash on Delivery","Contre-Remboursement"
|
143 |
+
"Bank Payment","Paiement d'avance"
|
144 |
"Invoice Payment","Facture"
|
145 |
"Extension Key","Extension Key"
|
146 |
"MagentoConnect","MagentoConnect"
|
147 |
+
"Bank Information","Référence bancaire"
|
app/locale/fr_FR/template/magesetup/agreement/business_terms.html
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
<!--@name CGV @-->
|
2 |
-
<!--@checkbox_text J'ai lu
|
3 |
{{block type="cms/block" block_id="business_terms"}}
|
1 |
<!--@name CGV @-->
|
2 |
+
<!--@checkbox_text J'ai lu les conditions générales et je les accepte. @-->
|
3 |
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/fr_FR/template/magesetup/agreement/revocation.html
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
-
<!--@name
|
2 |
-
<!--@checkbox_text J'ai lu les
|
3 |
{{block type="cms/block" block_id="revocation"}}
|
1 |
+
<!--@name Clause de révocation @-->
|
2 |
+
<!--@checkbox_text J'ai lu les informations de rétraction. @-->
|
3 |
{{block type="cms/block" block_id="revocation"}}
|
app/locale/fr_FR/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Clause de révocation pour les contenus digitaux @-->
|
2 |
+
<!--@checkbox_text Je suis assurément d'accord que vous commencer avec l'execution du contrat avant l'expiration du délai.Je sais que je perds le droit de révocation avec l'agrément de l'execution du contrat. @-->
|
app/locale/fr_FR/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Révocation pour les services @-->
|
2 |
+
<!--@checkbox_text Je suis d'accord et je demande explicitement que vous commencez avec les services chargés avant la fin du délai de révocation. Je sais que je perds mon droit de révocation lorsque l'execution de contrat par vous. @-->
|
app/locale/fr_FR/template/magesetup/block/business_terms.html
CHANGED
@@ -1,6 +1,2 @@
|
|
1 |
-
<!--@title
|
2 |
-
<h2><i>
|
3 |
-
|
4 |
-
<a name="retractation"></a>
|
5 |
-
<h3>Conditions de retractions</h3>
|
6 |
-
<p>Veuillez remplir ici vos conditions de rétractations</p>
|
1 |
+
<!--@title Conditions générales @-->
|
2 |
+
<h2><i>Veuillez entrer les conditions générales ici.</i></h2>
|
|
|
|
|
|
|
|
app/locale/fr_FR/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
-
<!--@title
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title information sur le droit de révocation @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Veulliez entrer vos informations de révocation ici. Évitez les informations contradictoires sur la révocation sur les autres pages.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ATTENTION: depuis le 13 juin 2014, l'option du droit de retour est supprimé en raison de l'entrée en vigueur de la directive de droit des consommateurs.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='revocation_form'}}">Exemple formulaire de révocation</a></p>
|
app/locale/fr_FR/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formulaire de révocation @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Exemple formulaire de révocation</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
Selon le nouveau droit, le client doit être informé à l'aide d'un formulaire de révocation de ses droits de révocation avant de passer une commande. Celui-ci ne doit pas être en contradiction avec l'information de révocation et doit être employeé toujours indépendamment de la forme de l'information. En plus du formulaire de révocation, celui-ci doit être mis à la diposition du client sur un support de données durable. Il est recommandé de lister le formulaire sous l'information de révocation de sorte que le client puisse obtenir les informations de révocation en combinaison avec le formularie de révocation dans un même document.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
To<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
par fax à: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
ou par courriel à: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
Je/ Nous <sup>*</sup> notifie/nofifions par la présente ma/notre rétraction du contrat portant sur la vente du bien/la prestaion de service suivant<sup>*</sup>.
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Nommé le<sup>*</sup>/ date de livraison<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Nom du client
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
L'adresse du client
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Signature du client <em>(seulement nécessaire pour la communication sur papier)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Date
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> biffer les mentions inutiles.
|
51 |
+
</p>
|
app/locale/fr_FR/template/magesetup/page/404.html
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
-
<!--@title
|
2 |
<!--@identifier no-route @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
-
<h2>404 -
|
5 |
-
<p>Malheureusement, la page
|
6 |
<ul>
|
7 |
-
<li><a href="{{store url='catalogsearch/advanced'}}">
|
8 |
<li><a href="{{store url=''}}">Page d'accueil</a></li>
|
9 |
</ul>
|
1 |
+
<!--@title page introuvable @-->
|
2 |
<!--@identifier no-route @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
+
<h2>404 - page introuvable</h2>
|
5 |
+
<p>Malheureusement, la page demandée n'a pas pu être trouvée. Apparemment, a été fournie à partir d'une URL incorrect.</p>
|
6 |
<ul>
|
7 |
+
<li><a href="{{store url='catalogsearch/advanced'}}">Recherche avancée</a></li>
|
8 |
<li><a href="{{store url=''}}">Page d'accueil</a></li>
|
9 |
</ul>
|
app/locale/fr_FR/template/magesetup/page/business_terms.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
-
<!--@identifier
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="business_terms"}}
|
1 |
+
<!--@title Condition générales @-->
|
2 |
+
<!--@identifier business_terms @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/fr_FR/template/magesetup/page/imprint.html
CHANGED
@@ -8,7 +8,7 @@
|
|
8 |
En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
|
9 |
</p>
|
10 |
|
11 |
-
<h2>Mentions légales (
|
12 |
|
13 |
<h3>{{block type="magesetup/imprint_field" value="shop_name"}}</h3>
|
14 |
|
@@ -24,14 +24,4 @@
|
|
24 |
|
25 |
<p>{{block type="magesetup/imprint_field" value="business_rules"}}</p>
|
26 |
|
27 |
-
<p>
|
28 |
-
Vous pouvez contacter nottre service clientèle pour toutes questions ou réclamations auprès du numéro de téléphone suivant: {{block type="magesetup/imprint_field" value="telephone"}} ou bien par email {{block type="magesetup/imprint_field" value="email"}} ou encore notre formulaire de contact situé sur notre site internet.
|
29 |
-
</p>
|
30 |
-
|
31 |
-
<h3>Droits d'auteur et des marques</h3>
|
32 |
-
<p>
|
33 |
-
Nous, la société, sommes soucieux de prendre en compte dans toutes les publications les droits d'auteur des graphiques utilisés, des documents sonores, des séquences vidéo et textes, d'utiliser ses propres graphiques, documents sonores, séquences vidéo et textes ou d'utiliser des graphiques sans licence, des documents sonores, des séquences vidéo et des textes.<br>
|
34 |
-
Tous les éléments de notre site protégées par des tiers relèvent des dispositions de la loi applicable sur les marques et les droits de propriété des propriétaires enregistrés respectifs.<br>
|
35 |
-
La simple mention ne signifie pas que les marques ne sont pas protégées par des droits des tiers! Le droit d'auteur pour tout matériel créé par l'auteur reste avec la propriété de l'auteur.<br>
|
36 |
-
Toute reproduction ou utilisation de tels graphiques, documents sonores, séquences vidéo et textes dans d'autres publications électroniques ou imprimées est interdite sans l'autorisation expresse de l'auteur
|
37 |
-
</p>
|
8 |
En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
|
9 |
</p>
|
10 |
|
11 |
+
<h2>Mentions légales (example)</h2>
|
12 |
|
13 |
<h3>{{block type="magesetup/imprint_field" value="shop_name"}}</h3>
|
14 |
|
24 |
|
25 |
<p>{{block type="magesetup/imprint_field" value="business_rules"}}</p>
|
26 |
|
27 |
+
<p>Vous pouvez nous appeler au numéro {{block type="magesetup/imprint_field" value="telephone"}} ou nous envoyer un e-mail à {{block type="magesetup/imprint_field" value="email"}}.</p>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/locale/fr_FR/template/magesetup/page/order.html
CHANGED
@@ -1,38 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
<!--@identifier commande @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
-
<
|
5 |
-
<p>
|
6 |
-
Le texte placé ci-dessous est seulement un <strong>MODELE</strong> vous permettant de vous aider à créer
|
7 |
-
cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
|
8 |
-
En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
|
9 |
-
</p>
|
10 |
-
|
11 |
-
<h2>Commandez confortablement et simplement</h2>
|
12 |
-
|
13 |
-
<h3>Comment puis-je commander chez {{block type="magesetup/imprint_field" value="shop_name"}}?</h3>
|
14 |
-
|
15 |
-
<h4>1. Panier d'achat</h4>
|
16 |
-
|
17 |
-
<p>Choisissez un article que vous souhaitez acheter, puis cliquez sur le bouton "Ajouter au panier d'achat". Ainsi sera déposé votre article dans le panier d'achat. Vous pouvez modifier votre panier d'achat à tout moment et avant de confirmer votre commande. Si vous souhaitez modifier le nombre d'article dans le panier, cliquez dans le champ "Quantité" du produit concerné puis validez votre modification grâce au bouton "Actualiser". Vous pouvez également supprimer l'article de votre choix en cliquant sur le bouton "Supprimer" du produit voulu.<br>
|
18 |
-
Une fois que les choix faits dans votre panier d'achat vous convient, vous pouvez continuer le processus de commande et nous fournir les informations de livraison et de paiement en cliquant sur "Commander".</p>
|
19 |
-
|
20 |
-
<h4>2. Commander</h4>
|
21 |
-
<p>Enregistrez-vous s'il vous plait avec votre adresse email et votre mot de passe dans le cas où vous possédez déjà un compte dans notre boutique. A défaut, veuillez s'il vous plaît vous enregistrer en tant que nouveau client. Vos données sont collectées conformément à la réglementation de protection des données, traités et utilisés selon (<a href="{{store url="politique-de-confidentialite"}}">Politique de confidentialité</a>). Êtes-vous déjà inscrit, vous pouvez sélectionner la méthode d'expédition. En cliquant sur le bouton "Suivant" pour passer à l'ordre de la prochaine étape.
|
22 |
-
</p>
|
23 |
-
|
24 |
-
<h4>3. Vérification de l'adresse de facturation / Choix du mode de paiement</h4>
|
25 |
-
|
26 |
-
<p>Veuillez vérifier votre adresse de facturation et choisissez <a href="{{store url="paiement"}}">votre mode de paiement</a>. Puis cliquez sur "Suivant" pour poursuivre la prochaine étape.</p>
|
27 |
-
|
28 |
-
<h4>4. Vérification de l'adresse de livraison / Choix du mode de livraison</h4>
|
29 |
-
|
30 |
-
<p>Veuillez vérifier votre adresse de facturation et choisissez <a href="{{store url="livraison"}}">votre mode de livraison</a>. Puis cliquez sur "Suivant" pour poursuivre la prochaine étape.</p>
|
31 |
-
|
32 |
-
<h4>5. Remplissage du processus de commande / CGV et politique de retour de marchandise</h4>
|
33 |
-
|
34 |
-
<p>Vous trouverez un sommaire de votre commande: les produits choisis, le mode et l'adresse de livraison ainsi que vos coordonnées personnelles. Vérifiez si toutes les informations fournies sont correctes puis lisez les <a href="{{store url="cgv"}}">conditions générales de vente</a> et les <a href="{{store url="retour"}}">conditions de retour</a>. Vous pouvez confirmer votre commande seulement si vous avez acceptez les CGV et les conditions de retour (cochez la case correspondante). En cliquant sur le bouton "Commander", vous confirmerez l'envoi de votre commande vers nos services.</p>
|
35 |
-
|
36 |
-
<h4>Droit de rétractation</h4>
|
37 |
-
|
38 |
-
<p>Toutes les informations sur les <a href="{{store url="cgv#retractation"}}">droits de rétractation</a></p>.
|
1 |
+
<!--@title Processus de commande @-->
|
2 |
<!--@identifier commande @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
+
<h2><i>Veuillez mentionner les détails du processus de commande ici.</i></h2>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/locale/fr_FR/template/magesetup/page/payment.html
CHANGED
@@ -1,24 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
-
<!--@identifier
|
3 |
<!--@root_template one_column @-->
|
4 |
-
<
|
5 |
-
<p>
|
6 |
-
Le texte placé ci-dessous est seulement un <strong>MODELE</strong> vous permettant de vous aider à créer
|
7 |
-
cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
|
8 |
-
En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
|
9 |
-
</p>
|
10 |
-
|
11 |
-
<h2>Modes de paiement</h2>
|
12 |
-
<p>Nous vous offrons les moyens de paiement suivant. Choisissez celui qui vosu convient le mieux. Les frais d'envoi peuvent être dépendant du mode de paiement choisi.</p>
|
13 |
-
|
14 |
-
<h3>Virement</h3>
|
15 |
-
<p>Veuillez s'il vous plaît effectuer le versement du montant total de votre commande auprès de notre compte bancaire.</p>
|
16 |
-
|
17 |
-
<h3>Facture</h3>
|
18 |
-
<p>Seulement pour les écoles, les administrations et registre du commerce après vérification.</p>
|
19 |
-
|
20 |
-
<h3>Contre-remboursement</h3>
|
21 |
-
<p>Veuillez garder votre facture avec vous; Le livreur n'acceptera à la livraison que de l'argent liquide (pas de chèque). Lors d'un contre-remboursement, des frais de l'ordre de 2 Euros s'ajoutent. Veuillez les régler directement au livreur.</p>
|
22 |
-
|
23 |
-
<h3>Direct Débit direct</h3>
|
24 |
-
<p>Aussitôt que le paiement est confirmé, nous définissons votre commande comme "Payé"</p>
|
1 |
+
<!--@title Mode de paiement @-->
|
2 |
+
<!--@identifier payment @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
+
<h2><i>Veuillez mentionner vos modes de paiement et les information supplémentaires ici.</i></h2>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/locale/fr_FR/template/magesetup/page/privacy.html
CHANGED
@@ -1,24 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
<!--@identifier politique-de-confidentialite @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
-
<h2><i>
|
5 |
-
<p>
|
6 |
-
Le texte placé ci-dessous est seulement un <strong>MODELE</strong> vous permettant de vous aider à créer
|
7 |
-
cette page. Vous devez dans tous les cas modifier ce texte sous CMS > Block statique.
|
8 |
-
En aucun cas, l'association Firegento et Trusted Shop porte la responsabilité de ce texte.
|
9 |
-
</p>
|
10 |
-
|
11 |
-
<p>
|
12 |
-
(Veuillez indiquer l’identité du responsable du traitement)
|
13 |
-
« Les informations recueillies font l’objet d’un traitement informatique destiné à …
|
14 |
-
</p>
|
15 |
-
<p>
|
16 |
-
(Veuillez préciser la finalité)
|
17 |
-
Les destinataires des données sont :………………………
|
18 |
-
(précisez)
|
19 |
-
</p>
|
20 |
-
<p>
|
21 |
-
Conformément à la loi « informatique et libertés » du 6 janvier 1978 modifiée en 2004, vous bénéficiez d’un droit d’accès et de rectification aux informations qui vous concernent, que vous pouvez exercer en vous adressant à ……………………………………
|
22 |
-
(Veuillez préciser le service et l’adresse)
|
23 |
-
</p>
|
24 |
-
<p>Vous pouvez également, pour des motifs légitimes, vous opposer au traitement des données vous concernant.</p>
|
1 |
+
<!--@title Protection des données @-->
|
2 |
<!--@identifier politique-de-confidentialite @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
+
<h2><i>Veuillez mentionner vos informations de protection sur les données ici.</i></h2>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/locale/fr_FR/template/magesetup/page/revocation.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
-
<!--@identifier
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
1 |
+
<!--@title Révocation @-->
|
2 |
+
<!--@identifier revocation @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
app/locale/fr_FR/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formulaire de révocation @-->
|
2 |
+
<!--@identifier revocation_form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/fr_FR/template/magesetup/page/shipping.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
<!--@title Livraison @-->
|
2 |
<!--@identifier livraison @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
-
<h2><i>
|
1 |
<!--@title Livraison @-->
|
2 |
<!--@identifier livraison @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
+
<h2><i>Veuillez mentionner vos modes d'envoi et vos frais de livraison.</i></h2>
|
app/locale/it_IT/FireGento_MageSetup.csv
CHANGED
@@ -1,150 +1,150 @@
|
|
1 |
-
"Display Block below Price","
|
2 |
-
"Display tax info and shipping cost link below the price on all pages","
|
3 |
-
"Display Delivery time on Category Pages","Mostra tempi di consegna nelle categorie"
|
4 |
-
"CMS Page for Shipping Info","Pagina CMS per
|
5 |
-
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Mostra ""
|
|
|
6 |
"No Page","Nessuna pagina"
|
7 |
"No Block","Nessun blocco"
|
8 |
-
"Incl. Tax","
|
9 |
-
"Incl. %s Tax","
|
10 |
-
"Excl. %s Tax","
|
11 |
-
"excl. <a href=""%s"">Shipping Cost</a>","<a href=""%s"">
|
12 |
-
"incl. <a href=""%s"">Shipping Cost</a>","<a href=""%s"">
|
13 |
-
"Display Product Weight below Price","Mostra peso sotto al prezzo"
|
14 |
-
"Unit for Product Weight","Unità di misura
|
15 |
"e.g. g, kg, lb, ...","ad es. g, kg, lb, ..."
|
16 |
"Shipping Weight %s","Peso spedizione %s"
|
17 |
|
18 |
-
"If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Se
|
19 |
-
"Skip installation","
|
20 |
-
"MageSetup has been installed.","MageSetup installato
|
21 |
-
"Click <a href=""%s"">here</a> to set up your pages, blocks, emails and tax settings.","
|
22 |
-
"Please choose the requested setups:","Seleziona
|
23 |
-
"Run MageSetup","
|
24 |
-
"Update System Config Settings","Aggiorna
|
25 |
-
"i.e. newsletter confirmation, account confirmation, ..","
|
26 |
-
"Create CMS Pages and Blocks","Crea
|
27 |
-
"i.e. shipping, conditions, revocation","
|
28 |
-
"Create Checkout Agreements","Crea
|
29 |
-
"Conditions","
|
30 |
-
"Display Checkbox on Frontend","Mostra
|
31 |
-
"Require Confirmation on Customer Registration and/or Checkout","
|
32 |
-
"Language Package for CMS Pages/Blocks/Agreements","Pacchetto
|
33 |
-
"Create Email Templates","
|
34 |
-
"German Email Templates","Template
|
35 |
-
"Configure Tax","
|
36 |
-
"
|
37 |
-
"
|
38 |
-
|
39 |
-
|
40 |
-
"
|
41 |
-
"
|
|
|
|
|
42 |
|
43 |
-
"MageSetup: CMS Blocks and Pages have been created.","MageSetup:
|
44 |
-
"MageSetup: Checkout Agreements have been created.","MageSetup: condizioni di vendita
|
45 |
-
"MageSetup: Email Templates have been created.","MageSetup: template
|
46 |
-
"MageSetup: Tax Settings have been created.","MageSetup:
|
47 |
-
"MageSetup: Product Tax Classes have been updated.","MageSetup: classi
|
48 |
-
"MageSetup: System Config Settings have been updated.","MageSetup:
|
49 |
|
50 |
-
"Imprint","
|
51 |
-
Account,"Conto corrente n°"
|
52 |
"Account owner","Intestatario c/c"
|
53 |
-
"Bank number",
|
54 |
-
"Bank name",Banca
|
55 |
-
CEO,Amministratore
|
56 |
"Owner","Proprietario"
|
57 |
-
"Responsible according to § 5 TMG","
|
58 |
-
"Responsible for content","
|
59 |
-
"Responsible for content address","
|
60 |
-
"Responsible in the interests of the press law","
|
61 |
"E-Mail","E-Mail"
|
62 |
"Fax","Fax"
|
63 |
-
"Financial office","Ufficio
|
64 |
"IBAN","IBAN"
|
65 |
"Clearing","Clearing"
|
66 |
-
"Register court","
|
67 |
-
"Register number","
|
68 |
"SWIFT","SWIFT"
|
69 |
"BIC/SWIFT","BIC/SWIFT"
|
70 |
-
"Tax number","
|
71 |
-
"Telephone","
|
72 |
-
"Web","
|
73 |
-
VAT-ID,"
|
74 |
"Company 1","Ditta 1"
|
75 |
"Company 2","Ditta 2"
|
76 |
-
Street,Via
|
77 |
-
Zip,CAP
|
78 |
-
City,Città
|
79 |
-
Telephone,Telefono
|
80 |
-
"Tax number","
|
81 |
"Register court","Tribunale competente"
|
82 |
-
"Financial office","Ufficio
|
83 |
"Register number","Iscrizione al registro delle imprese n°"
|
84 |
-
"Reference for business rules (physician, physician...)","
|
85 |
-
"Authority (ECG)","Behörde gem. ECG (E-Commerce-Gesetz)"
|
86 |
-
"Shareholdings","Beteiligungen"
|
87 |
-
"Editorial Concept","Blattlinie"
|
88 |
-
"relevant for Austrian shops","relevant für österreichische Shops"
|
89 |
"Account owner","Intestatario c/c"
|
90 |
-
Account,"Conto corrente n°"
|
91 |
-
"Bank number",ABI/CAB
|
92 |
-
"Bank name",Banca
|
93 |
|
94 |
"%s%%","%s%%"
|
95 |
|
96 |
-
"Recommended Extensions","
|
97 |
-
"Popular Payment Methods","Metodi di pagamento popolari"
|
98 |
"Ip anonymization","Mascheramento IP"
|
99 |
-
"Ensures that the ip address of the customers doesnt get involved into the tracking","
|
100 |
|
101 |
-
"Dynamic Shipping Tax Class Calculation","Calcolo dinamico
|
102 |
-
"
|
103 |
|
104 |
-
"Shipping from","
|
105 |
"This setting is base for the tax rate setup!","Questo settaggio è utilizzato per la configurazione delle tasse!"
|
106 |
|
107 |
-
"[Show]","[
|
108 |
-
"Visible in Checkout","Visibile
|
109 |
|
110 |
-
"Display Additional Information","
|
111 |
-
"Display content from text field below at the checkout confirm page directly above the checkout button","
|
112 |
|
113 |
-
"Directory ""%s"" not found. Locale not installed?","
|
114 |
-
"Default Setting","Impostazioni
|
115 |
-
"Use Default Setting","
|
116 |
-
"Select Locale","
|
117 |
-
"Create Transational Email Templates to be managed in the Magento admin area","Crea template
|
118 |
-
"Language Package for Email Templates","Pacchetto
|
119 |
-
"If your desired locale is missing, please check if it installed.","Se
|
120 |
-
"If your desired locale is missing, it is not supported yet by MageSetup.","Se
|
121 |
|
122 |
-
"Configuration Settings","
|
123 |
"CMS Settings","Impostazioni CMS"
|
124 |
-
"Email Settings","Impostazioni
|
125 |
-
"Tax Settings","Impostazioni
|
126 |
|
127 |
-
"Delivery Time","
|
128 |
-
"Shipping Costs","
|
129 |
-
"Hide estimated shipping costs in cart","Nascondi
|
130 |
-
"Replace with a link to the shipping costs cms page","
|
131 |
-
"Here you find information regarding the shipping costs.","
|
132 |
-
"Hide box ""Last Ordered Items""","Nascondi box ""
|
133 |
-
"Tax Settings","Impostazioni
|
134 |
|
135 |
-
"Display on","
|
136 |
-
"On checkout (Magento Default)","
|
137 |
-
"On customer registration (or on checkout, if customer not registered before)","
|
138 |
-
"On customer registration and on checkout","
|
139 |
-
Nowhere,
|
140 |
-
"Agreements not confirmed.","Condizioni di vendita non
|
141 |
|
142 |
-
"
|
143 |
-
"
|
144 |
-
"
|
|
|
145 |
"Cash on Delivery","Contrassegno"
|
146 |
-
"Bank Payment","
|
147 |
-
"Invoice Payment","
|
148 |
-
"Extension Key","
|
149 |
"MagentoConnect","MagentoConnect"
|
150 |
-
"Bank Information","
|
1 |
+
"Display Block below Price","Visualizza il blocco sotto al prezzo"
|
2 |
+
"Display tax info and shipping cost link below the price on all pages","Visualizza il link alle informazioni sulle tasse e ai costi di spedizione sotto al prezzo su tutte le pagine"
|
3 |
+
"Display Delivery time on Category Pages","Mostra i tempi di consegna nelle categorie"
|
4 |
+
"CMS Page for Shipping Info","Pagina CMS per le informazioni delle spedizioni"
|
5 |
+
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Mostra ""incl. costi di spedizione"" invece di ""escl. costi di spedizione"""
|
6 |
+
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Mostra ""incl. costi di spedizione"" invece di ""escl. costi di spedizione"""
|
7 |
"No Page","Nessuna pagina"
|
8 |
"No Block","Nessun blocco"
|
9 |
+
"Incl. Tax","Tasse incluse"
|
10 |
+
"Incl. %s Tax","Incl. %s tasse"
|
11 |
+
"Excl. %s Tax","Escl. %s tasse"
|
12 |
+
"excl. <a href=""%s"">Shipping Cost</a>","escl. <a href=""%s"">costi di spedizione</a>"
|
13 |
+
"incl. <a href=""%s"">Shipping Cost</a>","incl. <a href=""%s"">costi di spedizione</a>"
|
14 |
+
"Display Product Weight below Price","Mostra il peso del prodotto sotto al prezzo"
|
15 |
+
"Unit for Product Weight","Unità di misura del peso del prodotto"
|
16 |
"e.g. g, kg, lb, ...","ad es. g, kg, lb, ..."
|
17 |
"Shipping Weight %s","Peso spedizione %s"
|
18 |
|
19 |
+
"If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Se vuoi aggiungere ulteriori storeview (per ulteriori lingue), sei pregato di farlo prima di compilare questa form."
|
20 |
+
"Skip installation","salta l'installazione"
|
21 |
+
"MageSetup has been installed.","MageSetup è stato installato."
|
22 |
+
"Click <a href=""%s"">here</a> to set up your pages, blocks, emails and tax settings.","clicca <a href=""%s"">qui</a> per configurare le pagine, i blocchi, le email e la tassazione."
|
23 |
+
"Please choose the requested setups:","Seleziona le configurazioni necessarie:"
|
24 |
+
"Run MageSetup","Avvia MageSetup"
|
25 |
+
"Update System Config Settings","Aggiorna le configurazioni di sistema"
|
26 |
+
"i.e. newsletter confirmation, account confirmation, ..","ovvero conferma newsletter, conferma registrazione, .."
|
27 |
+
"Create CMS Pages and Blocks","Crea Pagine e Blocchi CMS"
|
28 |
+
"i.e. shipping, conditions, revocation","ovvero spedizioni, condizioni, resi"
|
29 |
+
"Create Checkout Agreements","Crea Condizioni di Vendita"
|
30 |
+
"Conditions","Condizioni"
|
31 |
+
"Display Checkbox on Frontend","Mostra il Checkout nel Frontend"
|
32 |
+
"Require Confirmation on Customer Registration and/or Checkout","Richiedi conferma alla registrazione e/o al checkout di un cliente"
|
33 |
+
"Language Package for CMS Pages/Blocks/Agreements","Pacchetto traduzioni per Pagine/Blocchi/Condizioni CMS"
|
34 |
+
"Create Email Templates","Crea template delle email"
|
35 |
+
"German Email Templates","Template delle email in tedesco"
|
36 |
+
"Configure Tax","Configura tassazione"
|
37 |
+
"Shipping from Germany","Spedizioni dalla Germania"
|
38 |
+
"All tax settings will be overwritten!","Tutte le configurazioni di tassazione saranno sovrascritte!"
|
39 |
+
"Update Product Tax Classes","Aggiorna le classi fiscali dei prodotti"
|
40 |
+
"Update Customer Tax Classes","Aggiorna le classi fiscali dei clienti"
|
41 |
+
"Old","Vecchio"
|
42 |
+
"New","Nuovo"
|
43 |
+
"No tax","No tasse"
|
44 |
+
"Newsletter Subscribers Status History","Storico degli iscritti alla newsletter"
|
45 |
|
46 |
+
"MageSetup: CMS Blocks and Pages have been created.","MageSetup: Pagine e blocchi CMS sono stati creati."
|
47 |
+
"MageSetup: Checkout Agreements have been created.","MageSetup: Le condizioni di vendita sono state create."
|
48 |
+
"MageSetup: Email Templates have been created.","MageSetup: I template email sono stati creati."
|
49 |
+
"MageSetup: Tax Settings have been created.","MageSetup: Le configurazioni delle tassazioni sono state create."
|
50 |
+
"MageSetup: Product Tax Classes have been updated.","MageSetup: Le classi fiscali dei prodotti sono state create."
|
51 |
+
"MageSetup: System Config Settings have been updated.","MageSetup: Le configurazioni di sistema sono state aggiornate."
|
52 |
|
53 |
+
"Imprint","Informazioni negozio"
|
54 |
+
"Account","Conto corrente n°"
|
55 |
"Account owner","Intestatario c/c"
|
56 |
+
"Bank number","Bank number"
|
57 |
+
"Bank name","Banca"
|
58 |
+
"CEO","Amministratore"
|
59 |
"Owner","Proprietario"
|
60 |
+
"Responsible according to § 5 TMG","Responsabile secondo § 5 TMG"
|
61 |
+
"Responsible for content","Responsabile contenuti"
|
62 |
+
"Responsible for content address","Indirizzo del resp. contenuti"
|
63 |
+
"Responsible in the interests of the press law","Responsabile stampa"
|
64 |
"E-Mail","E-Mail"
|
65 |
"Fax","Fax"
|
66 |
+
"Financial office","Ufficio triburatio"
|
67 |
"IBAN","IBAN"
|
68 |
"Clearing","Clearing"
|
69 |
+
"Register court","Tribunale competente"
|
70 |
+
"Register number","Iscrizione al registro delle imprese n°"
|
71 |
"SWIFT","SWIFT"
|
72 |
"BIC/SWIFT","BIC/SWIFT"
|
73 |
+
"Tax number","Numero di identificazione con le autorità fiscali"
|
74 |
+
"Supplementary Information for Telephone","Supplementary Information for Telephone"
|
75 |
+
"Web","Pagina web"
|
76 |
+
"VAT-ID","Numero di partita IVA"
|
77 |
"Company 1","Ditta 1"
|
78 |
"Company 2","Ditta 2"
|
79 |
+
"Street","Via"
|
80 |
+
"Zip","CAP"
|
81 |
+
"City","Città"
|
82 |
+
"Telephone","Telefono"
|
83 |
+
"Tax number","Tax number"
|
84 |
"Register court","Tribunale competente"
|
85 |
+
"Financial office","Ufficio finanziario"
|
86 |
"Register number","Iscrizione al registro delle imprese n°"
|
87 |
+
"Reference for business rules (physician, physician...)","Riferimento regolamentazione lavorativo"
|
|
|
|
|
|
|
|
|
88 |
"Account owner","Intestatario c/c"
|
89 |
+
"Account","Conto corrente n°"
|
90 |
+
"Bank number","ABI/CAB"
|
91 |
+
"Bank name","Banca"
|
92 |
|
93 |
"%s%%","%s%%"
|
94 |
|
95 |
+
"Recommended Extensions","Estensioni suggerite"
|
96 |
+
"Popular Payment Methods in Germany","Metodi di pagamento popolari"
|
97 |
"Ip anonymization","Mascheramento IP"
|
98 |
+
"Ensures that the ip address of the customers doesnt get involved into the tracking","Assicura che l'IP del cliente non venga coinvolto nel tracciamento"
|
99 |
|
100 |
+
"Dynamic Shipping Tax Class Calculation","Calcolo dinamico della classe fiscale delle spedizioni"
|
101 |
+
"<b>ATTENTION:</b> This setting overwrites the ""Tax Class for Shipping"" setting above!","<b>ATTENZIONE:</b> Questa impostazione sovrascrive la configurazione ""Classe fiscale per le spedizioni"" di cui sopra!"
|
102 |
|
103 |
+
"Shipping from","Spedito da"
|
104 |
"This setting is base for the tax rate setup!","Questo settaggio è utilizzato per la configurazione delle tasse!"
|
105 |
|
106 |
+
"[Show]","[Visualizza]"
|
107 |
+
"Visible in Checkout","Visibile nel Checkout"
|
108 |
|
109 |
+
"Display Additional Information","Visualizza informazioni aggiuntive"
|
110 |
+
"Display content from text field below at the checkout confirm page directly above the checkout button","Visualizza il contenuto dal campo di testo sotto nella pagina di conferma del checkout subito sopra al bottone di conferma"
|
111 |
|
112 |
+
"Directory ""%s"" not found. Locale not installed?","La directory ""%s"" non è stata trovata. Locale non installato?"
|
113 |
+
"Default Setting","Impostazioni di default"
|
114 |
+
"Use Default Setting","Usa le impostazioni di default"
|
115 |
+
"Select Locale","Seleziona le impostazioni Locali"
|
116 |
+
"Create Transational Email Templates to be managed in the Magento admin area","Crea i template delle email transazionali per essere gestiti nel backend di Magento"
|
117 |
+
"Language Package for Email Templates","Pacchetto traduzioni per i template delle email"
|
118 |
+
"If your desired locale is missing, please check if it installed.","Se manca la tua traduzione preferita, verifica se è installata."
|
119 |
+
"If your desired locale is missing, it is not supported yet by MageSetup.","Se manca la tua traduzione preferita, non è ancora supportata da MageSetup."
|
120 |
|
121 |
+
"Configuration Settings","Configurazioni"
|
122 |
"CMS Settings","Impostazioni CMS"
|
123 |
+
"Email Settings","Impostazioni Email"
|
124 |
+
"Tax Settings","Impostazioni Tassazione"
|
125 |
|
126 |
+
"Delivery Time","Data di consegna"
|
127 |
+
"Shipping Costs","Costi di spedizione"
|
128 |
+
"Hide estimated shipping costs in cart","Nascondi i costi di spedizione presunti nel carrello"
|
129 |
+
"Replace with a link to the shipping costs cms page","Sostituiscili con un link alla pagina CMS dei costi di spedizione"
|
130 |
+
"Here you find information regarding the shipping costs.","Qui puoi trovare informazioni sui costi di spedizione."
|
131 |
+
"Hide box ""Last Ordered Items""","Nascondi box ""Gli ultimi prodotti ordinati"""
|
132 |
+
"Tax Settings","Impostazioni Tassazione"
|
133 |
|
134 |
+
"Display on","Visualizza su"
|
135 |
+
"On checkout (Magento Default)","Sul checkout (predefinito di Magento)"
|
136 |
+
"On customer registration (or on checkout, if customer not registered before)","Sulla registrazione utente (o nel checkout, se il cliente non si è registrato in precedenza)"
|
137 |
+
"On customer registration and on checkout","Sulla registrazione utente e sul checkout"
|
138 |
+
"Nowhere","Da nessuna parte"
|
139 |
+
"Agreements not confirmed.","Condizioni di vendita non confermate."
|
140 |
|
141 |
+
"German Language Pack","Pacchetto traduzioni tedesco"
|
142 |
+
"Base Price","Prezzo base"
|
143 |
+
"Newsletter Unsubscription for Guests, Double Opt In for registered Customers","Disiscrizione dalla newsletter per ospiti, Double Opt In per clienti registrati"
|
144 |
+
"Debit Payment","Carta di Debito"
|
145 |
"Cash on Delivery","Contrassegno"
|
146 |
+
"Bank Payment","Bonifico Bancario"
|
147 |
+
"Invoice Payment","Invoice Payment"
|
148 |
+
"Extension Key","Chiave Estensione"
|
149 |
"MagentoConnect","MagentoConnect"
|
150 |
+
"Bank Information","Informazioni della Banca"
|
app/locale/it_IT/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Digital Goods @-->
|
2 |
+
<!--@checkbox_text I consent to the starting of the supply of the digital content during the legal cooling off period and I acknowledge that my right to cancel the contract will be lost with this consent to start the supply of the digital content. @-->
|
app/locale/it_IT/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Services @-->
|
2 |
+
<!--@checkbox_text I expressly request you to start the service during the legal cooling off period and acknowledge that my right to cancel the contract will be lost once the contract has been fully performed. I recognize that I will have to pay for the services provided if I cancel the contract despite my express request to start the service within the legal cooling off period. @-->
|
app/locale/it_IT/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
<!--@title Diritto di recesso @-->
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<!--@title Diritto di recesso @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Sei pregato di inserire la tua Dichiarazione di Reso qui. Evita di inserire informazioni contrastanti con il diritto di reso nelle altre pagine informative.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ATTENZI0NE: A partire dal 13 Giugno 2014 le opzioni di reso sono cancellate a causa dell'adozione della Direttiva sui Diritti dei Consumatori VRRL.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='revocation_form'}}">Esempio di modulo di reso</a></p>
|
app/locale/it_IT/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Withdrawal Form @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Modulo di reso</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
In accordo con le leggi recenti, il consumatore deve essere informato sulle modalit� di reso prima dell'inserimento dell'ordine. Da non confondere con la dichiarazione di recesso e deve essere utilizzato indipendentemente dalla dichiarazione. Inoltre, il modulo di recesso deve essere fornito al consumatore su un supporto durevole. � opportuno inserire questo modulo sotto la dichiarazione di recesso in modo che il consumatore riceva la dichiarazione di recesso e il modulo di recesso in un unico documento.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
A<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
via fax a: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
o via email a: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
Io/ Noi<sup>*</sup> revochiamo il contratto concluso con me/ noi per l'acquisto dei seguenti prodotti/ la fornitura dei seguenti servizi<sup>*</sup>.
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Data ordine<sup>*</sup>/ data ricezione<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Nome del consumatore
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
Indirizzo del consumatore
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Firma del consumatore <em>(necessaria solo per comunicazioni cartacee)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Data
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> Rimuovere se non applicabile.
|
51 |
+
</p>
|
app/locale/it_IT/template/magesetup/page/business_terms.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
-
<!--@identifier
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="business_terms"}}
|
1 |
+
<!--@title Business Terms @-->
|
2 |
+
<!--@identifier business_terms @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/it_IT/template/magesetup/page/imprint.html
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<!--@title Note legali @-->
|
2 |
<!--@identifier note-legali @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
-
<
|
5 |
|
6 |
<p>I testi a seguito hanno esclusivamente scopo dimostrativo e
|
7 |
devono essere sostituiti con informazioni corrette modificando
|
1 |
<!--@title Note legali @-->
|
2 |
<!--@identifier note-legali @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
+
<h2><i>Si prega di inserire le informazioni del negozio qui.</i></h2>
|
5 |
|
6 |
<p>I testi a seguito hanno esclusivamente scopo dimostrativo e
|
7 |
devono essere sostituiti con informazioni corrette modificando
|
app/locale/it_IT/template/magesetup/page/order.html
CHANGED
@@ -41,13 +41,3 @@ spedizione</a> che preferite. Facendo click su "Avanti" potrete accedere al pass
|
|
41 |
<h4>5. Invio dell'ordine / CGV e diritto di recesso</h4>
|
42 |
|
43 |
<p>La pagina successiva contiene un quadro dettagliato del vostro ordine: i prodotti selezionati,
|
44 |
-
gli indirizzi di fatturazione e spedizione, i metodi di spedizione e pagamento selezionati e i
|
45 |
-
vostri recapiti. Verificate la correttezza di questi dati e controllate le nostre
|
46 |
-
<a href="{{store url="condizioni-generali-di-vendita"}}">Condizioni generali di vendita</a> e
|
47 |
-
l'informativa sul <a href="{{store url="diritto-di-recesso"}}">diritto di recesso</a> con attenzione.
|
48 |
-
Potete ora procedere all'acquisto, dichiarando di avere letto e accettato le CGV e il diritto di recesso.
|
49 |
-
Facendo click su "Acquista" riceveremo il vostro ordine.</p>
|
50 |
-
|
51 |
-
<h4>Diritto di recesso</h4>
|
52 |
-
|
53 |
-
<p>Maggiori informazioni in merito al <a href="{{store url="condizioni-generali-di-vendita#recesso"}}">Diritto di recesso</a></p>
|
41 |
<h4>5. Invio dell'ordine / CGV e diritto di recesso</h4>
|
42 |
|
43 |
<p>La pagina successiva contiene un quadro dettagliato del vostro ordine: i prodotti selezionati,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
app/locale/it_IT/template/magesetup/page/revocation.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
<!--@title Diritto di recesso @-->
|
2 |
-
<!--@identifier
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
1 |
<!--@title Diritto di recesso @-->
|
2 |
+
<!--@identifier diritto_di_recesso @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
app/locale/it_IT/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<!--@identifier revocation_form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/pl_PL/template/magesetup/agreement/business_terms.html
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
1 |
+
<!--@name Regulamin @-->
|
2 |
+
<!--@checkbox_text Znam warunki korzystania i całkowicie się z nimi zgadzam. @-->
|
3 |
+
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/pl_PL/template/magesetup/agreement/revocation.html
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
1 |
+
<!--@name Odwołanie @-->
|
2 |
+
<!--@checkbox_text Znam zasady odwołania. @-->
|
3 |
+
{{block type="cms/block" block_id="revocation"}}
|
app/locale/pl_PL/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Zwrot dóbr cyfrowych @-->
|
2 |
+
<!--@checkbox_text Zgadzam się z ... (wpisz tekst) @-->
|
app/locale/pl_PL/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Rezygnacja ze świadczenia usług @-->
|
2 |
+
<!--@checkbox_text Zgadzam sie z ... (wpisz tekst) @-->
|
app/locale/pl_PL/template/magesetup/block/business_terms.html
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<h3 style="color:red;">
|
2 |
+
<em>Wprowadź warunki zakupów</em>
|
3 |
+
</h3>
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
Użyj następującego kodu tagu, aby zintegrować politykę zwrotów z regulaminem.
|
6 |
+
</p>
|
7 |
+
{{block type="cms/block" block_id="revocation"}}
|
app/locale/pl_PL/template/magesetup/block/revocation.html
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<h3 style="color:red;">
|
2 |
+
<em>Wprowadź deklarację zwrotu. Unikaj konfliktów informacji z prawem odstąpienia od umowy zawartym na innych stronach informacyjnych.</em>
|
3 |
+
</h3>
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
UWAGA: Od 13 czerwca 2014 opcja polityki zwrotów została anulowana z powodu przyjęcia Dyrektywy o Prawach Konsumenta.
|
6 |
+
</p>
|
7 |
+
<hr/>
|
8 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/pl_PL/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<h3 style="font-style:italic; color:red;">Formularz zwrotu</h3>
|
2 |
+
|
3 |
+
<p style="font-style:italic; color:red;">
|
4 |
+
Zgodnie z nowymi ustaleniami, użytkownik musi zostać poinformowany o formularzu zwrotu przed złożeniem zamówienia. Nie mylić ze zleceniem zwrotu i używać niezależnie od siebie. Co więcej, formularz zwrotu musi być zostać dostarczony klientowi na trwałym nośniku. Właściwym jest umieszczenie tego formularza pod zleceniem zwrotu tak, że konsument otrzyma zlecenie zwrotu oraz formularz zwrotu w formie jednego dokumentu.
|
5 |
+
<hr/>
|
6 |
+
</p>
|
7 |
+
|
8 |
+
<p>
|
9 |
+
Jeżeli chcesz odstąpić od umowy, proszę wypełnić ten formularz i wysłać do nas.
|
10 |
+
</p>
|
11 |
+
<p>
|
12 |
+
Do<br/>
|
13 |
+
<strong>
|
14 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
16 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
17 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
18 |
+
</strong>
|
19 |
+
</p>
|
20 |
+
<p>
|
21 |
+
faksem na numer: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
22 |
+
lub e-mailem na adres: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
23 |
+
</p>
|
24 |
+
<p>
|
25 |
+
Ja/My<sup>*</sup> odstępuję/emy od zawartej umowy zakupu następujących produktów/ umowy dostarczenia następujących usług<sup>*</sup>.
|
26 |
+
</p>
|
27 |
+
<p style="min-height:200px;">
|
28 |
+
|
29 |
+
</p>
|
30 |
+
|
31 |
+
<p style="padding-top:14px;">
|
32 |
+
<hr style="width:50%;">
|
33 |
+
Data zamówienia<sup>*</sup>/ data otrzymania<sup>*</sup>
|
34 |
+
</p>
|
35 |
+
<p style="padding-top:14px;">
|
36 |
+
<hr style="width:50%;">
|
37 |
+
Imię i nazwisko
|
38 |
+
</p>
|
39 |
+
<p style="padding-top:14px;">
|
40 |
+
<hr style="width:50%;">
|
41 |
+
Adres
|
42 |
+
</p>
|
43 |
+
<p style="padding-top:14px;">
|
44 |
+
<hr style="width:50%;">
|
45 |
+
Podpis <em>(wymagany tylko przy wersji papierowej)</em>
|
46 |
+
</p>
|
47 |
+
<p style="padding-top:14px;">
|
48 |
+
<hr style="width:50%;">
|
49 |
+
Data
|
50 |
+
</p>
|
51 |
+
<p>
|
52 |
+
<sup>*</sup> Skreślić niepotrzebne.
|
53 |
+
</p>
|
app/locale/pl_PL/template/magesetup/page/404.html
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Strona nie istnieje @-->
|
2 |
+
<!--@identifier no-route @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>404 - strona nie istnieje.</em>
|
6 |
+
</h3>
|
7 |
+
|
8 |
+
<p style="color:red;">Zastąp ten tekst.</p>
|
9 |
+
<ul>
|
10 |
+
<li><a href="{{store url='catalogsearch/advanced'}}">Wyszukiwanie zaawansowane</a></li>
|
11 |
+
<li><a href="{{store url=''}}">Strona główna</a></li>
|
12 |
+
</ul>
|
app/locale/pl_PL/template/magesetup/page/business_terms.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Warunki zakupów @-->
|
2 |
+
<!--@identifier business-terms @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/pl_PL/template/magesetup/page/imprint.html
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Znak firmowy @-->
|
2 |
+
<!--@identifier imprint @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>Zamień ten tekst na znak firmowy.</em>
|
6 |
+
</h3>
|
7 |
+
|
8 |
+
<h2>Znak firmowy</h2>
|
9 |
+
|
10 |
+
<h3>{{block type="magesetup/imprint_field" value="shop_name"}}</h3>
|
11 |
+
|
12 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/address.phtml"}}</p>
|
13 |
+
|
14 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/communication.phtml"}}</p>
|
15 |
+
|
16 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/legal.phtml"}}</p>
|
17 |
+
|
18 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/tax.phtml"}}</p>
|
19 |
+
|
20 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/bank.phtml"}}</p>
|
21 |
+
|
22 |
+
<p>{{block type="magesetup/imprint_field" value="business_rules"}}</p>
|
app/locale/pl_PL/template/magesetup/page/order.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Zamówienie @-->
|
2 |
+
<!--@identifier order @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>Zastąp ten tekst metodami oraz warunkami zamówienia.</em>
|
6 |
+
</h3>
|
app/locale/pl_PL/template/magesetup/page/payment.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Płatność @-->
|
2 |
+
<!--@identifier payment @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>Zastąp tekst metodami i warunkami płatności.</em>
|
6 |
+
</h3>
|
app/locale/pl_PL/template/magesetup/page/privacy.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Polityka prywatności @-->
|
2 |
+
<!--@identifier privacy-policy @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>Zamień ten tekst na politykę prywatności.</em>
|
6 |
+
</h3>
|
app/locale/pl_PL/template/magesetup/page/revocation.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Zwrot @-->
|
2 |
+
<!--@identifier revocation @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation"}}
|
app/locale/pl_PL/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formularz zwrotu @-->
|
2 |
+
<!--@identifier revocation-form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/pl_PL/template/magesetup/page/shipping.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Wysyłka @-->
|
2 |
+
<!--@identifier shipping @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>Zastąp tekst warunkami wysyłki.</em>
|
6 |
+
</h3>
|
app/locale/ro_RO/template/magesetup/agreement/business_terms.html
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
1 |
+
<!--@name Termeni și condiții @-->
|
2 |
+
<!--@checkbox_text Am citit termenii și condițiile generale și sunt de acord să-i explicit. @-->
|
3 |
+
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/ro_RO/template/magesetup/agreement/revocation.html
ADDED
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
1 |
+
<!--@name Instrucțiuni pentru revocare @-->
|
2 |
+
<!--@checkbox_text Am citit instruc?iunile de retragere. @-->
|
3 |
+
{{block type="cms/block" block_id="revocation"}}
|
app/locale/ro_RO/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Instructiuni de revocare pentru conținut digital @-->
|
2 |
+
<!--@checkbox_text Am citit instrucțiunile de retragere. (produse digitale) @-->
|
app/locale/ro_RO/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Instructiuni de revocare pentru servicii @-->
|
2 |
+
<!--@checkbox_text Am citit instrucțiunile de retragere. (produse de servicii) @-->
|
app/locale/ro_RO/template/magesetup/block/business_terms.html
ADDED
@@ -0,0 +1,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<h3 style="color:red;">
|
2 |
+
<em>Inserați Termenii dvs. de Afaceri aici.</em>
|
3 |
+
</h3>
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
Utilizați următoarea etichetă de cod pentru a integra politica de revocare în termenii și Condițiile dvs.:
|
6 |
+
</p>
|
7 |
+
{{block type="cms/block" block_id="revocation"}}
|
app/locale/ro_RO/template/magesetup/block/revocation.html
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<h3 style="color:red;">
|
2 |
+
<em>Introduceți-vă Declarația de Revocare aici. Evitați informațiile conflictuale despre dreptul de retragere de pe alte pagini de informare.</em>
|
3 |
+
</h3>
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
ATENȚIE: Din/ de la 13 Iunie 2014 opțiunea de politică de returnare e anulată datorită adoptării Directivei Drepturilor Consumatorului VRRL.
|
6 |
+
</p>
|
7 |
+
<hr/>
|
8 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/ro_RO/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<h3 style="font-style:italic; color:red;">Model formular retragere</h3>
|
2 |
+
|
3 |
+
<p style="font-style:italic; color:red;">
|
4 |
+
Conform cu legislația recentă consumatorul trebuie să fie informat cu privire la formularul de retragere înaintea plasării comenzii. A nu se confunda cu declarația de retragere și a se folosi independent de această declarație. Mai mult, formularul de retragere trebuie să fie pus la dispoziția consumatorului pe un mediu durabil. Este potrivită plasarea acestui formular sub declarația de retragere astfel încât consumatorul să primească declarația de retragere și formularul de retragere într-un singur document.
|
5 |
+
<hr/>
|
6 |
+
</p>
|
7 |
+
|
8 |
+
<p>
|
9 |
+
Dacă doriți să revocați contractul, vă rugăm completați acest formular și trimiteți-l înapoi la noi.
|
10 |
+
</p>
|
11 |
+
<p>
|
12 |
+
To<br/>
|
13 |
+
<strong>
|
14 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
16 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
17 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
18 |
+
</strong>
|
19 |
+
</p>
|
20 |
+
<p>
|
21 |
+
prin fax la: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
22 |
+
sau prin e-mail la: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
23 |
+
</p>
|
24 |
+
<p>
|
25 |
+
Eu/noi<sup>*</sup> revoc(ăm) contractul încheiat de mine/noi pentru achiziția următoarelor produse/ prestarea următoarelor servicii<sup>*</sup>.
|
26 |
+
</p>
|
27 |
+
<p style="min-height:200px;">
|
28 |
+
|
29 |
+
</p>
|
30 |
+
|
31 |
+
<p style="padding-top:14px;">
|
32 |
+
<hr style="width:50%;">
|
33 |
+
Dată comandă<sup>*</sup>/ dată primire<sup>*</sup>
|
34 |
+
</p>
|
35 |
+
<p style="padding-top:14px;">
|
36 |
+
<hr style="width:50%;">
|
37 |
+
Numele consumatorului
|
38 |
+
</p>
|
39 |
+
<p style="padding-top:14px;">
|
40 |
+
<hr style="width:50%;">
|
41 |
+
Adresa consumatorului
|
42 |
+
</p>
|
43 |
+
<p style="padding-top:14px;">
|
44 |
+
<hr style="width:50%;">
|
45 |
+
Semnătura consumatorului <em>(necesară numai pentru comunicarea pe hârtie)</em>
|
46 |
+
</p>
|
47 |
+
<p style="padding-top:14px;">
|
48 |
+
<hr style="width:50%;">
|
49 |
+
Date
|
50 |
+
</p>
|
51 |
+
<p>
|
52 |
+
<sup>*</sup> Vă rugăm eliminați dacă nu se aplică.
|
53 |
+
</p>
|
app/locale/ro_RO/template/magesetup/page/404.html
ADDED
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Pagina nu a fost gasita @-->
|
2 |
+
<!--@identifier no-route @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h2>404 - Pagina nu a fost găsită</h2>
|
5 |
+
<p>Va rugam sa folositi: <a href="{{store url="catalogsearch/advanced"}}">Căutare</a> sau <a href="{{store url=""}}">Pagina de start</a></p>
|
6 |
+
<ul>
|
7 |
+
<li><a href="{{store url='catalogsearch/advanced'}}">Căutare</a></li>
|
8 |
+
<li><a href="{{store url=''}}">Pagina de start</a></li>
|
9 |
+
</ul>
|
app/locale/ro_RO/template/magesetup/page/business_terms.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Termeni și condiții @-->
|
2 |
+
<!--@identifier business_terms @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="business_terms"}}
|
app/locale/ro_RO/template/magesetup/page/imprint.html
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Contact @-->
|
2 |
+
<!--@identifier imprint @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h1>Imprima (Disclaimer)</h1>
|
5 |
+
|
6 |
+
<p>Vă rugăm să adăugați:</p>
|
7 |
+
|
8 |
+
<h2>Imprima</h2>
|
9 |
+
|
10 |
+
<h3>{{block type="magesetup/imprint_field" value="shop_name"}}</h3>
|
11 |
+
|
12 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/address.phtml"}}</p>
|
13 |
+
|
14 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/communication.phtml"}}</p>
|
15 |
+
|
16 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/legal.phtml"}}</p>
|
17 |
+
|
18 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/tax.phtml"}}</p>
|
19 |
+
|
20 |
+
<p>{{block type="magesetup/imprint_content" template="magesetup/imprint/bank.phtml"}}</p>
|
21 |
+
|
22 |
+
<p>{{block type="magesetup/imprint_field" value="business_rules"}}</p>
|
app/locale/ro_RO/template/magesetup/page/order.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Procesul de cumparare @-->
|
2 |
+
<!--@identifier order @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h1>Descriere a unui ordin</h1>
|
5 |
+
|
6 |
+
<p>Vă rugăm să adăugați</p>
|
app/locale/ro_RO/template/magesetup/page/payment.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Modalitati de plata @-->
|
2 |
+
<!--@identifier payment @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h1>Descrierea de plată</h1>
|
5 |
+
|
6 |
+
<p>Vă rugăm să adăugați</p>
|
app/locale/ro_RO/template/magesetup/page/privacy.html
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Politica de confidențialitate @-->
|
2 |
+
<!--@identifier privacy-policy @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h3 style="color:red;">
|
5 |
+
<em>Înlocuiți acest text cu Politica dvs. de Confidențialitate.</em>
|
6 |
+
</h3>
|
app/locale/ro_RO/template/magesetup/page/revocation.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Instrucțiuni pentru revocare @-->
|
2 |
+
<!--@identifier revocation @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation"}}
|
app/locale/ro_RO/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular de revocare @-->
|
2 |
+
<!--@identifier revocation-form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/ro_RO/template/magesetup/page/shipping.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Livrare @-->
|
2 |
+
<!--@identifier shipping @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
<h2><i>Pune aici costurile de expediere și detalii suplimentare de la livrare.</i></h2>
|
app/locale/ru_RU/FireGento_MageSetup.csv
CHANGED
@@ -80,7 +80,7 @@
|
|
80 |
"Ensures that the ip address of the customers doesnt get involved into the tracking","Гарантирует, что IP адреса клиентов не отслеживаются"
|
81 |
|
82 |
"Dynamic Shipping Tax Class Calculation","Динамические вычисление налогового класса доставки"
|
83 |
-
"
|
84 |
|
85 |
"Germany","Германия"
|
86 |
"Austria","Австрия"
|
80 |
"Ensures that the ip address of the customers doesnt get involved into the tracking","Гарантирует, что IP адреса клиентов не отслеживаются"
|
81 |
|
82 |
"Dynamic Shipping Tax Class Calculation","Динамические вычисление налогового класса доставки"
|
83 |
+
"<b>ATTENTION:</b> This setting overwrites the ""Tax Class for Shipping"" setting above!","<b>ВНИМАНИЕ:</b> Эта настройка заменяет настройку ""Налоговый класс на доставку"", расположенную выше!"
|
84 |
|
85 |
"Germany","Германия"
|
86 |
"Austria","Австрия"
|
app/locale/ru_RU/template/magesetup/agreement/revocation_digital.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Digital Goods @-->
|
2 |
+
<!--@checkbox_text I consent to the starting of the supply of the digital content during the legal cooling off period and I acknowledge that my right to cancel the contract will be lost with this consent to start the supply of the digital content. @-->
|
app/locale/ru_RU/template/magesetup/agreement/revocation_service.html
ADDED
@@ -0,0 +1,2 @@
|
|
|
|
|
1 |
+
<!--@name Revocation for Services @-->
|
2 |
+
<!--@checkbox_text I expressly request you to start the service during the legal cooling off period and acknowledge that my right to cancel the contract will be lost once the contract has been fully performed. I recognize that I will have to pay for the services provided if I cancel the contract despite my express request to start the service within the legal cooling off period. @-->
|
app/locale/ru_RU/template/magesetup/block/revocation.html
CHANGED
@@ -1,2 +1,9 @@
|
|
1 |
<!--@title Отмена @-->
|
2 |
-
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
<!--@title Отмена @-->
|
2 |
+
<h3 style="color:red;">
|
3 |
+
<em>Пожалуйста, впишите сюда ваши условия отмены.</em>
|
4 |
+
</h3>
|
5 |
+
<p style="font-style:italic; color:red;">
|
6 |
+
ATTENTION: From / since June 13th 2014 the return policy option is canceled due to the adoption of the Consumer Rights Directive VRRL.
|
7 |
+
</p>
|
8 |
+
<hr/>
|
9 |
+
<p><a href="{{store url='revocation_form'}}">Sample Revocation Form</a></p>
|
app/locale/ru_RU/template/magesetup/block/revocation_form.html
ADDED
@@ -0,0 +1,51 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Withdrawal Form @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Model withdrawal form</h3>
|
3 |
+
|
4 |
+
<p style="font-style:italic; color:red;">
|
5 |
+
According to recent right the consumer has to be informed about the withdrawal form before placing his order. Not to be confused with the withdrawal declaration and needs to be used independently of the declaration. Furhtermore the withdrawal form has to be provided to the consumer on a durable medium. It is appropriate to place this form beneath the withdrawal declaration so that the counsumer receives the withdrawal declaration and the withdrawal form in one document.
|
6 |
+
<hr/>
|
7 |
+
</p>
|
8 |
+
|
9 |
+
<p>
|
10 |
+
To<br/>
|
11 |
+
<strong>
|
12 |
+
{{block type="magesetup/imprint_field" value="shop_name"}}<br/>
|
13 |
+
{{block type="magesetup/imprint_field" value="company_first"}}<br/>
|
14 |
+
{{block type="magesetup/imprint_field" value="street"}}<br/>
|
15 |
+
{{block type="magesetup/imprint_field" value="zip"}} {{block type="magesetup/imprint_field" value="city"}}
|
16 |
+
</strong>
|
17 |
+
</p>
|
18 |
+
<p>
|
19 |
+
by fax to: <strong>{{block type="magesetup/imprint_field" value="fax"}}</strong><br/>
|
20 |
+
or by email to: <strong>{{block type="magesetup/imprint_field" value="email"}}</strong>
|
21 |
+
</p>
|
22 |
+
<p>
|
23 |
+
I/ We<sup>*</sup> revoke the concluded me/ us contract for the purchase of the following products/ the provision of the following service<sup>*</sup>.
|
24 |
+
</p>
|
25 |
+
<p style="min-height:200px;">
|
26 |
+
|
27 |
+
</p>
|
28 |
+
|
29 |
+
<p style="padding-top:14px;">
|
30 |
+
<hr style="width:50%;">
|
31 |
+
Order date<sup>*</sup>/ received date<sup>*</sup>
|
32 |
+
</p>
|
33 |
+
<p style="padding-top:14px;">
|
34 |
+
<hr style="width:50%;">
|
35 |
+
Name of the consumer
|
36 |
+
</p>
|
37 |
+
<p style="padding-top:14px;">
|
38 |
+
<hr style="width:50%;">
|
39 |
+
Address of the consumer
|
40 |
+
</p>
|
41 |
+
<p style="padding-top:14px;">
|
42 |
+
<hr style="width:50%;">
|
43 |
+
Signature of the consumer <em>(only required for communication on paper)</em>
|
44 |
+
</p>
|
45 |
+
<p style="padding-top:14px;">
|
46 |
+
<hr style="width:50%;">
|
47 |
+
Date
|
48 |
+
</p>
|
49 |
+
<p>
|
50 |
+
<sup>*</sup> Please remove if not applicable.
|
51 |
+
</p>
|
app/locale/ru_RU/template/magesetup/page/revocation_form.html
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
1 |
+
<!--@title Formular zur Widerrufsbelehrung @-->
|
2 |
+
<!--@identifier revocation_form @-->
|
3 |
+
<!--@root_template one_column @-->
|
4 |
+
{{block type="cms/block" block_id="revocation_form"}}
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FireGento_MageSetup</name>
|
4 |
-
<version>2.1
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.</summary>
|
10 |
-
<description
|
11 |
<notes></notes>
|
12 |
<authors><author><name>Team FireGento</name><user>team</user><email>team@firegento.com</email></author></authors>
|
13 |
-
<date>
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="FireGento"><dir name="MageSetup"><dir name="Block"><dir name="Adminhtml"><file name="Magesetup.php" hash="c5d17511889aff2964c142d9a7e411c5"/><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Grid.php" hash="6c1343d5bf7b1e9f8f81f947890f4c68"/></dir><file name="Status.php" hash="bdec64f6640b37779a952f2336f882d5"/></dir></dir><file name="Notifications.php" hash="37e23e2fc846c5b3a08ed7a32e6242eb"/></dir><dir name="Bundle"><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="51ec15ede629fb9a0e701a4233096ade"/></dir><file name="Price.php" hash="f04dede6acee295bc46ecc0d7f454cf6"/></dir></dir></dir><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="2edc817c8fb2e110ffe58f20c52f83bf"/></dir><file name="Price.php" hash="164b47917dc5d17e03253a9994305036"/></dir></dir><dir name="Checkout"><file name="Agreements.php" hash="c10dd7f0c03cd4fcf031d654913ae9f9"/><file name="Information.php" hash="6aca66846c7a4f3ee3be57a147b9052f"/></dir><dir name="Customer"><dir name="Account"><file name="Agreements.php" hash="7d64c23ed2ba6d69c94b3aeced08d732"/></dir></dir><file name="Ga.php" hash="4fd2610ae56548f401395d03d3786248"/><dir name="Imprint"><file name="Content.php" hash="6ca7e1de3411e2d01d86f7870d4c7a8b"/><file name="Field.php" hash="d0a4f8c2dd95c431988bf3a118276d99"/></dir></dir><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Configuration.php" hash="2b640af38ba8635efae1e074eac8429c"/></dir></dir><dir name="Checkout"><file name="Data.php" hash="df1e925faa51a16cf2e1c4afe81b05b1"/></dir><file name="Data.php" hash="24cdba7daa4376d29db9bfa55698f21b"/></dir><dir name="Model"><file name="Config.php" hash="e6e1efbc1c3a36a4f8bce98c672797d7"/><dir name="Newsletter"><file name="Observer.php" hash="2b0baec0913d0bab19828762b55240ac"/><dir name="Subscriber"><file name="Status.php" hash="8de5d36199b228a4aadf78e9d29f0606"/></dir></dir><file name="Observer.php" hash="1cfbd8f5c6601a0c58f357eaf9dbd53b"/><dir name="Resource"><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Collection.php" hash="e8ed7ef5a85397b612074bb095fb2798"/></dir><file name="Status.php" hash="e003bab0d4abc1b225d379ee8515724f"/></dir></dir></dir><dir name="Setup"><file name="Abstract.php" hash="fedbb1a5f7ff38b053dff629fb5e8eb3"/><file name="Agreements.php" hash="3479b3c1055687f3e0eb7b98f475ea4c"/><file name="Cms.php" hash="3b177a6b39a9a5dcd0bf8d336939d41b"/><file name="Email.php" hash="bf8e88977a0669dd36f2a662e05a8692"/><file name="Systemconfig.php" hash="fe623f2db0e456e79836f12d06ce5aa7"/><file name="Tax.php" hash="0a3d2291f3e426cf07195a696931467e"/></dir><file name="Setup.php" hash="93714f326a019c1046539623ecb5050c"/><dir name="Source"><file name="AgreementType.php" hash="a294d17f996abf748f32fb427f793554"/><dir name="Cms"><file name="Block.php" hash="b4b1eaee398d4c471a4d61d081f50ede"/><file name="Page.php" hash="6fa5fddba7c16df085c9b31ee33c9ab9"/></dir><dir name="Tax"><file name="CustomerTaxClass.php" hash="c14f649cfa4ef5bfc326c4ab4c1959c4"/><file name="DynamicType.php" hash="6e73d42733c2f56b81cb89ee90fe6067"/><file name="NewCustomerTaxClass.php" hash="688cfb15325809b964a97922898c1906"/><file name="NewProductTaxClass.php" hash="b57d171531d4f293fa24e37927e0c62c"/><file name="ProductTaxClass.php" hash="71209338b07c5963a008a0c4be38d974"/></dir></dir><dir name="Tax"><file name="Config.php" hash="ab8bf2e6969510f0bbfbe31a51eb3dbd"/></dir></dir><dir name="Test"><dir name="Config"><dir name="Main"><dir name="expectations"><file name="testModuleConfig.yaml" hash="fe9f80af6f11096abd54d4b8ee0969a2"/></dir></dir><file name="Main.php" hash="e205467f5371b5c292e3d4b2a0cceb8d"/></dir><dir name="Model"><dir name="Source"><dir name="AgreementType"><dir name="expectations"><file name="testGetOptionArray.yaml" hash="2c9de8f042c422e9da57eae98a6e6d0f"/><file name="testToOptionArray.yaml" hash="30a7c238cc60b24ef6d8c5768e4490b1"/></dir></dir><file name="AgreementType.php" hash="c3a39ba08aac670e169a1ac671981b0f"/><dir name="Tax"><dir name="DynamicType"><dir name="expectations"><file name="testToOptionArray.yaml" hash="e62597bccca0517120bb012a67995008"/></dir></dir><file name="DynamicType.php" hash="4e296520a07507c98dac7d4d3d8f9de8"/></dir></dir></dir><dir name="features"><file name="product_list.feature" hash="b64eb37aa130127af5ff91f02212adf3"/><file name="product_view.feature" hash="705c4b6679d22042a378c1d37ef08590"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="NewsletterController.php" hash="0b18c2d317fa65f05e6d9965b6f5c6ab"/></dir><file name="FrontendController.php" hash="c813c68ab471b437bd56bb8f71b8b469"/><file name="MagesetupController.php" hash="661b105bb6d8756120c4f02091c9ea25"/></dir><dir name="data"><dir name="magesetup_setup"><file name="data-upgrade-2.0.0-2.0.1.php" hash="746f6499217174bf50974e92ef679490"/><file name="data-upgrade-2.0.1-2.0.2.php" hash="ea3c26c5a92dd28d433318cc347185e3"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="bf0eb2bd6a013d68c900d7f5bf2aa35b"/><dir name="at"><file name="email.xml" hash="33155590334e56b7020e8dbf83dbed56"/><file name="tax.xml" hash="ed665f0fe4cca5baa2d9be0ef1c41ff3"/></dir><dir name="ch"><file name="email.xml" hash="33155590334e56b7020e8dbf83dbed56"/><file name="tax.xml" hash="a4c0bcd1d3091d16a63ff318645a4415"/></dir><file name="config.xml" hash="e2c15fdaf400c8c95774defea439d40b"/><dir name="de"><file name="email.xml" hash="ecfcc38b5bbbb7faf0b3a53833507c8d"/><file name="tax.xml" hash="75a5068cab22e73f0d9ccc3ade75fd37"/></dir><dir name="default"><file name="agreement.xml" hash="51a8538a6ef7e757cfab9349e51514f7"/><file name="cms.xml" hash="aea1eaf493a26917edb32a3513f24dc3"/><file name="email.xml" hash="2f184544a556ccd2bf8d71e6a9806138"/><file name="systemconfig.xml" hash="21b80ce10bfe673c1952e5661def9c45"/><file name="tax.xml" hash="f459cc9b0aafc3109f133c54d8fed084"/></dir><dir name="fr"><file name="email.xml" hash="ce3e979f5e119073f71b47c4046f5d5f"/><file name="tax.xml" hash="f3d2482b60419666f4053bdb81dd3428"/></dir><dir name="gb"><file name="tax.xml" hash="f459cc9b0aafc3109f133c54d8fed084"/></dir><dir name="it"><file name="email.xml" hash="8b0545e0c98bb57ba630c7e2efe8f84a"/><file name="tax.xml" hash="f0916bd5dc0592d30200688ec8a95390"/></dir><dir name="nl"><file name="tax.xml" hash="a24fd1ae6346968878a25c4b1640f9f7"/></dir><dir name="ru"><file name="cms.xml" hash="06c1bd4c8c1c25da4e635e1b8a85143f"/><file name="email.xml" hash="34911101ab8a0dbe01814360ae952a6b"/><file name="systemconfig.xml" hash="f5ea7cf75cb125f1ae77adcf96cb2d43"/><file name="tax.xml" hash="f6776296c3ca8310b22f45225160b145"/></dir><file name="system.xml" hash="05b2ed15567983205e81dde33c476892"/></dir><dir name="sql"><dir name="magesetup_setup"><file name="mysql4-install-0.5.0.php" hash="94c61c448c2806703c8c3302a1bd5bd4"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="185360a3e129c9d507b9bc23696ac95f"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="d0c88bfabfda03c6b6fffff4a594da4f"/><file name="mysql4-upgrade-1.1.3-1.1.4.php" hash="615395b2509665e2928b3d9577983623"/><file name="mysql4-upgrade-1.1.4-1.2.0.php" hash="420e0bde8f4179521937aaae47a35b85"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="b601478b45fed57fb148327e80adb6f1"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="6147aac8c9a3ded712e3d0f16161e96b"/><file name="mysql4-upgrade-1.2.2-1.2.3.php" hash="be666ae64d6e1e6ce60e47fa483e2a9a"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FireGento_MageSetup.xml" hash="44fa3504628d001a7374189138d84c72"/></dir></target><target name="magelocale"><dir name="de_AT"><file name="FireGento_MageSetup.csv" hash="1426249fbc630b1911fd87d85d03867a"/></dir><dir name="de_CH"><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="08d8bee54c2fb03eddb0adc23d7e274e"/><file name="revocation.html" hash="05677b80fda54565da0cacedaea4f365"/></dir><dir name="block"><file name="business_terms.html" hash="0f96986590d2a64fd7a2b55e43b7f965"/><file name="revocation.html" hash="0ec2bdedc783b47db6ac538f0e7d7d1b"/></dir><dir name="page"><file name="404.html" hash="be269dd09e9e4290cf44a3a2413bc434"/><file name="business_terms.html" hash="51449b5899f3ba597707bfcfdc90bc76"/><file name="imprint.html" hash="a7ba9cf1f91dd6bd9667999f80d6b63f"/><file name="order.html" hash="d074e7420356a9048f14273f331570e5"/><file name="payment.html" hash="eb09162116067fbcba1ba84c0fb57639"/><file name="privacy.html" hash="a8445b5f751b668e5ff1ac2e9621b0d4"/><file name="revocation.html" hash="6ac5f8d9ba0f55fb8490e213746f424b"/><file name="shipping.html" hash="9f1eccc97f3202833b97d5c46cb431cd"/></dir></dir></dir></dir><dir name="de_DE"><file name="FireGento_MageSetup.csv" hash="91e1a5a0e20ffcf79cb6ee462be4399d"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="08d8bee54c2fb03eddb0adc23d7e274e"/><file name="revocation.html" hash="05677b80fda54565da0cacedaea4f365"/></dir><dir name="block"><file name="business_terms.html" hash="0f96986590d2a64fd7a2b55e43b7f965"/><file name="revocation.html" hash="0ec2bdedc783b47db6ac538f0e7d7d1b"/></dir><dir name="page"><file name="404.html" hash="be269dd09e9e4290cf44a3a2413bc434"/><file name="business_terms.html" hash="51449b5899f3ba597707bfcfdc90bc76"/><file name="imprint.html" hash="a7ba9cf1f91dd6bd9667999f80d6b63f"/><file name="order.html" hash="d074e7420356a9048f14273f331570e5"/><file name="payment.html" hash="eb09162116067fbcba1ba84c0fb57639"/><file name="privacy.html" hash="a8445b5f751b668e5ff1ac2e9621b0d4"/><file name="revocation.html" hash="6ac5f8d9ba0f55fb8490e213746f424b"/><file name="shipping.html" hash="9f1eccc97f3202833b97d5c46cb431cd"/></dir></dir></dir></dir><dir name="en_US"><file name="FireGento_MageSetup.csv" hash="9da5b5e63852554eb725876f5c283a76"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="ef0782b634c45ad53a0b153e4262be31"/><file name="revocation.html" hash="96c3fc8498277ffc7db1c20940e10b22"/></dir><dir name="block"><file name="business_terms.html" hash="d3c29b8986a1280d74e253ef876f8517"/><file name="revocation.html" hash="02ecf946094aaf3d6d359e10c6eb9a15"/></dir><dir name="page"><file name="404.html" hash="ef24222de59d479e006a9854aadd1ab9"/><file name="business_terms.html" hash="5e8a3c758bd5c172cc94eec5872392dd"/><file name="imprint.html" hash="dcff5e560a9b251a34ef6e4cb9db32b8"/><file name="order.html" hash="5a0695c9e9a774b4f1ff6e0b5622eb32"/><file name="payment.html" hash="658621f82e8af8159905c9911df52fdd"/><file name="privacy.html" hash="2c9fde1acd5675293284d01ae95109ab"/><file name="revocation.html" hash="9429eabfa9900c84df6d0e8f842b151d"/><file name="shipping.html" hash="f62421a73c1852867f95b10eddf09562"/></dir></dir></dir></dir><dir name="ru_RU"><file name="FireGento_MageSetup.csv" hash="acde55d24327b8e7afa11da1b4a4b6d6"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="6324cb1d34261c3fc7da453d67b2593a"/><file name="revocation.html" hash="972a311efd9d9a2f81db699601259c61"/></dir><dir name="block"><file name="business_terms.html" hash="f91b5b1fff5c7433cd3193558884925b"/><file name="revocation.html" hash="723c5a812543e38a231ab349c095dd60"/></dir><dir name="page"><file name="404.html" hash="adc9a947957a70181b05e8f0c88fda52"/><file name="business_terms.html" hash="e527de3d77e98664a307d723e9aa804e"/><file name="order.html" hash="86ee34198060a1dcb40fc9577e83f259"/><file name="payment.html" hash="0b613cf5e24e9c0f7b6fa375c94bda14"/><file name="privacy.html" hash="0085ca06f30eb9b42e3a8caaedcd8d8e"/><file name="revocation.html" hash="0ba1d3e52f2a2ebe200d85de52c152bd"/><file name="shipping.html" hash="94ae3eb57647d0390d485a18a8a7b401"/></dir></dir></dir></dir><dir name="fr_CH"><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="06c85aba03fb36477dfc5ed1c0507279"/><file name="revocation.html" hash="a7496f45c125c3967a199dff58bc8ab7"/></dir><dir name="block"><file name="business_terms.html" hash="ad3203fd83cc6f2889e7f9bd6b140416"/><file name="revocation.html" hash="eb7c5d635b68174740983389c5bd1a8e"/></dir><dir name="page"><file name="404.html" hash="3f817bbe5b25886372749e91330b12d3"/><file name="business_terms.html" hash="7b212cf0ae4f65efb1ccaa3a9b45c26b"/><file name="imprint.html" hash="ca94ff740794026ad57c7772d7f9645c"/><file name="order.html" hash="9ace1c990d3960fa3e3a8ddab6a2210f"/><file name="payment.html" hash="72db5b37c9733d050b6760407570105a"/><file name="privacy.html" hash="39342651392d29868d52039d9b860c89"/><file name="revocation.html" hash="76657b8808e2e401e7d7e08b199a0b3c"/><file name="shipping.html" hash="b191377982a1d83230ba88950b1d2a05"/></dir></dir></dir></dir><dir name="fr_FR"><file name="FireGento_MageSetup.csv" hash="ec7107aae02605fe8807ba1f4a9f966e"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="06c85aba03fb36477dfc5ed1c0507279"/><file name="revocation.html" hash="a7496f45c125c3967a199dff58bc8ab7"/></dir><dir name="block"><file name="business_terms.html" hash="ad3203fd83cc6f2889e7f9bd6b140416"/><file name="revocation.html" hash="eb7c5d635b68174740983389c5bd1a8e"/></dir><dir name="page"><file name="404.html" hash="3f817bbe5b25886372749e91330b12d3"/><file name="business_terms.html" hash="7b212cf0ae4f65efb1ccaa3a9b45c26b"/><file name="imprint.html" hash="ca94ff740794026ad57c7772d7f9645c"/><file name="order.html" hash="9ace1c990d3960fa3e3a8ddab6a2210f"/><file name="payment.html" hash="72db5b37c9733d050b6760407570105a"/><file name="privacy.html" hash="39342651392d29868d52039d9b860c89"/><file name="revocation.html" hash="76657b8808e2e401e7d7e08b199a0b3c"/><file name="shipping.html" hash="b191377982a1d83230ba88950b1d2a05"/></dir></dir></dir></dir><dir name="it_IT"><file name="FireGento_MageSetup.csv" hash="137dba02d28adef545266178bc54688a"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="85021eb464bdf7b978c679e88bb0c7e1"/><file name="revocation.html" hash="95064e9a9d4dd388e556974d8bc97135"/></dir><dir name="block"><file name="business_terms.html" hash="def7695e209d28ab27a456aba89ad677"/><file name="revocation.html" hash="7cdfce1c57b093c006800716ee6becce"/></dir><dir name="page"><file name="404.html" hash="8d48a098b3b2f72c0e5ee5ec35d2ad22"/><file name="business_terms.html" hash="bafb85bd7f2fef3a056c353539a9aa4f"/><file name="imprint.html" hash="f77eb86287a8899e9ae786a269ed1ef2"/><file name="order.html" hash="2f5406460c3b33eb2ebbd1bec089c8d8"/><file name="payment.html" hash="94bf4e522c78f55a982eef1d4c719712"/><file name="privacy.html" hash="72d877b7d3402493160bd153ae0fc797"/><file name="revocation.html" hash="ff8e3ecb6b1dbd4f0b203b1f311380d2"/><file name="shipping.html" hash="104b43f4c169f9a3e6f682c50ba77b22"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="magesetup.xml" hash="e553ea10aa94c6b9cb149555fa13b8a6"/></dir><dir name="template"><dir name="magesetup"><file name="extensions.phtml" hash="c7abf7273028986a29e4efad58fe6094"/><file name="form.phtml" hash="a9b37df2885081c82b8c9ed2e71c0046"/><file name="notifications.phtml" hash="5fcb7a336368dca279c8886443397576"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="magesetup.xml" hash="8bab307af56c1bcf09205a66ec305e3f"/></dir><dir name="template"><dir name="magesetup"><dir name="checkout"><file name="additional.phtml" hash="3ed2fc19f501f1fb53e53eabbf157e05"/><dir name="multishipping"><file name="agreements.phtml" hash="2c119d42acd123ad78f8e63923408f74"/><file name="overview.phtml" hash="79fade7c1deb9ef903b832e50f11d20a"/></dir><dir name="onepage"><file name="agreements.phtml" hash="6a422b5e5836212319a7f90bce4c1c24"/></dir></dir><dir name="customer"><dir name="form"><file name="tc-confirmation.phtml" hash="a3762aaec5fb62ea82febc3e83a8fb82"/></dir></dir><file name="delivery_time.phtml" hash="1085de970b06360e1036b258138d34bf"/><dir name="imprint"><file name="address.phtml" hash="20432ca1bbaa4af0d64a87bc91021c2e"/><file name="bank.phtml" hash="aacfd784ac729b62f598a5554e477fc8"/><file name="communication.phtml" hash="a34563d4fb9cf49e09bad8fa6baac8ec"/><file name="email_footer.phtml" hash="e6c935b4dc336c6a36c900272b10c910"/><file name="legal.phtml" hash="3c338a1543185ce973b8d70adbb6ccdf"/><file name="tax.phtml" hash="beb277bc22a2f15be17f671b6f5f57ee"/></dir><file name="price_info.phtml" hash="3c7b41408ae4d298698dc02b8c494305"/><file name="shipping.phtml" hash="73a4c0768e1223b3270c4e26a275ba7f"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="magesetup"><file name="checkout.css" hash="8f2c450d31624e72cd4d927899d4ecb3"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>7.9.9</max></php></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FireGento_MageSetup</name>
|
4 |
+
<version>2.2.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.</summary>
|
10 |
+
<description>See the full list of features including several screenshots at https://github.com/firegento/firegento-magesetup/blob/development/docs/features/features.markdown. Central features of MageSetup are: Setting of important configuration settings per Country; Predefined tax settings and tax classes for shipping from several countries to worldwide destinations; Assign new tax classes to all products (configurable); Creation of email templates based on the local language pack (Legal texts can be added to some templates automatically); Creation and Activation of Checkout Agreements (Agreements can be shown at customer registration instead of or additional to the checkout. They can be required or not); Creation of default CMS pages like imprint, terms and conditions, privacy, shipping, payment methods; Create email templates, cms pages and blocks as well as checkout agreements for store views with a different language as well; Possibility to add tax and/or shipping info to all prices; Automatical generation of meta data to products; Saving of every status change of newsletter subscriptions; Presets are configurable via xml files for every country seperately; Many more.</description>
|
11 |
<notes></notes>
|
12 |
<authors><author><name>Team FireGento</name><user>team</user><email>team@firegento.com</email></author></authors>
|
13 |
+
<date>2015-01-25</date>
|
14 |
+
<time>10:30:26</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="FireGento"><dir name="MageSetup"><dir name="Block"><dir name="Adminhtml"><file name="Magesetup.php" hash="99c5555b120fef2759b2c362b3cb6f4c"/><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Grid.php" hash="77901af39415e90b956861fdf4874590"/></dir><file name="Status.php" hash="9b144225b161e6873fa7319248a59472"/></dir></dir><file name="Notifications.php" hash="9b1aa730e27b60ced71e3bab5096c280"/></dir><dir name="Bundle"><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="5fbc3769950bdb17801f5d369b340c14"/></dir><file name="Price.php" hash="a06b5357a796f465bde817cae8af0689"/></dir></dir></dir><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="46da61fca724813042018a1d25bef45c"/></dir><file name="Price.php" hash="4a74936eeafd0b571c50a7251ba0eb91"/></dir></dir><dir name="Checkout"><file name="Agreements.php" hash="34da9e2078c935131d0c6c4f0b121a7d"/><file name="Information.php" hash="4bb667367eb333cdb98ad374375c4fc4"/></dir><dir name="Customer"><dir name="Account"><file name="Agreements.php" hash="e4c3218d6a480075c4839ffd68e33746"/></dir></dir><dir name="Imprint"><file name="Content.php" hash="97235bb394257733eca27c4000d26548"/><file name="Field.php" hash="bdb286318c8e800e8b4730c114c869ad"/></dir></dir><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Configuration.php" hash="51e02438dfa60e5f1d0657ee9b916d7d"/></dir></dir><dir name="Checkout"><file name="Data.php" hash="35bd571d1fe417c87d88cd2591fdb65b"/></dir><file name="Data.php" hash="6e1d72181bb8bfdd7c6851275d6506ab"/></dir><dir name="Model"><file name="Config.php" hash="14844f5b0e79cb59e620bf72cbd89776"/><dir name="Newsletter"><file name="Observer.php" hash="fa7fc0a1f2d1953411b6f12df4b33c0a"/><dir name="Subscriber"><file name="Status.php" hash="1c22c580e1d6371d5a5e8404b924be84"/></dir></dir><file name="Observer.php" hash="d46c6fcb264b327fb3da33960fade8ed"/><dir name="Resource"><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Collection.php" hash="1a39eb0b8d7c5d9d28bacfe2f42fe4e9"/></dir><file name="Status.php" hash="15548bd6d4e35c8a90262002e46a8b08"/></dir></dir></dir><dir name="Setup"><file name="Abstract.php" hash="ae6c4cdf8d4cf0ce6a6a2360294560d5"/><file name="Agreements.php" hash="fdc543ba72b602651bd6dd61f21836b4"/><file name="Cms.php" hash="48c5e522c6600a43561e780efb62f82a"/><file name="Email.php" hash="d362e3e06d588f9faf43e37b1383aabc"/><file name="Systemconfig.php" hash="5131744b21bde952c1cd83e52460c740"/><file name="Tax.php" hash="d29d3f6b89f6630ad4affab0fc5d9a23"/></dir><file name="Setup.php" hash="d290b12827550e874db142474358a225"/><dir name="Source"><file name="AgreementType.php" hash="ed7cb594ab9c7904d0acd421aea475ac"/><dir name="Cms"><file name="Block.php" hash="b3bc35834be66e3888648315302a7f50"/><file name="Page.php" hash="4c167287500a2d450164575c30e095eb"/></dir><file name="RevocationProductType.php" hash="d08f0fb288daf837958a2311f21ca9b3"/><dir name="Tax"><file name="CustomerTaxClass.php" hash="cf520518a560969538959eaf4bcc1661"/><file name="DynamicType.php" hash="9b4cad4fc2d4ba28f965756a716f2730"/><file name="NewCustomerTaxClass.php" hash="492b226db76e23f5f8dc05d0ff09f091"/><file name="NewProductTaxClass.php" hash="78dd6cc02ea447cd7a09d1aef302da20"/><file name="ProductTaxClass.php" hash="6c540124ad863ad9e74f2b351fb735b5"/></dir></dir><dir name="Tax"><file name="Config.php" hash="7624c02c73d7f2bc21e7a9f83aa02e2b"/></dir></dir><dir name="Test"><dir name="Block"><dir name="Imprint"><dir name="Content"><dir name="expectations"><file name="testGetEmail.yaml" hash="9f818bf5ccbc6a1fa12c1b470e813695"/><file name="testGetWeb.yaml" hash="530af4c66a5195368ca1fe32037680e4"/></dir><dir name="fixtures"><file name="generalImprint.yaml" hash="934a52b32f15683542f7c995b49e1dcf"/></dir><dir name="providers"><file name="testGetEmail.yaml" hash="3bd16e6edeb534f18c436f47e1555075"/><file name="testGetWeb.yaml" hash="bc224101dfc0f4049231a6a3eeb59cd0"/></dir></dir><file name="Content.php" hash="9db5403823b344a065ea83f3cedc448a"/></dir></dir><dir name="Config"><dir name="Main"><dir name="expectations"><file name="testModuleConfig.yaml" hash="bab59a7394272d618a40b98c51c71e91"/></dir></dir><file name="Main.php" hash="f3e36058726ca8f4713e520f57f96e8f"/></dir><dir name="Model"><dir name="Observer"><dir name="fixtures"><file name="testGoogleAnonymizationDisabled.yaml" hash="f5866b144d7c442b7fb6cc672d6f1ea4"/><file name="testGoogleAnonymizationEnabled.yaml" hash="4b347efc44a483a10d4dd703c44acffd"/></dir></dir><file name="Observer.php" hash="9a3848618e75ad075a0413ad5d27d9fb"/><dir name="Source"><dir name="AgreementType"><dir name="expectations"><file name="testGetOptionArray.yaml" hash="2c9de8f042c422e9da57eae98a6e6d0f"/><file name="testToOptionArray.yaml" hash="30a7c238cc60b24ef6d8c5768e4490b1"/></dir></dir><file name="AgreementType.php" hash="2d88cc4f9696425ce9e745f7636d8d67"/><dir name="Tax"><dir name="DynamicType"><dir name="expectations"><file name="testToOptionArray.yaml" hash="9488477b2222e1d8f21bdac5a44e59ec"/></dir></dir><file name="DynamicType.php" hash="0a74dbde74df8f04c7f8a1cf997fd182"/></dir></dir></dir><dir name="features"><file name="product_list.feature" hash="2d4190b881c870cde65486d72843d73a"/><file name="product_view.feature" hash="0434a55fd3640fb2fbe3d97ec4ae94d5"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="MagesetupController.php" hash="c3689f2c5e8a942fbac69a6deab8fb78"/><file name="NewsletterController.php" hash="0dbd444534a7375138a79c90dec5f2c6"/></dir><file name="FrontendController.php" hash="3abe78395cf9dceedecaeed5ef3bc23b"/></dir><dir name="data"><dir name="magesetup_setup"><file name="data-upgrade-2.0.0-2.0.1.php" hash="5692432cbe60cd4a81ae9677814ab160"/><file name="data-upgrade-2.0.1-2.0.2.php" hash="787dabb92ee402b715b96770a678f68b"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="675558ca002a52a0c3ceee7f721db6d7"/><dir name="at"><file name="email.xml" hash="52797f693f793a9da357af183ee49605"/><file name="tax.xml" hash="2be69fc7a2f9f21532ddde8f07eecc35"/></dir><dir name="ch"><file name="email.xml" hash="52797f693f793a9da357af183ee49605"/><file name="tax.xml" hash="5a45467b526bdc179a74f9395faa3251"/></dir><file name="config.xml" hash="08d08454c81577f55d218f6a7eb9ad83"/><dir name="de"><file name="email.xml" hash="52821a6e3b12313a2e23f9b7dc8c6f0b"/><file name="tax.xml" hash="13c60cda40d7cda604e6978a4a09c2fc"/></dir><dir name="default"><file name="agreement.xml" hash="b87196d3e8b48768ca67010b276c6a5e"/><file name="cms.xml" hash="134184c6597cde65f1072706cf6043f4"/><file name="email.xml" hash="be16bfc537d5380631d43eba948d300a"/><file name="systemconfig.xml" hash="b6f4126e18038f8bfbfd00e09e049887"/><file name="tax.xml" hash="8975bb323df16620646ce155a58a6bcb"/></dir><dir name="es"><file name="tax.xml" hash="6ec2dbb21d79a3fe52ca6a1ff33090e0"/></dir><dir name="fr"><file name="email.xml" hash="2441d882b8664a91c0abde3c7a47844d"/><file name="tax.xml" hash="2b8b12aa867e54d10099fc5c859c2588"/></dir><dir name="gb"><file name="tax.xml" hash="8975bb323df16620646ce155a58a6bcb"/></dir><dir name="it"><file name="email.xml" hash="063dea49ecf9bfa674f39fca6b66451e"/><file name="tax.xml" hash="b4af5663aa8eda02375012ce13029c13"/></dir><dir name="nl"><file name="tax.xml" hash="c930912f74508297db8efb46c626bf1c"/></dir><dir name="pl"><file name="email.xml" hash="c39628017071f8d7e0249972fbde6a95"/><file name="tax.xml" hash="954be3553ddb108a7f4457e5d185c832"/></dir><dir name="ro"><file name="email.xml" hash="da0daadea779614c75e213c4e2ded7e3"/><file name="tax.xml" hash="73466782b9e91951f8d4fc47a4e77508"/></dir><dir name="ru"><file name="cms.xml" hash="1de6b740c339de7effc60053d353bb5f"/><file name="email.xml" hash="306c50a2356951b28141263c00cd295d"/><file name="tax.xml" hash="85829ae770e82d3913da7a57f5243556"/></dir><file name="system.xml" hash="1761421f8d1c602ae42dd7d5f70e55b2"/></dir><dir name="sql"><dir name="magesetup_setup"><file name="mysql4-install-0.5.0.php" hash="0e8c1b28a9b22eb65cc564d17481a695"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="8ad120db971ce4622bdd078aabc17616"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="f8b081f27dadfc77b60a98a8a3aa677b"/><file name="mysql4-upgrade-1.1.3-1.1.4.php" hash="e6dcab09e34d8fa726fb0dd40bd1ac54"/><file name="mysql4-upgrade-1.1.4-1.2.0.php" hash="5540eebb24fc38b78db9a5b8a107a3d7"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="d67ada4d4d8923b05d09a5138e6ea294"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="07b9490cc47222578cc817c15b7d852b"/><file name="mysql4-upgrade-1.2.2-1.2.3.php" hash="be9f6c4290e01c19159287eb153a358b"/><file name="mysql4-upgrade-2.1.1-2.2.0.php" hash="33ce2ab3d34ef912961e621bd77caae0"/><file name="mysql4-upgrade-2.2.0-2.2.1.php" hash="43893826a6300c30b4e927d8b2c61d11"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FireGento_MageSetup.xml" hash="ef2a84794e682d2d2ff9c0a606f382c4"/></dir></target><target name="magelocale"><dir name="de_AT"><file name="FireGento_MageSetup.csv" hash="1426249fbc630b1911fd87d85d03867a"/></dir><dir name="de_CH"><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="08d8bee54c2fb03eddb0adc23d7e274e"/><file name="revocation.html" hash="05677b80fda54565da0cacedaea4f365"/><file name="revocation_digital.html" hash="c95a541c842a0a08a5ac525ada2ce470"/><file name="revocation_service.html" hash="cedf232325f863b86aca22d2b5bc7571"/></dir><dir name="block"><file name="business_terms.html" hash="0f96986590d2a64fd7a2b55e43b7f965"/><file name="revocation.html" hash="ec86aa93ec9aace4032dd6ecb1003ed1"/><file name="revocation_form.html" hash="e05c7a1c355715f7134718f2167a3dee"/></dir><dir name="page"><file name="404.html" hash="be269dd09e9e4290cf44a3a2413bc434"/><file name="business_terms.html" hash="51449b5899f3ba597707bfcfdc90bc76"/><file name="imprint.html" hash="a7ba9cf1f91dd6bd9667999f80d6b63f"/><file name="order.html" hash="d074e7420356a9048f14273f331570e5"/><file name="payment.html" hash="eb09162116067fbcba1ba84c0fb57639"/><file name="privacy.html" hash="a8445b5f751b668e5ff1ac2e9621b0d4"/><file name="revocation.html" hash="6ac5f8d9ba0f55fb8490e213746f424b"/><file name="revocation_form.html" hash="f0d8c0e523ef7a17e9c928405dc9d9f1"/><file name="shipping.html" hash="9f1eccc97f3202833b97d5c46cb431cd"/></dir></dir></dir></dir><dir name="de_DE"><file name="FireGento_MageSetup.csv" hash="81569339a756f37b9d0b1cf419ac7a83"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="08d8bee54c2fb03eddb0adc23d7e274e"/><file name="revocation.html" hash="05677b80fda54565da0cacedaea4f365"/><file name="revocation_digital.html" hash="c95a541c842a0a08a5ac525ada2ce470"/><file name="revocation_service.html" hash="cedf232325f863b86aca22d2b5bc7571"/></dir><dir name="block"><file name="business_terms.html" hash="846e8539fe4bd873d6b637a6d305a9af"/><file name="revocation.html" hash="ec86aa93ec9aace4032dd6ecb1003ed1"/><file name="revocation_form.html" hash="e05c7a1c355715f7134718f2167a3dee"/></dir><dir name="page"><file name="404.html" hash="be269dd09e9e4290cf44a3a2413bc434"/><file name="business_terms.html" hash="51449b5899f3ba597707bfcfdc90bc76"/><file name="imprint.html" hash="a7ba9cf1f91dd6bd9667999f80d6b63f"/><file name="order.html" hash="d074e7420356a9048f14273f331570e5"/><file name="payment.html" hash="eb09162116067fbcba1ba84c0fb57639"/><file name="privacy.html" hash="a8445b5f751b668e5ff1ac2e9621b0d4"/><file name="revocation.html" hash="6ac5f8d9ba0f55fb8490e213746f424b"/><file name="revocation_form.html" hash="f0d8c0e523ef7a17e9c928405dc9d9f1"/><file name="shipping.html" hash="9f1eccc97f3202833b97d5c46cb431cd"/></dir></dir></dir></dir><dir name="en_US"><file name="FireGento_MageSetup.csv" hash="dd014f75ad4aaaf0b48d36c0e9a76f27"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="ef0782b634c45ad53a0b153e4262be31"/><file name="revocation.html" hash="96c3fc8498277ffc7db1c20940e10b22"/><file name="revocation_digital.html" hash="57c45c5f1517631a93c3f6092a442580"/><file name="revocation_service.html" hash="7904f62e69dd3eb0b72ac3be792ba910"/></dir><dir name="block"><file name="business_terms.html" hash="d3c29b8986a1280d74e253ef876f8517"/><file name="revocation.html" hash="2e3ebc99fa1f8e62d7afe024e403f9b9"/><file name="revocation_form.html" hash="9f17e339e4654a8f7fa7fd1381429d31"/></dir><dir name="page"><file name="404.html" hash="ef24222de59d479e006a9854aadd1ab9"/><file name="business_terms.html" hash="5e8a3c758bd5c172cc94eec5872392dd"/><file name="imprint.html" hash="dcff5e560a9b251a34ef6e4cb9db32b8"/><file name="order.html" hash="5a0695c9e9a774b4f1ff6e0b5622eb32"/><file name="payment.html" hash="658621f82e8af8159905c9911df52fdd"/><file name="privacy.html" hash="2c9fde1acd5675293284d01ae95109ab"/><file name="revocation.html" hash="9429eabfa9900c84df6d0e8f842b151d"/><file name="revocation_form.html" hash="650da3135b326caf2b082e8a72df09fa"/><file name="shipping.html" hash="f62421a73c1852867f95b10eddf09562"/></dir></dir></dir></dir><dir name="ru_RU"><file name="FireGento_MageSetup.csv" hash="59aa002fa8a2c8785fabb91404afb7ab"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="6324cb1d34261c3fc7da453d67b2593a"/><file name="revocation.html" hash="972a311efd9d9a2f81db699601259c61"/><file name="revocation_digital.html" hash="57c45c5f1517631a93c3f6092a442580"/><file name="revocation_service.html" hash="7904f62e69dd3eb0b72ac3be792ba910"/></dir><dir name="block"><file name="business_terms.html" hash="f91b5b1fff5c7433cd3193558884925b"/><file name="revocation.html" hash="487b87ad1b9c16dc5d26756d007bd2f2"/><file name="revocation_form.html" hash="9f17e339e4654a8f7fa7fd1381429d31"/></dir><dir name="page"><file name="404.html" hash="adc9a947957a70181b05e8f0c88fda52"/><file name="business_terms.html" hash="e527de3d77e98664a307d723e9aa804e"/><file name="order.html" hash="86ee34198060a1dcb40fc9577e83f259"/><file name="payment.html" hash="0b613cf5e24e9c0f7b6fa375c94bda14"/><file name="privacy.html" hash="0085ca06f30eb9b42e3a8caaedcd8d8e"/><file name="revocation.html" hash="0ba1d3e52f2a2ebe200d85de52c152bd"/><file name="revocation_form.html" hash="650da3135b326caf2b082e8a72df09fa"/><file name="shipping.html" hash="94ae3eb57647d0390d485a18a8a7b401"/></dir></dir></dir></dir><dir name="pl_PL"><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="f1da85112eaa87ce5c0ee24e19498098"/><file name="revocation.html" hash="f3f12d969a2c4dced244e4668d0698dd"/><file name="revocation_digital.html" hash="de8afe1556be563be13d88634f0028c0"/><file name="revocation_service.html" hash="d50b2d8d75ed4d4aec7a205fd3f655f4"/></dir><dir name="block"><file name="business_terms.html" hash="e9067c2db9137a1074e584b143b86e1b"/><file name="revocation.html" hash="fa1988d8d72bb098a6f03a7b3f9eee3b"/><file name="revocation_form.html" hash="7c9e594c0f6bfb9ad4a8bed750577a30"/></dir><dir name="page"><file name="404.html" hash="86f8ac2a0447897cf0dfc2cf28acf80b"/><file name="business_terms.html" hash="e248bb89f3032e8d9bd84948188df692"/><file name="imprint.html" hash="014f5bfdb932dd535793cb8e61add73b"/><file name="order.html" hash="d89f8a5f028fc1de00859c4450e82c88"/><file name="payment.html" hash="63aa7b4f060601c5a4651c7dbe6a5f1b"/><file name="privacy.html" hash="961c2c1da3ff981f2e1bee3d8c2a4060"/><file name="revocation.html" hash="edf0a49b9acc413b17eb5a63dbe71f45"/><file name="revocation_form.html" hash="170e86983fa92d9c72e34e1fa0aef7b5"/><file name="shipping.html" hash="aeef34e7060ee4f0f0be4c301301ffa3"/></dir></dir></dir></dir><dir name="ro_RO"><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="637aefdc1a8deab4155c20f62c2ebb69"/><file name="revocation.html" hash="21872413ef06beacd83b161bb5e3d69d"/><file name="revocation_digital.html" hash="4a1d0dc444bb2500038d617ee7573e51"/><file name="revocation_service.html" hash="62b12f063605edb979b1f9fcbc912f1c"/></dir><dir name="block"><file name="business_terms.html" hash="aca1583ff494d4646888685d26716885"/><file name="revocation.html" hash="e45f08058a04c58fb62aa6c7d7264c18"/><file name="revocation_form.html" hash="3f78b56f9144631ffa8a0f1a27a5f9b6"/></dir><dir name="page"><file name="404.html" hash="6577105a0b50bf03f5322fb70a1181b2"/><file name="business_terms.html" hash="706d8030141b485b9c0995c20766bf23"/><file name="imprint.html" hash="75904794c2ceba468e551a0db6363406"/><file name="order.html" hash="1ced23d0554547a5cdf45b284abc66a2"/><file name="payment.html" hash="1235074e35632e201898d909c1783cf1"/><file name="privacy.html" hash="d1bd000f66448a35df0aa5a85e62c5e9"/><file name="revocation.html" hash="1f69d4df74f4bc482f663e929117e5de"/><file name="revocation_form.html" hash="668dffc5099ef28f93818beba6aeca73"/><file name="shipping.html" hash="024802f9a2cccd9d3e8ce39047adf9f9"/></dir></dir></dir></dir><dir name="fr_CH"><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="06c85aba03fb36477dfc5ed1c0507279"/><file name="revocation.html" hash="a7496f45c125c3967a199dff58bc8ab7"/><file name="revocation_digital.html" hash="57c45c5f1517631a93c3f6092a442580"/><file name="revocation_service.html" hash="7904f62e69dd3eb0b72ac3be792ba910"/></dir><dir name="block"><file name="business_terms.html" hash="ad3203fd83cc6f2889e7f9bd6b140416"/><file name="revocation.html" hash="a89c68600b266edc854020cf72283941"/><file name="revocation_form.html" hash="9f17e339e4654a8f7fa7fd1381429d31"/></dir><dir name="page"><file name="404.html" hash="3f817bbe5b25886372749e91330b12d3"/><file name="business_terms.html" hash="7b212cf0ae4f65efb1ccaa3a9b45c26b"/><file name="imprint.html" hash="ca94ff740794026ad57c7772d7f9645c"/><file name="order.html" hash="9ace1c990d3960fa3e3a8ddab6a2210f"/><file name="payment.html" hash="72db5b37c9733d050b6760407570105a"/><file name="privacy.html" hash="39342651392d29868d52039d9b860c89"/><file name="revocation.html" hash="76657b8808e2e401e7d7e08b199a0b3c"/><file name="revocation_form.html" hash="650da3135b326caf2b082e8a72df09fa"/><file name="shipping.html" hash="b191377982a1d83230ba88950b1d2a05"/></dir></dir></dir></dir><dir name="fr_FR"><file name="FireGento_MageSetup.csv" hash="86b32f5f88b191e09d57eae1d320fc3c"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="cdbfcc57244cb13c7775574015248bc9"/><file name="revocation.html" hash="c6920aff5a63e4d1b2f2da82185f25f2"/><file name="revocation_digital.html" hash="04bae36c87b79fec2412b2654dc4dbbb"/><file name="revocation_service.html" hash="db7583cf6bf6dc2f4187da63dd1f42ae"/></dir><dir name="block"><file name="business_terms.html" hash="275ff7f3a1bc75feb6afc5bf6e6c7eec"/><file name="revocation.html" hash="3d7f9f210ebbccada812a92682ba721b"/><file name="revocation_form.html" hash="cd43d21615148760c394f34f4d41dc58"/></dir><dir name="page"><file name="404.html" hash="358030e3dfc682b49c1ffc6227b23f0c"/><file name="business_terms.html" hash="2fc29e7ac0fb6e21a38b2312154d111b"/><file name="imprint.html" hash="b09662c9a172658c8bdac21ebad52ad4"/><file name="order.html" hash="7a94b5ecb516a1a9249d4160072c4e9b"/><file name="payment.html" hash="9597a524c3c90baebb517700e559dd51"/><file name="privacy.html" hash="10e9513f9770c28538fb7d06c3b8d985"/><file name="revocation.html" hash="9a20ae49a4b28ed9914bd8595fd402e5"/><file name="revocation_form.html" hash="aed50371f9585490b4ab1cb7c6ebbd36"/><file name="shipping.html" hash="f0ec9be50cd7b5b98813124192bea44d"/></dir></dir></dir></dir><dir name="it_IT"><file name="FireGento_MageSetup.csv" hash="cadaf332269a5fb4348c0cfddc434ea8"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="85021eb464bdf7b978c679e88bb0c7e1"/><file name="revocation.html" hash="95064e9a9d4dd388e556974d8bc97135"/><file name="revocation_digital.html" hash="57c45c5f1517631a93c3f6092a442580"/><file name="revocation_service.html" hash="7904f62e69dd3eb0b72ac3be792ba910"/></dir><dir name="block"><file name="business_terms.html" hash="def7695e209d28ab27a456aba89ad677"/><file name="revocation.html" hash="93493be4fe91cd38fa991e1a271e01a9"/><file name="revocation_form.html" hash="0a729eebe75c6dea9f8b6bee4c2c2fa6"/></dir><dir name="page"><file name="404.html" hash="8d48a098b3b2f72c0e5ee5ec35d2ad22"/><file name="business_terms.html" hash="5e8a3c758bd5c172cc94eec5872392dd"/><file name="imprint.html" hash="2ea2a9b22eb10b4e07c87b4787061f85"/><file name="order.html" hash="874f0c8550af24f63f9acaed6a173d2b"/><file name="payment.html" hash="94bf4e522c78f55a982eef1d4c719712"/><file name="privacy.html" hash="72d877b7d3402493160bd153ae0fc797"/><file name="revocation.html" hash="d446fae31562e09f192868c63ec308f3"/><file name="revocation_form.html" hash="650da3135b326caf2b082e8a72df09fa"/><file name="shipping.html" hash="104b43f4c169f9a3e6f682c50ba77b22"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="magesetup.xml" hash="24f76b231be05976adba823a803b5ac4"/></dir><dir name="template"><dir name="magesetup"><file name="form.phtml" hash="cfb5100d6dab11a7855a1afdcf426d5e"/><file name="notifications.phtml" hash="f64760b55a1e6ace42525727a07a524f"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="magesetup.xml" hash="8b9b721112f047ba3d3d847b0e633dbe"/></dir><dir name="template"><dir name="magesetup"><dir name="checkout"><file name="additional.phtml" hash="56ff8a69368e0f17dbf84b684fa39b3e"/><dir name="multishipping"><file name="agreements.phtml" hash="b2a43c5805f93e047866b74066ea9560"/><file name="overview.phtml" hash="b63c1467c562bda89bbd09c4300780e1"/></dir><dir name="onepage"><file name="agreements.phtml" hash="309af1f1a5f67a95c0449c94d95ecc04"/><dir name="review"><file name="item.phtml" hash="44984e9c7eeebfb7b609a14bad997c78"/></dir></dir></dir><dir name="customer"><dir name="form"><file name="tc-confirmation.phtml" hash="d68022d51af891ec256241ebd9c90ea3"/></dir></dir><file name="delivery_time.phtml" hash="df59c69ce711cbd1fcb70f2757fb1f35"/><dir name="footer"><file name="links.phtml" hash="5288fb0656fc714465f79560ba8be9f3"/></dir><dir name="imprint"><file name="address.phtml" hash="72aa4d12d8eeb24f13b895f2a1bf874b"/><file name="bank.phtml" hash="1ad3bd5237a922ed2e0225cac4141330"/><file name="communication.phtml" hash="1a4af3735041365469fa26037167f4cf"/><file name="email_footer.phtml" hash="73d3f6e630981bf1854147788fe8225f"/><file name="legal.phtml" hash="e08037c4e38a49fffaf9c320a8c85332"/><file name="tax.phtml" hash="72a21ac871e846803dd7ed5f17c78042"/></dir><file name="price_info.phtml" hash="6c46bb887d1dcbe93dff849be2e44715"/><file name="shipping.phtml" hash="c331e36d11a07ed784a89c7f4742c2e1"/></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="template"><dir name="magesetup"><dir name="footer"><file name="links.phtml" hash="b28f505e36e7a43587b7514c2841cfc3"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="magesetup"><file name="checkout.css" hash="7f58981c1ef61834d9af66e9ef67337d"/><file name="default.css" hash="6c94f0b4274685eafdf49473e577b430"/></dir></dir></dir></dir><dir name="rwd"><dir name="default"><dir name="css"><dir name="magesetup"><file name="checkout.css" hash="2edc6c1346bfd3aee7a6f404203abc2d"/><file name="default.css" hash="64276dcb923cb4fb42b7e5c38575b9f8"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>7.9.9</max></php></required></dependencies>
|
18 |
</package>
|
skin/frontend/base/default/css/magesetup/checkout.css
CHANGED
@@ -12,20 +12,69 @@
|
|
12 |
* @category FireGento
|
13 |
* @package FireGento_MageSetup
|
14 |
* @author FireGento Team <team@firegento.com>
|
15 |
-
* @copyright 2013 FireGento Team (http://www.firegento.com)
|
16 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
17 |
*/
|
18 |
|
19 |
-
#checkout-review-table tfoot tr{
|
20 |
-
|
21 |
-
|
22 |
-
|
23 |
-
#checkout-review-table
|
24 |
-
|
25 |
-
|
26 |
-
|
27 |
-
|
28 |
-
|
29 |
-
|
30 |
-
|
31 |
-
#review-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
12 |
* @category FireGento
|
13 |
* @package FireGento_MageSetup
|
14 |
* @author FireGento Team <team@firegento.com>
|
15 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
16 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
17 |
*/
|
18 |
|
19 |
+
#checkout-review-table tfoot tr {
|
20 |
+
background-color: #FBFAF6 !important
|
21 |
+
}
|
22 |
+
|
23 |
+
#checkout-review-table tr.odd, #checkout-review-table tr.even {
|
24 |
+
background-color: #FBFAF6
|
25 |
+
}
|
26 |
+
|
27 |
+
#checkout-review-table td.last {
|
28 |
+
text-align: right
|
29 |
+
}
|
30 |
+
|
31 |
+
#checkout-review-table td.last .price {
|
32 |
+
font-weight: 700
|
33 |
+
}
|
34 |
+
|
35 |
+
#checkout-review-table-wrapper {
|
36 |
+
border: 2px solid #0A263D;
|
37 |
+
border-bottom: 0
|
38 |
+
}
|
39 |
+
|
40 |
+
#opc-review #checkout-step-review .additional-information {
|
41 |
+
border: 2px solid #0A263D;
|
42 |
+
border-top: 0;
|
43 |
+
border-bottom: 0
|
44 |
+
}
|
45 |
+
|
46 |
+
#checkout-review-submit {
|
47 |
+
background-color: #FBFAF6;
|
48 |
+
border: 2px solid #0A263D;
|
49 |
+
border-top: 0
|
50 |
+
}
|
51 |
+
|
52 |
+
#opc-review .additional-information {
|
53 |
+
clear: both;
|
54 |
+
margin: 0;
|
55 |
+
padding: 15px 10px;
|
56 |
+
text-align: right
|
57 |
+
}
|
58 |
+
|
59 |
+
.checkout-multishipping-overview .additional-information {
|
60 |
+
margin: 0;
|
61 |
+
padding: 0 10px 25px;
|
62 |
+
text-align: right
|
63 |
+
}
|
64 |
+
|
65 |
+
.checkout-multishipping-overview .checkout-agreements {
|
66 |
+
margin-bottom: 25px
|
67 |
+
}
|
68 |
+
|
69 |
+
.opc .checkout-agreements li, .checkout-multishipping-overview .checkout-agreements li {
|
70 |
+
margin: 10px 0
|
71 |
+
}
|
72 |
+
|
73 |
+
.opc .checkout-agreements .agree, .checkout-multishipping-overview .checkout-agreements .agree {
|
74 |
+
padding-top: 0;
|
75 |
+
padding-bottom: 0
|
76 |
+
}
|
77 |
+
|
78 |
+
#review-buttons-container p.f-left {
|
79 |
+
display: none
|
80 |
+
}
|
skin/frontend/base/default/css/magesetup/default.css
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
/**
|
2 |
+
* This file is part of a FireGento e.V. module.
|
3 |
+
*
|
4 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
5 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
6 |
+
* published by the Free Software Foundation.
|
7 |
+
*
|
8 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
9 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
10 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
11 |
+
*
|
12 |
+
* @category FireGento
|
13 |
+
* @package FireGento_MageSetup
|
14 |
+
* @author FireGento Team <team@firegento.com>
|
15 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
16 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
17 |
+
*/
|
18 |
+
|
19 |
+
/* Left empty on purpose, only needed in rwd theme */
|
skin/frontend/rwd/default/css/magesetup/checkout.css
ADDED
@@ -0,0 +1,91 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
/**
|
2 |
+
* This file is part of a FireGento e.V. module.
|
3 |
+
*
|
4 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
5 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
6 |
+
* published by the Free Software Foundation.
|
7 |
+
*
|
8 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
9 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
10 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
11 |
+
*
|
12 |
+
* @category FireGento
|
13 |
+
* @package FireGento_MageSetup
|
14 |
+
* @author FireGento Team <team@firegento.com>
|
15 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
16 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
17 |
+
*/
|
18 |
+
|
19 |
+
#checkout-review-table tfoot tr {
|
20 |
+
background-color: #FBFAF6 !important
|
21 |
+
}
|
22 |
+
|
23 |
+
#checkout-review-table tr.odd, #checkout-review-table tr.even {
|
24 |
+
background-color: #FBFAF6
|
25 |
+
}
|
26 |
+
|
27 |
+
#checkout-review-table td.last {
|
28 |
+
text-align: right
|
29 |
+
}
|
30 |
+
|
31 |
+
#checkout-review-table td.last .price {
|
32 |
+
font-weight: 700
|
33 |
+
}
|
34 |
+
|
35 |
+
#checkout-review-table-wrapper {
|
36 |
+
border: 2px solid #0A263D;
|
37 |
+
border-bottom: 0
|
38 |
+
}
|
39 |
+
|
40 |
+
#opc-review #checkout-step-review .additional-information {
|
41 |
+
border: 2px solid #0A263D;
|
42 |
+
border-top: 0;
|
43 |
+
border-bottom: 0
|
44 |
+
}
|
45 |
+
|
46 |
+
#checkout-review-submit {
|
47 |
+
background-color: #FBFAF6;
|
48 |
+
border: 2px solid #0A263D;
|
49 |
+
border-top: 0
|
50 |
+
}
|
51 |
+
|
52 |
+
#checkout-review-submit .buttons-set {
|
53 |
+
margin-top: 0;
|
54 |
+
padding: 15px 0 0 15px;
|
55 |
+
}
|
56 |
+
|
57 |
+
#opc-review .additional-information {
|
58 |
+
clear: both;
|
59 |
+
margin: 0;
|
60 |
+
text-align: right;
|
61 |
+
background-color: #fbfaf6;
|
62 |
+
border-top: 1px solid #ededed;
|
63 |
+
}
|
64 |
+
|
65 |
+
#opc-review .additional-information .info {
|
66 |
+
border-top: 1px solid #ededed;
|
67 |
+
padding: 15px 10px;
|
68 |
+
}
|
69 |
+
|
70 |
+
.checkout-multishipping-overview .additional-information {
|
71 |
+
margin: 0;
|
72 |
+
padding: 0 10px 25px;
|
73 |
+
text-align: right
|
74 |
+
}
|
75 |
+
|
76 |
+
.checkout-multishipping-overview .checkout-agreements {
|
77 |
+
margin-bottom: 25px
|
78 |
+
}
|
79 |
+
|
80 |
+
.opc .checkout-agreements li, .checkout-multishipping-overview .checkout-agreements li {
|
81 |
+
margin: 10px 0
|
82 |
+
}
|
83 |
+
|
84 |
+
.opc .checkout-agreements .agree, .checkout-multishipping-overview .checkout-agreements .agree {
|
85 |
+
padding-top: 0;
|
86 |
+
padding-bottom: 0
|
87 |
+
}
|
88 |
+
|
89 |
+
#review-buttons-container p.f-left {
|
90 |
+
display: none
|
91 |
+
}
|
skin/frontend/rwd/default/css/magesetup/default.css
ADDED
@@ -0,0 +1,21 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
/**
|
2 |
+
* This file is part of a FireGento e.V. module.
|
3 |
+
*
|
4 |
+
* This FireGento e.V. module is free software; you can redistribute it and/or
|
5 |
+
* modify it under the terms of the GNU General Public License version 3 as
|
6 |
+
* published by the Free Software Foundation.
|
7 |
+
*
|
8 |
+
* This script is distributed in the hope that it will be useful, but WITHOUT
|
9 |
+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
10 |
+
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
11 |
+
*
|
12 |
+
* @category FireGento
|
13 |
+
* @package FireGento_MageSetup
|
14 |
+
* @author FireGento Team <team@firegento.com>
|
15 |
+
* @copyright 2013-2015 FireGento Team (http://www.firegento.com)
|
16 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
17 |
+
*/
|
18 |
+
|
19 |
+
.product-options-bottom .tax-details {
|
20 |
+
display: none;
|
21 |
+
}
|