From 9b90ff04822abfdc30f8f6aee851749ce521e543 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 11 Jun 2021 08:47:55 +0200 Subject: [PATCH 1/4] [bug] unable to process stripe payments with 3DS authentication --- CHANGELOG.md | 4 ++++ app/controllers/api/payments_controller.rb | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e1efa9f2..e2387fa73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab-manager +## v4.7.13 2020 June 11 + +- Fix a bug: unable to process stripe payments with 3DS authentication + ## v4.7.12 2021 June 09 - Fix a bug: unable to process stripe payments diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb index 2d5df145e..8b0104461 100644 --- a/app/controllers/api/payments_controller.rb +++ b/app/controllers/api/payments_controller.rb @@ -34,7 +34,7 @@ class API::PaymentsController < API::ApiController }, { api_key: Setting.get('stripe_secret_key') } ) elsif params[:payment_intent_id].present? - intent = Stripe::PaymentIntent.confirm(params[:payment_intent_id], api_key: Setting.get('stripe_secret_key')) + intent = Stripe::PaymentIntent.confirm(params[:payment_intent_id], {}, { api_key: Setting.get('stripe_secret_key') }) end rescue Stripe::CardError => e # Display error on client diff --git a/package.json b/package.json index 33aad27af..29b1a46cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.7.12", + "version": "4.7.13", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab", From cb4bf36358d9a471c02f48d2e3d710cd2d9656b5 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 30 Sep 2021 14:38:32 +0200 Subject: [PATCH 2/4] updated sassc to 2.4.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b4562b85d..e626a3dda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -140,7 +140,7 @@ GEM i18n (>= 1.6, < 2) faraday (0.17.3) multipart-post (>= 1.2, < 3) - ffi (1.15.1) + ffi (1.15.4) foreman (0.87.0) forgery (0.7.0) friendly_id (5.1.0) @@ -341,7 +341,7 @@ GEM rubyzip (>= 1.3.0) rubyzip (2.3.0) safe_yaml (1.0.5) - sassc (2.2.1) + sassc (2.4.0) ffi (~> 1.9) seed_dump (3.3.1) activerecord (>= 4) From 405afc7333b8f37e0603bc1aecb8f97edff2821a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 30 Sep 2021 14:38:46 +0200 Subject: [PATCH 3/4] Version 4.7.14 --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2387fa73..d4e19837e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog Fab-manager +## v4.7.14 2021 September 30 + +- Fix a bug: update sassc to 2.4.0 to try to fix #270 + ## v4.7.13 2020 June 11 - Fix a bug: unable to process stripe payments with 3DS authentication diff --git a/package.json b/package.json index 29b1a46cb..4460a198d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "4.7.13", + "version": "4.7.14", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab", From c00b8c6cdd63c3d088c3e74453d226198aabbf37 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 30 Sep 2021 14:54:26 +0200 Subject: [PATCH 4/4] try to downgrade sassc to 2.1.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index daf0fbad7..4a2a60c58 100644 --- a/Gemfile +++ b/Gemfile @@ -138,4 +138,4 @@ gem 'icalendar' gem 'tzinfo-data' # compilation of dynamic stylesheets (home page & theme) -gem 'sassc' +gem 'sassc', '= 2.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index e626a3dda..cf7d223c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -341,7 +341,7 @@ GEM rubyzip (>= 1.3.0) rubyzip (2.3.0) safe_yaml (1.0.5) - sassc (2.4.0) + sassc (2.1.0) ffi (~> 1.9) seed_dump (3.3.1) activerecord (>= 4) @@ -484,7 +484,7 @@ DEPENDENCIES rubocop (~> 0.61.1) rubyXL rubyzip (>= 1.3.0) - sassc + sassc (= 2.1.0) seed_dump sha3 sidekiq (>= 6.0.7)