spree_vpago 2.2.2.pre.pre17 → 2.2.2.pre.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a41c53551544436fc2973a85d085bf8dd9712ebd84ae9d6b8d820ffeeea6d5b2
-  data.tar.gz: e0141d5b5968a647843616bfcea9a458c2805215cc78bc3651a999565bed6a59
+  metadata.gz: df57ee8f0d9491a0059e01819c47fd3620f9f9f0602f82c7e9ae4bd4f05fe01c
+  data.tar.gz: 90e49af5baece5e10f5f03f20d99f428e34c1ea50922992957a7f181da3d2e51
 SHA512:
-  metadata.gz: dc3468dcff8511b38149ec840b73c09ed669c0347d0daa84956983edde8b8e4470f23825efc5e662424f6057d008f5ca788623a580cd21f45f3ab726923638a8
-  data.tar.gz: 9ed4fe39e71672992963611effb80f9e781b24b677a9ac040de0b75cf56762d2e210a3c60abde7e3e69a838816715d7969412a92db588de3cf543eba81a39cd2
+  metadata.gz: 5f642f68de641579f20895fa58497b1e6f65852a145aed4d32af5e62bf3dd376867cb71adc7545f3778e273e90610d0d66e201c4192cff713b81dff842986a82
+  data.tar.gz: 7047fb3b5e701621ef108c321c78e46ed8b5e9570b1af3879a6dd8e952e7679483a33640c994d1b19e52db61fc18e48e81150ec9a3f3cf32d64ae41b62a73403

data/Gemfile.lock

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

data/app/controllers/spree/vpago_payments_controller.rb

@@ -18,6 +18,22 @@ module Spree
       @order = @payment.order
     end
 
+    # GET
+    def check_transaction
+      @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify
+      raise ActiveRecord::RecordNotFound unless @payment.present?
+
+      checker = @payment.payment_method.check_transaction(@payment)
+
+      if checker.success?
+        render json: { status: :success }, status: :ok
+      elsif checker.failed?
+        render json: { status: :failed }, status: :payment_required
+      else
+        render json: { status: :pending }, status: :accepted
+      end
+    end
+
     # GET
     def processing
       @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -9,8 +9,10 @@ module Vpago
       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'
+    def render_transaction_checker
+      if @payment.payment_method.support_check_transaction_api?
+        render partial: 'spree/vpago_payments/transaction_checker'
+      end
     end
 
     # when return nil, each payment method should use their default URL.

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

@@ -33,6 +33,11 @@ module Spree
       preferred_abapay_khqr_deeplink_option.in?(%w[open_both open_checkout_url_only])
     end
 
+    # override
+    def support_check_transaction_api?
+      true
+    end
+
     # override
     def default_payout_profile
       Spree::PayoutProfiles::PaywayV2.default
@@ -67,6 +72,12 @@ module Spree
       !enable_pre_auth?
     end
 
+    # override
+    def check_status(payment)
+      checker = check_transaction(payment)
+      checker.success?
+    end
+
     # override
     # authorize is used when pre auth enabled
     def authorize(_amount, _source, gateway_options = {})
@@ -148,14 +159,15 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Payment has been canceled.')
     end
 
-    private
-
+    # override
     def check_transaction(payment)
       checker = Vpago::PaywayV2::TransactionStatus.new(payment)
       checker.call
       checker
     end
 
+    private
+
     def cancel_pre_auth(payment)
       canceler = Vpago::PaywayV2::PreAuthCanceler.new(payment)
       canceler.call

data/app/models/vpago/payment_decorator.rb

@@ -20,6 +20,7 @@ module Vpago
 
       base.delegate :checkout_url,
                     :web_checkout_url,
+                    :check_transaction_url,
                     :processing_url,
                     :success_url,
                     :process_payment_url,

data/app/models/vpago/payment_method_decorator.rb

@@ -35,6 +35,13 @@ module Vpago
     def support_payout? = false
     def support_pre_auth? = false
 
+    # Must be explicitly overridden to true by each payment method.
+    # Payment method must implement check_transaction(payment), and its response
+    # must provide: success?, failed?, pending?.
+    def support_check_transaction_api?
+      false
+    end
+
     # TODO: we have already implement purchase for payway_v2.
     # make sure to implement this on other payment method as well.
     def purchase(_amount, _source, _gateway_options = {})

data/app/services/vpago/payment_url_constructor.rb

@@ -12,6 +12,7 @@ module Vpago
     def checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=app"
     def web_checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=web"
 
+    def check_transaction_url = "#{base_url}/vpago_payments/check_transaction?#{query}"
     def processing_url = "#{base_url}/vpago_payments/processing?#{query}"
 
     def success_url = "#{base_url}/vpago_payments/success?#{query}"

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

@@ -1,35 +1,40 @@
-<%# This partial listens to payment status changes and does not process the payment. %>
+<%# This partial listens to payment status changes from bank 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 %>;
+    var checkTransactionUrl = "<%= j @payment.check_transaction_url %>";
+    var processingUrl = "<%= j @payment.processing_url %>";
+    var pollIntervalMs = 5000;
+    var hasRedirected = false;
+    var intervalId;
 
-    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 %>";
-      },
-    });
+    var pollStatus = function() {
+      if (hasRedirected) return;
+
+      fetch(checkTransactionUrl, {
+        method: "GET",
+        headers: { "Accept": "application/json" },
+        credentials: "same-origin"
+      })
+        .then(function(response) {
+          return response.json().then(function(body) {
+            return { ok: response.ok, body: body };
+          });
+        })
+        .then(function(result) {
+          var status = result.body && result.body.status ? String(result.body.status) : "pending";
+
+          if (status === "success" || status === "failed") {
+            hasRedirected = true;
+            if (intervalId) clearInterval(intervalId);
+            window.location.replace(processingUrl);
+          }
+        })
+        .catch(function() {});
+    };
+
+    intervalId = window.setInterval(pollStatus, pollIntervalMs);
   });
 </script>

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

@@ -5,5 +5,5 @@
 <%# 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_transaction_checker %>
 <%= render_form %>

data/config/routes.rb

@@ -20,6 +20,7 @@ Spree::Core::Engine.add_routes do
   resource :vpago_payments do
     collection do
       get :checkout
+      get :check_transaction
       get :processing
       get :success
 

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.2-pre17'.freeze
+  VERSION = '2.2.2-pre18'.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.2.2.pre.pre17
+  version: 2.2.2.pre.pre18
 platform: ruby
 authors:
 - You