From eda6decae0cd90e91cd3e3e4d844575357d5c39a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Thu, 22 Jul 2021 20:04:23 +0100 Subject: [PATCH] feat: send individual discounts to machine --- lib/loyalty.js | 3 +-- lib/plugins.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/loyalty.js b/lib/loyalty.js index 7e1de54b..d378ed62 100644 --- a/lib/loyalty.js +++ b/lib/loyalty.js @@ -33,8 +33,7 @@ function getAvailableIndividualDiscounts () { id: it.id, idType: _.camelCase(it.identification), value: it.value, - discount: it.discount, - softDeleted: it.soft_deleted + discount: it.discount }), res)) } diff --git a/lib/plugins.js b/lib/plugins.js index 2bce6972..4c7dd893 100644 --- a/lib/plugins.js +++ b/lib/plugins.js @@ -230,6 +230,7 @@ function plugins (settings, deviceId) { const pingPromise = recordPing(deviceTime, machineVersion, machineModel) const currentConfigVersionPromise = fetchCurrentConfigVersion() const currentAvailablePromoCodes = loyalty.getNumberOfAvailablePromoCodes() + const currentAvailableIndividualDiscounts = loyalty.getAvailableIndividualDiscounts() const timezoneObj = { utcOffset: timezone[0], dstOffset: timezone[1] } const promises = [ @@ -241,7 +242,8 @@ function plugins (settings, deviceId) { tickerPromises, balancePromises, testnetPromises, - currentAvailablePromoCodes + currentAvailablePromoCodes, + currentAvailableIndividualDiscounts ) return Promise.all(promises) @@ -252,10 +254,11 @@ function plugins (settings, deviceId) { const cryptoCodesCount = cryptoCodes.length const tickers = arr.slice(4, cryptoCodesCount + 4) const balances = arr.slice(cryptoCodesCount + 4, 2 * cryptoCodesCount + 4) - const testNets = arr.slice(2 * cryptoCodesCount + 4, arr.length - 1) + const testNets = arr.slice(2 * cryptoCodesCount + 4, arr.length - 2) const coinParams = _.zip(cryptoCodes, testNets) const coinsWithoutRate = _.map(mapCoinSettings, coinParams) - const areThereAvailablePromoCodes = arr[arr.length - 1] > 0 + const areThereAvailablePromoCodes = arr[arr.length - 2] > 0 + const individualDiscounts = arr[arr.length - 1] return { cassettes, @@ -264,7 +267,8 @@ function plugins (settings, deviceId) { coins: _.zipWith(_.assign, coinsWithoutRate, tickers), configVersion, areThereAvailablePromoCodes, - timezone: tz + timezone: tz, + individualDiscounts } }) }