Session quote fixes

helbertqueiroz · Aug 6, 2018 · 2b78e0f · 2b78e0f
1 parent 5da752a
commit 2b78e0f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 69 deletions.
diff --git a/Cron/Queue/Sales/Order/Queue.php b/Cron/Queue/Sales/Order/Queue.php
@@ -51,7 +51,7 @@ public function executeIntegration(Schedule $schedule, StoreInterface $store)
             $skyhubCode = $this->arrayExtract($orderData, 'code');
 
 
-                /** @var \Magento\Sales\Api\Data\OrderInterface $order */
+            /** @var \Magento\Sales\Api\Data\OrderInterface $order */
             $order = $orderProcessor->createOrder($orderData);
             if (!$order || !$order->getEntityId()) {
                 $message = $schedule->getMessages();

diff --git a/Integration/Processor/Sales/Order.php b/Integration/Processor/Sales/Order.php
@@ -161,6 +161,7 @@ public function createOrder(array $data)
      */
     protected function processOrderCreation(array $data)
     {
+        $order   = null;
         $code    = $this->arrayExtract($data, 'code');
         $channel = $this->arrayExtract($data, 'channel');
         $orderId = $this->getOrderId($code);

diff --git a/Integration/Support/Sales/Order/Create.php b/Integration/Support/Sales/Order/Create.php
@@ -264,8 +264,8 @@ public function setCustomer(CustomerInterface $customer)
         $data = [
             'order' => [
                 'account' => [
-                    'group_id' => $customer->getGroupId(),
-                    'email'    => $customer->getEmail()
+                    'group_id'      => $customer->getGroupId(),
+                    'email'         => $customer->getEmail(),
                 ]
             ],
             'session' => [
@@ -422,27 +422,30 @@ public function create()
         $order     = null;
 
         if (!empty($orderData)) {
+
+            $this->getSession()->clear();
             $this->initSession($this->arrayExtract($orderData, 'session'));
 
-            $this->processQuote($orderData);
-            $paymentData = $this->arrayExtract($orderData, 'payment');
+            try {
 
-            if (!empty($paymentData)) {
-                $this->getOrderCreator()
-                    ->setPaymentData($paymentData);
+                $this->processQuote($orderData);
+                $paymentData = $this->arrayExtract($orderData, 'payment');
 
-                $this->getQuote()
-                    ->getPayment()
-                    ->addData($paymentData);
-            }
+                if (!empty($paymentData)) {
+                    $this->getOrderCreator()
+                        ->setPaymentData($paymentData);
 
-            $this->context->eventManager()->dispatch('bittools_skyhub_order_import_before', [
-                'order'      => $order,
-                'order_data' => $orderData,
-                'creator'    => $this,
-            ]);
+                    $this->getQuote()
+                        ->getPayment()
+                        ->addData($paymentData);
+                }
+
+                $this->context->eventManager()->dispatch('bittools_skyhub_order_import_before', [
+                    'order'      => $order,
+                    'order_data' => $orderData,
+                    'creator'    => $this,
+                ]);
 
-            try {
                 /** @var Order $order */
                 $order = $this->getOrderCreator()
                     ->importPostData($this->arrayExtract($orderData, 'order'))
@@ -452,7 +455,7 @@ public function create()
             } catch (\Exception $e) {
                 /** remove quote */
                 $this->quoteRepository->delete($this->getQuote());
-                $this->getSession()->clear();
+//                $this->getSession()->clear();
                 /** end */
 
                 $this->context->helperContext()->logger()->critical($e);

diff --git a/Model/Backend/Session/Quote.php b/Model/Backend/Session/Quote.php
@@ -7,62 +7,16 @@
 
 class Quote extends \Magento\Backend\Model\Session\Quote
 {
-    public function __construct(
-        \Magento\Framework\App\Request\Http $request,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
-        \Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
-        \Magento\Framework\Session\SaveHandlerInterface $saveHandler,
-        \Magento\Framework\Session\ValidatorInterface $validator,
-        \Magento\Framework\Session\StorageInterface $storage,
-        \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
-        \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
-        \Magento\Framework\App\State $appState,
-        CustomerRepositoryInterface $customerRepository,
-        \Magento\Quote\Api\CartRepositoryInterface $quoteRepository,
-        \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        GroupManagementInterface $groupManagement,
-        \Magento\Quote\Model\QuoteFactory $quoteFactory
-    ) {
-        $this->customerRepository = $customerRepository;
-        $this->quoteRepository = $quoteRepository;
-        $this->_orderFactory = $orderFactory;
-        $this->_storeManager = $storeManager;
-        $this->groupManagement = $groupManagement;
-        $this->quoteFactory = $quoteFactory;
-        parent::__construct(
-            $request,
-            $sidResolver,
-            $sessionConfig,
-            $saveHandler,
-            $validator,
-            $storage,
-            $cookieManager,
-            $cookieMetadataFactory,
-            $appState,
-            $customerRepository,
-            $quoteRepository,
-            $orderFactory,
-            $storeManager,
-            $groupManagement,
-            $quoteFactory
-        );
-
-        $this->clear();
-    }
-
     /**
      * @return $this
      */
     public function clear()
     {
-        if ($this->getQuote()->getSkyhubCode()) {
-            $this->_quote = null;
-            $this->_order = null;
-            $this->_store = null;
+        $this->_quote = null;
+        $this->_order = null;
+        $this->_store = null;
 
-            $this->clearStorage();
-        }
+        $this->clearStorage();
 
         return $this;
     }