Merge pull request #9 from zawaze/master

Add gtin on review export

Author: zawaze

Command/SendOrderCommand.php

@@ -8,6 +8,7 @@
 use NetReviews\Model\NetreviewsOrderQueueQuery;
 use NetReviews\Service\OrderService;
 use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\Propel;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Thelia\Command\ContainerAwareCommand;
@@ -31,17 +32,24 @@ public function execute(InputInterface $input, OutputInterface $output)
             /** @var OrderService $netreviewsOrderService */
             $netreviewsOrderService = $this->getContainer()->get('netreviews.order.service');
 
-            $ordersInQueue = NetreviewsOrderQueueQuery::create()
-                ->filterByTreatedAt(null, Criteria::ISNULL)
-                ->find();
+            $con = Propel::getConnection();
 
-            $orderCount = $ordersInQueue->count();
+            $ordersInQueue = "
+                                SELECT n.order_id 'order_id' 
+                                FROM netreviews_order_queue n 
+                                JOIN `order` o on n.order_id = o.id 
+                                WHERE o.status_id =4 AND n.treated_at IS NULL";
+
+            $stmt = $con->prepare($ordersInQueue);
+            $stmt->execute();
+            $results = $stmt->fetchAll();
+
+            $orderCount = count($results);
             $output->writeln(sprintf("<info>$orderCount orders found</info>"));
 
-            /** @var NetreviewsOrderQueue $order */
-            foreach ($ordersInQueue as $order) {
+            foreach ($results as $order) {
                 try {
-                    $orderId = $order->getOrderId();
+                    $orderId = $order['order_id'];
                     $response = $netreviewsOrderService->sendOrderToNetReviews($orderId);
                     $return = $response->return;
 
@@ -50,7 +58,7 @@ public function execute(InputInterface $input, OutputInterface $output)
                         throw new \Exception($debug);
                     }
                 } catch (\Exception $e) {
-                    $output->writeln(sprintf("<error>Error on order id ".$order->getOrderId().":".$e->getMessage()."</error>"));
+                    $output->writeln(sprintf("<error>Error on order id ".$order['order_id'].":".$e->getMessage()."</error>"));
                 }
             }
         } catch (\Exception $e) {

Object/NetReviewsProduct.php

@@ -16,6 +16,9 @@ class NetReviewsProduct
     /** @var  string */
     protected $imageUrl;
 
+    /** @var  string */
+    protected $gtinEan;
+
     /**
      * @return int
      */
@@ -88,5 +91,21 @@ public function setImageUrl($imageUrl)
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getGtinEan()
+    {
+        return $this->gtinEan;
+    }
 
+    /**
+     * @param string $gtinEan
+     * @return NetReviewsProduct
+     */
+    public function setGtinEan(string $gtinEan)
+    {
+        $this->gtinEan = $gtinEan;
+        return $this;
+    }
 }

Service/OrderService.php

@@ -52,7 +52,8 @@ public function sendOrderToNetReviews($orderId)
                 'id_product' => $product->getId(),
                 'name_product' => $product->getName(),
                 'url_product' => $product->getUrl(),
-                'url_product_image' => $product->getImageUrl()
+                'url_product_image' => $product->getImageUrl(),
+                'GTIN_EAN' => $product->getGtinEan()
             ];
         }
 
@@ -109,7 +110,7 @@ public function getNetreviewsOrder($orderId)
         $statusToExport = NetReviews::getConfigValue('status_to_export', '3,4');
         $delay = NetReviews::getConfigValue('email_delay', '3');
 
-        $orderProductSql = "SELECT o.ref, o.created_at, cu.firstname, cu.lastname, cu.email, op.product_ref, op.title, ru.url, pi.file
+        $orderProductSql = "SELECT o.ref, o.created_at, cu.firstname, cu.lastname, cu.email, op.product_ref, op.title, op.ean_code, ru.url, pi.file
                             FROM order_product op 
                             LEFT JOIN `order` o ON (op.order_id = o.id)
                             LEFT JOIN `customer` cu ON (o.customer_id = cu.id)
@@ -142,7 +143,8 @@ public function getNetreviewsOrder($orderId)
 
         foreach ($results as $orderProduct) {
             $product = new NetReviewsProduct();
-            $product->setId($orderProduct['product_ref'])
+            $product
+                ->setId($orderProduct['product_ref'])
                 ->setName($orderProduct['title']);
 
             if ($orderProduct['file'] !== null) {
@@ -156,6 +158,10 @@ public function getNetreviewsOrder($orderId)
                 $product->setUrl($baseUrl . "/" . $orderProduct['url']);
             }
 
+            if($orderProduct['ean_code']){
+                $product->setGtinEan($orderProduct['ean_code']);
+            }
+
             $products[] = $product;
         }