Merge pull request #440 from OXID-eSales/PSPAYPAL_MailTwice_6.3

Dont send order mails twice for Google- and ApplePay

Author: mariolorenz

CHANGELOG.md

@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fix Cancellation of PayPal Express Checkout deletes items stored in Cart
 - Fix Processes Duplicate Refunds on Rapid Refund Button Clicks
 - [0007776](https://bugs.oxid-esales.com/view.php?id=7776): Fix GooglePay and ApplePay always use first shipping method
+- [0007765](https://bugs.oxid-esales.com/view.php?id=7765): Fix Dont send order mails twice for Google- and ApplePay
 
 ### NEW
 

metadata.php

@@ -61,7 +61,7 @@
         'en' => 'Use of the online payment service from PayPal. Documentation: <a href="https://docs.oxid-esales.com/modules/paypal-checkout/en/latest/" target="_blank">PayPal Checkout</a>'
     ],
     'thumbnail' => 'out/img/paypal.png',
-    'version' => '2.5.3-rc.4',
+    'version' => '2.5.3-rc.5',
     'author' => 'OXID eSales AG',
     'url' => 'https://www.oxid-esales.com',
     'email' => 'info@oxid-esales.com',

src/Model/Order.php

@@ -221,7 +221,9 @@ public function finalizeOrderAfterExternalPayment(string $payPalOrderId, bool $f
         //ensure order number
         $this->setOrderNumber();
 
-        $this->sendPayPalOrderByEmail($user, $basket);
+        if (!$isPaypalGooglePay && !$isPaypalApplePay) {
+            $this->sendPayPalOrderByEmail($user, $basket);
+        }
     }
 
     /** @inheritDoc */