Merge branch 'dev' for release 5.3.8

CHANGELOG.md

@@ -1,11 +1,18 @@
 # Changelog Fab-manager
 
+## v5.3.8 2022 March 29
+
+- Updated the version of ruby to 2.6.9
+- Fix a bug: unable to show payment schedules list if active PayZen
+- Fix a bug: unable to set user's invoicing profile names and email if active address required in create user form
+- [TODO DEPLOY] `rails fablab:fix:invoices_without_names_and_email`
+
 ## v5.3.7 2022 March 28
 
 - Updated Spanish translations (thanks to [@altieriranedo](https://crowdin.com/profile/altieriranedo))
 - Fix a security issue: updated minimist to 1.2.6 to fix [CVE-2021-44906](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-44906)
 - Fix a security issue: updated node-forge to 1.3.0 to fix [CVE-2022-24771](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24771), [CVE-2022-24772](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24772) and [CVE-2022-24773](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24773)
- 
+
 ## v5.3.6 2022 March 24
 
 - Support for Google Analytics V4

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.7-alpine
+FROM ruby:2.6.9-alpine
 MAINTAINER contact@fab-manager.com
 
 # Install upgrade system packages

app/frontend/src/javascript/components/payment/stripe/stripe-elements.tsx

@@ -27,6 +27,7 @@ export const StripeElements: React.FC = memo(({ children }) => {
       {stripe && <Elements stripe={stripe}>
         {children}
       </Elements>}
+      {!stripe && children}
     </div>
   );
 });

app/models/user.rb

@@ -469,6 +469,8 @@ class User < ApplicationRecord
         first_name: first_name,
         last_name: last_name
       )
+    else
+      update_invoicing_profile
     end
     if wallet.nil?
       ip ||= invoicing_profile

lib/tasks/fablab/fix.rake

@@ -195,5 +195,14 @@ namespace :fablab do
         ip.update_attribute('last_name', ip.user.profile.last_name)
       end
     end
+
+    desc '[release 5.3.8] fix invoicing profiles without names and email'
+    task invoices_without_names_and_email: :environment do
+      InvoicingProfile.where('(first_name IS NULL OR last_name IS NULL OR email IS NULL) AND user_id IS NOT NULL').each do |ip|
+        ip.update_attribute('first_name', ip.user.profile.first_name)
+        ip.update_attribute('last_name', ip.user.profile.last_name)
+        ip.update_attribute('email', ip.user.email)
+      end
+    end
   end
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.3.7",
+  "version": "5.3.8",
   "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",