Merge pull request #362 from FatchipRobert/MAG2-180-MultipleAppointed…

…LeadsToMultipleInvoices MAG2-180 - Fixes problem with multiple invoices being generated when …
PAYONE-GmbH · Nov 25, 2020 · bf6e450 · bf6e450
2 parents 150389d + 7450b72
commit bf6e450
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Observer/Transactionstatus/Appointed.php b/Observer/Transactionstatus/Appointed.php
@@ -127,7 +127,7 @@ public function execute(Observer $observer)
         }
 
         // preauthorization-orders and advance payment should not create an invoice
-        if ($oOrder->getPayoneAuthmode() !== 'authorization' || $oOrder->getPayment()->getMethodInstance()->getCode() === PayoneConfig::METHOD_ADVANCE_PAYMENT){
+        if ($oOrder->getPayoneAuthmode() !== 'authorization' || $oOrder->getPayment()->getMethodInstance()->getCode() === PayoneConfig::METHOD_ADVANCE_PAYMENT || !$oOrder->canInvoice()){
             return;
         }
 

diff --git a/Test/Unit/Observer/Transactionstatus/AppointedTest.php b/Test/Unit/Observer/Transactionstatus/AppointedTest.php
@@ -89,10 +89,11 @@ public function testExecute()
 
         $order = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getPayment', 'getEmailSent', 'getPayoneAuthmode', 'save'])
+            ->setMethods(['getPayment', 'getEmailSent', 'getPayoneAuthmode', 'save', 'canInvoice'])
             ->getMock();
         $order->method('getPayment')->willReturn($payment);
         $order->method('getPayoneAuthmode')->willReturn('authorization');
+        $order->method('canInvoice')->willReturn(true);
 
         $observer = $this->getMockBuilder(Observer::class)->disableOriginalConstructor()->setMethods(['getOrder'])->getMock();
         $observer->method('getOrder')->willReturn($order);
@@ -115,10 +116,11 @@ public function testExecuteException()
 
         $order = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getPayment', 'getEmailSent', 'getPayoneAuthmode', 'save'])
+            ->setMethods(['getPayment', 'getEmailSent', 'getPayoneAuthmode', 'save', 'canInvoice'])
             ->getMock();
         $order->method('getPayment')->willReturn($payment);
         $order->method('getPayoneAuthmode')->willReturn('authorization');
+        $order->method('canInvoice')->willReturn(true);
 
         $observer = $this->getMockBuilder(Observer::class)->disableOriginalConstructor()->setMethods(['getOrder'])->getMock();
         $observer->method('getOrder')->willReturn($order);