From 17ab75cfa54192fe37034e195164dacc8d0ec456 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 15 Jun 2021 13:05:38 +0200 Subject: [PATCH 01/28] [bug] during the upgrade, unable to detect the target when not explicitly specified --- CHANGELOG.md | 2 ++ setup/upgrade.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6597900b..5606bc5ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: during the upgrade, unable to detect the target when not explicitly specified + ## v5.0.4 2021 June 15 - Ability to disable the public agenda diff --git a/setup/upgrade.sh b/setup/upgrade.sh index 63d686b37..1c9fb469d 100644 --- a/setup/upgrade.sh +++ b/setup/upgrade.sh @@ -88,7 +88,7 @@ target_version() if [[ "$TAG" =~ ^:release-v[\.0-9]+$ ]]; then TARGET=$(echo "$TAG" | grep -Eo '[\.0-9]{5}') - elif [ "$TAG" = ":latest" ]; then + elif [ "$TAG" = ":latest" ] || [ "$TAG" = "" ]; then TARGET=$(\curl -sSL "https://hub.fab-manager.com/api/versions/latest" | jq -r '.semver') else TARGET='custom' From 2a616125c199736d339c6dad08496e08596abaeb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 10:33:52 +0200 Subject: [PATCH 02/28] [bug] unable to sync users on stripe if one of them have an invalid email address --- CHANGELOG.md | 1 + app/workers/sync_objects_on_stripe_worker.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5606bc5ce..efa7e8593 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab-manager - Fix a bug: during the upgrade, unable to detect the target when not explicitly specified +- Fix a bug: unable to sync users on stripe if one of them have an invalid email address ## v5.0.4 2021 June 15 diff --git a/app/workers/sync_objects_on_stripe_worker.rb b/app/workers/sync_objects_on_stripe_worker.rb index 63eb29f1d..4add9fbef 100644 --- a/app/workers/sync_objects_on_stripe_worker.rb +++ b/app/workers/sync_objects_on_stripe_worker.rb @@ -11,10 +11,14 @@ class SyncObjectsOnStripeWorker User.online_payers.each_with_index do |member, index| logger.debug "#{index} / #{total}" begin - stp_customer = member.payment_gateway_object.gateway_object.retrieve + stp_customer = member.payment_gateway_object&.gateway_object&.retrieve StripeWorker.new.create_stripe_customer(member.id) if stp_customer.nil? || stp_customer[:deleted] rescue Stripe::InvalidRequestError - StripeWorker.new.create_stripe_customer(member.id) + begin + StripeWorker.new.create_stripe_customer(member.id) + rescue Stripe::InvalidRequestError => e + puts "Unable to create the customer #{member.id} do to a Stripe error: #{e}" + end end end From 3f0884550323688872e6732db92f236ee1e45586 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 11:44:53 +0200 Subject: [PATCH 03/28] [bug] unable to book a free event --- CHANGELOG.md | 1 + app/frontend/src/javascript/controllers/events.js.erb | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efa7e8593..12ad7c772 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Fix a bug: during the upgrade, unable to detect the target when not explicitly specified - Fix a bug: unable to sync users on stripe if one of them have an invalid email address +- Fix a bug: unable to book a free event ## v5.0.4 2021 June 15 diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb index d25b27740..f0b808715 100644 --- a/app/frontend/src/javascript/controllers/events.js.erb +++ b/app/frontend/src/javascript/controllers/events.js.erb @@ -126,8 +126,8 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve } ]); -Application.Controllers.controller('ShowEventController', ['$scope', '$state', '$stateParams', '$rootScope', 'Event', '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'Slot', 'eventPromise', 'growl', '_t', 'Wallet', 'AuthService', 'helpers', 'dialogs', 'priceCategoriesPromise', 'settingsPromise', - function ($scope, $state, $stateParams, $rootScope, Event, $uibModal, Member, Reservation, Price, CustomAsset, Slot, eventPromise, growl, _t, Wallet, AuthService, helpers, dialogs, priceCategoriesPromise, settingsPromise) { +Application.Controllers.controller('ShowEventController', ['$scope', '$state', '$stateParams', '$rootScope', 'Event', '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'Slot', 'eventPromise', 'growl', '_t', 'Wallet', 'AuthService', 'helpers', 'dialogs', 'priceCategoriesPromise', 'settingsPromise', 'LocalPayment', + function ($scope, $state, $stateParams, $rootScope, Event, $uibModal, Member, Reservation, Price, CustomAsset, Slot, eventPromise, growl, _t, Wallet, AuthService, helpers, dialogs, priceCategoriesPromise, settingsPromise, LocalPayment) { /* PUBLIC SCOPE */ // reservations for the currently shown event @@ -366,7 +366,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' // set the attempting marker $scope.attempting = true; // save the reservation to the API - return Reservation.save(cartItems, function (reservation) { + return LocalPayment.confirm(cartItems, function (reservation) { // reservation successful afterPayment(reservation); return $scope.attempting = false; From 8826cef37196d45da65ae35d37019060042d33f2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 14:07:14 +0200 Subject: [PATCH 04/28] New translations en.yml (French) --- config/locales/fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 909efd963..309799f09 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -525,4 +525,4 @@ fr: payzen_public_key: "Clé publique du client PayZen" payzen_hmac: "Clef HMAC-SHA-256 PayZen" payzen_currency: "Devise PayZen" - public_agenda_module: "Public agenda module" + public_agenda_module: "Module d'agenda public" From f3f6a61461371dfad8658add112f2f5fad583ef3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 14:07:34 +0200 Subject: [PATCH 05/28] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 128ec21bb..908688b9f 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -250,11 +250,11 @@ fr: common_url: "URL commune" common_url_is_required: "L'URL commune est requise." provided_url_is_not_a_valid_url: "L'URL fournie n'est pas une URL valide." - authorization_endpoint: "Terminaison d'autorisation" - oauth2_authorization_endpoint_is_required: "La terminaison d'autorisation OAuth 2 est requise." - provided_endpoint_is_not_valid: "La terminaison fournie n'est pas valide." - token_acquisition_endpoint: "Terminaison d'acquisition du jeton" - oauth2_token_acquisition_endpoint_is_required: "La terminaison d'acquisition du jeton OAuth 2 est requise." + authorization_endpoint: "Point d'accès pour l'autorisation" + oauth2_authorization_endpoint_is_required: "Le point d'accès pour l'autorisation OAuth 2 est requis." + provided_endpoint_is_not_valid: "Le point d'accès fourni n'est pas valide." + token_acquisition_endpoint: "Point d'accès d'acquisition du jeton" + oauth2_token_acquisition_endpoint_is_required: "Le point d'accès d'acquisition du jeton OAuth 2 est requis." profil_edition_url: "URL d'édition du profil" profile_edition_url_is_required: "L'adresse d'édition du profil utilisateur est requise." client_identifier: "Identifiant client" @@ -266,7 +266,7 @@ fr: add_a_match: "Ajouter une correspondance" model: "Modèle" field: "Champ" - api_endpoint_url: "Terminaison/URL de l'API" + api_endpoint_url: "Point d'accès/URL de l'API" api_type: "Type d'API" api_fields: "Champ de l'API" #machine/training slot modification modal From 21a593edf0b8d87566cf0631b6cd1df1ab4404a7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 14:46:47 +0200 Subject: [PATCH 06/28] [bug] can't see the dates for the next booked training session --- CHANGELOG.md | 1 + app/frontend/templates/machines/training_reservation_modal.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12ad7c772..b696463e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - Fix a bug: during the upgrade, unable to detect the target when not explicitly specified - Fix a bug: unable to sync users on stripe if one of them have an invalid email address - Fix a bug: unable to book a free event +- Fix a bug: can't see the dates for the next booked training session, when the user is reserving a machine without the appropriate training ## v5.0.4 2021 June 15 diff --git a/app/frontend/templates/machines/training_reservation_modal.html b/app/frontend/templates/machines/training_reservation_modal.html index 6b986a511..21068196e 100644 --- a/app/frontend/templates/machines/training_reservation_modal.html +++ b/app/frontend/templates/machines/training_reservation_modal.html @@ -3,7 +3,7 @@

{{ 'app.shared.training_reservation_modal.you_must_wait_for_your_training_is_being_validated_by_the_fablab_team_to_book_this_machine' }}

-

{{ 'app.shared.training_reservation_modal.your_training_will_occur_' | translate }} {{machine.current_user_training_reservation.slots[0].start_at | amDateFormat: 'LL'}} : {{machine.current_user_training_reservation.slots[0].start_at | amDateFormat:'LT'}} - {{machine.current_user_training_reservation.slots[0].end_at | amDateFormat:'LT'}}

+

{{ 'app.shared.training_reservation_modal.your_training_will_occur_' | translate }} {{machine.current_user_training_reservation.slots_attributes[0].start_at | amDateFormat: 'LL'}} : {{machine.current_user_training_reservation.slots_attributes[0].start_at | amDateFormat:'LT'}} - {{machine.current_user_training_reservation.slots_attributes[0].end_at | amDateFormat:'LT'}}

From f88e53708dbab5475c8a7dd56ddade1e59b7bb56 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 14:57:59 +0200 Subject: [PATCH 07/28] [bug] invalid link to the user's manual --- CHANGELOG.md | 1 + app/frontend/src/javascript/services/help.js | 2 +- app/frontend/templates/shared/help_modal.html | 2 +- config/locales/app.admin.en.yml | 2 +- config/locales/app.public.en.yml | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b696463e3..f0242576e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fix a bug: unable to sync users on stripe if one of them have an invalid email address - Fix a bug: unable to book a free event - Fix a bug: can't see the dates for the next booked training session, when the user is reserving a machine without the appropriate training +- Fix a bug: invalid link to the user's manual ## v5.0.4 2021 June 15 diff --git a/app/frontend/src/javascript/services/help.js b/app/frontend/src/javascript/services/help.js index c2361366f..784731454 100644 --- a/app/frontend/src/javascript/services/help.js +++ b/app/frontend/src/javascript/services/help.js @@ -28,7 +28,7 @@ Application.Services.factory('Help', ['$rootScope', '$uibModal', '$state', 'Auth // if no tour, just open the guide if (tourName === undefined) { - return window.open('https://github.com/sleede/fab-manager/raw/master/doc/fr/guide_utilisation_fab_manager_v4.7.pdf', '_blank'); + return window.open('http://guide-fr.fab.mn', '_blank'); } $uibModal.open({ diff --git a/app/frontend/templates/shared/help_modal.html b/app/frontend/templates/shared/help_modal.html index f8ac7b62c..fd5256991 100644 --- a/app/frontend/templates/shared/help_modal.html +++ b/app/frontend/templates/shared/help_modal.html @@ -13,7 +13,7 @@
{{ 'app.shared.help.guide' }}
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index ca918cd4c..9e8216fe0 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -1325,7 +1325,7 @@ en: tour: conclusion: title: "Thank you for your attention" - content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" trainings: welcome: title: "Trainings" diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml index facd47981..dd0f01a66 100644 --- a/config/locales/app.public.en.yml +++ b/config/locales/app.public.en.yml @@ -362,7 +362,7 @@ en: tour: conclusion: title: "Thank you for your attention" - content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" welcome: welcome: title: "Welcome to Fab-manager" From 5d1833218772aeb2ee3c11772d96f555b387219d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:03:17 +0200 Subject: [PATCH 08/28] cleaned dockerignore --- .dockerignore | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index f68271ab0..d1d9e2d39 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,13 +1,7 @@ # Ignore bundler config. -.bundle -vendor/cache - config/database.yml -config/application.yml # Ignore database files. -db/*.sqlite3 -db/*.sqlite3-journal postgresql elasticsearch redis @@ -15,7 +9,6 @@ redis # Ignore public assets public/uploads -public/assets public/packs # Ignore all logfiles and tempfiles. @@ -23,8 +16,7 @@ log *.log tmp -# Ignore platform dependent files -*.DS_Store +# Ignore IDE configuration files .idea # PDF invoices @@ -39,10 +31,7 @@ imports # accounting archives accounting -.DS_Store - # Development files -.vagrant Vagrantfile provision .git* From a93477a5b9eea98b2f807465ba4df5d4c7a62fed Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:03:54 +0200 Subject: [PATCH 09/28] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 5186b7f25..2bf2b308e 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1325,7 +1325,7 @@ fr: tour: conclusion: title: "Merci de votre attention" - content: "

Si vous souhaitez relancer cette aide contextuelle, appuyez sur F1 à n'importe quel moment ou cliquez sur [? Aide] depuis le menu utilisateur.

Si vous avez besoin d'aide supplémentaire, vous pouvez consulter le guide d'utilisation disponible en Français.

L'équipe de Fab-manager propose également du support personnalisé (aide à la prise en main, aide à l'installation, personnalisation, etc.), contactez-nous pour plus d'informations.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" trainings: welcome: title: "Formations" From c4ab9212764af9b01478a57a3da9f2e08e9c3513 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:03:55 +0200 Subject: [PATCH 10/28] New translations app.public.en.yml (French) --- config/locales/app.public.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index 0d80c5578..d31594ee8 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -362,7 +362,7 @@ fr: tour: conclusion: title: "Merci de votre attention" - content: "

Si vous souhaitez relancer cette aide contextuelle, appuyez sur F1 à n'importe quel moment ou cliquez sur « ? Aide » depuis le menu utilisateur.

Si vous avez besoin d'aide supplémentaire, vous pouvez consulter le guide d'utilisation disponible en Français.

L'équipe de Fab-manager propose également du support personnalisé (aide à la prise en main, aide à l'installation, personnalisation, etc.), contactez-nous pour plus d'informations.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" welcome: welcome: title: "Bienvenue dans Fab-manager" From d3bc55cba27956a3f50688d2a01b43a31877e3e7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:03:57 +0200 Subject: [PATCH 11/28] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index d7ada6d0b..62a6eddcf 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1325,7 +1325,7 @@ es: tour: conclusion: title: "Thank you for your attention" - content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" trainings: welcome: title: "Trainings" From b9d6df1e82c90e01a215a649f8285ed15a5a3274 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:03:58 +0200 Subject: [PATCH 12/28] New translations app.public.en.yml (Spanish) --- config/locales/app.public.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.es.yml b/config/locales/app.public.es.yml index 0161e5ae9..fab79c729 100644 --- a/config/locales/app.public.es.yml +++ b/config/locales/app.public.es.yml @@ -362,7 +362,7 @@ es: tour: conclusion: title: "Thank you for your attention" - content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" welcome: welcome: title: "Welcome to Fab-manager" From 88163498b094926f062e9b18207a3311bf1d6d2c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:03:59 +0200 Subject: [PATCH 13/28] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 935c89afa..98a36174c 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1325,7 +1325,7 @@ de: tour: conclusion: title: "Vielen Dank für Ihre Aufmerksamkeit" - content: "

Um diese kontextabhängige Hilfe neu zu starten, können Sie jederzeit F1 drücken oder klicken Sie im Benutzermenu auf [? Hilfe].

Zusätzliche Hilfe finden Sie in der Benutzeranleitung (nur auf Französisch).

Das Fab-Manager-Team bietet auch personalisierten Support (Hilfe beim Einstieg, Hilfe bei der Installation, Anpassung etc.), kontaktieren Sie uns für weitere Informationen.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" trainings: welcome: title: "Schulungen" From f60b77e0c5e7a0bd14fed25739ab24d1127b37a4 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:04:01 +0200 Subject: [PATCH 14/28] New translations app.public.en.yml (German) --- config/locales/app.public.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.de.yml b/config/locales/app.public.de.yml index f697c5090..98a52be59 100644 --- a/config/locales/app.public.de.yml +++ b/config/locales/app.public.de.yml @@ -362,7 +362,7 @@ de: tour: conclusion: title: "Vielen Dank für Ihre Aufmerksamkeit" - content: "

Um diese kontextabhängige Hilfe neu zu starten, können Sie jederzeit F1 drücken oder klicken Sie im Benutzermenu auf [? Hilfe].

Zusätzliche Hilfe finden Sie in der Benutzeranleitung (nur auf Französisch).

Das Fab-Manager-Team bietet auch personalisierten Support (Hilfe beim Einstieg, Hilfe bei der Installation, Anpassung etc.), kontaktieren Sie uns für weitere Informationen.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" welcome: welcome: title: "Willkommen bei Fab-Manager" From 52eee3cea2767d6f1a0db23c35699718b80cd72c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:04:02 +0200 Subject: [PATCH 15/28] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 1e2afacd5..a6729cd7e 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1325,7 +1325,7 @@ pt: tour: conclusion: title: "Obrigado pela sua atenção" - content: "

Se você deseja reiniciar esta ajuda contextual, pressione F1 a qualquer momento ou clique em [? Ajuda] do menu do usuário.

Se precisar de ajuda adicional, você pode verificar o guia do usuário (apenas em francês por enquanto).

A equipe do Fab-Gerente também fornece suporte personalizado (ajuda para começar, ajuda com a instalação, personalização, etc.), contacte-nos para mais informações.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" trainings: welcome: title: "Treinamentos" From ea0c2142aee58c13c2f917e01e6ae65b2038de94 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:04:03 +0200 Subject: [PATCH 16/28] New translations app.public.en.yml (Portuguese) --- config/locales/app.public.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index fefe59796..2fecb9edd 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -362,7 +362,7 @@ pt: tour: conclusion: title: "Obrigado pela sua atenção" - content: "

Se você deseja reiniciar esta ajuda contextual, pressione F1 a qualquer momento ou clique em « ? Ajuda » no menu do usuário.

Se precisar de ajuda adicional, você pode verificar o guia do usuário (apenas em francês por enquanto).

A equipe do Fab-Gerente também fornece suporte personalizado (ajuda para começar, ajuda com a instalação, personalização, etc.) , contacte-nos para mais informações.

" + content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" welcome: welcome: title: "Bem-vindo ao Fab-manager" From dc8a4e22cdcf0b186b120817fe33a1a6e0d5c69c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:04:06 +0200 Subject: [PATCH 17/28] New translations app.admin.en.yml (Zulu) --- config/locales/app.admin.zu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 398ebd872..3be982e98 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1325,7 +1325,7 @@ zu: tour: conclusion: title: "crwdns19898:0crwdne19898:0" - content: "crwdns21088:0crwdne21088:0" + content: "crwdns21876:0crwdne21876:0" trainings: welcome: title: "crwdns19902:0crwdne19902:0" From 22135734805739a45a48b66104f615a125a08203 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:04:09 +0200 Subject: [PATCH 18/28] New translations app.public.en.yml (Zulu) --- config/locales/app.public.zu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.zu.yml b/config/locales/app.public.zu.yml index ee83c415f..fa9723697 100644 --- a/config/locales/app.public.zu.yml +++ b/config/locales/app.public.zu.yml @@ -362,7 +362,7 @@ zu: tour: conclusion: title: "crwdns19646:0crwdne19646:0" - content: "crwdns21054:0crwdne21054:0" + content: "crwdns21878:0crwdne21878:0" welcome: welcome: title: "crwdns19650:0crwdne19650:0" From 518fac5ddf2d7dd957fd1cf809ae471fbbb97fed Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:08:16 +0200 Subject: [PATCH 19/28] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index a6729cd7e..b0d202006 100755 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1325,7 +1325,7 @@ pt: tour: conclusion: title: "Obrigado pela sua atenção" - content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

Se você deseja reiniciar esta ajuda contextual, pressione F1 a qualquer momento ou clique em [? Ajuda] do menu do usuário.

Se precisar de ajuda adicional, você pode verificar o guia do usuário (apenas em francês por enquanto).

A equipe do Fab-Gerente também fornece suporte personalizado (ajuda para começar, ajuda com a instalação, personalização, etc.), contacte-nos para mais informações.

" trainings: welcome: title: "Treinamentos" From a4dbc012160791907e36f88dfecefde5c0879314 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:08:17 +0200 Subject: [PATCH 20/28] New translations app.public.en.yml (Portuguese) --- config/locales/app.public.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.pt.yml b/config/locales/app.public.pt.yml index 2fecb9edd..64cb8ec16 100755 --- a/config/locales/app.public.pt.yml +++ b/config/locales/app.public.pt.yml @@ -362,7 +362,7 @@ pt: tour: conclusion: title: "Obrigado pela sua atenção" - content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

Se você deseja reiniciar esta ajuda contextual, pressione F1 a qualquer momento ou clique em « ? Ajuda » no menu do usuário.

Se precisar de ajuda adicional, você pode verificar o guia do usuário (apenas em francês por enquanto).

A equipe do Fab-Gerente também fornece suporte personalizado (ajuda para começar, ajuda com a instalação, personalização, etc.) , contacte-nos para mais informações.

" welcome: welcome: title: "Bem-vindo ao Fab-manager" From 0ecf4191bb0c06d12da3b390b4262dff2e9f1a39 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:08:27 +0200 Subject: [PATCH 21/28] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 2bf2b308e..a47752f66 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1325,7 +1325,7 @@ fr: tour: conclusion: title: "Merci de votre attention" - content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

Si vous souhaitez relancer cette aide contextuelle, appuyez sur F1 à n'importe quel moment ou cliquez sur [? Aide] depuis le menu utilisateur.

Si vous avez besoin d'aide supplémentaire, vous pouvez consulter le guide d'utilisation disponible en Français.

L'équipe de Fab-manager propose également du support personnalisé (aide à la prise en main, aide à l'installation, personnalisation, etc.), contactez-nous pour plus d'informations.

" trainings: welcome: title: "Formations" From 2e7654e6b9ce1e573a158a3865e2215d02c04ed6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:08:29 +0200 Subject: [PATCH 22/28] New translations app.public.en.yml (French) --- config/locales/app.public.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.fr.yml b/config/locales/app.public.fr.yml index d31594ee8..331b252ee 100644 --- a/config/locales/app.public.fr.yml +++ b/config/locales/app.public.fr.yml @@ -362,7 +362,7 @@ fr: tour: conclusion: title: "Merci de votre attention" - content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

Si vous souhaitez relancer cette aide contextuelle, appuyez sur F1 à n'importe quel moment ou cliquez sur « ? Aide » depuis le menu utilisateur.

Si vous avez besoin d'aide supplémentaire, vous pouvez consulter le guide d'utilisation disponible en Français.

L'équipe de Fab-manager propose également du support personnalisé (aide à la prise en main, aide à l'installation, personnalisation, etc.), contactez-nous pour plus d'informations.

" welcome: welcome: title: "Bienvenue dans Fab-manager" From faa649894c23a4d0de5f1971c92e7c068713c167 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:08:33 +0200 Subject: [PATCH 23/28] New translations app.public.en.yml (German) --- config/locales/app.public.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.public.de.yml b/config/locales/app.public.de.yml index 98a52be59..7caeceb66 100644 --- a/config/locales/app.public.de.yml +++ b/config/locales/app.public.de.yml @@ -362,7 +362,7 @@ de: tour: conclusion: title: "Vielen Dank für Ihre Aufmerksamkeit" - content: "

If you want to restart this contextual help, press F1 at any time or click on « ? Help » from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

Um diese kontextabhängige Hilfe neu zu starten, können Sie jederzeit F1 drücken oder klicken Sie im Benutzermenu auf [? Hilfe].

Zusätzliche Hilfe finden Sie in der Benutzeranleitung (nur auf Französisch).

Das Fab-Manager-Team bietet auch personalisierten Support (Hilfe beim Einstieg, Hilfe bei der Installation, Anpassung etc.), kontaktieren Sie uns für weitere Informationen.

" welcome: welcome: title: "Willkommen bei Fab-Manager" From 3d3fec86f4c04077e0a49d5dc8dff58b2edaf407 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:08:36 +0200 Subject: [PATCH 24/28] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 98a36174c..0b724dc6b 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1325,7 +1325,7 @@ de: tour: conclusion: title: "Vielen Dank für Ihre Aufmerksamkeit" - content: "

If you want to restart this contextual help, press F1 at any time or click on [? Help] from the user's menu.

If you need additional help, you can check the user guide (only in French for now).

The Fab-manager's team also provides personalized support (help with getting started, help with installation, customization, etc.), contact-us for more info.

" + content: "

Um diese kontextabhängige Hilfe neu zu starten, können Sie jederzeit F1 drücken oder klicken Sie im Benutzermenu auf [? Hilfe].

Zusätzliche Hilfe finden Sie in der Benutzeranleitung (nur auf Französisch).

Das Fab-Manager-Team bietet auch personalisierten Support (Hilfe beim Einstieg, Hilfe bei der Installation, Anpassung etc.), kontaktieren Sie uns für weitere Informationen.

" trainings: welcome: title: "Schulungen" From f5126084b991fdb6809e680f557e170dd3bce65e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 16 Jun 2021 15:48:45 +0200 Subject: [PATCH 25/28] [bug] unable to sync coupons on stripe --- CHANGELOG.md | 1 + app/workers/sync_objects_on_stripe_worker.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0242576e..a011bc328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fix a bug: unable to book a free event - Fix a bug: can't see the dates for the next booked training session, when the user is reserving a machine without the appropriate training - Fix a bug: invalid link to the user's manual +- Fix a bug: unable to sync coupons on stripe ## v5.0.4 2021 June 15 diff --git a/app/workers/sync_objects_on_stripe_worker.rb b/app/workers/sync_objects_on_stripe_worker.rb index 4add9fbef..859c7285d 100644 --- a/app/workers/sync_objects_on_stripe_worker.rb +++ b/app/workers/sync_objects_on_stripe_worker.rb @@ -26,9 +26,9 @@ class SyncObjectsOnStripeWorker total = Coupon.all.count Coupon.all.each_with_index do |coupon, index| logger.debug "#{index} / #{total}" - Stripe::Coupon.retrieve(c.code, api_key: Setting.get('stripe_secret_key')) + Stripe::Coupon.retrieve(coupon.code, api_key: Setting.get('stripe_secret_key')) rescue Stripe::InvalidRequestError - Stripe::Service.create_coupon(c.id) + Stripe::Service.create_coupon(coupon.id) end w = StripeWorker.new From 33e45fd536ca5c807959d1674aa763b92b4fd8ec Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 18 Jun 2021 17:19:24 +0200 Subject: [PATCH 26/28] [bug] ignored coupon when booking an event with card payment --- CHANGELOG.md | 1 + app/frontend/src/javascript/controllers/events.js.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a011bc328..80bd4367b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fix a bug: can't see the dates for the next booked training session, when the user is reserving a machine without the appropriate training - Fix a bug: invalid link to the user's manual - Fix a bug: unable to sync coupons on stripe +- Fix a bug: ignored coupon when booking an event with card payment ## v5.0.4 2021 June 15 diff --git a/app/frontend/src/javascript/controllers/events.js.erb b/app/frontend/src/javascript/controllers/events.js.erb index f0b808715..b9f4f86ab 100644 --- a/app/frontend/src/javascript/controllers/events.js.erb +++ b/app/frontend/src/javascript/controllers/events.js.erb @@ -715,7 +715,7 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', ' growl.error(_t('app.shared.cart.online_payment_disabled')); } else { $scope.toggleOnlinePaymentModal(() => { - $scope.onlinePayment.cartItems = mkCartItems(reservation, 'card'); + $scope.onlinePayment.cartItems = mkCartItems(reservation, $scope.coupon.applied, 'card'); }); } }; From 263b69dc8b34a22a506f687e936606cc0a443ef1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 18 Jun 2021 17:40:06 +0200 Subject: [PATCH 27/28] [bug] deleting a coupon displays an error message --- CHANGELOG.md | 1 + app/models/coupon.rb | 2 +- config/routes.rb | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80bd4367b..976a376c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fix a bug: invalid link to the user's manual - Fix a bug: unable to sync coupons on stripe - Fix a bug: ignored coupon when booking an event with card payment +- Fix a bug: deleting a coupon displays an error message ## v5.0.4 2021 June 15 diff --git a/app/models/coupon.rb b/app/models/coupon.rb index 235997423..744ad35ba 100644 --- a/app/models/coupon.rb +++ b/app/models/coupon.rb @@ -6,7 +6,7 @@ class Coupon < ApplicationRecord has_many :payment_schedule after_create :create_gateway_coupon - after_commit :delete_gateway_coupon, on: [:destroy] + before_destroy :delete_gateway_coupon validates :name, presence: true validates :code, presence: true diff --git a/config/routes.rb b/config/routes.rb index a5614461c..826887a0b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,9 +78,10 @@ Rails.application.routes.draw do resources :prices, only: %i[index update] do post 'compute', on: :collection end - resources :coupons - post 'coupons/validate' => 'coupons#validate' - post 'coupons/send' => 'coupons#send_to' + resources :coupons do + post 'validate', action: 'validate', on: :collection + post 'send', action: 'send_to', on: :collection + end resources :trainings_pricings, only: %i[index update] From 9509d7b2a6cd3551dbbc9d7a6204e0343fcc555a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 18 Jun 2021 17:43:06 +0200 Subject: [PATCH 28/28] Version 5.0.5 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 976a376c0..f3b4e9988 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +## v5.0.5 2021 June 18 + - Fix a bug: during the upgrade, unable to detect the target when not explicitly specified - Fix a bug: unable to sync users on stripe if one of them have an invalid email address - Fix a bug: unable to book a free event diff --git a/package.json b/package.json index 757730363..944399080 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "5.0.4", + "version": "5.0.5", "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",