spree_vpago 2.0.8.pre.beta3 → 2.0.8.pre.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60df6ffc7539631a90fd4076f856cb62517d0c589a6f0bb18f9e109e4708dc5
-  data.tar.gz: 572c3179370f5ddc763cfffe3a4cbbce054537b0a26620c7e4e9041e2e5b14bb
+  metadata.gz: 347bcfd7a5120dff061943a3ac91bdc64e22dca81f9bf046b028c06bd7f50521
+  data.tar.gz: e7261ee32ab96b7e3f43e4089b88f6b7a2505674055e6d48e0da434c90b6dbf5
 SHA512:
-  metadata.gz: bb331771b411e9b54d85d2810d4849e18574c5155a878922730014a0618393b27392d167c3596471e3322a32b12b111c8eda97718955675c72450d1ffee02a46
-  data.tar.gz: 89f4e3adbb4a08772e0b32a584a412934b6697d9b96a92da2af2904ada71233f481886b50a9c863a98eea5015d41d969376b61e8af499a5be84938d318481b7a
+  metadata.gz: 3705d3643e441c22533dd68def749c8e7569afe2f78a6a0134046674d82d60d9e8416720817d9cebc7d351b4011081b3fb284822612bf2f324b53ab6f92acf77
+  data.tar.gz: bb38cab70179348c732fd2358086a8c3e4957f5fad20fa7a9ee18ef8abea2febcb01c9efae211882e8ad7f6fbbdc1803ec5e3d57bed923c0b1d35bdbe4f819cb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.0.8.pre.beta3)
+    spree_vpago (2.0.8.pre.beta4)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -198,7 +198,7 @@ GEM
     flatpickr (4.6.13.1)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    gapic-common (1.0.0)
+    gapic-common (1.0.1)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
@@ -234,7 +234,7 @@ GEM
       google-cloud-core (~> 1.7)
       google-cloud-firestore-v1 (~> 2.0)
       rbtree (~> 0.4.2)
-    google-cloud-firestore-v1 (2.1.0)
+    google-cloud-firestore-v1 (2.1.1)
       gapic-common (~> 1.0)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)

data/app/assets/config/spree_vpago_manifest.js

@@ -1,3 +1,4 @@
 //= link_tree ../images
 //= link vpago/vpago_payments/request_process_payment.js
 //= link vpago/vpago_payments/user_informers/firebase.js
+//= link vpago/vpago_payments/payment_processing_listener.js

data/app/assets/javascripts/vpago/vpago_payments/payment_processing_listener.js

@@ -0,0 +1,46 @@
+window.initPaymentProcessingListener = async function (
+  firebaseConfigs,
+  documentReferencePath,
+  successUrl
+) {
+  function log(status, processing, reasonCode, reasonMessage) {
+    console.log(`Status: ${status}`);
+    console.log(`Reason Code: ${reasonCode}`);
+    console.log(`Processing: ${processing ? "Processing..." : "No more process."}`);
+    console.log(`Reason Message: ${reasonMessage}`);
+  }
+
+  window.listenToProcessingState({
+    firebaseConfigs,
+    documentReferencePath,
+
+    onPaymentIsProcessing(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Payment is processing", processing, reasonCode, reasonMessage);
+    },
+
+    onOrderIsProcessing(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Order is processing", processing, reasonCode, reasonMessage);
+    },
+
+    onOrderIsCompleted(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Order is completed", processing, reasonCode, reasonMessage);
+    },
+
+    onOrderProcessFailed(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Order process failed", processing, reasonCode, reasonMessage);
+    },
+
+    onPaymentIsRefunded(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Payment is refunded", processing, reasonCode, reasonMessage);
+    },
+
+    onPaymentProcessFailed(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Payment process failed", processing, reasonCode, reasonMessage);
+    },
+
+    onCompleted(orderState, paymentState, processing, reasonCode, reasonMessage) {
+      log("Completed — redirecting to success URL", processing, reasonCode, reasonMessage);
+      window.location.href = successUrl;
+    }
+  });
+};

data/app/controllers/spree/vpago_payments_controller.rb

@@ -33,12 +33,6 @@ module Spree
 
       @order = @payment.order
       raise CanCan::AccessDenied unless @order.completed?
-
-      if params[:offsite_payment].present?
-        redirect_to @payment.payment_url, allow_other_host: true
-      else
-        render :success
-      end
     end
 
     # POST

data/app/models/vpago/payment_decorator.rb

@@ -10,7 +10,6 @@ module Vpago
                     :processing_deeplink_url,
                     :success_url,
                     :process_payment_url,
-                    :payment_url,
                     to: :url_constructor
     end
 

data/app/models/vpago/payouts_generator.rb

@@ -30,7 +30,15 @@ module Vpago
       return [] if payouts.all?(&:default?)
       return [] unless payouts.all? { |payout| validated?(payout) }
 
-      ActiveRecord::Base.transaction { payouts.each(&:save!) }
+      ActiveRecord::Base.transaction do
+        payouts.each(&:save!)
+
+        # If any payouts were rounded, the total may increase slightly.
+        # Update the payment amount to match the sum of payouts to avoid mismatch errors.
+        payment.update(amount: payouts.map(&:amount).sum)
+
+        payouts
+      end
     end
 
     def validated?(payout)
@@ -47,7 +55,7 @@ module Vpago
         total_confirmed_payouts = line_item.confirmed_payouts_for_vendor.sum(:amount)
         next if total_confirmed_payouts >= line_item.pre_commission_amount
 
-        amount_owed_to_vendor = line_item.pre_commission_amount - total_confirmed_payouts
+        amount_owed_to_vendor = round_up(line_item.pre_commission_amount - total_confirmed_payouts)
         payout_amount = [amount_owed_to_vendor, remaining_amount].min
         outstanding_amount = [amount_owed_to_vendor - payout_amount, 0].max
 
@@ -80,7 +88,7 @@ module Vpago
         total_confirmed_payouts = shipment.confirmed_payouts_for_vendor.sum(:amount)
         next if total_confirmed_payouts >= shipment.cost_with_vendor_adjustment_total
 
-        amount_owed_to_shipping_vendor = shipment.cost_with_vendor_adjustment_total - total_confirmed_payouts
+        amount_owed_to_shipping_vendor = round_up(shipment.cost_with_vendor_adjustment_total - total_confirmed_payouts)
         payout_amount = [amount_owed_to_shipping_vendor, remaining_amount].min
         outstanding_amount = [amount_owed_to_shipping_vendor - payout_amount, 0].max
 
@@ -117,9 +125,33 @@ module Vpago
           state: :created,
           payment: payment,
           payout_profile: Spree::PayoutProfiles::PaywayV2.default,
-          amount: self.remaining_amount
+          amount: round_up(self.remaining_amount)
         )
       ]
     end
+
+    # ABA does not support amounts with more than 2 decimal places.
+    # Therefore, we must round all 3-decimal payouts to 2 decimals beforehand.
+    #
+    # Our rounding strategy:
+    # - We round up for vendors & shipment payouts (to favor external parties).
+    # - The remaining amount is adjusted in the platform's share (may be slightly less).
+    #
+    # Example:
+    # Total amount: $5.00
+    #
+    # Vendor payouts:
+    # - Vendor 1: $0.625 → $0.63
+    # - Vendor 2: $0.625 → $0.63
+    #
+    # Shipment payouts:
+    # - Shipment 1: $0.625 → $0.63
+    # - Shipment 2: $0.625 → $0.63
+    #
+    # Platform payout:
+    # - $2.50 → $2.48 (adjusted to ensure total remains $5.00)
+    def round_up(amount)
+      (amount * 100).ceil / 100.0
+    end
   end
 end

data/app/services/vpago/payment_finder.rb

@@ -7,7 +7,6 @@ module Vpago
     end
 
     def find_and_verify
-
       find_and_verify!
     rescue StandardError, ActiveRecord::RecordNotFound => e
       Rails.logger.error("PaymentJwtVerifier#find_and_verify error: #{e.class} - #{e.message}")
@@ -15,16 +14,15 @@ module Vpago
     end
 
     def find_and_verify!
-
       if vattanac_mini_app_payload?
-        payload =  Vpago::VattanacMiniAppDataHandler.new.decrypt_data(@params_hash[:data])
+        payload = Vpago::VattanacMiniAppDataHandler.new.decrypt_data(@params_hash[:data])
         payment = Spree::Payment.find_by!(number: payload['paymentId'])
         payment.update(transaction_response: payload)
         payment
-      else 
+      else
         order = Spree::Order.find_by!(number: params_hash[:order_number])
         verify_jwt!(order)
-  
+
         Spree::Payment.find_by!(number: params_hash[:payment_number])
       end
     end
@@ -36,8 +34,5 @@ module Vpago
     def vattanac_mini_app_payload?
       params_hash[:data].present?
     end
-
   end
 end
-
-

data/app/services/vpago/payment_url_constructor.rb

@@ -15,7 +15,6 @@ module Vpago
     def processing_deeplink_url = "#{@payment.payment_method.preferred_return_url_scheme}/vpago_payments/processing?#{query}"
     def success_url = "#{base_url}/vpago_payments/success?#{query}"
     def process_payment_url = "#{base_url}/vpago_payments/process_payment?#{query}"
-    def payment_url = "#{base_url}/book/payment?number=#{@payment.order.number}&tk=#{@payment.order.token}"
 
     def query
       {

data/app/services/vpago/rsa_handler.rb

@@ -30,4 +30,4 @@ module Vpago
       Base64.strict_encode64(private_key.sign(sign_hash, payload))
     end
   end
-end
+end

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

@@ -1,9 +1,33 @@
 <% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
-<% redirect_url = @checkout.generate_payment_urls(params[:platform])%>
+<% redirect_url = @checkout.generate_payment_urls(params[:platform]) %>
+<% @payment.user_informer.payment_is_processing(processing: true) %>
 
-  <script>
-    document.addEventListener("DOMContentLoaded", function () {
-      window.top.location.href = "<%= j redirect_url %>";
-    });
-  </script>
+<script>
+  document.addEventListener("DOMContentLoaded", () => {
 
+    const setupConfirmPaymentButton = () => {
+      const confirmButton = document.getElementById("confirm-payment-button");
+      if (!confirmButton) return;
+
+      confirmButton.addEventListener("click", () => {
+        window.open("<%= j redirect_url %>", "_blank");
+      });
+    };
+
+    const setupPaymentProcessingListener = () => {
+      const firebaseConfigs = <%= Rails.application.credentials.firebase_web_config.to_json.html_safe %>;
+      const documentReferencePath = "<%= @payment.user_informer.document_reference_path %>";
+      const successUrl = "<%= @payment.success_url %>";
+
+      if (window.initPaymentProcessingListener) {
+        window.initPaymentProcessingListener(firebaseConfigs, documentReferencePath, successUrl);
+      } else {
+        console.warn("initPaymentProcessingListener is not defined");
+      }
+    };
+
+    setupConfirmPaymentButton();
+    setupPaymentProcessingListener();
+    
+  });
+</script>

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

@@ -2,92 +2,51 @@
 <% @payment.user_informer.payment_is_processing(processing: true) %>
 
 <p id="unsupported-message"
-   style="margin-top: 10px;
-          font-weight: bold;
-          color: red;
-          display: none;">
+   style="margin-top: 10px; font-weight: bold; color: red; display: none;">
 </p>
 
 <script>
-  function detectMobileOS() {
-    const ua = navigator.userAgent || navigator.vendor || window.opera;
-    if (/iPad|iPhone|iPod/.test(ua) && !window.MSStream) return 'iOS';
-    if (/Android/i.test(ua)) return 'Android';
-    return 'unknown';
-  }
-
-  document.addEventListener('DOMContentLoaded', () => {
-    const os = detectMobileOS();
-    const payload = {
-      data: "<%= j @checkout.signed_payload %>",
-      paymentId: "<%= @checkout.payment_id %>"
+  document.addEventListener("DOMContentLoaded", () => {
+
+    const setupMiniAppPayment = () => {
+      const detectMobileOS = () => {
+        const ua = navigator.userAgent || navigator.vendor || window.opera;
+        if (/iPad|iPhone|iPod/.test(ua) && !window.MSStream) return 'iOS';
+        if (/Android/i.test(ua)) return 'Android';
+        return 'unknown';
+      };
+
+      const os = detectMobileOS();
+      const payload = {
+        data: "<%= j @checkout.signed_payload %>",
+        paymentId: "<%= @checkout.payment_id %>"
+      };
+
+      if (os === 'iOS' && window.webkit?.messageHandlers?.startPayment) {
+        window.webkit.messageHandlers.startPayment.postMessage(JSON.stringify(payload));
+      } else if (os === 'Android' && window.AndroidInterface?.startPayment) {
+        window.AndroidInterface.startPayment(JSON.stringify(payload));
+      } else {
+        const unsupported = document.getElementById('unsupported-message');
+        unsupported.style.display = 'block';
+        unsupported.innerText = 'Unsupported OS';
+      }
     };
 
-    if (os === 'iOS' && window.webkit?.messageHandlers?.startPayment) {
-      window.webkit.messageHandlers.startPayment.postMessage(JSON.stringify(payload));
-    } else if (os === 'Android' && window.AndroidInterface?.startPayment) {
-      window.AndroidInterface.startPayment(JSON.stringify(payload));
-    } else {
-      const unsupported = document.getElementById('unsupported-message');
-      unsupported.style.display = 'block';
-      unsupported.innerText = 'Unsupported OS';
-    }
-
-    const firebaseConfigs = <%= Rails.application.credentials.firebase_web_config.to_json.html_safe %>;
-
-    window.listenToProcessingState({
-      firebaseConfigs: firebaseConfigs,
-      documentReferencePath: "<%= @payment.user_informer.document_reference_path %>",
-
-      onPaymentIsProcessing: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Payment is processing");
-        console.log("Reason Code:", reasonCode);
-        console.log("Processing:", processing ? "Processing..." : "No more process.");
-        console.log("Reason Message:", reasonMessage);
-      },
-
-      onOrderIsProcessing: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Order is processing");
-        console.log("Reason Code:", reasonCode);
-        console.log("Processing:", processing ? "Processing..." : "No more process.");
-        console.log("Reason Message:", reasonMessage);
-      },
+    const setupPaymentProcessingListener = () => {
+      const firebaseConfigs = <%= Rails.application.credentials.firebase_web_config.to_json.html_safe %>;
+      const documentReferencePath = "<%= @payment.user_informer.document_reference_path %>";
+      const successUrl = "<%= @payment.success_url %>";
 
-      onOrderIsCompleted: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Order is completed");
-        console.log("Reason Code:", reasonCode);
-        console.log("Processing:", processing ? "Processing..." : "No more process.");
-        console.log("Reason Message:", reasonMessage);
-      },
-
-      onOrderProcessFailed: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Order process failed");
-        console.log("Reason Code:", reasonCode);
-        console.log("Processing:", processing ? "Processing..." : "No more process.");
-        console.log("Reason Message:", reasonMessage);
-      },
-
-      onPaymentIsRefunded: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Payment is refunded");
-        console.log("Reason Code:", reasonCode);
-        console.log("Processing:", processing ? "Processing..." : "No more process.");
-        console.log("Reason Message:", reasonMessage);
-      },
-
-      onPaymentProcessFailed: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Payment process failed");
-        console.log("Reason Code:", reasonCode);
-        console.log("Processing:", processing ? "Processing..." : "No more process.");
-        console.log("Reason Message:", reasonMessage);
-      },
-
-      onCompleted: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
-        console.log("Status: Completed — redirecting to success URL");
-        console.log("Reason Code:", reasonCode);
-        console.log("Reason Message:", reasonMessage);
-        let successPath = "<%= @payment.success_url %>";
-        window.location.href = successPath;
-      },
-    });
+      if (window.initPaymentProcessingListener) {
+        window.initPaymentProcessingListener(firebaseConfigs, documentReferencePath, successUrl);
+      } else {
+        console.log("initPaymentProcessingListener is not defined");
+      }
+    };
+    
+    setupMiniAppPayment();
+    setupPaymentProcessingListener();
+    
   });
 </script>

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.0.8-beta3'.freeze
+  VERSION = '2.0.8-beta4'.freeze
 
   def version
     Gem::Version.new VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.0.8.pre.beta3
+  version: 2.0.8.pre.beta4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-18 00:00:00.000000000 Z
+date: 2025-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -134,6 +134,7 @@ files:
 - app/assets/images/backend-process.svg
 - app/assets/images/vpago/payway/abapay.png
 - app/assets/images/vpago/payway/cards.png
+- app/assets/javascripts/vpago/vpago_payments/payment_processing_listener.js
 - app/assets/javascripts/vpago/vpago_payments/request_process_payment.js
 - app/assets/javascripts/vpago/vpago_payments/user_informers/firebase.js
 - app/controllers/.gitkeep