spree_vpago 2.4.0.pre.pre1 → 2.4.0.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b281c3ae420620dbd3d1da80ed2bc713c9283292484c1812cd1e9c979e6bf52
-  data.tar.gz: 70b7603d37c2c5e8f434e1ab333e622619296fd1ced75642ea9c0512a7591eb1
+  metadata.gz: e67f9f17cf4c31b88166afade1d7fb6cca4e5d849db06d3437ca2f06495a2a70
+  data.tar.gz: 9d4073b8a168900c3492f27d80034e7396526c5e9cbb139539a77cecbac3d79a
 SHA512:
-  metadata.gz: 718d7eb47ff0a91b7cbcd43d13bd28f4808e008bed9ebee489c913af2d18d5069b5bdc4f06cca8e57693559e96da51a7af8c6e8843e5e01952898c7853c919e1
-  data.tar.gz: dd5f68ec20858da961d36f88a488bd3906d0623baa9f88a3811bbe10957ebd93bf891d047df9b2b8123a549d6881ef8ef32e1c7674144e6dd7901c779e79ae8b
+  metadata.gz: 1d23aff10d339d0c4587645678dba14c8cb0e0e199161ae3f96189ef087fc8fb9345bb39dd826b3b030c1b7ccc5f45b84e866c8f9bb3f0baa5329a3ec97af589
+  data.tar.gz: afdc9d8cd84de339e2ec3323490765e2f2e709c18cbc1655f86dff7ceb60dfdb75fc14f1039b635a7b8877412515ec503395c3176be364af184c91f1008927ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.4.0.pre.pre1)
+    spree_vpago (2.4.0.pre.pre2)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/models/spree/payment_method/cash_on.rb

@@ -11,5 +11,12 @@ module Spree
     def auto_capture?
       true
     end
+
+    # override: Spree::Payment#cancel! calls payment_method.cancel(response_code, payment).
+    # Cash has no gateway to void against, so acknowledge success and let the payment
+    # transition to `void`.
+    def cancel(_response_code, _payment = nil)
+      ActiveMerchant::Billing::Response.new(true, 'Cash On: Payment has been canceled.')
+    end
   end
 end

data/app/models/vpago/order_decorator.rb

@@ -102,7 +102,7 @@ module Vpago
     # override this method if you want flexibility
     # for example, host per payment method or tenant
     def payment_host
-      ENV.fetch('DEFAULT_URL_HOST')
+      ENV.fetch('PAYMENT_BASE_URL')
     end
   end
 end

data/app/services/vpago/payment_redirect_handler.rb

@@ -50,7 +50,7 @@ module Vpago
 
     def process_acleda_gateway
       data = {
-        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/acleda_redirects?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/acleda_redirects?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -81,7 +81,7 @@ module Vpago
     def process_payway_v2_card
       ## TO DO: generate redirect url
       data = {
-        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/payway_v2_card_popups?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/payway_v2_card_popups?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -115,7 +115,7 @@ module Vpago
       end
 
       conn.post(abapay_payment.checkout_url, gateway_params) do |request|
-        request.headers['Referer'] = ENV.fetch('DEFAULT_URL_HOST', nil)
+        request.headers['Referer'] = ENV.fetch('PAYMENT_BASE_URL', nil)
       end
     end
 
@@ -127,7 +127,7 @@ module Vpago
     def process_payway_card
       ## TO DO: generate redirect url
       data = {
-        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/payway_card_popups?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/payway_card_popups?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -135,7 +135,7 @@ module Vpago
 
     def process_wing_gateway
       data = {
-        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/wing_redirects?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/wing_redirects?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -169,7 +169,7 @@ module Vpago
       end
 
       @response = conn.post(abapay_payment.action_url, gateway_params) do |request|
-        request.headers['Referer'] = ENV.fetch('DEFAULT_URL_HOST', nil)
+        request.headers['Referer'] = ENV.fetch('PAYMENT_BASE_URL', nil)
       end
     end
 

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.4.0-pre1'.freeze
+  VERSION = '2.4.0-pre2'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/wing_sdk/base.rb

@@ -33,7 +33,7 @@ module Vpago
       end
 
       def return_url
-        "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/webhook/wings/#{payment_number}/return?app_checkout=#{app_checkout}"
+        "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/webhook/wings/#{payment_number}/return?app_checkout=#{app_checkout}"
       end
 
       def app_checkout

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.4.0.pre.pre1
+  version: 2.4.0.pre.pre2
 platform: ruby
 authors:
 - You