rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

when generating an avoir, the option "by_wallet" is not present anymore if wallet module is off

Browse Source
This commit is contained in:
Nicolas Florentin 2022-05-02 14:16:55 +02:00
parent 8853c2e076
commit 5cffdff65a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## next deploy
- when generating an avoir, the option "by_wallet" is not present anymore if wallet module is off
## v5.3.13 2022 May 02
- Fix a bug: With PayZen, when there was more than one transaction (for ex: 1 failed atempt + 1 successful atemp), the order was not considered PAID because only the first transaction was checked

5
app/frontend/src/javascript/controllers/admin/invoices.js
View File

@ -1198,9 +1198,12 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal
{ name: _t('app.admin.invoices.by_cash'), value: 'cash' },
{ name: _t('app.admin.invoices.by_cheque'), value: 'cheque' },
{ name: _t('app.admin.invoices.by_transfer'), value: 'transfer' },
{ name: _t('app.admin.invoices.by_wallet'), value: 'wallet' }
];
if (Fablab.walletModule) {
$scope.avoirModes.push({ name: _t('app.admin.invoices.by_wallet'), value: 'wallet' });
}
// If a subscription was took with the current invoice, should it be canceled or not
$scope.subscriptionExpireOptions = {};
$scope.subscriptionExpireOptions[_t('app.shared.buttons.yes')] = true;