solidus_nexio 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e7a1d21b8b503adb8ed4af984442d630cefcf9ef3c1c2352ffe6db02395471'
-  data.tar.gz: 5fd1549e81e00ea69ac0e9a694e3bc6878b74ff749e85bced1683a658ecefa28
+  metadata.gz: 525f2da66654de5e21c691b3b8ff31f1ee0fcf40809add10ee6e8dea028f6b3e
+  data.tar.gz: f2adedc946f2828dba69917915c2aa77f2dad46c5e30d6d5f46fa6328c3b7bdb
 SHA512:
-  metadata.gz: ed778a0e002ef2081a3e76ae963263be45351b6a79be680362d9c786898a709266a29bba46d33eb89a39076cb22dcfe3be7b43ee84fe5dc4abbb00ad67eab937
-  data.tar.gz: 1e74bfa3f155c7e721d9b8dbb6125a1685209d1b26793e80dd190b690c6f173ffa14d5123b5b311a293cd96b2e4b86961b6c65b93ddbf570200d0c26b3168af5
+  metadata.gz: 6b1ec373cc8e04ba09195235eca930f510764f76a9b8aa5be2cc2c6b06aab328d61a07719f4c4845e86e959ab2aff6cc3bdfd92b7669d4676c9f299a2bd3b7cf
+  data.tar.gz: 7fc0b2446f803393c269bd24d749bce5ff4f1642e167189f38c973c027b17411561a8712eb1ea114b9993a1eac0805c8534ef75cb3c685735124ea9a4e07823b

data/app/controllers/solidus_nexio/payment_states_controller.rb

@@ -0,0 +1,16 @@
+module SolidusNexio
+  class PaymentStatesController < Spree::StoreController
+    def show
+      payment_method = PaymentMethod.find(params[:payment_method_id])
+      payment = payment_method.payments.find(params[:payment_id])
+      render json: { data: { state: payment.state } }
+    end
+
+    def capture
+      payment_method = PaymentMethod.find(params[:payment_method_id])
+      payment = payment_method.payments.find(params[:payment_id])
+      @result = payment_method.capture_order_payment(payment, params[:id], params[:status])
+      render :capture, layout: false
+    end
+  end
+end

data/app/controllers/solidus_nexio/payments_controller.rb

@@ -10,19 +10,6 @@ module SolidusNexio
       end
     end
 
-    def show
-      payment_method = PaymentMethod.find(params[:payment_method_id])
-      payment = payment_method.payments.find(params[:payment_id])
-      render json: { data: { state: payment.state } }
-    end
-
-    def capture
-      payment_method = PaymentMethod.find(params[:payment_method_id])
-      payment = payment_method.payments.find(params[:payment_id])
-      @result = payment_method.capture_order_payment(payment, params[:id], params[:status])
-      render :capture, layout: false
-    end
-
     private
 
     def update_params

data/app/models/solidus_nexio/payment_method.rb

@@ -17,7 +17,7 @@ module SolidusNexio
       # nothing needed to be done, as other payments cover order
       return ProcessResult.new(:success, :absent) unless payment
 
-      callback_url = Engine.routes.url_helpers.capture_payment_method_payment_url(self, payment)
+      callback_url = Engine.routes.url_helpers.capture_payment_method_payment_state_url(self, payment)
       payment.instance_variable_set(:@nexio_callback_url, callback_url)
 
       begin
@@ -31,7 +31,7 @@ module SolidusNexio
         payment.save!
         ProcessResult.new(:three_d_secure, {
           redirect_url: redirect_url,
-          check_path: Engine.routes.url_helpers.payment_method_payment_path(self, payment)
+          check_path: Engine.routes.url_helpers.payment_method_payment_state_path(self, payment)
         })
       ensure
         payment.remove_instance_variable(:@nexio_callback_url)

data/config/routes.rb

@@ -4,8 +4,10 @@ SolidusNexio::Engine.routes.draw do
   resources :payment_methods, only: [] do
     resources :one_time_tokens, only: %i[create]
     resources :credit_cards, only: %i[create]
-    resources :payments, only: %i[create show], param: :payment_id do
-      get :capture, on: :member
+    resources :payments, only: %i[create] do
+      resource :state, only: %i[show], controller: 'payment_states' do
+        get :capture
+      end
     end
   end
   resources :webhooks, only: :create

data/lib/solidus_nexio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusNexio
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_nexio
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Whitespectre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,13 +97,14 @@ files:
 - app/controllers/solidus_nexio/base_payment_controller.rb
 - app/controllers/solidus_nexio/credit_cards_controller.rb
 - app/controllers/solidus_nexio/one_time_tokens_controller.rb
+- app/controllers/solidus_nexio/payment_states_controller.rb
 - app/controllers/solidus_nexio/payments_controller.rb
 - app/controllers/solidus_nexio/webhooks_controller.rb
 - app/helpers/solidus_nexio/checkout_helper.rb
 - app/models/solidus_nexio/payment_method.rb
 - app/models/solidus_nexio/webhook.rb
 - app/services/solidus_nexio/nexio_data.rb
-- app/views/solidus_nexio/payments/capture.html.erb
+- app/views/solidus_nexio/payment_states/capture.html.erb
 - app/views/spree/admin/payments/source_forms/_nexio_own_form.html.erb
 - app/views/spree/admin/payments/source_views/_nexio_own_form.html.erb
 - app/views/spree/checkout/existing_payment/_nexio_own_form.html.erb