Allow to import old orders by console command

macopedia · Jun 19, 2020 · b50ce32 · b50ce32
1 parent 025a736
commit b50ce32
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/Model/AbstractOrderImporter.php b/Model/AbstractOrderImporter.php
@@ -54,7 +54,8 @@ protected function tryToProcessOrder($checkoutFormId)
     {
         try {
             $checkoutForm = $this->checkoutFormRepository->get($checkoutFormId);
-            if ($this->processor->processOrder($checkoutForm)) {
+            if ($this->processor->validateCheckoutFormBoughtAtDate($checkoutForm)) {
+                $this->processor->processOrder($checkoutForm);
                 $this->successIds[] = $checkoutFormId;
             } else {
                 $this->skippedIds[] = $checkoutFormId;

diff --git a/Model/OrderImporter/Processor.php b/Model/OrderImporter/Processor.php
@@ -87,15 +87,10 @@ public function __construct(
 
     /**
      * @param CheckoutFormInterface $checkoutForm
-     * @return bool
      * @throws \Exception
      */
-    public function processOrder(CheckoutFormInterface $checkoutForm): bool
+    public function processOrder(CheckoutFormInterface $checkoutForm): void
     {
-        if (!$this->validateCheckoutFormBoughtAtDate($checkoutForm)) {
-            return false;
-        }
-
         $connection = $this->resource->getConnection();
         try {
             $connection->beginTransaction();
@@ -113,8 +108,6 @@ public function processOrder(CheckoutFormInterface $checkoutForm): bool
             }
 
             $connection->commit();
-            return true;
-
         } catch (\Exception $e) {
             $connection->rollBack();
             $this->addOrderWithErrorToTable($checkoutForm, $e);
@@ -218,7 +211,7 @@ private function removeErrorLogIfExist(CheckoutFormInterface $checkoutForm): voi
      * @param CheckoutFormInterface $checkoutForm
      * @return bool
      */
-    private function validateCheckoutFormBoughtAtDate(CheckoutFormInterface $checkoutForm): bool
+    public function validateCheckoutFormBoughtAtDate(CheckoutFormInterface $checkoutForm): bool
     {
         foreach ($checkoutForm->getLineItems() as $lineItem) {
             if ($lineItem->getBoughtAt() < $this->configuration->getInitializationTime()) {

diff --git a/Model/OrderImporter/Shipping.php b/Model/OrderImporter/Shipping.php
@@ -52,7 +52,7 @@ public function getShippingMethodCode(CheckoutFormInterface $checkoutForm)
         $methodName = $checkoutForm->getDelivery()->getMethod()->getId();
 
         if ($methodName == '') {
-            return $this->getDefaultShippingMethodCode();
+            return $this->getDefaultMethodCode();
         }
 
         if (!isset($this->shippingCodes[$methodName])) {
@@ -62,14 +62,6 @@ public function getShippingMethodCode(CheckoutFormInterface $checkoutForm)
         return $this->shippingCodes[$methodName];
     }
 
-    /**
-     * @return string
-     */
-    public function getDefaultShippingMethodCode()
-    {
-        return self::DEFAULT_SHIPPING_METHOD;
-    }
-
     /**
      * @param string $methodId
      * @return string