Merge remote-tracking branch 'origin' into feature/expense

# Conflicts:
#	internal/router/router.go

internal/repository/analytics_repository.go

@@ -284,6 +284,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Select(`
 			p.id as product_id,
 			p.name as product_name,
+			p.price as product_price,
 			c.id as category_id,
 			c.name as category_name,
 			c.order as category_order,
@@ -342,7 +343,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 	query = r.resolveOutletID(query, outletID, "o.outlet_id")
 
 	err := query.
-		Group("p.id, p.name, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
+		Group("p.id, p.name, p.price, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
 		Order("revenue DESC").
 		Limit(limit).
 		Scan(&results).Error

internal/repository/organization_repository.go

@@ -2,6 +2,8 @@ package repository
 
 import (
 	"context"
+	"time"
+
 	"github.com/google/uuid"
 
 	"apskel-pos-be/internal/entities"
@@ -110,3 +112,29 @@ func (r *OrganizationRepositoryImpl) GetTotalOmset(ctx context.Context, organiza
 		Scan(&total).Error
 	return total, err
 }
+
+// GetTodayOmset returns the total revenue from completed orders for an organization on the current calendar day.
+func (r *OrganizationRepositoryImpl) GetTodayOmset(ctx context.Context, organizationID uuid.UUID) (float64, error) {
+	var total float64
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where(
+			"organization_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ? AND created_at >= ? AND created_at < ?",
+			organizationID, "completed", false, false,
+			todayStart(), tomorrowStart(),
+		).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}
+
+// todayStart returns midnight of the current local day.
+func todayStart() time.Time {
+	now := time.Now()
+	return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+}
+
+// tomorrowStart returns midnight of the next local day.
+func tomorrowStart() time.Time {
+	return todayStart().AddDate(0, 0, 1)
+}

internal/repository/outlet_repository.go

@@ -3,6 +3,7 @@ package repository
 import (
 	"apskel-pos-be/internal/entities"
 	"context"
+	"time"
 
 	"github.com/google/uuid"
 	"gorm.io/gorm"
@@ -103,3 +104,22 @@ func (r *OutletRepositoryImpl) Count(ctx context.Context, filters map[string]int
 	err := query.Count(&count).Error
 	return count, err
 }
+
+// GetTodayOmset returns the total revenue from completed orders for an outlet on the current calendar day.
+func (r *OutletRepositoryImpl) GetTodayOmset(ctx context.Context, outletID uuid.UUID) (float64, error) {
+	var total float64
+	now := time.Now()
+	todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	tomorrowStart := todayStart.AddDate(0, 0, 1)
+
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where(
+			"outlet_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ? AND created_at >= ? AND created_at < ?",
+			outletID, "completed", false, false,
+			todayStart, tomorrowStart,
+		).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}

internal/repository/tx_manager.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"database/sql"
 
 	"gorm.io/gorm"
 )
@@ -37,3 +38,15 @@ func (m *TxManager) WithTransaction(ctx context.Context, fn func(ctx context.Con
 		return fn(ctxTx)
 	})
 }
+
+// WithTransactionOptions runs fn inside a DB transaction with custom TxOptions (e.g. isolation level).
+func (m *TxManager) WithTransactionOptions(ctx context.Context, opts *sql.TxOptions, fn func(ctx context.Context) error) error {
+	if m == nil || m.db == nil {
+		return fn(ctx)
+	}
+
+	return m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		ctxTx := context.WithValue(ctx, txKey, tx)
+		return fn(ctxTx)
+	}, opts)
+}