Merge pull request #1225 from lamassu/release-10.0.5

Release 10.0.5

deploy/codebase/lamassu-machine-manager.js

@@ -103,12 +103,23 @@ function updateSupervisor (cb) {
   const osuser = getOSUser()
   const services = getServices()
 
-  async.series([
+  const commands = [
     async.apply(command, `cp ${supervisorPath}/* /etc/supervisor/conf.d/`),
-    async.apply(command, `sed -i 's|^user=.*\$|user=${osuser}|;' /etc/supervisor/conf.d/lamassu-browser.conf || true`),
-    async.apply(command, `supervisorctl update ${services}`),
-    async.apply(command, `supervisorctl restart ${services}`),
-  ], err => {
+    async.apply(command, `sed -i 's|^user=.*\$|user=${osuser}|;' /etc/supervisor/conf.d/lamassu-browser.conf || true`)
+  ]
+
+  commands.push(async.apply(command, `supervisorctl update ${services}`))
+  commands.push(async.apply(command, `supervisorctl stop ${services}`))
+
+  if (machineCode == 'aveiro') {
+    LOG("Updating GSR50")
+    commands.push(async.apply(command, `cp ${applicationParentFolder}/lamassu-machine/lib/gsr50/binaries/* /opt/FujitsuGSR50/`))
+    commands.push(async.apply(command, `chmod +x /opt/FujitsuGSR50/FujitsuGSR50`))
+  }
+
+  commands.push(async.apply(command, `supervisorctl restart ${services}`))
+
+  async.series(commands, err => {
     if (err) throw err;
     cb()
   })
@@ -182,10 +193,7 @@ function installDeviceConfig (cb) {
       newDeviceConfig.billDispenser.cassettes = currentDeviceConfig.billDispenser.cassettes
     }
     if (currentDeviceConfig.billValidator) {
-      newDeviceConfig.billValidator.deviceType = currentDeviceConfig.billValidator.deviceType
-      if (currentDeviceConfig.billValidator.rs232) {
-        newDeviceConfig.billValidator.rs232.device = currentDeviceConfig.billValidator.rs232.device
-      }
+      newDeviceConfig.billValidator = currentDeviceConfig.billValidator
     }
     if (currentDeviceConfig.kioskPrinter) {
       newDeviceConfig.kioskPrinter.model = currentDeviceConfig.kioskPrinter.model

lib/brain.js

@@ -1511,6 +1511,7 @@ Brain.prototype.initValidator = function initValidator () {
         console.log('Bill validator connected.')
       },
       {
+        numberOfCashboxes: this.rootConfig.billValidator.cashboxes ?? 1,
         cassettes: this.trader.cassettes,
         recyclers: this.trader.recyclers,
       }

lib/gsr50/gsr50.js

@@ -212,10 +212,11 @@ Gsr50.prototype.processUnitEvent = function processUnitEvent(data) {
   }
 }
 
-Gsr50.prototype.run = function run (cb, { cassettes, recyclers }) {
+Gsr50.prototype.run = function run (cb, { numberOfCashboxes, cassettes, recyclers }) {
   const self = this
 
   this.wss = new WebSocketServer({ port: 9001, host: 'localhost' })
+  this.numberOfCashboxes = numberOfCashboxes
 
   this.wss.on('connection', function (ws) {
     self.ws = ws
@@ -284,17 +285,23 @@ Gsr50.prototype.getDeviceCashUnits = function getDeviceCashUnits () {
 Gsr50.prototype.setDeviceCashUnits = function setDeviceCashUnits (cassettes, recyclers) {
   return this.getDeviceCashUnits()
     .then(res => {
-      let units = {
-        cashbox: {
-          Number: 8,
-          Mode: CASH_UNIT_MODES.CashIn,
-          Position: CASH_UNIT_POSITIONS.cashbox1,
-          Currency: {
-            CurrencyCode: this.fiatCode
-          }
-        }
-      }
-
+      let units = _.reduce(
+        (acc, value) => {
+          return Object.assign(acc, {
+            // cashbox1 is not being used in the c# code, keeping for compatibility
+            [value === 0 ? 'cashbox' : `cashbox${value + 1}`]: {
+              Mode: CASH_UNIT_MODES.CashIn,
+              Position: CASH_UNIT_POSITIONS.cashbox1 + value,
+              Currency: {
+                CurrencyCode: this.fiatCode
+              }
+            }
+          })
+        },
+        {},
+        _.range(0, this.numberOfCashboxes)
+      )
+
       if (cassettes) {
         units = _.reduce(
           (acc, value) => {
@@ -315,8 +322,8 @@ Gsr50.prototype.setDeviceCashUnits = function setDeviceCashUnits (cassettes, rec
           _.range(0, _.size(cassettes))
         )
       }
-    
-      if (recyclers) {
+
+     if (recyclers) {
         units = _.reduce(
           (acc, value) => {
             const realName = RECYCLER_NAMES[value.name]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lamassu-machine",
   "license": "./LICENSE",
-  "version": "10.0.4",
+  "version": "10.0.5",
   "dependencies": {
     "@apollo/client": "3.11.8",
     "@haensl/subset-sum": "^3.0.5",