(MAGE2-316)[refactor]

- Use trait for state handling of shipments.
- update changelog.

CHANGELOG.md

@@ -7,8 +7,8 @@ This project does not follow a versioning standard. Versions are crafted after t
 ### Fixed
 - An issue during checkout if phone number is optional and not set by customer. That leads to a failing address comparison 
 for secured payment methods and PayPal.
-
 - An issue creating orders from Reservations.
+- Invoice Payment methods : An issue not always setting the expected state after shipment.
 
 ## 20.2.24
 ### Added

Controller/Adminhtml/Order/Shipment/Save.php

@@ -142,9 +142,11 @@ public function beforeExecute()
                     );
 
                     $this->_redirect('*/*/new', ['order_id' => $this->getRequest()->getParam('order_id')]);
+                } else {
+                    $order->addStatusHistoryComment('heidelpay - Finalizing Order');
+                    $this->messageManager->addSuccessMessage(__('Shipping Notification has been sent to Heidelpay.'));
                 }
 
-                $this->messageManager->addSuccessMessage(__('Shipping Notification has been sent to Heidelpay.'));
             }
             $method->setShippedOrderState($order);
             $this->orderResository->save($order);

PaymentMethods/HeidelpayInvoicePaymentMethod.php

@@ -15,6 +15,7 @@
 
 use Exception;
 use Heidelpay\Gateway\Block\Info\Invoice as InvoiceBlock;
+use Heidelpay\Gateway\Traits\CanShipBeforePayment;
 use Heidelpay\PhpPaymentApi\Exceptions\UndefinedTransactionModeException;
 use Heidelpay\PhpPaymentApi\PaymentMethods\InvoicePaymentMethod;
 use Magento\Sales\Model\Order;
@@ -27,6 +28,8 @@
  */
 class HeidelpayInvoicePaymentMethod extends HeidelpayAbstractPaymentMethod
 {
+    use CanShipBeforePayment;
+
     /** @var string Payment Code */
     const CODE = 'hgwiv';
 
@@ -108,15 +111,4 @@ public function pendingTransactionProcessing($data, &$order, $message = null)
             $this->_paymentHelper->saveTransaction($invoice);
         }
     }
-
-    /**
-     * @param Order $order
-     */
-    public function setShippedOrderState(&$order)
-    {
-        if ($order->getTotalPaid() < $order->getGrandTotal()) {
-            $state = Order::STATE_PENDING_PAYMENT;
-            $order->setState($state)->addStatusHistoryComment('heidelpay - Order shipped, awaiting payment', true);
-        }
-    }
 }

PaymentMethods/HeidelpayInvoiceSecuredPaymentMethod.php

@@ -15,6 +15,7 @@
 
 use Heidelpay\Gateway\Block\Info\InvoiceSecured as InvoiceSecuredBlock;
 use Heidelpay\Gateway\Model\PaymentInformation;
+use Heidelpay\Gateway\Traits\CanShipBeforePayment;
 use Heidelpay\PhpPaymentApi\Exceptions\UndefinedTransactionModeException;
 use Heidelpay\PhpPaymentApi\PaymentMethods\InvoiceB2CSecuredPaymentMethod;
 use Magento\Quote\Api\Data\CartInterface;
@@ -28,6 +29,7 @@
  */
 class HeidelpayInvoiceSecuredPaymentMethod extends HeidelpayAbstractPaymentMethod
 {
+    use CanShipBeforePayment;
     /** @var string Payment Code */
     const CODE = 'hgwivs';
 
@@ -143,15 +145,4 @@ public function pendingTransactionProcessing($data, &$order, $message = null)
             $this->_paymentHelper->saveTransaction($invoice);
         }
     }
-
-    /**
-     * @param Order $order
-     */
-    public function setShippedOrderState(&$order)
-    {
-        if ($order->getTotalPaid() < $order->getGrandTotal()) {
-            $state = Order::STATE_PENDING_PAYMENT;
-            $order->setState($state)->addStatusHistoryComment('heidelpay - Finalizing Order', true);
-        }
-    }
 }

PaymentMethods/Traits/CanShipBeforePayment.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace Heidelpay\Gateway\Traits;
+
+
+use Magento\Sales\Model\Order;
+
+trait CanShipBeforePayment
+{
+    /**
+     * @param Order $order
+     */
+    public function setShippedOrderState(&$order)
+    {
+        if ($order->getTotalPaid() < $order->getGrandTotal()) {
+            $state = Order::STATE_PENDING_PAYMENT;
+            $status = $order->getConfig()->getStateDefaultStatus($state);
+            $order->setState($state)->setStatus($status);
+        }
+    }
+}