From 6a884d6f4fe8021151e3600e538742655b719baf Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Tue, 3 Sep 2024 17:28:05 +0200
Subject: [PATCH 1/2] (bug) manager cannot pay a subscription(payment schedule)
 with a wallet

---
 CHANGELOG.md                                   | 2 ++
 app/frontend/src/javascript/directives/cart.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0337dafb2..01574ac19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next release
 
+- Fix a bug: manager cannot pay a subscription(payment schedule) with a wallet
+
 ## v6.3.31 2024 July 22
 
 - updates translations
diff --git a/app/frontend/src/javascript/directives/cart.js b/app/frontend/src/javascript/directives/cart.js
index 5e89d5bc5..b301d4ffe 100644
--- a/app/frontend/src/javascript/directives/cart.js
+++ b/app/frontend/src/javascript/directives/cart.js
@@ -840,7 +840,7 @@ Application.Directives.directive('cart', ['$rootScope', '$uibModal', 'dialogs',
           return Wallet.getWalletByUser({ user_id: $scope.user.id }, function (wallet) {
             const amountToPay = helpers.getAmountToPay($scope.amountTotal, wallet.amount);
             if ((AuthService.isAuthorized(['member']) && (amountToPay > 0 || (amountToPay === 0 && hasOtherDeadlines()))) ||
-              ($scope.user.id === $rootScope.currentUser.id && amountToPay > 0)) {
+              (AuthService.isAuthorized(['admin', 'manager']) && $scope.user.id === $rootScope.currentUser.id && (amountToPay > 0 || (amountToPay === 0 && hasOtherDeadlines())))) {
               return payOnline(items);
             } else {
               if ((AuthService.isAuthorized(['admin', 'manager']) && $scope.user.id !== $rootScope.currentUser.id) ||

From 7281ad3bd40aecb876e43a296980196b1c1550ac Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Wed, 4 Sep 2024 10:35:07 +0200
Subject: [PATCH 2/2] Version 6.3.32

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01574ac19..d0eadd3e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next release
 
+## v6.3.32 2024 July 22
+
 - Fix a bug: manager cannot pay a subscription(payment schedule) with a wallet
 
 ## v6.3.31 2024 July 22
diff --git a/package.json b/package.json
index f72fdea01..cb9f52d8a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.31",
+  "version": "6.3.32",
   "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",