Merge pull request #6 from innoppl-developers/master

Bitpay OrderId fix

Author: Pieter Poorthuis

Diff for: app/code/Bitpay/Core/Model/Ipn.php

@@ -51,35 +51,41 @@ public function _construct()
      *
      * @return boolean
      */
-    function GetStatusReceived($quoteId, $statuses)
-    {
+    function GetStatusReceived($quoteId, $statuses) {
         $objectmanager = \Magento\Framework\App\ObjectManager::getInstance();
-        if (!$quoteId)
-        {
+        if (!$quoteId) {
             return false;
         }
-        $quote_model = $objectmanager->get('\Magento\Quote\Model\Quote');
-        $quote = $quote_model->load($quoteId, 'entity_id');
-        if (!$quote)
-        {
-            $objectmanager->get('\Bitpay\Core\Helper\Data')->debugData('[ERROR] quote not found.');
+
+        $order = $objectmanager -> get('\Magento\Sales\Model\Order') -> load($quoteId, 'quote_id');
+        if (!$order) {
+            $objectmanager -> get('\Bitpay\Core\Helper\Data') -> debugData('[DEBUG] Bitpay_Core_Model_Ipn::GetStatusReceived(), order not found for quoteId');
             return false;
         }
 
-        $collection = $this->_ipnCollectionFactory->load();//$objectmanager->create('\Bitpay\Core\Model\Ipn')->getCollection();
+        $orderIncrementId = $order -> getIncrementId();
 
-        foreach ($collection as $i)
-        {
-            $postData = json_decode($i->getData('pos_data'), true);
-            if (isset($postData['quoteId']) && $quoteId == $postData['quoteId']) {
-                if (in_array($i->getData('status'), $statuses)) {
+        if (false === isset($orderIncrementId) || true === empty($orderIncrementId)) {
+            $objectmanager -> get('\Bitpay\Core\Helper\Data') -> debugData('[DEBUG] Bitpay_Core_Model_Ipn::GetStatusReceived(), orderId not found for quoteId' . $orderIncrementId);
+            return false;
+        }
+        $collection = $objectmanager->create('\Bitpay\Core\Model\Ipn')->getCollection();//$this -> _ipnCollectionFactory -> load();
+        
+        foreach ($collection as $i) {
+            $pos=json_decode($i -> getPosData(), true);
+            if(!isset($pos['orderId'])){
+            continue;
+            }
+            if ($orderIncrementId == $pos['orderId']) {
+                if (in_array($i -> getData('status'), $statuses)) {
                     return true;
                 }
             }
         }
-        return false;       
+        return false;
     }
 
+
     /**
      * @param string $quoteId
      *

Diff for: app/code/Bitpay/Core/Model/Method/Bitcoin.php

@@ -445,15 +445,10 @@ private function prepareInvoice($invoice, $payment, $amount)
         $quote = $objectmanager->create('\Magento\Quote\Model\Quote')->load($quote_session->getId());
         $order = $payment->getOrder();
 
-        if ($this->_scopeConfig->getValue('payment/bitpay/fullscreen')) {
-            $invoice->setOrderId($order->getIncrementId());
-            $invoice->setPosData(json_encode(array('orderId' => $order->getIncrementId())));
-        } else {
-            $invoice->setOrderId($quote->getId());
-            $invoice->setPosData(json_encode(array('quoteId' => $quote->getId())));
-            // $convertQuote = $this->quoteManagement;//$objectmanager->create('\Magento\Quote\Model\QuoteManagement');
-            // $order = $convertQuote->submit($quote);
-        }
+        //Passing Order Ids
+        $invoice->setOrderId($order->getIncrementId());
+        $invoice->setPosData(json_encode(array('orderId' => $order->getIncrementId())));
+        
         $invoice = $this->addCurrencyInfo($invoice, $order);
         $invoice = $this->addPriceInfo($invoice, $order->getGrandTotal());
         $invoice = $this->addBuyerInfo($invoice, $order);