spree_vpago 2.2.2.pre.pre15 → 2.2.2.pre.pre17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8b2ed39701b994d1334481c2e6abaaf9d1e7f8139d0bfa85e776dd56f77f64
-  data.tar.gz: 1640e2aaa90a6c156c1abf61998e7b12e559e6be88bdb0c5c4eef9b97cc7ea33
+  metadata.gz: a41c53551544436fc2973a85d085bf8dd9712ebd84ae9d6b8d820ffeeea6d5b2
+  data.tar.gz: e0141d5b5968a647843616bfcea9a458c2805215cc78bc3651a999565bed6a59
 SHA512:
-  metadata.gz: b89362c53d5398d9cd17498fbd294fac146eb7d8b6121ab3b93dc4ab914daab4c868b73b1ff650c83c2c45909cf1cad088830f85f23c566618c0d5ed8fc886f5
-  data.tar.gz: 1c5981c54969f653d06f45e45e11da30944b1488b40f0c6cea3219b4a1bf17e0b946e2e647c3f30590f5565ecfc74a561cfbc146a2d36ad04b62fbed62a2415d
+  metadata.gz: dc3468dcff8511b38149ec840b73c09ed669c0347d0daa84956983edde8b8e4470f23825efc5e662424f6057d008f5ca788623a580cd21f45f3ab726923638a8
+  data.tar.gz: 9ed4fe39e71672992963611effb80f9e781b24b677a9ac040de0b75cf56762d2e210a3c60abde7e3e69a838816715d7969412a92db588de3cf543eba81a39cd2

data/Gemfile.lock

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

data/app/helpers/vpago/admin/base_helper_decorator.rb

@@ -37,6 +37,12 @@ module Vpago
                              class: 'fullwidth select2')
         when 'preferred_icon_name'
           return form.select(:preferred_icon_name, available_payment_icons, {}, class: 'fullwidth select2')
+        when 'preferred_payment_option'
+          return form.select(:preferred_payment_option, Spree::Gateway::PaywayV2::PAYMENT_OPTIONS, {}, class: 'fullwidth select2')
+        when 'preferred_abapay_khqr_deeplink_option'
+          return ''.html_safe unless form.object.abapay_khqr_deeplink?
+
+          return form.select(:preferred_abapay_khqr_deeplink_option, Spree::Gateway::PaywayV2::ABAPAY_KHQR_DEEPLINK_OPTIONS, {}, class: 'fullwidth select2')
         when 'preferred_vattanac_payment_option'
           return form.select(:preferred_vattanac_payment_option, available_vattanac_payment_options, {}, class: 'fullwidth select2')
         end

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -8,5 +8,37 @@ module Vpago
     def render_form
       render partial: "spree/vpago_payments/forms/#{@payment.payment_method.class.to_s.underscore}"
     end
+
+    def render_payment_status_listener
+      render partial: 'spree/vpago_payments/payment_status_listener'
+    end
+
+    # when return nil, each payment method should use their default URL.
+    # eg. PayWayV2 will use the continue_success_url as deeplink back URL.
+    def custom_return_deeplink_url
+      if telegram_user_agent?
+        'tg://'
+      elsif facebook_user_agent?
+        'fb://'
+      elsif messenger_user_agent?
+        'fb-messenger://'
+      end
+    end
+
+    def mobile_user_agent?
+      request.user_agent.to_s.downcase.match?(/android|iphone|ipad|ipod/)
+    end
+
+    def telegram_user_agent?
+      request.user_agent.to_s.downcase.include?('telegram')
+    end
+
+    def facebook_user_agent?
+      request.user_agent.to_s.downcase.include?('fban') || request.user_agent.to_s.downcase.include?('facebook')
+    end
+
+    def messenger_user_agent?
+      request.user_agent.to_s.downcase.include?('messenger')
+    end
   end
 end

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

@@ -1,20 +1,38 @@
 module Spree
   class Gateway::PaywayV2 < PaymentMethod
+    ABAPAY_KHQR_DEEPLINK_OPTIONS = %w[open_both open_deeplink_only open_checkout_url_only].freeze
+    PAYMENT_OPTIONS = %w[abapay_khqr_deeplink abapay_khqr cards wechat alipay].freeze
+
     preference :host, :string
     preference :api_key, :string
     preference :merchant_id, :string
-    preference :payment_option, :string # 'abapay', 'cards', 'abapay_deeplink'
+    preference :payment_option, :string
     preference :transaction_fee_fix, :string
     preference :transaction_fee_percentage, :string
     preference :public_key, :text
+    preference :abapay_khqr_deeplink_option, :string, default: 'open_both'
 
     validates :preferred_public_key, presence: true, if: :enable_pre_auth?
+    validates :preferred_abapay_khqr_deeplink_option, inclusion: { in: ABAPAY_KHQR_DEEPLINK_OPTIONS }, if: :abapay_khqr_deeplink?
+    validates :preferred_payment_option, inclusion: { in: PAYMENT_OPTIONS }
 
     # override: partial to render in admin
     def method_type
       'payway_v2'
     end
 
+    def abapay_khqr_deeplink?
+      preferred_payment_option == 'abapay_khqr_deeplink'
+    end
+
+    def open_abapay_deeplink?
+      preferred_abapay_khqr_deeplink_option.in?(%w[open_both open_deeplink_only])
+    end
+
+    def open_checkout_url?
+      preferred_abapay_khqr_deeplink_option.in?(%w[open_both open_checkout_url_only])
+    end
+
     # override
     def default_payout_profile
       Spree::PayoutProfiles::PaywayV2.default

data/app/views/spree/vpago_payments/_payment_status_listener.html.erb

@@ -0,0 +1,35 @@
+<%# This partial listens to payment status changes and does not process the payment. %>
+<%# When it detects a status change, it automatically redirects to the processing URL for actual processing. %>
+<%# Designed to be used in checkout.html.erb %>
+
+<script>
+  document.addEventListener("DOMContentLoaded", function() {
+    let 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) {
+        window.location.href = "<%= @payment.processing_url %>";
+      },
+      onPaymentIsRetrying: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
+        window.location.href = "<%= @payment.processing_url %>";
+      },
+      onOrderIsProcessing: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
+        window.location.href = "<%= @payment.processing_url %>";
+      },
+      onOrderIsCompleted: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
+        window.location.href = "<%= @payment.processing_url %>";
+      },
+      onOrderProcessFailed: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
+        window.location.href = "<%= @payment.processing_url %>";
+      },
+      onPaymentProcessFailed: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
+        window.location.href = "<%= @payment.processing_url %>";
+      },
+      onCompleted: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
+        window.location.href = "<%= @payment.success_url %>";
+      },
+    });
+  });
+</script>

data/app/views/spree/vpago_payments/checkout.html.erb

@@ -1,3 +1,9 @@
 <h1>Checkout...</h1>
 
-<%= render_form %>
+<%# Primary action button fixed at bottom of screen %>
+<%# Each payment method can customize this button (title, onclick) for their specific action. %>
+<%# See: app/views/spree/vpago_payments/forms/spree/gateway/_payway_v2.html.erb for example %>
+<button id="vpago_primary_button" style="display: none;"></button>
+
+<%= render_payment_status_listener %>
+<%= render_form %>

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

@@ -1,50 +1,77 @@
-<% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment) %>
-<% @payment_option = @payment.payment_method.preferences[:payment_option] %>
-
-<form method="POST"
-      action="<%= @checkout.checkout_url %>"
-      id="aba_merchant_request"
-      data-payment-option="<%= @payment_option %>"
-      style="<%= 'display:none;' if @payment_option == 'abapay_khqr_deeplink' %>">
+<% @checkout_options = { custom_return_deeplink_url: custom_return_deeplink_url } %>
+<% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment, @checkout_options) %>
 
+<form method="POST" action="<%= @checkout.checkout_url %>" id="aba_merchant_request">
   <% @checkout.gateway_params.each do |key, value| %>
     <input type="hidden" name="<%= key %>" value="<%= value %>">
   <% end %>
 </form>
 
 <script>
-document.addEventListener("DOMContentLoaded", function () {
-  const form = document.getElementById("aba_merchant_request");
-  const paymentOption = form.dataset.paymentOption;
-
-  if (paymentOption === "abapay_khqr_deeplink") {
-
-    fetch(form.action, {
-      method: "POST",
-      body: new FormData(form)
-    })
-    .then(res => res.json())
-    .then(data => {
-      if (data.checkout_qr_url && data.abapay_deeplink) {
-        // 1) Show checkout QR in this tab
-        window.location.href = data.checkout_qr_url;
-
-        // 2) Try to open the deeplink in a new tab
-        setTimeout(() => {
-          window.open(data.abapay_deeplink, "_blank");
-        }, 5000);
-      } else if (data.checkout_qr_url) {
-        window.location.href = data.checkout_qr_url;
-      } else if (data.abapay_deeplink) {
-        window.location.href = data.abapay_deeplink;
-      }
-    })
-    .catch(err => {
-      console.error("Error:", err);
+  const isTelegram = <%= telegram_user_agent? %>;
+  const isMobile = <%= mobile_user_agent? %>;
+
+  const abapayKhqrDeeplink = "<%= @payment.payment_method.abapay_khqr_deeplink? %>";
+  const shouldOpenAbaPayDeeplink = isMobile && <%= @payment.payment_method.open_abapay_deeplink? %>;
+  const shouldOpenCheckoutUrl = <%= @payment.payment_method.open_checkout_url? %>;
+
+  function openDeeplink(abapay_deeplink) {
+    if(isTelegram){
+      window.open(abapay_deeplink, '_blank');
+    } else {
+      window.location.href = abapay_deeplink;
+    }
+  }
+
+  function openAbapayDeeplink(abapay_deeplink) {
+    document.getElementById("vpago_primary_button").style.display = "block";
+    document.getElementById("vpago_primary_button").innerText = "Open ABA Pay";
+    document.getElementById("vpago_primary_button").addEventListener("click", function() {
+      openDeeplink(abapay_deeplink)
     });
 
-  } else {
-    form.submit();
+    openDeeplink(abapay_deeplink)
   }
-});
-</script>
+
+  function openCheckoutUrl(checkout_qr_url, delay = 0) {
+    if(delay > 0) {
+      setTimeout(function() {
+        window.location.href = checkout_qr_url;
+      }, delay);
+    } else {
+      window.location.href = checkout_qr_url;
+    }
+  }
+
+  document.addEventListener("DOMContentLoaded", function () {
+    if (abapayKhqrDeeplink) {
+      var formData = new FormData(document.getElementById("aba_merchant_request"));
+      var checkoutUrl = document.getElementById("aba_merchant_request").action;
+
+      fetch(checkoutUrl, {
+        method: "POST",
+        body: formData
+      })
+      .then(function(response) {
+        return response.json();
+      })
+      .then(function(data) {
+        var shouldDelayBeforeOpenCheckoutUrl = false;
+
+        if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
+          openAbapayDeeplink(data.abapay_deeplink);
+          shouldDelayBeforeOpenCheckoutUrl = true;
+        }
+
+        if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
+          openCheckoutUrl(data.checkout_qr_url, shouldDelayBeforeOpenCheckoutUrl ? 500 : 0);
+        }
+      })
+      .catch(function(error) {
+        console.error("Payment request failed:", error);
+      });
+    } else {
+      document.getElementById("aba_merchant_request").submit();
+    }
+  })
+</script>

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.2-pre15'.freeze
+  VERSION = '2.2.2-pre17'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/payway_v2/base.rb

@@ -4,6 +4,7 @@ module Vpago
       def initialize(payment, options = {})
         @options = options
         @payment = payment
+        @custom_return_deeplink_url = options[:custom_return_deeplink_url]
       end
 
       def req_time
@@ -76,8 +77,7 @@ module Vpago
       end
 
       def payment_option
-        card_option = @payment.payment_method.preferences[:payment_option]
-        Vpago::Payway::CARD_TYPES.index(card_option).nil? ? Vpago::Payway::CARD_TYPE_ABAPAY : card_option
+        @payment.payment_method.preferences[:payment_option]
       end
 
       # optional
@@ -105,6 +105,8 @@ module Vpago
       # redirect to continue URL, let it handle redirecting to app.
       # allowed override to specific app eg. from tg://t.me
       def return_deeplink_url
+        return @custom_return_deeplink_url if @custom_return_deeplink_url.present?
+
         app_scheme = @payment.payment_method.preferences[:app_scheme]
 
         if app_scheme.present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre15
+  version: 2.2.2.pre.pre17
 platform: ruby
 authors:
 - You
@@ -329,6 +329,7 @@ files:
 - app/views/spree/payway_results/success.html.erb
 - app/views/spree/payway_v2_card_popups/_form.html.erb
 - app/views/spree/payway_v2_card_popups/show.html.erb
+- app/views/spree/vpago_payments/_payment_status_listener.html.erb
 - app/views/spree/vpago_payments/checkout.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_payway_v2.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_true_money.html.erb