Upstream sync

2018-05-03 07:54:09 +02:00
parent c43ae352a3
commit 282b0a0ee8
16 changed files with 63 additions and 29 deletions
--- a/data/datamysql/user.go
+++ b/data/datamysql/user.go
@@ -784,7 +784,7 @@ func (c *userRepo) getAddressSecondaryData(address entity.Address) (entity.Addre

 // GetAll returns a list of all active cards
 func (c *userRepo) GetAll() (list []entity.User, err error) {
-	return c.parseSet(c.conn.Query(c.getQuery() + " AND a.active = 1 "))
+	return c.parseSet(c.conn.Query(c.getQuery() + " WHERE a.active = 1 "))
 }

 // GetByID returns a single card data by its ID