Merge pull request #16 from ThomasDaSilva/fix_1.0.15

Remove Useless Field + Fix Url Send

Command/SendOrderCommand.php

@@ -6,6 +6,7 @@
 use GuaranteedOpinion\Api\GuaranteedOpinionClient;
 use GuaranteedOpinion\Service\OrderService;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Thelia\Command\ContainerAwareCommand;
 
@@ -22,15 +23,17 @@ public function configure(): void
     {
         $this
             ->setName('module:GuaranteedOpinion:SendOrder')
-            ->setDescription('Send orders to API Avis-Garantis');
+            ->setDescription('Send orders to API Avis-Garantis')
+            ->addOption('locale', 'l', InputOption::VALUE_OPTIONAL, 'locale', 'fr_FR')
+        ;
     }
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->initRequest();
 
         try {
-            $order = $this->orderService->prepareOrderRequest();
+            $order = $this->orderService->prepareOrderRequest($input->getOption('locale'));
 
             $response = $this->client->sendOrder($order);
 

Config/module.xml

@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.0.14</version>
+    <version>1.0.15</version>
     <authors>
         <author>
             <name>Chabreuil Antoine</name>

Controller/GuaranteedOpinionConfigController.php

@@ -27,7 +27,6 @@ public function saveConfiguration(ParserContext $parserContext) : RedirectRespon
             GuaranteedOpinion::setConfigValue(GuaranteedOpinion::SHOW_RATING_URL_CONFIG_KEY, $data["show_rating_url"]);
 
             GuaranteedOpinion::setConfigValue(GuaranteedOpinion::STATUS_TO_EXPORT_CONFIG_KEY, implode(',', $data["status_to_export"]));
-            GuaranteedOpinion::setConfigValue(GuaranteedOpinion::EMAIL_DELAY_CONFIG_KEY, $data["email_delay"]);
 
             GuaranteedOpinion::setConfigValue(GuaranteedOpinion::SITE_REVIEW_HOOK_DISPLAY_CONFIG_KEY, $data["site_review_hook_display"]);
             GuaranteedOpinion::setConfigValue(GuaranteedOpinion::SITE_REVIEW_DISPLAY_CONFIG_KEY, (bool)$data["site_review_display"]);

Form/ConfigurationForm.php

@@ -65,15 +65,6 @@ protected function buildForm(): void
                 ),
                 "data" => GuaranteedOpinion::getConfigValue(GuaranteedOpinion::API_ORDER_CONFIG_KEY)
             ))
-            ->add(
-                'email_delay',
-                TextType::class,
-                [
-                    "data" => GuaranteedOpinion::getConfigValue(GuaranteedOpinion::EMAIL_DELAY_CONFIG_KEY, 10),
-                    "label"=>$translator?->trans("Reviews email delay (in days):", array(), GuaranteedOpinion::DOMAIN_NAME),
-                    "required" => false
-                ]
-            )
             ->add(
                 'show_rating_url',
                 TextType::class,

GuaranteedOpinion.php

@@ -18,7 +18,6 @@ class GuaranteedOpinion extends BaseModule
     public const API_ORDER_CONFIG_KEY = "guaranteedopinion.api.order";
 
     public const STATUS_TO_EXPORT_CONFIG_KEY = "guaranteedopinion.status_to_export";
-    public const EMAIL_DELAY_CONFIG_KEY = "guaranteedopinion.email_delay";
 
     public const SHOW_RATING_URL_CONFIG_KEY = "guaranteedopinion.show_rating_url";
 

I18n/fr_FR.php

@@ -5,7 +5,6 @@
     'Api key review' => 'Clé API publique des avis',
     'Order status to export' => 'Statut des commandes à envoyer',
     'Product review hook display' => 'Lien du hook des avis des produits',
-    'Reviews email delay (in days):' => 'Delai de l\'envoi du mail (en jours)',
     'Show all opinions url' => 'Url des avis vérifiés du sites',
     'Show product review' => 'Montrer les avis des produits',
     'Show product review tab' => 'Montrer le tableau des avis des produits',

Model/GuaranteedOpinionOrderQueueQuery.php

@@ -30,11 +30,13 @@ public static function getCategoryByProductSaleElements(ProductSaleElements $pro
             ->findOne();
     }
 
-    public static function getProductUrl(int $id): RewritingUrl
+    public static function getProductUrl(int $id, string $locale = 'fr_FR'): RewritingUrl
     {
         return RewritingUrlQuery::create()
             ->filterByView('product')
             ->filterByViewId($id)
+            ->filterByViewLocale($locale)
+            ->filterByRedirected()
             ->findOne();
     }
 }

Service/OrderService.php

@@ -25,14 +25,14 @@ public function __construct(
     /**
      * @throws JsonException|RuntimeException|PropelException
      */
-    public function prepareOrderRequest(): string
+    public function prepareOrderRequest(string $locale): string
     {
         $jsonOrder = [];
 
         $guaranteedOpinionOrders = GuaranteedOpinionOrderQueueQuery::create()->filterByTreatedAt(null)->findByStatus(0);
 
         foreach ($guaranteedOpinionOrders as $guaranteedOpinionOrder) {
-            $jsonOrder[] = $this->orderToJsonObject($guaranteedOpinionOrder);
+            $jsonOrder[] = $this->orderToJsonObject($guaranteedOpinionOrder, $locale);
         }
 
         if (empty($jsonOrder)) {
@@ -45,14 +45,14 @@ public function prepareOrderRequest(): string
     /**
      * @throws PropelException
      */
-    private function orderToJsonObject(GuaranteedOpinionOrderQueue $guaranteedOpinionOrder): array
+    private function orderToJsonObject(GuaranteedOpinionOrderQueue $guaranteedOpinionOrder, string $locale): array
     {
         $order = OrderQuery::create()->findOneById($guaranteedOpinionOrder->getOrderId());
 
         $jsonProduct = [];
 
         foreach ($order?->getOrderProducts() as $orderProduct) {
-            $jsonProduct[] = $this->productToJsonObject($orderProduct);
+            $jsonProduct[] = $this->productToJsonObject($orderProduct, $locale);
         }
 
         return [
@@ -69,29 +69,29 @@ private function orderToJsonObject(GuaranteedOpinionOrderQueue $guaranteedOpinio
     /**
      * @throws PropelException
      */
-    private function productToJsonObject(OrderProduct $orderProduct): array
+    private function productToJsonObject(OrderProduct $orderProduct, string $locale): array
     {
         if (null === $pse = ProductSaleElementsQuery::create()->findOneById($orderProduct->getProductSaleElementsId())) {
             return [];
         }
 
         $category  = GuaranteedOpinionOrderQueueQuery::getCategoryByProductSaleElements($pse);
-        $productReviewEvent = new ProductReviewEvent($pse?->getProduct());
+        $productReviewEvent = new ProductReviewEvent($pse->getProduct());
         $this->eventDispatcher->dispatch($productReviewEvent, GuaranteedOpinionEvents::SEND_ORDER_PRODUCT_EVENT);
 
         return [
             'id' => $productReviewEvent->getGuaranteedOpinionProductId(),
-            'name' => $pse?->getProduct()->getRef(),
+            'name' => $pse->getProduct()->getRef(),
             'category_id' => $category->getId(),
             'category_name' => $category->getTitle(),
             'qty' => $orderProduct->getQuantity(),
             'unit_price' => $orderProduct->getPrice(),
             'mpn' => null,
-            'ean13' => $pse?->getEanCode(),
+            'ean13' => $pse->getEanCode(),
             'sku' => null,
             'upc' => null,
             'url' => URL::getInstance()->absoluteUrl('') .
-                GuaranteedOpinionOrderQueueQuery::getProductUrl($pse?->getProductId())->getUrl(),
+                GuaranteedOpinionOrderQueueQuery::getProductUrl($pse->getProductId(), $locale)->getUrl(),
         ];
     }
 

templates/backOffice/default/module_configuration.html

@@ -42,7 +42,6 @@ <h2 class="title title-without-tabs">{intl l="Guaranteed Opinion Order access" d
                                 </div>
 
                                 <div class="form-group">
-                                    {render_form_field form=$form field="email_delay"}
                                     {render_form_field form=$form field="status_to_export"}
                                 </div>
                             </div>