From 2f4c97b3ad95407f0483124e46d4cd9a4607f782 Mon Sep 17 00:00:00 2001 From: TheCoreDev Date: Fri, 13 Nov 2020 10:53:13 +0100 Subject: [PATCH] =?UTF-8?q?Boulette=20sur=20modif=20du=20module=20Colissim?= =?UTF-8?q?o=20(suite=20=C3=A0=20cr=C3=A9ation=20de=20module=20FedEx)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- local/modules/Colissimo/Colissimo.php | 18 +++++++++--------- .../Colissimo/Controller/Configuration.php | 10 +++++----- .../Colissimo/Controller/EditPrices.php | 8 ++++---- local/modules/Colissimo/Controller/Export.php | 8 ++++---- .../Colissimo/Controller/FreeShipping.php | 8 ++++---- .../EventListener/AreaDeletedListener.php | 8 ++++---- local/modules/Colissimo/Form/Configuration.php | 8 ++++---- local/modules/Colissimo/Form/Export.php | 10 +++++----- local/modules/Colissimo/Form/FreeShipping.php | 8 ++++---- local/modules/Colissimo/Listener/SendMail.php | 4 ++-- .../modules/Colissimo/Loop/CheckRightsLoop.php | 10 +++++----- local/modules/Colissimo/Loop/NotSendLoop.php | 4 ++-- local/modules/Colissimo/Loop/Price.php | 4 ++-- .../modules/Colissimo/Model/ColissimoQuery.php | 4 ++-- .../Model/Config/FedExConfigValue.php | 4 ++-- 15 files changed, 58 insertions(+), 58 deletions(-) diff --git a/local/modules/Colissimo/Colissimo.php b/local/modules/Colissimo/Colissimo.php index 5ba957a8..c1023908 100644 --- a/local/modules/Colissimo/Colissimo.php +++ b/local/modules/Colissimo/Colissimo.php @@ -13,7 +13,7 @@ namespace Colissimo; -use Colissimo\Model\Config\FedExConfigValue; +use Colissimo\Model\Config\ColissimoConfigValue; use Propel\Runtime\Connection\ConnectionInterface; use Thelia\Core\Translation\Translator; use Thelia\Install\Database; @@ -35,7 +35,7 @@ class Colissimo extends AbstractDeliveryModule public static function getPrices() { 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; @@ -43,7 +43,7 @@ class Colissimo extends AbstractDeliveryModule public function postActivation(ConnectionInterface $con = null) { - self::setConfigValue(FedExConfigValue::ENABLED, 1); + self::setConfigValue(ColissimoConfigValue::ENABLED, 1); $database = new Database($con); $database->insertSql(null, array(__DIR__ . '/Config/thelia.sql')); @@ -51,7 +51,7 @@ class Colissimo extends AbstractDeliveryModule public function isValidDelivery(Country $country) { - if (0 == self::getConfigValue(FedExConfigValue::ENABLED, 1)) { + if (0 == self::getConfigValue(ColissimoConfigValue::ENABLED, 1)) { return false; } @@ -90,7 +90,7 @@ class Colissimo extends AbstractDeliveryModule */ public static function getPostageAmount($areaId, $weight) { - $freeshipping = FedEx::getConfigValue(FedExConfigValue::FREE_SHIPPING); + $freeshipping = Colissimo::getConfigValue(ColissimoConfigValue::FREE_SHIPPING); $postage = 0; if (!$freeshipping) { $prices = self::getPrices(); @@ -164,14 +164,14 @@ class Colissimo extends AbstractDeliveryModule $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"]; - FedEx::setConfigValue(FedExConfigValue::FREE_SHIPPING, $result); + Colissimo::setConfigValue(ColissimoConfigValue::FREE_SHIPPING, $result); $database->execute("DROP TABLE `colissimo_freeshipping`"); } - if (is_readable($uploadDir) && FedEx::getConfigValue(FedExConfigValue::PRICES, null) == null) { - FedEx::setConfigValue(FedExConfigValue::PRICES, file_get_contents($uploadDir)); + if (is_readable($uploadDir) && Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null) == null) { + Colissimo::setConfigValue(ColissimoConfigValue::PRICES, file_get_contents($uploadDir)); } } } diff --git a/local/modules/Colissimo/Controller/Configuration.php b/local/modules/Colissimo/Controller/Configuration.php index 5929efc2..52f99df8 100644 --- a/local/modules/Colissimo/Controller/Configuration.php +++ b/local/modules/Colissimo/Controller/Configuration.php @@ -12,8 +12,8 @@ namespace Colissimo\Controller; -use Colissimo\FedEx; -use Colissimo\Model\Config\FedExConfigValue; +use Colissimo\Colissimo; +use Colissimo\Model\Config\ColissimoConfigValue; use Symfony\Component\HttpFoundation\RedirectResponse; use Thelia\Controller\Admin\BaseAdminController; use Thelia\Core\Security\AccessManager; @@ -32,7 +32,7 @@ class Configuration extends BaseAdminController { if (null !== $response = $this->checkAuth( AdminResources::MODULE, - [FedEx::DOMAIN_NAME], + [Colissimo::DOMAIN_NAME], AccessManager::UPDATE )) { return $response; @@ -45,8 +45,8 @@ class Configuration extends BaseAdminController $validateForm = $this->validateForm($form); $data = $validateForm->getData(); - FedEx::setConfigValue( - FedExConfigValue::ENABLED, + Colissimo::setConfigValue( + ColissimoConfigValue::ENABLED, is_bool($data["enabled"]) ? (int) ($data["enabled"]) : $data["enabled"] ); diff --git a/local/modules/Colissimo/Controller/EditPrices.php b/local/modules/Colissimo/Controller/EditPrices.php index 5ea40449..a4ed5083 100644 --- a/local/modules/Colissimo/Controller/EditPrices.php +++ b/local/modules/Colissimo/Controller/EditPrices.php @@ -12,8 +12,8 @@ namespace Colissimo\Controller; -use Colissimo\FedEx; -use Colissimo\Model\Config\FedExConfigValue; +use Colissimo\Colissimo; +use Colissimo\Model\Config\ColissimoConfigValue; use Symfony\Component\HttpFoundation\RedirectResponse; use Thelia\Model\AreaQuery; use Thelia\Controller\Admin\BaseAdminController; @@ -44,7 +44,7 @@ class EditPrices extends BaseAdminController ->findPK($area); if ($exists !== null) { - if (null !== $data = FedEx::getConfigValue(FedExConfigValue::PRICES, null)) { + if (null !== $data = Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null)) { $json_data = json_decode( $data, true @@ -62,7 +62,7 @@ class EditPrices extends BaseAdminController } ksort($json_data[$area]['slices']); - FedEx::setConfigValue(FedExConfigValue::PRICES, json_encode($json_data)); + Colissimo::setConfigValue(ColissimoConfigValue::PRICES, json_encode($json_data)); } else { throw new \Exception("Area not found"); diff --git a/local/modules/Colissimo/Controller/Export.php b/local/modules/Colissimo/Controller/Export.php index 00a67b8f..ca82a68e 100644 --- a/local/modules/Colissimo/Controller/Export.php +++ b/local/modules/Colissimo/Controller/Export.php @@ -12,8 +12,8 @@ namespace Colissimo\Controller; -use Colissimo\FedEx; -use Colissimo\Model\FedExQuery; +use Colissimo\Colissimo; +use Colissimo\Model\ColissimoQuery; use Thelia\Controller\Admin\BaseAdminController; use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; @@ -56,7 +56,7 @@ class Export extends BaseAdminController ->findOne(); // Get Colissimo orders - $orders = FedExQuery::getOrders()->find(); + $orders = ColissimoQuery::getOrders()->find(); $export = ""; $store_name = ConfigQuery::getStoreName(); @@ -149,7 +149,7 @@ class Export extends BaseAdminController } catch (FormValidationException $e) { $this->setupFormErrorContext( - Translator::getInstance()->trans("colissimo expeditor export", [], FedEx::DOMAIN_NAME), + Translator::getInstance()->trans("colissimo expeditor export", [], Colissimo::DOMAIN_NAME), $e->getMessage(), $form, $e diff --git a/local/modules/Colissimo/Controller/FreeShipping.php b/local/modules/Colissimo/Controller/FreeShipping.php index 5d71ba1e..10d46e6f 100644 --- a/local/modules/Colissimo/Controller/FreeShipping.php +++ b/local/modules/Colissimo/Controller/FreeShipping.php @@ -12,8 +12,8 @@ namespace Colissimo\Controller; -use Colissimo\FedEx; -use Colissimo\Model\Config\FedExConfigValue; +use Colissimo\Colissimo; +use Colissimo\Model\Config\ColissimoConfigValue; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\RedirectResponse; use Thelia\Controller\Admin\BaseAdminController; @@ -30,7 +30,7 @@ class FreeShipping extends BaseAdminController { 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) { return $response; } @@ -42,7 +42,7 @@ class FreeShipping extends BaseAdminController $validateForm = $this->validateForm($form); $data = $validateForm->getData(); - FedEx::setConfigValue(FedExConfigValue::FREE_SHIPPING, (int) ($data["freeshipping"])); + Colissimo::setConfigValue(ColissimoConfigValue::FREE_SHIPPING, (int) ($data["freeshipping"])); return $this->redirectToConfigurationPage(); } catch (\Exception $e) { diff --git a/local/modules/Colissimo/EventListener/AreaDeletedListener.php b/local/modules/Colissimo/EventListener/AreaDeletedListener.php index 915769fd..c1eb3e41 100644 --- a/local/modules/Colissimo/EventListener/AreaDeletedListener.php +++ b/local/modules/Colissimo/EventListener/AreaDeletedListener.php @@ -12,8 +12,8 @@ namespace Colissimo\EventListener; -use Colissimo\FedEx; -use Colissimo\Model\Config\FedExConfigValue; +use Colissimo\Colissimo; +use Colissimo\Model\Config\ColissimoConfigValue; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Core\Event\Area\AreaDeleteEvent; use Thelia\Core\Event\TheliaEvents; @@ -30,12 +30,12 @@ class AreaDeletedListener implements EventSubscriberInterface */ public function updateConfig(AreaDeleteEvent $event) { - if (null !== $data = FedEx::getConfigValue(FedExConfigValue::PRICES, null)) { + if (null !== $data = Colissimo::getConfigValue(ColissimoConfigValue::PRICES, null)) { $areaId = $event->getAreaId(); $json_data = json_decode($data, true); unset($json_data[$areaId]); - FedEx::setConfigValue(FedExConfigValue::PRICES, json_encode($json_data, true)); + Colissimo::setConfigValue(ColissimoConfigValue::PRICES, json_encode($json_data, true)); } } diff --git a/local/modules/Colissimo/Form/Configuration.php b/local/modules/Colissimo/Form/Configuration.php index 37ac3a57..bc9c58b3 100644 --- a/local/modules/Colissimo/Form/Configuration.php +++ b/local/modules/Colissimo/Form/Configuration.php @@ -12,8 +12,8 @@ namespace Colissimo\Form; -use Colissimo\FedEx; -use Colissimo\Model\Config\Base\FedExConfigValue; +use Colissimo\Colissimo; +use Colissimo\Model\Config\Base\ColissimoConfigValue; use Thelia\Core\Translation\Translator; use Thelia\Form\BaseForm; @@ -38,13 +38,13 @@ class Configuration extends BaseForm "help" => Translator::getInstance()->trans( 'Check if you want to activate Colissimo', [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ) ], "required" => false, "constraints" => array( ), - "value" => FedEx::getConfigValue(FedExConfigValue::ENABLED, 1), + "value" => Colissimo::getConfigValue(ColissimoConfigValue::ENABLED, 1), ) ); } diff --git a/local/modules/Colissimo/Form/Export.php b/local/modules/Colissimo/Form/Export.php index 7d759ac1..47c8fddf 100644 --- a/local/modules/Colissimo/Form/Export.php +++ b/local/modules/Colissimo/Form/Export.php @@ -12,8 +12,8 @@ namespace Colissimo\Form; -use Colissimo\FedEx; -use Colissimo\Model\FedExQuery; +use Colissimo\Colissimo; +use Colissimo\Model\ColissimoQuery; use Symfony\Component\Validator\Constraints\Callback; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Context\ExecutionContextInterface; @@ -50,7 +50,7 @@ class Export extends BaseForm */ protected function buildForm() { - $orders = FedExQuery::getOrders() + $orders = ColissimoQuery::getOrders() ->find(); $this->formBuilder @@ -67,7 +67,7 @@ class Export extends BaseForm 'label' => Translator::getInstance()->trans( 'Modify status export after export', [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ), 'label_attr' => [ 'for' => 'status_id' @@ -106,7 +106,7 @@ class Export extends BaseForm Translator::getInstance()->trans( 'select a valid status', [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ) ); } diff --git a/local/modules/Colissimo/Form/FreeShipping.php b/local/modules/Colissimo/Form/FreeShipping.php index 7268d356..baea56e0 100644 --- a/local/modules/Colissimo/Form/FreeShipping.php +++ b/local/modules/Colissimo/Form/FreeShipping.php @@ -12,8 +12,8 @@ namespace Colissimo\Form; -use Colissimo\FedEx; -use Colissimo\Model\Config\Base\FedExConfigValue; +use Colissimo\Colissimo; +use Colissimo\Model\Config\Base\ColissimoConfigValue; use Thelia\Core\Translation\Translator; use Thelia\Form\BaseForm; @@ -46,8 +46,8 @@ class FreeShipping extends BaseForm "freeshipping", "checkbox", array( - "label" => Translator::getInstance()->trans("Activate free shipping: ", [], FedEx::DOMAIN_NAME), - "value" => FedEx::getConfigValue(FedExConfigValue::FREE_SHIPPING, false), + "label" => Translator::getInstance()->trans("Activate free shipping: ", [], Colissimo::DOMAIN_NAME), + "value" => Colissimo::getConfigValue(ColissimoConfigValue::FREE_SHIPPING, false), ) ); } diff --git a/local/modules/Colissimo/Listener/SendMail.php b/local/modules/Colissimo/Listener/SendMail.php index 9634c915..d8491e71 100644 --- a/local/modules/Colissimo/Listener/SendMail.php +++ b/local/modules/Colissimo/Listener/SendMail.php @@ -12,7 +12,7 @@ namespace Colissimo\Listener; -use Colissimo\FedEx; +use Colissimo\Colissimo; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Thelia\Core\Event\Order\OrderEvent; use Thelia\Core\Event\TheliaEvents; @@ -46,7 +46,7 @@ class SendMail implements EventSubscriberInterface public function updateStatus(OrderEvent $event) { $order = $event->getOrder(); - $colissimo = new FedEx(); + $colissimo = new Colissimo(); if ($order->isSent() && $order->getDeliveryModuleId() == $colissimo->getModuleModel()->getId()) { $contact_email = ConfigQuery::getStoreEmail(); diff --git a/local/modules/Colissimo/Loop/CheckRightsLoop.php b/local/modules/Colissimo/Loop/CheckRightsLoop.php index 2f24f788..d655f1ad 100644 --- a/local/modules/Colissimo/Loop/CheckRightsLoop.php +++ b/local/modules/Colissimo/Loop/CheckRightsLoop.php @@ -11,7 +11,7 @@ /*************************************************************************************/ namespace Colissimo\Loop; -use Colissimo\FedEx; +use Colissimo\Colissimo; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\LoopResultRow; @@ -41,7 +41,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface "ERRMES"=>Translator::getInstance()->trans( "Can't read Config directory", [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ), "ERRFILE"=>"" ); @@ -51,7 +51,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface "ERRMES"=>Translator::getInstance()->trans( "Can't write Config directory", [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ), "ERRFILE"=>"" ); @@ -66,7 +66,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface "ERRMES"=>Translator::getInstance()->trans( "Can't read file", [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ), "ERRFILE"=>"Colissimo/Config/".$file ); @@ -76,7 +76,7 @@ class CheckRightsLoop extends BaseLoop implements ArraySearchLoopInterface "ERRMES"=>Translator::getInstance()->trans( "Can't write file", [], - FedEx::DOMAIN_NAME + Colissimo::DOMAIN_NAME ), "ERRFILE"=>"Colissimo/Config/".$file ); diff --git a/local/modules/Colissimo/Loop/NotSendLoop.php b/local/modules/Colissimo/Loop/NotSendLoop.php index 1cd54018..b504924e 100644 --- a/local/modules/Colissimo/Loop/NotSendLoop.php +++ b/local/modules/Colissimo/Loop/NotSendLoop.php @@ -12,7 +12,7 @@ namespace Colissimo\Loop; -use Colissimo\Model\FedExQuery; +use Colissimo\Model\ColissimoQuery; use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; @@ -69,6 +69,6 @@ class NotSendLoop extends Order */ public function buildModelCriteria() { - return FedExQuery::getOrders(); + return ColissimoQuery::getOrders(); } } diff --git a/local/modules/Colissimo/Loop/Price.php b/local/modules/Colissimo/Loop/Price.php index 9282957d..014f5eef 100644 --- a/local/modules/Colissimo/Loop/Price.php +++ b/local/modules/Colissimo/Loop/Price.php @@ -12,7 +12,7 @@ namespace Colissimo\Loop; -use Colissimo\FedEx; +use Colissimo\Colissimo; use Thelia\Core\Template\Element\ArraySearchLoopInterface; use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\LoopResult; @@ -47,7 +47,7 @@ class Price extends BaseLoop implements ArraySearchLoopInterface public function buildArray() { $area = $this->getArea(); - $prices = FedEx::getPrices(); + $prices = Colissimo::getPrices(); if (!isset($prices[$area]) || !isset($prices[$area]["slices"])) { return array(); diff --git a/local/modules/Colissimo/Model/ColissimoQuery.php b/local/modules/Colissimo/Model/ColissimoQuery.php index 05fb2186..2fb634c7 100644 --- a/local/modules/Colissimo/Model/ColissimoQuery.php +++ b/local/modules/Colissimo/Model/ColissimoQuery.php @@ -23,7 +23,7 @@ namespace Colissimo\Model; -use Colissimo\FedEx; +use Colissimo\Colissimo; use Propel\Runtime\ActiveQuery\Criteria; use Thelia\Model\OrderQuery; use Thelia\Model\OrderStatus; @@ -53,7 +53,7 @@ class ColissimoQuery ->toArray("code"); $query = OrderQuery::create() - ->filterByDeliveryModuleId((new FedEx())->getModuleModel()->getId()) + ->filterByDeliveryModuleId((new Colissimo())->getModuleModel()->getId()) ->filterByStatusId( array( $status[OrderStatus::CODE_PAID]['Id'], diff --git a/local/modules/Colissimo/Model/Config/FedExConfigValue.php b/local/modules/Colissimo/Model/Config/FedExConfigValue.php index 35330e12..d0cb0be1 100644 --- a/local/modules/Colissimo/Model/Config/FedExConfigValue.php +++ b/local/modules/Colissimo/Model/Config/FedExConfigValue.php @@ -12,13 +12,13 @@ namespace Colissimo\Model\Config; -use Colissimo\Model\Config\Base\FedExConfigValue as BaseColissimoConfigValue; +use Colissimo\Model\Config\Base\ColissimoConfigValue as BaseColissimoConfigValue; /** * Class Colissimo * @package Colissimo\Model\Config * @author Thomas Arnaud */ -class FedExConfigValue extends BaseColissimoConfigValue +class ColissimoConfigValue extends BaseColissimoConfigValue { }