Fixes #24 add check if order confirmation is already send

239011d3 · rikterbeek · eee13672 · 239011d3
Commit 239011d3 authored Mar 30, 2016 by rikterbeek
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

Model/Cron.php Model/Cron.php +8 -6

No files found.
--- a/Model/Cron.php
+++ b/Model/Cron.php
@@ -545,12 +545,12 @@ class Cron
                    // Check if payment is banktransfer or sepa if true then send out order confirmation email
                    $isBankTransfer = $this->_isBankTransfer();
                    if($isBankTransfer || $this->_paymentMethod == 'sepadirectdebit') {
-//                        $this->_order->sendNewOrderEmail(); // send order email
+                        if(!$this->_order->getEmailSent()) {
                            $this->_orderSender->send($this->_order);
-
                            $this->_debugData['_processNotification send email'] = 'Send orderconfirmation email to shopper';
                        }
                    }
+                }
                break;
            case Notification::HANDLED_EXTERNALLY:
            case Notification::AUTHORISATION:
@@ -811,8 +811,10 @@ class Cron
        // for boleto confirmation mail is send on order creation
        if($this->_paymentMethod != "adyen_boleto") {
            // send order confirmation mail after invoice creation so merchant can add invoicePDF to this mail
-//            $this->_order->sendNewOrderEmail(); // send order email
+            if(!$this->_order->getEmailSent()) {
                $this->_orderSender->send($this->_order);
+                $this->_debugData['_authorizePayment send email'] = 'Send orderconfirmation email to shopper';
+            }
        }

        if(($this->_paymentMethod == "c_cash" && $this->_getConfigData('create_shipment', 'adyen_cash', $this->_order->getStoreId())) || ($this->_getConfigData('create_shipment', 'adyen_pos', $this->_order->getStoreId()) && $_paymentCode == "adyen_pos"))