Merge branch 'dev' for release 5.5.3

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog Fab-manager
 
+## v5.5.3 2022 November 17
+
+- By default, sort invoices by date in the admin list
+- Fix a bug: unable to reserve a machine with payment on site
+- Fix a security issue: updated loader-utils to 1.4.2 to fix [CVE-2022-37601](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37601), [CVE-2022-37603](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37603) and [CVE-2022-37599](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37599)
+
 ## v5.5.2 2022 November 16
 
 - Fix a bug: unable to export statistics

app/frontend/src/javascript/controllers/admin/invoices.js

@@ -51,7 +51,7 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
     $scope.noMoreResults = false;
 
     // Default invoices ordering/sorting
-    $scope.orderInvoice = '-reference';
+    $scope.orderInvoice = '-date';
 
     // Invoice PDF filename settings (and example)
     $scope.file = {

app/frontend/src/javascript/directives/cart.js

@@ -824,8 +824,8 @@ Application.Directives.directive('cart', ['$rootScope', '$uibModal', 'dialogs',
               ($scope.user.id === $rootScope.currentUser.id && amountToPay > 0)) {
               return payOnline(items);
             } else {
-              if (AuthService.isAuthorized(['admin', 'manager'] && $scope.user.id !== $rootScope.currentUser.id) ||
-                (amountToPay === 0 && !hasOtherDeadlines())) {
+              if ((AuthService.isAuthorized(['admin', 'manager']) && $scope.user.id !== $rootScope.currentUser.id) ||
+                  (amountToPay === 0 && !hasOtherDeadlines())) {
                 return payOnSite(items);
               }
             }

app/models/history_value.rb

@@ -5,13 +5,11 @@ class HistoryValue < Footprintable
   belongs_to :setting
   belongs_to :invoicing_profile
 
+  delegate :user, to: :invoicing_profile
+
   after_create :chain_record
 
   def sort_on_field
     'created_at'
   end
-
-  def user
-    invoicing_profile.user
-  end
 end

package.json

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

yarn.lock

@@ -5373,9 +5373,9 @@ loader-runner@^4.2.0:
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
 loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
-  integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"