Version Notes
Download this release
Release Info
Developer | Team FireGento |
Extension | FireGento_MageSetup |
Version | 2.4.0 |
Comparing to | |
See all releases |
Code changes from version 2.2.2 to 2.4.0
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php +22 -21
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php +1 -2
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php +1 -2
- app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php +1 -1
- app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php +3 -2
- app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php +10 -10
- app/code/community/FireGento/MageSetup/Block/Imprint/Field.php +8 -1
- app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php +132 -133
- app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php +1 -2
- app/code/community/FireGento/MageSetup/Helper/Contacts/Data.php +39 -0
- app/code/community/FireGento/MageSetup/Helper/Data.php +23 -0
- app/code/community/FireGento/MageSetup/Model/Config.php +9 -5
- app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Observer.php +429 -405
- app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php +4 -4
- app/code/community/FireGento/MageSetup/Model/Setup/Cms.php +59 -34
- app/code/community/FireGento/MageSetup/Model/Setup/Customergroups.php +33 -0
- app/code/community/FireGento/MageSetup/Model/Setup/Email.php +0 -4
- app/code/community/FireGento/MageSetup/Model/Setup/Tax.php +0 -3
- app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php +1 -1
- app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php +1 -2
- app/code/community/FireGento/MageSetup/Model/Tax/Config.php +6 -1
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content.php +2 -0
- app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/fixtures/defaultEnvironment.yaml +20 -0
- app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType/expectations/testToOptionArray.yaml +1 -1
- 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/Adminhtml/MagesetupController.php +5 -0
- app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php +5 -0
- app/code/community/FireGento/MageSetup/controllers/Contacts/IndexController.php +116 -0
- app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.2.3-2.3.0.php +61 -0
- app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.3.0-2.3.1.php +62 -0
- app/code/community/FireGento/MageSetup/etc/adminhtml.xml +2 -2
- app/code/community/FireGento/MageSetup/etc/config.xml +22 -8
- app/code/community/FireGento/MageSetup/etc/de/tax.xml +3 -3
- app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml +1 -0
- app/code/community/FireGento/MageSetup/etc/system.xml +31 -3
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php +0 -2
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php +4 -6
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php +25 -7
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php +4 -6
- app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-2.1.1-2.2.0.php +0 -2
- app/design/adminhtml/default/default/layout/magesetup.xml +2 -2
- app/design/frontend/base/default/layout/magesetup.xml +17 -3
- app/design/frontend/base/default/template/magesetup/contacts/form.phtml +102 -0
- app/design/frontend/base/default/template/magesetup/delivery_time.phtml +2 -2
- app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml +1 -1
- app/locale/de_DE/FireGento_MageSetup.csv +12 -5
- app/locale/en_US/FireGento_MageSetup.csv +9 -1
- app/locale/en_US/template/magesetup/block/revocation.html +3 -3
- app/locale/en_US/template/magesetup/block/revocation_form.html +1 -1
- app/locale/en_US/template/magesetup/page/revocation.html +1 -1
- app/locale/en_US/template/magesetup/page/revocation_form.html +1 -1
- app/locale/fr_CH/template/magesetup/block/business_terms.html +2 -2
- app/locale/fr_CH/template/magesetup/block/revocation.html +1 -1
- app/locale/fr_CH/template/magesetup/block/revocation_form.html +1 -1
- app/locale/fr_FR/FireGento_MageSetup.csv +146 -147
- app/locale/fr_FR/template/magesetup/agreement/revocation.html +2 -2
- app/locale/fr_FR/template/magesetup/agreement/revocation_digital.html +2 -2
- app/locale/fr_FR/template/magesetup/agreement/revocation_service.html +2 -2
- app/locale/fr_FR/template/magesetup/block/revocation.html +3 -3
- app/locale/fr_FR/template/magesetup/block/revocation_form.html +4 -4
- app/locale/fr_FR/template/magesetup/page/revocation.html +1 -1
- app/locale/fr_FR/template/magesetup/page/revocation_form.html +1 -1
- app/locale/ru_RU/template/magesetup/block/revocation.html +1 -1
- app/locale/ru_RU/template/magesetup/block/revocation_form.html +1 -1
- package.xml +5 -5
app/code/community/FireGento/MageSetup/Block/Adminhtml/Magesetup.php
CHANGED
@@ -108,8 +108,9 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
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'
|
112 |
-
|
|
|
113 |
unset($options[$key]);
|
114 |
}
|
115 |
}
|
@@ -126,8 +127,9 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
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'
|
130 |
-
|
|
|
131 |
unset($options[$key]);
|
132 |
}
|
133 |
}
|
@@ -177,17 +179,18 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
177 |
$countryTaxClasses = array();
|
178 |
foreach (Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
|
179 |
// Get the config file for the given country
|
180 |
-
$
|
|
|
181 |
|
182 |
// If the given file does not exist, use the default file
|
183 |
-
|
184 |
-
|
|
|
185 |
}
|
186 |
|
187 |
-
$
|
188 |
-
|
189 |
-
|
190 |
-
$taxClasses = $xml->default->magesetup->tax_classes->default;
|
191 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
192 |
if ($taxClass->class_type != 'PRODUCT'
|
193 |
|| $taxClass->execute != 1
|
@@ -198,7 +201,6 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
198 |
|
199 |
$countryTaxClasses[$countryId][(string)$taxClass->class_id] = (string)$taxClass->class_name;
|
200 |
}
|
201 |
-
// @codingStandardsIgnoreEnd
|
202 |
|
203 |
$countryTaxClasses[$countryId][] = $this->__('No tax');
|
204 |
}
|
@@ -218,17 +220,18 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
218 |
$countryTaxClasses = array();
|
219 |
foreach (Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
|
220 |
// Get the config file for the given country
|
221 |
-
$
|
|
|
222 |
|
223 |
// If the given file does not exist, use the default file
|
224 |
-
|
225 |
-
|
|
|
226 |
}
|
227 |
|
228 |
-
$
|
229 |
-
|
230 |
-
|
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
|
@@ -237,10 +240,8 @@ class FireGento_MageSetup_Block_Adminhtml_Magesetup extends Mage_Adminhtml_Block
|
|
237 |
}
|
238 |
$countryTaxClasses[$countryId][(string)$taxClass->class_id] = (string)$taxClass->class_name;
|
239 |
}
|
240 |
-
// @codingStandardsIgnoreEnd
|
241 |
}
|
242 |
|
243 |
return Zend_Json::encode($countryTaxClasses);
|
244 |
}
|
245 |
}
|
246 |
-
|
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';
|
112 |
+
$validatorNot = new Zend_Validate_File_NotExists($filePath);
|
113 |
+
if ($validatorNot->isValid('email')) {
|
114 |
unset($options[$key]);
|
115 |
}
|
116 |
}
|
127 |
{
|
128 |
$options = Mage::getSingleton('adminhtml/system_config_source_locale')->toOptionArray();
|
129 |
foreach ($options as $key => $value) {
|
130 |
+
$filePath = Mage::getBaseDir('locale') . DS . $value['value'] . DS . 'template';
|
131 |
+
$validatorNot = new Zend_Validate_File_NotExists($filePath);
|
132 |
+
if ($validatorNot->isValid('magesetup')) {
|
133 |
unset($options[$key]);
|
134 |
}
|
135 |
}
|
179 |
$countryTaxClasses = array();
|
180 |
foreach (Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
|
181 |
// Get the config file for the given country
|
182 |
+
$fileName = 'tax.xml';
|
183 |
+
$configFile = $moduleDir . DS . $countryId;
|
184 |
|
185 |
// If the given file does not exist, use the default file
|
186 |
+
$validatorNot = new Zend_Validate_File_NotExists($configFile);
|
187 |
+
if ($validatorNot->isValid($fileName)) {
|
188 |
+
$configFile = $moduleDir . DS . 'default';
|
189 |
}
|
190 |
|
191 |
+
$configFile .= DS . $fileName;
|
192 |
+
$xml = new Varien_Simplexml_Config($configFile);
|
193 |
+
$taxClasses = $xml->getNode('default/magesetup/tax_classes/default');
|
|
|
194 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
195 |
if ($taxClass->class_type != 'PRODUCT'
|
196 |
|| $taxClass->execute != 1
|
201 |
|
202 |
$countryTaxClasses[$countryId][(string)$taxClass->class_id] = (string)$taxClass->class_name;
|
203 |
}
|
|
|
204 |
|
205 |
$countryTaxClasses[$countryId][] = $this->__('No tax');
|
206 |
}
|
220 |
$countryTaxClasses = array();
|
221 |
foreach (Mage::helper('magesetup')->getAvailableCountries() as $countryId => $countryName) {
|
222 |
// Get the config file for the given country
|
223 |
+
$fileName = 'tax.xml';
|
224 |
+
$configFile = $moduleDir . DS . $countryId;
|
225 |
|
226 |
// If the given file does not exist, use the default file
|
227 |
+
$validatorNot = new Zend_Validate_File_NotExists($configFile);
|
228 |
+
if ($validatorNot->isValid($fileName)) {
|
229 |
+
$configFile = $moduleDir . DS . 'default';
|
230 |
}
|
231 |
|
232 |
+
$configFile .= DS . $fileName;
|
233 |
+
$xml = new Varien_Simplexml_Config($configFile);
|
234 |
+
$taxClasses = $xml->getNode('default/magesetup/tax_classes/default');
|
|
|
235 |
foreach ($taxClasses->children() as $identifier => $taxClass) {
|
236 |
if ($taxClass->class_type != 'CUSTOMER'
|
237 |
|| $taxClass->execute != 1
|
240 |
}
|
241 |
$countryTaxClasses[$countryId][(string)$taxClass->class_id] = (string)$taxClass->class_name;
|
242 |
}
|
|
|
243 |
}
|
244 |
|
245 |
return Zend_Json::encode($countryTaxClasses);
|
246 |
}
|
247 |
}
|
|
app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status
|
32 |
-
extends Mage_Adminhtml_Block_Widget_Grid_Container
|
33 |
{
|
34 |
/**
|
35 |
* Class constructor
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status extends Mage_Adminhtml_Block_Widget_Grid_Container
|
|
|
32 |
{
|
33 |
/**
|
34 |
* Class constructor
|
app/code/community/FireGento/MageSetup/Block/Adminhtml/Newsletter/Subscriber/Status/Grid.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status_Grid
|
32 |
-
extends Mage_Adminhtml_Block_Widget_Grid
|
33 |
{
|
34 |
/**
|
35 |
* Class constructor
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
|
32 |
{
|
33 |
/**
|
34 |
* Class constructor
|
app/code/community/FireGento/MageSetup/Block/Adminhtml/Notifications.php
CHANGED
@@ -56,7 +56,7 @@ class FireGento_MageSetup_Block_Adminhtml_Notifications extends Mage_Adminhtml_B
|
|
56 |
*/
|
57 |
public function getManageUrl()
|
58 |
{
|
59 |
-
return $this->getUrl('
|
60 |
}
|
61 |
|
62 |
/**
|
56 |
*/
|
57 |
public function getManageUrl()
|
58 |
{
|
59 |
+
return $this->getUrl('adminhtml/magesetup');
|
60 |
}
|
61 |
|
62 |
/**
|
app/code/community/FireGento/MageSetup/Block/Bundle/Catalog/Product/Price.php
CHANGED
@@ -29,8 +29,7 @@
|
|
29 |
* @package FireGento_MageSetup
|
30 |
* @author FireGento Team <team@firegento.com>
|
31 |
*/
|
32 |
-
class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price
|
33 |
-
extends FireGento_MageSetup_Block_Bundle_Catalog_Product_Price_Abstract
|
34 |
{
|
35 |
/**
|
36 |
* Add content of template block below price html if defined in config
|
@@ -47,8 +46,10 @@ class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price
|
|
47 |
|
48 |
$html .= $this->getLayout()->createBlock('core/template')
|
49 |
->setTemplate('magesetup/price_info.phtml')
|
|
|
50 |
->setFormattedTaxRate($this->getFormattedTaxRate())
|
51 |
->setIsIncludingTax($this->isIncludingTax())
|
|
|
52 |
->setIsShowShippingLink($this->isShowShippingLink())
|
53 |
->setIsShowWeightInfo($this->getIsShowWeightInfo())
|
54 |
->setFormattedWeight($this->getFormattedWeight())
|
29 |
* @package FireGento_MageSetup
|
30 |
* @author FireGento Team <team@firegento.com>
|
31 |
*/
|
32 |
+
class FireGento_MageSetup_Block_Bundle_Catalog_Product_Price extends FireGento_MageSetup_Block_Bundle_Catalog_Product_Price_Abstract
|
|
|
33 |
{
|
34 |
/**
|
35 |
* Add content of template block below price html if defined in config
|
46 |
|
47 |
$html .= $this->getLayout()->createBlock('core/template')
|
48 |
->setTemplate('magesetup/price_info.phtml')
|
49 |
+
->setProduct($this->getProduct())
|
50 |
->setFormattedTaxRate($this->getFormattedTaxRate())
|
51 |
->setIsIncludingTax($this->isIncludingTax())
|
52 |
+
->setPriceDisplayType(Mage::helper('tax')->getPriceDisplayType())
|
53 |
->setIsShowShippingLink($this->isShowShippingLink())
|
54 |
->setIsShowWeightInfo($this->getIsShowWeightInfo())
|
55 |
->setFormattedWeight($this->getFormattedWeight())
|
app/code/community/FireGento/MageSetup/Block/Catalog/Product/Price.php
CHANGED
@@ -29,8 +29,7 @@
|
|
29 |
* @package FireGento_MageSetup
|
30 |
* @author FireGento Team <team@firegento.com>
|
31 |
*/
|
32 |
-
class FireGento_MageSetup_Block_Catalog_Product_Price
|
33 |
-
extends FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
34 |
{
|
35 |
/**
|
36 |
* @var array Path to common tier price template
|
@@ -89,10 +88,11 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
89 |
|
90 |
$this->_addDeliveryTimeHtml($htmlObject);
|
91 |
|
92 |
-
Mage::dispatchEvent(
|
|
|
93 |
array(
|
94 |
'html_obj' => $htmlObject,
|
95 |
-
'block'
|
96 |
)
|
97 |
);
|
98 |
|
@@ -120,12 +120,11 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
120 |
if (strpos($pathInfo, 'catalog/category/view') !== false
|
121 |
|| strpos($pathInfo, 'catalogsearch/result') !== false
|
122 |
) {
|
123 |
-
|
124 |
-
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
}
|
129 |
}
|
130 |
}
|
131 |
|
@@ -153,6 +152,7 @@ class FireGento_MageSetup_Block_Catalog_Product_Price
|
|
153 |
{
|
154 |
if ($this->getTaxRate() === null
|
155 |
|| $this->getProduct()->getTypeId() == 'bundle'
|
|
|
156 |
) {
|
157 |
return '';
|
158 |
}
|
29 |
* @package FireGento_MageSetup
|
30 |
* @author FireGento Team <team@firegento.com>
|
31 |
*/
|
32 |
+
class FireGento_MageSetup_Block_Catalog_Product_Price extends FireGento_MageSetup_Block_Catalog_Product_Price_Abstract
|
|
|
33 |
{
|
34 |
/**
|
35 |
* @var array Path to common tier price template
|
88 |
|
89 |
$this->_addDeliveryTimeHtml($htmlObject);
|
90 |
|
91 |
+
Mage::dispatchEvent(
|
92 |
+
'magesetup_after_product_price',
|
93 |
array(
|
94 |
'html_obj' => $htmlObject,
|
95 |
+
'block' => $this,
|
96 |
)
|
97 |
);
|
98 |
|
120 |
if (strpos($pathInfo, 'catalog/category/view') !== false
|
121 |
|| strpos($pathInfo, 'catalogsearch/result') !== false
|
122 |
) {
|
123 |
+
$block = $this->getLayout()->createBlock('core/template', 'magesetup.deliverytime', array(
|
124 |
+
'product' => $this->getProduct(),
|
125 |
+
'template' => 'magesetup/delivery_time.phtml'
|
126 |
+
));
|
127 |
+
$htmlObject->setSuffix($block->toHtml());
|
|
|
128 |
}
|
129 |
}
|
130 |
|
152 |
{
|
153 |
if ($this->getTaxRate() === null
|
154 |
|| $this->getProduct()->getTypeId() == 'bundle'
|
155 |
+
|| $this->getProduct()->getTypeId() == 'grouped'
|
156 |
) {
|
157 |
return '';
|
158 |
}
|
app/code/community/FireGento/MageSetup/Block/Imprint/Field.php
CHANGED
@@ -37,8 +37,15 @@ class FireGento_MageSetup_Block_Imprint_Field extends FireGento_MageSetup_Block_
|
|
37 |
*/
|
38 |
protected function _toHtml()
|
39 |
{
|
|
|
40 |
if ($this->getValue() == 'email') {
|
41 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
42 |
}
|
43 |
|
44 |
return $this->getData($this->getValue());
|
37 |
*/
|
38 |
protected function _toHtml()
|
39 |
{
|
40 |
+
|
41 |
if ($this->getValue() == 'email') {
|
42 |
+
$isFrontend = ($this->getLayout()->getArea() === 'frontend');
|
43 |
+
$isCheckout = ($this->getRequest()->getActionName() === 'placeOrder');
|
44 |
+
|
45 |
+
// protect email address in frontend but not when placing order where it is used to
|
46 |
+
// send order confirmation mails (which might include imprint's mail address, i.e.
|
47 |
+
// in the withdrawal form)
|
48 |
+
return $this->getEmail($isFrontend && !$isCheckout);
|
49 |
}
|
50 |
|
51 |
return $this->getData($this->getValue());
|
app/code/community/FireGento/MageSetup/Helper/Catalog/Product/Configuration.php
CHANGED
@@ -1,133 +1,132 @@
|
|
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.2
|
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 |
-
|
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 |
-
$this->
|
86 |
-
$
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
-
|
96 |
-
|
97 |
-
|
98 |
-
*
|
99 |
-
*
|
100 |
-
* @
|
101 |
-
|
102 |
-
|
103 |
-
|
104 |
-
|
105 |
-
|
106 |
-
|
107 |
-
$attributes
|
108 |
-
|
109 |
-
|
110 |
-
|
111 |
-
|
112 |
-
|
113 |
-
|
114 |
-
|
115 |
-
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
|
122 |
-
'
|
123 |
-
'
|
124 |
-
'
|
125 |
-
|
126 |
-
|
127 |
-
|
128 |
-
|
129 |
-
|
130 |
-
|
131 |
-
|
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.2
|
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 extends Mage_Catalog_Helper_Product_Configuration
|
32 |
+
{
|
33 |
+
/**
|
34 |
+
* @var array
|
35 |
+
*/
|
36 |
+
protected $_finished = array();
|
37 |
+
|
38 |
+
/**
|
39 |
+
* @var array
|
40 |
+
*/
|
41 |
+
protected $_products = array();
|
42 |
+
|
43 |
+
/**
|
44 |
+
* @var array
|
45 |
+
*/
|
46 |
+
protected $_attributes = array();
|
47 |
+
|
48 |
+
/**
|
49 |
+
* Merge Attributes
|
50 |
+
*
|
51 |
+
* @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item Quote item
|
52 |
+
* @return array Custom Options
|
53 |
+
*/
|
54 |
+
public function getCustomOptions(Mage_Catalog_Model_Product_Configuration_Item_Interface $item)
|
55 |
+
{
|
56 |
+
$optionsParent = parent::getCustomOptions($item);
|
57 |
+
$optionsSelf = $this->_getAttributes($item);
|
58 |
+
$options = array_merge($optionsSelf, $optionsParent);
|
59 |
+
|
60 |
+
return $options;
|
61 |
+
}
|
62 |
+
|
63 |
+
/**
|
64 |
+
* Get the product for the current quote item
|
65 |
+
*
|
66 |
+
* @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item Quote item
|
67 |
+
* @return Mage_Catalog_Model_Product Product Model
|
68 |
+
*/
|
69 |
+
protected function _getProduct($item)
|
70 |
+
{
|
71 |
+
return $item->getProduct();
|
72 |
+
}
|
73 |
+
|
74 |
+
/**
|
75 |
+
* Retrieve the product attributes
|
76 |
+
*
|
77 |
+
* @param Mage_Catalog_Model_Product_Configuration_Item_Interface $item Quote item
|
78 |
+
* @return array Attributes
|
79 |
+
*/
|
80 |
+
protected function _getAttributes($item)
|
81 |
+
{
|
82 |
+
$itemId = $item->getId();
|
83 |
+
if (!isset($this->_finished[$itemId])) {
|
84 |
+
$this->_finished[$itemId] = true;
|
85 |
+
$product = $this->_getProduct($item);
|
86 |
+
$this->_attributes[$itemId] = $this->_getAdditionalData($product);
|
87 |
+
}
|
88 |
+
|
89 |
+
if (count($this->_attributes[$itemId]) > 0) {
|
90 |
+
return $this->_attributes[$itemId];
|
91 |
+
}
|
92 |
+
|
93 |
+
return array();
|
94 |
+
}
|
95 |
+
|
96 |
+
/**
|
97 |
+
* Retrieve the attributes which are visible on the checkout page
|
98 |
+
*
|
99 |
+
* @param Mage_Catalog_Model_Product $product Product Model
|
100 |
+
* @return array Addition data as array
|
101 |
+
*/
|
102 |
+
protected function _getAdditionalData(Mage_Catalog_Model_Product $product)
|
103 |
+
{
|
104 |
+
$data = array();
|
105 |
+
|
106 |
+
$attributes = $product->getAttributes();
|
107 |
+
foreach ($attributes as $attribute) {
|
108 |
+
if ($attribute->getIsVisibleOnCheckout()) {
|
109 |
+
if (in_array($attribute->getFrontendInput(), array('select', 'multiselect')) && !$product->getData($attribute->getAttributeCode())) {
|
110 |
+
continue;
|
111 |
+
}
|
112 |
+
$value = $attribute->getFrontend()->getValue($product);
|
113 |
+
if (!$product->hasData($attribute->getAttributeCode()) || (string)$value == '') {
|
114 |
+
$value = '';
|
115 |
+
} elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
|
116 |
+
$value = Mage::app()->getStore()->convertPrice($value, true);
|
117 |
+
}
|
118 |
+
|
119 |
+
if (is_string($value) && strlen($value)) {
|
120 |
+
$data[$attribute->getAttributeCode()] = array(
|
121 |
+
'label' => $attribute->getStoreLabel(),
|
122 |
+
'value' => $value,
|
123 |
+
'print_value' => $value,
|
124 |
+
'code' => $attribute->getAttributeCode()
|
125 |
+
);
|
126 |
+
}
|
127 |
+
}
|
128 |
+
}
|
129 |
+
|
130 |
+
return $data;
|
131 |
+
}
|
132 |
+
}
|
|
app/code/community/FireGento/MageSetup/Helper/Checkout/Data.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Helper_Checkout_Data
|
32 |
-
extends Mage_Checkout_Helper_Data
|
33 |
{
|
34 |
/**
|
35 |
* Avoid loss of translation
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Helper_Checkout_Data extends Mage_Checkout_Helper_Data
|
|
|
32 |
{
|
33 |
/**
|
34 |
* Avoid loss of translation
|
app/code/community/FireGento/MageSetup/Helper/Contacts/Data.php
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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 2016 FireGento Team (http://www.firegento.com)
|
19 |
+
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
20 |
+
*/
|
21 |
+
|
22 |
+
class FireGento_MageSetup_Helper_Contacts_Data extends Mage_Contacts_Helper_Data
|
23 |
+
{
|
24 |
+
|
25 |
+
const XML_PATH_ACCEPT_AGREEMENT = 'contacts/contacts/accept_agreement';
|
26 |
+
|
27 |
+
/**
|
28 |
+
* Avoid loss of translation
|
29 |
+
*/
|
30 |
+
public function __construct()
|
31 |
+
{
|
32 |
+
$this->_moduleName = 'Mage_Contacts';
|
33 |
+
}
|
34 |
+
|
35 |
+
public function isAcceptAgreement()
|
36 |
+
{
|
37 |
+
return Mage::getStoreConfig(self::XML_PATH_ACCEPT_AGREEMENT);
|
38 |
+
}
|
39 |
+
}
|
app/code/community/FireGento/MageSetup/Helper/Data.php
CHANGED
@@ -116,4 +116,27 @@ class FireGento_MageSetup_Helper_Data extends Mage_Core_Helper_Abstract
|
|
116 |
Mage::app()->getCacheInstance()->cleanType('config');
|
117 |
Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => 'config'));
|
118 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
119 |
}
|
116 |
Mage::app()->getCacheInstance()->cleanType('config');
|
117 |
Mage::dispatchEvent('adminhtml_cache_refresh_type', array('type' => 'config'));
|
118 |
}
|
119 |
+
|
120 |
+
/**
|
121 |
+
* Gets the value of the delivery time attribute:
|
122 |
+
* @param $product
|
123 |
+
* @return string Delivery Time
|
124 |
+
*/
|
125 |
+
public function getDeliveryTimeFromProduct($product)
|
126 |
+
{
|
127 |
+
$attribute = $product->getResource()->getAttribute("delivery_time");
|
128 |
+
switch ($attribute->getFrontendInput()) {
|
129 |
+
case "select":
|
130 |
+
$deliveryTime = $product->getAttributeText("delivery_time");
|
131 |
+
break;
|
132 |
+
case "text":
|
133 |
+
case "textarea":
|
134 |
+
$deliveryTime = $product->getDeliveryTime();
|
135 |
+
break;
|
136 |
+
default:
|
137 |
+
$deliveryTime = null;
|
138 |
+
break;
|
139 |
+
}
|
140 |
+
return $deliveryTime;
|
141 |
+
}
|
142 |
}
|
app/code/community/FireGento/MageSetup/Model/Config.php
CHANGED
@@ -128,16 +128,20 @@ class FireGento_MageSetup_Model_Config extends Varien_Simplexml_Config
|
|
128 |
protected function _addConfigFile($fileName, $mergeConfig, $overwrite = true)
|
129 |
{
|
130 |
$config = Mage::getConfig();
|
131 |
-
$
|
|
|
132 |
|
133 |
// If the given file does not exist, use the default file
|
134 |
-
|
135 |
-
|
|
|
136 |
}
|
137 |
|
138 |
// Load the given config file
|
139 |
-
|
140 |
-
|
|
|
|
|
141 |
$config->extend($mergeConfig, $overwrite);
|
142 |
}
|
143 |
}
|
128 |
protected function _addConfigFile($fileName, $mergeConfig, $overwrite = true)
|
129 |
{
|
130 |
$config = Mage::getConfig();
|
131 |
+
$moduleDir = $config->getModuleDir('etc', 'FireGento_MageSetup');
|
132 |
+
$configFile = $moduleDir . DS . $this->getCountry();
|
133 |
|
134 |
// If the given file does not exist, use the default file
|
135 |
+
$validatorNot = new Zend_Validate_File_NotExists($configFile);
|
136 |
+
if ($validatorNot->isValid($fileName)) {
|
137 |
+
$configFile = $moduleDir . DS . 'default';
|
138 |
}
|
139 |
|
140 |
// Load the given config file
|
141 |
+
$validator = new Zend_Validate_File_Exists($configFile);
|
142 |
+
if ($validator->isValid($fileName)) {
|
143 |
+
$fileName = $configFile . DS . $fileName;
|
144 |
+
if ($mergeConfig->loadFile($fileName)) {
|
145 |
$config->extend($mergeConfig, $overwrite);
|
146 |
}
|
147 |
}
|
app/code/community/FireGento/MageSetup/Model/Newsletter/Subscriber/Status.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Newsletter_Subscriber_Status
|
32 |
-
extends Mage_Core_Model_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* Init resource model
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Newsletter_Subscriber_Status extends Mage_Core_Model_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* Init resource model
|
app/code/community/FireGento/MageSetup/Model/Observer.php
CHANGED
@@ -1,405 +1,429 @@
|
|
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.2
|
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 |
-
|
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 |
-
|
352 |
-
|
353 |
-
|
354 |
-
|
355 |
-
|
356 |
-
|
357 |
-
|
358 |
-
|
359 |
-
|
360 |
-
|
361 |
-
|
362 |
-
|
363 |
-
|
364 |
-
|
365 |
-
|
366 |
-
|
367 |
-
|
368 |
-
|
369 |
-
|
370 |
-
|
371 |
-
|
372 |
-
|
373 |
-
|
374 |
-
|
375 |
-
|
376 |
-
*
|
377 |
-
|
378 |
-
|
379 |
-
|
380 |
-
|
381 |
-
|
382 |
-
|
383 |
-
|
384 |
-
|
385 |
-
|
386 |
-
$
|
387 |
-
|
388 |
-
|
389 |
-
|
390 |
-
|
391 |
-
|
392 |
-
|
393 |
-
|
394 |
-
$
|
395 |
-
|
396 |
-
|
397 |
-
|
398 |
-
|
399 |
-
|
400 |
-
|
401 |
-
|
402 |
-
|
403 |
-
|
404 |
-
|
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-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.2
|
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, $product->getStoreId());
|
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 |
+
$description = strip_tags($description);
|
143 |
+
if (mb_strlen($description) > 255) {
|
144 |
+
$remainder = '';
|
145 |
+
$description = Mage::helper('core/string')->truncate($description, 255, '...', $remainder, false);
|
146 |
+
}
|
147 |
+
$product->setMetaDescription($description);
|
148 |
+
}
|
149 |
+
|
150 |
+
return $this;
|
151 |
+
}
|
152 |
+
|
153 |
+
/**
|
154 |
+
* Get the categories of the current product
|
155 |
+
*
|
156 |
+
* @param Mage_Catalog_Model_Product $product Product
|
157 |
+
* @return array Categories
|
158 |
+
*/
|
159 |
+
protected function _getCategoryKeywords($product, $storeid = 0)
|
160 |
+
{
|
161 |
+
$categories = $product->getCategoryIds();
|
162 |
+
$categoryArr = $this->_fetchCategoryNames($categories, $storeid);
|
163 |
+
$keywords = $this->_buildKeywords($categoryArr);
|
164 |
+
|
165 |
+
return $keywords;
|
166 |
+
}
|
167 |
+
|
168 |
+
/**
|
169 |
+
* Fetches all category names via category path; adds first the assigned
|
170 |
+
* categories and second all categories via path.
|
171 |
+
*
|
172 |
+
* @param array $categories Category Ids
|
173 |
+
* @return array Categories
|
174 |
+
*/
|
175 |
+
protected function _fetchCategoryNames($categories, $storeid=0)
|
176 |
+
{
|
177 |
+
$return = array(
|
178 |
+
'assigned' => array(),
|
179 |
+
'path' => array()
|
180 |
+
);
|
181 |
+
|
182 |
+
$storeRootCategoryId = Mage::app()->getStore($storeid)->getRootCategoryId();
|
183 |
+
|
184 |
+
foreach ($categories as $categoryId) {
|
185 |
+
// Check if category was already added
|
186 |
+
if (array_key_exists($categoryId, $return['assigned'])
|
187 |
+
|| array_key_exists($categoryId, $return['path'])
|
188 |
+
) {
|
189 |
+
return;
|
190 |
+
}
|
191 |
+
|
192 |
+
/* @var $category Mage_Catalog_Model_Category */
|
193 |
+
$category = Mage::getModel('catalog/category')->setStoreId($storeid)->load($categoryId);
|
194 |
+
|
195 |
+
$path = $category->getPath();
|
196 |
+
$pathIds = explode('/', $path);
|
197 |
+
// Fetch path ids and remove the first two (base and root category)
|
198 |
+
$categorySuperRootCategoryId = array_shift($pathIds);
|
199 |
+
$categoryRootCategoryId = array_shift($pathIds);
|
200 |
+
|
201 |
+
// use category names only if root category id matches
|
202 |
+
if ($categoryRootCategoryId == $storeRootCategoryId || 0 == $storeid) {
|
203 |
+
$return['assigned'][$categoryId] = $category->getName();
|
204 |
+
|
205 |
+
// Fetch the names from path categories
|
206 |
+
if (count($pathIds) > 0) {
|
207 |
+
foreach ($pathIds as $pathId) {
|
208 |
+
if (!array_key_exists($pathId, $return['assigned'])
|
209 |
+
&& !array_key_exists($pathId, $return['path'])
|
210 |
+
) {
|
211 |
+
/* @var $pathCategory Mage_Catalog_Model_Category */
|
212 |
+
$pathCategory = Mage::getModel('catalog/category')->setStoreId($storeid)->load($pathId);
|
213 |
+
$return['path'][$pathId] = $pathCategory->getName();
|
214 |
+
}
|
215 |
+
}
|
216 |
+
}
|
217 |
+
}
|
218 |
+
}
|
219 |
+
|
220 |
+
return $return;
|
221 |
+
}
|
222 |
+
|
223 |
+
/**
|
224 |
+
* Processes the category array and generates a string
|
225 |
+
*
|
226 |
+
* @param array $categoryTypes Categories
|
227 |
+
* @return string Keywords
|
228 |
+
*/
|
229 |
+
protected function _buildKeywords($categoryTypes)
|
230 |
+
{
|
231 |
+
if (!$categoryTypes) {
|
232 |
+
return '';
|
233 |
+
}
|
234 |
+
|
235 |
+
$keywords = array();
|
236 |
+
foreach ($categoryTypes as $categories) {
|
237 |
+
$keywords[] = trim(implode(', ', $categories), ', ');
|
238 |
+
}
|
239 |
+
|
240 |
+
return trim(implode(', ', $keywords), ', ');
|
241 |
+
}
|
242 |
+
|
243 |
+
/**
|
244 |
+
* Add "Required" and "Visible on Custom Creation" Option to Checkout Agreements
|
245 |
+
*
|
246 |
+
* Event: <adminhtml_block_html_before>
|
247 |
+
*
|
248 |
+
* @param Varien_Event_Observer $observer Observer
|
249 |
+
* @return FireGento_MageSetup_Model_Observer Observer
|
250 |
+
*/
|
251 |
+
public function addOptionsForAgreements(Varien_Event_Observer $observer)
|
252 |
+
{
|
253 |
+
$block = $observer->getEvent()->getBlock();
|
254 |
+
if ($block instanceof Mage_Adminhtml_Block_Checkout_Agreement_Edit_Form) {
|
255 |
+
$helper = Mage::helper('magesetup');
|
256 |
+
$form = $block->getForm();
|
257 |
+
|
258 |
+
/** @var Varien_Data_Form_Element_Fieldset $fieldset */
|
259 |
+
$fieldset = $form->getElement('base_fieldset');
|
260 |
+
|
261 |
+
$form->getElement('content')->setRequired(false);
|
262 |
+
|
263 |
+
$fieldset->addField('is_required', 'select', array(
|
264 |
+
'label' => $helper->__('Required'),
|
265 |
+
'title' => $helper->__('Required'),
|
266 |
+
'note' => $helper->__('Display Checkbox on Frontend'),
|
267 |
+
'name' => 'is_required',
|
268 |
+
'required' => true,
|
269 |
+
'options' => array(
|
270 |
+
'1' => $helper->__('Yes'),
|
271 |
+
'0' => $helper->__('No'),
|
272 |
+
),
|
273 |
+
));
|
274 |
+
|
275 |
+
$fieldset->addField('agreement_type', 'select', array(
|
276 |
+
'label' => $helper->__('Display on'),
|
277 |
+
'title' => $helper->__('Display on'),
|
278 |
+
'note' => $helper->__('Require Confirmation on Customer Registration and/or Checkout'),
|
279 |
+
'name' => 'agreement_type',
|
280 |
+
'required' => true,
|
281 |
+
'options' => Mage::getSingleton('magesetup/source_agreementType')->getOptionArray(),
|
282 |
+
));
|
283 |
+
|
284 |
+
$fieldset->addField('revocation_product_type', 'select', array(
|
285 |
+
'label' => $helper->__('Display for following Revocation Product Types'),
|
286 |
+
'title' => $helper->__('Display for following Revocation Product Types'),
|
287 |
+
'note' => $helper->__('Will only be displayed if at least one product of the selected type is in cart'),
|
288 |
+
'name' => 'revocation_product_type',
|
289 |
+
'required' => false,
|
290 |
+
'options' => Mage::getSingleton('magesetup/source_revocationProductType')->getOptionArray(),
|
291 |
+
));
|
292 |
+
|
293 |
+
Mage::dispatchEvent('magesetup_adminhtml_checkout_agreement_edit_form', array(
|
294 |
+
'form' => $form,
|
295 |
+
'fieldset' => $fieldset,
|
296 |
+
));
|
297 |
+
|
298 |
+
$model = Mage::registry('checkout_agreement');
|
299 |
+
$form->setValues($model->getData());
|
300 |
+
$block->setForm($form);
|
301 |
+
}
|
302 |
+
|
303 |
+
return $this;
|
304 |
+
}
|
305 |
+
|
306 |
+
/**
|
307 |
+
* Get required agreements on custom registration
|
308 |
+
*
|
309 |
+
* @return array Customer agreement ids
|
310 |
+
*/
|
311 |
+
protected function _getCustomerCreateAgreements()
|
312 |
+
{
|
313 |
+
$ids = Mage::getModel('checkout/agreement')->getCollection()
|
314 |
+
->addStoreFilter(Mage::app()->getStore()->getId())
|
315 |
+
->addFieldToFilter('is_active', 1)
|
316 |
+
->addFieldToFilter('agreement_type', array('in' => array(
|
317 |
+
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_CUSTOMER,
|
318 |
+
FireGento_MageSetup_Model_Source_AgreementType::AGREEMENT_TYPE_BOTH,
|
319 |
+
)))// Only get Required Elements
|
320 |
+
->getAllIds();
|
321 |
+
|
322 |
+
return $ids;
|
323 |
+
}
|
324 |
+
|
325 |
+
/**
|
326 |
+
* Check if there are required agreements for the customer registration
|
327 |
+
* and validate them if applicable.
|
328 |
+
*
|
329 |
+
* Event: <controller_action_predispatch_customer_account_createpost>
|
330 |
+
*
|
331 |
+
* @param Varien_Event_Observer $observer Observer
|
332 |
+
*/
|
333 |
+
public function customerCreatePreDispatch(Varien_Event_Observer $observer)
|
334 |
+
{
|
335 |
+
$controller = $observer->getEvent()->getControllerAction();
|
336 |
+
if (!$this->requiredAgreementsAccepted($controller)) {
|
337 |
+
$session = Mage::getSingleton('customer/session');
|
338 |
+
$session->addException(
|
339 |
+
new Mage_Customer_Exception('Cannot create customer: agreements not confirmed'),
|
340 |
+
Mage::helper('magesetup')->__('Agreements not confirmed.')
|
341 |
+
);
|
342 |
+
|
343 |
+
$controller->getResponse()->setRedirect(Mage::getUrl('*/*/create', array('_secure' => true)));
|
344 |
+
$controller->setFlag(
|
345 |
+
$controller->getRequest()->getActionName(),
|
346 |
+
Mage_Core_Controller_Varien_Action::FLAG_NO_DISPATCH,
|
347 |
+
true
|
348 |
+
);
|
349 |
+
}
|
350 |
+
}
|
351 |
+
|
352 |
+
private function requiredAgreementsAccepted($controller)
|
353 |
+
{
|
354 |
+
$requiredAgreements = $this->_getCustomerCreateAgreements();
|
355 |
+
if (!$requiredAgreements) {
|
356 |
+
return false;
|
357 |
+
}
|
358 |
+
$postedAgreements = $controller->getRequest()->getPost('agreement', array());
|
359 |
+
if (!is_array($postedAgreements)) {
|
360 |
+
return false;
|
361 |
+
}
|
362 |
+
|
363 |
+
$postedAgreements = array_keys($postedAgreements);
|
364 |
+
$diff = array_diff($requiredAgreements, $postedAgreements);
|
365 |
+
if ($diff) {
|
366 |
+
return false;
|
367 |
+
}
|
368 |
+
return true;
|
369 |
+
}
|
370 |
+
|
371 |
+
/**
|
372 |
+
* add product attributes to quote items collection
|
373 |
+
*
|
374 |
+
* @magentoEvent sales_quote_config_get_product_attributes
|
375 |
+
*
|
376 |
+
* @param Varien_Event_Observer $observer Observer
|
377 |
+
*/
|
378 |
+
public function addProductAttributesToQuoteItems(Varien_Event_Observer $observer)
|
379 |
+
{
|
380 |
+
$cacheTag = 'magesetup_quote_attributes';
|
381 |
+
if (Mage::app()->useCache('eav') && Mage::app()->loadCache($cacheTag)) {
|
382 |
+
foreach (explode(',', Mage::app()->loadCache($cacheTag)) as $_cacheRow) {
|
383 |
+
$observer->getAttributes()->setData($_cacheRow, '');
|
384 |
+
}
|
385 |
+
} else {
|
386 |
+
$collection = Mage::getResourceModel('catalog/product_attribute_collection')
|
387 |
+
->setItemObjectClass('catalog/resource_eav_attribute')
|
388 |
+
->addFieldToFilter('additional_table.is_visible_on_checkout', 1);
|
389 |
+
$attrList = array();
|
390 |
+
foreach ($collection as $_attribute) {
|
391 |
+
$attrList[] = $_attribute->getAttributeCode();
|
392 |
+
$observer->getAttributes()->setData($_attribute->getAttributeCode(), '');
|
393 |
+
}
|
394 |
+
Mage::app()->saveCache(implode(',', $attrList), $cacheTag, array('eav'), false);
|
395 |
+
}
|
396 |
+
}
|
397 |
+
|
398 |
+
/**
|
399 |
+
* Compatibility for Magento < 1.9
|
400 |
+
*
|
401 |
+
* @magentoEvent core_block_abstract_to_html_after
|
402 |
+
*
|
403 |
+
* @param Varien_Event_Observer $observer Observer
|
404 |
+
*/
|
405 |
+
public function setGAAnonymizerCode(Varien_Event_Observer $observer)
|
406 |
+
{
|
407 |
+
$block = $observer->getEvent()->getBlock();
|
408 |
+
if ($block instanceof Mage_GoogleAnalytics_Block_Ga && version_compare(Mage::getVersion(), '1.9', '<=')) {
|
409 |
+
$transport = $observer->getEvent()->getTransport();
|
410 |
+
|
411 |
+
$html = $transport->getHtml();
|
412 |
+
|
413 |
+
if (!Mage::getStoreConfigFlag(self::CONFIG_GOOGLE_ANALYTICS_IP_ANONYMIZATION)) {
|
414 |
+
return;
|
415 |
+
}
|
416 |
+
|
417 |
+
$matches = array();
|
418 |
+
$setAccountExpression = '/_gaq\.push\(\[\'_setAccount\', \'[a-zA-Z0-9-_]+\'\]\);\n/';
|
419 |
+
$append = '_gaq.push([\'_gat._anonymizeIp\']);';
|
420 |
+
|
421 |
+
if (preg_match_all($setAccountExpression, $html, $matches) && count($matches) && count($matches[0])) {
|
422 |
+
$html = preg_replace($setAccountExpression, $matches[0][0] . $append . "\n", $html);
|
423 |
+
}
|
424 |
+
|
425 |
+
$transport->setHtml($html);
|
426 |
+
}
|
427 |
+
}
|
428 |
+
}
|
429 |
+
|
app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Resource_Newsletter_Subscriber_Status
|
32 |
-
extends Mage_Core_Model_Resource_Db_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* Init main table and id field name
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Resource_Newsletter_Subscriber_Status extends Mage_Core_Model_Resource_Db_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* Init main table and id field name
|
app/code/community/FireGento/MageSetup/Model/Resource/Newsletter/Subscriber/Status/Collection.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Resource_Newsletter_Subscriber_Status_Collection
|
32 |
-
extends Mage_Core_Model_Resource_Db_Collection_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* Initialize the model and resource for the collection
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Resource_Newsletter_Subscriber_Status_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* Initialize the model and resource for the collection
|
app/code/community/FireGento/MageSetup/Model/Setup/Agreements.php
CHANGED
@@ -38,7 +38,6 @@ class FireGento_MageSetup_Model_Setup_Agreements extends FireGento_MageSetup_Mod
|
|
38 |
public function setup($locale = array('default' => 'de_DE'))
|
39 |
{
|
40 |
foreach ($locale as $storeId => $localeCode) {
|
41 |
-
|
42 |
if (!$localeCode) {
|
43 |
if (sizeof($locale) == 1) {
|
44 |
continue;
|
@@ -80,12 +79,13 @@ class FireGento_MageSetup_Model_Setup_Agreements extends FireGento_MageSetup_Mod
|
|
80 |
return;
|
81 |
}
|
82 |
|
83 |
-
$filename = Mage::getBaseDir('locale') . DS . $locale . DS . 'template'
|
84 |
-
|
|
|
85 |
return;
|
86 |
}
|
87 |
|
88 |
-
$templateContent = $this->getTemplateContent($filename);
|
89 |
|
90 |
// Find name
|
91 |
$name = '';
|
38 |
public function setup($locale = array('default' => 'de_DE'))
|
39 |
{
|
40 |
foreach ($locale as $storeId => $localeCode) {
|
|
|
41 |
if (!$localeCode) {
|
42 |
if (sizeof($locale) == 1) {
|
43 |
continue;
|
79 |
return;
|
80 |
}
|
81 |
|
82 |
+
$filename = Mage::getBaseDir('locale') . DS . $locale . DS . 'template';
|
83 |
+
$validatorNot = new Zend_Validate_File_NotExists($filename);
|
84 |
+
if ($validatorNot->isValid($agreementData['filename'])) {
|
85 |
return;
|
86 |
}
|
87 |
|
88 |
+
$templateContent = $this->getTemplateContent($filename.DS.$agreementData['filename']);
|
89 |
|
90 |
// Find name
|
91 |
$name = '';
|
app/code/community/FireGento/MageSetup/Model/Setup/Cms.php
CHANGED
@@ -43,7 +43,6 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
43 |
public function setup($locale = array('default' => 'de_DE'))
|
44 |
{
|
45 |
foreach ($locale as $storeId => $localeCode) {
|
46 |
-
|
47 |
if (!$localeCode) {
|
48 |
continue;
|
49 |
}
|
@@ -167,35 +166,13 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
167 |
'is_active' => 1,
|
168 |
);
|
169 |
|
170 |
-
$filename = Mage::getBaseDir('locale') . DS . $locale . DS . 'template'
|
171 |
-
|
|
|
172 |
return;
|
173 |
}
|
174 |
|
175 |
-
$
|
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 |
-
|
183 |
-
if (preg_match('/<!--@identifier\s*((?:.)*?)\s*@-->/us', $templateContent, $matches)) {
|
184 |
-
$data['identifier'] = $matches[1];
|
185 |
-
$templateContent = str_replace($matches[0], '', $templateContent);
|
186 |
-
}
|
187 |
-
|
188 |
-
if (preg_match('/<!--@root_template\s*(.*?)\s*@-->/s', $templateContent, $matches)) {
|
189 |
-
$data['root_template'] = $matches[1];
|
190 |
-
$templateContent = str_replace($matches[0], '', $templateContent);
|
191 |
-
}
|
192 |
-
|
193 |
-
/**
|
194 |
-
* Remove comment lines
|
195 |
-
*/
|
196 |
-
$templateContent = preg_replace('#\{\*.*\*\}#suU', '', $templateContent);
|
197 |
-
|
198 |
-
$data['content'] = $templateContent;
|
199 |
|
200 |
if (is_null($storeId)) {
|
201 |
$page = $this->_getDefaultPage($data['identifier']);
|
@@ -230,6 +207,51 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
230 |
}
|
231 |
}
|
232 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
233 |
/**
|
234 |
* Collect data and create CMS block
|
235 |
*
|
@@ -246,12 +268,13 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
246 |
$block = Mage::getModel('cms/block');
|
247 |
}
|
248 |
|
249 |
-
$filename = Mage::getBaseDir('locale') . DS . $locale . DS . 'template'
|
250 |
-
|
|
|
251 |
return;
|
252 |
}
|
253 |
|
254 |
-
$templateContent = $this->getTemplateContent($filename);
|
255 |
|
256 |
// Find title
|
257 |
if (preg_match('/<!--@title\s*(.*?)\s*@-->/u', $templateContent, $matches)) {
|
@@ -320,11 +343,9 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
320 |
}
|
321 |
|
322 |
if ($block->getId()) {
|
323 |
-
|
324 |
/** @var $backupBlock Mage_Cms_Model_Block */
|
325 |
$backupBlock = Mage::getModel('cms/block')->load('footer_links_backup');
|
326 |
if (!$backupBlock->getId()) {
|
327 |
-
|
328 |
// create copy of original block
|
329 |
$data = array();
|
330 |
$data['block_id'] = $block->getId();
|
@@ -362,7 +383,9 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
362 |
{
|
363 |
return Mage::getResourceModel('cms/block_collection')
|
364 |
->addFieldToFilter('identifier', $identifier)
|
365 |
-
->addStoreFilter(0)
|
|
|
|
|
366 |
}
|
367 |
|
368 |
/**
|
@@ -375,6 +398,8 @@ class FireGento_MageSetup_Model_Setup_Cms extends FireGento_MageSetup_Model_Setu
|
|
375 |
{
|
376 |
return Mage::getResourceModel('cms/page_collection')
|
377 |
->addFieldToFilter('identifier', $identifier)
|
378 |
-
->addStoreFilter(0)
|
|
|
|
|
379 |
}
|
380 |
}
|
43 |
public function setup($locale = array('default' => 'de_DE'))
|
44 |
{
|
45 |
foreach ($locale as $storeId => $localeCode) {
|
|
|
46 |
if (!$localeCode) {
|
47 |
continue;
|
48 |
}
|
166 |
'is_active' => 1,
|
167 |
);
|
168 |
|
169 |
+
$filename = Mage::getBaseDir('locale') . DS . $locale . DS . 'template';
|
170 |
+
$validatorNot = new Zend_Validate_File_NotExists($filename);
|
171 |
+
if ($validatorNot->isValid($pageData['filename'])) {
|
172 |
return;
|
173 |
}
|
174 |
|
175 |
+
$data = $this->_extractPageData($this->getTemplateContent($filename.DS.$pageData['filename']), $data);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
176 |
|
177 |
if (is_null($storeId)) {
|
178 |
$page = $this->_getDefaultPage($data['identifier']);
|
207 |
}
|
208 |
}
|
209 |
|
210 |
+
/**
|
211 |
+
* Get page data as array from template content
|
212 |
+
*
|
213 |
+
* @param array $data CMS page data
|
214 |
+
* @param string $templateContent Template content extracted from file
|
215 |
+
* @return array
|
216 |
+
*/
|
217 |
+
protected function _extractPageData($templateContent, $data = array())
|
218 |
+
{
|
219 |
+
if (preg_match('/<!--@title\s*(.*?)\s*@-->/u', $templateContent, $matches)) {
|
220 |
+
$data['title'] = $matches[1];
|
221 |
+
$data['content_heading'] = $matches[1];
|
222 |
+
$templateContent = str_replace($matches[0], '', $templateContent);
|
223 |
+
}
|
224 |
+
|
225 |
+
if (preg_match('/<!--@identifier\s*((?:.)*?)\s*@-->/us', $templateContent, $matches)) {
|
226 |
+
$data['identifier'] = $matches[1];
|
227 |
+
$templateContent = str_replace($matches[0], '', $templateContent);
|
228 |
+
}
|
229 |
+
|
230 |
+
if (preg_match('/<!--@root_template\s*(.*?)\s*@-->/s', $templateContent, $matches)) {
|
231 |
+
$data['root_template'] = $matches[1];
|
232 |
+
$templateContent = str_replace($matches[0], '', $templateContent);
|
233 |
+
}
|
234 |
+
|
235 |
+
if (preg_match('/<!--@meta_keywords\s*((?:.)*?)\s*@-->/us', $templateContent, $matches)) {
|
236 |
+
$data['meta_keywords'] = $matches[1];
|
237 |
+
$templateContent = str_replace($matches[0], '', $templateContent);
|
238 |
+
}
|
239 |
+
|
240 |
+
if (preg_match('/<!--@meta_description\s*((?:.)*?)\s*@-->/us', $templateContent, $matches)) {
|
241 |
+
$data['meta_description'] = $matches[1];
|
242 |
+
$templateContent = str_replace($matches[0], '', $templateContent);
|
243 |
+
}
|
244 |
+
|
245 |
+
/**
|
246 |
+
* Remove comment lines
|
247 |
+
*/
|
248 |
+
$templateContent = preg_replace('#\{\*.*\*\}#suU', '', $templateContent);
|
249 |
+
|
250 |
+
$data['content'] = $templateContent;
|
251 |
+
|
252 |
+
return $data;
|
253 |
+
}
|
254 |
+
|
255 |
/**
|
256 |
* Collect data and create CMS block
|
257 |
*
|
268 |
$block = Mage::getModel('cms/block');
|
269 |
}
|
270 |
|
271 |
+
$filename = Mage::getBaseDir('locale') . DS . $locale . DS . 'template';
|
272 |
+
$validatorNot = new Zend_Validate_File_NotExists($filename);
|
273 |
+
if ($validatorNot->isValid($blockData['filename'])) {
|
274 |
return;
|
275 |
}
|
276 |
|
277 |
+
$templateContent = $this->getTemplateContent($filename.DS.$blockData['filename']);
|
278 |
|
279 |
// Find title
|
280 |
if (preg_match('/<!--@title\s*(.*?)\s*@-->/u', $templateContent, $matches)) {
|
343 |
}
|
344 |
|
345 |
if ($block->getId()) {
|
|
|
346 |
/** @var $backupBlock Mage_Cms_Model_Block */
|
347 |
$backupBlock = Mage::getModel('cms/block')->load('footer_links_backup');
|
348 |
if (!$backupBlock->getId()) {
|
|
|
349 |
// create copy of original block
|
350 |
$data = array();
|
351 |
$data['block_id'] = $block->getId();
|
383 |
{
|
384 |
return Mage::getResourceModel('cms/block_collection')
|
385 |
->addFieldToFilter('identifier', $identifier)
|
386 |
+
->addStoreFilter(0)
|
387 |
+
->setPageSize(1)
|
388 |
+
->getFirstItem();
|
389 |
}
|
390 |
|
391 |
/**
|
398 |
{
|
399 |
return Mage::getResourceModel('cms/page_collection')
|
400 |
->addFieldToFilter('identifier', $identifier)
|
401 |
+
->addStoreFilter(0)
|
402 |
+
->setPageSize(1)
|
403 |
+
->getFirstItem();
|
404 |
}
|
405 |
}
|
app/code/community/FireGento/MageSetup/Model/Setup/Customergroups.php
ADDED
@@ -0,0 +1,33 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.2
|
21 |
+
* @since 0.2.0
|
22 |
+
*/
|
23 |
+
|
24 |
+
/**
|
25 |
+
* Setup class for CMS pages and blocks
|
26 |
+
*
|
27 |
+
* @category FireGento
|
28 |
+
* @package FireGento_MageSetup
|
29 |
+
* @author FireGento Team <team@firegento.com>
|
30 |
+
*/
|
31 |
+
class FireGento_MageSetup_Model_Setup_Customergroups extends FireGento_MageSetup_Model_Setup_Abstract
|
32 |
+
{
|
33 |
+
}
|
app/code/community/FireGento/MageSetup/Model/Setup/Email.php
CHANGED
@@ -44,7 +44,6 @@ class FireGento_MageSetup_Model_Setup_Email extends FireGento_MageSetup_Model_Se
|
|
44 |
public function setup($locale = array('default' => 'de_DE'), $overwrite = false)
|
45 |
{
|
46 |
foreach ($locale as $storeId => $localeCode) {
|
47 |
-
|
48 |
if (!$localeCode) {
|
49 |
continue;
|
50 |
}
|
@@ -55,9 +54,7 @@ class FireGento_MageSetup_Model_Setup_Email extends FireGento_MageSetup_Model_Se
|
|
55 |
|
56 |
// execute emails
|
57 |
foreach ($this->_getConfigEmails($localeCode) as $data) {
|
58 |
-
|
59 |
if ($data['execute'] == 1) {
|
60 |
-
|
61 |
// Change override param from false to true to override existing templates for testing
|
62 |
$this->_createEmail($data, $localeCode, $overwrite, $storeId);
|
63 |
}
|
@@ -101,7 +98,6 @@ class FireGento_MageSetup_Model_Setup_Email extends FireGento_MageSetup_Model_Se
|
|
101 |
->loadByCode($templateCode);
|
102 |
|
103 |
if (!$template->getId() || $override) {
|
104 |
-
|
105 |
$localeEmailPath = $this->_getLocaleEmailPath($locale);
|
106 |
|
107 |
$template
|
44 |
public function setup($locale = array('default' => 'de_DE'), $overwrite = false)
|
45 |
{
|
46 |
foreach ($locale as $storeId => $localeCode) {
|
|
|
47 |
if (!$localeCode) {
|
48 |
continue;
|
49 |
}
|
54 |
|
55 |
// execute emails
|
56 |
foreach ($this->_getConfigEmails($localeCode) as $data) {
|
|
|
57 |
if ($data['execute'] == 1) {
|
|
|
58 |
// Change override param from false to true to override existing templates for testing
|
59 |
$this->_createEmail($data, $localeCode, $overwrite, $storeId);
|
60 |
}
|
98 |
->loadByCode($templateCode);
|
99 |
|
100 |
if (!$template->getId() || $override) {
|
|
|
101 |
$localeEmailPath = $this->_getLocaleEmailPath($locale);
|
102 |
|
103 |
$template
|
app/code/community/FireGento/MageSetup/Model/Setup/Tax.php
CHANGED
@@ -191,7 +191,6 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
191 |
// look up label
|
192 |
$label = '';
|
193 |
if (isset($taxCalcRateData['label'])) {
|
194 |
-
|
195 |
$label = $taxCalcRateData['label'];
|
196 |
unset($taxCalcRateData['label']);
|
197 |
}
|
@@ -268,7 +267,6 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
268 |
->addAttributeToFilter('tax_class_id', intval($source));
|
269 |
|
270 |
foreach ($productCollection as $product) {
|
271 |
-
|
272 |
/** @var $product Mage_Catalog_Model_Product */
|
273 |
$product->setTaxClassId(intval($target));
|
274 |
$product->getResource()->saveAttribute($product, 'tax_class_id');
|
@@ -292,7 +290,6 @@ class FireGento_MageSetup_Model_Setup_Tax extends FireGento_MageSetup_Model_Setu
|
|
292 |
->addFieldToFilter('tax_class_id', intval($source));
|
293 |
|
294 |
foreach ($customerGroupCollection as $customerGroup) {
|
295 |
-
|
296 |
/** @var $customerGroup Mage_Customer_Model_Group */
|
297 |
$customerGroup->setTaxClassId(intval($target));
|
298 |
$customerGroup->save();
|
191 |
// look up label
|
192 |
$label = '';
|
193 |
if (isset($taxCalcRateData['label'])) {
|
|
|
194 |
$label = $taxCalcRateData['label'];
|
195 |
unset($taxCalcRateData['label']);
|
196 |
}
|
267 |
->addAttributeToFilter('tax_class_id', intval($source));
|
268 |
|
269 |
foreach ($productCollection as $product) {
|
|
|
270 |
/** @var $product Mage_Catalog_Model_Product */
|
271 |
$product->setTaxClassId(intval($target));
|
272 |
$product->getResource()->saveAttribute($product, 'tax_class_id');
|
290 |
->addFieldToFilter('tax_class_id', intval($source));
|
291 |
|
292 |
foreach ($customerGroupCollection as $customerGroup) {
|
|
|
293 |
/** @var $customerGroup Mage_Customer_Model_Group */
|
294 |
$customerGroup->setTaxClassId(intval($target));
|
295 |
$customerGroup->save();
|
app/code/community/FireGento/MageSetup/Model/Source/Cms/Block.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Source_Cms_Block
|
32 |
-
extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* @var array $_options cached options
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Source_Cms_Block extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* @var array $_options cached options
|
app/code/community/FireGento/MageSetup/Model/Source/Cms/Page.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Source_Cms_Page
|
32 |
-
extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* @var array $_options cached options
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Source_Cms_Page extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* @var array $_options cached options
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/DynamicType.php
CHANGED
@@ -42,7 +42,7 @@ class FireGento_MageSetup_Model_Source_Tax_DynamicType
|
|
42 |
return array(
|
43 |
array(
|
44 |
'value' => 0,
|
45 |
-
'label' => $helper->__('No dynamic shipping tax
|
46 |
),
|
47 |
array(
|
48 |
'value' => FireGento_MageSetup_Model_Tax_Config::USE_HIGHEST_TAX_ON_PRODUCTS,
|
42 |
return array(
|
43 |
array(
|
44 |
'value' => 0,
|
45 |
+
'label' => $helper->__('No dynamic shipping tax calculation')
|
46 |
),
|
47 |
array(
|
48 |
'value' => FireGento_MageSetup_Model_Tax_Config::USE_HIGHEST_TAX_ON_PRODUCTS,
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/NewCustomerTaxClass.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Source_Tax_NewCustomerTaxClass
|
32 |
-
extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* @var array $_options cached options
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Source_Tax_NewCustomerTaxClass extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* @var array $_options cached options
|
app/code/community/FireGento/MageSetup/Model/Source/Tax/NewProductTaxClass.php
CHANGED
@@ -28,8 +28,7 @@
|
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
-
class FireGento_MageSetup_Model_Source_Tax_NewProductTaxClass
|
32 |
-
extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
33 |
{
|
34 |
/**
|
35 |
* @var array $_options cached options
|
28 |
* @package FireGento_MageSetup
|
29 |
* @author FireGento Team <team@firegento.com>
|
30 |
*/
|
31 |
+
class FireGento_MageSetup_Model_Source_Tax_NewProductTaxClass extends Mage_Eav_Model_Entity_Attribute_Source_Abstract
|
|
|
32 |
{
|
33 |
/**
|
34 |
* @var array $_options cached options
|
app/code/community/FireGento/MageSetup/Model/Tax/Config.php
CHANGED
@@ -75,9 +75,14 @@ class FireGento_MageSetup_Model_Tax_Config extends Mage_Tax_Model_Config
|
|
75 |
// Fetch the tax rates from the quote items
|
76 |
$taxClassSums = array();
|
77 |
foreach ($quoteItems as $item) {
|
78 |
-
|
79 |
/** @var $item Mage_Sales_Model_Quote_Item */
|
80 |
if ($item->getParentItem()) {
|
|
|
|
|
|
|
|
|
|
|
|
|
81 |
continue;
|
82 |
}
|
83 |
|
75 |
// Fetch the tax rates from the quote items
|
76 |
$taxClassSums = array();
|
77 |
foreach ($quoteItems as $item) {
|
|
|
78 |
/** @var $item Mage_Sales_Model_Quote_Item */
|
79 |
if ($item->getParentItem()) {
|
80 |
+
$parentProduct = $item->getParentItem()->getProduct();
|
81 |
+
if ($parentProduct->getTypeId() == 'bundle' && $parentProduct->getPriceType() != 0) {
|
82 |
+
continue;
|
83 |
+
}
|
84 |
+
}
|
85 |
+
if ($item->getProduct()->getTypeId() == 'bundle' && $item->getProduct()->getPriceType() == 0) {
|
86 |
continue;
|
87 |
}
|
88 |
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content.php
CHANGED
@@ -26,6 +26,8 @@
|
|
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 |
{
|
26 |
* @category FireGento
|
27 |
* @package FireGento_MageSetup
|
28 |
* @author FireGento Team <team@firegento.com>
|
29 |
+
*
|
30 |
+
* @loadFixture defaultEnvironment.yaml
|
31 |
*/
|
32 |
class FireGento_MageSetup_Test_Block_Imprint_Content extends EcomDev_PHPUnit_Test_Case
|
33 |
{
|
app/code/community/FireGento/MageSetup/Test/Block/Imprint/Content/fixtures/defaultEnvironment.yaml
ADDED
@@ -0,0 +1,20 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
scope:
|
2 |
+
website:
|
3 |
+
- website_id: 1
|
4 |
+
code: base
|
5 |
+
name: Base Website
|
6 |
+
default_group_id: 1
|
7 |
+
group:
|
8 |
+
- group_id: 1
|
9 |
+
website_id: 1
|
10 |
+
name: Base Store Group
|
11 |
+
default_store_id: 1
|
12 |
+
root_category_id: 2
|
13 |
+
store:
|
14 |
+
- store_id: 1
|
15 |
+
website_id: 1
|
16 |
+
group_id: 1
|
17 |
+
code: basestore
|
18 |
+
name: Base Store
|
19 |
+
is_active: 1
|
20 |
+
|
app/code/community/FireGento/MageSetup/Test/Model/Source/Tax/DynamicType/expectations/testToOptionArray.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
result:
|
2 |
-
|
3 |
value: 0
|
4 |
-
label: "No dynamic shipping tax
|
5 |
-
|
6 |
value: 1
|
7 |
label: "Use the highest product tax"
|
1 |
result:
|
2 |
-
|
3 |
value: 0
|
4 |
+
label: "No dynamic shipping tax calculation"
|
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% MwSt., zzgl. Versandkosten"
|
11 |
+
Then I should see text "Inkl. 19% MwSt."
|
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% MwSt., 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% MwSt., 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% MwSt., zzgl. Versandkosten"
|
11 |
+
Then I should see text "Inkl. 19% MwSt."
|
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% MwSt., 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% MwSt., inkl. Versandkosten"
|
app/code/community/FireGento/MageSetup/controllers/Adminhtml/MagesetupController.php
CHANGED
@@ -134,4 +134,9 @@ class FireGento_MageSetup_Adminhtml_MagesetupController extends Mage_Adminhtml_C
|
|
134 |
|
135 |
return $params;
|
136 |
}
|
|
|
|
|
|
|
|
|
|
|
137 |
}
|
134 |
|
135 |
return $params;
|
136 |
}
|
137 |
+
|
138 |
+
protected function _isAllowed()
|
139 |
+
{
|
140 |
+
return Mage::getSingleton('admin/session')->isAllowed('system/magesetup');
|
141 |
+
}
|
142 |
}
|
app/code/community/FireGento/MageSetup/controllers/Adminhtml/NewsletterController.php
CHANGED
@@ -74,4 +74,9 @@ class FireGento_MageSetup_Adminhtml_NewsletterController extends Mage_Adminhtml_
|
|
74 |
$this->getLayout()->createBlock('magesetup/adminhtml_newsletter_subscriber_status_grid')->toHtml()
|
75 |
);
|
76 |
}
|
|
|
|
|
|
|
|
|
|
|
77 |
}
|
74 |
$this->getLayout()->createBlock('magesetup/adminhtml_newsletter_subscriber_status_grid')->toHtml()
|
75 |
);
|
76 |
}
|
77 |
+
|
78 |
+
protected function _isAllowed()
|
79 |
+
{
|
80 |
+
return Mage::getSingleton('admin/session')->isAllowed('newsletter/subscriber_status');
|
81 |
+
}
|
82 |
}
|
app/code/community/FireGento/MageSetup/controllers/Contacts/IndexController.php
ADDED
@@ -0,0 +1,116 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Magento
|
4 |
+
*
|
5 |
+
* NOTICE OF LICENSE
|
6 |
+
*
|
7 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
9 |
+
* It is also available through the world-wide-web at this URL:
|
10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
11 |
+
* If you did not receive a copy of the license and are unable to
|
12 |
+
* obtain it through the world-wide-web, please send an email
|
13 |
+
* to license@magento.com so we can send you a copy immediately.
|
14 |
+
*
|
15 |
+
* DISCLAIMER
|
16 |
+
*
|
17 |
+
* Do not edit or add to this file if you wish to upgrade Magento to newer
|
18 |
+
* versions in the future. If you wish to customize Magento for your
|
19 |
+
* needs please refer to http://www.magento.com for more information.
|
20 |
+
*
|
21 |
+
* @category Mage
|
22 |
+
* @package Mage_Contacts
|
23 |
+
* @copyright Copyright (c) 2006-2016 X.commerce, Inc. and affiliates (http://www.magento.com)
|
24 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
25 |
+
*/
|
26 |
+
|
27 |
+
/**
|
28 |
+
* Contacts index controller
|
29 |
+
*
|
30 |
+
* @category Mage
|
31 |
+
* @package Mage_Contacts
|
32 |
+
* @author Magento Core Team <core@magentocommerce.com>
|
33 |
+
*/
|
34 |
+
require_once Mage::getModuleDir('controllers', 'Mage_Contacts') . DS . 'IndexController.php';
|
35 |
+
|
36 |
+
class FireGento_MageSetup_Contacts_IndexController extends Mage_Contacts_IndexController
|
37 |
+
{
|
38 |
+
const XML_PATH_EMAIL_RECIPIENT = 'contacts/email/recipient_email';
|
39 |
+
const XML_PATH_EMAIL_SENDER = 'contacts/email/sender_email_identity';
|
40 |
+
const XML_PATH_EMAIL_TEMPLATE = 'contacts/email/email_template';
|
41 |
+
|
42 |
+
public function postAction()
|
43 |
+
{
|
44 |
+
$post = $this->getRequest()->getPost();
|
45 |
+
if ($post) {
|
46 |
+
$translate = Mage::getSingleton('core/translate');
|
47 |
+
/* @var $translate Mage_Core_Model_Translate */
|
48 |
+
$translate->setTranslateInline(false);
|
49 |
+
try {
|
50 |
+
$error = false;
|
51 |
+
|
52 |
+
// checkbox validation needs to be done before creating $postObject
|
53 |
+
// otherwise data for email template can't be set
|
54 |
+
if (!array_key_exists('accept-agreement', $post) && Mage::helper('contacts')->isAcceptAgreement()) {
|
55 |
+
$error = true;
|
56 |
+
} else {
|
57 |
+
$post['accept-agreement'] = Mage::helper('contacts')->__('Agreement accepted');
|
58 |
+
}
|
59 |
+
|
60 |
+
$postObject = new Varien_Object();
|
61 |
+
$postObject->setData($post);
|
62 |
+
|
63 |
+
if (!Zend_Validate::is(trim($post['name']), 'NotEmpty')) {
|
64 |
+
$error = true;
|
65 |
+
}
|
66 |
+
|
67 |
+
if (!Zend_Validate::is(trim($post['comment']), 'NotEmpty')) {
|
68 |
+
$error = true;
|
69 |
+
}
|
70 |
+
|
71 |
+
if (!Zend_Validate::is(trim($post['email']), 'EmailAddress')) {
|
72 |
+
$error = true;
|
73 |
+
}
|
74 |
+
|
75 |
+
if (Zend_Validate::is(trim($post['hideit']), 'NotEmpty')) {
|
76 |
+
$error = true;
|
77 |
+
}
|
78 |
+
|
79 |
+
if ($error) {
|
80 |
+
throw new Exception();
|
81 |
+
}
|
82 |
+
$mailTemplate = Mage::getModel('core/email_template');
|
83 |
+
/* @var $mailTemplate Mage_Core_Model_Email_Template */
|
84 |
+
$mailTemplate->setDesignConfig(array('area' => 'frontend'))
|
85 |
+
->setReplyTo($post['email'])
|
86 |
+
->sendTransactional(
|
87 |
+
Mage::getStoreConfig(self::XML_PATH_EMAIL_TEMPLATE),
|
88 |
+
Mage::getStoreConfig(self::XML_PATH_EMAIL_SENDER),
|
89 |
+
Mage::getStoreConfig(self::XML_PATH_EMAIL_RECIPIENT),
|
90 |
+
null,
|
91 |
+
array('data' => $postObject)
|
92 |
+
);
|
93 |
+
|
94 |
+
if (!$mailTemplate->getSentSuccess()) {
|
95 |
+
throw new Exception();
|
96 |
+
}
|
97 |
+
|
98 |
+
$translate->setTranslateInline(true);
|
99 |
+
|
100 |
+
Mage::getSingleton('customer/session')->addSuccess(Mage::helper('contacts')->__('Your inquiry was submitted and will be responded to as soon as possible. Thank you for contacting us.'));
|
101 |
+
$this->_redirect('*/*/');
|
102 |
+
|
103 |
+
return;
|
104 |
+
} catch (Exception $e) {
|
105 |
+
$translate->setTranslateInline(true);
|
106 |
+
|
107 |
+
Mage::getSingleton('customer/session')->addError(Mage::helper('contacts')->__('Unable to submit your request. Please, try again later'));
|
108 |
+
$this->_redirect('*/*/');
|
109 |
+
return;
|
110 |
+
}
|
111 |
+
|
112 |
+
} else {
|
113 |
+
$this->_redirect('*/*/');
|
114 |
+
}
|
115 |
+
}
|
116 |
+
}
|
app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.2.3-2.3.0.php
ADDED
@@ -0,0 +1,61 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.2
|
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 |
+
// Make sure the upgrade is not performed on legacy installations with tables missing
|
36 |
+
$adminVersion = Mage::getConfig()->getModuleConfig('Mage_Admin')->version;
|
37 |
+
if (version_compare($adminVersion, '1.6.1.1', '>')) {
|
38 |
+
$connection = $installer->getConnection();
|
39 |
+
|
40 |
+
//---------------------------------------------------
|
41 |
+
// Add blocks
|
42 |
+
//---------------------------------------------------
|
43 |
+
$table = $installer->getTable('admin/permission_block');
|
44 |
+
if ($table) {
|
45 |
+
$blockNames = array(
|
46 |
+
'magesetup/imprint_field',
|
47 |
+
'magesetup/imprint_content'
|
48 |
+
);
|
49 |
+
foreach ($blockNames as $blockName) {
|
50 |
+
$connection->insertOnDuplicate(
|
51 |
+
$table,
|
52 |
+
array(
|
53 |
+
'block_name' => $blockName,
|
54 |
+
'is_allowed' => 1,
|
55 |
+
)
|
56 |
+
);
|
57 |
+
}
|
58 |
+
}
|
59 |
+
}
|
60 |
+
|
61 |
+
$installer->endSetup();
|
app/code/community/FireGento/MageSetup/data/magesetup_setup/data-upgrade-2.3.0-2.3.1.php
ADDED
@@ -0,0 +1,62 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.2
|
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 |
+
// Make sure the upgrade is not performed on legacy installations with tables missing
|
36 |
+
$adminVersion = Mage::getConfig()->getModuleConfig('Mage_Admin')->version;
|
37 |
+
if (version_compare($adminVersion, '1.6.1.1', '>')) {
|
38 |
+
$connection = $installer->getConnection();
|
39 |
+
|
40 |
+
//---------------------------------------------------
|
41 |
+
// Add blocks
|
42 |
+
//---------------------------------------------------
|
43 |
+
$table = $installer->getTable('admin/permission_block');
|
44 |
+
if ($table) {
|
45 |
+
$blockNames = array(
|
46 |
+
'cms/block',
|
47 |
+
'germansetup/imprint_field',
|
48 |
+
'germansetup/imprint_content',
|
49 |
+
);
|
50 |
+
foreach ($blockNames as $blockName) {
|
51 |
+
$connection->insertOnDuplicate(
|
52 |
+
$table,
|
53 |
+
array(
|
54 |
+
'block_name' => $blockName,
|
55 |
+
'is_allowed' => 1,
|
56 |
+
)
|
57 |
+
);
|
58 |
+
}
|
59 |
+
}
|
60 |
+
}
|
61 |
+
|
62 |
+
$installer->endSetup();
|
app/code/community/FireGento/MageSetup/etc/adminhtml.xml
CHANGED
@@ -26,7 +26,7 @@
|
|
26 |
<magesetup translate="title">
|
27 |
<title>MageSetup</title>
|
28 |
<sort_order>10</sort_order>
|
29 |
-
<action>
|
30 |
</magesetup>
|
31 |
</children>
|
32 |
</system>
|
@@ -34,7 +34,7 @@
|
|
34 |
<children>
|
35 |
<subscriber_status translate="title" module="magesetup">
|
36 |
<title>Newsletter Subscribers Status History</title>
|
37 |
-
<action>
|
38 |
</subscriber_status>
|
39 |
</children>
|
40 |
</newsletter>
|
26 |
<magesetup translate="title">
|
27 |
<title>MageSetup</title>
|
28 |
<sort_order>10</sort_order>
|
29 |
+
<action>adminhtml/magesetup</action>
|
30 |
</magesetup>
|
31 |
</children>
|
32 |
</system>
|
34 |
<children>
|
35 |
<subscriber_status translate="title" module="magesetup">
|
36 |
<title>Newsletter Subscribers Status History</title>
|
37 |
+
<action>adminhtml/newsletter</action>
|
38 |
</subscriber_status>
|
39 |
</children>
|
40 |
</newsletter>
|
app/code/community/FireGento/MageSetup/etc/config.xml
CHANGED
@@ -14,15 +14,14 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
-
* @version 2.2.2
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
23 |
<modules>
|
24 |
<FireGento_MageSetup>
|
25 |
-
<version>2.
|
26 |
</FireGento_MageSetup>
|
27 |
</modules>
|
28 |
<global>
|
@@ -45,6 +44,11 @@
|
|
45 |
<data>FireGento_MageSetup_Helper_Checkout_Data</data>
|
46 |
</rewrite>
|
47 |
</checkout>
|
|
|
|
|
|
|
|
|
|
|
48 |
</helpers>
|
49 |
<models>
|
50 |
<magesetup>
|
@@ -184,6 +188,13 @@
|
|
184 |
<frontName>magesetup</frontName>
|
185 |
</args>
|
186 |
</magesetup>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
187 |
</routers>
|
188 |
</frontend>
|
189 |
<adminhtml>
|
@@ -226,16 +237,13 @@
|
|
226 |
</adminhtml>
|
227 |
<admin>
|
228 |
<routers>
|
229 |
-
<
|
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 |
-
</
|
239 |
</routers>
|
240 |
</admin>
|
241 |
<default>
|
@@ -243,6 +251,7 @@
|
|
243 |
<price>
|
244 |
<display_block_below_price>1</display_block_below_price>
|
245 |
<display_delivery_time_on_categories>1</display_delivery_time_on_categories>
|
|
|
246 |
<cms_page_shipping>lieferung</cms_page_shipping>
|
247 |
<weight_unit>kg</weight_unit>
|
248 |
</price>
|
@@ -355,6 +364,11 @@ Tel: {{var telephone}}
|
|
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>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2016 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.4.0</version>
|
25 |
</FireGento_MageSetup>
|
26 |
</modules>
|
27 |
<global>
|
44 |
<data>FireGento_MageSetup_Helper_Checkout_Data</data>
|
45 |
</rewrite>
|
46 |
</checkout>
|
47 |
+
<contacts>
|
48 |
+
<rewrite>
|
49 |
+
<data>FireGento_MageSetup_Helper_Contacts_Data</data>
|
50 |
+
</rewrite>
|
51 |
+
</contacts>
|
52 |
</helpers>
|
53 |
<models>
|
54 |
<magesetup>
|
188 |
<frontName>magesetup</frontName>
|
189 |
</args>
|
190 |
</magesetup>
|
191 |
+
<contacts>
|
192 |
+
<args>
|
193 |
+
<modules>
|
194 |
+
<contacts before="Mage_Contacts">FireGento_MageSetup_Contacts</contacts>
|
195 |
+
</modules>
|
196 |
+
</args>
|
197 |
+
</contacts>
|
198 |
</routers>
|
199 |
</frontend>
|
200 |
<adminhtml>
|
237 |
</adminhtml>
|
238 |
<admin>
|
239 |
<routers>
|
240 |
+
<adminhtml>
|
|
|
241 |
<args>
|
|
|
|
|
242 |
<modules>
|
243 |
<FireGento_MageSetup after="Mage_Adminhtml">FireGento_MageSetup_Adminhtml</FireGento_MageSetup>
|
244 |
</modules>
|
245 |
</args>
|
246 |
+
</adminhtml>
|
247 |
</routers>
|
248 |
</admin>
|
249 |
<default>
|
251 |
<price>
|
252 |
<display_block_below_price>1</display_block_below_price>
|
253 |
<display_delivery_time_on_categories>1</display_delivery_time_on_categories>
|
254 |
+
<display_delivery_time_on_prod_detail>1</display_delivery_time_on_prod_detail>
|
255 |
<cms_page_shipping>lieferung</cms_page_shipping>
|
256 |
<weight_unit>kg</weight_unit>
|
257 |
</price>
|
364 |
<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>
|
365 |
</country>
|
366 |
</general>
|
367 |
+
<contacts>
|
368 |
+
<contacts>
|
369 |
+
<accept_agreement>0</accept_agreement>
|
370 |
+
</contacts>
|
371 |
+
</contacts>
|
372 |
</default>
|
373 |
<phpunit>
|
374 |
<suite>
|
app/code/community/FireGento/MageSetup/etc/de/tax.xml
CHANGED
@@ -111,7 +111,7 @@
|
|
111 |
<execute>1</execute>
|
112 |
<tax_region_id>0</tax_region_id>
|
113 |
<tax_postcode>*</tax_postcode>
|
114 |
-
<label>
|
115 |
<rate>19</rate>
|
116 |
</tax_calculation_rate_1>
|
117 |
|
@@ -119,7 +119,7 @@
|
|
119 |
<execute>1</execute>
|
120 |
<tax_region_id>0</tax_region_id>
|
121 |
<tax_postcode>*</tax_postcode>
|
122 |
-
<label>reduzierte
|
123 |
<rate>7</rate>
|
124 |
</tax_calculation_rate_2>
|
125 |
|
@@ -127,7 +127,7 @@
|
|
127 |
<execute>1</execute>
|
128 |
<tax_region_id>0</tax_region_id>
|
129 |
<tax_postcode>*</tax_postcode>
|
130 |
-
<label>ohne
|
131 |
<rate>0</rate>
|
132 |
</tax_calculation_rate_3>
|
133 |
</default>
|
111 |
<execute>1</execute>
|
112 |
<tax_region_id>0</tax_region_id>
|
113 |
<tax_postcode>*</tax_postcode>
|
114 |
+
<label>MwSt.</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 MwSt.</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 MwSt.</label>
|
131 |
<rate>0</rate>
|
132 |
</tax_calculation_rate_3>
|
133 |
</default>
|
app/code/community/FireGento/MageSetup/etc/default/systemconfig.xml
CHANGED
@@ -29,6 +29,7 @@
|
|
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>
|
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 |
+
<sales__reorder__hide_sidebar_box>1</sales__reorder__hide_sidebar_box>
|
33 |
</default>
|
34 |
</system_config>
|
35 |
</magesetup>
|
app/code/community/FireGento/MageSetup/etc/system.xml
CHANGED
@@ -14,9 +14,8 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
-
* @version 2.2.2
|
20 |
*/
|
21 |
-->
|
22 |
<config>
|
@@ -46,6 +45,15 @@
|
|
46 |
<show_in_website>1</show_in_website>
|
47 |
<show_in_store>1</show_in_store>
|
48 |
</display_delivery_time_on_categories>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
49 |
<cms_page_shipping translate="label" module="magesetup">
|
50 |
<label>CMS Page for Shipping Info</label>
|
51 |
<frontend_type>select</frontend_type>
|
@@ -151,7 +159,7 @@
|
|
151 |
<sort_order>55</sort_order>
|
152 |
<show_in_default>1</show_in_default>
|
153 |
<show_in_website>1</show_in_website>
|
154 |
-
<show_in_store>
|
155 |
<can_be_empty>1</can_be_empty>
|
156 |
</country>
|
157 |
<telephone translate="label">
|
@@ -484,5 +492,25 @@
|
|
484 |
</classes>
|
485 |
</groups>
|
486 |
</tax>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
487 |
</sections>
|
488 |
</config>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2016 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>
|
45 |
<show_in_website>1</show_in_website>
|
46 |
<show_in_store>1</show_in_store>
|
47 |
</display_delivery_time_on_categories>
|
48 |
+
<display_delivery_time_on_prod_detail translate="label,comment" module="magesetup">
|
49 |
+
<label>Display Delivery time on Product Detail</label>
|
50 |
+
<frontend_type>select</frontend_type>
|
51 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
52 |
+
<sort_order>26</sort_order>
|
53 |
+
<show_in_default>1</show_in_default>
|
54 |
+
<show_in_website>1</show_in_website>
|
55 |
+
<show_in_store>1</show_in_store>
|
56 |
+
</display_delivery_time_on_prod_detail>
|
57 |
<cms_page_shipping translate="label" module="magesetup">
|
58 |
<label>CMS Page for Shipping Info</label>
|
59 |
<frontend_type>select</frontend_type>
|
159 |
<sort_order>55</sort_order>
|
160 |
<show_in_default>1</show_in_default>
|
161 |
<show_in_website>1</show_in_website>
|
162 |
+
<show_in_store>1</show_in_store>
|
163 |
<can_be_empty>1</can_be_empty>
|
164 |
</country>
|
165 |
<telephone translate="label">
|
492 |
</classes>
|
493 |
</groups>
|
494 |
</tax>
|
495 |
+
<contacts>
|
496 |
+
<groups>
|
497 |
+
<contacts>
|
498 |
+
<fields>
|
499 |
+
<accept_agreement translate="label">
|
500 |
+
<label>Enable Checkbox To Accept Agreement</label>
|
501 |
+
<comment>
|
502 |
+
<![CDATA[This setting is required by German law due to a ruling by OLG Köln from 11.03.2016]]></comment>
|
503 |
+
<frontend_type>select</frontend_type>
|
504 |
+
<source_model>adminhtml/system_config_source_yesno</source_model>
|
505 |
+
<backend_model>contacts/system_config_backend_links</backend_model>
|
506 |
+
<sort_order>20</sort_order>
|
507 |
+
<show_in_default>1</show_in_default>
|
508 |
+
<show_in_website>1</show_in_website>
|
509 |
+
<show_in_store>1</show_in_store>
|
510 |
+
</accept_agreement>
|
511 |
+
</fields>
|
512 |
+
</contacts>
|
513 |
+
</groups>
|
514 |
+
</contacts>
|
515 |
</sections>
|
516 |
</config>
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.0.4-1.0.5.php
CHANGED
@@ -33,14 +33,12 @@ $installer = $this;
|
|
33 |
$installer->startSetup();
|
34 |
|
35 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
36 |
-
|
37 |
$installer->run("
|
38 |
ALTER TABLE `{$installer->getTable('catalog/eav_attribute')}`
|
39 |
ADD `is_visible_on_checkout` SMALLINT(5) NOT NULL DEFAULT '0';
|
40 |
");
|
41 |
|
42 |
} else {
|
43 |
-
|
44 |
$installer->getConnection()->addColumn(
|
45 |
$installer->getTable('catalog/eav_attribute'),
|
46 |
'is_visible_on_checkout',
|
33 |
$installer->startSetup();
|
34 |
|
35 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
|
36 |
$installer->run("
|
37 |
ALTER TABLE `{$installer->getTable('catalog/eav_attribute')}`
|
38 |
ADD `is_visible_on_checkout` SMALLINT(5) NOT NULL DEFAULT '0';
|
39 |
");
|
40 |
|
41 |
} else {
|
|
|
42 |
$installer->getConnection()->addColumn(
|
43 |
$installer->getTable('catalog/eav_attribute'),
|
44 |
'is_visible_on_checkout',
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.2-1.1.3.php
CHANGED
@@ -33,25 +33,23 @@ $installer = $this;
|
|
33 |
$installer->startSetup();
|
34 |
|
35 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
36 |
-
|
37 |
$installer->run("
|
38 |
ALTER TABLE `{$installer->getTable('checkout/agreement')}`
|
39 |
ADD `is_required` SMALLINT( 5 ) NOT NULL DEFAULT '1' COMMENT 'Agreement is Required'
|
40 |
");
|
41 |
|
42 |
} else {
|
43 |
-
|
44 |
$installer->getConnection()->addColumn(
|
45 |
-
|
46 |
-
|
47 |
-
|
48 |
'type' => Varien_Db_Ddl_Table::TYPE_SMALLINT,
|
49 |
'unsigned' => true,
|
50 |
'nullable' => false,
|
51 |
'default' => '1',
|
52 |
'comment' => 'Agreement is Required'
|
53 |
)
|
54 |
-
|
55 |
}
|
56 |
|
57 |
$installer->endSetup();
|
33 |
$installer->startSetup();
|
34 |
|
35 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
|
36 |
$installer->run("
|
37 |
ALTER TABLE `{$installer->getTable('checkout/agreement')}`
|
38 |
ADD `is_required` SMALLINT( 5 ) NOT NULL DEFAULT '1' COMMENT 'Agreement is Required'
|
39 |
");
|
40 |
|
41 |
} else {
|
|
|
42 |
$installer->getConnection()->addColumn(
|
43 |
+
$installer->getTable('checkout/agreement'),
|
44 |
+
'is_required',
|
45 |
+
array(
|
46 |
'type' => Varien_Db_Ddl_Table::TYPE_SMALLINT,
|
47 |
'unsigned' => true,
|
48 |
'nullable' => false,
|
49 |
'default' => '1',
|
50 |
'comment' => 'Agreement is Required'
|
51 |
)
|
52 |
+
);
|
53 |
}
|
54 |
|
55 |
$installer->endSetup();
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.1.3-1.1.4.php
CHANGED
@@ -33,7 +33,6 @@ $installer = $this;
|
|
33 |
$installer->startSetup();
|
34 |
|
35 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
36 |
-
|
37 |
$installer->run("
|
38 |
DROP TABLE IF EXISTS `{$installer->getTable('magesetup/newsletter_subscriber_status')}`;
|
39 |
CREATE TABLE `{$installer->getTable('magesetup/newsletter_subscriber_status')}` (
|
@@ -47,14 +46,17 @@ if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
47 |
");
|
48 |
|
49 |
} else {
|
50 |
-
|
51 |
$subscriberStatusTable = $installer->getTable('magesetup/newsletter_subscriber_status');
|
52 |
if ($installer->getConnection()->isTableExists($subscriberStatusTable)) {
|
53 |
$installer->getConnection()->dropTable($subscriberStatusTable);
|
54 |
}
|
55 |
|
56 |
$subscriberStatusTable = $installer->getConnection()->newTable($subscriberStatusTable)
|
57 |
-
->addColumn(
|
|
|
|
|
|
|
|
|
58 |
'unsigned' => true,
|
59 |
'nullable' => false,
|
60 |
'primary' => true,
|
@@ -62,23 +64,39 @@ if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
62 |
),
|
63 |
'ID'
|
64 |
)
|
65 |
-
->addColumn(
|
|
|
|
|
|
|
|
|
66 |
'unsigned' => true,
|
67 |
'nullable' => false,
|
68 |
),
|
69 |
'Subscriber Id'
|
70 |
)
|
71 |
-
->addColumn(
|
|
|
|
|
|
|
|
|
72 |
'nullable' => false,
|
73 |
'default' => '0',
|
74 |
),
|
75 |
'Subscriber Status'
|
76 |
)
|
77 |
-
->addColumn(
|
|
|
|
|
|
|
|
|
78 |
),
|
79 |
'Subscriber Status'
|
80 |
)
|
81 |
-
->addColumn(
|
|
|
|
|
|
|
|
|
82 |
),
|
83 |
'Changed at'
|
84 |
)
|
33 |
$installer->startSetup();
|
34 |
|
35 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
|
36 |
$installer->run("
|
37 |
DROP TABLE IF EXISTS `{$installer->getTable('magesetup/newsletter_subscriber_status')}`;
|
38 |
CREATE TABLE `{$installer->getTable('magesetup/newsletter_subscriber_status')}` (
|
46 |
");
|
47 |
|
48 |
} else {
|
|
|
49 |
$subscriberStatusTable = $installer->getTable('magesetup/newsletter_subscriber_status');
|
50 |
if ($installer->getConnection()->isTableExists($subscriberStatusTable)) {
|
51 |
$installer->getConnection()->dropTable($subscriberStatusTable);
|
52 |
}
|
53 |
|
54 |
$subscriberStatusTable = $installer->getConnection()->newTable($subscriberStatusTable)
|
55 |
+
->addColumn(
|
56 |
+
'id',
|
57 |
+
Varien_Db_Ddl_Table::TYPE_INTEGER,
|
58 |
+
null,
|
59 |
+
array(
|
60 |
'unsigned' => true,
|
61 |
'nullable' => false,
|
62 |
'primary' => true,
|
64 |
),
|
65 |
'ID'
|
66 |
)
|
67 |
+
->addColumn(
|
68 |
+
'subscriber',
|
69 |
+
Varien_Db_Ddl_Table::TYPE_INTEGER,
|
70 |
+
null,
|
71 |
+
array(
|
72 |
'unsigned' => true,
|
73 |
'nullable' => false,
|
74 |
),
|
75 |
'Subscriber Id'
|
76 |
)
|
77 |
+
->addColumn(
|
78 |
+
'status',
|
79 |
+
Varien_Db_Ddl_Table::TYPE_INTEGER,
|
80 |
+
null,
|
81 |
+
array(
|
82 |
'nullable' => false,
|
83 |
'default' => '0',
|
84 |
),
|
85 |
'Subscriber Status'
|
86 |
)
|
87 |
+
->addColumn(
|
88 |
+
'email',
|
89 |
+
Varien_Db_Ddl_Table::TYPE_TEXT,
|
90 |
+
null,
|
91 |
+
array(
|
92 |
),
|
93 |
'Subscriber Status'
|
94 |
)
|
95 |
+
->addColumn(
|
96 |
+
'created_at',
|
97 |
+
Varien_Db_Ddl_Table::TYPE_TIMESTAMP,
|
98 |
+
null,
|
99 |
+
array(
|
100 |
),
|
101 |
'Changed at'
|
102 |
)
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-1.2.1-1.2.2.php
CHANGED
@@ -32,25 +32,23 @@ $installer = $this;
|
|
32 |
$installer->startSetup();
|
33 |
|
34 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
35 |
-
|
36 |
$installer->run("
|
37 |
ALTER TABLE `{$installer->getTable('checkout/agreement')}`
|
38 |
ADD `agreement_type` SMALLINT( 5 ) NOT NULL DEFAULT '0' COMMENT 'Agreement Type'
|
39 |
");
|
40 |
|
41 |
} else {
|
42 |
-
|
43 |
$installer->getConnection()->addColumn(
|
44 |
-
|
45 |
-
|
46 |
-
|
47 |
'type' => Varien_Db_Ddl_Table::TYPE_SMALLINT,
|
48 |
'unsigned' => true,
|
49 |
'nullable' => false,
|
50 |
'default' => '0',
|
51 |
'comment' => 'Agreement Type'
|
52 |
)
|
53 |
-
|
54 |
}
|
55 |
|
56 |
$installer->endSetup();
|
32 |
$installer->startSetup();
|
33 |
|
34 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
|
35 |
$installer->run("
|
36 |
ALTER TABLE `{$installer->getTable('checkout/agreement')}`
|
37 |
ADD `agreement_type` SMALLINT( 5 ) NOT NULL DEFAULT '0' COMMENT 'Agreement Type'
|
38 |
");
|
39 |
|
40 |
} else {
|
|
|
41 |
$installer->getConnection()->addColumn(
|
42 |
+
$installer->getTable('checkout/agreement'),
|
43 |
+
'agreement_type',
|
44 |
+
array(
|
45 |
'type' => Varien_Db_Ddl_Table::TYPE_SMALLINT,
|
46 |
'unsigned' => true,
|
47 |
'nullable' => false,
|
48 |
'default' => '0',
|
49 |
'comment' => 'Agreement Type'
|
50 |
)
|
51 |
+
);
|
52 |
}
|
53 |
|
54 |
$installer->endSetup();
|
app/code/community/FireGento/MageSetup/sql/magesetup_setup/mysql4-upgrade-2.1.1-2.2.0.php
CHANGED
@@ -57,14 +57,12 @@ $installer->addAttribute(
|
|
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',
|
57 |
);
|
58 |
|
59 |
if (version_compare(Mage::getVersion(), '1.6', '<')) {
|
|
|
60 |
$installer->run("
|
61 |
ALTER TABLE `{$installer->getTable('checkout/agreement')}`
|
62 |
ADD `revocation_product_type` VARCHAR( 255 ) NOT NULL COMMENT 'Revocation Product Type'
|
63 |
");
|
64 |
|
65 |
} else {
|
|
|
66 |
$installer->getConnection()->addColumn(
|
67 |
$installer->getTable('checkout/agreement'),
|
68 |
'revocation_product_type',
|
app/design/adminhtml/default/default/layout/magesetup.xml
CHANGED
@@ -24,9 +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 |
</layout>
|
24 |
<block type="magesetup/adminhtml_notifications" name="magesetup_notifications" template="magesetup/notifications.phtml" before="-" />
|
25 |
</reference>
|
26 |
</default>
|
27 |
+
<adminhtml_magesetup_index>
|
28 |
<reference name="content">
|
29 |
<block type="magesetup/adminhtml_magesetup" name="magesetup.index" template="magesetup/form.phtml"/>
|
30 |
</reference>
|
31 |
+
</adminhtml_magesetup_index>
|
32 |
</layout>
|
app/design/frontend/base/default/layout/magesetup.xml
CHANGED
@@ -14,15 +14,15 @@
|
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
-
* @copyright
|
18 |
* @license http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)
|
19 |
*/
|
20 |
-->
|
21 |
<layout version="0.1.0">
|
22 |
|
23 |
<!--
|
24 |
-
|
25 |
-
|
26 |
<catalog_category_default>
|
27 |
<reference name="product_list">
|
28 |
<action method="addPriceBlockType">
|
@@ -523,6 +523,11 @@
|
|
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>
|
@@ -584,4 +589,13 @@
|
|
584 |
</action>
|
585 |
</reference>
|
586 |
</customer_logged_in>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
587 |
</layout>
|
14 |
* @category FireGento
|
15 |
* @package FireGento_MageSetup
|
16 |
* @author FireGento Team <team@firegento.com>
|
17 |
+
* @copyright 2016 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 |
<layout version="0.1.0">
|
22 |
|
23 |
<!--
|
24 |
+
Adding custom product price block
|
25 |
+
-->
|
26 |
<catalog_category_default>
|
27 |
<reference name="product_list">
|
28 |
<action method="addPriceBlockType">
|
523 |
</checkout_onepage_review>
|
524 |
|
525 |
<paypal_express_review>
|
526 |
+
<reference name="paypal.express.review">
|
527 |
+
<remove name="agreements"/>
|
528 |
+
<block type="magesetup/checkout_agreements" name="magesetup.checkout.agreements" as="agreements"
|
529 |
+
template="magesetup/checkout/onepage/agreements.phtml" after="details"/>
|
530 |
+
</reference>
|
531 |
<reference name="paypal.express.review.details">
|
532 |
<action method="addItemRender"><type>default</type><block>checkout/cart_item_renderer</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
533 |
<action method="addItemRender"><type>grouped</type><block>checkout/cart_item_renderer_grouped</block><template>magesetup/checkout/onepage/review/item.phtml</template></action>
|
589 |
</action>
|
590 |
</reference>
|
591 |
</customer_logged_in>
|
592 |
+
|
593 |
+
<!-- for updated contact form with checkbox to accept agreement -->
|
594 |
+
<contacts_index_index>
|
595 |
+
<reference name="contactForm">
|
596 |
+
<action method="setTemplate">
|
597 |
+
<template>magesetup/contacts/form.phtml</template>
|
598 |
+
</action>
|
599 |
+
</reference>
|
600 |
+
</contacts_index_index>
|
601 |
</layout>
|
app/design/frontend/base/default/template/magesetup/contacts/form.phtml
ADDED
@@ -0,0 +1,102 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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 2016 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 |
+
<div id="messages_product_view"><?php echo $this->getMessagesBlock()->toHtml() ?></div>
|
21 |
+
<div class="page-title test">
|
22 |
+
<h1><?php echo Mage::helper('contacts')->__('Contact Us') ?></h1>
|
23 |
+
</div>
|
24 |
+
<form action="<?php echo $this->getFormAction(); ?>" id="contactForm" method="post">
|
25 |
+
<div class="fieldset">
|
26 |
+
<h2 class="legend"><?php echo Mage::helper('contacts')->__('Contact Information') ?></h2>
|
27 |
+
<ul class="form-list">
|
28 |
+
<li class="fields">
|
29 |
+
<div class="field">
|
30 |
+
<label for="name" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Name') ?></label>
|
31 |
+
<div class="input-box">
|
32 |
+
<input name="name" id="name" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Name')) ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserName()) ?>" class="input-text required-entry" type="text" />
|
33 |
+
</div>
|
34 |
+
</div>
|
35 |
+
<div class="field">
|
36 |
+
<label for="email" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Email') ?></label>
|
37 |
+
<div class="input-box">
|
38 |
+
<input name="email" id="email" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Email')) ?>" value="<?php echo $this->escapeHtml($this->helper('contacts')->getUserEmail()) ?>" class="input-text required-entry validate-email" type="text" />
|
39 |
+
</div>
|
40 |
+
</div>
|
41 |
+
</li>
|
42 |
+
<li>
|
43 |
+
<label for="telephone"><?php echo Mage::helper('contacts')->__('Telephone') ?></label>
|
44 |
+
<div class="input-box">
|
45 |
+
<input name="telephone" id="telephone" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Telephone')) ?>" value="" class="input-text" type="text" />
|
46 |
+
</div>
|
47 |
+
</li>
|
48 |
+
<li class="wide">
|
49 |
+
<label for="comment" class="required"><em>*</em><?php echo Mage::helper('contacts')->__('Comment') ?></label>
|
50 |
+
<div class="input-box">
|
51 |
+
<textarea name="comment" id="comment" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Comment')) ?>" class="required-entry input-text" cols="5" rows="3"></textarea>
|
52 |
+
</div>
|
53 |
+
</li>
|
54 |
+
<?php if(Mage::helper('contacts')->isAcceptAgreement()): ?>
|
55 |
+
<li>
|
56 |
+
<div class="input-box">
|
57 |
+
<label for="accept-agreement">
|
58 |
+
<input name="accept-agreement" id="accept-agreement" title=""
|
59 |
+
value="" class="input-checkbox validate-required-accept-agreement" type="checkbox" >
|
60 |
+
<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('I agree that my contact details are saved permanently for allocation and any further queries.')) ?>
|
61 |
+
</label>
|
62 |
+
</div>
|
63 |
+
<strong>
|
64 |
+
<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Notice')); ?>:
|
65 |
+
</strong>
|
66 |
+
<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('You can revoke this agreement at any time and for the future by sending an e-mail to %s.', Mage::getStoreConfig('contacts/email/recipient_email'))); ?>
|
67 |
+
</li>
|
68 |
+
<?php endif; ?>
|
69 |
+
</ul>
|
70 |
+
</div>
|
71 |
+
<div class="buttons-set">
|
72 |
+
<p class="required"><?php echo Mage::helper('contacts')->__('* Required Fields') ?></p>
|
73 |
+
<input type="text" name="hideit" id="hideit" value="" style="display:none !important;" />
|
74 |
+
<button type="submit" title="<?php echo Mage::helper('core')->quoteEscape(Mage::helper('contacts')->__('Submit')) ?>" class="button"><span><span><?php echo Mage::helper('contacts')->__('Submit') ?></span></span></button>
|
75 |
+
</div>
|
76 |
+
</form>
|
77 |
+
<script type="text/javascript">
|
78 |
+
//<![CDATA[
|
79 |
+
var contactForm = new VarienForm('contactForm', true);
|
80 |
+
Validation.addAllThese([
|
81 |
+
['validate-required-accept-agreement', '<?php echo $this->__('Please accept the agreement or call us.'); ?>', function (v,elm) {
|
82 |
+
var input = $$('input[name="' + elm.name.replace(/([\\"])/g, '\\$1') + '"]');
|
83 |
+
|
84 |
+
var error = 1;
|
85 |
+
|
86 |
+
if(input[0].type == 'checkbox' && input[0].checked == true) {
|
87 |
+
error = 0;
|
88 |
+
}
|
89 |
+
|
90 |
+
if(Validation.isOnChange && input[0].type == 'checkbox') {
|
91 |
+
Validation.reset(input[0]);
|
92 |
+
}
|
93 |
+
|
94 |
+
if( error == 0 ) {
|
95 |
+
return true;
|
96 |
+
} else {
|
97 |
+
return false;
|
98 |
+
}
|
99 |
+
}]
|
100 |
+
]);
|
101 |
+
//]]>
|
102 |
+
</script>
|
app/design/frontend/base/default/template/magesetup/delivery_time.phtml
CHANGED
@@ -22,8 +22,8 @@
|
|
22 |
* @var $this Mage_Catalog_Block_Product_View_Abstract
|
23 |
*/
|
24 |
?>
|
25 |
-
<?php if ($this->getProduct()->getDeliveryTime()): ?>
|
26 |
<p class="delivery-time">
|
27 |
-
<?php echo $this->__('Delivery Time') ?>: <?php echo $this->getProduct()
|
28 |
</p>
|
29 |
<?php endif ?>
|
22 |
* @var $this Mage_Catalog_Block_Product_View_Abstract
|
23 |
*/
|
24 |
?>
|
25 |
+
<?php if ( Mage::getStoreConfigFlag('catalog/price/display_delivery_time_on_prod_detail') && $this->getProduct()->getDeliveryTime()): ?>
|
26 |
<p class="delivery-time">
|
27 |
+
<?php echo $this->__('Delivery Time') ?>: <?php echo Mage::helper('magesetup')->getDeliveryTimeFromProduct($this->getProduct()) ?>
|
28 |
</p>
|
29 |
<?php endif ?>
|
app/design/frontend/base/default/template/magesetup/imprint/email_footer.phtml
CHANGED
@@ -45,7 +45,7 @@
|
|
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="
|
49 |
<?php endif ?>
|
50 |
<?php echo $this->__('E-Mail') ?>: <?php echo $this->getEmail(false) ?>
|
51 |
</p>
|
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="<?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/locale/de_DE/FireGento_MageSetup.csv
CHANGED
@@ -1,14 +1,14 @@
|
|
1 |
"Display Block below Price","Block unterhalb der Preise darstellen"
|
2 |
"Display tax info and shipping cost link below the price on all pages","Steuerinformationen und Link zur Versandkostenseite auf allen Seiten unterhalb der Preise darstellen"
|
3 |
"Display Delivery time on Category Pages","Lieferzeit auf Produktübersichtsseiten anzeigen"
|
|
|
4 |
"CMS Page for Shipping Info","CMS-Seite für Versandkosten"
|
5 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Zeige ""inkl. Versandkosten"" statt ""zzgl. Versandkosten"""
|
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"
|
@@ -160,4 +160,11 @@
|
|
160 |
"Invoice Payment","Rechnung"
|
161 |
"Extension Key","Extension Key"
|
162 |
"MagentoConnect","MagentoConnect"
|
163 |
-
"Bank Information","Bankverbindung"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
"Display Block below Price","Block unterhalb der Preise darstellen"
|
2 |
"Display tax info and shipping cost link below the price on all pages","Steuerinformationen und Link zur Versandkostenseite auf allen Seiten unterhalb der Preise darstellen"
|
3 |
"Display Delivery time on Category Pages","Lieferzeit auf Produktübersichtsseiten anzeigen"
|
4 |
+
"Display Delivery time on Product Detail","Lieferzeit auf Produktbeschreibung anzeigen"
|
5 |
"CMS Page for Shipping Info","CMS-Seite für Versandkosten"
|
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. MwSt."
|
10 |
+
"Incl. %s Tax","Inkl. %s MwSt."
|
11 |
+
"Excl. %s Tax","Zzgl. %s MwSt."
|
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"
|
160 |
"Invoice Payment","Rechnung"
|
161 |
"Extension Key","Extension Key"
|
162 |
"MagentoConnect","MagentoConnect"
|
163 |
+
"Bank Information","Bankverbindung"
|
164 |
+
|
165 |
+
"I agree that my contact details are saved permanently for allocation and any further queries.","Ich willige ein, dass meine Angaben zur Kontaktaufnahme und Zuordnung für eventuelle Rückfragen dauerhaft gespeichert werden."
|
166 |
+
"Notice","Hinweis"
|
167 |
+
"You can revoke this agreement at any time and for the future by sending an e-mail to %s.","Diese Einwilligung können Sie jederzeit mit Wirkung für die Zukunft widerrufen, indem Sie eine E-Mail an %s schicken."
|
168 |
+
"Please accept the agreement or call us.","Bitte erklären Sie Ihre Einwilligung oder kontaktieren Sie uns telefonisch."
|
169 |
+
"This setting is required by German law due a ruling by OLG Köln from 11.03.2016","Diese Einstellung ist erforderlich nach deutschem Gesetz auf Grund eines Urteils vom OLG Köln vom 11.03.2016"
|
170 |
+
"Agreement accepted","Einwilligung erteilt"
|
app/locale/en_US/FireGento_MageSetup.csv
CHANGED
@@ -1,6 +1,7 @@
|
|
1 |
"Display Block below Price","Display Block below Price"
|
2 |
"Display tax info and shipping cost link below the price on all pages","Display tax info and shipping cost link below the price on all pages"
|
3 |
"Display Delivery time on Category Pages","Display Delivery time on Category Pages"
|
|
|
4 |
"CMS Page for Shipping Info","CMS Page for Shipping Info"
|
5 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost"""
|
6 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost"""
|
@@ -152,4 +153,11 @@
|
|
152 |
"Invoice Payment","Invoice Payment"
|
153 |
"Extension Key","Extension Key"
|
154 |
"MagentoConnect","MagentoConnect"
|
155 |
-
"Bank Information","Bank Information"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
"Display Block below Price","Display Block below Price"
|
2 |
"Display tax info and shipping cost link below the price on all pages","Display tax info and shipping cost link below the price on all pages"
|
3 |
"Display Delivery time on Category Pages","Display Delivery time on Category Pages"
|
4 |
+
"Display Delivery time on Product Detail","Display Delivery time on Product Detail"
|
5 |
"CMS Page for Shipping Info","CMS Page for Shipping Info"
|
6 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost"""
|
7 |
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost"""
|
153 |
"Invoice Payment","Invoice Payment"
|
154 |
"Extension Key","Extension Key"
|
155 |
"MagentoConnect","MagentoConnect"
|
156 |
+
"Bank Information","Bank Information"
|
157 |
+
|
158 |
+
"I agree that my contact details are saved permanently for allocation and any further queries.","I agree that my contact details are saved permanently for allocation and any further queries."
|
159 |
+
"Notice","Notice"
|
160 |
+
"You can revoke this agreement at any time and for the future by sending an e-mail to %s.","You can revoke this agreement at any time and for the future by sending an e-mail to %s."
|
161 |
+
"Please accept the agreement or call us by phone.","Please accept the agreement or call us."
|
162 |
+
"This setting is required by German law due a ruling by OLG Köln from 11.03.2016","This setting is required by German law due a ruling by OLG Köln from 11.03.2016"
|
163 |
+
"Agreement accepted","Agreement accepted"
|
app/locale/en_US/template/magesetup/block/revocation.html
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
-
<!--@title
|
2 |
<h3 style="color:red;">
|
3 |
-
<em>Please insert your Declaration of
|
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'}}">
|
1 |
+
<!--@title Withdrawal @-->
|
2 |
<h3 style="color:red;">
|
3 |
+
<em>Please insert your Declaration of Withdrawal 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'}}">Model Withdrawal Form</a></p>
|
app/locale/en_US/template/magesetup/block/revocation_form.html
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<!--@title Withdrawal Form @-->
|
2 |
-
<h3 style="font-style:italic; color:red;">Model
|
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.
|
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.
|
app/locale/en_US/template/magesetup/page/revocation.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
<!--@identifier revocation @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
1 |
+
<!--@title Withdrawal @-->
|
2 |
<!--@identifier revocation @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
app/locale/en_US/template/magesetup/page/revocation_form.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
<!--@identifier revocation_form @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation_form"}}
|
1 |
+
<!--@title Withdrawal Form @-->
|
2 |
<!--@identifier revocation_form @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/fr_CH/template/magesetup/block/business_terms.html
CHANGED
@@ -2,5 +2,5 @@
|
|
2 |
<h2><i>Remplissez ici vos conditions générales de vente.</i></h2>
|
3 |
|
4 |
<a name="retractation"></a>
|
5 |
-
<h3>Conditions de
|
6 |
-
<p>Veuillez remplir ici vos conditions de
|
2 |
<h2><i>Remplissez ici vos conditions générales de vente.</i></h2>
|
3 |
|
4 |
<a name="retractation"></a>
|
5 |
+
<h3>Conditions de rétractation</h3>
|
6 |
+
<p>Veuillez remplir ici vos conditions de rétractation</p>
|
app/locale/fr_CH/template/magesetup/block/revocation.html
CHANGED
@@ -6,4 +6,4 @@
|
|
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'}}">
|
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'}}">Modèle de formulaire de rétractation</a></p>
|
app/locale/fr_CH/template/magesetup/block/revocation_form.html
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<!--@title Withdrawal Form @-->
|
2 |
-
<h3 style="font-style:italic; color:red;">Model
|
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.
|
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.
|
app/locale/fr_FR/FireGento_MageSetup.csv
CHANGED
@@ -1,147 +1,146 @@
|
|
1 |
-
|
2 |
-
|
3 |
-
|
4 |
-
|
5 |
-
"Show ""incl. Shipping Cost"" instead of ""excl. Shipping Cost""","Afficher ""incl. les frais de livraison"" au lieu ""excl. les frais de livraison"""
|
6 |
-
|
7 |
-
|
8 |
-
|
9 |
-
|
10 |
-
|
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 |
-
|
14 |
-
|
15 |
-
"e.g. g, kg, lb, ...","
|
16 |
-
|
17 |
-
|
18 |
-
|
19 |
-
|
20 |
-
"
|
21 |
-
|
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 |
-
"If your desired locale is missing,
|
116 |
-
|
117 |
-
|
118 |
-
|
119 |
-
|
120 |
-
|
121 |
-
|
122 |
-
|
123 |
-
|
124 |
-
|
125 |
-
|
126 |
-
"
|
127 |
-
"
|
128 |
-
|
129 |
-
|
130 |
-
|
131 |
-
|
132 |
-
"On
|
133 |
-
|
134 |
-
|
135 |
-
|
136 |
-
|
137 |
-
|
138 |
-
|
139 |
-
"
|
140 |
-
|
141 |
-
|
142 |
-
|
143 |
-
|
144 |
-
|
145 |
-
|
146 |
-
|
147 |
-
"Bank Information","Référence bancaire"
|
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, ...","ex. g, kg, lb, ...",
|
16 |
+
Shipping Weight %s,Poids de la livraison %s,
|
17 |
+
"If you want to add additional StoreViews (i.e. for multiple languages), please do so before submitting this form.","Si vous souhaitez ajouter plus de vues de magasin (p. ex. langue multiple), vous devez le faire avant l'envoi de ce formulaire.",
|
18 |
+
Skip installation,Passez l'installation,
|
19 |
+
MageSetup has been installed.,MageSetup a été installé.,
|
20 |
+
"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.",
|
21 |
+
Please choose the requested setups:,Choisissez les réglages souhaités:,
|
22 |
+
Run MageSetup,Lancer MageSetup,
|
23 |
+
Update System Config Settings,Mettre à jour les réglages de la configuration système,
|
24 |
+
"i.e. newsletter confirmation, account confirmation, ..","ex. confirmation de newsletter, confirmation de création de compte, ...",
|
25 |
+
Create CMS Pages and Blocks,Créer les pages CMS et blocs,
|
26 |
+
"i.e. shipping, conditions, revocation","ex. livraison, conditions, rétractation",
|
27 |
+
Create Checkout Agreements,Créer des conditions de vente,
|
28 |
+
Conditions,Conditions,
|
29 |
+
Display Checkbox on Frontend,Afficher les checkbox en Frontend,
|
30 |
+
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,
|
31 |
+
Language Package for CMS Pages/Blocks/Agreements,Paquet de langues pour les pages/blocs/conventions CMS,
|
32 |
+
Create Email Templates,Créer des modèles d'email,
|
33 |
+
German Email Templates,Modèles d'email Allemand,
|
34 |
+
Configure Tax,Configurer les taxes,
|
35 |
+
Shipping from Germany,Livraison depuis l'Allemagne,
|
36 |
+
All tax settings will be overwritten!,Tous les réglages de taxes seront écrasés!,
|
37 |
+
Update Product Tax Classes,Mettre à jour les classes de taxe produit,
|
38 |
+
Update Customer Tax Classes,Mettre à jour les classes de taxe client,
|
39 |
+
Old,Ancien,
|
40 |
+
New,Nouveau,
|
41 |
+
No tax,Pas de taxe,
|
42 |
+
Newsletter Subscribers Status History,Historique des statuts des abonnés à la newsletter,
|
43 |
+
,,
|
44 |
+
MageSetup: CMS Blocks and Pages have been created.,MageSetup: les blocs et pages CMS ont été créés.,
|
45 |
+
MageSetup: Checkout Agreements have been created.,MageSetup: les conventions de vente ont été créés.,
|
46 |
+
MageSetup: Email Templates have been created.,MageSetup: les modèles d'email ont été créés.,
|
47 |
+
MageSetup: Tax Settings have been created.,MageSetup: les réglages de taxe ont été créés.,
|
48 |
+
MageSetup: Product Tax Classes have been updated.,MageSetup: les classes de taxe produit ont été créés.,
|
49 |
+
MageSetup: System Config Settings have been updated.,MageSetup: les réglages de la configuration système ont été créés.,
|
50 |
+
,,
|
51 |
+
Imprint,Mentions légales,
|
52 |
+
Account,Numéro de compte,
|
53 |
+
Account owner,Titulaire du compte,
|
54 |
+
Bank number,Numéro de la banque,
|
55 |
+
Bank name,Numéro de la banque,
|
56 |
+
CEO,Gérant,
|
57 |
+
Owner,Titulaire,
|
58 |
+
Responsible according to § 5 TMG,Le responsable conforme au §5 TMG (lois allemandes),
|
59 |
+
Responsible for content,Le rédacteur en chef,
|
60 |
+
Responsible for content address,Le responsable des liens de contenu,
|
61 |
+
Responsible in the interests of the press law,Attaché de presse,
|
62 |
+
E-Mail,Courriel,
|
63 |
+
Fax,Fax,
|
64 |
+
Financial office,Bureau des finances,
|
65 |
+
IBAN,IBAN,
|
66 |
+
Clearing,Clearing,
|
67 |
+
Register court,Tribunal de commerce,
|
68 |
+
Register number,Numéro de Siret,
|
69 |
+
SWIFT,SWIFT,
|
70 |
+
BIC/SWIFT,BIC/SWIFT,
|
71 |
+
Tax number,Numéro de TVA,
|
72 |
+
Telephone,Téléphone,
|
73 |
+
Supplementary Information for Telephone,Informations complémentaires pour Téléphone,
|
74 |
+
Web,Web,
|
75 |
+
VAT-ID,Numéro de TVA,
|
76 |
+
Company 1,Société 1,
|
77 |
+
Company 2,Société 2,
|
78 |
+
Street,Rue,
|
79 |
+
Zip,Code postal,
|
80 |
+
City,Ville,
|
81 |
+
"Reference for business rules (physician, physician...)","Référence aux régimes professionnels (ex. pour les médecins, pharmaciens)",
|
82 |
+
Authority (ECG),Autorité acc. ECG (loi E-Commerce),
|
83 |
+
Shareholdings,Investissements,
|
84 |
+
Editorial Concept,Concept éditorial,
|
85 |
+
relevant for Austrian shops,Important pour les boutiques Autrichiennes,
|
86 |
+
Bank number,Numéro de la banque,
|
87 |
+
Bank name,Nom de la banque,
|
88 |
+
,,
|
89 |
+
%s%%,%s%%,
|
90 |
+
,,
|
91 |
+
Recommended Extensions,Extensions recommandés,
|
92 |
+
Popular Payment Methods,Méthodes de paiement populaires,
|
93 |
+
Ip anonymization,Anonymisation de l'adresse IP,
|
94 |
+
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),
|
95 |
+
,,
|
96 |
+
Dynamic Shipping Tax Class Calculation,Calculation dynamique de la classe de taxe livraison,
|
97 |
+
"<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!",
|
98 |
+
,,
|
99 |
+
Shipping from,Livraison depuis,
|
100 |
+
This setting is base for the tax rate setup!,Ce réglage est la base pour le réglage du taux de la taxe!,
|
101 |
+
,,
|
102 |
+
[Show],[Afficher],
|
103 |
+
Visible in Checkout,Visible dans le processus d'achat,
|
104 |
+
,,
|
105 |
+
Display Additional Information,Afficher les informations complémentaires,
|
106 |
+
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),
|
107 |
+
,,
|
108 |
+
"Directory ""%s"" not found. Locale not installed?","Dossier ""%s"" non trouvé. Est-ce que le paquet de langue a été installé correctement?",
|
109 |
+
Default Setting,Réglage par défaut,
|
110 |
+
Use Default Setting,Utiliser le réglage par défaut,
|
111 |
+
Select Locale,Paquet de langue choisi,
|
112 |
+
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,
|
113 |
+
Language Package for Email Templates,Paquet de langue pour les modèles d'email,
|
114 |
+
"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é.",
|
115 |
+
"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",
|
116 |
+
,,
|
117 |
+
Configuration Settings,Réglages de la configuration,
|
118 |
+
CMS Settings,Réglages CMS,
|
119 |
+
Email Settings,Réglages du courriel,
|
120 |
+
Tax Settings,Réglages de taxe,
|
121 |
+
,,
|
122 |
+
Delivery Time,Délai de livraison,
|
123 |
+
Shipping Costs,Frais de livraison,
|
124 |
+
Hide estimated shipping costs in cart,Cacher les estimations des frais de livraison dans le panier d'achat,
|
125 |
+
Replace with a link to the shipping costs cms page,"Remplacer avec un lien vers une page CMS ""frais de livraison""
|
126 |
+
""Here you find information regarding the shipping costs.",Vous trouverez les informations concernant les frais de livraison ici.
|
127 |
+
"Hide box ""Last Ordered Items""","Cacher la boite ""les derniers articles commandés""",
|
128 |
+
Tax Settings,Réglages de taxe,
|
129 |
+
,,
|
130 |
+
Display on,Afficher sur,
|
131 |
+
On checkout (Magento Default),Dans le processus d'achat (Par défaut dans Magento),
|
132 |
+
"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é),
|
133 |
+
On customer registration and on checkout,Pendant la création d'un compte client ou dans le prossesus d'achat,
|
134 |
+
Nowhere,Nulle part,
|
135 |
+
Agreements not confirmed.,Conditions ne sont pas confirmées.,
|
136 |
+
,,
|
137 |
+
German Language Pack,Pack de langue allemand,
|
138 |
+
Base Price,Prix de base,
|
139 |
+
"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",
|
140 |
+
Debit Payment,Prélèvement automatique,
|
141 |
+
Cash on Delivery,Contre-Remboursement,
|
142 |
+
Bank Payment,Paiement d'avance,
|
143 |
+
Invoice Payment,Facture,
|
144 |
+
Extension Key,Extension Key,
|
145 |
+
MagentoConnect,MagentoConnect,
|
146 |
+
Bank Information,Référence bancaire,
|
|
app/locale/fr_FR/template/magesetup/agreement/revocation.html
CHANGED
@@ -1,3 +1,3 @@
|
|
1 |
-
<!--@name Clause de
|
2 |
-
<!--@checkbox_text J'ai lu les informations de
|
3 |
{{block type="cms/block" block_id="revocation"}}
|
1 |
+
<!--@name Clause de rétractation @-->
|
2 |
+
<!--@checkbox_text J'ai lu les informations de rétractation. @-->
|
3 |
{{block type="cms/block" block_id="revocation"}}
|
app/locale/fr_FR/template/magesetup/agreement/revocation_digital.html
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
-
<!--@name Clause de
|
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
|
1 |
+
<!--@name Clause de rétractation 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étractation avec l'agrément de l'execution du contrat. @-->
|
app/locale/fr_FR/template/magesetup/agreement/revocation_service.html
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
-
<!--@name
|
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
|
1 |
+
<!--@name Rétractation 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étractation. Je sais que je perds mon droit de rétractation lorsque l'execution de contrat par vous. @-->
|
app/locale/fr_FR/template/magesetup/block/revocation.html
CHANGED
@@ -1,9 +1,9 @@
|
|
1 |
-
<!--@title information sur le droit de
|
2 |
<h3 style="color:red;">
|
3 |
-
<em>Veulliez entrer vos informations de
|
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'}}">
|
1 |
+
<!--@title information sur le droit de rétractation @-->
|
2 |
<h3 style="color:red;">
|
3 |
+
<em>Veulliez entrer vos informations de rétractation ici. Évitez les informations contradictoires sur la rétractation 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'}}">Modèle de formulaire de rétractation</a></p>
|
app/locale/fr_FR/template/magesetup/block/revocation_form.html
CHANGED
@@ -1,8 +1,8 @@
|
|
1 |
-
<!--@title Formulaire de
|
2 |
-
<h3 style="font-style:italic; color:red;">
|
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
|
6 |
<hr/>
|
7 |
</p>
|
8 |
|
@@ -20,7 +20,7 @@
|
|
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
|
24 |
</p>
|
25 |
<p style="min-height:200px;">
|
26 |
|
1 |
+
<!--@title Formulaire de rétractation @-->
|
2 |
+
<h3 style="font-style:italic; color:red;">Modèle de formulaire de rétractation</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étractation de ses droits de rétractation avant de passer une commande. Celui-ci ne doit pas être en contradiction avec l'information de rétractation et doit être employeé toujours indépendamment de la forme de l'information. En plus du formulaire de rétractation, 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étractation de sorte que le client puisse obtenir les informations de rétractation en combinaison avec le formularie de rétractation dans un même document.
|
6 |
<hr/>
|
7 |
</p>
|
8 |
|
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étractation du contrat portant sur la vente du bien/la prestaion de service suivant<sup>*</sup>.
|
24 |
</p>
|
25 |
<p style="min-height:200px;">
|
26 |
|
app/locale/fr_FR/template/magesetup/page/revocation.html
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title
|
2 |
<!--@identifier revocation @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation"}}
|
1 |
+
<!--@title Rétractation @-->
|
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
CHANGED
@@ -1,4 +1,4 @@
|
|
1 |
-
<!--@title Formulaire de
|
2 |
<!--@identifier revocation_form @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation_form"}}
|
1 |
+
<!--@title Formulaire de rétractation @-->
|
2 |
<!--@identifier revocation_form @-->
|
3 |
<!--@root_template one_column @-->
|
4 |
{{block type="cms/block" block_id="revocation_form"}}
|
app/locale/ru_RU/template/magesetup/block/revocation.html
CHANGED
@@ -6,4 +6,4 @@
|
|
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'}}">
|
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'}}">Model Withdrawal Form</a></p>
|
app/locale/ru_RU/template/magesetup/block/revocation_form.html
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<!--@title Withdrawal Form @-->
|
2 |
-
<h3 style="font-style:italic; color:red;">Model
|
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.
|
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.
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FireGento_MageSetup</name>
|
4 |
-
<version>2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/licenses/gpl-3.0.html">GPL-3.0</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
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>
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="FireGento"><dir name="MageSetup"><dir name="Block"><dir name="Adminhtml"><file name="Magesetup.php" hash="e7e20c184fd8c885942f255bf208ebcc"/><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Grid.php" hash="011390e2fd75259b2fb3491976d62aaa"/></dir><file name="Status.php" hash="db8deaa92622fbe1dd8b2e44fd5f05eb"/></dir></dir><file name="Notifications.php" hash="ee044c9b78d9a37c36e6e98aee20c82e"/></dir><dir name="Bundle"><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="573a9be26e8f4f327236e8783b2da762"/></dir><file name="Price.php" hash="dc179e483831351bcd49f1462eb69056"/></dir></dir></dir><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="49ff7bda429996e2c4d33dc3b65c1d74"/></dir><file name="Price.php" hash="a3f293b0010f92abec8aa2dadf377ca6"/></dir></dir><dir name="Checkout"><file name="Agreements.php" hash="daf958d55661f8ad7d4055c439b31307"/><file name="Information.php" hash="9e6b7b7a863934feb0006f4c84d67741"/></dir><dir name="Customer"><dir name="Account"><file name="Agreements.php" hash="847a2fcd3806f57bec9724f31a7a0bcd"/></dir></dir><dir name="Imprint"><file name="Content.php" hash="54a15e0e17f2ae27d82fd9121d782f77"/><file name="Field.php" hash="15a5b3b19e8785129d562731b471f6a7"/></dir></dir><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Configuration.php" hash="565a85b934577fb340a5d4470767caba"/></dir></dir><dir name="Checkout"><file name="Data.php" hash="5fd2a1d31fd19b39e1d5fff7e8679c1b"/></dir><file name="Data.php" hash="e906a25ea8a95af07c1f831d9e50e205"/></dir><dir name="Model"><file name="Config.php" hash="506271f960609c30bdf76e18d1072915"/><dir name="Newsletter"><file name="Observer.php" hash="4711c652904d5251ecaa9943ae7910c3"/><dir name="Subscriber"><file name="Status.php" hash="b322cd4ef117f84d039252fc715d348d"/></dir></dir><file name="Observer.php" hash="cbe93ce0103374dd1935e40b140685ca"/><dir name="Resource"><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Collection.php" hash="a4c45ebda5567023fadb7e88884b9d0f"/></dir><file name="Status.php" hash="1383ad9dd7d772e23a916d644478b3b6"/></dir></dir></dir><dir name="Setup"><file name="Abstract.php" hash="e4abeb4f177cd34545350297943af51d"/><file name="Agreements.php" hash="78ce33c076282387df6fd455cbeb6a2f"/><file name="Cms.php" hash="62b7239542da4eee6e6f57eb8597684b"/><file name="Email.php" hash="69b67eed1a5eaa2fdb42dde2fff9fbd6"/><file name="Systemconfig.php" hash="f2c0fe93e6636c3e673035775e8b7e91"/><file name="Tax.php" hash="548096212f64f83eca05728b004d4a12"/></dir><file name="Setup.php" hash="960795fba8ac61c9d7d036605c63bfca"/><dir name="Source"><file name="AgreementType.php" hash="c4b4a130bf49385d19ce216a31c377fb"/><dir name="Cms"><file name="Block.php" hash="5e17d525e2ce6a06706a9a27a349387e"/><file name="Page.php" hash="325775a940442b4eb5bac8202ad0a6a1"/></dir><file name="RevocationProductType.php" hash="21634b58bd5fb61e3018367b6c3ba904"/><dir name="Tax"><file name="CustomerTaxClass.php" hash="4e32c4374a70418dc85f7c9ba2f458c2"/><file name="DynamicType.php" hash="be7e14b3ebad6a9d30c7e53077b25936"/><file name="NewCustomerTaxClass.php" hash="8667f5251b03c3a4333f56ee9bfce35a"/><file name="NewProductTaxClass.php" hash="1103136945c44e3c35df71fef591716f"/><file name="ProductTaxClass.php" hash="3dfc53c5e1a30fff79523269c8bbe564"/></dir></dir><dir name="Tax"><file name="Config.php" hash="b67151bd8e0df17c17f10d2fda771945"/></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="d14a37595a58d112cc6fbde75a4cb566"/></dir></dir><dir name="Config"><dir name="Main"><dir name="expectations"><file name="testModuleConfig.yaml" hash="bab59a7394272d618a40b98c51c71e91"/></dir></dir><file name="Main.php" hash="92773636541f2f1bc8a124318693856a"/></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="64bac87a58af8f6a6409fb775fb1e0da"/><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="ba3d5649f52cab0c14ab573c841ef0a3"/><dir name="Tax"><dir name="DynamicType"><dir name="expectations"><file name="testToOptionArray.yaml" hash="9488477b2222e1d8f21bdac5a44e59ec"/></dir></dir><file name="DynamicType.php" hash="5d4efe7a28c792b24327dd9fad764d6e"/></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="542abb209573da685aaeb5eb5dcc5c3f"/><file name="NewsletterController.php" hash="2e60f507227740ea6c556dd8aa1af368"/></dir><file name="FrontendController.php" hash="fe36ba540e9739b57d7ca22d03526d37"/></dir><dir name="data"><dir name="magesetup_setup"><file name="data-upgrade-2.0.0-2.0.1.php" hash="58cb73df49e1b2baa9100aa0f1476cb9"/><file name="data-upgrade-2.0.1-2.0.2.php" hash="ef0a17c3febf75df7119ac7867888b4c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="87ea8c61adad43906df4fee5d4855c28"/><dir name="at"><file name="email.xml" hash="c779eab591c7654684261f9602217fdf"/><file name="tax.xml" hash="72961645922a846eba31e4d323ad62e5"/></dir><dir name="ch"><file name="email.xml" hash="c779eab591c7654684261f9602217fdf"/><file name="tax.xml" hash="0a929e575b29692db5b417300b043184"/></dir><file name="config.xml" hash="c8da3b53ec49854e0266f01ad89f5ca4"/><dir name="de"><file name="email.xml" hash="b8fe9d954896f0ec6c8a77ba5190ff8d"/><file name="tax.xml" hash="aaca575d8d2503d20e17e8c9284462da"/></dir><dir name="default"><file name="agreement.xml" hash="1ea363033cd4401efc6b5934b3087286"/><file name="cms.xml" hash="4d3943f325ea7d8789ceb3bac007875e"/><file name="email.xml" hash="a1cc80ddfd08c0c4231347ba58550dad"/><file name="systemconfig.xml" hash="bb0bf72455c3f88867184509c16857af"/><file name="tax.xml" hash="dd2195b1fe6b7421236388ab357a0344"/></dir><dir name="es"><file name="tax.xml" hash="f345ad39216d8eec19e99e06ceb9a8f3"/></dir><dir name="fr"><file name="email.xml" hash="a8b8d9695b910f6c63e426939a6af1ce"/><file name="tax.xml" hash="6a90953a7594724ce315ff940f518829"/></dir><dir name="gb"><file name="tax.xml" hash="dd2195b1fe6b7421236388ab357a0344"/></dir><dir name="it"><file name="email.xml" hash="0e33f6586c6a61b74cf6d1d338674d10"/><file name="tax.xml" hash="d2cacaec155986cefb4af1ca8b562fbd"/></dir><dir name="nl"><file name="tax.xml" hash="43e3f67badf8883606bda8e370372637"/></dir><dir name="pl"><file name="email.xml" hash="40c143b491a55b2c89b9bcffafca6146"/><file name="tax.xml" hash="4b2b49cb3f8d61be2bdb5882f1644fb7"/></dir><dir name="ro"><file name="email.xml" hash="0d3894cd750cd95de7555fe7161c95ab"/><file name="tax.xml" hash="14cba6497b7f47d25c574879a3ce244c"/></dir><dir name="ru"><file name="cms.xml" hash="3eae47564023e4fcc1acc62c684ac172"/><file name="email.xml" hash="1ddca775239cf495479d870574701f76"/><file name="tax.xml" hash="e82a8a2f7121c0908cb06b9d71c8b756"/></dir><file name="system.xml" hash="584984ffa2ceefa7fcfc1e15446e965b"/></dir><dir name="sql"><dir name="magesetup_setup"><file name="mysql4-install-0.5.0.php" hash="b7ef87ef269af29e17eeb87c2e8a4df8"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="5b94f3adc90fdf15a9ff175c819e4745"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="34f440e616431cf8b7980a2e08782e82"/><file name="mysql4-upgrade-1.1.3-1.1.4.php" hash="16e9021bf885b171a8c14aa92a15f115"/><file name="mysql4-upgrade-1.1.4-1.2.0.php" hash="fabae5d1563c3dbb8bbfa064dfa6b07f"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="450be2a8d4bc695e807955fa06c5bdc0"/><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="2173e7901c67db7f12b567afaa927405"/><file name="mysql4-upgrade-2.1.1-2.2.0.php" hash="15d1879b5769a4ed39c01f86a4336875"/><file name="mysql4-upgrade-2.2.0-2.2.1.php" hash="134a24f5414a2c27c6f10e3732e337c3"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FireGento_MageSetup.xml" hash="138e97b458add71cc16245ad69071e06"/></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="a51f725ed0ae2fae419fbe9259988a6b"/><file name="overview.phtml" hash="b63c1467c562bda89bbd09c4300780e1"/></dir><dir name="onepage"><file name="agreements.phtml" hash="04e65940079620c15f229d57258eae05"/><dir name="review"><file name="item.phtml" hash="44984e9c7eeebfb7b609a14bad997c78"/></dir></dir></dir><dir name="customer"><dir name="form"><file name="tc-confirmation.phtml" hash="18c8d8458cd63bb855378fa7aa0e3037"/></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>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>FireGento_MageSetup</name>
|
4 |
+
<version>2.4.0</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>
|
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>2017-04-12</date>
|
14 |
+
<time>12:39:12</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="FireGento"><dir name="MageSetup"><dir name="Block"><dir name="Adminhtml"><file name="Magesetup.php" hash="67f18c187d2d866ce43b6187454c8996"/><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Grid.php" hash="b713be8c7f333ddee9bdad064e380c4b"/></dir><file name="Status.php" hash="17e894818f56f479d782f8ce85a3d97e"/></dir></dir><file name="Notifications.php" hash="5124b08aeb02de0db09f9ba1af9a400e"/></dir><dir name="Bundle"><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="573a9be26e8f4f327236e8783b2da762"/></dir><file name="Price.php" hash="5117332f08a5a8fd69106921c92c8bba"/></dir></dir></dir><dir name="Catalog"><dir name="Product"><dir name="Price"><file name="Abstract.php" hash="49ff7bda429996e2c4d33dc3b65c1d74"/></dir><file name="Price.php" hash="073ad17ee18c8c0ccd5cf2a7ad39cbe6"/></dir></dir><dir name="Checkout"><file name="Agreements.php" hash="daf958d55661f8ad7d4055c439b31307"/><file name="Information.php" hash="9e6b7b7a863934feb0006f4c84d67741"/></dir><dir name="Customer"><dir name="Account"><file name="Agreements.php" hash="847a2fcd3806f57bec9724f31a7a0bcd"/></dir></dir><dir name="Imprint"><file name="Content.php" hash="54a15e0e17f2ae27d82fd9121d782f77"/><file name="Field.php" hash="c00f24f9b03dafbc68c11e87e9291f57"/></dir></dir><dir name="Helper"><dir name="Catalog"><dir name="Product"><file name="Configuration.php" hash="af85da7bf5fd6daaa272135250a6e376"/></dir></dir><dir name="Checkout"><file name="Data.php" hash="43de006532a7a1560957e48bc33422d1"/></dir><dir name="Contacts"><file name="Data.php" hash="4c889cf424ea6d951f40005cfa76dd00"/></dir><file name="Data.php" hash="4b9b82ad48ac49ff510a00a166bf0eaf"/></dir><dir name="Model"><file name="Config.php" hash="d9a3a92c633ab18469491096bad933ed"/><dir name="Newsletter"><file name="Observer.php" hash="4711c652904d5251ecaa9943ae7910c3"/><dir name="Subscriber"><file name="Status.php" hash="01f1c4a9f1b060df45406e7b92d87252"/></dir></dir><file name="Observer.php" hash="8d975c1d97c8c104025b274337ecc398"/><dir name="Resource"><dir name="Newsletter"><dir name="Subscriber"><dir name="Status"><file name="Collection.php" hash="ef499dfeb4ed2002cfadf6edb8fc1ef1"/></dir><file name="Status.php" hash="a38102d35aabb6434ddef807e691911e"/></dir></dir></dir><dir name="Setup"><file name="Abstract.php" hash="e4abeb4f177cd34545350297943af51d"/><file name="Agreements.php" hash="80e39b9071e52a166ef8c34c7e98a819"/><file name="Cms.php" hash="d1d1eeb4913af7719155af3f04cf0246"/><file name="Customergroups.php" hash="875601c398d413f8de66c458e2b5fd4e"/><file name="Email.php" hash="e2d4e0f94d1eab61fc0d3dc93e545180"/><file name="Systemconfig.php" hash="f2c0fe93e6636c3e673035775e8b7e91"/><file name="Tax.php" hash="5df1b5580cb7ff6cfe0e2db3d40a1012"/></dir><file name="Setup.php" hash="960795fba8ac61c9d7d036605c63bfca"/><dir name="Source"><file name="AgreementType.php" hash="c4b4a130bf49385d19ce216a31c377fb"/><dir name="Cms"><file name="Block.php" hash="43b9f6479f8214f4b540f53a6817761c"/><file name="Page.php" hash="f098d409f65a311cd9c155c6eb8415c4"/></dir><file name="RevocationProductType.php" hash="21634b58bd5fb61e3018367b6c3ba904"/><dir name="Tax"><file name="CustomerTaxClass.php" hash="4e32c4374a70418dc85f7c9ba2f458c2"/><file name="DynamicType.php" hash="73dcd01f0a63d768223038965b2bf487"/><file name="NewCustomerTaxClass.php" hash="024b02e392881e4cf61fe98a1a1718f2"/><file name="NewProductTaxClass.php" hash="0483f65521e8cfe63985e95df3efcbf5"/><file name="ProductTaxClass.php" hash="3dfc53c5e1a30fff79523269c8bbe564"/></dir></dir><dir name="Tax"><file name="Config.php" hash="917f33c5c169213aab93c6f629d83bda"/></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="defaultEnvironment.yaml" hash="91e8644ffabe1fb74ed7f1c025e1813d"/><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="1399d78a6fe79c367fbdcd26c416ebe0"/></dir></dir><dir name="Config"><dir name="Main"><dir name="expectations"><file name="testModuleConfig.yaml" hash="bab59a7394272d618a40b98c51c71e91"/></dir></dir><file name="Main.php" hash="92773636541f2f1bc8a124318693856a"/></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="64bac87a58af8f6a6409fb775fb1e0da"/><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="ba3d5649f52cab0c14ab573c841ef0a3"/><dir name="Tax"><dir name="DynamicType"><dir name="expectations"><file name="testToOptionArray.yaml" hash="826c896ae75474fc6ce8b28c480a2936"/></dir></dir><file name="DynamicType.php" hash="5d4efe7a28c792b24327dd9fad764d6e"/></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="MagesetupController.php" hash="47ceb13a0164f78f3be974fbdd482ecb"/><file name="NewsletterController.php" hash="15f5899dde8c566c23063a901d6f68f3"/></dir><dir name="Contacts"><file name="IndexController.php" hash="25352c90eb2582025fdca76663af109d"/></dir><file name="FrontendController.php" hash="fe36ba540e9739b57d7ca22d03526d37"/></dir><dir name="data"><dir name="magesetup_setup"><file name="data-upgrade-2.0.0-2.0.1.php" hash="58cb73df49e1b2baa9100aa0f1476cb9"/><file name="data-upgrade-2.0.1-2.0.2.php" hash="ef0a17c3febf75df7119ac7867888b4c"/><file name="data-upgrade-2.2.3-2.3.0.php" hash="ec70f110ddc9196f9f727856041cea8c"/><file name="data-upgrade-2.3.0-2.3.1.php" hash="d7c1f750354eb6d429208f60b5d6a22c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="f8eef87872e1bc514f7e01ed6defc9e0"/><dir name="at"><file name="email.xml" hash="c779eab591c7654684261f9602217fdf"/><file name="tax.xml" hash="72961645922a846eba31e4d323ad62e5"/></dir><dir name="ch"><file name="email.xml" hash="c779eab591c7654684261f9602217fdf"/><file name="tax.xml" hash="0a929e575b29692db5b417300b043184"/></dir><file name="config.xml" hash="205d5feb24abed4254c20c52c9723bc6"/><dir name="de"><file name="email.xml" hash="b8fe9d954896f0ec6c8a77ba5190ff8d"/><file name="tax.xml" hash="0f1a96a3de9831a08b0f873ce2c9fc92"/></dir><dir name="default"><file name="agreement.xml" hash="1ea363033cd4401efc6b5934b3087286"/><file name="cms.xml" hash="4d3943f325ea7d8789ceb3bac007875e"/><file name="email.xml" hash="a1cc80ddfd08c0c4231347ba58550dad"/><file name="systemconfig.xml" hash="c78e88531f64efbe20cfa563c204ac3e"/><file name="tax.xml" hash="dd2195b1fe6b7421236388ab357a0344"/></dir><dir name="es"><file name="tax.xml" hash="f345ad39216d8eec19e99e06ceb9a8f3"/></dir><dir name="fr"><file name="email.xml" hash="a8b8d9695b910f6c63e426939a6af1ce"/><file name="tax.xml" hash="6a90953a7594724ce315ff940f518829"/></dir><dir name="gb"><file name="tax.xml" hash="dd2195b1fe6b7421236388ab357a0344"/></dir><dir name="it"><file name="email.xml" hash="0e33f6586c6a61b74cf6d1d338674d10"/><file name="tax.xml" hash="d2cacaec155986cefb4af1ca8b562fbd"/></dir><dir name="nl"><file name="tax.xml" hash="43e3f67badf8883606bda8e370372637"/></dir><dir name="pl"><file name="email.xml" hash="40c143b491a55b2c89b9bcffafca6146"/><file name="tax.xml" hash="4b2b49cb3f8d61be2bdb5882f1644fb7"/></dir><dir name="ro"><file name="email.xml" hash="0d3894cd750cd95de7555fe7161c95ab"/><file name="tax.xml" hash="14cba6497b7f47d25c574879a3ce244c"/></dir><dir name="ru"><file name="cms.xml" hash="3eae47564023e4fcc1acc62c684ac172"/><file name="email.xml" hash="1ddca775239cf495479d870574701f76"/><file name="tax.xml" hash="e82a8a2f7121c0908cb06b9d71c8b756"/></dir><file name="system.xml" hash="e5b0599b62c43c553760ff5025f4406d"/></dir><dir name="sql"><dir name="magesetup_setup"><file name="mysql4-install-0.5.0.php" hash="b7ef87ef269af29e17eeb87c2e8a4df8"/><file name="mysql4-upgrade-1.0.4-1.0.5.php" hash="b99c762c84158148a51865e714230a65"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="a9e9835daa51ac52fe7a97c57b4417ae"/><file name="mysql4-upgrade-1.1.3-1.1.4.php" hash="889b322bcb0cb9460493a23ac7d82d90"/><file name="mysql4-upgrade-1.1.4-1.2.0.php" hash="fabae5d1563c3dbb8bbfa064dfa6b07f"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="450be2a8d4bc695e807955fa06c5bdc0"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="872595a7b4593464f0a0b66789db7e14"/><file name="mysql4-upgrade-1.2.2-1.2.3.php" hash="2173e7901c67db7f12b567afaa927405"/><file name="mysql4-upgrade-2.1.1-2.2.0.php" hash="11c599701e315de0f399a833fc923c65"/><file name="mysql4-upgrade-2.2.0-2.2.1.php" hash="134a24f5414a2c27c6f10e3732e337c3"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="FireGento_MageSetup.xml" hash="138e97b458add71cc16245ad69071e06"/></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="62dda00f88e868bc8f2e52eab9b0e71c"/><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="72f8c163cccf6a9813ca6e5fdd2e4226"/><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="a219caa341972c10bc9f1c2f65ab00ad"/><file name="revocation_form.html" hash="ca3f525c6b7e523090be523975f46ed6"/></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="47e943e265d2b67d40d3cffbc16ed3eb"/><file name="revocation_form.html" hash="49f4c1318d6f8138731373bd72f687ae"/><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="b4990d137c18c3ed0b201a6a91bb4eb0"/><file name="revocation_form.html" hash="ca3f525c6b7e523090be523975f46ed6"/></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="267308f0e2c012d9fc29b44806e1465f"/><file name="revocation.html" hash="48379a6b16eeaf4f3a443c7c7968416e"/><file name="revocation_form.html" hash="ca3f525c6b7e523090be523975f46ed6"/></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="cb5f7e36e42c4965063fd90589ed59d3"/><dir name="template"><dir name="magesetup"><dir name="agreement"><file name="business_terms.html" hash="cdbfcc57244cb13c7775574015248bc9"/><file name="revocation.html" hash="05827e2d298fcfc3a0919f37816e7d58"/><file name="revocation_digital.html" hash="b0c21ecef8fc83c9bf493da0947eb814"/><file name="revocation_service.html" hash="cdef62e2c424c5bc6513e1bb68ab4ce1"/></dir><dir name="block"><file name="business_terms.html" hash="275ff7f3a1bc75feb6afc5bf6e6c7eec"/><file name="revocation.html" hash="d3b23b86b5b0137e5fc4c56ac4958d37"/><file name="revocation_form.html" hash="a88bbd4b7d60937fa859bb8d0fdb556d"/></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="07d8c543204bcaef856df09eef0902e2"/><file name="revocation_form.html" hash="7c9d4f39db26d85215f33ca6a8886cc6"/><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="cb0a0889ee24cd3abb665e14eff39959"/></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="224a94e7b9a9eef5ba45e70b63b1f79c"/></dir><dir name="template"><dir name="magesetup"><dir name="checkout"><file name="additional.phtml" hash="56ff8a69368e0f17dbf84b684fa39b3e"/><dir name="multishipping"><file name="agreements.phtml" hash="a51f725ed0ae2fae419fbe9259988a6b"/><file name="overview.phtml" hash="b63c1467c562bda89bbd09c4300780e1"/></dir><dir name="onepage"><file name="agreements.phtml" hash="04e65940079620c15f229d57258eae05"/><dir name="review"><file name="item.phtml" hash="44984e9c7eeebfb7b609a14bad997c78"/></dir></dir></dir><dir name="contacts"><file name="form.phtml" hash="9d4837aadeb75e88827cb83028679f10"/></dir><dir name="customer"><dir name="form"><file name="tc-confirmation.phtml" hash="18c8d8458cd63bb855378fa7aa0e3037"/></dir></dir><file name="delivery_time.phtml" hash="f75e2b3cf750844e2dcd97d29e04d00c"/><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="c8d9cd30ae3b0ae74167e0f02abc2ea2"/><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>8.0.0</max></php></required></dependencies>
|
18 |
</package>
|