lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: apply review comments

Browse source
This commit is contained in:
André Sá 2021-11-22 18:42:56 +00:00
parent 6444b20a8c
commit 900756d6f4
4 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js
View file

@ -128,7 +128,7 @@ const WizardStep = ({
const originalCassetteCount = machine?.[cassetteField]
const cassetteDenomination = cashoutSettings?.[cassetteField]
const cassetteCount = values => values[`${step - 1}`] || originalCassetteCount
const cassetteCount = values => values[cassetteField] || originalCassetteCount
const cassetteTotal = values => cassetteCount(values) * cassetteDenomination
const getPercentage = R.pipe(
cassetteCount,
@ -150,7 +150,7 @@ const WizardStep = ({
onSubmit={onContinue}
initialValues={{ wasCashboxEmptied: '' }}
enableReinitialize
validationSchema={steps[step - 1].schema}>
validationSchema={steps[0].schema}>
{({ values }) => (
<Form>
<div
@ -211,7 +211,12 @@ const WizardStep = ({
validateOnBlur={false}
validateOnChange={false}
onSubmit={onContinue}
initialValues={{ 1: '', 2: '', 3: '', 4: '' }}
initialValues={{
cassette1: '',
cassette2: '',
cassette3: '',
cassette4: ''
}}
enableReinitialize
validationSchema={steps[step - 1].schema}>
{({ values }) => (
@ -262,7 +267,7 @@ const WizardStep = ({
decimalPlaces={0}
width={50}
placeholder={originalCassetteCount.toString()}
name={step - 1}
name={cassetteField}
className={classes.cashboxBills}
/>
<P>