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

fix: count updates and small ui adjustments

Browse source
This commit is contained in:
Rafael Taranto 2024-02-13 21:44:49 +00:00
parent eaa2b69f18
commit 24d0973f12
3 changed files with 95 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/machine-loader.js
View file

@ -182,7 +182,7 @@ function setCassetteBills (rec) {
return getMachine(rec.deviceId) return getMachine(rec.deviceId)
.then(machine => { .then(machine => {
const oldCashboxCount = machine?.cashUnits?.cashbox const oldCashboxCount = machine?.cashUnits?.cashbox
if (_.isNil(oldCashboxCount) || cashbox === oldCashboxCount) { if (_.isNil(oldCashboxCount) || cashbox.toString() === oldCashboxCount.toString()) {
const sql = 'UPDATE devices SET cassette1=$1, cassette2=$2, cassette3=$3, cassette4=$4, recycler1=$5, recycler2=$6, recycler3=$7, recycler4=$8, recycler5=$9, recycler6=$10 WHERE device_id=$11' const sql = 'UPDATE devices SET cassette1=$1, cassette2=$2, cassette3=$3, cassette4=$4, recycler1=$5, recycler2=$6, recycler3=$7, recycler4=$8, recycler5=$9, recycler6=$10 WHERE device_id=$11'
return db.none(sql, [cassette1, cassette2, cassette3, cassette4, recycler1, recycler2, recycler3, recycler4, recycler5, recycler6, rec.deviceId]) return db.none(sql, [cassette1, cassette2, cassette3, cassette4, recycler1, recycler2, recycler3, recycler4, recycler5, recycler6, rec.deviceId])
} }

151
new-lamassu-admin/src/pages/Cashout/helper.js
View file

@ -17,67 +17,90 @@ const widthsByNumberOfUnits = {
7: { machine: 130, cassette: 125 } 7: { machine: 130, cassette: 125 }
} }
const DenominationsSchema = Yup.object().shape({ const denominationKeys = [
cassette1: Yup.number() 'cassette1',
.label('Cassette 1') 'cassette2',
.min(1) 'cassette3',
.nullable() 'cassette4',
.max(CURRENCY_MAX), 'recycler1',
cassette2: Yup.number() 'recycler2',
.label('Cassette 2') 'recycler3',
.min(1) 'recycler4',
.max(CURRENCY_MAX) 'recycler5',
.nullable() 'recycler6'
.transform(transformNumber), ]
cassette3: Yup.number()
.label('Cassette 3') const DenominationsSchema = Yup.object()
.min(1) .shape({
.max(CURRENCY_MAX) cassette1: Yup.number()
.nullable() .label('Cassette 1')
.transform(transformNumber), .min(1)
cassette4: Yup.number() .nullable()
.label('Cassette 4') .max(CURRENCY_MAX),
.min(1) cassette2: Yup.number()
.max(CURRENCY_MAX) .label('Cassette 2')
.nullable() .min(1)
.transform(transformNumber), .max(CURRENCY_MAX)
recycler1: Yup.number() .nullable()
.label('Recycler 1') .transform(transformNumber),
.min(1) cassette3: Yup.number()
.max(CURRENCY_MAX) .label('Cassette 3')
.nullable() .min(1)
.transform(transformNumber), .max(CURRENCY_MAX)
recycler2: Yup.number() .nullable()
.label('Recycler 2') .transform(transformNumber),
.min(1) cassette4: Yup.number()
.max(CURRENCY_MAX) .label('Cassette 4')
.nullable() .min(1)
.transform(transformNumber), .max(CURRENCY_MAX)
recycler3: Yup.number() .nullable()
.label('Recycler 3') .transform(transformNumber),
.min(1) recycler1: Yup.number()
.max(CURRENCY_MAX) .label('Recycler 1')
.nullable() .min(1)
.transform(transformNumber), .max(CURRENCY_MAX)
recycler4: Yup.number() .nullable()
.label('Recycler 4') .transform(transformNumber),
.min(1) recycler2: Yup.number()
.max(CURRENCY_MAX) .label('Recycler 2')
.nullable() .min(1)
.transform(transformNumber), .max(CURRENCY_MAX)
recycler5: Yup.number() .nullable()
.label('Recycler 5') .transform(transformNumber),
.min(1) recycler3: Yup.number()
.max(CURRENCY_MAX) .label('Recycler 3')
.nullable() .min(1)
.transform(transformNumber), .max(CURRENCY_MAX)
recycler6: Yup.number() .nullable()
.label('Recycler 6') .transform(transformNumber),
.min(1) recycler4: Yup.number()
.max(CURRENCY_MAX) .label('Recycler 4')
.nullable() .min(1)
.transform(transformNumber) .max(CURRENCY_MAX)
}) .nullable()
.transform(transformNumber),
recycler5: Yup.number()
.label('Recycler 5')
.min(1)
.max(CURRENCY_MAX)
.nullable()
.transform(transformNumber),
recycler6: Yup.number()
.label('Recycler 6')
.min(1)
.max(CURRENCY_MAX)
.nullable()
.transform(transformNumber)
})
.test((values, context) =>
R.any(key => !R.isNil(values[key]), denominationKeys)
? true
: context.createError({
path: '',
message:
'The recyclers or at least one of the cassettes must have a value'
})
)
const getElements = (machines, locale = {}, classes) => { const getElements = (machines, locale = {}, classes) => {
const fiatCurrency = R.prop('fiatCurrency')(locale) const fiatCurrency = R.prop('fiatCurrency')(locale)
@ -157,8 +180,10 @@ const getElements = (machines, locale = {}, classes) => {
doubleHeader: 'Denominations of Cassettes & Recyclers', doubleHeader: 'Denominations of Cassettes & Recyclers',
isHidden: machine => isHidden: machine =>
it > it >
machines.find(({ deviceId }) => deviceId === machine.id) Math.ceil(
.numberOfRecyclers machines.find(({ deviceId }) => deviceId === machine.id)
.numberOfRecyclers / 2
)
}) })
return R.add(1, it) return R.add(1, it)
}, },

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

@ -159,8 +159,12 @@ const Wizard = ({ machine, cashoutSettings, locale, onClose, save, error }) => {
R.merge(makeCassettesInitialValues(), makeRecyclersInitialValues()) R.merge(makeCassettesInitialValues(), makeRecyclersInitialValues())
const steps = R.pipe( const steps = R.pipe(
R.concat(makeRecyclerSteps(numberOfRecyclers)), R.concat(
R.concat(makeCassetteSteps(numberOfCassettes)), makeRecyclerSteps(
canManuallyLoadRecyclers(machine) ? numberOfRecyclers : 0
)
),
R.concat(makeCassetteSteps(isCashOutDisabled ? 0 : numberOfCassettes)),
R.concat([ R.concat([
{ {
type: 'cashbox', type: 'cashbox',