spree_vpago 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a01d3dcdc6c3ced08df846438e83619a55e7ae1ef61a2062b8d92cb5563fc09
-  data.tar.gz: 9c3c06510f3dcfc46c8dda76e951675931e91d96b473b3372849610aa38e8de2
+  metadata.gz: e82b6ed2c52fdcd372da38e034ab404db96e14054311146497f22e16e8b0b7cb
+  data.tar.gz: 97deb457994a42b61a6ad0583336d4d0b0b52d14594b4990ee74700754d5a8e3
 SHA512:
-  metadata.gz: 1244b21a9ba3d2eb6dd345e7d5cc7ce318a867d8744a7c8bb40789f77d2be7b85a9c8b4339eec6aa5c732ba5ab31fd756dbe4fd97518b3ab39fd23df1b749a96
-  data.tar.gz: d6b2cc2a7eeb0a9eeb39f1b4d5c6d0d5f9ae09e7c3f2372498a3d2f411f0205076243dbc0d1813a4b2b4c2b15133b2e7cb4cf7645222053df4572070f776e4d2
+  metadata.gz: 2c53f7fbac300190cfe294852eecc82f67f047b2e66021e2f4f3330f80ea5b7632b9aee6543dd6199bef7c17b9a420e537ff1e5cb8174056b5cd567f004aef02
+  data.tar.gz: 7484172952f36a0b0802836dbcec0e9d487535605f16340fd3b4a246c0e8b583cce7a5f36feac1b46edc4886f5cef4fea3771298056076e29660fcf246a60aa2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.1.1)
+    spree_vpago (2.1.2)
       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.1)
+    gapic-common (1.1.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
@@ -242,7 +242,7 @@ GEM
       gapic-common (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.31.1)
+    google-protobuf (4.32.0)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.8.0)
@@ -251,15 +251,15 @@ GEM
       grpc (~> 1.41)
     googleapis-common-protos-types (1.20.0)
       google-protobuf (>= 3.18, < 5.a)
-    googleauth (1.14.0)
+    googleauth (1.15.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 3.0)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.74.1-arm64-darwin)
+    grpc (1.74.1)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)
@@ -479,10 +479,10 @@ GEM
       websocket (~> 1.0)
     shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simplecov (0.22.0)
       docile (~> 1.1)

data/app/models/vpago/line_item_decorator.rb

@@ -52,17 +52,18 @@ module Vpago
     end
 
     def latest_private_metadata
-      private_metadata ||= {}
-
-      private_metadata[:subtotal] = subtotal.to_f
-      private_metadata[:commission_rate] = commission_rate.to_f
-      private_metadata[:commission_amount] = commission_amount.to_f
-      private_metadata[:vendor_pre_tax_amount] = vendor_pre_tax_amount.to_f
-      private_metadata[:pre_commission_amount] = pre_commission_amount.to_f
-      private_metadata[:vendor_tax_total] = vendor_tax_total.to_f
-      private_metadata[:vendor_adjustments_total_excluding_tax] = vendor_adjustments_total_excluding_tax.to_f
-
-      private_metadata
+      # Preserve existing metadata and merge with new financial data
+      updated_private_metadata = (private_metadata || {}).dup
+
+      updated_private_metadata[:subtotal] = subtotal.to_f
+      updated_private_metadata[:commission_rate] = commission_rate.to_f
+      updated_private_metadata[:commission_amount] = commission_amount.to_f
+      updated_private_metadata[:vendor_pre_tax_amount] = vendor_pre_tax_amount.to_f
+      updated_private_metadata[:pre_commission_amount] = pre_commission_amount.to_f
+      updated_private_metadata[:vendor_tax_total] = vendor_tax_total.to_f
+      updated_private_metadata[:vendor_adjustments_total_excluding_tax] = vendor_adjustments_total_excluding_tax.to_f
+
+      updated_private_metadata
     end
 
     # generate metadata for financial reports.

data/app/models/vpago/payment_decorator.rb

@@ -64,6 +64,10 @@ module Vpago
     def vattanac_mini_app_payment?
       payment_method.type_vattanac_mini_app?
     end
+
+    def check_payment?
+      payment_method.type_check?
+    end
   end
 end
 

data/app/models/vpago/payment_method_decorator.rb

@@ -97,6 +97,15 @@ module Vpago
     def type_true_money?
       type == Spree::PaymentMethod::TYPE_TRUE_MONEY
     end
+
+    def type_check?
+      type == 'Spree::PaymentMethod::Check'
+    end
+
+    # @return [String] the image asset path, e.g. "payment_logos/payway-abapay-khqr.png"
+    def payment_icon_path
+      "payment_logos/#{preferred_icon_name.tr('_', ' ').parameterize}.png"
+    end
   end
 end
 

data/app/services/vpago/payments/find_or_create.rb

@@ -39,9 +39,10 @@ module Vpago
           }.compact
 
           payment.source = payment_method.payment_source_class.new(source_attributes)
-          payment.save!
         end
 
+        payment.save!
+
         return failure(payment) if payment.errors.any?
 
         success(order: order)

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.2'.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.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -132,6 +132,18 @@ files:
 - app/.gitkeep
 - app/assets/config/spree_vpago_manifest.js
 - app/assets/images/backend-process.svg
+- app/assets/images/payment_logos/acleda-cards.png
+- app/assets/images/payment_logos/acleda-khqr.png
+- app/assets/images/payment_logos/acleda.png
+- app/assets/images/payment_logos/cheque.png
+- app/assets/images/payment_logos/payway-abapay-khqr.png
+- app/assets/images/payment_logos/payway-abapay.png
+- app/assets/images/payment_logos/payway-alipay.png
+- app/assets/images/payment_logos/payway-cards.png
+- app/assets/images/payment_logos/payway-wechat.png
+- app/assets/images/payment_logos/true-money.png
+- app/assets/images/payment_logos/vattanac-mini-app.png
+- app/assets/images/payment_logos/wingpay.png
 - app/assets/images/vpago/payway/abapay.png
 - app/assets/images/vpago/payway/cards.png
 - app/assets/javascripts/vpago/vpago_payments/payment_processing_listener.js