spree_vpago 2.0.9.pre.beta5 → 2.0.9.pre.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7af7ed97c69c8a8263697826295b12b59d8eabcd50fc6ec83a8be08f474e024e
-  data.tar.gz: 58bc7620d3cf994a1302f6c972cef6ff6c3611d58f59667235e7c473f8808769
+  metadata.gz: d007281b3eac7e38e9f8f9ebd48c2a71cb7d7bc1e5c6675c99c19492171f31ef
+  data.tar.gz: fed43008f20b2757ea22b6334cb2c3cd380b21d518e17fe2e790cd56cd704e2f
 SHA512:
-  metadata.gz: d3b9a0bc94d9b0baf78a87632c227eca2237928805255e815dcd0afa9919115191755ac7741173d821fc46703b8529186f6eeb3a8dfee1f79235394e20e66929
-  data.tar.gz: 6f930577991ff8830593fc48d64ec9c6be8b894c73648987caf6f08a103ef2e800e7355a1a57f09f41d6cf2c56a92c818b6e1d5cc64e5e78537484b3e55a227c
+  metadata.gz: 2d8bae5d999a97f83e2465e20963e2d88b1b5035afc78fdd23552c3e4a86b7cc0bab16ec069ac4eb06862d942b917c1101b07afff98c7e2381c2e154c643979a
+  data.tar.gz: d953058e8a545453014b90e6251f7b55db9784a9be8be2e98fbd1795c9443fbd82f843ecd6086f671a8a681a67fe83dd5f456420db38937c6eccf5b0a7028c17

data/Gemfile.lock

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

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

@@ -26,7 +26,9 @@ module Spree
     end
 
     # override
-    def support_payout? = true
+    def support_payout?
+      preferred_payment_option.in?(%w[abapay_khqr abapay_khqr_deeplink])
+    end
 
     # override
     def support_pre_auth? = true

data/app/models/vpago/order_decorator.rb

@@ -57,7 +57,7 @@ module Vpago
                         end
 
       @available_payment_methods ||= if required_payway_payout?
-                                       payment_methods.select(&:type_payway_v2?)
+                                       payment_methods.select(&:support_payout?)
                                      else
                                        payment_methods
                                      end

data/app/models/vpago/payouts_generator.rb

@@ -26,6 +26,10 @@ module Vpago
 
     def call
       payouts = vendor_payouts + vendor_shipment_payouts + store_payouts
+      payouts = payouts.map do |payout|
+        payout.amount = round_up(payout.amount)
+        payout
+      end
 
       return [] if payouts.all?(&:default?)
       return [] unless payouts.all? { |payout| validated?(payout) }
@@ -55,7 +59,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 = round_up(line_item.pre_commission_amount - total_confirmed_payouts)
+        amount_owed_to_vendor = 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
 
@@ -88,7 +92,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 = round_up(shipment.cost_with_vendor_adjustment_total - total_confirmed_payouts)
+        amount_owed_to_shipping_vendor = 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
 
@@ -125,7 +129,7 @@ module Vpago
           state: :created,
           payment: payment,
           payout_profile: Spree::PayoutProfiles::PaywayV2.default,
-          amount: round_up(self.remaining_amount)
+          amount: self.remaining_amount
         )
       ]
     end
@@ -133,23 +137,14 @@ module Vpago
     # 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
+    # Total amount: $2.5
     #
-    # Vendor payouts:
     # - Vendor 1: $0.625 → $0.63
     # - Vendor 2: $0.625 → $0.63
+    # - Platform: $1.25
     #
-    # 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)
+    # Final amount: 2.51$
     def round_up(amount)
       (amount * 100).ceil / 100.0
     end

data/app/services/vpago/payment_finder.rb

@@ -7,6 +7,7 @@ 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}")
@@ -14,15 +15,16 @@ 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
@@ -34,5 +36,8 @@ module Vpago
     def vattanac_mini_app_payload?
       params_hash[:data].present?
     end
+
   end
 end
+
+

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

@@ -1,15 +1,7 @@
 <% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
 <% redirect_urls = @checkout.generate_payment_urls(params[:platform]) %>
-<h1><%= params[:platform] %></h1>
-<%= redirect_urls  %>
 <% @payment.user_informer.payment_is_processing(processing: true) %>
 
-<dialog id="custom-dialog" style="padding: 1.5em; border-radius: 8px; border: 1px solid #ccc; max-width: 300px;">
-  <p style="margin-bottom: 1em;">Do you want to open the app?</p>
-  <button id="dialog-confirm" style="margin-right: 1em; padding: 0.5em 1em;">Yes</button>
-  <button id="dialog-cancel" style="padding: 0.5em 1em;">No</button>
-</dialog>
-
 <script>
   document.addEventListener("DOMContentLoaded", () => {
     const platform = "<%= params[:platform] %>";
@@ -19,52 +11,15 @@
     const docRefPath = "<%= @payment.user_informer.document_reference_path %>";
     const successUrl = "<%= @payment.success_url %>";
 
-    function showDialog(onConfirm) {
-      const dialog = document.getElementById('custom-dialog');
-      const confirmAction = document.getElementById('dialog-confirm');
-      const cancelAction = document.getElementById('dialog-cancel');
-
-      // Clean up old listeners to avoid duplicates
-      confirmAction.onclick = null;
-      cancelAction.onclick = null;
-
-      confirmAction.onclick = () => {
-        dialog.close();
-        onConfirm(true);
-      };
-      cancelAction.onclick = () => {
-        dialog.close();
-        onConfirm(false);
-      };
-
-      dialog.showModal();
-    }
-
     function setupConfirmPaymentButton() {
       if (platform === "app") {
-        showDialog((proceed) => {
-            if (proceed) {
-                window.location.href = redirectUrls.deeplink;
-                setTimeout(() => {
-                  window.location.href = redirectUrls.webview;
-                }, 1500); 
-              } else {
-                window.location.href = redirectUrls.webview;
-              }
-        });
-
+        window.location.href = redirectUrls.deeplink;
+        setTimeout(() => {
+          window.location.href = redirectUrls.webview;
+        }, 1500);
       } else if (confirmButton) {
         confirmButton.addEventListener("click", () => {
-          showDialog((proceed) => {
-            if (proceed) {
-                window.location.href = redirectUrls.deeplink;
-                setTimeout(() => {
-                  window.location.href = redirectUrls.webview;
-                }, 1500); // wait 1.5 seconds before redirecting to webview
-              } else {
-                window.location.href = redirectUrls.webview;
-              }
-          });
+          window.open(redirectUrls.webview, '_blank');
         });
       }
     }
@@ -76,7 +31,6 @@
         console.warn("initPaymentProcessingListener is not defined");
       }
     }
-
     setupConfirmPaymentButton();
     setupPaymentProcessingListener();
   });

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.0.9-beta5'.freeze
+  VERSION = '2.0.9-beta7'.freeze
 
   def version
     Gem::Version.new VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.0.9.pre.beta5
+  version: 2.0.9.pre.beta7
 platform: ruby
 authors:
 - You