RubyGems - solidus_six_saferpay - Versions diffs - 0.1.8 → 0.5.0 - Mend

solidus_six_saferpay 0.1.8 → 0.5.0

Files changed (53) hide show

data/app/views/spree/solidus_six_saferpay/checkout/{iframe_breakout_redirect.html.erb → iframe_breakout_redirect.erb} RENAMED Viewed

@@ -1,7 +1,7 @@
 <html>
   <body>
     <script type='text/javascript' charset='utf-8'>
-      window.parent.document.location.href = "<%= @redirect_path %>"
+      window.parent.document.location.replace("<%= @redirect_path %>");
     </script>
   </body>
 </html>

data/config/locales/de.yml CHANGED Viewed

@@ -5,7 +5,9 @@ de:
       checkout: &checkout
         init:
           checkout_not_initialized: Zahlung konnte nicht gestartet werden.
+          order_was_modified_after_confirmation: Bestellung wurde nach der Bestätigung verändert. Bitte starten Sie den Zahlungsvorgang erneut.
         success:
+          error_while_processing_payment: Beim Verarbeiten der Bezahlung ist ein Fehler aufgetreten. Bitte starten Sie den Zahlungsvorgang erneut.
           saferpay_payment_not_found: Six Saferpay Zahlung kann nicht gefunden werden.
         fail:
           payment_failed: Die Zahlung konnte nicht abgeschlossen werden.
@@ -19,6 +21,7 @@ de:
     errors:
       general_error: Bezahlungsfehler
       liability_shift_not_granted:  Haftungsumkehr wurde abgelehnt
+      saferpay_payment_not_found: Saferpay Payment konnte nicht gefunden werden
   six_saferpay:
     error_names:
       ACTION_NOT_SUPPORTED: Die angeforderte Aktion wird im Kontext der Aktion nicht unterstützt un kann mit den Anforderungsdaten nicht ausgeführt werden.

data/config/locales/en.yml CHANGED Viewed

@@ -5,7 +5,9 @@ en:
       checkout: &checkout
         init:
           checkout_not_initialized: Payment could not be initialized.
+          order_was_modified_after_confirmation: Order was modified after confirmation. Please restart the checkout process.
         success:
+          error_while_processing_payment: An error occurred while processing the payment. Please restart the checkout process.
           saferpay_payment_not_found: Six Saferpay payment can not be found.
         fail:
           payment_failed: The payment could not be completed.
@@ -19,6 +21,7 @@ en:
     errors:
       general_error: Payment Error
       liability_shift_not_granted:  Liability Shift was rejected
+      saferpay_payment_not_found: Saferpay Payment could not be found
   six_saferpay:
     error_names:
       ACTION_NOT_SUPPORTED:	The requested action is not supported in the given context or the action can't be executed with the request data.

data/config/locales/fr.yml CHANGED Viewed

@@ -5,7 +5,9 @@ fr:
       checkout: &checkout
         init:
           checkout_not_initialized: Le paiement n'a pas pu être initialisé.
+          order_was_modified_after_confirmation: La commande a été modifiée après confirmation. Veuillez redémarrer le processus de paiement.
         success:
+          error_while_processing_payment: Une erreur s'est produite lors du traitement du paiement. Veuillez redémarrer le processus de paiement.
           saferpay_payment_not_found: Paiement Six Saferpay est introuvable.
         fail:
           payment_failed: Le paiement n'a pas pu être complété.
@@ -18,6 +20,7 @@ fr:
   solidus_six_saferpay:
     errors:
       liability_shift_not_granted:  Le transfert de responsabilité a été rejeté
+      saferpay_payment_not_found: Saferpay Payment est introuvable
   six_saferpay:
     error_names:
       ACTION_NOT_SUPPORTED: l'action demandé n'es pas prise en charge dans le contexte de l'action et ne peut pas être exécutée avec les données de la demande.

data/config/routes.rb CHANGED Viewed

@@ -3,15 +3,15 @@
 Spree::Core::Engine.routes.draw do
   namespace :solidus_six_saferpay do
     namespace :payment_page do
-      get :init, controller: :checkout, defaults: { format: :json }
-      get :success, controller: :checkout
-      get :fail, controller: :checkout
+      get 'init/:order_number', to: 'checkout#init', as: :init, defaults: { format: :json }
+      get 'success/:order_number', to: 'checkout#success', as: :success
+      get 'fail/:order_number', to: 'checkout#fail', as: :fail
     end
     namespace :transaction do
-      get :init, controller: :checkout, defaults: { format: :json }
-      get :success, controller: :checkout
-      get :fail, controller: :checkout
+      get 'init/:order_number', to: 'checkout#init', as: :init, defaults: { format: :json }
+      get 'success/:order_number', to: 'checkout#success', as: :success
+      get 'fail/:order_number', to: 'checkout#fail', as: :fail
     end
   end
 end

data/lib/solidus_six_saferpay/configuration.rb CHANGED Viewed

@@ -2,8 +2,6 @@ module SolidusSixSaferpay
   class Configuration
     include ActiveSupport::Configurable
-    config_accessor(:payment_processing_success_handler)
     config_accessor(:error_handlers) { [] }
   end
 end

data/lib/solidus_six_saferpay/gateway.rb CHANGED Viewed

@@ -5,9 +5,6 @@ module SolidusSixSaferpay
     def initialize(options = {})
       SixSaferpay.configure do |config|
-        config.success_url = options.fetch(:success_url)
-        config.fail_url = options.fetch(:fail_url)
         # Allow config via ENV for static values
         config.customer_id = options.fetch(:customer_id) { ENV.fetch('SIX_SAFERPAY_CUSTOMER_ID') }
         config.terminal_id = options.fetch(:terminal_id) { ENV.fetch('SIX_SAFERPAY_TERMINAL_ID') }
@@ -43,7 +40,7 @@ module SolidusSixSaferpay
       capture(amount, saferpay_payment.transaction_id, options)
     end
-    def capture(amount, transaction_id, options={})
+    def capture(_amount, transaction_id, options={})
       transaction_reference = SixSaferpay::TransactionReference.new(transaction_id: transaction_id)
       payment_capture = SixSaferpay::SixTransaction::Capture.new(transaction_reference: transaction_reference)
@@ -82,15 +79,14 @@ module SolidusSixSaferpay
     end
     # aliased to #refund for compatibility with solidus internals
-    def credit(amount, transaction_id, options = {})
-      refund(amount, transaction_id, options)
+    def credit(amount_cents, transaction_id, options = {})
+      refund(amount_cents, transaction_id, options)
     end
-    def refund(amount, transaction_id, options = {})
+    def refund(amount_cents, transaction_id, options = {})
       payment = Spree::Payment.find_by!(response_code: transaction_id)
-      refund_amount = Spree::Money.new(amount, currency: payment.currency)
-      saferpay_amount = SixSaferpay::Amount.new(value: refund_amount.cents, currency_code: payment.currency)
+      saferpay_amount = SixSaferpay::Amount.new(value: amount_cents, currency_code: payment.currency)
       saferpay_refund = SixSaferpay::Refund.new(amount: saferpay_amount, order_id: payment.order.number)
       capture_reference = SixSaferpay::CaptureReference.new(capture_id: payment.transaction_id)
@@ -99,7 +95,7 @@ module SolidusSixSaferpay
       if refund_response = SixSaferpay::Client.post(payment_refund)
         # actually capture the refund
-        capture(amount, refund_response.transaction.id, options)
+        capture(amount_cents, refund_response.transaction.id, options)
       end
     rescue SixSaferpay::Error => e
@@ -156,7 +152,7 @@ module SolidusSixSaferpay
       )
       payer = SixSaferpay::Payer.new(language_code: I18n.locale, billing_address: billing_address, delivery_address: delivery_address)
-      params = { payment: payment, payer: payer }
+      params = { payment: payment, payer: payer, return_urls: return_urls(order) }
       six_payment_methods = payment_method.enabled_payment_methods
       params.merge!(payment_methods: six_payment_methods) unless six_payment_methods.blank?
@@ -164,6 +160,10 @@ module SolidusSixSaferpay
       params
     end
+    def return_urls(order)
+      raise NotImplementedError, "Must be implemented in PaymentPageGateway or TransactionGateway"
+    end
     def response(success, message, api_response, options = {})
       GatewayResponse.new(success, message, api_response, options)
     end

data/lib/solidus_six_saferpay/payment_page_gateway.rb CHANGED Viewed

@@ -1,15 +1,6 @@
 module SolidusSixSaferpay
   class PaymentPageGateway < Gateway
-    def initialize(options = {})
-      super(
-        options.merge(
-          success_url: url_helpers.solidus_six_saferpay_payment_page_success_url,
-          fail_url: url_helpers.solidus_six_saferpay_payment_page_fail_url
-        )
-      )
-    end
     def inquire(saferpay_payment, options = {})
       inquire_response = perform_assert_request(saferpay_payment, options)
@@ -47,6 +38,14 @@ module SolidusSixSaferpay
       SixSaferpay::SixPaymentPage::Initialize.new(interface_initialize_params(order, payment_method))
     end
+    def return_urls(order)
+      SixSaferpay::ReturnUrls.new(
+        success: url_helpers.solidus_six_saferpay_payment_page_success_url(order.number),
+        fd_fail: url_helpers.solidus_six_saferpay_payment_page_fail_url(order.number),
+        fd_abort: url_helpers.solidus_six_saferpay_payment_page_fail_url(order.number)
+      )
+    end
     def perform_assert_request(saferpay_payment, options = {})
       payment_page_assert = SixSaferpay::SixPaymentPage::Assert.new(token: saferpay_payment.token)
       SixSaferpay::Client.post(payment_page_assert)

data/lib/solidus_six_saferpay/transaction_gateway.rb CHANGED Viewed

@@ -1,15 +1,6 @@
 module SolidusSixSaferpay
   class TransactionGateway < Gateway
-    def initialize(options = {})
-      super(
-        options.merge(
-          success_url: url_helpers.solidus_six_saferpay_transaction_success_url,
-          fail_url: url_helpers.solidus_six_saferpay_transaction_fail_url
-        )
-      )
-    end
     def inquire(saferpay_payment, options = {})
       transaction_inquire = SixSaferpay::SixTransaction::Inquire.new(transaction_reference: saferpay_payment.transaction_id)
       inquire_response = SixSaferpay::Client.post(transaction_inquire)
@@ -43,5 +34,13 @@ module SolidusSixSaferpay
     def interface_initialize_object(order, payment_method)
       SixSaferpay::SixTransaction::Initialize.new(interface_initialize_params(order, payment_method))
     end
+    def return_urls(order)
+      SixSaferpay::ReturnUrls.new(
+        success: url_helpers.solidus_six_saferpay_transaction_success_url(order.number),
+        fd_fail: url_helpers.solidus_six_saferpay_transaction_fail_url(order.number),
+        fd_abort: url_helpers.solidus_six_saferpay_transaction_fail_url(order.number)
+      )
+    end
   end
 end

data/lib/solidus_six_saferpay/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module SolidusSixSaferpay
-  VERSION = '0.1.8'
+  VERSION = '0.5.0'
 end

data/solidus_six_saferpay.gemspec CHANGED Viewed

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
   spec.add_dependency 'solidus_support', '~> 0.4.0'
-  spec.add_dependency "six_saferpay", "~> 2.2"
+  spec.add_dependency "six_saferpay", "~> 2.8.1"
   spec.add_dependency "rails-i18n", "~> 5.1"
   spec.add_development_dependency 'solidus_dev_support'
@@ -39,4 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rails-controller-testing", "~> 1.0", ">= 1.0.4"
   spec.add_development_dependency "pry", "~> 0.12"
   spec.add_development_dependency "pry-rails", "~> 0.3"
+  spec.add_development_dependency "bundler-audit"
 end

data/spec/controllers/spree/solidus_six_saferpay/payment_page/checkout_controller_spec.rb CHANGED Viewed

@@ -1,205 +1,16 @@
 require 'rails_helper'
-RSpec.describe Spree::SolidusSixSaferpay::PaymentPage::CheckoutController, type: :controller do
-  routes { Spree::Core::Engine.routes }
+module Spree
+  module SolidusSixSaferpay
+    RSpec.describe PaymentPage::CheckoutController do
-  let(:user) { create(:user) }
-  let(:order) { create(:order) }
-  let(:payment_method) { create(:saferpay_payment_method_payment_page) }
+      let(:initialize_payment_service_class) { InitializePaymentPage }
+      let(:authorize_payment_service_class) { AssertPaymentPage }
+      let(:process_authorization_service_class) { ProcessPaymentPagePayment }
+      let(:inquire_payment_service_class) { InquirePaymentPagePayment }
-  let(:subject) { described_class.new }
+      it_behaves_like "checkout_controller"
-  before do
-    allow(controller).to receive_messages try_spree_current_user: user
-    allow(controller).to receive_messages current_order: order
-  end
-  describe 'GET init' do
-    let(:success) { false }
-    let(:redirect_url) { '/saferpay/redirect/url' }
-    let(:initialized_payment) { instance_double("Spree::SolidusSixSaferpay::InitializePaymentPage", success?: success, redirect_url: redirect_url) }
-    it 'tries to the saferpay payment' do
-      expect(Spree::SolidusSixSaferpay::InitializePaymentPage).to receive(:call).with(order, payment_method).and_return(initialized_payment)
-      get :init, params: { payment_method_id: payment_method.id }
-    end
-    context 'when payment initialize succeeds' do
-      let(:success) { true }
-      before do
-        allow(Spree::SolidusSixSaferpay::InitializePaymentPage).to receive(:call).with(order, payment_method).and_return(initialized_payment)
-      end
-      it 'returns the redirect_url' do
-        get :init, params: { payment_method_id: payment_method.id }
-        body = JSON.parse(response.body)
-        expect(body["redirect_url"]).to eq(redirect_url)
-      end
-    end
-    context 'when payment initialize fails' do
-      let(:success) { false }
-      before do
-        allow(Spree::SolidusSixSaferpay::InitializePaymentPage).to receive(:call).with(order, payment_method).and_return(initialized_payment)
-      end
-      it 'returns an error' do
-        get :init, params: { payment_method_id: payment_method.id }
-        expect(response.body).to match(/errors/)
-        expect(response.status).to eq(422)
-      end
-    end
-  end
-  describe 'GET success' do
-    context 'when the order is not found' do
-      let(:order) { nil }
-      it 'redirects to the cart page via iframe breakout' do
-        get :success
-        expect(assigns(:redirect_path)).to eq(routes.cart_path)
-        expect(response).to render_template :iframe_breakout_redirect
-      end
-    end
-    context 'when the order is already completed' do
-      let(:order) { create(:order_ready_to_ship) }
-      it 'redirects to the cart page via iframe breakout' do
-        get :success
-        expect(assigns(:redirect_path)).to eq(routes.cart_path)
-        expect(response).to render_template :iframe_breakout_redirect
-      end
-    end
-    context 'when payment could not be created' do
-      let!(:payment) { nil }
-      it 'raises an error because no payment exists' do
-        expect{ get(:success) }.to raise_error(Spree::Core::GatewayError)
-      end
-    end
-    context 'when payment create was successful' do
-      let!(:payment) { create(:six_saferpay_payment, order: order) }
-      let(:assert_success) { false }
-      let(:payment_assert) { instance_double("Spree::SolidusSixSaferpay::AssertPaymentPage", success?: assert_success) }
-      let(:payment_inquiry) { instance_double("Spree::SolidusSixSaferpay::InquirePaymentPagePayment", user_message: "payment inquiry message") }
-      it 'asserts the payment' do
-        expect(Spree::SolidusSixSaferpay::AssertPaymentPage).to receive(:call).with(payment).and_return(payment_assert)
-        expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
-        get :success
-      end
-      context 'when the payment assert is successful' do
-        let(:assert_success) { true }
-        let(:process_success) { false }
-        let(:processed_payment) { instance_double("Spree::SolidusSixSaferpay::ProcessPaymentPagePayment", success?: process_success, user_message: "payment processing message") }
-        before do
-          allow(Spree::SolidusSixSaferpay::AssertPaymentPage).to receive(:call).with(payment).and_return(payment_assert)
-        end
-        it 'processes the asserted payment' do
-          expect(Spree::SolidusSixSaferpay::ProcessPaymentPagePayment).to receive(:call).with(payment).and_return(processed_payment)
-          get :success
-        end
-        context 'when the processing is successful' do
-          let(:process_success) { true }
-          before do
-            allow(Spree::SolidusSixSaferpay::ProcessPaymentPagePayment).to receive(:call).with(payment).and_return(processed_payment)
-          end
-          context 'when order is in payment state' do
-            let(:order) { create(:order, state: :payment) }
-            it 'moves order to next state' do
-              expect(order).to receive(:next!)
-              get :success
-            end
-          end
-          context 'when order is already in complete state' do
-            let(:order) { create(:order, state: :complete) }
-            it 'does not modify the order state' do
-              expect(order).not_to receive(:next!)
-              get :success
-            end
-          end
-        end
-        context 'when the processing fails' do
-          let(:process_success) { false }
-          before do
-            allow(Spree::SolidusSixSaferpay::ProcessPaymentPagePayment).to receive(:call).with(payment).and_return(processed_payment)
-          end
-          it 'displays an error message' do
-            get :success
-            expect(flash[:error]).to eq("payment processing message")
-          end
-        end
-      end
-      context 'when the payment assert fails' do
-        let(:assert_success) { false }
-        before do
-          allow(Spree::SolidusSixSaferpay::AssertPaymentPage).to receive(:call).with(payment).and_return(payment_assert)
-        end
-        it 'inquires the payment' do
-          expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
-          get :success
-        end
-        it 'displays an error message' do
-          expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
-          get :success
-          expect(flash[:error]).to eq("payment inquiry message")
-        end
-      end
-    end
-  end
-  describe 'GET fail' do
-    let!(:payment) { create(:six_saferpay_payment, order: order) }
-    let(:payment_inquiry) { instance_double("Spree::SolidusSixSaferpay::InquirePaymentPagePayment", user_message: "payment inquiry message") }
-    it 'inquires the payment' do
-      expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
-      get :fail
-    end
-    it 'displays an error message' do
-      expect(Spree::SolidusSixSaferpay::InquirePaymentPagePayment).to receive(:call).with(payment).and_return(payment_inquiry)
-      get :fail
-      expect(flash[:error]).to eq("payment inquiry message")
     end
   end
 end