From 575235283a32610e2f52d89667b7824921dc6058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Wed, 1 Sep 2021 01:04:59 +0100
Subject: [PATCH] fix: issue when saving cassettes 3 and 4

---
 lib/machine-loader.js                         |  4 +-
 lib/new-admin/machines.js                     |  4 +-
 .../MachineComponents/Cassettes/Cassettes.js  | 54 ++++++++++++++++++-
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/lib/machine-loader.js b/lib/machine-loader.js
index cd387efe..a53fb75c 100644
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@@ -127,8 +127,8 @@ function renameMachine (rec) {
 
 function resetCashOutBills (rec) {
   const detailB = notifierUtils.buildDetail({ deviceId: rec.deviceId })
-  const sql = `UPDATE devices SET cassette1=$1, cassette2=$2 WHERE device_id=$3;`
-  return db.none(sql, [rec.cassettes[0], rec.cassettes[1], rec.deviceId]).then(() => notifierQueries.invalidateNotification(detailB, 'fiatBalance'))
+  const sql = `UPDATE devices SET cassette1=$1, cassette2=$2, cassette3=$3, cassette4=$4 WHERE device_id=$5;`
+  return db.none(sql, [rec.cassettes[0], rec.cassettes[1], rec.cassettes[2], rec.cassettes[3], rec.deviceId]).then(() => notifierQueries.invalidateNotification(detailB, 'fiatBalance'))
 }
 
 function emptyCashInBills (rec) {
diff --git a/lib/new-admin/machines.js b/lib/new-admin/machines.js
index 78e2f46a..e2d2ad5e 100644
--- a/lib/new-admin/machines.js
+++ b/lib/new-admin/machines.js
@@ -6,13 +6,13 @@ function getMachine (machineId) {
     .then(machines => machines.find(({ deviceId }) => deviceId === machineId))
 }
 
-function machineAction ({ deviceId, action, cashbox, cassette1, cassette2, newName }) {
+function machineAction ({ deviceId, action, cashbox, cassette1, cassette2, cassette3, cassette4, newName }) {
   return getMachine(deviceId)
     .then(machine => {
       if (!machine) throw new UserInputError(`machine:${deviceId} not found`, { deviceId })
       return machine
     })
-    .then(machineLoader.setMachine({ deviceId, action, cashbox, cassettes: [cassette1, cassette2], newName }))
+    .then(machineLoader.setMachine({ deviceId, action, cashbox, cassettes: [cassette1, cassette2, cassette3, cassette4], newName }))
     .then(getMachine(deviceId))
 }
 
diff --git a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
index 4834d782..86997b5f 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
@@ -40,6 +40,8 @@ const SET_CASSETTE_BILLS = gql`
     $cashbox: Int!
     $cassette1: Int!
     $cassette2: Int!
+    $cassette3: Int!
+    $cassette4: Int!
   ) {
     machineAction(
       deviceId: $deviceId
@@ -47,11 +49,15 @@ const SET_CASSETTE_BILLS = gql`
       cashbox: $cashbox
       cassette1: $cassette1
       cassette2: $cassette2
+      cassette3: $cassette3
+      cassette4: $cassette4
     ) {
       deviceId
       cashbox
       cassette1
       cassette2
+      cassette3
+      cassette4
     }
   }
 `
@@ -119,6 +125,46 @@ const CashCassettes = ({ machine, config, refetchData }) => {
       inputProps: {
         decimalPlaces: 0
       }
+    },
+    {
+      name: 'cassette3',
+      header: 'Cash-out 3',
+      width: 265,
+      stripe: true,
+      view: (value, { deviceId }) => {
+        return (
+          <CashOut
+            className={classes.cashbox}
+            denomination={getCashoutSettings(deviceId)?.cassette2}
+            currency={{ code: fiatCurrency }}
+            notes={value}
+          />
+        )
+      },
+      input: NumberInput,
+      inputProps: {
+        decimalPlaces: 0
+      }
+    },
+    {
+      name: 'cassette4',
+      header: 'Cash-out 4',
+      width: 265,
+      stripe: true,
+      view: (value, { deviceId }) => {
+        return (
+          <CashOut
+            className={classes.cashbox}
+            denomination={getCashoutSettings(deviceId)?.cassette2}
+            currency={{ code: fiatCurrency }}
+            notes={value}
+          />
+        )
+      },
+      input: NumberInput,
+      inputProps: {
+        decimalPlaces: 0
+      }
     }
   ]
 
@@ -126,14 +172,18 @@ const CashCassettes = ({ machine, config, refetchData }) => {
     refetchQueries: () => refetchData()
   })
 
-  const onSave = (...[, { deviceId, cashbox, cassette1, cassette2 }]) => {
+  const onSave = (
+    ...[, { deviceId, cashbox, cassette1, cassette2, cassette3, cassette4 }]
+  ) => {
     return setCassetteBills({
       variables: {
         action: 'setCassetteBills',
         deviceId: deviceId,
         cashbox,
         cassette1,
-        cassette2
+        cassette2,
+        cassette3,
+        cassette4
       }
     })
   }