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

Boulette sur modif du module Colissimo (suite à création de module FedEx)

Browse Source
This commit is contained in:
TheCoreDev
2020-11-13 10:53:13 +01:00
parent 63504d5f90
commit 2f4c97b3ad
15 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@
namespace Colissimo; namespace Colissimo;
use Colissimo\Model\Config\FedExConfigValue; use Colissimo\Model\Config\ColissimoConfigValue;
use Propel\Runtime\Connection\ConnectionInterface; use Propel\Runtime\Connection\ConnectionInterface;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Install\Database; use Thelia\Install\Database;
@@ -35,7 +35,7 @@ class Colissimo extends AbstractDeliveryModule
public static function getPrices() public static function getPrices()
{ {
if (null === self::$prices) { if (null === self::$prices) {
self::$prices = json_decode(FedEx::getConfigValue(FedExConfigValue::PRICES, null), true); self::$prices = json_decode(Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null), true);
} }
return self::$prices; return self::$prices;
@@ -43,7 +43,7 @@ class Colissimo extends AbstractDeliveryModule
public function postActivation(ConnectionInterface $con = null) public function postActivation(ConnectionInterface $con = null)
{ {
self::setConfigValue(FedExConfigValue::ENABLED, 1); self::setConfigValue(ColissimoConfigValue::ENABLED, 1);
$database = new Database($con); $database = new Database($con);
$database->insertSql(null, array(__DIR__ . '/Config/thelia.sql')); $database->insertSql(null, array(__DIR__ . '/Config/thelia.sql'));
@@ -51,7 +51,7 @@ class Colissimo extends AbstractDeliveryModule
public function isValidDelivery(Country $country) public function isValidDelivery(Country $country)
{ {
if (0 == self::getConfigValue(FedExConfigValue::ENABLED, 1)) { if (0 == self::getConfigValue(ColissimoConfigValue::ENABLED, 1)) {
return false; return false;
} }
@@ -90,7 +90,7 @@ class Colissimo extends AbstractDeliveryModule
*/ */
public static function getPostageAmount($areaId, $weight) public static function getPostageAmount($areaId, $weight)
{ {
$freeshipping = FedEx::getConfigValue(FedExConfigValue::FREE_SHIPPING); $freeshipping = Colissimo::getConfigValue(ColissimoConfigValue::FREE_SHIPPING);
$postage = 0; $postage = 0;
if (!$freeshipping) { if (!$freeshipping) {
$prices = self::getPrices(); $prices = self::getPrices();
@@ -164,14 +164,14 @@ class Colissimo extends AbstractDeliveryModule
$tableExists = $database->execute("SHOW TABLES LIKE 'colissimo_freeshipping'")->rowCount(); $tableExists = $database->execute("SHOW TABLES LIKE 'colissimo_freeshipping'")->rowCount();
if (FedEx::getConfigValue(FedExConfigValue::FREE_SHIPPING, null) == null && $tableExists) { if (Colissimo::getConfigValue(ColissimoConfigValue::FREE_SHIPPING, null) == null && $tableExists) {
$result = $database->execute('SELECT active FROM colissimo_freeshipping WHERE id=1')->fetch()["active"]; $result = $database->execute('SELECT active FROM colissimo_freeshipping WHERE id=1')->fetch()["active"];
FedEx::setConfigValue(FedExConfigValue::FREE_SHIPPING, $result); Colissimo::setConfigValue(ColissimoConfigValue::FREE_SHIPPING, $result);
$database->execute("DROP TABLE `colissimo_freeshipping`"); $database->execute("DROP TABLE `colissimo_freeshipping`");
} }
if (is_readable($uploadDir) && FedEx::getConfigValue(FedExConfigValue::PRICES, null) == null) { if (is_readable($uploadDir) && Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null) == null) {
FedEx::setConfigValue(FedExConfigValue::PRICES, file_get_contents($uploadDir)); Colissimo::setConfigValue(ColissimoConfigValue::PRICES, file_get_contents($uploadDir));
} }
} }
} }

10
local/modules/Colissimo/Controller/Configuration.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Controller; namespace Colissimo\Controller;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\Config\FedExConfigValue; use Colissimo\Model\Config\ColissimoConfigValue;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Thelia\Controller\Admin\BaseAdminController; use Thelia\Controller\Admin\BaseAdminController;
use Thelia\Core\Security\AccessManager; use Thelia\Core\Security\AccessManager;
@@ -32,7 +32,7 @@ class Configuration extends BaseAdminController
{ {
if (null !== $response = $this->checkAuth( if (null !== $response = $this->checkAuth(
AdminResources::MODULE, AdminResources::MODULE,
[FedEx::DOMAIN_NAME], [Colissimo::DOMAIN_NAME],
AccessManager::UPDATE AccessManager::UPDATE
)) { )) {
return $response; return $response;
@@ -45,8 +45,8 @@ class Configuration extends BaseAdminController
$validateForm = $this->validateForm($form); $validateForm = $this->validateForm($form);
$data = $validateForm->getData(); $data = $validateForm->getData();
FedEx::setConfigValue( Colissimo::setConfigValue(
FedExConfigValue::ENABLED, ColissimoConfigValue::ENABLED,
is_bool($data["enabled"]) ? (int) ($data["enabled"]) : $data["enabled"] is_bool($data["enabled"]) ? (int) ($data["enabled"]) : $data["enabled"]
); );

8
local/modules/Colissimo/Controller/EditPrices.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Controller; namespace Colissimo\Controller;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\Config\FedExConfigValue; use Colissimo\Model\Config\ColissimoConfigValue;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Thelia\Model\AreaQuery; use Thelia\Model\AreaQuery;
use Thelia\Controller\Admin\BaseAdminController; use Thelia\Controller\Admin\BaseAdminController;
@@ -44,7 +44,7 @@ class EditPrices extends BaseAdminController
->findPK($area); ->findPK($area);
if ($exists !== null) { if ($exists !== null) {
if (null !== $data = FedEx::getConfigValue(FedExConfigValue::PRICES, null)) { if (null !== $data = Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null)) {
$json_data = json_decode( $json_data = json_decode(
$data, $data,
true true
@@ -62,7 +62,7 @@ class EditPrices extends BaseAdminController
} }
ksort($json_data[$area]['slices']); ksort($json_data[$area]['slices']);
FedEx::setConfigValue(FedExConfigValue::PRICES, json_encode($json_data)); Colissimo::setConfigValue(ColissimoConfigValue::PRICES, json_encode($json_data));
} else { } else {
throw new \Exception("Area not found"); throw new \Exception("Area not found");

8
local/modules/Colissimo/Controller/Export.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Controller; namespace Colissimo\Controller;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\FedExQuery; use Colissimo\Model\ColissimoQuery;
use Thelia\Controller\Admin\BaseAdminController; use Thelia\Controller\Admin\BaseAdminController;
use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
@@ -56,7 +56,7 @@ class Export extends BaseAdminController
->findOne(); ->findOne();
// Get Colissimo orders // Get Colissimo orders
$orders = FedExQuery::getOrders()->find(); $orders = ColissimoQuery::getOrders()->find();
$export = ""; $export = "";
$store_name = ConfigQuery::getStoreName(); $store_name = ConfigQuery::getStoreName();
@@ -149,7 +149,7 @@ class Export extends BaseAdminController
} catch (FormValidationException $e) { } catch (FormValidationException $e) {
$this->setupFormErrorContext( $this->setupFormErrorContext(
Translator::getInstance()->trans("colissimo expeditor export", [], FedEx::DOMAIN_NAME), Translator::getInstance()->trans("colissimo expeditor export", [], Colissimo::DOMAIN_NAME),
$e->getMessage(), $e->getMessage(),
$form, $form,
$e $e

8
local/modules/Colissimo/Controller/FreeShipping.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Controller; namespace Colissimo\Controller;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\Config\FedExConfigValue; use Colissimo\Model\Config\ColissimoConfigValue;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Thelia\Controller\Admin\BaseAdminController; use Thelia\Controller\Admin\BaseAdminController;
@@ -30,7 +30,7 @@ class FreeShipping extends BaseAdminController
{ {
public function set() public function set()
{ {
$response = $this->checkAuth(AdminResources::MODULE, [FedEx::DOMAIN_NAME], AccessManager::UPDATE); $response = $this->checkAuth(AdminResources::MODULE, [Colissimo::DOMAIN_NAME], AccessManager::UPDATE);
if (null !== $response) { if (null !== $response) {
return $response; return $response;
} }
@@ -42,7 +42,7 @@ class FreeShipping extends BaseAdminController
$validateForm = $this->validateForm($form); $validateForm = $this->validateForm($form);
$data = $validateForm->getData(); $data = $validateForm->getData();
FedEx::setConfigValue(FedExConfigValue::FREE_SHIPPING, (int) ($data["freeshipping"])); Colissimo::setConfigValue(ColissimoConfigValue::FREE_SHIPPING, (int) ($data["freeshipping"]));
return $this->redirectToConfigurationPage(); return $this->redirectToConfigurationPage();
} catch (\Exception $e) { } catch (\Exception $e) {

8
local/modules/Colissimo/EventListener/AreaDeletedListener.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\EventListener; namespace Colissimo\EventListener;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\Config\FedExConfigValue; use Colissimo\Model\Config\ColissimoConfigValue;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\Area\AreaDeleteEvent; use Thelia\Core\Event\Area\AreaDeleteEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
@@ -30,12 +30,12 @@ class AreaDeletedListener implements EventSubscriberInterface
*/ */
public function updateConfig(AreaDeleteEvent $event) public function updateConfig(AreaDeleteEvent $event)
{ {
if (null !== $data = FedEx::getConfigValue(FedExConfigValue::PRICES, null)) { if (null !== $data = Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null)) {
$areaId = $event->getAreaId(); $areaId = $event->getAreaId();
$json_data = json_decode($data, true); $json_data = json_decode($data, true);
unset($json_data[$areaId]); unset($json_data[$areaId]);
FedEx::setConfigValue(FedExConfigValue::PRICES, json_encode($json_data, true)); Colissimo::setConfigValue(ColissimoConfigValue::PRICES, json_encode($json_data, true));
} }
} }

8
local/modules/Colissimo/Form/Configuration.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Form; namespace Colissimo\Form;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\Config\Base\FedExConfigValue; use Colissimo\Model\Config\Base\ColissimoConfigValue;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Form\BaseForm; use Thelia\Form\BaseForm;
@@ -38,13 +38,13 @@ class Configuration extends BaseForm
"help" => Translator::getInstance()->trans( "help" => Translator::getInstance()->trans(
'Check if you want to activate Colissimo', 'Check if you want to activate Colissimo',
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
) )
], ],
"required" => false, "required" => false,
"constraints" => array( "constraints" => array(
), ),
"value" => FedEx::getConfigValue(FedExConfigValue::ENABLED, 1), "value" => Colissimo::getConfigValue(ColissimoConfigValue::ENABLED, 1),
) )
); );
} }

10
local/modules/Colissimo/Form/Export.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Form; namespace Colissimo\Form;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\FedExQuery; use Colissimo\Model\ColissimoQuery;
use Symfony\Component\Validator\Constraints\Callback; use Symfony\Component\Validator\Constraints\Callback;
use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Context\ExecutionContextInterface; use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -50,7 +50,7 @@ class Export extends BaseForm
*/ */
protected function buildForm() protected function buildForm()
{ {
$orders = FedExQuery::getOrders() $orders = ColissimoQuery::getOrders()
->find(); ->find();
$this->formBuilder $this->formBuilder
@@ -67,7 +67,7 @@ class Export extends BaseForm
'label' => Translator::getInstance()->trans( 'label' => Translator::getInstance()->trans(
'Modify status export after export', 'Modify status export after export',
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
), ),
'label_attr' => [ 'label_attr' => [
'for' => 'status_id' 'for' => 'status_id'
@@ -106,7 +106,7 @@ class Export extends BaseForm
Translator::getInstance()->trans( Translator::getInstance()->trans(
'select a valid status', 'select a valid status',
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
) )
); );
} }

8
local/modules/Colissimo/Form/FreeShipping.php
View File

@@ -12,8 +12,8 @@
namespace Colissimo\Form; namespace Colissimo\Form;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Colissimo\Model\Config\Base\FedExConfigValue; use Colissimo\Model\Config\Base\ColissimoConfigValue;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\Form\BaseForm; use Thelia\Form\BaseForm;
@@ -46,8 +46,8 @@ class FreeShipping extends BaseForm
"freeshipping", "freeshipping",
"checkbox", "checkbox",
array( array(
"label" => Translator::getInstance()->trans("Activate free shipping: ", [], FedEx::DOMAIN_NAME), "label" => Translator::getInstance()->trans("Activate free shipping: ", [], Colissimo::DOMAIN_NAME),
"value" => FedEx::getConfigValue(FedExConfigValue::FREE_SHIPPING, false), "value" => Colissimo::getConfigValue(ColissimoConfigValue::FREE_SHIPPING, false),
) )
); );
} }

4
local/modules/Colissimo/Listener/SendMail.php
View File

@@ -12,7 +12,7 @@
namespace Colissimo\Listener; namespace Colissimo\Listener;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\Order\OrderEvent;
use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Event\TheliaEvents;
@@ -46,7 +46,7 @@ class SendMail implements EventSubscriberInterface
public function updateStatus(OrderEvent $event) public function updateStatus(OrderEvent $event)
{ {
$order = $event->getOrder(); $order = $event->getOrder();
$colissimo = new FedEx(); $colissimo = new Colissimo();
if ($order->isSent() && $order->getDeliveryModuleId() == $colissimo->getModuleModel()->getId()) { if ($order->isSent() && $order->getDeliveryModuleId() == $colissimo->getModuleModel()->getId()) {
$contact_email = ConfigQuery::getStoreEmail(); $contact_email = ConfigQuery::getStoreEmail();

10
local/modules/Colissimo/Loop/CheckRightsLoop.php
View File

@@ -11,7 +11,7 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Colissimo\Loop; namespace Colissimo\Loop;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResultRow; use Thelia\Core\Template\Element\LoopResultRow;
@@ -41,7 +41,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
"ERRMES"=>Translator::getInstance()->trans( "ERRMES"=>Translator::getInstance()->trans(
"Can't read Config directory", "Can't read Config directory",
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
), ),
"ERRFILE"=>"" "ERRFILE"=>""
); );
@@ -51,7 +51,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
"ERRMES"=>Translator::getInstance()->trans( "ERRMES"=>Translator::getInstance()->trans(
"Can't write Config directory", "Can't write Config directory",
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
), ),
"ERRFILE"=>"" "ERRFILE"=>""
); );
@@ -66,7 +66,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
"ERRMES"=>Translator::getInstance()->trans( "ERRMES"=>Translator::getInstance()->trans(
"Can't read file", "Can't read file",
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
), ),
"ERRFILE"=>"Colissimo/Config/".$file "ERRFILE"=>"Colissimo/Config/".$file
); );
@@ -76,7 +76,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface
"ERRMES"=>Translator::getInstance()->trans( "ERRMES"=>Translator::getInstance()->trans(
"Can't write file", "Can't write file",
[], [],
FedEx::DOMAIN_NAME Colissimo::DOMAIN_NAME
), ),
"ERRFILE"=>"Colissimo/Config/".$file "ERRFILE"=>"Colissimo/Config/".$file
); );

4
local/modules/Colissimo/Loop/NotSendLoop.php
View File

@@ -12,7 +12,7 @@
namespace Colissimo\Loop; namespace Colissimo\Loop;
use Colissimo\Model\FedExQuery; use Colissimo\Model\ColissimoQuery;
use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
@@ -69,6 +69,6 @@ class NotSendLoop extends Order
*/ */
public function buildModelCriteria() public function buildModelCriteria()
{ {
return FedExQuery::getOrders(); return ColissimoQuery::getOrders();
} }
} }

4
local/modules/Colissimo/Loop/Price.php
View File

@@ -12,7 +12,7 @@
namespace Colissimo\Loop; namespace Colissimo\Loop;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Thelia\Core\Template\Element\ArraySearchLoopInterface; use Thelia\Core\Template\Element\ArraySearchLoopInterface;
use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\BaseLoop;
use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResult;
@@ -47,7 +47,7 @@ class Price extends BaseLoop implements ArraySearchLoopInterface
public function buildArray() public function buildArray()
{ {
$area = $this->getArea(); $area = $this->getArea();
$prices = FedEx::getPrices(); $prices = Colissimo::getPrices();
if (!isset($prices[$area]) || !isset($prices[$area]["slices"])) { if (!isset($prices[$area]) || !isset($prices[$area]["slices"])) {
return array(); return array();

4
local/modules/Colissimo/Model/ColissimoQuery.php
View File

@@ -23,7 +23,7 @@
namespace Colissimo\Model; namespace Colissimo\Model;
use Colissimo\FedEx; use Colissimo\Colissimo;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Model\OrderQuery; use Thelia\Model\OrderQuery;
use Thelia\Model\OrderStatus; use Thelia\Model\OrderStatus;
@@ -53,7 +53,7 @@ class ColissimoQuery
->toArray("code"); ->toArray("code");
$query = OrderQuery::create() $query = OrderQuery::create()
->filterByDeliveryModuleId((new FedEx())->getModuleModel()->getId()) ->filterByDeliveryModuleId((new Colissimo())->getModuleModel()->getId())
->filterByStatusId( ->filterByStatusId(
array( array(
$status[OrderStatus::CODE_PAID]['Id'], $status[OrderStatus::CODE_PAID]['Id'],

4
local/modules/Colissimo/Model/Config/FedExConfigValue.php
View File

@@ -12,13 +12,13 @@
namespace Colissimo\Model\Config; namespace Colissimo\Model\Config;
use Colissimo\Model\Config\Base\FedExConfigValue as BaseColissimoConfigValue; use Colissimo\Model\Config\Base\ColissimoConfigValue as BaseColissimoConfigValue;
/** /**
* Class Colissimo * Class Colissimo
* @package Colissimo\Model\Config * @package Colissimo\Model\Config
* @author Thomas Arnaud <tarnaud@openstudio.fr> * @author Thomas Arnaud <tarnaud@openstudio.fr>
*/ */
class FedExConfigValue extends BaseColissimoConfigValue class ColissimoConfigValue extends BaseColissimoConfigValue
{ {
} }