Skip to content

Commit 6b3de2e

Browse files
therouvtherouv
committed
Merge branch 'release/2.0.2'
2 parents cbf04de + c94105d commit 6b3de2e

274 files changed

Lines changed: 24648 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
build.sh
2+
build.default.properties
3+
build.xml
4+
.DS_Store
5+
*.cache.properties
6+
*~
7+
*.swp
8+
build.properties
9+
.buildpath
10+
.project
11+
.settings
12+
.settings/**/*
13+
.externalToolBuilders
14+
.externalToolBuilders/**/*
15+
.vagrant
16+
.vagrant/**/*
17+
Vagrantfile
18+
/.idea

‎.travis.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
language: php
2+
php:
3+
- 5.3
4+
before_install:
5+
- mkdir test/
6+
- curl -sS https://getcomposer.org/installer | php
7+
- chmod +x ./composer.phar
8+
- ./composer.phar --version
9+
- ./composer.phar install --dev
10+
before_script:
11+
- CURR_DIR=$(pwd)
12+
- bin/mage-ci install test 1.7.0.2 magento_test -c -t -r http://mage-ci.ecomdev.org
13+
- bin/mage-ci install-module test $CURR_DIR
14+
- git clone https://github.com/EcomDev/EcomDev_PHPUnit.git ./phpunit/
15+
- bin/mage-ci install-module $CURR_DIR/test $CURR_DIR/phpunit/
16+
script:
17+
- bin/mage-ci phpunit test

‎README.markdown‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
FireGento_MageSetup
2+
=====================
3+
MageSetup configures a shop for a national market. It's the international variant and successor of [GermanSetup](https://github.com/firegento/firegento-germansetup).
4+
5+
Currently supported countries: Austria, France, Germany, Italy, Russia, Switzerland, United Kingdom. More to follow.
6+
7+
Build Status
8+
------------
9+
* Latest Release: [![Master Branch](https://travis-ci.org/firegento/firegento-magesetup.png?branch=master)](https://travis-ci.org/firegento/firegento-magesetup)
10+
* Development Branch: [![Development Branch](https://travis-ci.org/firegento/firegento-magesetup.png?branch=development)](https://travis-ci.org/firegento/firegento-magesetup)
11+
12+
Facts
13+
------
14+
- Version: check [config.xml](https://github.com/firegento/firegento-magesetup/blob/master/src/app/code/community/FireGento/MageSetup/etc/config.xml)
15+
- Extension key: FireGento_MageSetup
16+
- [Extension on GitHub](https://github.com/firegento/firegento-magesetup/)
17+
18+
Description
19+
------------
20+
Central features of MageSetup are:
21+
22+
* Setting of important configuration settings
23+
* Predefined tax settings and tax classes for shipping from several countries to worldwide destinations
24+
* Assign new tax classes to all products (configurable)
25+
* Creation of email templates based on the local language pack. Legal texts can be added to some templates automatically.
26+
* 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.
27+
* Creation of default CMS pages like imprint, terms and conditions, privacy, shipping, payment methods.
28+
* Create email templates, cms pages and blocks as well as checkout agreements for store views with a different language as well
29+
* Possibility to add tax and/or shipping info to all prices
30+
* Automatical generation of meta data to products
31+
* Saving of every status change of newsletter subscriptions
32+
* Presets are configurable via xml files for every country seperately
33+
34+
Requirements
35+
------------
36+
- PHP >= 5.3.0
37+
38+
Compatibility
39+
--------------
40+
- Magento >= 1.6
41+
42+
Installation
43+
-----------------------
44+
Please create the desired websites and store view as well as install any language packs before running MageSetup.
45+
46+
Copy all files from the src/ folder to your magento directory in order to install the MageSetup module.
47+
After you have installed the module, you should clear the cache and log off from admin panel. When you log on again, you should see the following hint:
48+
49+
MageSetup has been installed. Click here to set up your pages, blocks, emails and tax settings.
50+
51+
If you don't see that hint, please check that the configuration setting **System -> Configuration -> Developer -> Template Settings -> Allow Symlinks** is enabled.
52+
53+
On the linked page, you can make the desired settings and then click "Run MageSetup" on the top or bottom right. The adjustments will be made.
54+
55+
Support
56+
-------
57+
If you encounter any problems or bugs, please create an issue on [GitHub](https://github.com/firegento/firegento-magesetup/issues).
58+
59+
Contribution
60+
------------
61+
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).
62+
63+
Developer
64+
---------
65+
FireGento Team
66+
* Website: [http://firegento.com](http://firegento.com)
67+
* Twitter: [@firegento](https://twitter.com/firegento)
68+
69+
Licence
70+
-------
71+
[GNU General Public License, version 3 (GPLv3)](http://opensource.org/licenses/gpl-3.0)
72+
73+
Copyright
74+
---------
75+
(c) 2011-2013 FireGento Team

‎composer.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"name": "firegento/magesetup",
3+
"license": ["GPL-3.0"],
4+
"type": "magento-module",
5+
"description": "MageSetup configures a shop for a national market. It creates configuration and tax settings, email templates, cms blocks and pages.",
6+
"homepage": "https://github.com/firegento/firegento-magesetup",
7+
"require": {
8+
"magento-hackathon/magento-composer-installer": "*"
9+
},
10+
"require-dev": {
11+
"ecomdev/mage-ci": "master-dev"
12+
},
13+
"config": {
14+
"bin-dir": "bin"
15+
},
16+
"repositories": [
17+
{
18+
"type": "composer",
19+
"url": "http://packages.firegento.com"
20+
}
21+
],
22+
"extra":{
23+
"magento-root-dir": "test/"
24+
}
25+
}

‎docs/api/html/classes/FireGento_MageSetup_Adminhtml_NewsletterController.xhtml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!DOCTYPE html PUBLIC "html" "">
3+
<html xmlns="http://www.w3.org/1999/xhtml" class="no-js" lang="en">
4+
<head>
5+
<meta charset="utf-8"/>
6+
<title>FireGento_MageSetup - FireGento_MageSetup_Adminhtml_NewsletterController - API Documentation</title>
7+
<link href="../css/normalize.css" rel="stylesheet" type="text/css" media="all"/>
8+
<link href="../css/styles.css" rel="stylesheet" type="text/css" media="all"/>
9+
</head>
10+
<body>
11+
<div class="wrapper clearfix">
12+
<div class="topbar clearfix">
13+
<h1>
14+
<a class="brand" href="../index.xhtml">FireGento_MageSetup - API Documentation</a>
15+
</h1>
16+
<ul class="nav">
17+
<li class="active">
18+
<a href="../index.xhtml">Overview</a>
19+
</li>
20+
</ul>
21+
</div>
22+
<div class="navigation">
23+
<h3>Methods</h3>
24+
<ul>
25+
<li>
26+
<a href="#gridAction">gridAction</a>
27+
</li>
28+
<li>
29+
<a href="#indexAction">indexAction</a>
30+
</li>
31+
</ul>
32+
</div>
33+
<div class="content">
34+
<h2><span style="font-size:60%">\</span>FireGento_MageSetup_Adminhtml_NewsletterController</h2>
35+
<div class="file-notice">
36+
<p>Newsletter Subscriber Status Adminhtml Controller</p>
37+
</div>
38+
<ul class="fileinfos">
39+
<li><b>Author: </b>FireGento Team &lt;team@firegento.com&gt;</li>
40+
<li><b>Copyright: </b>2013 FireGento Team (http://www.firegento.de). All rights served.</li>
41+
<li><b>License: </b>http://opensource.org/licenses/gpl-3.0 GNU General Public License, version 3 (GPLv3)</li>
42+
</ul>
43+
<h3>Methods</h3>
44+
<ul class="varlist">
45+
<li>
46+
<a name="gridAction"/>
47+
<h4><span class="label public">public</span>gridAction<span style="font-size:90%;">( )</span></h4>
48+
<p style="font-size:110%; padding-top:5px;">
49+
<li>Retrieve the new grid layout via ajax requests</li>
50+
</p>
51+
</li>
52+
<li>
53+
<a name="indexAction"/>
54+
<h4><span class="label public">public</span>indexAction<span style="font-size:90%;">( )</span></h4>
55+
<p style="font-size:110%; padding-top:5px;">
56+
<li>Displays the newsletter subscribers status history</li>
57+
</p>
58+
</li>
59+
</ul>
60+
<div class="footer">Generated using phpDox 0.5 - Copyright (C) 2010 - 2013 by Arne Blankerts</div>
61+
</div>
62+
</div>
63+
</body>
64+
</html>

0 commit comments

Comments
 (0)