feat: add loyalty panel screen and structure

feat: add coupons table

feat: add coupons to schema

fix: coupon schema

feat: coupon table

feat: add coupon top button

feat: add first coupon button

feat: delete coupon

feat: coupon modal

fix: clear discount on modal close

fix: modal input formatting

feat: add new coupons

fix: button positioning

fix: remove loyalty panel sidebar

fix: coupon screen matching specs

fix: coupon modal

feat: send coupon data to machine on poll

fix: available coupons bool

feat: coupon endpoint

feat: transaction discount migration

feat: post-discount rates

refactor: bills

feat: version string

fix: bill saving on db

feat: coupon soft-delete

fix: coupon soft delete

fix: bill receiving

feat: remove cryptoAtoms update during tx

fix: tx trading

fix: bills

feat: start trades rework

fix: remove code

fix: code review

lib/cash-in/cash-in-atomic.js

@@ -44,7 +44,7 @@ function insertNewBills (t, billRows, machineTx) {
   if (_.isEmpty(bills)) return Promise.resolve([])
 
   const dbBills = _.map(cashInLow.massage, bills)
-  const columns = _.keys(dbBills[0])
+  const columns = ['id', 'fiat', 'fiat_code', 'crypto_code', 'cash_in_fee', 'cash_in_txs_id', 'device_time']
   const sql = pgp.helpers.insert(dbBills, columns, 'bills')
 
   return t.none(sql)

lib/cash-in/cash-in-low.js

@@ -11,6 +11,9 @@ const PENDING_INTERVAL_MS = 60 * T.minutes
 const massage = _.flow(_.omit(['direction', 'cryptoNetwork', 'bills', 'blacklisted', 'addressReuse']),
   convertBigNumFields, _.mapKeys(_.snakeCase))
 
+const massageUpdates = _.flow(_.omit(['cryptoAtoms', 'direction', 'cryptoNetwork', 'bills', 'blacklisted', 'addressReuse']),
+  convertBigNumFields, _.mapKeys(_.snakeCase))
+
 module.exports = {toObj, upsert, insert, update, massage, isClearToSend}
 
 function convertBigNumFields (obj) {
@@ -62,7 +65,7 @@ function insert (t, tx) {
 function update (t, tx, changes) {
   if (_.isEmpty(changes)) return Promise.resolve(tx)
 
-  const dbChanges = massage(changes)
+  const dbChanges = isFinalTxStage(changes) ? massage(changes) : massageUpdates(changes)
   const sql = pgp.helpers.update(dbChanges, null, 'cash_in_txs') +
     pgp.as.format(' where id=$1', [tx.id]) + ' returning *'
 
@@ -136,3 +139,7 @@ function isClearToSend (oldTx, newTx) {
     (!oldTx || (!oldTx.sendPending && !oldTx.sendConfirmed)) &&
     (newTx.created > now - PENDING_INTERVAL_MS)
 }
+
+function isFinalTxStage (txChanges) {
+  return txChanges.send
+}

lib/cash-in/cash-in-tx.js

@@ -43,8 +43,8 @@ function post (machineTx, pi) {
     })
 }
 
-function registerTrades (pi, newBills) {
-  _.forEach(bill => pi.buy(bill), newBills)
+function registerTrades (pi, r) {
+  _.forEach(bill => pi.buy(bill, r.tx), r.newBills)
 }
 
 function logAction (rec, tx) {
@@ -92,7 +92,7 @@ function postProcess (r, pi, isBlacklisted, addressReuse) {
     })
   }
 
-  registerTrades(pi, r.newBills)
+  registerTrades(pi, r)
 
   if (!cashInLow.isClearToSend(r.dbTx, r.tx)) return Promise.resolve({})