UPA : Resolved Issued and Improvements

Block/Checkout/Onepage/Success/AdditionalInformation.php

@@ -52,6 +52,15 @@ public function getPaymentType()
     {
         return $this->paymentType;
     }
+
+    /**
+     * @return bool
+     */
+    protected function isUpaPayment()
+    {
+        return !empty($this->getPaymentAdditionalInformation('session_id'));
+    }
+
     /**
      * returns payment additional information depending on $key.
      * @param string $key

Block/Checkout/Onepage/Success/ConveniencestoreAdditionalInformation.php

@@ -28,12 +28,16 @@
      *
      * @return string
      */
     protected function _toHtml()
     {
         $order = $this->_checkoutSession->getLastRealOrder();
         $paymentData = $order->getPayment()->getData();
         $paymentAdditionalInfo = $paymentData['additional_information'];
 
+        if (array_key_exists('session_id', $paymentAdditionalInfo) && !empty($paymentAdditionalInfo['session_id'])) {
+            return;
+        }
+
         if (!array_key_exists('payment_type', $paymentAdditionalInfo)) {
             return;
         }

Block/Checkout/Onepage/Success/PaynowAdditionalInformation.php

@@ -9,6 +9,9 @@ class PaynowAdditionalInformation extends AdditionalInformation
      */
     protected function _toHtml()
     {
+        if ($this->isUpaPayment()) {
+            return;
+        }
         if ($this->getPaymentType() !== 'paynow') {
             return;
         }

Block/Checkout/Onepage/Success/PromptpayAdditionalInformation.php

@@ -9,6 +9,9 @@ class PromptpayAdditionalInformation extends AdditionalInformation
      */
     protected function _toHtml()
     {
+        if ($this->isUpaPayment()) {
+            return;
+        }
         if ($this->getPaymentType() !== 'promptpay') {
             return;
         }

Block/Checkout/Onepage/Success/TescoAdditionalInformation.php

@@ -9,6 +9,9 @@ class TescoAdditionalInformation extends AdditionalInformation
      */
     protected function _toHtml()
     {
+        if ($this->isUpaPayment()) {
+            return;
+        }
         if ($this->getPaymentType() !== 'bill_payment_tesco_lotus') {
             return;
         }

Controller/Callback/UPACallback.php

@@ -12,7 +12,6 @@
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\App\Request\Http;
 use Omise\Payment\Model\Api\CheckoutSession as OmiseCheckoutSession;
-use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface as TransactionBuilderInterface;
 use Magento\Framework\App\Action\Action;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment\Transaction;
@@ -71,11 +70,6 @@
      */
     protected $omiseCheckoutSession;
 
-    /**
-     * @var TransactionBuilderInterface
-     */
-    protected $transactionBuilder;
-
     /**
      * @param Context $context
      * @param Session $session
@@ -87,7 +81,6 @@
      * @param CheckoutSession $checkoutSession
      * @param Http $request
      * @param OmiseCheckoutSession $omiseCheckoutSession
-     * @param TransactionBuilderInterface $transactionBuilder
      */
     public function __construct(
         Context $context,
@@ -99,8 +92,7 @@
         Config $config,
         CheckoutSession $checkoutSession,
         Http $request,
-        OmiseCheckoutSession $omiseCheckoutSession,
-        TransactionBuilderInterface $transactionBuilder
+        OmiseCheckoutSession $omiseCheckoutSession
     ) {
         parent::__construct($context);
         $this->session = $session;
@@ -112,7 +104,6 @@
         $this->checkoutSession  = $checkoutSession;
         $this->request = $request;
         $this->omiseCheckoutSession = $omiseCheckoutSession;
-        $this->transactionBuilder = $transactionBuilder;
         $this->omise->defineUserAgent();
         $this->omise->defineApiVersion();
         $this->omise->defineApiKeys();
@@ -140,8 +131,8 @@
             $checkoutSession = $this->getCheckoutSession($payment);
             $sessionPayments = $checkoutSession->payments;
 
-            if($checkoutSession && !is_array($sessionPayments) || empty($sessionPayments)) {
+            if ($checkoutSession && !is_array($sessionPayments) || empty($sessionPayments)) {
                 $errorMessage = __('The payment session is invalid or no payment information was found. Please contact our support if you have any questions.');
                 return $this->redirectBackToCart($order, $errorMessage);
             }
 
@@ -152,8 +143,8 @@
                 $chargeId = $finalPayment['charge_id'];
                 $charge = $this->charge->find($chargeId);
             } else {
                 $errorMessage = __('The payment session is invalid or no payment information was found. Please contact our support if you have any questions.');
-                return $this->redirectBackToCart($order,$errorMessage);
+                return $this->redirectBackToCart($order, $errorMessage);
             }
 
             if (!$charge instanceof \Omise\Payment\Model\Api\BaseObject) {
@@ -173,27 +164,13 @@
 
             // Do not proceed if webhook is enabled
             if ($this->config->isWebhookEnabled()) {
-                $this->transactionBuilder
-                    ->setPayment($payment)
-                    ->setOrder($order)
-                    ->setTransactionId($charge->id)
-                    ->setAdditionalInformation([
-                        Transaction::RAW_DETAILS => [
-                            'omise_charge_id' => $charge->id,
-                            'status' => $charge->status,
-                            'charge_id' => $charge->id
-                        ]
-                    ])
-                    ->setFailSafe(true)
-                    ->build(Transaction::TYPE_PAYMENT);
-                $order->save();
                 return $this->redirect(self::PATH_SUCCESS);
             }
-
+            
             $payment->setTransactionId($charge->id);
             $payment->setLastTransId($charge->id);
             $payment->setAdditionalInformation('charge_id', $charge->id);
-            
+
             if ($charge->isSuccessful()) {
                 return $this->handleSuccess($order, $charge, $payment);
             }

Gateway/Response/UPAPaymentDetailsHandler.php

@@ -3,30 +3,21 @@
 
 use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
-use Magento\Sales\Model\Order\Payment\Transaction;
 use Omise\Payment\Helper\OmiseHelper;
 
 class UPAPaymentDetailsHandler implements HandlerInterface
 {
-    /**
-     * @var \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface
-     */
-    protected $transactionBuilder;
-
     /**
      * @var OmiseHelper
      */
     protected $helper;
 
     /**
-     * @param Transaction\BuilderInterface $transactionBuilder
      * @param OmiseHelper $helper
      */
     public function __construct(
-        \Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface $transactionBuilder,
         OmiseHelper $helper
     ) {
-        $this->transactionBuilder = $transactionBuilder;
         $this->helper = $helper;
     }
 
@@ -48,19 +39,12 @@ public function handle(array $handlingSubject, array $response)
         $payment->setAdditionalInformation('session_id', $response['session']->id);
         $payment->setAdditionalInformation('payment_type', $paymentType);
 
-        $transaction = $this->transactionBuilder
-                            ->setPayment($payment)
-                            ->setOrder($order)
-                            ->setTransactionId($response['session']->id)
-                            ->setAdditionalInformation([Transaction::RAW_DETAILS => (array) $payment])
-                            ->setFailSafe(true)
-                            ->build(Transaction::TYPE_PAYMENT);
-        $payment->addTransactionCommentsToOrder(
-            $transaction,
+        $order->addStatusHistoryComment(
             $payment->prependMessage(
                 __(
-                    'Processing amount of %1 via Omise Checkout Gateway.',
-                    $order->getBaseCurrency()->formatTxt($order->getTotalDue())
+                    'Processing amount of %1 via Omise Checkout session ID: %2',
+                    $order->getBaseCurrency()->formatTxt($order->getTotalDue()),
+                    $response['session']->id
                 )
             )
         );

Test/Unit/Controller/Callback/UPACallbackTest.php

@@ -10,7 +10,6 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\Order\Payment\Transaction;
-use Magento\Sales\Model\Order\Payment\Transaction\BuilderInterface;
 use Omise\Payment\Controller\Callback\UPACallback;
 use Omise\Payment\Helper\OmiseEmailHelper;
 use Omise\Payment\Helper\OmiseHelper;
@@ -35,7 +34,6 @@ class UPACallbackTest extends TestCase
     private $checkoutSession;
     private $request;
     private $omiseCheckoutSession;
-    private $transactionBuilder;
     private $messageManager;
     private const ORDER_ID = 1;
     private const SESSION_ID = 'session_123';
@@ -60,7 +58,6 @@ protected function setUp(): void
         $this->omiseCheckoutSession = $this->createMock(
             \Omise\Payment\Model\Api\CheckoutSession::class
         );
-        $this->transactionBuilder = $this->createMock(BuilderInterface::class);
 
         $this->messageManager = $this->createMock(ManagerInterface::class);
 
@@ -86,8 +83,7 @@ private function getController()
                 $this->config,
                 $this->checkoutSession,
                 $this->request,
-                $this->omiseCheckoutSession,
-                $this->transactionBuilder
+                $this->omiseCheckoutSession
                 ]
             )
             ->onlyMethods(['_redirect', 'getRequest'])
@@ -706,7 +702,6 @@ public function testExecuteWithWebhookEnabledBuildsTransactionAndRedirectsToSucc
     {
         $payment = $this->createPayment(self::SESSION_ID);
         $order = $this->createOrder($payment, self::ORDER_ID, true, Order::STATE_PENDING_PAYMENT);
-        $transaction = $this->createMock(Transaction::class);
 
         $this->session->method('getLastRealOrder')
             ->willReturn($order);
@@ -751,46 +746,6 @@ public function testExecuteWithWebhookEnabledBuildsTransactionAndRedirectsToSucc
         $this->config->method('isWebhookEnabled')
             ->willReturn(true);
 
-        $this->transactionBuilder->expects($this->once())
-            ->method('setPayment')
-            ->with($payment)
-            ->willReturnSelf();
-
-        $this->transactionBuilder->expects($this->once())
-            ->method('setOrder')
-            ->with($order)
-            ->willReturnSelf();
-
-        $this->transactionBuilder->expects($this->once())
-            ->method('setTransactionId')
-            ->with(self::CHARGE_ID)
-            ->willReturnSelf();
-
-        $this->transactionBuilder->expects($this->once())
-            ->method('setAdditionalInformation')
-            ->with([
-                Transaction::RAW_DETAILS => [
-                    'omise_charge_id' => self::CHARGE_ID,
-                    'status' => 'pending',
-                    'charge_id' => self::CHARGE_ID
-                ]
-            ])
-            ->willReturnSelf();
-
-        $this->transactionBuilder->expects($this->once())
-            ->method('setFailSafe')
-            ->with(true)
-            ->willReturnSelf();
-
-        $this->transactionBuilder->expects($this->once())
-            ->method('build')
-            ->with(Transaction::TYPE_PAYMENT)
-            ->willReturn($transaction);
-
-        $order->expects($this->once())
-            ->method('save')
-            ->willReturnSelf();
-
         $controller = $this->getController();
 
         $redirectResult = $this->createMock(Redirect::class);