Merge remote-tracking branch 'origin/release-8.1' into chore/merge-8.1-into-8.6-2023-10-22

This commit is contained in:
Rafael Taranto 2023-10-22 00:57:33 +01:00
commit 416744baf3
31 changed files with 3327 additions and 2533 deletions

View file

@ -1,7 +1,6 @@
const _ = require('lodash/fp')
const crypto = require('crypto')
const pgp = require('pg-promise')()
const dateFormat = require('dateformat')
const { getTimezoneOffset } = require('date-fns-tz')
const { millisecondsToMinutes } = require('date-fns/fp')
@ -471,7 +470,8 @@ function plugins (settings, deviceId) {
logger.debug('notifyConfirmation')
const phone = tx.phone
const timestamp = dateFormat(new Date(), 'UTC:HH:MM Z')
const timestamp = `${(new Date()).toISOString().substring(11, 19)} UTC`
return sms.getSms(CASH_OUT_DISPENSE_READY, phone, { timestamp })
.then(smsObj => {
const rec = {
@ -961,13 +961,13 @@ function plugins (settings, deviceId) {
? '123'
: randomCode()
const timestamp = dateFormat(new Date(), 'UTC:HH:MM Z')
const timestamp = `${(new Date()).toISOString().substring(11, 19)} UTC`
return sms.getSms(CONFIRMATION_CODE, phone, { code, timestamp })
.then(smsObj => {
const rec = {
sms: smsObj
}
return sms.sendMessage(settings, rec)
.then(() => code)
})