Merge remote-tracking branch 'origin/master'

firegento · Jan 6, 2014 · 16023ba · 16023ba
2 parents 385c1c9 + 5ea63fc
commit 16023ba
Show file tree

Hide file tree

Showing 248 changed files with 4,103 additions and 2,153 deletions.
diff --git a/README.markdown b/README.markdown
@@ -1,5 +1,5 @@
 FireGento_MageSetup
-=====================
+===================
 MageSetup configures a shop for a national market. It's the international variant and successor of [GermanSetup](https://github.com/firegento/firegento-germansetup).
 
 Currently supported countries: Austria, France, Germany, Italy, Russia, Switzerland, United Kingdom. More to follow.
@@ -10,14 +10,14 @@ Build Status
 * Development Branch: [![Development Branch](https://travis-ci.org/firegento/firegento-magesetup.png?branch=development)](https://travis-ci.org/firegento/firegento-magesetup)
 
 Facts
-------
+-----
 - Version: check [config.xml](https://github.com/firegento/firegento-magesetup/blob/master/src/app/code/community/FireGento/MageSetup/etc/config.xml)
 - Extension key: FireGento_MageSetup
 - [Extension on GitHub](https://github.com/firegento/firegento-magesetup/)
-- Composer name: firegento/magesetup on [packages.firegento.com](http://packages.firegento.com/)
+- Composer name: `firegento/magesetup` on [packages.firegento.com](http://packages.firegento.com/)
 
 Description
-------------
+-----------
 Central features of MageSetup are:
 
 * Setting of important configuration settings
@@ -38,11 +38,11 @@ Requirements
 - PHP >= 5.3.0
 
 Compatibility
---------------
+-------------
 - Magento >= 1.6
 
 Installation
------------------------
+------------
 Please create the desired websites and store views as well as install any language packs before running MageSetup.
 
 Copy all files from the src/ folder to your magento directory in order to install the MageSetup module.

diff --git a/composer.json b/composer.json
@@ -1,25 +1,142 @@
 {
-  "name": "firegento/magesetup",
-  "license": ["GPL-3.0"],
-  "type": "magento-module",
-  "description": "MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
-  "homepage": "https://github.com/firegento/firegento-magesetup",
-  "require": {
-    "magento-hackathon/magento-composer-installer": "*"
-  },
-  "require-dev": {
-    "ecomdev/mage-ci": "master-dev"
-  },
-  "config": {
-    "bin-dir": "bin"
-  },
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "http://packages.firegento.com"
+    "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>",
+    "homepage": "https://github.com/firegento/firegento-magesetup",
+    "authors": [
+        {
+            "name":"Team FireGento",
+            "email":"[email protected]"
+        }
+    ],
+    "require": {
+        "magento-hackathon/magento-composer-installer": "*"
+    },
+    "require-dev": {
+        "ecomdev/mage-ci": "master-dev"
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://packages.firegento.com"
+        }
+    ],
+    "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",
+            "content":[
+                {
+                    "type":"magecommunity",
+                    "structure":"dir",
+                    "path":"FireGento/MageSetup"
+                },
+                {
+                    "type":"mageetc",
+                    "structure":"file",
+                    "path":"modules/FireGento_MageSetup.xml"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"de_AT/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"de_CH/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"de_DE/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"de_DE/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"en_US/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"en_US/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"ru_RU/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"ru_RU/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"fr_CH/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"fr_FR/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"fr_FR/template/magesetup"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"file",
+                    "path":"it_IT/FireGento_MageSetup.csv"
+                },
+                {
+                    "type":"magelocale",
+                    "structure":"dir",
+                    "path":"it_IT/template/magesetup"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"file",
+                    "path":"adminhtml/default/default/layout/magesetup.xml"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"dir",
+                    "path":"adminhtml/default/default/template/magesetup"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"file",
+                    "path":"frontend/base/default/layout/magesetup.xml"
+                },
+                {
+                    "type":"magedesign",
+                    "structure":"dir",
+                    "path":"frontend/base/default/template/magesetup"
+                },
+                {
+                    "type":"mageskin",
+                    "structure":"dir",
+                    "path":"frontend/base/default/css/magesetup"
+                }
+            ]
+        }
     }
-  ],
-  "extra":{
-    "magento-root-dir": "test/"
-  }
 }
diff --git a/docs/api/html/classes/FireGento_MageSetup_Adminhtml_NewsletterController.xhtml b/docs/api/html/classes/FireGento_MageSetup_Adminhtml_NewsletterController.xhtml
@@ -37,7 +37,7 @@
         </div>
         <ul class="fileinfos">
           <li><b>Author: </b>FireGento Team &lt;[email protected]&gt;</li>
-          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.de). All rights served.</li>
+          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.com)</li>
           <li><b>License: </b>http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</li>
         </ul>
         <h3>Methods</h3>

diff --git a/docs/api/html/classes/FireGento_MageSetup_Block_Adminhtml_Magesetup.xhtml b/docs/api/html/classes/FireGento_MageSetup_Block_Adminhtml_Magesetup.xhtml
@@ -28,6 +28,9 @@
           <li>
             <a href="#getAvailableCountriesForSetup">getAvailableCountriesForSetup</a>
           </li>
+          <li>
+            <a href="#getCustomerTaxClasses">getCustomerTaxClasses</a>
+          </li>
           <li>
             <a href="#getDefaultProductTaxClass">getDefaultProductTaxClass</a>
           </li>
@@ -37,9 +40,18 @@
           <li>
             <a href="#getLocaleOptionsForEmailTemplates">getLocaleOptionsForEmailTemplates</a>
           </li>
+          <li>
+            <a href="#getNewCustomerTaxClasses">getNewCustomerTaxClasses</a>
+          </li>
+          <li>
+            <a href="#getNewCustomerTaxClassesJson">getNewCustomerTaxClassesJson</a>
+          </li>
           <li>
             <a href="#getNewProductTaxClasses">getNewProductTaxClasses</a>
           </li>
+          <li>
+            <a href="#getNewProductTaxClassesJson">getNewProductTaxClassesJson</a>
+          </li>
           <li>
             <a href="#getPostActionUrl">getPostActionUrl</a>
           </li>
@@ -61,7 +73,7 @@
         </div>
         <ul class="fileinfos">
           <li><b>Author: </b>FireGento Team &lt;[email protected]&gt;</li>
-          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.de). All rights served.</li>
+          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.com)</li>
           <li><b>License: </b>http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</li>
         </ul>
         <h3>Constructor</h3>
@@ -89,6 +101,19 @@
               </ul>
             </ul>
           </li>
+          <li>
+            <a name="getCustomerTaxClasses"/>
+            <h4><span class="label public">public</span>getCustomerTaxClasses<span style="font-size:90%;">(  )</span></h4>
+            <p style="font-size:110%; padding-top:5px;">
+              <li>Get old product tax classes</li>
+            </p>
+            <ul>
+              <h4 class="return">Returns:</h4>
+              <ul class="return">
+                <li>All existing product tax classes</li>
+              </ul>
+            </ul>
+          </li>
           <li>
             <a name="getDefaultProductTaxClass"/>
             <h4><span class="label public">public</span>getDefaultProductTaxClass<span style="font-size:90%;">(  )</span></h4>
@@ -128,6 +153,32 @@
               </ul>
             </ul>
           </li>
+          <li>
+            <a name="getNewCustomerTaxClasses"/>
+            <h4><span class="label public">public</span>getNewCustomerTaxClasses<span style="font-size:90%;">(  )</span></h4>
+            <p style="font-size:110%; padding-top:5px;">
+              <li>Get new product tax classes (yet to be created)</li>
+            </p>
+            <ul>
+              <h4 class="return">Returns:</h4>
+              <ul class="return">
+                <li>All new product tax classes</li>
+              </ul>
+            </ul>
+          </li>
+          <li>
+            <a name="getNewCustomerTaxClassesJson"/>
+            <h4><span class="label public">public</span>getNewCustomerTaxClassesJson<span style="font-size:90%;">(  )</span></h4>
+            <p style="font-size:110%; padding-top:5px;">
+              <li>Retrieve the new customer tax classes as JSON</li>
+            </p>
+            <ul>
+              <h4 class="return">Returns:</h4>
+              <ul class="return">
+                <li>JSON with Customer Tax Classes</li>
+              </ul>
+            </ul>
+          </li>
           <li>
             <a name="getNewProductTaxClasses"/>
             <h4><span class="label public">public</span>getNewProductTaxClasses<span style="font-size:90%;">(  )</span></h4>
@@ -141,6 +192,19 @@
               </ul>
             </ul>
           </li>
+          <li>
+            <a name="getNewProductTaxClassesJson"/>
+            <h4><span class="label public">public</span>getNewProductTaxClassesJson<span style="font-size:90%;">(  )</span></h4>
+            <p style="font-size:110%; padding-top:5px;">
+              <li>Retrieve the new product tax classes as JSON</li>
+            </p>
+            <ul>
+              <h4 class="return">Returns:</h4>
+              <ul class="return">
+                <li>JSON with Product Tax Classes</li>
+              </ul>
+            </ul>
+          </li>
           <li>
             <a name="getPostActionUrl"/>
             <h4><span class="label public">public</span>getPostActionUrl<span style="font-size:90%;">(  )</span></h4>

diff --git a/docs/api/html/classes/FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status.xhtml b/docs/api/html/classes/FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status.xhtml
@@ -34,7 +34,7 @@
         </div>
         <ul class="fileinfos">
           <li><b>Author: </b>FireGento Team &lt;[email protected]&gt;</li>
-          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.de). All rights served.</li>
+          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.com)</li>
           <li><b>License: </b>http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</li>
         </ul>
         <h3>Constructor</h3>

diff --git a/.../html/classes/FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status_Grid.xhtml b/.../html/classes/FireGento_MageSetup_Block_Adminhtml_Newsletter_Subscriber_Status_Grid.xhtml
@@ -46,7 +46,7 @@
         </div>
         <ul class="fileinfos">
           <li><b>Author: </b>FireGento Team &lt;[email protected]&gt;</li>
-          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.de). All rights served.</li>
+          <li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.com)</li>
           <li><b>License: </b>http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</li>
         </ul>
         <h3>Constructor</h3>
@@ -83,7 +83,7 @@
             <ul>
               <h4 class="param">Parameters:</h4>
               <ul class="param">
-                <li><code>$row</code> - </li>
+                <li><code>$row</code> - Newsletter Subscriber Status Model</li>
               </ul>
             </ul>
             <ul>