Merge branch 'release/2.2.1'

firegento · Jan 25, 2015 · 2cc8260 · 2cc8260
2 parents 79e52f5 + 47c0926
commit 2cc8260
Show file tree

Hide file tree

Showing 256 changed files with 6,243 additions and 1,568 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,38 @@
 language: php
+
 php:
   - 5.3
+  - 5.4
+  - 5.5
+
+env:
+  - MAGENTO_VERSION="1.6.2.0"
+  - MAGENTO_VERSION="1.7.0.2"
+  - MAGENTO_VERSION="1.8.1.0"
+  - MAGENTO_VERSION="1.9.0.1"
+  - MAGENTO_VERSION="1.9.1.0"
+
+matrix:
+  fast_finish: true
+  exclude:
+    - php: 5.5
+      env: MAGENTO_VERSION="1.6.2.0"
+    - php: 5.5
+      env: MAGENTO_VERSION="1.7.0.2"
+
 before_install:
   - mkdir test/
   - curl -sS https://getcomposer.org/installer | php
   - chmod +x ./composer.phar
   - ./composer.phar --version
   - ./composer.phar install --dev
+
 before_script:
   - CURR_DIR=$(pwd)
-  - bin/mage-ci install test 1.7.0.2 magento_test -c -t -r http://mage-ci.ecomdev.org
+  - bin/mage-ci install test ${MAGENTO_VERSION} magento_test -c -t -r http://mage-ci.firegento.com
   - bin/mage-ci install-module test $CURR_DIR
   - git clone https://github.com/EcomDev/EcomDev_PHPUnit.git ./phpunit/
   - bin/mage-ci install-module $CURR_DIR/test $CURR_DIR/phpunit/
+
 script:
   - bin/mage-ci phpunit test
diff --git a/README.markdown b/README.markdown
@@ -62,6 +62,8 @@ Contribution
 ------------
 Any contribution to the development of MageSetup is highly welcome. The best possibility to provide any code is to open a [pull request on GitHub](https://help.github.com/articles/using-pull-requests).
 
+Please also see have a look at our [contribution guide](https://github.com/firegento/firegento-magesetup/blob/master/docs/contribute/contribute.markdown) for this extension and our [general contribution process](https://github.com/firegento/coding-guidelines/blob/master/guidelines/05_CONTRIBUTIONS.md) for FireGento extensions.
+
 Developer
 ---------
 FireGento Team
@@ -74,4 +76,4 @@ Licence
 
 Copyright
 ---------
-(c) 2011-2013 FireGento Team
+(c) 2013-2015 FireGento Team
diff --git a/composer.json b/composer.json
@@ -2,19 +2,20 @@
     "name": "firegento/magesetup",
     "license": "GPL-3.0",
     "type": "magento-module",
-    "description": "<p>Central features of MageSetup are:</p><ul><li>Setting of important configuration settings</li><li>Predefined tax settings and tax classes for shipping from several countries to worldwide destinations</li><li>Assign new tax classes to all products (configurable)</li><li>Creation of email templates based on the local language pack. Legal texts can be added to some templates automatically.</li><li>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.</li><li>Creation of default CMS pages like imprint, terms and conditions, privacy, shipping, payment methods.</li><li>Create email templates, cms pages and blocks as well as checkout agreements for store views with a different language as well</li><li>Possibility to add tax and/or shipping info to all prices</li><li>Automatical generation of meta data to products</li><li>Saving of every status change of newsletter subscriptions</li><li>Presets are configurable via xml files for every country seperately</li><li>Many more, see the <a href=\"https://github.com/firegento/firegento-magesetup/blob/development/docs/features/features.markdown\">full list of features</a> including several screenshots.</li></ul>",
+    "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.",
     "homepage": "https://github.com/firegento/firegento-magesetup",
     "authors": [
         {
-            "name":"Team FireGento",
-            "email":"[email protected]"
+            "name": "Team FireGento",
+            "email": "[email protected]"
         }
     ],
     "require": {
         "magento-hackathon/magento-composer-installer": "*"
     },
     "require-dev": {
-        "ecomdev/mage-ci": "master-dev"
+        "phpunit/phpunit": "4.1.*@dev",
+        "firegento/mage-ci": "master-dev"
     },
     "config": {
         "bin-dir": "bin"
@@ -27,114 +28,134 @@
     ],
     "extra": {
         "magento-root-dir": "test/",
-        "magento_connect":{
-            "name":"FireGento_MageSetup",
-            "summary":"MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
-            "channel":"community",
-            "php_min":"5.3.0",
-            "php_max":"7.9.9",
-            "stability":"stable",
-            "license_uri":"http://www.gnu.org/licenses/gpl-3.0.html",
+        "magento_connect": {
+            "name": "FireGento_MageSetup",
+            "summary": "MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
+            "channel": "community",
+            "php_min": "5.3.0",
+            "php_max": "7.9.9",
+            "stability": "stable",
+            "license_uri": "http://www.gnu.org/licenses/gpl-3.0.html",
             "content":[
                 {
-                    "type":"magecommunity",
-                    "structure":"dir",
-                    "path":"FireGento/MageSetup"
+                    "type": "magecommunity",
+                    "structure": "dir",
+                    "path": "FireGento/MageSetup"
                 },
                 {
-                    "type":"mageetc",
-                    "structure":"file",
-                    "path":"modules/FireGento_MageSetup.xml"
+                    "type": "mageetc",
+                    "structure": "file",
+                    "path": "modules/FireGento_MageSetup.xml"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"file",
-                    "path":"de_AT/FireGento_MageSetup.csv"
+                    "type": "magelocale",
+                    "structure": "file",
+                    "path": "de_AT/FireGento_MageSetup.csv"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"de_CH/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "de_CH/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"file",
-                    "path":"de_DE/FireGento_MageSetup.csv"
+                    "type": "magelocale",
+                    "structure": "file",
+                    "path": "de_DE/FireGento_MageSetup.csv"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"de_DE/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "de_DE/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"file",
-                    "path":"en_US/FireGento_MageSetup.csv"
+                    "type": "magelocale",
+                    "structure": "file",
+                    "path": "en_US/FireGento_MageSetup.csv"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"en_US/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "en_US/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"file",
-                    "path":"ru_RU/FireGento_MageSetup.csv"
+                    "type": "magelocale",
+                    "structure": "file",
+                    "path": "ru_RU/FireGento_MageSetup.csv"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"ru_RU/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "ru_RU/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"fr_CH/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "pl_PL/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"file",
-                    "path":"fr_FR/FireGento_MageSetup.csv"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "ro_RO/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"fr_FR/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "fr_CH/template/magesetup"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"file",
-                    "path":"it_IT/FireGento_MageSetup.csv"
+                    "type": "magelocale",
+                    "structure": "file",
+                    "path": "fr_FR/FireGento_MageSetup.csv"
                 },
                 {
-                    "type":"magelocale",
-                    "structure":"dir",
-                    "path":"it_IT/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "fr_FR/template/magesetup"
                 },
                 {
-                    "type":"magedesign",
-                    "structure":"file",
-                    "path":"adminhtml/default/default/layout/magesetup.xml"
+                    "type": "magelocale",
+                    "structure": "file",
+                    "path": "it_IT/FireGento_MageSetup.csv"
                 },
                 {
-                    "type":"magedesign",
-                    "structure":"dir",
-                    "path":"adminhtml/default/default/template/magesetup"
+                    "type": "magelocale",
+                    "structure": "dir",
+                    "path": "it_IT/template/magesetup"
                 },
                 {
-                    "type":"magedesign",
-                    "structure":"file",
-                    "path":"frontend/base/default/layout/magesetup.xml"
+                    "type": "magedesign",
+                    "structure": "file",
+                    "path": "adminhtml/default/default/layout/magesetup.xml"
                 },
                 {
-                    "type":"magedesign",
-                    "structure":"dir",
-                    "path":"frontend/base/default/template/magesetup"
+                    "type": "magedesign",
+                    "structure": "dir",
+                    "path": "adminhtml/default/default/template/magesetup"
                 },
                 {
-                    "type":"mageskin",
-                    "structure":"dir",
-                    "path":"frontend/base/default/css/magesetup"
+                    "type": "magedesign",
+                    "structure": "file",
+                    "path": "frontend/base/default/layout/magesetup.xml"
+                },
+                {
+                    "type": "magedesign",
+                    "structure": "dir",
+                    "path": "frontend/base/default/template/magesetup"
+                },
+                {
+                    "type": "magedesign",
+                    "structure": "dir",
+                    "path": "frontend/rwd/default/template/magesetup"
+                },
+                {
+                    "type": "mageskin",
+                    "structure": "dir",
+                    "path": "frontend/base/default/css/magesetup"
+                },
+                {
+                    "type": "mageskin",
+                    "structure": "dir",
+                    "path": "frontend/rwd/default/css/magesetup"
                 }
             ]
         }

diff --git a/docs/api/html/classes/FireGento_MageSetup_Model_Tax_Config.xhtml b/docs/api/html/classes/FireGento_MageSetup_Model_Tax_Config.xhtml
@@ -26,7 +26,7 @@
             <a href="#XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX">XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX</a>
           </li>
           <li>
-            <a href="#USE_HIGHTES_TAX_ON_PRODUCTS">USE_HIGHTES_TAX_ON_PRODUCTS</a>
+            <a href="#USE_HIGHEST_TAX_ON_PRODUCTS">USE_HIGHEST_TAX_ON_PRODUCTS</a>
           </li>
           <li>
             <a href="#USE_TAX_DEPENDING_ON_PRODUCT_VALUES">USE_TAX_DEPENDING_ON_PRODUCT_VALUES</a>
@@ -53,7 +53,7 @@
         <h3>Constants</h3>
         <ul class="varlist">
           <li><a name="XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX"/>XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX = 'tax/classes/shipping_tax_on_product_tax'<hr/></li>
-          <li><a name="USE_HIGHTES_TAX_ON_PRODUCTS"/>USE_HIGHTES_TAX_ON_PRODUCTS = 1<hr/></li>
+          <li><a name="USE_HIGHEST_TAX_ON_PRODUCTS"/>USE_HIGHEST_TAX_ON_PRODUCTS = 1<hr/></li>
           <li><a name="USE_TAX_DEPENDING_ON_PRODUCT_VALUES"/>USE_TAX_DEPENDING_ON_PRODUCT_VALUES = 2<hr/></li>
         </ul>
         <h3>Methods</h3>

diff --git a/docs/api/xml/classes/FireGento_MageSetup_Model_Tax_Config.xml b/docs/api/xml/classes/FireGento_MageSetup_Model_Tax_Config.xml
@@ -9,7 +9,7 @@
   </docblock>
   <extends full="Mage_Tax_Model_Config" namespace="" name="Mage_Tax_Model_Config"/>
   <constant name="XML_PATH_SHIPPING_TAX_ON_PRODUCT_TAX" value="'tax/classes/shipping_tax_on_product_tax'"/>
-  <constant name="USE_HIGHTES_TAX_ON_PRODUCTS" value="1"/>
+  <constant name="USE_HIGHEST_TAX_ON_PRODUCTS" value="1"/>
   <constant name="USE_TAX_DEPENDING_ON_PRODUCT_VALUES" value="2"/>
   <method name="getShippingTaxClass" start="43" end="124" abstract="false" final="false" static="false" visibility="public">
     <docblock>

diff --git a/modman b/modman
@@ -1,20 +1,30 @@
 src/app/code/community/FireGento/MageSetup/                       app/code/community/FireGento/MageSetup/
 src/app/etc/modules/FireGento_MageSetup.xml                       app/etc/modules/FireGento_MageSetup.xml
 src/app/locale/de_AT/FireGento_MageSetup.csv                      app/locale/de_AT/FireGento_MageSetup.csv
+src/app/locale/de_CH/template/magesetup/                          app/locale/de_CH/template/magesetup/
 src/app/locale/de_DE/FireGento_MageSetup.csv                      app/locale/de_DE/FireGento_MageSetup.csv
 src/app/locale/de_DE/template/magesetup/                          app/locale/de_DE/template/magesetup/
 src/app/locale/en_US/FireGento_MageSetup.csv                      app/locale/en_US/FireGento_MageSetup.csv
 src/app/locale/en_US/template/magesetup/                          app/locale/en_US/template/magesetup/
-src/app/locale/ru_RU/FireGento_MageSetup.csv                      app/locale/ru_RU/FireGento_MageSetup.csv
-src/app/locale/ru_RU/template/magesetup/                          app/locale/ru_RU/template/magesetup/
+src/app/locale/es_ES/FireGento_MageSetup.csv                      app/locale/es_ES/FireGento_MageSetup.csv
+src/app/locale/es_ES/template/magesetup/                          app/locale/es_ES/template/magesetup/
+src/app/locale/fr_CH/template/magesetup/                          app/locale/fr_CH/template/magesetup/
 src/app/locale/fr_FR/FireGento_MageSetup.csv                      app/locale/fr_FR/FireGento_MageSetup.csv
 src/app/locale/fr_FR/template/magesetup/                          app/locale/fr_FR/template/magesetup/
 src/app/locale/it_IT/FireGento_MageSetup.csv                      app/locale/it_IT/FireGento_MageSetup.csv
 src/app/locale/it_IT/template/magesetup/                          app/locale/it_IT/template/magesetup/
-src/app/locale/de_CH/template/magesetup/                          app/locale/de_CH/template/magesetup/
-src/app/locale/fr_CH/template/magesetup/                          app/locale/fr_CH/template/magesetup/
+src/app/locale/nl_NL/FireGento_MageSetup.csv                      app/locale/nl_NL/FireGento_MageSetup.csv
+src/app/locale/nl_NL/template/magesetup/                          app/locale/nl_NL/template/magesetup/
+src/app/locale/ru_RU/FireGento_MageSetup.csv                      app/locale/ru_RU/FireGento_MageSetup.csv
+src/app/locale/ru_RU/template/magesetup/                          app/locale/ru_RU/template/magesetup/
+src/app/locale/pl_PL/FireGento_MageSetup.csv                      app/locale/pl_PL/FireGento_MageSetup.csv
+src/app/locale/pl_PL/template/magesetup/                          app/locale/pl_PL/template/magesetup/
+src/app/locale/ro_RO/FireGento_MageSetup.csv                      app/locale/ro_RO/FireGento_MageSetup.csv
+src/app/locale/ro_RO/template/magesetup/                          app/locale/ro_RO/template/magesetup/
 src/app/design/adminhtml/default/default/layout/magesetup.xml     app/design/adminhtml/default/default/layout/magesetup.xml
 src/app/design/adminhtml/default/default/template/magesetup/      app/design/adminhtml/default/default/template/magesetup/
 src/app/design/frontend/base/default/layout/magesetup.xml         app/design/frontend/base/default/layout/magesetup.xml
 src/app/design/frontend/base/default/template/magesetup/          app/design/frontend/base/default/template/magesetup/
+src/app/design/frontend/rwd/default/template/magesetup/           app/design/frontend/rwd/default/template/magesetup/
 src/skin/frontend/base/default/css/magesetup/                     skin/frontend/base/default/css/magesetup
+src/skin/frontend/rwd/default/css/magesetup/                      skin/frontend/rwd/default/css/magesetup