lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1120 from chaotixkilla/fix-individual-discounts

Browse source 
Fix customer active individual discounts
This commit is contained in:
Rafael Taranto 2022-02-18 19:09:45 +00:00 • committed by GitHub
commit 1d523b6762
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/loyalty.js
View file

@ -37,8 +37,8 @@ function getAvailableIndividualDiscounts () {
}), res)) }), res))
} }
function getCustomerIndividualDiscounts (customerId) { function getCustomerActiveIndividualDiscount (customerId) {
const sql = `SELECT * FROM individual_discounts WHERE customer_id=$1 LIMIT 1` const sql = `SELECT * FROM individual_discounts WHERE customer_id=$1 AND soft_deleted=false LIMIT 1`
return db.oneOrNone(sql, [customerId]).then(res => { return db.oneOrNone(sql, [customerId]).then(res => {
if (!_.isNil(res)) { if (!_.isNil(res)) {
return { return {
@ -68,7 +68,7 @@ module.exports = {
deletePromoCode, deletePromoCode,
getNumberOfAvailablePromoCodes, getNumberOfAvailablePromoCodes,
getAvailableIndividualDiscounts, getAvailableIndividualDiscounts,
getCustomerIndividualDiscounts, getCustomerActiveIndividualDiscount,
createIndividualDiscount, createIndividualDiscount,
deleteIndividualDiscount deleteIndividualDiscount
} }

2
lib/routes/phoneCodeRoutes.js
View file

@ -48,7 +48,7 @@ function addOrUpdateCustomer (req) {
}) })
}) })
.then(customer => { .then(customer => {
return loyalty.getCustomerIndividualDiscounts(customer.id) return loyalty.getCustomerActiveIndividualDiscount(customer.id)
.then(discount => ({ ...customer, discount })) .then(discount => ({ ...customer, discount }))
}) })
} }