TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php
This commit is contained in:
Etienne Roudeix
2013-10-21 17:48:13 +02:00
parent 9a7708451a 1f55d569ef
commit abe45c5798
100 changed files with 1333 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
local/modules/Cheque/Cheque.php
View File

@@ -23,6 +23,7 @@
namespace Cheque;
use Propel\Runtime\Connection\ConnectionInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Request;
use Thelia\Model\ModuleImageQuery;
@@ -59,17 +60,13 @@ class Cheque extends BaseModule implements PaymentModuleInterface
// no special process, waiting for the cheque.
}
public function install()
{
}
public function afterActivation()
public function postActivation(ConnectionInterface $con = null)
{
/* insert the images from image folder if first module activation */
$module = $this->getModuleModel();
if(ModuleImageQuery::create()->filterByModule($module)->count() == 0) {
$this->deployImageFolder($module, sprintf('%s/images', __DIR__));
$this->deployImageFolder($module, sprintf('%s/images', __DIR__), $con);
}
/* set module title */
@@ -82,10 +79,6 @@ class Cheque extends BaseModule implements PaymentModuleInterface
);
}
public function destroy()
{
// TODO: Implement destroy() method.
}
public function getCode()
{

18
local/modules/Cheque/Config/module.xml Executable file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
<fullnamespace>Cheque\Cheque</fullnamespace>
<descriptive locale="en_US">
<title>Cheque</title>
</descriptive>
<descriptive locale="fr_FR">
<title>Cheque</title>
</descriptive>
<version>1.1</version>
<author>
<name>Manuel Raynaud</name>
<email>mraynaud@openstudio.fr</email>
</author>
<type>payment</type>
<thelia>2.0.0</thelia>
<stability>alpha</stability>
</module>

0
local/modules/Cheque/Config/plugin.xml
View File

19
local/modules/Colissimo/Colissimo.php
View File

@@ -67,25 +67,6 @@ class Colissimo extends BaseModule implements DeliveryModuleInterface
return 2;
}
public function afterActivation()
{
}
/**
* YOU HAVE TO IMPLEMENT HERE ABSTRACT METHODD FROM BaseModule Class
* Like install and destroy
*/
public function install()
{
// TODO: Implement install() method.
}
public function destroy()
{
// TODO: Implement destroy() method.
}
public function getCode()
{
return 'Colissimo';

18
local/modules/Colissimo/Config/module.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
<fullnamespace>Colissimo\Colissimo</fullnamespace>
<descriptive locale="en_US">
<title>colisimo</title>
</descriptive>
<descriptive locale="fr_FR">
<title>colisimo</title>
</descriptive>
<version>1.0</version>
<author>
<name>Manuel Raynaud</name>
<email>mraynaud@openstudio.fr</email>
</author>
<type>delivery</type>
<thelia>2.0.0</thelia>
<stability>alpha</stability>
</module>

0
local/modules/Colissimo/Config/plugin.xml
View File

18
local/modules/FakeCB/Config/module.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
<fullnamespace>FakeCB\FakeCB</fullnamespace>
<descriptive locale="en_US">
<title>fake cb</title>
</descriptive>
<descriptive locale="fr_FR">
<title>simulation cb</title>
</descriptive>
<version>1.0</version>
<author>
<name>Manuel Raynaud</name>
<email>mraynaud@openstudio.fr</email>
</author>
<type>payment</type>
<thelia>2.0.0</thelia>
<stability>alpha</stability>
</module>

0
local/modules/FakeCB/Config/plugin.xml
View File

11
local/modules/FakeCB/FakeCB.php
View File

@@ -23,6 +23,7 @@
namespace FakeCB;
use Propel\Runtime\Connection\ConnectionInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Request;
use Thelia\Model\Base\ModuleImageQuery;
@@ -59,12 +60,8 @@ class FakeCB extends BaseModule implements PaymentModuleInterface
// TODO: Implement pay() method.
}
public function install()
{
}
public function afterActivation()
public function postActivation(ConnectionInterface $con = null)
{
/* insert the images from image folder if first module activation */
$module = $this->getModuleModel();
@@ -82,10 +79,6 @@ class FakeCB extends BaseModule implements PaymentModuleInterface
);
}
public function destroy()
{
// TODO: Implement destroy() method.
}
public function getCode()
{

18
local/modules/TheliaDebugBar/Config/module.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<module>
<fullnamespace>TheliaDebugBar\TheliaDebugBar</fullnamespace>
<descriptive locale="en_US">
<title>debugbar for thelia</title>
</descriptive>
<descriptive locale="fr_FR">
<title>debugbar pour thelia</title>
</descriptive>
<version>1.0</version>
<author>
<name>Manuel Raynaud</name>
<email>mraynaud@openstudio.fr</email>
</author>
<type>classic</type>
<thelia>2.0.0</thelia>
<stability>alpha</stability>
</module>

0
local/modules/TheliaDebugBar/Config/plugin.xml
View File

15
local/modules/TheliaDebugBar/TheliaDebugBar.php
View File

@@ -32,21 +32,6 @@ class TheliaDebugBar extends BaseModule
* Like install and destroy
*/
public function afterActivation()
{
}
public function install()
{
// TODO: Implement install() method.
}
public function destroy()
{
// TODO: Implement destroy() method.
}
public function getCode()
{
return 'TheliaDebugBar';