From 0d3eb2e3922003684dbcc345734217a1712ad1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Thu, 14 Jan 2021 13:29:21 +0000 Subject: [PATCH] fix: virtual cassette and denomination min value --- lib/plugins.js | 14 +------------- new-lamassu-admin/src/pages/Cashout/helper.js | 4 ++-- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/lib/plugins.js b/lib/plugins.js index 139a6a34..9e8ba945 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -126,18 +126,6 @@ function plugins (settings, deviceId) { ] } - function getLcmOrBigx2 (n1, n2) { - let big = Math.max(n1, n2); - let small = Math.min(n1, n2); - - let i = big * 2; - while(i % small !== 0){ - i += lar; - } - - return i; - } - function buildAvailableCassettes (excludeTxId) { const cashOutConfig = configManager.getCashOut(deviceId, settings.config) @@ -145,7 +133,7 @@ function plugins (settings, deviceId) { const denominations = [cashOutConfig.top, cashOutConfig.bottom] - const virtualCassettes = [getLcmOrBigx2(cashOutConfig.top, cashOutConfig.bottom)] + const virtualCassettes = [Math.max(cashOutConfig.top, cashOutConfig.bottom) * 2] return Promise.all([dbm.cassetteCounts(deviceId), cashOutHelper.redeemableTxs(deviceId, excludeTxId)]) .then(([rec, _redeemableTxs]) => { diff --git a/new-lamassu-admin/src/pages/Cashout/helper.js b/new-lamassu-admin/src/pages/Cashout/helper.js index 2567f9d8..314985c7 100644 --- a/new-lamassu-admin/src/pages/Cashout/helper.js +++ b/new-lamassu-admin/src/pages/Cashout/helper.js @@ -7,12 +7,12 @@ const DenominationsSchema = Yup.object().shape({ top: Yup.number() .label('Cassette 1 (Top)') .required() - .min(0) + .min(1) .max(currencyMax), bottom: Yup.number() .label('Cassette 2 (Bottom)') .required() - .min(0) + .min(1) .max(currencyMax), zeroConfLimit: Yup.number() .label('0-conf Limit')