Upa fix issue

Block/Checkout/Onepage/Success/ConveniencestoreAdditionalInformation.php

@@ -30,6 +30,10 @@ public function __construct(
      */
     protected function _toHtml()
     {
+        if ($this->getRequest()->getParam('upa') === 'true') {
+            return '';
+        }
+
         $order = $this->_checkoutSession->getLastRealOrder();
         $paymentData = $order->getPayment()->getData();
         $paymentAdditionalInfo = $paymentData['additional_information'];

Block/Checkout/Onepage/Success/PaynowAdditionalInformation.php

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

Block/Checkout/Onepage/Success/PromptpayAdditionalInformation.php

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

Block/Checkout/Onepage/Success/TescoAdditionalInformation.php

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

Controller/Callback/UPACallback.php

@@ -123,22 +123,40 @@
      */
     public function execute()
     {
+        $finalPayment = [];
         $order = $this->session->getLastRealOrder();
-        $chargeId = $this->getRequest()->getParam('chargeId');
 
         if (!$this->isValid($order)) {
             return $this->redirect(self::PATH_CART);
         }
 
         $orderState = $order->getState();
         if ($orderState === Order::STATE_PROCESSING) {
-            return $this->redirect(self::PATH_SUCCESS);
+            return $this->redirect(self::PATH_SUCCESS, ['upa' => 'true']);
         }
 
         try {
             $payment = $order->getPayment();
-            $charge = $this->charge->find($chargeId);
-            if (! $charge instanceof \Omise\Payment\Model\Api\BaseObject) {
+            $checkoutSession = $this->getCheckoutSession($payment);
+            $sessionPayments = $checkoutSession->payments;
+
+            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);
+            }
+
+            $sessionStatus = $checkoutSession->status;
+            $finalPayment = $this->getFinalPayment($sessionPayments, $sessionStatus);
+
+            if (!empty($finalPayment) && !empty($finalPayment['charge_id'])) {
+                $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);
+            }
+
+            if (!$charge instanceof \Omise\Payment\Model\Api\BaseObject) {
                 throw new LocalizedException(
                     __('Couldn\'t retrieve charge transaction. Please contact administrator.')
                 );
@@ -162,17 +180,19 @@
                     ->setAdditionalInformation([
                         Transaction::RAW_DETAILS => [
                             'omise_charge_id' => $charge->id,
-                            'status' => $charge->status
+                            'status' => $charge->status,
+                            'charge_id' => $charge->id
                         ]
                     ])
                     ->setFailSafe(true)
                     ->build(Transaction::TYPE_PAYMENT);
                 $order->save();
-                return $this->redirect(self::PATH_SUCCESS);
+                return $this->redirect(self::PATH_SUCCESS, ['upa' => 'true']);
             }
 
             $payment->setTransactionId($charge->id);
             $payment->setLastTransId($charge->id);
+            $payment->setAdditionalInformation('charge_id', $charge->id);
 
             if ($charge->isSuccessful()) {
                 return $this->handleSuccess($order, $charge, $payment);
@@ -231,19 +251,9 @@
                     $order->getBaseCurrency()->formatTxt($invoice->getBaseGrandTotal())
                 )
             );
-        } else {
-            $payment->addTransactionCommentsToOrder(
-                $payment->addTransaction(Transaction::TYPE_AUTH),
-                $payment->prependMessage(
-                    __(
-                        'Authorized amount of %1 via Omise Gateway.',
-                        $order->getBaseCurrency()->formatTxt($order->getTotalDue())
-                    )
-                )
-            );
         }
         $order->save();
-        return $this->redirect(self::PATH_SUCCESS);
+        return $this->redirect(self::PATH_SUCCESS, ['upa' => 'true']);
     }
 
     /**
@@ -272,7 +282,7 @@
 
         // TODO: Should redirect users to a page that tell users that
         // their payment is in review instead of success page.
-        return $this->redirect(self::PATH_SUCCESS);
+        return $this->redirect(self::PATH_SUCCESS, ['upa' => 'true']);
     }
 
     /**
@@ -283,7 +293,7 @@
      */
     private function isValid($order)
     {
-        if (! $order->getId()) {
+        if (!$order->getId()) {
             $this->messageManager->addErrorMessage(__('The order session no longer exists, please make an order
             again or contact our support if you have any questions.'));
 
@@ -299,38 +309,16 @@
             return false;
         }
 
-        $chargeId = $this->request->getParam('chargeId');
-        $isValidCharge = $this->validateChargeId($payment, $chargeId);
-
-        if (!$chargeId || !$isValidCharge) {
-            $this->invalid(
-                $order,
-                __('The URL is invalid. Please contact our support if you have any questions.')
-            );
-
-            return false;
-        }
-
         $orderState = $order->getState();
         $validOrderStates = [Order::STATE_PENDING_PAYMENT, Order::STATE_PAYMENT_REVIEW, Order::STATE_PROCESSING];
-        
+
         if (!in_array($orderState, $validOrderStates)) {
             $this->invalid($order, __('Invalid order status, cannot validate the payment. Please contact our
             support if you have any questions.'));
 
             return false;
         }
 
-        if (!$payment->getAdditionalInformation('session_id')) {
-            $this->cancel(
-                $order,
-                __('Cannot retrieve a session reference id. Please contact our support to confirm your payment.')
-            );
-            $this->session->restoreQuote();
-
-            return false;
-        }
-
         return true;
     }
 
@@ -346,12 +334,13 @@
 
     /**
      * @param  string $path
+     * @param  array  $arguments
      *
      * @return \Magento\Framework\App\ResponseInterface
      */
-    protected function redirect($path)
+    protected function redirect($path, array $arguments = [])
     {
-        return $this->_redirect($path, ['_secure' => true]);
+        return $this->_redirect($path, array_merge(['_secure' => true], $arguments));
     }
 
     /**
@@ -382,29 +371,57 @@
         $this->messageManager->addErrorMessage($message);
     }
 
+    private function redirectBackToCart($order, $errorMessage)
+    {
+        $this->invalid($order, $errorMessage);
+        $this->checkoutSession->restoreQuote();
+        return $this->redirect(self::PATH_CART);
+    }
+
     /**
-     * @var Magento\Sales\Model\Order\Payment
-     * @var string
-     * @return bool
+     * @param Magento\Sales\Model\Order\Payment $payment
+     * @return \Omise\Payment\Model\Api\CheckoutSession|null
      */
-    private function validateChargeId($payment, $chargeId)
+    private function getCheckoutSession($payment)
     {
-        try {
-            $sessionId = $payment->getAdditionalInformation('session_id');
-            $checkoutSessionInfo = $this->omiseCheckoutSession->getSessionInfo($sessionId);
+        $sessionId = $payment->getAdditionalInformation('session_id');
+        if (empty($sessionId)) {
+            $this->checkoutSession->restoreQuote();
+            throw new LocalizedException(
+                __('Cannot retrieve a session reference id. Please contact our support to confirm your payment.')
+            );
+        }
+
+        $checkoutSession = $this->omiseCheckoutSession->getSessionInfo($sessionId);
+        return $checkoutSession;
+    }
 
-            if (!is_array($checkoutSessionInfo->payments)) {
-                return false;
-            }
-
-            foreach ($checkoutSessionInfo->payments as $charge) {
-                if ($charge['charge_id'] === $chargeId) {
-                    return true;
-                }
+    /**
+     * @param array $payments
+     * @param string $sessionStatus
+     * @return array|null
+     */
+    private function getFinalPayment($payments, $sessionStatus)
+    {
+        if (!is_array($payments) || empty($payments)) {
+            return null;
+        }
+
+        $paymentsWithChargeId = array_filter($payments, function ($payment) {
+            return !empty($payment['charge_id']);
+        });
+
+        if (empty($paymentsWithChargeId)) {
+            return null;
+        }
+
+        foreach ($paymentsWithChargeId as $payment) {
+            $paymentStatus = strtolower(isset($payment['status']) ? (string) $payment['status'] : '');
+            if ($paymentStatus === strtolower((string) $sessionStatus)) {
+                return $payment;
             }
-        } catch (\Exception $e) {
-            return false;
         }
-        return false;
+
+        return end($paymentsWithChargeId);
     }
 }

Helper/OmiseHelper.php

@@ -35,16 +35,9 @@
 use Omise\Payment\Model\Config\Conveniencestore;
 use Omise\Payment\Model\Config\WeChatPay;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\DeploymentConfig;
 
 class OmiseHelper extends AbstractHelper
 {
-    /**
-     * Path to check if UPA feature is enabled in deployment config.
-     * @var string
-     */
-    protected const UPA_FEATURE_PATH = 'omise_payment/omise_feature_upa';
-
     /**
      * @var array
      */
@@ -226,26 +219,18 @@ class OmiseHelper extends AbstractHelper
      * @var ScopeConfigInterface
      */
     protected $scopeConfig;
-
-    /**
-     * @var DeploymentConfig $deploymentConfig
-     */
-    protected $deploymentConfig;
-
+
     /**
      * @param Header $header
      * @param Config $config
      * @param ScopeConfigInterface $scopeConfig
-     * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(
         Config $config,
-        ScopeConfigInterface $scopeConfig,
-        DeploymentConfig $deploymentConfig
+        ScopeConfigInterface $scopeConfig
     ) {
         $this->config = $config;
         $this->scopeConfig = $scopeConfig;
-        $this->deploymentConfig = $deploymentConfig;
         $this->omisePaymentMethods = array_merge(
             $this->offsitePaymentMethods,
             $this->offlinePaymentMethods,
@@ -267,17 +252,6 @@ public function getConfig(string $fieldId, ?int $storeId = null)
             $storeId
         );
     }
-
-    /**
-     * Check whether merchant-specific feature is enabled.
-     */
-    public function isUpaFeatureEnabled(): bool
-    {
-        return (bool) $this->deploymentConfig->get(
-            self::UPA_FEATURE_PATH,
-            false
-        );
-    }
 
     /**
      * @param string $methodcode
@@ -286,8 +260,7 @@ public function isUpaFeatureEnabled(): bool
     public function isAllowUpa($methodCode)
     {
         $isUpaFeatureFlagEnabled = $this->config->getIsUpaFeatureFlagEnabled();
-        $upaFeatureEnabled = $this->isUpaFeatureEnabled();
-        if ($isUpaFeatureFlagEnabled && $upaFeatureEnabled) {
+        if ($isUpaFeatureFlagEnabled) {
             return $this->isOffsitePaymentMethod($methodCode) || $this->isOfflinePaymentMethod($methodCode);
         }
         return false;