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

fix: remove log and fix rebase leftovers

Browse source
This commit is contained in:
José Oliveira 2021-09-24 11:04:11 +01:00
parent e5ea16d83b
commit 8c143ab216
2 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/customers.js
View file

@ -451,12 +451,7 @@ function batch () {
* @returns {array} Array of customers with it's transactions aggregations * @returns {array} Array of customers with it's transactions aggregations
*/ */
function getCustomersList (phone = null, name = null, address = null, id = null) { function getCustomersList (phone = null, name = null, address = null, id = null) {
<<<<<<< HEAD
const sql = `SELECT id, authorized_override, days_suspended, is_suspended, front_camera_path, front_camera_override, const sql = `SELECT id, authorized_override, days_suspended, is_suspended, front_camera_path, front_camera_override,
=======
const sql = `SELECT id, authorized_override, days_suspended, front_camera_path, front_camera_override,
>>>>>>> fix: customer filters not being applied
phone, sms_override, id_card_data, id_card_data_override, id_card_data_expiration, phone, sms_override, id_card_data, id_card_data_override, id_card_data_expiration,
id_card_photo_path, id_card_photo_override, us_ssn, us_ssn_override, sanctions, sanctions_at, id_card_photo_path, id_card_photo_override, us_ssn, us_ssn_override, sanctions, sanctions_at,
sanctions_override, total_txs, total_spent, created AS last_active, fiat AS last_tx_fiat, sanctions_override, total_txs, total_spent, created AS last_active, fiat AS last_tx_fiat,
@ -464,10 +459,7 @@ function getCustomersList (phone = null, name = null, address = null, id = null)
FROM ( FROM (
SELECT c.id, c.authorized_override, SELECT c.id, c.authorized_override,
greatest(0, date_part('day', c.suspended_until - now())) AS days_suspended, greatest(0, date_part('day', c.suspended_until - now())) AS days_suspended,
<<<<<<< HEAD
c.suspended_until > now() AS is_suspended, c.suspended_until > now() AS is_suspended,
=======
>>>>>>> fix: customer filters not being applied
c.front_camera_path, c.front_camera_override, c.front_camera_path, c.front_camera_override,
c.phone, c.sms_override, c.id_card_data, c.id_card_data_override, c.id_card_data_expiration, c.phone, c.sms_override, c.id_card_data, c.id_card_data_override, c.id_card_data_expiration,
c.id_card_photo_path, c.id_card_photo_override, c.us_ssn, c.us_ssn_override, c.sanctions, c.id_card_photo_path, c.id_card_photo_override, c.us_ssn, c.us_ssn_override, c.sanctions,

7
new-lamassu-admin/src/pages/Customers/Customers.js
View file

@ -98,13 +98,6 @@ const Customers = () => {
id: filtersObject.id id: filtersObject.id
}) })
console.log({
phone: filtersObject.phone,
name: filtersObject.name,
address: filtersObject.address,
id: filtersObject.id
})
refetch && refetch() refetch && refetch()
} }