fix sales

Reviewed-on: #1

Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y ca-certificates tzdata curl && rm -rf /
 RUN groupadd -r appuser && useradd -r -g appuser appuser
 COPY --from=build /out/app /app
 ENV TZ=Asia/Jakarta
-EXPOSE 3300
+EXPOSE 4000
 HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
   CMD curl -fsS http://localhost:3300/health || exit 1
 USER appuser

deployment.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 APP_NAME="apskel-pos"
-PORT="3300"
+PORT="4000"
 
 echo "🔄 Pulling latest code..."
 git pull

internal/middleware/cors.go

@@ -6,7 +6,11 @@ import (
 
 func CORS() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		c.Header("Access-Control-Allow-Origin", "*")
+		origin := c.Request.Header.Get("Origin")
+		if origin == "" {
+			origin = "*"
+		}
+		c.Header("Access-Control-Allow-Origin", origin)
 		c.Header("Access-Control-Allow-Credentials", "true")
 		c.Header("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
 		c.Header("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT, DELETE")

internal/repository/analytics_repository.go

@@ -77,33 +77,43 @@ func (r *AnalyticsRepositoryImpl) GetSalesAnalytics(ctx context.Context, organiz
 		dateFormat = "DATE(o.created_at)"
 	}
 
-	query := r.db.WithContext(ctx).
+	outletFilter := ""
-		Table("orders o").
+	args := []interface{}{organizationID, false, false, string(entities.PaymentStatusCompleted), dateFrom, dateTo}
-		Select(`
+	if outletID != nil {
+		outletFilter = "AND o.outlet_id = ?"
+		args = append(args, *outletID)
+	}
+
+	rawQuery := `
+		SELECT
 			` + dateFormat + ` as date,
 			COALESCE(SUM(o.total_amount), 0) as sales,
 			COUNT(o.id) as orders,
-			COALESCE(SUM(CASE WHEN oi.status != 'cancelled' AND oi.is_fully_refunded = false THEN oi.quantity - COALESCE(oi.refund_quantity, 0) ELSE 0 END), 0) as items,
+			COALESCE(SUM(oi_agg.total_items), 0) as items,
 			COALESCE(SUM(o.tax_amount), 0) as tax,
 			COALESCE(SUM(o.discount_amount), 0) as discount,
 			COALESCE(SUM(o.total_amount - o.tax_amount - o.discount_amount), 0) as net_sales
-		`).
+		FROM orders o
-		Joins("LEFT JOIN order_items oi ON o.id = oi.order_id").
+		LEFT JOIN (
-		Where("o.organization_id = ?", organizationID).
+			SELECT
-		Where("o.is_void = ?", false).
+				oi.order_id,
-		Where("o.is_refund = ?", false).
+				SUM(oi.quantity - COALESCE(oi.refund_quantity, 0)) as total_items
-		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+			FROM order_items oi
-		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
+			WHERE oi.status != 'cancelled'
-
+			  AND oi.is_fully_refunded = false
-	if outletID != nil {
+			GROUP BY oi.order_id
-		query = query.Where("o.outlet_id = ?", *outletID)
+		) oi_agg ON oi_agg.order_id = o.id
-	}
+		WHERE o.organization_id = ?
-
+		  AND o.is_void = ?
-	err := query.
+		  AND o.is_refund = ?
-		Group("date").
+		  AND o.payment_status = ?
-		Order("date ASC").
+		  AND o.created_at >= ? AND o.created_at <= ?
-		Scan(&results).Error
+		  ` + outletFilter + `
+		GROUP BY date
+		ORDER BY date ASC
+	`
 
+	err := r.db.WithContext(ctx).Raw(rawQuery, args...).Scan(&results).Error
 	return results, err
 }
 

internal/service/order_service.go

@@ -483,7 +483,7 @@ func (s *OrderServiceImpl) validateCreatePaymentRequest(req *models.CreatePaymen
 				return fmt.Errorf("order item ID is required for payment item %d", i+1)
 			}
 
-			if item.Amount <= 0 {
+			if item.Amount < 0 {
 				return fmt.Errorf("payment item amount must be greater than zero for item %d", i+1)
 			}