Merge pull request #9 from enupal/develop

Develop
enupal · Jan 29, 2021 · 4e5511d · 4e5511d
2 parents e1c328a + ae74d74
commit 4e5511d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Enupal PayPal Changelog
 
+## 1.3.1 - 2021.01.29
+### Fixed
+- Fixed issue where duplicate orders during IPN
+
 ## 1.3.0 - 2020.11.12
 ### Added
 - Added support to PHP 7.4

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "enupal/paypal",
   "description": "Sell products or services on your website using a PayPal Buy Now Button",
   "type": "craft-plugin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/controllers/PaypalController.php b/src/controllers/PaypalController.php
@@ -43,6 +43,12 @@ public function actionIpn()
             if ($ipn->verifyIPN()) {
 	            Craft::info("IPN validated", __METHOD__);
                 $order = Paypal::$app->orders->populateOrder();
+
+                if ($order->id) {
+                    Craft::info('IPN already processed with order id: '.$order->id, __METHOD__);
+                    return $this->asJson(['success' => 'true']);
+                }
+
                 $button = Paypal::$app->buttons->getButtonBySku($this->getValue('item_number'));
 
                 if ($button){

diff --git a/src/services/Orders.php b/src/services/Orders.php
@@ -343,11 +343,16 @@ public function getEmailsPath()
     }
 
     /**
-     * @return Order
+     * @return Order|\craft\base\ElementInterface
      * @throws \Exception
      */
     public function populateOrder()
     {
+        $order = $this->getOrderByPaypalTransactionId($this->getPostValue('txn_id'));
+        if (!is_null($order)) {
+            return $order;
+        }
+
         $order = new Order();
         $order->orderStatusId = OrderStatus::NEW;