From f16be1d263a9f0f7a0a89a6520be7a8e4400ebb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Thu, 9 Dec 2021 23:06:24 +0000
Subject: [PATCH] fix: empty cashbox conditional

---
 lib/machine-loader.js                         |  2 +-
 .../MachineComponents/Cassettes/Cassettes.js  | 30 ++-----------------
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/lib/machine-loader.js b/lib/machine-loader.js
index b6859ccc..9e0a7a93 100644
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@@ -142,7 +142,7 @@ function emptyCashInBills (rec) {
 function setCassetteBills (rec) {
   return db.oneOrNone(`SELECT cashbox FROM devices WHERE device_id=$1 LIMIT 1`, [rec.deviceId])
     .then(oldCashboxValue => {
-      if (_.isNil(oldCashboxValue) || rec.cashbox === oldCashboxValue) {
+      if (_.isNil(oldCashboxValue) || rec.cashbox === oldCashboxValue.cashbox) {
         const sql = 'UPDATE devices SET cashbox=$1, cassette1=$2, cassette2=$3, cassette3=$4, cassette4=$5 WHERE device_id=$6'
         return db.none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.cassettes[2], rec.cassettes[3], rec.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 54608d1b..c0b82c94 100644
--- a/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
+++ b/new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js
@@ -82,14 +82,6 @@ const SET_CASSETTE_BILLS = gql`
   }
 `
 
-const CREATE_BATCH = gql`
-  mutation createBatch($deviceId: ID, $cashboxCount: Int) {
-    createBatch(deviceId: $deviceId, cashboxCount: $cashboxCount) {
-      id
-    }
-  }
-`
-
 const CashCassettes = ({ machine, config, refetchData }) => {
   const data = { machine, config }
   const classes = useStyles()
@@ -176,31 +168,15 @@ const CashCassettes = ({ machine, config, refetchData }) => {
     refetchQueries: () => refetchData()
   })
 
-  const [createBatch] = useMutation(CREATE_BATCH)
-
-  const onSave = (_, cashbox, cassette1, cassette2, cassette3, cassette4) => {
-    const oldCashboxCount = machine.cashbox
-    if (cashbox < oldCashboxCount) {
-      createBatch({
-        variables: {
-          deviceId: machine.deviceId,
-          cashboxCount: oldCashboxCount
-        }
-      })
-    }
-
-    return setCassetteBills({
+  const onSave = (_, cashbox, cassettes) =>
+    setCassetteBills({
       variables: {
         action: 'setCassetteBills',
         deviceId: machine.deviceId,
         cashbox,
-        cassette1,
-        cassette2,
-        cassette3,
-        cassette4
+        ...cassettes
       }
     })
-  }
 
   return machine.name ? (
     <>