spree_vpago 2.3.5.pre.pre.pre.1 → 2.3.5.pre.pre.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0262a0bad21d6ed9d53d73ba6805f307e6b9f82db837ac96fe4f3c4725ae49b
-  data.tar.gz: 71f83ae18d1c306419bbef87f291185e1835a653fde1d1f0a09e1c783cf6f54c
+  metadata.gz: 48d7c4c6d67178d69d9c79153a1faefed2988bee02b651d084305cf368642bf7
+  data.tar.gz: b2d865bb7e27a47c21f881e6412687864a79daa95827e8241cf5031e42e6c662
 SHA512:
-  metadata.gz: ffc03cf77c82129ee5cf13ca1d3abb1646a9d39878ea647e1fd2451c30c027a885d8e8cb99fe45fabef2d7308c73f70c11b654ef9043b59814ef4737a983392c
-  data.tar.gz: cde29375e88d3428cd5854b47bb597fac4697eaf60550dfb74573dd0d5edff55624ea0df78659328ba40343548c39b60d4284fe7c6bfcd495a24ba405b82fcea
+  metadata.gz: 9d691bcf146a73f3cb5ea24ac25b2dfc3c37ce45b5af81c6ccc870ca53600e195bdb8f94532bd80e61c5e00ad8ff8dd824f12bd079ec799976b31be694fe20f5
+  data.tar.gz: ece9f7bb49bc13462b63cae96090167ced2924259ec7bbed9bb5686aacc8c726fe2f5f1dddcce6f396d460c2288a9e019cbfb8dc745ba481eb8a91a73aaf364d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.5.pre.pre.pre.1)
+    spree_vpago (2.3.5.pre.pre.pre.3)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/models/spree/gateway/acleda_v2.rb

@@ -2,11 +2,8 @@ module Spree
   class Gateway::AcledaV2 < PaymentMethod
     MODES = %w[khqr card deeplink].freeze
 
-    # BOOKMEPLUS — sent as the "merchantName" field in getTxnStatus requests
     preference :merchant_name, :string
-    # e.g. https://epaymentuat.acledabank.com.kh/BOOKMEPLUS/XPAYConnectorServiceInterfaceImplV2/XPAYConnectorServiceInterfaceImplV2RS
     preference :xpay_service_base_url, :string
-    # e.g. https://epaymentuat.acledabank.com.kh/BOOKMEPLUS/paymentPage.jsp
     preference :payment_page_url, :string
     preference :merchant_id, :string
     preference :login_id, :string
@@ -60,7 +57,6 @@ module Spree
     end
 
     # override
-    # mirror PayWay V2: gateway_options[:order_id] == "<order_number>-<payment_number>"
     def purchase(_amount, _source, gateway_options = {})
       _, payment_number = gateway_options[:order_id].split('-')
       payment = Spree::Payment.find_by(number: payment_number)

data/app/models/vpago/payment_method_decorator.rb

@@ -1,5 +1,5 @@
 module Vpago
-  module PaymentMethodDecorator
+  module PaymentMethodDecorator # rubocop:disable Metrics/ModuleLength
     TYPE_PAYWAY = 'Spree::Gateway::Payway'.freeze
     TYPE_PAYWAY_V2 = 'Spree::Gateway::PaywayV2'.freeze
     TYPE_WINGSDK = 'Spree::Gateway::WingSdk'.freeze

data/app/services/vpago/payment_finder.rb

@@ -20,9 +20,9 @@ module Vpago
         payment.update(transaction_response: payload)
         payment
       elsif acleda_v2_callback?
-        # ACLEDA V2's static portal callback carries only _paymenttokenid, which we
-        # stored on the payment source at openSessionV2. Resolve the payment by it.
-        Spree::VpagoPaymentSource.find_by!(transaction_id: params_hash[:_paymenttokenid]).payment
+        # ACLEDA V2's static portal callback echoes back _transactionid, which is
+        # the payment number we sent as transactionID/txid at openSessionV2.
+        Spree::Payment.find_by!(number: params_hash[:_transactionid])
       else
         order = Spree::Order.find_by!(number: params_hash[:order_number])
         verify_jwt!(order)

data/app/views/spree/admin/payments/source_views/_acleda_v2.html.erb

@@ -1 +1,5 @@
-<%= render 'spree/admin/payments/source_views/vpago_payment_tmpl', payment: payment %>
+<%= render 'spree/admin/payments/source_views/vpago_payment_tmpl',
+    payment: payment,
+    check_status_url: '',
+    heal_payment_url: '',
+    manual_update_payment_url: '' %>

data/app/views/spree/vpago_payments/forms/spree/gateway/_acleda_v2.html.erb

@@ -19,7 +19,7 @@
       }
     });
   </script>
-<% elsif @payment.payment_method.deeplink? %>
+<% elsif checkout.deeplink? %>
   <script>
     function showRedirectContainer(buttonLabel, onClick) {
       const loadingContainer = document.getElementById('vpago_loading_container');
@@ -37,8 +37,14 @@
     const redirectTo = (url) => { if (url) window.location.href = url; };
 
 
+<<<<<<< Updated upstream
     redirectTo(deeplinkUrl);
     showRedirectContainer("Open ACLEDA", () => redirectTo(deeplinkUrl));
+=======
+    redirectTo(deeplinkUrl);   
+    showRedirectContainer("Open ACLEDA", () => redirectTo(deeplinkUrl));
+
+>>>>>>> Stashed changes
   </script>
 <% else %>
   <%= render 'spree/checkout/payment/acleda_v2_checkout_form',

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.3.5-pre-1'.freeze
+  VERSION = '2.3.5-pre-3'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/acleda/checkout.rb

@@ -60,7 +60,7 @@ module Vpago
             purchaseDate: purchase_date,
             purchaseDesc: 'items',
             item: '1',
-            quantity: '1',
+            quantity: '1', # always 1: one payment = one transaction
             expiryTime: expiry_time,
             otherUrl: other_url
           }

data/lib/vpago/acleda_v2/base.rb

@@ -18,7 +18,6 @@ module Vpago
         @payment.number
       end
 
-      # PDF samples quote every xpayTransaction field as a JSON string.
       def amount
         format('%.2f', @payment.amount)
       end
@@ -50,15 +49,13 @@ module Vpago
         payment_method.preferences[:secret]
       end
 
-      # PDF samples quote every xpayTransaction field as a JSON string, even ones
-      # labeled "Numeric" in the field tables (paymentCard, quantity, expiryTime).
+      # Dynamically mirrors the shopper's remaining seat/inventory hold time so the bank's
+      # QR/session doesn't outlive the hold. Falls back to the admin-configured preference
+      # when the order has no hold (e.g. non-inventory items) or the hold has already lapsed.
       def expiry_time
-        payment_method.preferences[:payment_expiry_time_in_mn].to_s
+        @expiry_time ||= (remaining_hold_minutes || payment_method.preferences[:payment_expiry_time_in_mn]).to_s
       end
 
-      # PDF: "Date of Transaction in UTC Time", sent as a YYYY-MM-DD string in the
-      # samples. Explicit .utc so this stays correct even if config.time_zone is
-      # ever changed away from UTC.
       def purchase_date
         @payment.created_at.utc.strftime('%Y-%m-%d')
       end
@@ -67,11 +64,6 @@ module Vpago
         @payment.order.currency
       end
 
-      # --- Endpoints (each stored as a full URL preference) ---
-      # Strip embedded whitespace: these URLs are long and wrap across lines in
-      # the bank's PDFs, so a copy-paste into the admin preference easily carries
-      # over a stray space/line-break where the PDF wrapped.
-
       def xpay_service_base_url
         strip_whitespace(payment_method.preferences[:xpay_service_base_url])
       end
@@ -96,13 +88,11 @@ module Vpago
       end
 
       def callback_url
-        if platform == 'app' && app_scheme.present?
-          uri = URI.parse(@payment.processing_url)
-          uri.scheme = app_scheme
-          uri.to_s
-        else
-          @payment.processing_url
-        end
+        return continue_success_url unless app_scheme.present? && platform == 'app'
+
+        uri = URI.parse(continue_success_url)
+        uri.scheme = app_scheme
+        uri.to_s
       end
 
       def app_scheme
@@ -118,6 +108,10 @@ module Vpago
         @options[:platform]
       end
 
+      def deeplink?
+        payment_method.deeplink? && platform == 'app'
+      end
+
       # --- HMAC-SHA512 (uppercase hex) signing ---
       # openSessionV2 message: merchantID + loginId + password + txid
       def open_session_hash
@@ -141,6 +135,19 @@ module Vpago
 
       private
 
+      # Minutes left on the order's seat/inventory hold, rounded up so we never quote the
+      # bank less time than is actually left. nil when the order has no hold, the hold has
+      # already lapsed, or hold_expires_at isn't defined (spree_cm_commissioner not loaded).
+      def remaining_hold_minutes
+        return nil unless @payment.order.respond_to?(:hold_expires_at)
+
+        hold_expires_at = @payment.order.hold_expires_at
+        return nil if hold_expires_at.blank?
+
+        minutes = ((hold_expires_at - Time.current) / 60.0).ceil
+        minutes if minutes.positive?
+      end
+
       def strip_whitespace(value)
         value.to_s.gsub(/\s+/, '')
       end

data/lib/vpago/acleda_v2/checkout.rb

@@ -2,10 +2,6 @@ require 'faraday'
 
 module Vpago
   module AcledaV2
-    # Single class handling all three modes (khqr, card, deeplink).
-    # Two-step ACLEDA flow: openSessionV2 (JSON, here) yields paymentTokenid +
-    # sessionid, then either an auto-POST form to paymentPage.jsp (KHQR/Card) or
-    # a JS deeplink redirect (Deep Link).
     class Checkout < Base
       attr_reader :error_message
 
@@ -82,7 +78,7 @@ module Vpago
           xpayTransaction: xpay_transaction_base
         }
 
-        if payment_method.deeplink?
+        if deeplink?
           base[:xpayTransaction].merge!(oprDevice: opr_device, callBackUrl: callback_url)
         else
           base[:xpayTransaction][:paymentCard] = payment_method.payment_card_value

data/lib/vpago/acleda_v2/transaction_status.rb

@@ -31,10 +31,13 @@ module Vpago
       end
 
       def success?
-        http_success? && result_code == 0 && error_message == 'SUCCESS'
+        return false if token.blank?
+
+        http_success? && result_code.zero? && error_message == 'SUCCESS'
       end
 
       def failed?
+        return false if token.blank?
         return false unless http_success?
 
         FAILED_ERROR_DETAILS.include?(error_message.to_s.upcase)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.3.5.pre.pre.pre.1
+  version: 2.3.5.pre.pre.pre.3
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-03 00:00:00.000000000 Z
+date: 2026-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday