solidus_six_saferpay 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8848c45b0e022027642158af899f3b1c9d577c2e996f9fefece9f18b98d9d23f
-  data.tar.gz: 6d58c5b848c8afa2b29f3ed61e3af5d59d2972fb4092b91e749ddb9e049fa745
+  metadata.gz: 7202fabe3b8884bc1ab183e397f2ff18c419acd6c654ae75460b25f4c90fe470
+  data.tar.gz: 1e49380bf2304bd3694b307ee6231a73c212f3af216bf24bf44a4dd31f369f8a
 SHA512:
-  metadata.gz: 858c40016a86e47f86b804b58b1196ff9ede4207123923d0a4bb4b2f6ea479eca58eac3d1dc7360ddeedeebe4c058f772a7be09f25b2035f7465d3da14db0cb6
-  data.tar.gz: ef2cff8cdb39f534a610358ba3d66f53261ebd48f7c394e1deb06d379b313db8fa9d375d932fbb0d606a2538d4f8dfd1ef7207a1ee287a5db934273cb331e11c
+  metadata.gz: 6467caba523bb6a51aed70eeacf38f2b45e2bc9b0b9a2c5d43d23e4777ae89cca00bbce71312ce108cb2ce981d8bcf4cc1efebcef8a1abececa3c8170ff87550
+  data.tar.gz: 2b2ee111227b9b7df5de845d3ad471916ac73557379e5d77a7ccf43fac6d6ef4523f4b9d4d69f5c9f5aac8dd32093d37c0c3065cdab035a4c86d4bea98ab8147

data/app/controllers/spree/solidus_six_saferpay/checkout_controller.rb

@@ -4,8 +4,6 @@ module Spree
 
       before_action :load_order
 
-      after_action :allow_embed, only: [:success, :fail]
-
       def init
         payment_method = Spree::PaymentMethod.find(params[:payment_method_id])
         initialized_payment = initialize_payment(@order, payment_method)
@@ -22,7 +20,7 @@ module Spree
         saferpay_payment = Spree::SixSaferpayPayment.where(order_id: @order.id).order(:created_at).last
 
         if saferpay_payment.nil?
-          raise Spree::Core::GatewayError, t('.payment_source_not_created')
+          raise Spree::Core::GatewayError, t('.saferpay_payment_not_found')
         end
 
         # NOTE: PaymentPage payments are authorized directly. Instead, we
@@ -57,20 +55,19 @@ module Spree
       def fail
         saferpay_payment = Spree::SixSaferpayPayment.where(order_id: @order.id).order(:created_at).last
 
-        payment_inquiry = inquire_payment(saferpay_payment)
+        if saferpay_payment
+          payment_inquiry = inquire_payment(saferpay_payment)
+          flash[:error] = payment_inquiry.user_message
+        else
+          flash[:error] = I18n.t(:general_error, scope: [:solidus_six_saferpay, :errors])
+        end
 
         @redirect_path = order_checkout_path(:payment)
-        flash[:error] = payment_inquiry.user_message
         render :iframe_breakout_redirect, layout: false
       end
 
       private
 
-      def allow_embed
-        # allow response to be embedded in iFrame
-        response.headers.except! 'X-Frame-Options'
-      end
-
       def initialize_payment(order, payment_method)
         raise NotImplementedError, "Must be implemented in PaymentPageCheckoutController or TransactionCheckoutController"
       end

data/config/locales/de.yml

@@ -6,7 +6,7 @@ de:
         init:
           checkout_not_initialized: Zahlung konnte nicht gestartet werden.
         success:
-          payment_source_not_created: Six Saferpay Zahlungsquelle konnte nicht erstellt werden.
+          saferpay_payment_not_found: Six Saferpay Zahlung kann nicht gefunden werden.
         fail:
           payment_failed: Die Zahlung konnte nicht abgeschlossen werden.
       payment_page:

data/config/locales/en.yml

@@ -6,7 +6,7 @@ en:
         init:
           checkout_not_initialized: Payment could not be initialized.
         success:
-          payment_source_not_created: Six Saferpay payment source could not be created.
+          saferpay_payment_not_found: Six Saferpay payment can not be found.
         fail:
           payment_failed: The payment could not be completed.
       payment_page:

data/config/locales/fr.yml

@@ -6,7 +6,7 @@ fr:
         init:
           checkout_not_initialized: Le paiement n'a pas pu être initialisé.
         success:
-          payment_source_not_created: La source de paiement Six Saferpay n'a pas pu être créée.
+          saferpay_payment_not_found: Paiement Six Saferpay est introuvable.
         fail:
           payment_failed: Le paiement n'a pas pu être complété.
       payment_page:

data/lib/solidus_six_saferpay/version.rb

@@ -1,3 +1,3 @@
 module SolidusSixSaferpay
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_six_saferpay
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Simon Kiener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: solidus_support
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -178,34 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: ffaker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.11'
 description: Adds Saferpay Payment Page and Transaction payment methods to your Solidus
   application
 email: