From f1e6e24f05017192e349f7caf13bb4f69a702a8d Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 29 Aug 2023 15:10:53 +0100 Subject: [PATCH] fix: no loading box scenario --- lib/plugins.js | 4 ++-- new-lamassu-admin/src/pages/Cashout/Wizard.js | 3 +++ new-lamassu-admin/src/pages/Cashout/WizardStep.js | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/plugins.js b/lib/plugins.js index 5d8c096a..72d9f337 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -199,7 +199,7 @@ function plugins (settings, deviceId) { denominations.push(cashOutConfig[`cassette${it + 1}`]) }, _.times(_.identity(), _cassettes.numberOfCassettes)) - const virtualCassettes = [Math.max(...denominations) * 2] + const virtualCassettes = denominations.length ? [Math.max(...denominations) * 2] : [] const counts = _cassettes.counts @@ -245,7 +245,7 @@ function plugins (settings, deviceId) { denominations.push([cashOutConfig[`stacker${it + 1}f`], cashOutConfig[`stacker${it + 1}r`]]) }, _.times(_.identity(), _stackers.numberOfStackers)) - const virtualStackers = [Math.max(..._.flatten(denominations)) * 2] + const virtualStackers = denominations.length ? [Math.max(..._.flatten(denominations)) * 2] : [] const counts = _stackers.counts diff --git a/new-lamassu-admin/src/pages/Cashout/Wizard.js b/new-lamassu-admin/src/pages/Cashout/Wizard.js index bb646758..0dc2b67f 100644 --- a/new-lamassu-admin/src/pages/Cashout/Wizard.js +++ b/new-lamassu-admin/src/pages/Cashout/Wizard.js @@ -50,6 +50,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => { const steps = R.concat( R.map( it => ({ + model: 'cassette', type: `cassette${it}`, display: `Cassette ${it}`, component: Autocomplete, @@ -65,6 +66,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => { it => [ { type: `stacker${it}f`, + model: 'stacker', display: `Stacker ${it}F`, component: Autocomplete, inputProps: { @@ -75,6 +77,7 @@ const Wizard = ({ machine, locale, onClose, save, error }) => { }, { type: `stacker${it}r`, + model: 'stacker', display: `Stacker ${it}R`, component: Autocomplete, inputProps: { diff --git a/new-lamassu-admin/src/pages/Cashout/WizardStep.js b/new-lamassu-admin/src/pages/Cashout/WizardStep.js index 097b91f7..f9f372fa 100644 --- a/new-lamassu-admin/src/pages/Cashout/WizardStep.js +++ b/new-lamassu-admin/src/pages/Cashout/WizardStep.js @@ -57,7 +57,7 @@ const WizardStep = ({ const classes = useStyles() const label = isLastStep ? 'Finish' : 'Next' - + const cassetteIcon = getCassetesArtworks()[numberOfCassettes] return ( <>
@@ -114,7 +114,7 @@ const WizardStep = ({ alt="cassette" width="148" height="205" - src={getCassetesArtworks()[numberOfCassettes][step]}> + src={cassetteIcon ? cassetteIcon[step] : null}>