spree_vpago 2.2.2.pre.pre36 → 2.2.2.pre.pre38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c041b11de487a906751960209807c501c1c1e2b9fa7be4c902cedc6e566d47
-  data.tar.gz: a619fb9e96d513f5a6d462c56827b9cfce1742a511b5638bb6b81878bcda7606
+  metadata.gz: 6f928f176e0a9faa7c833f8a84357ef1b47b54e90317a746572e82990ec2fb70
+  data.tar.gz: 2575d2d9ed15e63f58efa5ab80efe48a82f21cadef0b42e0277d59b64adfe98e
 SHA512:
-  metadata.gz: be88c1bc4337844f6bb84afa307b78e2e247b4bb89ecdf3a4429878d66184c840652e96ab4715040db92e019915690523c5a84423df4ea8195f04d107fa21be7
-  data.tar.gz: 579c3d7d20e0a19d96e664cd9294435b14a95512490c50b53f5cae93760056285b3bb28b838da89e0758da19040ce5989fc10a2ac6a8685a44b4c22e9df8c204
+  metadata.gz: 1c783db7c54b8692924880f17c19e589e7b0ed097031fd93778e701364e5520c341e02ae1c2bf957ae4c014450d9411bfee35a14e73c27327ce6418e2d903c42
+  data.tar.gz: aa2a7c19225b123ef6e6c1dd1531cef9402fe67c7fbf04da3aa035ab54f46a5214501fbcbb4bf2393f84a602ba813fdf4cbe60910a1aa0937f126c9619a58572

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre36)
+    spree_vpago (2.2.2.pre.pre38)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -128,7 +128,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     base64 (0.3.0)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
     bigdecimal (3.1.8)
     bootstrap (4.6.2.1)
       autoprefixer-rails (>= 9.1.0)
@@ -176,7 +176,7 @@ GEM
       rainbow (>= 2.1.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    doorkeeper (5.8.2)
+    doorkeeper (5.9.0)
       railties (>= 5)
     erubi (1.12.0)
     execjs (2.10.0)
@@ -188,7 +188,7 @@ GEM
     faraday-http-cache (2.5.0)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    faraday-retry (2.3.2)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
     ffaker (2.21.0)
     ffi (1.15.5)
@@ -198,7 +198,7 @@ GEM
     flatpickr (4.6.13.1)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    gapic-common (1.2.0)
+    gapic-common (1.3.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
@@ -227,7 +227,7 @@ GEM
     google-cloud-env (2.3.1)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.5.0)
+    google-cloud-errors (1.6.0)
     google-cloud-firestore (3.1.1)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
@@ -238,11 +238,11 @@ GEM
       gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)
-    google-cloud-location (1.2.1)
+    google-cloud-location (1.3.0)
       gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.33.4)
+    google-protobuf (4.33.6)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.9.0)
@@ -251,7 +251,7 @@ GEM
       grpc (~> 1.41)
     googleapis-common-protos-types (1.22.0)
       google-protobuf (~> 4.26)
-    googleauth (1.16.1)
+    googleauth (1.16.2)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
@@ -259,7 +259,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.76.0)
+    grpc (1.78.1)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)
@@ -593,9 +593,8 @@ GEM
       actionmailer
       spree_core (>= 4.5.3)
       sprockets (>= 4.0)
-    spree_extension (0.1.0)
-      activerecord (>= 4.2)
-      spree_core
+    spree_extension (1.0.2)
+      thor (~> 1.0)
     spree_multi_vendor (2.4.1)
       deface (~> 1.0)
       spree (>= 4.3.0.rc1)

data/app/controllers/spree/admin/payment_payway_queriers_controller.rb

@@ -2,11 +2,11 @@ module Spree
   module Admin
     class PaymentPaywayQueriersController < PaymentPaywayBaseController
       include Spree::Backend::Callbacks
+
       around_action :set_writing_role, only: %i[show]
 
       def show
-        tran_status = transaction_status_service.new(@payment)
-        tran_status.call
+        tran_status = @payment.payment_method.check_transaction(@payment)
 
         if tran_status.success?
           @payment.update_column(:gateway_status, true)
@@ -19,14 +19,6 @@ module Spree
         redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
       end
 
-      def transaction_status_service
-        if @payment.payment_method.type_payway_v2?
-          Vpago::PaywayV2::TransactionStatus
-        elsif @payment.payment_method.type_payway?
-          Vpago::Payway::TransactionStatus
-        end
-      end
-
       private
 
       def set_writing_role

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

@@ -159,7 +159,7 @@ module Spree
       # ABA requires the use of the v2 API, but it does not yet support payout responses.
       # Until v2 fully supports payouts, we fall back to v1 when payouts are enabled.
       # Otherwise, we use v2 by default.
-      checker = if payment.payouts.any?
+      checker = if payment.preload_payout_ids.any?
                   Vpago::PaywayV2::TransactionStatus.new(payment)
                 else
                   Vpago::PaywayV2::TransactionStatusV2.new(payment)

data/app/models/vpago/payment_decorator.rb

@@ -33,6 +33,15 @@ module Vpago
       end
     end
 
+    def preload_payout_ids=(ids)
+      self.private_metadata ||= {}
+      self.private_metadata['preload_payout_ids'] = ids
+    end
+
+    def preload_payout_ids
+      self.private_metadata&.fetch('preload_payout_ids', []) || []
+    end
+
     # override
     def process!
       reset_for_retry! if failed?

data/app/models/vpago/payouts_generator.rb

@@ -39,7 +39,7 @@ module Vpago
 
         # 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)
+        payment.update(amount: payouts.map(&:amount).sum, preload_payout_ids: payouts.map(&:id))
 
         payouts
       end

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

@@ -35,7 +35,11 @@
     redirectContainer.style.removeProperty('display');
   }
 
-  if (abapayKhqrDeeplink) {
+  function submitForm() {
+    document.getElementById("aba_merchant_request").submit();
+  }
+
+  function submitFormViaJs(){
     var formData = new FormData(document.getElementById("aba_merchant_request"));
     var checkoutUrl = document.getElementById("aba_merchant_request").action;
 
@@ -74,9 +78,11 @@
     .catch(function(error) {
       console.error("Payment request failed:", error);
     });
+  }
+
+  if (abapayKhqrDeeplink) {
+    submitFormViaJs();
   } else {
-    document.addEventListener("DOMContentLoaded", function () {
-      document.getElementById("aba_merchant_request").submit();
-    });
+    submitForm();
   }
 </script>

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/payment_request_updater.rb

@@ -52,9 +52,7 @@ module Vpago
       end
 
       def check_payway_status
-        trans_status = Vpago::PaywayV2::TransactionStatus.new(@payment)
-        trans_status.call
-        trans_status
+        @payment.payment_method.check_transaction(@payment)
       end
 
       def items_eligible?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre36
+  version: 2.2.2.pre.pre38
 platform: ruby
 authors:
 - You