bugs fixed

repositories/orderRepository.go

@@ -42,11 +42,24 @@ func NewOrderRepository(db *gorm.DB) OrderRepository {
 	return &orderRepository{db: db}
 }
 
+// base backs the tenant and location order lists.
+//
+// It now selects the MONEY columns, and their absence is why every order in
+// the console Sales list read as worth nothing. The values were always stored
+// correctly - an order for 3 x 45 carries landingamount 135 on its line and
+// orderamount 135 on its header, and the orderdetails query below has always
+// selected it. This query simply never asked, so the columns scanned as zero
+// and the screen reported that faithfully.
+//
+// It made a real revenue figure indistinguishable from an order that genuinely
+// booked nothing, which is why the historic orders on several tenants all look
+// worthless.
 const (
 	base = `SELECT DISTINCT a.orderheaderid, a.applocationid, h.locationname AS applocation, a.tenantid, a.locationid, a.partnerid, a.configid, a.categoryid, a.subcategoryid, a.moduleid,
 		a.orderid, a.orderstatus, a.orderdate, a.ordernotes, a.itemcount, a.deliverytime AS deliverydate,
-		a.pending, a.processing, a.ready, a.delivered AS completed, a.cancelled, 
+		a.pending, a.processing, a.ready, a.delivered AS completed, a.cancelled,
 		a.deliverycharge, a.kms,
+		a.orderamount, a.ordervalue, a.taxamount, a.ordercharges,
 		a.customerid, a.pickuplocationid, a.pickupaddress, a.pickuplat, a.pickuplong,
 		a.pickupcustomer, a.pickupcontactno, a.pickuplocation as pickupsuburb, a.pickupcity,
 		a.deliveryid AS deliverycustomerid,  a.deliveryaddress, a.deliverylat, a.deliverylong, a.deliverytype, 
@@ -984,7 +997,7 @@ func (r *orderRepository) GetSalesSummary(tid, lid int, fdate, tdate string) (*m
 
 	totalsQuery := fmt.Sprintf(`
 		SELECT 
-			COALESCE(SUM(COALESCE(ordervalue, 0) + COALESCE(orderamount, 0) + COALESCE(deliveryamt, 0)), 0) AS total_revenue,
+			COALESCE(SUM(COALESCE(ordervalue, 0) + COALESCE(orderamount, 0)), 0) AS total_revenue,
 			COUNT(orderheaderid) AS total_orders
 		FROM orders 
 		WHERE %s`, whereClause)
@@ -1016,7 +1029,7 @@ func (r *orderRepository) GetSalesSummary(tid, lid int, fdate, tdate string) (*m
 	chartQuery := fmt.Sprintf(`
 		SELECT 
 			CAST(orderdate AS DATE) AS date,
-			COALESCE(SUM(COALESCE(ordervalue, 0) + COALESCE(orderamount, 0) + COALESCE(deliveryamt, 0)), 0) AS revenue,
+			COALESCE(SUM(COALESCE(ordervalue, 0) + COALESCE(orderamount, 0)), 0) AS revenue,
 			COUNT(orderheaderid) AS orders
 		FROM orders 
 		WHERE %s
@@ -1050,7 +1063,7 @@ func (r *orderRepository) GetSalesSummary(tid, lid int, fdate, tdate string) (*m
 		cleanTopLocQuery := fmt.Sprintf(`
 			SELECT 
 				COALESCE(l.locationname, 'Unknown') AS locationname,
-				COALESCE(SUM(COALESCE(o.ordervalue, 0) + COALESCE(o.orderamount, 0) + COALESCE(o.deliveryamt, 0)), 0) AS revenue
+				COALESCE(SUM(COALESCE(o.ordervalue, 0) + COALESCE(o.orderamount, 0)), 0) AS revenue
 			FROM orders o
 			LEFT JOIN tenantlocations l ON o.locationid = l.locationid
 			WHERE %s

repositories/userRepository.go

@@ -281,6 +281,15 @@ func (r *userRepository) CreateUser(user models.User) (int, error) {
 	return user.Userid, nil
 }
 
+// GetUserById reads one person back.
+//
+// The app_location join is LEFT, not INNER, and that is the whole fix. A user is
+// not required to belong to an app location, and an INNER JOIN did not "filter"
+// those users — it made them unreadable. CreateUser looks the new row up through
+// here to return it, so creating a store user with no applocationid answered 201
+// with userid 0 and every field blank. The user existed and every listing showed
+// it; only the response meant to confirm the creation came back empty, which
+// reads as a failure that silently succeeded.
 func (r *userRepository) GetUserById(uid int) (models.UserInfo, error) {
 	var user models.UserInfo
 
@@ -289,7 +298,7 @@ func (r *userRepository) GetUserById(uid int) (models.UserInfo, error) {
 			a.userfcmtoken,a.pin,a.deviceid,a.devicetype,a.tenantid,a.shiftid,
 			a.applocationid,b.locationname as applocation,b.latitude as applatitude,b.longitude as applongitude, b.radius as appradius , concat(c.starttime, ' - ', c.endtime) as shiftname, a.status                      
 			FROM app_users a
-			INNER JOIN app_location b on a.applocationid=b.applocationid
+			LEFT JOIN app_location b on a.applocationid=b.applocationid
 			LEFT JOIN ridershifts c ON a.shiftid = c.shiftid
 			WHERE a.userid= ?`