feat: update product analytic

Reviewed-on: #14

Makefile

@@ -83,6 +83,12 @@ migration-up:
 migration-down:
 	@migrate -database $(DB_URL) -path ./migrations down 1
 
+# Force migration to specific version
+
+.SILENT: migration-force
+migration-force:
+	@migrate -database $(DB_URL) -path ./migrations force $(version)
+
 .SILENT: seeder-create
 seeder-create:
 	@migrate create -ext sql -dir ./seeders -seq $(name)

internal/app/app.go

@@ -48,6 +48,7 @@ func (a *App) Initialize(cfg *config.Config) error {
 	// Initialize omset milestone scheduler
 	a.omsetScheduler = service.NewOmsetMilestoneScheduler(
 		repos.organizationRepo,
+		repos.outletRepo,
 		repos.userRepo,
 		processors.notificationProcessor,
 	)
@@ -135,15 +136,18 @@ func (a *App) Initialize(cfg *config.Config) error {
 		services.productOutletPriceService,
 		validators.productOutletPriceValidator,
 		selfOrderHandler,
+		services.expenseService,
+		validators.expenseValidator,
+		a.redisClient,
 	)
 
 	return nil
 }
 
 func (a *App) Start(port string) error {
-	// Start the omset milestone scheduler (checks every hour)
+	// Start the omset milestone scheduler (checks every 5 minutes for daily omset milestones)
 	if a.omsetScheduler != nil {
-		a.omsetScheduler.Start(1 * time.Hour)
+		a.omsetScheduler.Start(5 * time.Minute)
 	}
 
 	engine := a.router.Init()
@@ -236,6 +240,7 @@ type repositories struct {
 	notificationReceiverRepo       *repository.NotificationReceiverRepositoryImpl
 	notificationDeliveryRepo       *repository.NotificationDeliveryRepositoryImpl
 	productOutletPriceRepo         *repository.ProductOutletPriceRepositoryImpl
+	expenseRepo                    *repository.ExpenseRepositoryImpl
 }
 
 func (a *App) initRepositories() *repositories {
@@ -288,6 +293,7 @@ func (a *App) initRepositories() *repositories {
 		notificationReceiverRepo:       repository.NewNotificationReceiverRepository(a.db),
 		notificationDeliveryRepo:       repository.NewNotificationDeliveryRepository(a.db),
 		productOutletPriceRepo:         repository.NewProductOutletPriceRepositoryImpl(a.db),
+		expenseRepo:                    repository.NewExpenseRepositoryImpl(a.db),
 	}
 }
 
@@ -333,6 +339,7 @@ type processors struct {
 	userDeviceProcessor                 *processor.UserDeviceProcessorImpl
 	notificationProcessor               *processor.NotificationProcessorImpl
 	productOutletPriceProcessor         processor.ProductOutletPriceProcessor
+	expenseProcessor                    *processor.ExpenseProcessorImpl
 }
 
 func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
@@ -354,7 +361,7 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		paymentMethodProcessor:              processor.NewPaymentMethodProcessorImpl(repos.paymentMethodRepo),
 		fileProcessor:                       processor.NewFileProcessorImpl(repos.fileRepo, fileClient),
 		customerProcessor:                   processor.NewCustomerProcessor(repos.customerRepo),
-		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo),
+		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo, repos.expenseRepo),
 		tableProcessor:                      processor.NewTableProcessor(repos.tableRepo, repos.orderRepo),
 		unitProcessor:                       processor.NewUnitProcessor(repos.unitRepo),
 		ingredientProcessor:                 processor.NewIngredientProcessor(repos.ingredientRepo, repos.unitRepo, repos.ingredientCompositionRepo),
@@ -383,6 +390,7 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		userDeviceProcessor:                 processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
 		notificationProcessor:               buildNotificationProcessor(cfg, repos),
 		productOutletPriceProcessor:         processor.NewProductOutletPriceProcessorImpl(repos.productOutletPriceRepo, repos.productRepo, repos.outletRepo),
+		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo),
 	}
 }
 
@@ -422,6 +430,7 @@ type services struct {
 	userDeviceService                 service.UserDeviceService
 	notificationService               service.NotificationService
 	productOutletPriceService         service.ProductOutletPriceService
+	expenseService                    *service.ExpenseServiceImpl
 }
 
 func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
@@ -499,6 +508,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		userDeviceService:                 userDeviceService,
 		notificationService:               notificationService,
 		productOutletPriceService:         service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
+		expenseService:                    service.NewExpenseService(processors.expenseProcessor),
 	}
 }
 
@@ -541,6 +551,7 @@ type validators struct {
 	userDeviceValidator                 *validator.UserDeviceValidatorImpl
 	notificationValidator               *validator.NotificationValidatorImpl
 	productOutletPriceValidator         *validator.ProductOutletPriceValidatorImpl
+	expenseValidator                    *validator.ExpenseValidatorImpl
 }
 
 func (a *App) initValidators() *validators {
@@ -571,6 +582,7 @@ func (a *App) initValidators() *validators {
 		userDeviceValidator:                 validator.NewUserDeviceValidator(),
 		notificationValidator:               validator.NewNotificationValidator(),
 		productOutletPriceValidator:         validator.NewProductOutletPriceValidator(),
+		expenseValidator:                    validator.NewExpenseValidator(),
 	}
 }
 

internal/constants/error.go

@@ -60,6 +60,7 @@ const (
 	NotificationServiceEntity       = "notification_service"
 	NotificationHandlerEntity       = "notification_handler"
 	ProductOutletPriceServiceEntity = "product_outlet_price_service"
+	ExpenseServiceEntity            = "expense_service"
 )
 
 var HttpErrorMap = map[string]int{

internal/constants/expense.go

@@ -0,0 +1,28 @@
+package constants
+
+type ExpenseStatus string
+
+const (
+	ExpenseStatusDraft    ExpenseStatus = "draft"
+	ExpenseStatusSent     ExpenseStatus = "sent"
+	ExpenseStatusApproved ExpenseStatus = "approved"
+	ExpenseStatusCancel   ExpenseStatus = "cancel"
+)
+
+func GetAllExpenseStatuses() []ExpenseStatus {
+	return []ExpenseStatus{
+		ExpenseStatusDraft,
+		ExpenseStatusSent,
+		ExpenseStatusApproved,
+		ExpenseStatusCancel,
+	}
+}
+
+func IsValidExpenseStatus(status ExpenseStatus) bool {
+	for _, validStatus := range GetAllExpenseStatuses() {
+		if status == validStatus {
+			return true
+		}
+	}
+	return false
+}

internal/contract/analytics_contract.go

@@ -162,6 +162,7 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -236,7 +237,6 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
-// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
 	OutletID       *string `form:"outlet_id,omitempty"`
@@ -245,19 +245,20 @@ type ProfitLossAnalyticsRequest struct {
 	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
-// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
-	OrganizationID uuid.UUID           `json:"organization_id"`
+	OrganizationID           uuid.UUID                `json:"organization_id"`
-	OutletID       *uuid.UUID          `json:"outlet_id,omitempty"`
+	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	DateFrom       time.Time           `json:"date_from"`
+	DateFrom                 time.Time                `json:"date_from"`
-	DateTo         time.Time           `json:"date_to"`
+	DateTo                   time.Time                `json:"date_to"`
-	GroupBy        string              `json:"group_by"`
+	GroupBy                  string                   `json:"group_by"`
-	Summary        ProfitLossSummary   `json:"summary"`
+	Summary                  ProfitLossSummary        `json:"summary"`
-	Data           []ProfitLossData    `json:"data"`
+	Data                     []ProfitLossData         `json:"data"`
-	ProductData    []ProductProfitData `json:"product_data"`
+	ProductData              []ProductProfitData      `json:"product_data"`
+	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
+	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
+	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
-// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -272,7 +273,6 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
-// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -286,7 +286,6 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
-// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -301,3 +300,19 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
+
+type ProfitLossSummaryRow struct {
+	ID           string                 `json:"id"`
+	Label        string                 `json:"label"`
+	IsBold       bool                   `json:"is_bold"`
+	TodayNominal float64                `json:"today_nominal"`
+	TodayPct     float64                `json:"today_pct"`
+	MtdNominal   float64                `json:"mtd_nominal"`
+	MtdPct       float64                `json:"mtd_pct"`
+	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
+}
+
+type OperationalExpenseItem struct {
+	Item    string  `json:"item"`
+	Nominal float64 `json:"nominal"`
+}

internal/contract/expense_contract.go

@@ -0,0 +1,93 @@
+package contract
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type CreateExpenseRequest struct {
+	Receiver        string                     `json:"receiver" validate:"required"`
+	TransactionDate string                     `json:"transaction_date" validate:"required"`
+	CodeNumber      string                     `json:"code_number" validate:"required"`
+	OutletID        string                     `json:"outlet_id" validate:"required"`
+	Status          *string                    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
+	Description     *string                    `json:"description,omitempty"`
+	Tax             float64                    `json:"tax"`
+	Total           float64                    `json:"total" validate:"required"`
+	Items           []CreateExpenseItemRequest `json:"items" validate:"required"`
+}
+
+type CreateExpenseItemRequest struct {
+	ChartOfAccountID string  `json:"chart_of_account_id" validate:"required"`
+	Item             string  `json:"item" validate:"required"`
+	Description      *string `json:"description,omitempty"`
+	Amount           float64 `json:"amount" validate:"required"`
+}
+
+type UpdateExpenseRequest struct {
+	Receiver        *string                    `json:"receiver,omitempty"`
+	TransactionDate *string                    `json:"transaction_date,omitempty"`
+	CodeNumber      *string                    `json:"code_number,omitempty"`
+	OutletID        *string                    `json:"outlet_id,omitempty"`
+	Status          *string                    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
+	Description     *string                    `json:"description,omitempty"`
+	Tax             *float64                   `json:"tax,omitempty"`
+	Total           *float64                   `json:"total,omitempty"`
+	Reserved1       *string                    `json:"reserved1,omitempty"`
+	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
+}
+
+type UpdateExpenseItemRequest struct {
+	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
+	Item             *string  `json:"item,omitempty"`
+	Description      *string  `json:"description,omitempty"`
+	Amount           *float64 `json:"amount,omitempty"`
+}
+
+type ExpenseResponse struct {
+	ID              uuid.UUID             `json:"id"`
+	OrganizationID  uuid.UUID             `json:"organization_id"`
+	OutletID        uuid.UUID             `json:"outlet_id"`
+	Receiver        string                `json:"receiver"`
+	TransactionDate time.Time             `json:"transaction_date"`
+	CodeNumber      string                `json:"code_number"`
+	Status          string                `json:"status"`
+	Description     *string               `json:"description"`
+	Tax             float64               `json:"tax"`
+	Total           float64               `json:"total"`
+	Reserved1       *string               `json:"reserved1,omitempty"`
+	CreatedAt       time.Time             `json:"created_at"`
+	UpdatedAt       time.Time             `json:"updated_at"`
+	Items           []ExpenseItemResponse `json:"items,omitempty"`
+}
+
+type ExpenseItemResponse struct {
+	ID                 uuid.UUID `json:"id"`
+	ExpenseID          uuid.UUID `json:"expense_id"`
+	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
+	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	Item               string    `json:"item"`
+	Description        *string   `json:"description"`
+	Amount             float64   `json:"amount"`
+	CreatedAt          time.Time `json:"created_at"`
+	UpdatedAt          time.Time `json:"updated_at"`
+}
+
+type ListExpenseRequest struct {
+	Page      int    `json:"page" validate:"min=1"`
+	Limit     int    `json:"limit" validate:"min=1,max=100"`
+	Search    string `json:"search,omitempty"`
+	OutletID  string `json:"outlet_id,omitempty"`
+	Status    string `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
+	StartDate string `json:"start_date,omitempty"`
+	EndDate   string `json:"end_date,omitempty"`
+}
+
+type ListExpenseResponse struct {
+	Expenses   []ExpenseResponse `json:"expenses"`
+	TotalCount int               `json:"total_count"`
+	Page       int               `json:"page"`
+	Limit      int               `json:"limit"`
+	TotalPages int               `json:"total_pages"`
+}

internal/contract/purchase_order_contract.go

@@ -9,8 +9,8 @@ import (
 type CreatePurchaseOrderRequest struct {
 	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
 	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate   string                           `json:"transaction_date" validate:"required"` // Format: YYYY-MM-DD
+	TransactionDate   string                           `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
-	DueDate           string                           `json:"due_date" validate:"required"`          // Format: YYYY-MM-DD
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -30,7 +30,7 @@ type UpdatePurchaseOrderRequest struct {
 	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
 	PONumber          *string                          `json:"po_number,omitempty" validate:"omitempty,min=1,max=50"`
 	TransactionDate   *string                          `json:"transaction_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
-	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`          // Format: YYYY-MM-DD
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`         // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -53,7 +53,7 @@ type PurchaseOrderResponse struct {
 	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`

internal/entities/analytics.go

@@ -76,6 +76,7 @@ type ProductAnalytics struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -113,54 +114,67 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
-// ProfitLossAnalytics represents profit and loss analytics data
 type ProfitLossAnalytics struct {
-	Summary     ProfitLossSummary   `json:"summary"`
+	Summary                 ProfitLossSummary
-	Data        []ProfitLossData    `json:"data"`
+	Data                    []ProfitLossData
-	ProductData []ProductProfitData `json:"product_data"`
+	ProductData             []ProductProfitData
+	TodayRevenue            float64
+	TodayCost               float64
+	MtdRevenue              float64
+	MtdCost                 float64
+	TodayExpenseByCategory  []ExpenseCategoryTotal
+	MtdExpenseByCategory    []ExpenseCategoryTotal
+	OperationalExpenseItems []OperationalExpenseItem
 }
 
-// ProfitLossSummary represents profit and loss summary data
 type ProfitLossSummary struct {
-	TotalRevenue       float64 `json:"total_revenue"`
+	TotalRevenue       float64
-	TotalCost          float64 `json:"total_cost"`
+	TotalCost          float64
-	GrossProfit        float64 `json:"gross_profit"`
+	GrossProfit        float64
-	GrossProfitMargin  float64 `json:"gross_profit_margin"`
+	GrossProfitMargin  float64
-	TotalTax           float64 `json:"total_tax"`
+	TotalTax           float64
-	TotalDiscount      float64 `json:"total_discount"`
+	TotalDiscount      float64
-	NetProfit          float64 `json:"net_profit"`
+	NetProfit          float64
-	NetProfitMargin    float64 `json:"net_profit_margin"`
+	NetProfitMargin    float64
-	TotalOrders        int64   `json:"total_orders"`
+	TotalOrders        int64
-	AverageProfit      float64 `json:"average_profit"`
+	AverageProfit      float64
-	ProfitabilityRatio float64 `json:"profitability_ratio"`
+	ProfitabilityRatio float64
 }
 
-// ProfitLossData represents profit and loss data by time period
 type ProfitLossData struct {
-	Date              time.Time `json:"date"`
+	Date              time.Time
-	Revenue           float64   `json:"revenue"`
+	Revenue           float64
-	Cost              float64   `json:"cost"`
+	Cost              float64
-	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfit       float64
-	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	GrossProfitMargin float64
-	Tax               float64   `json:"tax"`
+	Tax               float64
-	Discount          float64   `json:"discount"`
+	Discount          float64
-	NetProfit         float64   `json:"net_profit"`
+	NetProfit         float64
-	NetProfitMargin   float64   `json:"net_profit_margin"`
+	NetProfitMargin   float64
-	Orders            int64     `json:"orders"`
+	Orders            int64
 }
 
-// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
-	ProductID         uuid.UUID `json:"product_id"`
+	ProductID         uuid.UUID
-	ProductName       string    `json:"product_name"`
+	ProductName       string
-	CategoryID        uuid.UUID `json:"category_id"`
+	CategoryID        uuid.UUID
-	CategoryName      string    `json:"category_name"`
+	CategoryName      string
-	QuantitySold      int64     `json:"quantity_sold"`
+	QuantitySold      int64
-	Revenue           float64   `json:"revenue"`
+	Revenue           float64
-	Cost              float64   `json:"cost"`
+	Cost              float64
-	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfit       float64
-	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	GrossProfitMargin float64
-	AveragePrice      float64   `json:"average_price"`
+	AveragePrice      float64
-	AverageCost       float64   `json:"average_cost"`
+	AverageCost       float64
-	ProfitPerUnit     float64   `json:"profit_per_unit"`
+	ProfitPerUnit     float64
+}
+
+type ExpenseCategoryTotal struct {
+	CategoryName string
+	Amount       float64
+}
+
+type OperationalExpenseItem struct {
+	Item   string
+	Amount float64
 }

internal/entities/entities.go

@@ -42,6 +42,7 @@ func GetAllEntities() []interface{} {
 		&NotificationReceiver{},
 		&NotificationDelivery{},
 		&ProductOutletPrice{},
+		&Expense{},
 	}
 }
 

internal/entities/expense.go

@@ -0,0 +1,40 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+
+	"gorm.io/gorm"
+)
+
+type Expense struct {
+	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID  uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id"`
+	OutletID        uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
+	Receiver        string    `gorm:"not null;size:255" json:"receiver"`
+	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date"`
+	CodeNumber      string    `gorm:"not null;size:50" json:"code_number"`
+	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status"`
+	Description     *string   `gorm:"type:text" json:"description"`
+	Tax             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"tax"`
+	Total           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total"`
+	Reserved1       *string   `gorm:"type:text" json:"reserved1"`
+	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Organization *Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       *Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	Items        []ExpenseItem `gorm:"foreignKey:ExpenseID" json:"items,omitempty"`
+}
+
+func (e *Expense) BeforeCreate(tx *gorm.DB) error {
+	if e.ID == uuid.Nil {
+		e.ID = uuid.New()
+	}
+	return nil
+}
+
+func (Expense) TableName() string {
+	return "expenses"
+}

internal/entities/expense_item.go

@@ -0,0 +1,34 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+
+	"gorm.io/gorm"
+)
+
+type ExpenseItem struct {
+	ID               uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ExpenseID        uuid.UUID `gorm:"type:uuid;not null;index" json:"expense_id"`
+	ChartOfAccountID uuid.UUID `gorm:"type:uuid;not null;index" json:"chart_of_account_id"`
+	Item             string    `gorm:"not null;size:255" json:"item"`
+	Description      *string   `gorm:"type:text" json:"description"`
+	Amount           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"amount"`
+	CreatedAt        time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt        time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Expense        *Expense        `gorm:"foreignKey:ExpenseID" json:"expense,omitempty"`
+	ChartOfAccount *ChartOfAccount `gorm:"foreignKey:ChartOfAccountID" json:"chart_of_account,omitempty"`
+}
+
+func (e *ExpenseItem) BeforeCreate(tx *gorm.DB) error {
+	if e.ID == uuid.Nil {
+		e.ID = uuid.New()
+	}
+	return nil
+}
+
+func (ExpenseItem) TableName() string {
+	return "expense_items"
+}

internal/entities/purchase_order.go

@@ -9,18 +9,18 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ID              uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID  uuid.UUID `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
+	OrganizationID  uuid.UUID  `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
-	VendorID        uuid.UUID `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
+	VendorID        uuid.UUID  `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
-	PONumber        string    `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
+	PONumber        string     `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
+	TransactionDate time.Time  `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
-	DueDate         time.Time `gorm:"type:date;not null" json:"due_date" validate:"required"`
+	DueDate         *time.Time `gorm:"type:date" json:"due_date" validate:"omitempty"`
-	Reference       *string   `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
+	Reference       *string    `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
-	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
+	Status          string     `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
-	Message         *string   `gorm:"type:text" json:"message" validate:"omitempty"`
+	Message         *string    `gorm:"type:text" json:"message" validate:"omitempty"`
-	TotalAmount     float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
+	TotalAmount     float64    `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
-	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
+	CreatedAt       time.Time  `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	UpdatedAt       time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`

internal/handler/common.go

@@ -1,6 +1,8 @@
 package handler
 
 import (
+	"apskel-pos-be/internal/logger"
+	"fmt"
 	"net/http"
 	"time"
 )
@@ -47,7 +49,7 @@ func (m *CommonMiddleware) Recovery(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			if err := recover(); err != nil {
-
+				logger.FromContext(r.Context()).Error("Recovery", fmt.Sprintf("panic recovered: %v", err))
 				http.Error(w, "Internal Server Error", http.StatusInternalServerError)
 			}
 		}()

internal/handler/expense_handler.go

@@ -0,0 +1,201 @@
+package handler
+
+import (
+	"apskel-pos-be/internal/appcontext"
+	"apskel-pos-be/internal/util"
+	"strconv"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/service"
+	"apskel-pos-be/internal/validator"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type ExpenseHandler struct {
+	expenseService   service.ExpenseService
+	expenseValidator validator.ExpenseValidator
+}
+
+func NewExpenseHandler(
+	expenseService service.ExpenseService,
+	expenseValidator validator.ExpenseValidator,
+) *ExpenseHandler {
+	return &ExpenseHandler{
+		expenseService:   expenseService,
+		expenseValidator: expenseValidator,
+	}
+}
+
+func (h *ExpenseHandler) CreateExpense(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.CreateExpenseRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::CreateExpense -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::CreateExpense")
+		return
+	}
+
+	validationError, validationErrorCode := h.expenseValidator.ValidateCreateExpenseRequest(&req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::CreateExpense")
+		return
+	}
+
+	expenseResponse := h.expenseService.CreateExpense(ctx, contextInfo, &req)
+	if expenseResponse.HasErrors() {
+		errorResp := expenseResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::CreateExpense -> Failed to create expense from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::CreateExpense")
+}
+
+func (h *ExpenseHandler) UpdateExpense(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	expenseIDStr := c.Param("id")
+	expenseID, err := uuid.Parse(expenseIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::UpdateExpense -> Invalid expense ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
+		return
+	}
+
+	var req contract.UpdateExpenseRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::UpdateExpense -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Invalid request body")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
+		return
+	}
+
+	validationError, validationErrorCode := h.expenseValidator.ValidateUpdateExpenseRequest(&req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::UpdateExpense")
+		return
+	}
+
+	expenseResponse := h.expenseService.UpdateExpense(ctx, contextInfo, expenseID, &req)
+	if expenseResponse.HasErrors() {
+		errorResp := expenseResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::UpdateExpense -> Failed to update expense from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::UpdateExpense")
+}
+
+func (h *ExpenseHandler) DeleteExpense(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	expenseIDStr := c.Param("id")
+	expenseID, err := uuid.Parse(expenseIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::DeleteExpense -> Invalid expense ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::DeleteExpense")
+		return
+	}
+
+	expenseResponse := h.expenseService.DeleteExpense(ctx, contextInfo, expenseID)
+	if expenseResponse.HasErrors() {
+		errorResp := expenseResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::DeleteExpense -> Failed to delete expense from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::DeleteExpense")
+}
+
+func (h *ExpenseHandler) GetExpense(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	expenseIDStr := c.Param("id")
+	expenseID, err := uuid.Parse(expenseIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::GetExpense -> Invalid expense ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid expense ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::GetExpense")
+		return
+	}
+
+	expenseResponse := h.expenseService.GetExpenseByID(ctx, contextInfo, expenseID)
+	if expenseResponse.HasErrors() {
+		errorResp := expenseResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::GetExpense -> Failed to get expense from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::GetExpense")
+}
+
+func (h *ExpenseHandler) ListExpenses(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	req := &contract.ListExpenseRequest{
+		Page:  1,
+		Limit: 10,
+	}
+
+	if pageStr := c.Query("page"); pageStr != "" {
+		if page, err := strconv.Atoi(pageStr); err == nil {
+			req.Page = page
+		}
+	}
+
+	if limitStr := c.Query("limit"); limitStr != "" {
+		if limit, err := strconv.Atoi(limitStr); err == nil {
+			req.Limit = limit
+		}
+	}
+
+	if search := c.Query("search"); search != "" {
+		req.Search = search
+	}
+
+	if status := c.Query("status"); status != "" {
+		req.Status = status
+	}
+
+	// Prioritize outlet_id from context (e.g. outlet-scoped user),
+	// fall back to query param if context has no outlet.
+	if contextInfo.OutletID != uuid.Nil {
+		req.OutletID = contextInfo.OutletID.String()
+	} else if outletID := c.Query("outlet_id"); outletID != "" {
+		req.OutletID = outletID
+	}
+
+	if startDate := c.Query("start_date"); startDate != "" {
+		req.StartDate = startDate
+	}
+
+	if endDate := c.Query("end_date"); endDate != "" {
+		req.EndDate = endDate
+	}
+
+	validationError, validationErrorCode := h.expenseValidator.ValidateListExpenseRequest(req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::ListExpenses")
+		return
+	}
+
+	expenseResponse := h.expenseService.ListExpenses(ctx, contextInfo, req)
+	if expenseResponse.HasErrors() {
+		errorResp := expenseResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::ListExpenses -> Failed to list expenses from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::ListExpenses")
+}

internal/mappers/expense_mapper.go

@@ -0,0 +1,128 @@
+package mappers
+
+import (
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+)
+
+func ExpenseEntityToModel(entity *entities.Expense) *models.Expense {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.Expense{
+		ID:              entity.ID,
+		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
+		Receiver:        entity.Receiver,
+		TransactionDate: entity.TransactionDate,
+		CodeNumber:      entity.CodeNumber,
+		Status:          entity.Status,
+		Description:     entity.Description,
+		Tax:             entity.Tax,
+		Total:           entity.Total,
+		Reserved1:       entity.Reserved1,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
+	}
+}
+
+func ExpenseModelToEntity(model *models.Expense) *entities.Expense {
+	if model == nil {
+		return nil
+	}
+
+	return &entities.Expense{
+		ID:              model.ID,
+		OrganizationID:  model.OrganizationID,
+		OutletID:        model.OutletID,
+		Receiver:        model.Receiver,
+		TransactionDate: model.TransactionDate,
+		CodeNumber:      model.CodeNumber,
+		Status:          model.Status,
+		Description:     model.Description,
+		Tax:             model.Tax,
+		Total:           model.Total,
+		Reserved1:       model.Reserved1,
+		CreatedAt:       model.CreatedAt,
+		UpdatedAt:       model.UpdatedAt,
+	}
+}
+
+func ExpenseEntityToResponse(entity *entities.Expense) *models.ExpenseResponse {
+	if entity == nil {
+		return nil
+	}
+
+	resp := &models.ExpenseResponse{
+		ID:              entity.ID,
+		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
+		Receiver:        entity.Receiver,
+		TransactionDate: entity.TransactionDate,
+		CodeNumber:      entity.CodeNumber,
+		Status:          entity.Status,
+		Description:     entity.Description,
+		Tax:             entity.Tax,
+		Total:           entity.Total,
+		Reserved1:       entity.Reserved1,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
+	}
+
+	if entity.Items != nil {
+		resp.Items = ExpenseItemEntitiesToResponses(entity.Items)
+	}
+
+	return resp
+}
+
+func ExpenseEntitiesToResponses(entities []*entities.Expense) []*models.ExpenseResponse {
+	if entities == nil {
+		return nil
+	}
+
+	responses := make([]*models.ExpenseResponse, len(entities))
+	for i, entity := range entities {
+		responses[i] = ExpenseEntityToResponse(entity)
+	}
+	return responses
+}
+
+func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseItemResponse {
+	if entity == nil {
+		return nil
+	}
+
+	response := &models.ExpenseItemResponse{
+		ID:               entity.ID,
+		ExpenseID:        entity.ExpenseID,
+		ChartOfAccountID: entity.ChartOfAccountID,
+		Item:             entity.Item,
+		Description:      entity.Description,
+		Amount:           entity.Amount,
+		CreatedAt:        entity.CreatedAt,
+		UpdatedAt:        entity.UpdatedAt,
+	}
+
+	if entity.ChartOfAccount != nil {
+		response.ChartOfAccountName = entity.ChartOfAccount.Name
+	}
+
+	return response
+}
+
+func ExpenseItemEntitiesToResponses(entities []entities.ExpenseItem) []models.ExpenseItemResponse {
+	if entities == nil {
+		return nil
+	}
+
+	responses := make([]models.ExpenseItemResponse, len(entities))
+	for i, entity := range entities {
+		response := ExpenseItemEntityToResponse(&entity)
+		if response != nil {
+			responses[i] = *response
+		}
+	}
+	return responses
+}

internal/middleware/idempotency.go

@@ -0,0 +1,137 @@
+package middleware
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/redis/go-redis/v9"
+)
+
+const (
+	IdempotencyKeyHeader = "X-Idempotency-Key"
+	idempotencyTTL       = 24 * time.Hour
+	idempotencyPrefix    = "idempotency:"
+)
+
+type cachedResponse struct {
+	StatusCode int               `json:"status_code"`
+	Headers    map[string]string `json:"headers"`
+	Body       string            `json:"body"`
+}
+
+// IdempotencyMiddleware returns a Gin middleware that ensures idempotent processing
+// for mutating operations. Client must send X-Idempotency-Key header.
+func IdempotencyMiddleware(redisClient *redis.Client) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		key := c.GetHeader(IdempotencyKeyHeader)
+		if key == "" {
+			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{
+				"success": false,
+				"errors": []gin.H{
+					{
+						"code":   "missing_idempotency_key",
+						"entity": "IdempotencyMiddleware",
+						"cause":  "X-Idempotency-Key header is required",
+					},
+				},
+			})
+			return
+		}
+
+		redisKey := fmt.Sprintf("%s%s", idempotencyPrefix, key)
+		ctx := context.Background()
+
+		fmt.Printf("[DEBUG] IdempotencyMiddleware: key=%s redisKey=%s\n", key, redisKey)
+
+		// Check if key already exists (request was already processed)
+		cached, err := redisClient.Get(ctx, redisKey).Result()
+		if err == nil {
+			// Key exists — return cached response
+			fmt.Printf("[DEBUG] IdempotencyMiddleware: cache HIT for key=%s\n", key)
+			var resp cachedResponse
+			if err := json.Unmarshal([]byte(cached), &resp); err == nil {
+				for k, v := range resp.Headers {
+					c.Writer.Header().Set(k, v)
+				}
+				c.Writer.Header().Set("X-Idempotent-Replay", "true")
+				c.Data(resp.StatusCode, "application/json", []byte(resp.Body))
+				c.Abort()
+				return
+			}
+		} else {
+			fmt.Printf("[DEBUG] IdempotencyMiddleware: cache MISS for key=%s err=%v\n", key, err)
+		}
+
+		// Mark key as in-progress to prevent concurrent duplicates
+		set, err := redisClient.SetNX(ctx, redisKey, "processing", idempotencyTTL).Result()
+		if err != nil {
+			// Redis error — proceed without idempotency (fail open)
+			c.Next()
+			return
+		}
+		if !set {
+			// Another request with the same key is being processed
+			c.AbortWithStatusJSON(http.StatusConflict, gin.H{
+				"success": false,
+				"errors": []gin.H{
+					{
+						"code":   "request_in_progress",
+						"entity": "IdempotencyMiddleware",
+						"cause":  "A request with this idempotency key is already being processed",
+					},
+				},
+			})
+			return
+		}
+
+		// Capture response using a custom writer
+		writer := &responseCapture{
+			ResponseWriter: c.Writer,
+			body:           &bytes.Buffer{},
+		}
+		c.Writer = writer
+
+		c.Next()
+
+		// After handler completes, cache the response only if successful (2xx)
+		statusCode := writer.Status()
+		if statusCode >= 200 && statusCode < 300 {
+			resp := cachedResponse{
+				StatusCode: statusCode,
+				Headers: map[string]string{
+					"Content-Type": writer.Header().Get("Content-Type"),
+				},
+				Body: writer.body.String(),
+			}
+
+			respJSON, err := json.Marshal(resp)
+			if err == nil {
+				redisClient.Set(ctx, redisKey, string(respJSON), idempotencyTTL)
+			}
+		} else {
+			// Remove the in-progress key so the client can retry with the same key
+			redisClient.Del(ctx, redisKey)
+		}
+	}
+}
+
+// responseCapture wraps gin.ResponseWriter to capture the response body
+type responseCapture struct {
+	gin.ResponseWriter
+	body *bytes.Buffer
+}
+
+func (w *responseCapture) Write(b []byte) (int, error) {
+	w.body.Write(b)
+	return w.ResponseWriter.Write(b)
+}
+
+func (w *responseCapture) WriteString(s string) (int, error) {
+	w.body.WriteString(s)
+	return w.ResponseWriter.WriteString(s)
+}

internal/models/analytics.go

@@ -172,6 +172,7 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -246,7 +247,6 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
-// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
@@ -255,19 +255,20 @@ type ProfitLossAnalyticsRequest struct {
 	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
 }
 
-// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
-	OrganizationID uuid.UUID           `json:"organization_id"`
+	OrganizationID           uuid.UUID                `json:"organization_id"`
-	OutletID       *uuid.UUID          `json:"outlet_id,omitempty"`
+	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	DateFrom       time.Time           `json:"date_from"`
+	DateFrom                 time.Time                `json:"date_from"`
-	DateTo         time.Time           `json:"date_to"`
+	DateTo                   time.Time                `json:"date_to"`
-	GroupBy        string              `json:"group_by"`
+	GroupBy                  string                   `json:"group_by"`
-	Summary        ProfitLossSummary   `json:"summary"`
+	Summary                  ProfitLossSummary        `json:"summary"`
-	Data           []ProfitLossData    `json:"data"`
+	Data                     []ProfitLossData         `json:"data"`
-	ProductData    []ProductProfitData `json:"product_data"`
+	ProductData              []ProductProfitData      `json:"product_data"`
+	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
+	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
+	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
-// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -282,7 +283,6 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
-// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -296,7 +296,6 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
-// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -311,3 +310,19 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
+
+type ProfitLossSummaryRow struct {
+	ID           string                 `json:"id"`
+	Label        string                 `json:"label"`
+	IsBold       bool                   `json:"is_bold"`
+	TodayNominal float64                `json:"today_nominal"`
+	TodayPct     float64                `json:"today_pct"`
+	MtdNominal   float64                `json:"mtd_nominal"`
+	MtdPct       float64                `json:"mtd_pct"`
+	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
+}
+
+type OperationalExpenseItem struct {
+	Item    string  `json:"item"`
+	Nominal float64 `json:"nominal"`
+}

internal/models/expense.go

@@ -0,0 +1,120 @@
+package models
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type Expense struct {
+	ID              uuid.UUID `json:"id"`
+	OrganizationID  uuid.UUID `json:"organization_id"`
+	OutletID        uuid.UUID `json:"outlet_id"`
+	Receiver        string    `json:"receiver"`
+	TransactionDate time.Time `json:"transaction_date"`
+	CodeNumber      string    `json:"code_number"`
+	Status          string    `json:"status"`
+	Description     *string   `json:"description"`
+	Tax             float64   `json:"tax"`
+	Total           float64   `json:"total"`
+	Reserved1       *string   `json:"reserved1"`
+	CreatedAt       time.Time `json:"created_at"`
+	UpdatedAt       time.Time `json:"updated_at"`
+}
+
+type ExpenseItem struct {
+	ID               uuid.UUID `json:"id"`
+	ExpenseID        uuid.UUID `json:"expense_id"`
+	ChartOfAccountID uuid.UUID `json:"chart_of_account_id"`
+	Item             string    `json:"item"`
+	Description      *string   `json:"description"`
+	Amount           float64   `json:"amount"`
+	CreatedAt        time.Time `json:"created_at"`
+	UpdatedAt        time.Time `json:"updated_at"`
+}
+
+type ExpenseResponse struct {
+	ID              uuid.UUID             `json:"id"`
+	OrganizationID  uuid.UUID             `json:"organization_id"`
+	OutletID        uuid.UUID             `json:"outlet_id"`
+	Receiver        string                `json:"receiver"`
+	TransactionDate time.Time             `json:"transaction_date"`
+	CodeNumber      string                `json:"code_number"`
+	Status          string                `json:"status"`
+	Description     *string               `json:"description"`
+	Tax             float64               `json:"tax"`
+	Total           float64               `json:"total"`
+	Reserved1       *string               `json:"reserved1"`
+	CreatedAt       time.Time             `json:"created_at"`
+	UpdatedAt       time.Time             `json:"updated_at"`
+	Items           []ExpenseItemResponse `json:"items,omitempty"`
+}
+
+type ExpenseItemResponse struct {
+	ID                 uuid.UUID `json:"id"`
+	ExpenseID          uuid.UUID `json:"expense_id"`
+	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
+	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	Item               string    `json:"item"`
+	Description        *string   `json:"description"`
+	Amount             float64   `json:"amount"`
+	CreatedAt          time.Time `json:"created_at"`
+	UpdatedAt          time.Time `json:"updated_at"`
+}
+
+type CreateExpenseRequest struct {
+	Receiver        string                     `json:"receiver"`
+	TransactionDate string                     `json:"transaction_date"`
+	CodeNumber      string                     `json:"code_number"`
+	OutletID        string                     `json:"outlet_id"`
+	Status          *string                    `json:"status,omitempty"`
+	Description     *string                    `json:"description"`
+	Tax             float64                    `json:"tax"`
+	Total           float64                    `json:"total"`
+	Items           []CreateExpenseItemRequest `json:"items"`
+}
+
+type CreateExpenseItemRequest struct {
+	ChartOfAccountID string  `json:"chart_of_account_id"`
+	Item             string  `json:"item"`
+	Description      *string `json:"description,omitempty"`
+	Amount           float64 `json:"amount"`
+}
+
+type UpdateExpenseRequest struct {
+	Receiver        *string                    `json:"receiver,omitempty"`
+	TransactionDate *string                    `json:"transaction_date,omitempty"`
+	CodeNumber      *string                    `json:"code_number,omitempty"`
+	OutletID        *string                    `json:"outlet_id,omitempty"`
+	Status          *string                    `json:"status,omitempty"`
+	Description     *string                    `json:"description,omitempty"`
+	Tax             *float64                   `json:"tax,omitempty"`
+	Total           *float64                   `json:"total,omitempty"`
+	Reserved1       *string                    `json:"reserved1,omitempty"`
+	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
+}
+
+type UpdateExpenseItemRequest struct {
+	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
+	Item             *string  `json:"item,omitempty"`
+	Description      *string  `json:"description,omitempty"`
+	Amount           *float64 `json:"amount,omitempty"`
+}
+
+type ListExpenseRequest struct {
+	Page      int    `json:"page"`
+	Limit     int    `json:"limit"`
+	Search    string `json:"search,omitempty"`
+	OutletID  string `json:"outlet_id,omitempty"`
+	Status    string `json:"status,omitempty"`
+	StartDate string `json:"start_date,omitempty"`
+	EndDate   string `json:"end_date,omitempty"`
+}
+
+type ListExpenseResponse struct {
+	Expenses   []*ExpenseResponse `json:"expenses"`
+	TotalCount int                `json:"total_count"`
+	Page       int                `json:"page"`
+	Limit      int                `json:"limit"`
+	TotalPages int                `json:"total_pages"`
+}

internal/models/purchase_order.go

@@ -7,18 +7,18 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `json:"id"`
+	ID              uuid.UUID  `json:"id"`
-	OrganizationID  uuid.UUID `json:"organization_id"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
-	VendorID        uuid.UUID `json:"vendor_id"`
+	VendorID        uuid.UUID  `json:"vendor_id"`
-	PONumber        string    `json:"po_number"`
+	PONumber        string     `json:"po_number"`
-	TransactionDate time.Time `json:"transaction_date"`
+	TransactionDate time.Time  `json:"transaction_date"`
-	DueDate         time.Time `json:"due_date"`
+	DueDate         *time.Time `json:"due_date"`
-	Reference       *string   `json:"reference"`
+	Reference       *string    `json:"reference"`
-	Status          string    `json:"status"`
+	Status          string     `json:"status"`
-	Message         *string   `json:"message"`
+	Message         *string    `json:"message"`
-	TotalAmount     float64   `json:"total_amount"`
+	TotalAmount     float64    `json:"total_amount"`
-	CreatedAt       time.Time `json:"created_at"`
+	CreatedAt       time.Time  `json:"created_at"`
-	UpdatedAt       time.Time `json:"updated_at"`
+	UpdatedAt       time.Time  `json:"updated_at"`
 }
 
 type PurchaseOrderItem struct {
@@ -46,7 +46,7 @@ type PurchaseOrderResponse struct {
 	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
@@ -84,7 +84,7 @@ type CreatePurchaseOrderRequest struct {
 	VendorID          uuid.UUID                        `json:"vendor_id"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
-	DueDate           time.Time                        `json:"due_date"`
+	DueDate           *time.Time                       `json:"due_date,omitempty"`
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`

internal/processor/analytics_processor.go

@@ -3,8 +3,10 @@ package processor
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
+	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
 )
@@ -21,11 +23,13 @@ type AnalyticsProcessor interface {
 
 type AnalyticsProcessorImpl struct {
 	analyticsRepo repository.AnalyticsRepository
+	expenseRepo   ExpenseRepository
 }
 
-func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository) *AnalyticsProcessorImpl {
+func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository, expenseRepo ExpenseRepository) *AnalyticsProcessorImpl {
 	return &AnalyticsProcessorImpl{
 		analyticsRepo: analyticsRepo,
+		expenseRepo:   expenseRepo,
 	}
 }
 
@@ -260,6 +264,7 @@ func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *m
 			ProductID:               data.ProductID,
 			ProductName:             data.ProductName,
 			ProductSku:              data.ProductSku,
+			ProductPrice:            data.ProductPrice,
 			CategoryID:              data.CategoryID,
 			CategoryName:            data.CategoryName,
 			CategoryOrder:           data.CategoryOrder,
@@ -394,17 +399,27 @@ func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req
 }
 
 func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
+	if req.DateFrom.IsZero() {
+		return nil, fmt.Errorf("date_from is required")
+	}
+
+	if req.DateTo.IsZero() {
+		return nil, fmt.Errorf("date_to is required")
+	}
+
 	if req.DateFrom.After(req.DateTo) {
 		return nil, fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	// Get analytics data from repository
+	if req.GroupBy == "" {
+		req.GroupBy = "day"
+	}
+
 	result, err := p.analyticsRepo.GetProfitLossAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get profit/loss analytics: %w", err)
 	}
 
-	// Transform entities to models
 	data := make([]models.ProfitLossData, len(result.Data))
 	for i, item := range result.Data {
 		data[i] = models.ProfitLossData{
@@ -439,6 +454,103 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		}
 	}
 
+	todayPromosi := getExpenseAmountByCategory(result.TodayExpenseByCategory, "promosi")
+	todayLainLain := getExpenseAmountByCategory(result.TodayExpenseByCategory, "lain")
+	todayTotalOps := todayPromosi + todayLainLain
+	todayGaji := getExpenseAmountByCategory(result.TodayExpenseByCategory, "gaji")
+
+	mtdPromosi := getExpenseAmountByCategory(result.MtdExpenseByCategory, "promosi")
+	mtdLainLain := getExpenseAmountByCategory(result.MtdExpenseByCategory, "lain")
+	mtdTotalOps := mtdPromosi + mtdLainLain
+	mtdGaji := getExpenseAmountByCategory(result.MtdExpenseByCategory, "gaji")
+
+	todayGrossProfit := result.TodayRevenue - result.TodayCost
+	mtdGrossProfit := result.MtdRevenue - result.MtdCost
+
+	todayProfitBeforeGaji := todayGrossProfit - todayTotalOps
+	mtdProfitBeforeGaji := mtdGrossProfit - mtdTotalOps
+
+	todayNetProfit := todayProfitBeforeGaji - todayGaji
+	mtdNetProfit := mtdProfitBeforeGaji - mtdGaji
+
+	todayPct := func(nominal float64) float64 {
+		if result.TodayRevenue == 0 {
+			return 0
+		}
+		return (nominal / result.TodayRevenue) * 100
+	}
+	mtdPct := func(nominal float64) float64 {
+		if result.MtdRevenue == 0 {
+			return 0
+		}
+		return (nominal / result.MtdRevenue) * 100
+	}
+
+	mainSummary := []models.ProfitLossSummaryRow{
+		{
+			ID: "total_omset", Label: "TOTAL OMSET",
+			TodayNominal: result.TodayRevenue, TodayPct: todayPct(result.TodayRevenue),
+			MtdNominal: result.MtdRevenue, MtdPct: mtdPct(result.MtdRevenue),
+		},
+		{
+			ID: "hpp", Label: "HPP",
+			TodayNominal: result.TodayCost, TodayPct: todayPct(result.TodayCost),
+			MtdNominal: result.MtdCost, MtdPct: mtdPct(result.MtdCost),
+		},
+		{
+			ID: "laba_kotor", Label: "Laba Kotor (1-2)",
+			TodayNominal: todayGrossProfit, TodayPct: todayPct(todayGrossProfit),
+			MtdNominal: mtdGrossProfit, MtdPct: mtdPct(mtdGrossProfit),
+		},
+		{
+			ID: "biaya_ops", Label: "BIAYA OPS",
+			TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
+			MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
+			SubItems: []models.ProfitLossSummaryRow{
+				{
+					ID: "by_promosi", Label: "1. By Promosi",
+					TodayNominal: todayPromosi, TodayPct: todayPct(todayPromosi),
+					MtdNominal: mtdPromosi, MtdPct: mtdPct(mtdPromosi),
+				},
+				{
+					ID: "by_lain_lain", Label: "2. By Lain lain",
+					TodayNominal: todayLainLain, TodayPct: todayPct(todayLainLain),
+					MtdNominal: mtdLainLain, MtdPct: mtdPct(mtdLainLain),
+				},
+				{
+					ID: "total_biaya_ops", Label: "Total Biaya OPS (4.1+4.2)", IsBold: true,
+					TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
+					MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
+				},
+			},
+		},
+		{
+			ID: "laba_rugi_sblm_gaji", Label: "Laba/Rugi sblm Gaji (3-4)",
+			TodayNominal: todayProfitBeforeGaji, TodayPct: todayPct(todayProfitBeforeGaji),
+			MtdNominal: mtdProfitBeforeGaji, MtdPct: mtdPct(mtdProfitBeforeGaji),
+		},
+		{
+			ID: "biaya_gaji", Label: "BIAYA GAJI",
+			TodayNominal: todayGaji, TodayPct: todayPct(todayGaji),
+			MtdNominal: mtdGaji, MtdPct: mtdPct(mtdGaji),
+		},
+		{
+			ID: "laba_rugi", Label: "Laba/Rugi (5-6)", IsBold: true,
+			TodayNominal: todayNetProfit, TodayPct: todayPct(todayNetProfit),
+			MtdNominal: mtdNetProfit, MtdPct: mtdPct(mtdNetProfit),
+		},
+	}
+
+	opsItems := make([]models.OperationalExpenseItem, len(result.OperationalExpenseItems))
+	var opsTotal float64
+	for i, item := range result.OperationalExpenseItems {
+		opsItems[i] = models.OperationalExpenseItem{
+			Item:    item.Item,
+			Nominal: item.Amount,
+		}
+		opsTotal += item.Amount
+	}
+
 	return &models.ProfitLossAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
@@ -458,7 +570,19 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 			AverageProfit:      result.Summary.AverageProfit,
 			ProfitabilityRatio: result.Summary.ProfitabilityRatio,
 		},
-		Data:        data,
+		Data:                     data,
-		ProductData: productData,
+		ProductData:              productData,
+		MainSummary:              mainSummary,
+		OperationalExpenses:      opsItems,
+		OperationalExpensesTotal: opsTotal,
 	}, nil
 }
+
+func getExpenseAmountByCategory(categories []entities.ExpenseCategoryTotal, keyword string) float64 {
+	for _, cat := range categories {
+		if strings.Contains(strings.ToLower(cat.CategoryName), keyword) {
+			return cat.Amount
+		}
+	}
+	return 0
+}

internal/processor/analytics_processor_test.go

@@ -14,6 +14,8 @@ import (
 
 type analyticsRepositoryStub struct {
 	purchasingResult *entities.PurchasingAnalytics
+	profitLossResult *entities.ProfitLossAnalytics
+	profitLossGroup  string
 }
 
 func (analyticsRepositoryStub) GetPaymentMethodAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.PaymentMethodAnalytics, error) {
@@ -40,9 +42,27 @@ func (analyticsRepositoryStub) GetDashboardOverview(context.Context, uuid.UUID,
 	return nil, nil
 }
 
-func (analyticsRepositoryStub) GetProfitLossAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) (*entities.ProfitLossAnalytics, error) {
+func (s analyticsRepositoryStub) GetProfitLossAnalytics(_ context.Context, _ uuid.UUID, _ *uuid.UUID, _, _ time.Time, groupBy string) (*entities.ProfitLossAnalytics, error) {
+	s.profitLossGroup = groupBy
+	return s.profitLossResult, nil
+}
+
+type expenseRepositoryStub struct{}
+
+func (expenseRepositoryStub) Create(context.Context, *entities.Expense) error { return nil }
+func (expenseRepositoryStub) GetByID(context.Context, uuid.UUID) (*entities.Expense, error) {
 	return nil, nil
 }
+func (expenseRepositoryStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.Expense, error) {
+	return nil, nil
+}
+func (expenseRepositoryStub) Update(context.Context, *entities.Expense) error { return nil }
+func (expenseRepositoryStub) Delete(context.Context, uuid.UUID) error         { return nil }
+func (expenseRepositoryStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.Expense, int64, error) {
+	return nil, 0, nil
+}
+func (expenseRepositoryStub) CreateItem(context.Context, *entities.ExpenseItem) error { return nil }
+func (expenseRepositoryStub) DeleteItemsByExpenseID(context.Context, uuid.UUID) error { return nil }
 
 func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T) {
 	outletID := uuid.New()
@@ -55,7 +75,7 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 				TotalPurchases: 125,
 			},
 		},
-	})
+	}, expenseRepositoryStub{})
 
 	result, err := processor.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
 		OrganizationID: uuid.New(),
@@ -71,3 +91,77 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	require.Equal(t, outletName, *result.OutletName)
 	require.Equal(t, float64(125), result.Summary.TotalPurchases)
 }
+
+func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *testing.T) {
+	productID := uuid.New()
+	categoryID := uuid.New()
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+		profitLossResult: &entities.ProfitLossAnalytics{
+			Summary: entities.ProfitLossSummary{
+				TotalRevenue:       1000,
+				TotalCost:          400,
+				GrossProfit:        600,
+				GrossProfitMargin:  60,
+				TotalTax:           50,
+				TotalDiscount:      25,
+				NetProfit:          575,
+				NetProfitMargin:    57.5,
+				TotalOrders:        10,
+				AverageProfit:      57.5,
+				ProfitabilityRatio: 150,
+			},
+			Data: []entities.ProfitLossData{
+				{
+					Date:              now,
+					Revenue:           1000,
+					Cost:              400,
+					GrossProfit:       600,
+					GrossProfitMargin: 60,
+					Tax:               50,
+					Discount:          25,
+					NetProfit:         575,
+					NetProfitMargin:   57.5,
+					Orders:            10,
+				},
+			},
+			ProductData: []entities.ProductProfitData{
+				{
+					ProductID:         productID,
+					ProductName:       "Nasi",
+					CategoryID:        categoryID,
+					CategoryName:      "Food",
+					QuantitySold:      5,
+					Revenue:           500,
+					Cost:              200,
+					GrossProfit:       300,
+					GrossProfitMargin: 60,
+					AveragePrice:      100,
+					AverageCost:       40,
+					ProfitPerUnit:     60,
+				},
+			},
+			TodayRevenue: 1000,
+			TodayCost:    400,
+			MtdRevenue:   2000,
+			MtdCost:      800,
+		},
+	}, expenseRepositoryStub{})
+
+	result, err := processor.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Equal(t, "day", result.GroupBy)
+	require.Equal(t, float64(1000), result.Summary.TotalRevenue)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(575), result.Data[0].NetProfit)
+	require.Len(t, result.ProductData, 1)
+	require.Equal(t, productID, result.ProductData[0].ProductID)
+	require.NotEmpty(t, result.MainSummary)
+	require.Equal(t, "total_omset", result.MainSummary[0].ID)
+}

internal/processor/expense_processor.go

@@ -0,0 +1,223 @@
+package processor
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+)
+
+type ExpenseProcessor interface {
+	CreateExpense(ctx context.Context, organizationID uuid.UUID, req *models.CreateExpenseRequest) (*models.ExpenseResponse, error)
+	UpdateExpense(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdateExpenseRequest) (*models.ExpenseResponse, error)
+	DeleteExpense(ctx context.Context, id, organizationID uuid.UUID) error
+	GetExpenseByID(ctx context.Context, id, organizationID uuid.UUID) (*models.ExpenseResponse, error)
+	ListExpenses(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.ExpenseResponse, int, error)
+}
+
+type ExpenseProcessorImpl struct {
+	expenseRepo ExpenseRepository
+}
+
+func NewExpenseProcessorImpl(expenseRepo ExpenseRepository) *ExpenseProcessorImpl {
+	return &ExpenseProcessorImpl{
+		expenseRepo: expenseRepo,
+	}
+}
+
+func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID uuid.UUID, req *models.CreateExpenseRequest) (*models.ExpenseResponse, error) {
+	outletID, err := uuid.Parse(req.OutletID)
+	if err != nil {
+		return nil, fmt.Errorf("invalid outlet_id: %w", err)
+	}
+
+	transactionDate, err := time.Parse("2006-01-02", req.TransactionDate)
+	if err != nil {
+		return nil, fmt.Errorf("invalid transaction_date format, expected YYYY-MM-DD: %w", err)
+	}
+
+	status := string(constants.ExpenseStatusDraft)
+	if req.Status != nil {
+		status = *req.Status
+	}
+
+	expenseEntity := &entities.Expense{
+		OrganizationID:  organizationID,
+		OutletID:        outletID,
+		Receiver:        req.Receiver,
+		TransactionDate: transactionDate,
+		CodeNumber:      req.CodeNumber,
+		Status:          status,
+		Description:     req.Description,
+		Tax:             req.Tax,
+		Total:           req.Total,
+	}
+
+	err = p.expenseRepo.Create(ctx, expenseEntity)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create expense: %w", err)
+	}
+
+	for _, itemReq := range req.Items {
+		chartOfAccountID, err := uuid.Parse(itemReq.ChartOfAccountID)
+		if err != nil {
+			return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
+		}
+
+		itemEntity := &entities.ExpenseItem{
+			ExpenseID:        expenseEntity.ID,
+			ChartOfAccountID: chartOfAccountID,
+			Item:             itemReq.Item,
+			Description:      itemReq.Description,
+			Amount:           itemReq.Amount,
+		}
+
+		err = p.expenseRepo.CreateItem(ctx, itemEntity)
+		if err != nil {
+			return nil, fmt.Errorf("failed to create expense item: %w", err)
+		}
+	}
+
+	created, err := p.expenseRepo.GetByID(ctx, expenseEntity.ID)
+	if err != nil {
+		return mappers.ExpenseEntityToResponse(expenseEntity), nil
+	}
+
+	return mappers.ExpenseEntityToResponse(created), nil
+}
+
+func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdateExpenseRequest) (*models.ExpenseResponse, error) {
+	expenseEntity, err := p.expenseRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("expense not found: %w", err)
+	}
+
+	if req.Receiver != nil {
+		expenseEntity.Receiver = *req.Receiver
+	}
+	if req.TransactionDate != nil {
+		parsedDate, err := time.Parse("2006-01-02", *req.TransactionDate)
+		if err != nil {
+			return nil, fmt.Errorf("invalid transaction_date format, expected YYYY-MM-DD: %w", err)
+		}
+		expenseEntity.TransactionDate = parsedDate
+	}
+	if req.CodeNumber != nil {
+		expenseEntity.CodeNumber = *req.CodeNumber
+	}
+	if req.Status != nil {
+		expenseEntity.Status = *req.Status
+	}
+	if req.OutletID != nil {
+		outletID, err := uuid.Parse(*req.OutletID)
+		if err != nil {
+			return nil, fmt.Errorf("invalid outlet_id: %w", err)
+		}
+		expenseEntity.OutletID = outletID
+	}
+	if req.Description != nil {
+		expenseEntity.Description = req.Description
+	}
+	if req.Tax != nil {
+		expenseEntity.Tax = *req.Tax
+	}
+	if req.Total != nil {
+		expenseEntity.Total = *req.Total
+	}
+	if req.Reserved1 != nil {
+		expenseEntity.Reserved1 = req.Reserved1
+	}
+
+	if req.Items != nil {
+		err = p.expenseRepo.DeleteItemsByExpenseID(ctx, expenseEntity.ID)
+		if err != nil {
+			return nil, fmt.Errorf("failed to delete existing items: %w", err)
+		}
+
+		for _, itemReq := range req.Items {
+			chartOfAccountID := uuid.Nil
+			if itemReq.ChartOfAccountID != nil {
+				chartOfAccountID, err = uuid.Parse(*itemReq.ChartOfAccountID)
+				if err != nil {
+					return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
+				}
+			}
+
+			amount := 0.0
+			if itemReq.Amount != nil {
+				amount = *itemReq.Amount
+			}
+			item := ""
+			if itemReq.Item != nil {
+				item = *itemReq.Item
+			}
+
+			itemEntity := &entities.ExpenseItem{
+				ExpenseID:        expenseEntity.ID,
+				ChartOfAccountID: chartOfAccountID,
+				Item:             item,
+				Description:      itemReq.Description,
+				Amount:           amount,
+			}
+
+			err = p.expenseRepo.CreateItem(ctx, itemEntity)
+			if err != nil {
+				return nil, fmt.Errorf("failed to create expense item: %w", err)
+			}
+		}
+	}
+
+	err = p.expenseRepo.Update(ctx, expenseEntity)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update expense: %w", err)
+	}
+
+	updated, err := p.expenseRepo.GetByID(ctx, id)
+	if err != nil {
+		return mappers.ExpenseEntityToResponse(expenseEntity), nil
+	}
+
+	return mappers.ExpenseEntityToResponse(updated), nil
+}
+
+func (p *ExpenseProcessorImpl) DeleteExpense(ctx context.Context, id, organizationID uuid.UUID) error {
+	_, err := p.expenseRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return fmt.Errorf("expense not found: %w", err)
+	}
+
+	err = p.expenseRepo.Delete(ctx, id)
+	if err != nil {
+		return fmt.Errorf("failed to delete expense: %w", err)
+	}
+
+	return nil
+}
+
+func (p *ExpenseProcessorImpl) GetExpenseByID(ctx context.Context, id, organizationID uuid.UUID) (*models.ExpenseResponse, error) {
+	expenseEntity, err := p.expenseRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("expense not found: %w", err)
+	}
+
+	return mappers.ExpenseEntityToResponse(expenseEntity), nil
+}
+
+func (p *ExpenseProcessorImpl) ListExpenses(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.ExpenseResponse, int, error) {
+	offset := (page - 1) * limit
+	expenseEntities, total, err := p.expenseRepo.List(ctx, organizationID, filters, limit, offset)
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to list expenses: %w", err)
+	}
+
+	expenseResponses := mappers.ExpenseEntitiesToResponses(expenseEntities)
+	totalPages := int((total + int64(limit) - 1) / int64(limit))
+
+	return expenseResponses, totalPages, nil
+}

internal/processor/expense_processor_test.go

@@ -0,0 +1,136 @@
+package processor
+
+import (
+	"context"
+	"testing"
+
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+type expenseRepositoryCaptureStub struct {
+	createdExpense *entities.Expense
+	createdItems   []*entities.ExpenseItem
+}
+
+func (s *expenseRepositoryCaptureStub) Create(_ context.Context, expense *entities.Expense) error {
+	if expense.ID == uuid.Nil {
+		expense.ID = uuid.New()
+	}
+	s.createdExpense = expense
+	return nil
+}
+
+func (s *expenseRepositoryCaptureStub) GetByID(context.Context, uuid.UUID) (*entities.Expense, error) {
+	if s.createdExpense == nil {
+		return nil, nil
+	}
+	items := make([]entities.ExpenseItem, len(s.createdItems))
+	for i, item := range s.createdItems {
+		items[i] = *item
+	}
+	s.createdExpense.Items = items
+	return s.createdExpense, nil
+}
+
+func (*expenseRepositoryCaptureStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.Expense, error) {
+	return nil, nil
+}
+func (*expenseRepositoryCaptureStub) Update(context.Context, *entities.Expense) error { return nil }
+func (*expenseRepositoryCaptureStub) Delete(context.Context, uuid.UUID) error         { return nil }
+func (*expenseRepositoryCaptureStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.Expense, int64, error) {
+	return nil, 0, nil
+}
+func (s *expenseRepositoryCaptureStub) CreateItem(_ context.Context, item *entities.ExpenseItem) error {
+	if item.ID == uuid.Nil {
+		item.ID = uuid.New()
+	}
+	s.createdItems = append(s.createdItems, item)
+	return nil
+}
+func (*expenseRepositoryCaptureStub) DeleteItemsByExpenseID(context.Context, uuid.UUID) error {
+	return nil
+}
+
+func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+	chartOfAccountID := uuid.New()
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: chartOfAccountID.String(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Len(t, repo.createdItems, 1)
+	require.Equal(t, "Cleaning supplies", repo.createdItems[0].Item)
+	require.Len(t, resp.Items, 1)
+	require.Equal(t, "Cleaning supplies", resp.Items[0].Item)
+}
+
+func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "draft", repo.createdExpense.Status)
+	require.Equal(t, "draft", resp.Status)
+}
+
+func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+	status := "approved"
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "approved", repo.createdExpense.Status)
+	require.Equal(t, "approved", resp.Status)
+}

internal/processor/expense_repository.go

@@ -0,0 +1,19 @@
+package processor
+
+import (
+	"apskel-pos-be/internal/entities"
+	"context"
+
+	"github.com/google/uuid"
+)
+
+type ExpenseRepository interface {
+	Create(ctx context.Context, expense *entities.Expense) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.Expense, error)
+	GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.Expense, error)
+	Update(ctx context.Context, expense *entities.Expense) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error)
+	CreateItem(ctx context.Context, item *entities.ExpenseItem) error
+	DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error
+}

internal/processor/order_processor.go

@@ -338,7 +338,7 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 			ProductID:        itemReq.ProductID,
 			ProductVariantID: itemReq.ProductVariantID,
 			Quantity:         itemReq.Quantity,
-			UnitPrice:        unitPrice, // Use price from database
+			UnitPrice:        unitPrice,
 			TotalPrice:       itemTotalPrice,
 			UnitCost:         unitCost,
 			TotalCost:        itemTotalCost,
@@ -594,6 +594,10 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 				return fmt.Errorf("order item does not belong to this order")
 			}
 
+			if orderItem.Status == entities.OrderItemStatusCancelled {
+				return fmt.Errorf("order item %s is already cancelled", orderItemID)
+			}
+
 			if itemVoid.Quantity > orderItem.Quantity {
 				return fmt.Errorf("void quantity cannot exceed original quantity for item %d", itemVoid.OrderItemID)
 			}
@@ -614,9 +618,15 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 			return fmt.Errorf("outlet not found: %w", err)
 		}
 
+		// Reload order to get latest state
+		order, err = p.orderRepo.GetByID(ctx, req.OrderID)
+		if err != nil {
+			return fmt.Errorf("failed to reload order: %w", err)
+		}
+
 		order.Subtotal -= totalVoidedAmount
 		order.TotalCost -= totalVoidedCost
-		order.TaxAmount = order.Subtotal * outlet.TaxRate // Recalculate tax using outlet's tax rate
+		order.TaxAmount = order.Subtotal * outlet.TaxRate
 		order.TotalAmount = order.Subtotal + order.TaxAmount - order.DiscountAmount
 
 		if err := p.orderRepo.Update(ctx, order); err != nil {

internal/processor/purchase_order_processor.go

@@ -175,7 +175,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 		poEntity.TransactionDate = *req.TransactionDate
 	}
 	if req.DueDate != nil {
-		poEntity.DueDate = *req.DueDate
+		poEntity.DueDate = req.DueDate
 	}
 	if req.Reference != nil {
 		poEntity.Reference = req.Reference

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
@@ -433,38 +434,40 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
 }
 
 func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ProfitLossAnalytics, error) {
-	// Summary query
+	mtdStart := time.Date(dateTo.Year(), dateTo.Month(), 1, 0, 0, 0, 0, dateTo.Location())
-	var summary entities.ProfitLossSummary
+	todayStart := time.Date(dateTo.Year(), dateTo.Month(), dateTo.Day(), 0, 0, 0, 0, dateTo.Location())
+	todayEnd := todayStart.Add(24 * time.Hour).Add(-time.Nanosecond)
 
+	var summary entities.ProfitLossSummary
 	summaryQuery := r.db.WithContext(ctx).
 		Table("orders o").
 		Select(`
 			COALESCE(SUM(o.total_amount), 0) as total_revenue,
 			COALESCE(SUM(o.total_cost), 0) as total_cost,
 			COALESCE(SUM(o.total_amount - o.total_cost), 0) as gross_profit,
-			CASE 
+			CASE
-				WHEN SUM(o.total_amount) > 0 
+				WHEN SUM(o.total_amount) > 0
-				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100 
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100
-				ELSE 0 
+				ELSE 0
 			END as gross_profit_margin,
 			COALESCE(SUM(o.tax_amount), 0) as total_tax,
 			COALESCE(SUM(o.discount_amount), 0) as total_discount,
 			COALESCE(SUM(o.total_amount - o.total_cost - o.discount_amount), 0) as net_profit,
-			CASE 
+			CASE
-				WHEN SUM(o.total_amount) > 0 
+				WHEN SUM(o.total_amount) > 0
-				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100 
+				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100
-				ELSE 0 
+				ELSE 0
 			END as net_profit_margin,
 			COUNT(o.id) as total_orders,
-			CASE 
+			CASE
-				WHEN COUNT(o.id) > 0 
+				WHEN COUNT(o.id) > 0
-				THEN SUM(o.total_amount - o.total_cost - o.discount_amount) / COUNT(o.id) 
+				THEN SUM(o.total_amount - o.total_cost - o.discount_amount) / COUNT(o.id)
-				ELSE 0 
+				ELSE 0
 			END as average_profit,
-			CASE 
+			CASE
-				WHEN SUM(o.total_cost) > 0 
+				WHEN SUM(o.total_cost) > 0
-				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_cost)) * 100 
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_cost)) * 100
-				ELSE 0 
+				ELSE 0
 			END as profitability_ratio
 		`).
 		Where("o.organization_id = ?", organizationID).
@@ -472,15 +475,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
 		Where("o.is_void = false AND o.is_refund = false").
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
-
 	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "o.outlet_id")
-
+	if err := summaryQuery.Scan(&summary).Error; err != nil {
-	err := summaryQuery.Scan(&summary).Error
-	if err != nil {
 		return nil, err
 	}
 
-	// Time series data query
 	var timeFormat string
 	switch groupBy {
 	case "hour":
@@ -489,12 +488,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		timeFormat = "DATE_TRUNC('week', o.created_at)"
 	case "month":
 		timeFormat = "DATE_TRUNC('month', o.created_at)"
-	default: // day
+	default:
 		timeFormat = "DATE_TRUNC('day', o.created_at)"
 	}
 
 	var data []entities.ProfitLossData
-
 	dataQuery := r.db.WithContext(ctx).
 		Table("orders o").
 		Select(`
@@ -502,18 +500,18 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 			COALESCE(SUM(o.total_amount), 0) as revenue,
 			COALESCE(SUM(o.total_cost), 0) as cost,
 			COALESCE(SUM(o.total_amount - o.total_cost), 0) as gross_profit,
-			CASE 
+			CASE
-				WHEN SUM(o.total_amount) > 0 
+				WHEN SUM(o.total_amount) > 0
-				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100 
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100
-				ELSE 0 
+				ELSE 0
 			END as gross_profit_margin,
 			COALESCE(SUM(o.tax_amount), 0) as tax,
 			COALESCE(SUM(o.discount_amount), 0) as discount,
 			COALESCE(SUM(o.total_amount - o.total_cost - o.discount_amount), 0) as net_profit,
-			CASE 
+			CASE
-				WHEN SUM(o.total_amount) > 0 
+				WHEN SUM(o.total_amount) > 0
-				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100 
+				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100
-				ELSE 0 
+				ELSE 0
 			END as net_profit_margin,
 			COUNT(o.id) as orders
 		`).
@@ -524,17 +522,12 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo).
 		Group(timeFormat).
 		Order(timeFormat)
-
 	dataQuery = r.resolveOutletID(dataQuery, outletID, "o.outlet_id")
-
+	if err := dataQuery.Scan(&data).Error; err != nil {
-	err = dataQuery.Scan(&data).Error
-	if err != nil {
 		return nil, err
 	}
 
-	// Product profit data query
 	var productData []entities.ProductProfitData
-
 	productQuery := r.db.WithContext(ctx).
 		Table("order_items oi").
 		Select(`
@@ -546,10 +539,10 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) as revenue,
 			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0)) ELSE 0 END) as cost,
 			SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) as gross_profit,
-			CASE 
+			CASE
-				WHEN SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) > 0 
+				WHEN SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) > 0
-				THEN (SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) / SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END)) * 100 
+				THEN (SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) / SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END)) * 100
-				ELSE 0 
+				ELSE 0
 			END as gross_profit_margin,
 			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_price ELSE NULL END) as average_price,
 			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_cost ELSE NULL END) as average_cost,
@@ -567,17 +560,124 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Group("p.id, p.name, c.id, c.name").
 		Order("p.name ASC").
 		Limit(1000)
-
 	productQuery = r.resolveOutletID(productQuery, outletID, "o.outlet_id")
+	if err := productQuery.Scan(&productData).Error; err != nil {
+		return nil, err
+	}
 
-	err = productQuery.Scan(&productData).Error
+	type revenueCostResult struct {
+		Revenue float64
+		Cost    float64
+	}
+
+	var todayRC revenueCostResult
+	todayQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			COALESCE(SUM(o.total_amount), 0) as revenue,
+			COALESCE(SUM(o.total_cost), 0) as cost
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", todayStart, todayEnd)
+	todayQuery = r.resolveOutletID(todayQuery, outletID, "o.outlet_id")
+	if err := todayQuery.Scan(&todayRC).Error; err != nil {
+		return nil, err
+	}
+
+	var mtdRC revenueCostResult
+	mtdQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			COALESCE(SUM(o.total_amount), 0) as revenue,
+			COALESCE(SUM(o.total_cost), 0) as cost
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", mtdStart, todayEnd)
+	mtdQuery = r.resolveOutletID(mtdQuery, outletID, "o.outlet_id")
+	if err := mtdQuery.Scan(&mtdRC).Error; err != nil {
+		return nil, err
+	}
+
+	todayExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, todayStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+
+	mtdExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, mtdStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+
+	opsItems, err := r.getOperationalExpenseItems(ctx, organizationID, outletID, mtdStart, todayEnd)
 	if err != nil {
 		return nil, err
 	}
 
 	return &entities.ProfitLossAnalytics{
-		Summary:     summary,
+		Summary:                 summary,
-		Data:        data,
+		Data:                    data,
-		ProductData: productData,
+		ProductData:             productData,
+		TodayRevenue:            todayRC.Revenue,
+		TodayCost:               todayRC.Cost,
+		MtdRevenue:              mtdRC.Revenue,
+		MtdCost:                 mtdRC.Cost,
+		TodayExpenseByCategory:  todayExpenseByCategory,
+		MtdExpenseByCategory:    mtdExpenseByCategory,
+		OperationalExpenseItems: opsItems,
 	}, nil
 }
+
+func (r *AnalyticsRepositoryImpl) getExpenseByCategory(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExpenseCategoryTotal, error) {
+	var results []entities.ExpenseCategoryTotal
+
+	query := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`COALESCE(parent_coa.name, 'Lain-lain') as category_name, COALESCE(SUM(ei.amount), 0) as amount`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
+		Joins("LEFT JOIN chart_of_accounts parent_coa ON coa.parent_id = parent_coa.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+
+	if outletID != nil {
+		query = query.Where("e.outlet_id = ?", *outletID)
+	}
+
+	err := query.
+		Group("parent_coa.name").
+		Order("parent_coa.name").
+		Scan(&results).Error
+
+	return results, err
+}
+
+func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.OperationalExpenseItem, error) {
+	var results []entities.OperationalExpenseItem
+
+	query := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`COALESCE(NULLIF(ei.item, ''), ei.description, coa.name) as item, COALESCE(SUM(ei.amount), 0) as amount`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+
+	if outletID != nil {
+		query = query.Where("e.outlet_id = ?", *outletID)
+	}
+
+	err := query.
+		Group("COALESCE(NULLIF(ei.item, ''), ei.description, coa.name)").
+		Order("amount DESC").
+		Scan(&results).Error
+
+	return results, err
+}

internal/repository/expense_repository.go

@@ -0,0 +1,123 @@
+package repository
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"github.com/google/uuid"
+
+	"apskel-pos-be/internal/entities"
+
+	"gorm.io/gorm"
+)
+
+type ExpenseRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewExpenseRepositoryImpl(db *gorm.DB) *ExpenseRepositoryImpl {
+	return &ExpenseRepositoryImpl{
+		db: db,
+	}
+}
+
+func (r *ExpenseRepositoryImpl) Create(ctx context.Context, expense *entities.Expense) error {
+	return r.db.WithContext(ctx).Create(expense).Error
+}
+
+func (r *ExpenseRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Expense, error) {
+	var expense entities.Expense
+	err := r.db.WithContext(ctx).
+		Preload("Items.ChartOfAccount").
+		First(&expense, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &expense, nil
+}
+
+func (r *ExpenseRepositoryImpl) GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.Expense, error) {
+	var expense entities.Expense
+	err := r.db.WithContext(ctx).
+		Preload("Items.ChartOfAccount").
+		Where("id = ? AND organization_id = ?", id, organizationID).
+		First(&expense).Error
+	if err != nil {
+		return nil, err
+	}
+	return &expense, nil
+}
+
+func (r *ExpenseRepositoryImpl) Update(ctx context.Context, expense *entities.Expense) error {
+	return r.db.WithContext(ctx).Save(expense).Error
+}
+
+func (r *ExpenseRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.Expense{}, "id = ?", id).Error
+}
+
+func (r *ExpenseRepositoryImpl) List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error) {
+	var expenses []*entities.Expense
+	var total int64
+
+	query := r.db.WithContext(ctx).Model(&entities.Expense{}).Where("organization_id = ?", organizationID)
+
+	for key, value := range filters {
+		switch key {
+		case "search":
+			if searchStr, ok := value.(string); ok && searchStr != "" {
+				searchPattern := "%" + strings.ToLower(searchStr) + "%"
+				query = query.Where(`
+					LOWER(receiver) LIKE ?
+					OR LOWER(code_number) LIKE ?
+					OR LOWER(description) LIKE ?
+					OR EXISTS (
+						SELECT 1
+						FROM expense_items ei
+						WHERE ei.expense_id = expenses.id
+						  AND LOWER(ei.item) LIKE ?
+					)
+				`, searchPattern, searchPattern, searchPattern, searchPattern)
+			}
+		case "outlet_id":
+			if outletID, ok := value.(uuid.UUID); ok {
+				query = query.Where("outlet_id = ?", outletID)
+			}
+		case "status":
+			if status, ok := value.(string); ok && status != "" {
+				query = query.Where("status = ?", status)
+			}
+		case "start_date":
+			if startDate, ok := value.(time.Time); ok {
+				query = query.Where("transaction_date >= ?", startDate)
+			}
+		case "end_date":
+			if endDate, ok := value.(time.Time); ok {
+				query = query.Where("transaction_date <= ?", endDate)
+			}
+		default:
+			query = query.Where(key+" = ?", value)
+		}
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.
+		Preload("Items.ChartOfAccount").
+		Order("created_at DESC").
+		Limit(limit).
+		Offset(offset).
+		Find(&expenses).Error
+	return expenses, total, err
+}
+
+func (r *ExpenseRepositoryImpl) CreateItem(ctx context.Context, item *entities.ExpenseItem) error {
+	return r.db.WithContext(ctx).Create(item).Error
+}
+
+func (r *ExpenseRepositoryImpl) DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.ExpenseItem{}, "expense_id = ?", expenseID).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)
+}

internal/router/router.go

@@ -9,6 +9,7 @@ import (
 	"apskel-pos-be/internal/validator"
 
 	"github.com/gin-gonic/gin"
+	"github.com/redis/go-redis/v9"
 )
 
 type Router struct {
@@ -50,11 +51,13 @@ type Router struct {
 	notificationHandler               *handler.NotificationHandler
 	selfOrderHandler                  *handler.SelfOrderHandler
 	productOutletPriceHandler         *handler.ProductOutletPriceHandler
+	expenseHandler                    *handler.ExpenseHandler
 	authMiddleware                    *middleware.AuthMiddleware
 	customerAuthMiddleware            *middleware.CustomerAuthMiddleware
+	redisClient                       *redis.Client
 }
 
-func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator, productOutletPriceService service.ProductOutletPriceService, productOutletPriceValidator validator.ProductOutletPriceValidator, selfOrderHandler *handler.SelfOrderHandler) *Router {
+func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator, productOutletPriceService service.ProductOutletPriceService, productOutletPriceValidator validator.ProductOutletPriceValidator, selfOrderHandler *handler.SelfOrderHandler, expenseService *service.ExpenseServiceImpl, expenseValidator *validator.ExpenseValidatorImpl, redisClient *redis.Client) *Router {
 
 	return &Router{
 		config:                            cfg,
@@ -97,6 +100,8 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		notificationHandler:               handler.NewNotificationHandler(notificationService, notificationValidator),
 		selfOrderHandler:                  selfOrderHandler,
 		productOutletPriceHandler:         handler.NewProductOutletPriceHandler(productOutletPriceService, productOutletPriceValidator),
+		expenseHandler:                    handler.NewExpenseHandler(expenseService, expenseValidator),
+		redisClient:                       redisClient,
 	}
 }
 
@@ -272,19 +277,19 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				orders.GET("", r.orderHandler.ListOrders)
 				orders.GET("/:id", r.orderHandler.GetOrderByID)
 				orders.POST("", r.orderHandler.CreateOrder)
-				orders.POST("/:id/add-items", r.orderHandler.AddToOrder)
+				orders.POST("/:id/add-items", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.AddToOrder)
 				orders.PUT("/:id", r.orderHandler.UpdateOrder)
 				orders.PUT("/:id/customer", r.orderHandler.SetOrderCustomer)
-				orders.POST("/void", r.orderHandler.VoidOrder)
+				orders.POST("/void", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.VoidOrder)
-				orders.POST("/:id/refund", r.orderHandler.RefundOrder)
+				orders.POST("/:id/refund", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.RefundOrder)
 				orders.POST("/split-bill", r.orderHandler.SplitBill)
 			}
 
 			payments := protected.Group("/payments")
 			payments.Use(r.authMiddleware.RequireAdminOrManager())
 			{
-				payments.POST("", r.orderHandler.CreatePayment)
+				payments.POST("", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.CreatePayment)
-				payments.POST("/:id/refund", r.orderHandler.RefundPayment)
+				payments.POST("/:id/refund", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.RefundPayment)
 			}
 
 			paymentMethods := protected.Group("/payment-methods")
@@ -444,6 +449,16 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				accounts.GET("/:id/balance", r.accountHandler.GetAccountBalance)
 			}
 
+			expenses := protected.Group("/expenses")
+			expenses.Use(r.authMiddleware.RequireAdminOrManager())
+			{
+				expenses.POST("", r.expenseHandler.CreateExpense)
+				expenses.GET("", r.expenseHandler.ListExpenses)
+				expenses.GET("/:id", r.expenseHandler.GetExpense)
+				expenses.PUT("/:id", r.expenseHandler.UpdateExpense)
+				expenses.DELETE("/:id", r.expenseHandler.DeleteExpense)
+			}
+
 			orderIngredientTransactions := protected.Group("/order-ingredient-transactions")
 			orderIngredientTransactions.Use(r.authMiddleware.RequireAdminOrManager())
 			{

internal/service/analytics_service.go

@@ -134,18 +134,6 @@ func (s *AnalyticsServiceImpl) validatePaymentMethodAnalyticsRequest(req *models
 		return fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	if req.GroupBy != "" {
-		validGroupBy := map[string]bool{
-			"day":   true,
-			"hour":  true,
-			"week":  true,
-			"month": true,
-		}
-		if !validGroupBy[req.GroupBy] {
-			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
-		}
-	}
-
 	return nil
 }
 
@@ -318,8 +306,16 @@ func (s *AnalyticsServiceImpl) validateProfitLossAnalyticsRequest(req *models.Pr
 		return fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	if req.GroupBy != "" && req.GroupBy != "hour" && req.GroupBy != "day" && req.GroupBy != "week" && req.GroupBy != "month" {
+	if req.GroupBy != "" {
-		return fmt.Errorf("invalid group_by value, must be one of: hour, day, week, month")
+		validGroupBy := map[string]bool{
+			"day":   true,
+			"hour":  true,
+			"week":  true,
+			"month": true,
+		}
+		if !validGroupBy[req.GroupBy] {
+			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
+		}
 	}
 
 	return nil

internal/service/analytics_service_test.go

@@ -119,3 +119,74 @@ func TestAnalyticsServiceGetPurchasingAnalyticsAllowsEmptyGroupBy(t *testing.T)
 	require.NoError(t, err)
 	require.NotNil(t, resp)
 }
+
+func TestAnalyticsServiceGetProfitLossAnalyticsValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name    string
+		req     *models.ProfitLossAnalyticsRequest
+		wantErr string
+	}{
+		{
+			name: "missing date_from",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateTo:         now,
+			},
+			wantErr: "date_from is required",
+		},
+		{
+			name: "missing date_to",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+			},
+			wantErr: "date_to is required",
+		},
+		{
+			name: "reversed dates",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now.AddDate(0, 0, 1),
+				DateTo:         now,
+			},
+			wantErr: "date_from cannot be after date_to",
+		},
+		{
+			name: "invalid group_by",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+				DateTo:         now,
+				GroupBy:        "quarter",
+			},
+			wantErr: "invalid group_by value: quarter",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp, err := service.GetProfitLossAnalytics(context.Background(), tt.req)
+
+			require.Nil(t, resp)
+			require.Error(t, err)
+			require.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
+}
+
+func TestAnalyticsServiceGetProfitLossAnalyticsAllowsEmptyGroupBy(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	resp, err := service.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, resp)
+}

internal/service/expense_service.go

@@ -0,0 +1,128 @@
+package service
+
+import (
+	"apskel-pos-be/internal/appcontext"
+	"context"
+	"time"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/processor"
+	"apskel-pos-be/internal/transformer"
+
+	"github.com/google/uuid"
+)
+
+type ExpenseService interface {
+	CreateExpense(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateExpenseRequest) *contract.Response
+	UpdateExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateExpenseRequest) *contract.Response
+	DeleteExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response
+	GetExpenseByID(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response
+	ListExpenses(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.ListExpenseRequest) *contract.Response
+}
+
+type ExpenseServiceImpl struct {
+	expenseProcessor processor.ExpenseProcessor
+}
+
+func NewExpenseService(expenseProcessor processor.ExpenseProcessor) *ExpenseServiceImpl {
+	return &ExpenseServiceImpl{
+		expenseProcessor: expenseProcessor,
+	}
+}
+
+func (s *ExpenseServiceImpl) CreateExpense(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.CreateExpenseRequest) *contract.Response {
+	modelReq := transformer.CreateExpenseRequestToModel(req)
+
+	expenseResponse, err := s.expenseProcessor.CreateExpense(ctx, apctx.OrganizationID, modelReq)
+	if err != nil {
+		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
+		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
+	}
+
+	contractResponse := transformer.ExpenseModelResponseToResponse(expenseResponse)
+	return contract.BuildSuccessResponse(contractResponse)
+}
+
+func (s *ExpenseServiceImpl) UpdateExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID, req *contract.UpdateExpenseRequest) *contract.Response {
+	modelReq := transformer.UpdateExpenseRequestToModel(req)
+
+	expenseResponse, err := s.expenseProcessor.UpdateExpense(ctx, id, apctx.OrganizationID, modelReq)
+	if err != nil {
+		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
+		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
+	}
+
+	contractResponse := transformer.ExpenseModelResponseToResponse(expenseResponse)
+	return contract.BuildSuccessResponse(contractResponse)
+}
+
+func (s *ExpenseServiceImpl) DeleteExpense(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response {
+	err := s.expenseProcessor.DeleteExpense(ctx, id, apctx.OrganizationID)
+	if err != nil {
+		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
+		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
+	}
+
+	return contract.BuildSuccessResponse(map[string]interface{}{
+		"message": "Expense deleted successfully",
+	})
+}
+
+func (s *ExpenseServiceImpl) GetExpenseByID(ctx context.Context, apctx *appcontext.ContextInfo, id uuid.UUID) *contract.Response {
+	expenseResponse, err := s.expenseProcessor.GetExpenseByID(ctx, id, apctx.OrganizationID)
+	if err != nil {
+		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
+		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
+	}
+
+	contractResponse := transformer.ExpenseModelResponseToResponse(expenseResponse)
+	return contract.BuildSuccessResponse(contractResponse)
+}
+
+func (s *ExpenseServiceImpl) ListExpenses(ctx context.Context, apctx *appcontext.ContextInfo, req *contract.ListExpenseRequest) *contract.Response {
+	modelReq := transformer.ListExpenseRequestToModel(req)
+
+	filters := make(map[string]interface{})
+	if modelReq.Search != "" {
+		filters["search"] = modelReq.Search
+	}
+	if modelReq.Status != "" {
+		filters["status"] = modelReq.Status
+	}
+	if modelReq.OutletID != "" {
+		outletID, err := uuid.Parse(modelReq.OutletID)
+		if err == nil {
+			filters["outlet_id"] = outletID
+		}
+	}
+	if modelReq.StartDate != "" {
+		if startDate, err := time.Parse("2006-01-02", modelReq.StartDate); err == nil {
+			filters["start_date"] = startDate
+		}
+	}
+	if modelReq.EndDate != "" {
+		if endDate, err := time.Parse("2006-01-02", modelReq.EndDate); err == nil {
+			// include the full end date day
+			filters["end_date"] = endDate.Add(24*time.Hour - time.Nanosecond)
+		}
+	}
+
+	expenses, totalPages, err := s.expenseProcessor.ListExpenses(ctx, apctx.OrganizationID, filters, modelReq.Page, modelReq.Limit)
+	if err != nil {
+		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.ExpenseServiceEntity, err.Error())
+		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
+	}
+
+	contractResponses := transformer.ExpenseModelResponsesToResponses(expenses)
+
+	response := contract.ListExpenseResponse{
+		Expenses:   contractResponses,
+		TotalCount: len(contractResponses),
+		Page:       modelReq.Page,
+		Limit:      modelReq.Limit,
+		TotalPages: totalPages,
+	}
+
+	return contract.BuildSuccessResponse(response)
+}

internal/service/omset_milestone_scheduler.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"math"
 	"sync"
 	"time"
 
 	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/processor"
 	"apskel-pos-be/internal/repository"
@@ -17,32 +17,38 @@ import (
 )
 
 const (
-	defaultCheckInterval = 1 * time.Hour
+	defaultCheckInterval = 5 * time.Minute
 	OmsetMillionRupiah   = 1_000_000.0
 )
 
-// OmsetMilestoneScheduler periodically checks each organization's total omset
+// OmsetMilestoneScheduler periodically checks each outlet's omset for the
-// and sends a notification to owner/admin users when a milestone is reached.
+// current calendar day and sends a notification every time it crosses a new
+// multiple of OmsetMillionRupiah (1 jt, 2 jt, 3 jt, …).
 //
-// NOTE: Milestone tracking is in-memory; notifications may re-trigger after a restart.
+// The notified state is keyed by "outletID:YYYY-MM-DD:N" so each multiple is
-// For persistent tracking, persist the notified state in the database.
+// only notified once per day. State resets naturally on the next day (new key).
+// NOTE: state is in-memory; a server restart within the same day may re-send
+// notifications for already-crossed milestones.
 type OmsetMilestoneScheduler struct {
 	orgRepo          *repository.OrganizationRepositoryImpl
+	outletRepo       *repository.OutletRepositoryImpl
 	userRepo         *repository.UserRepositoryImpl
 	notificationProc processor.NotificationProcessor
 
 	mu       sync.Mutex
-	notified map[string]bool // "orgID:milestone" -> already notified
+	notified map[string]bool // "outletID:YYYY-MM-DD:N" -> already notified
 	stopCh   chan struct{}
 }
 
 func NewOmsetMilestoneScheduler(
 	orgRepo *repository.OrganizationRepositoryImpl,
+	outletRepo *repository.OutletRepositoryImpl,
 	userRepo *repository.UserRepositoryImpl,
 	notificationProc processor.NotificationProcessor,
 ) *OmsetMilestoneScheduler {
 	return &OmsetMilestoneScheduler{
 		orgRepo:          orgRepo,
+		outletRepo:       outletRepo,
 		userRepo:         userRepo,
 		notificationProc: notificationProc,
 		notified:         make(map[string]bool),
@@ -57,8 +63,8 @@ func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
 	}
 
 	go func() {
-		// Perform an initial check immediately.
+		// Perform an initial check immediately on startup.
-		s.checkAllOrganizations()
+		s.checkAllOutlets()
 
 		ticker := time.NewTicker(interval)
 		defer ticker.Stop()
@@ -66,7 +72,7 @@ func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
 		for {
 			select {
 			case <-ticker.C:
-				s.checkAllOrganizations()
+				s.checkAllOutlets()
 			case <-s.stopCh:
 				log.Println("Omset milestone scheduler stopped")
 				return
@@ -74,7 +80,7 @@ func (s *OmsetMilestoneScheduler) Start(interval time.Duration) {
 		}
 	}()
 
-	log.Println("Omset milestone scheduler started")
+	log.Printf("Omset milestone scheduler started (interval: %s)", interval)
 }
 
 // Stop signals the scheduler to stop.
@@ -82,7 +88,7 @@ func (s *OmsetMilestoneScheduler) Stop() {
 	close(s.stopCh)
 }
 
-func (s *OmsetMilestoneScheduler) checkAllOrganizations() {
+func (s *OmsetMilestoneScheduler) checkAllOutlets() {
 	ctx := context.Background()
 
 	orgs, _, err := s.orgRepo.List(ctx, nil, 1000, 0)
@@ -92,25 +98,38 @@ func (s *OmsetMilestoneScheduler) checkAllOrganizations() {
 	}
 
 	for _, org := range orgs {
-		s.checkOrganization(ctx, org)
+		outlets, err := s.outletRepo.GetByOrganizationID(ctx, org.ID)
-	}
+		if err != nil {
-}
+			log.Printf("OmsetMilestoneScheduler: failed to list outlets for org %s: %v", org.ID, err)
-
-func (s *OmsetMilestoneScheduler) checkOrganization(ctx context.Context, org *entities.Organization) {
-	totalOmset, err := s.orgRepo.GetTotalOmset(ctx, org.ID)
-	if err != nil {
-		log.Printf("OmsetMilestoneScheduler: failed to get total omset for org %s: %v", org.ID, err)
-		return
-	}
-
-	milestones := []float64{OmsetMillionRupiah}
-
-	for _, milestone := range milestones {
-		if totalOmset < milestone {
 			continue
 		}
 
-		key := fmt.Sprintf("%s:%.0f", org.ID.String(), milestone)
+		for _, outlet := range outlets {
+			if !outlet.IsActive {
+				continue
+			}
+			s.checkOutlet(ctx, org.ID, outlet.ID, outlet.Name)
+		}
+	}
+}
+
+func (s *OmsetMilestoneScheduler) checkOutlet(ctx context.Context, organizationID, outletID uuid.UUID, outletName string) {
+	todayOmset, err := s.outletRepo.GetTodayOmset(ctx, outletID)
+	if err != nil {
+		log.Printf("OmsetMilestoneScheduler: failed to get today's omset for outlet %s: %v", outletID, err)
+		return
+	}
+
+	if todayOmset < OmsetMillionRupiah {
+		return
+	}
+
+	// How many full multiples of 1 juta have been crossed today?
+	crossedMultiple := int(math.Floor(todayOmset / OmsetMillionRupiah))
+	today := time.Now().Format("2006-01-02")
+
+	for n := 1; n <= crossedMultiple; n++ {
+		key := fmt.Sprintf("%s:%s:%d", outletID.String(), today, n)
 
 		s.mu.Lock()
 		if s.notified[key] {
@@ -120,23 +139,31 @@ func (s *OmsetMilestoneScheduler) checkOrganization(ctx context.Context, org *en
 		s.notified[key] = true
 		s.mu.Unlock()
 
-		s.sendMilestoneNotification(ctx, org, totalOmset, milestone)
+		milestone := float64(n) * OmsetMillionRupiah
+		s.sendMilestoneNotification(ctx, organizationID, outletID, outletName, todayOmset, milestone, n)
 	}
 }
 
-func (s *OmsetMilestoneScheduler) sendMilestoneNotification(ctx context.Context, org *entities.Organization, totalOmset float64, milestone float64) {
+func (s *OmsetMilestoneScheduler) sendMilestoneNotification(
-	users, err := s.userRepo.GetByOrganizationID(ctx, org.ID)
+	ctx context.Context,
+	organizationID, outletID uuid.UUID,
+	outletName string,
+	todayOmset, milestone float64,
+	multiple int,
+) {
+	// Fetch all users in the org, then filter to owner and manager only.
+	// These roles are not assigned to a specific outlet, so we query by org.
+	users, err := s.userRepo.GetByOrganizationID(ctx, organizationID)
 	if err != nil {
-		log.Printf("OmsetMilestoneScheduler: failed to get users for org %s: %v", org.ID, err)
+		log.Printf("OmsetMilestoneScheduler: failed to get users for org %s: %v", organizationID, err)
 		return
 	}
 
-	// Notify owner and admin users.
 	var receiverIDs []uuid.UUID
-	for _, user := range users {
+	for _, u := range users {
-		roleStr := string(user.Role)
+		role := string(u.Role)
-		if roleStr == string(constants.RoleOwner) || roleStr == string(constants.RoleAdmin) {
+		if role == string(constants.RoleOwner) || role == string(constants.RoleManager) {
-			receiverIDs = append(receiverIDs, user.ID)
+			receiverIDs = append(receiverIDs, u.ID)
 		}
 	}
 
@@ -144,28 +171,34 @@ func (s *OmsetMilestoneScheduler) sendMilestoneNotification(ctx context.Context,
 		return
 	}
 
-	orgID := org.ID
+	title := fmt.Sprintf("🎉 Omset %s Hari Ini Mencapai Rp %.0f!", outletName, milestone)
-	title := "🎉 Selamat! Omset Telah Mencapai 1 Juta Rupiah"
+	body := fmt.Sprintf(
-	body := fmt.Sprintf("Organisasi %s telah mencapai omset Rp %.0f. Terus tingkatkan prestasinya!", org.Name, totalOmset)
+		"Selamat! Omset outlet %s hari ini sudah menembus Rp %.0f (total hari ini: Rp %.0f). Terus semangat!",
+		outletName, milestone, todayOmset,
+	)
 
 	notifReq := &models.SendNotificationRequest{
 		Title:          title,
 		Body:           body,
 		Type:           "milestone",
 		Category:       "omset_milestone",
-		NotifiableType: "organization",
+		NotifiableType: "outlet",
-		NotifiableID:   &orgID,
+		NotifiableID:   &outletID,
 		ReceiverIDs:    receiverIDs,
 		Data: map[string]interface{}{
-			"organization_id": org.ID.String(),
+			"organization_id": organizationID.String(),
-			"total_omset":     totalOmset,
+			"outlet_id":       outletID.String(),
+			"outlet_name":     outletName,
+			"today_omset":     todayOmset,
 			"milestone":       milestone,
+			"multiple":        multiple,
 		},
 	}
 
 	if _, err := s.notificationProc.Send(ctx, notifReq); err != nil {
-		log.Printf("OmsetMilestoneScheduler: failed to send notification for org %s: %v", org.ID, err)
+		log.Printf("OmsetMilestoneScheduler: failed to send notification for outlet %s: %v", outletID, err)
 	} else {
-		log.Printf("OmsetMilestoneScheduler: sent milestone notification to org %s (omset: %.0f)", org.ID, totalOmset)
+		log.Printf("OmsetMilestoneScheduler: sent milestone x%d (Rp %.0f) for outlet %s (today omset: %.0f)",
+			multiple, milestone, outletName, todayOmset)
 	}
 }

internal/service/order_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"apskel-pos-be/internal/appcontext"
 	"context"
+	"database/sql"
 	"fmt"
 	"time"
 
@@ -228,7 +229,9 @@ func (s *OrderServiceImpl) AddToOrder(ctx context.Context, orderID uuid.UUID, re
 	var response *models.AddToOrderResponse
 	var ingredientTransactions []*contract.CreateOrderIngredientTransactionRequest
 
-	err := s.txManager.WithTransaction(ctx, func(txCtx context.Context) error {
+	err := s.txManager.WithTransactionOptions(ctx, &sql.TxOptions{
+		Isolation: sql.LevelSerializable,
+	}, func(txCtx context.Context) error {
 		addResp, err := s.orderProcessor.AddToOrder(txCtx, orderID, req)
 		if err != nil {
 			return fmt.Errorf("failed to add items to order: %w", err)
@@ -305,8 +308,16 @@ func (s *OrderServiceImpl) VoidOrder(ctx context.Context, req *models.VoidOrderR
 		return fmt.Errorf("invalid user ID")
 	}
 
-	if err := s.orderProcessor.VoidOrder(ctx, req, voidedBy); err != nil {
+	err := s.txManager.WithTransactionOptions(ctx, &sql.TxOptions{
-		return fmt.Errorf("failed to void order: %w", err)
+		Isolation: sql.LevelSerializable,
+	}, func(txCtx context.Context) error {
+		if err := s.orderProcessor.VoidOrder(txCtx, req, voidedBy); err != nil {
+			return fmt.Errorf("failed to void order: %w", err)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
 	}
 
 	if err := s.handleTableReleaseOnVoid(ctx, req.OrderID); err != nil {
@@ -561,9 +572,14 @@ func (s *OrderServiceImpl) validateCreatePaymentRequest(req *models.CreatePaymen
 				return fmt.Errorf("payment item amount must be greater than zero for item %d", i+1)
 			}
 
+			fmt.Printf("[DEBUG] CreatePayment order_id=%s item[%d] order_item_id=%s amount=%.10f\n",
+				req.OrderID, i, item.OrderItemID, item.Amount)
 			totalItemAmount += item.Amount
 		}
 
+		fmt.Printf("[DEBUG] CreatePayment order_id=%s total_amount=%.10f sum_items=%.10f diff=%.10f\n",
+			req.OrderID, req.Amount, totalItemAmount, req.Amount-totalItemAmount)
+
 		if totalItemAmount != req.Amount {
 			return fmt.Errorf("sum of payment item amounts must equal total payment amount")
 		}

internal/service/report_service.go

@@ -113,7 +113,8 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 	end := day.Add(24*time.Hour - time.Nanosecond)
 
 	salesReq := &models.SalesAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, GroupBy: "day"}
-	plReq := &models.ProfitLossAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, GroupBy: "day"}
+	plReq := &models.ProfitLossAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end}
+	productReq := &models.ProductAnalyticsRequest{OrganizationID: orgID, OutletID: &outID, DateFrom: start, DateTo: end, Limit: 1000}
 
 	sales, err := s.analyticsService.GetSalesAnalytics(ctx, salesReq)
 	if err != nil {
@@ -123,6 +124,15 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 	if err != nil {
 		return "", "", fmt.Errorf("get profit/loss analytics: %w", err)
 	}
+	products, err := s.analyticsService.GetProductAnalytics(ctx, productReq)
+	if err != nil {
+		return "", "", fmt.Errorf("get product analytics: %w", err)
+	}
+
+	totalOmset := getPLNominalByID(pl.MainSummary, "total_omset")
+	hpp := getPLNominalByID(pl.MainSummary, "hpp")
+	labaKotor := getPLNominalByID(pl.MainSummary, "laba_kotor")
+	labaKotorPct := getPLPctByID(pl.MainSummary, "laba_kotor")
 
 	data := reportTemplateData{
 		OrganizationName: org.Name,
@@ -133,28 +143,28 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 		GeneratedBy:      generatedBy,
 		PrintTime:        time.Now().Format("02/01/2006 15:04:05"),
 		Summary: reportSummary{
-			TotalTransactions:  pl.Summary.TotalOrders,
+			TotalTransactions:  sales.Summary.TotalOrders,
 			TotalItems:         sales.Summary.TotalItems,
-			GrossSales:         formatCurrency(pl.Summary.TotalRevenue),
+			GrossSales:         formatCurrency(totalOmset),
-			Discount:           formatCurrency(pl.Summary.TotalDiscount),
+			Discount:           formatCurrency(sales.Summary.TotalDiscount),
-			Tax:                formatCurrency(pl.Summary.TotalTax),
+			Tax:                formatCurrency(sales.Summary.TotalTax),
 			NetSales:           formatCurrency(sales.Summary.NetSales),
-			COGS:               formatCurrency(pl.Summary.TotalCost),
+			COGS:               formatCurrency(hpp),
-			GrossProfit:        formatCurrency(pl.Summary.GrossProfit),
+			GrossProfit:        formatCurrency(labaKotor),
-			GrossMarginPercent: fmt.Sprintf("%.2f", pl.Summary.GrossProfitMargin),
+			GrossMarginPercent: fmt.Sprintf("%.2f", labaKotorPct),
 		},
 	}
 
-	items := make([]reportItem, 0, len(pl.ProductData))
+	items := make([]reportItem, 0, len(products.Data))
-	for _, p := range pl.ProductData {
+	for _, p := range products.Data {
 		items = append(items, reportItem{
 			Name:        p.ProductName,
 			Quantity:    p.QuantitySold,
 			GrossSales:  formatCurrency(p.Revenue),
 			Discount:    formatCurrency(0),
 			NetSales:    formatCurrency(p.Revenue),
-			COGS:        formatCurrency(p.Cost),
+			COGS:        formatCurrency(p.StandardHppTotal),
-			GrossProfit: formatCurrency(p.GrossProfit),
+			GrossProfit: formatCurrency(p.Revenue - p.StandardHppTotal),
 		})
 	}
 	data.Items = items
@@ -190,3 +200,21 @@ func (s *ReportServiceImpl) GenerateDailyTransactionPDF(ctx context.Context, org
 
 	return publicURL, fileName, nil
 }
+
+func getPLNominalByID(rows []models.ProfitLossSummaryRow, id string) float64 {
+	for _, row := range rows {
+		if row.ID == id {
+			return row.TodayNominal
+		}
+	}
+	return 0
+}
+
+func getPLPctByID(rows []models.ProfitLossSummaryRow, id string) float64 {
+	for _, row := range rows {
+		if row.ID == id {
+			return row.TodayPct
+		}
+	}
+	return 0
+}

internal/transformer/analytics_transformer.go

@@ -257,6 +257,7 @@ func ProductAnalyticsModelToContract(resp *models.ProductAnalyticsResponse) *con
 			ProductID:               item.ProductID,
 			ProductName:             item.ProductName,
 			ProductSku:              item.ProductSku,
+			ProductPrice:            item.ProductPrice,
 			CategoryID:              item.CategoryID,
 			CategoryName:            item.CategoryName,
 			CategoryOrder:           item.CategoryOrder,
@@ -367,6 +368,7 @@ func DashboardAnalyticsModelToContract(resp *models.DashboardAnalyticsResponse)
 		topProducts = append(topProducts, contract.ProductAnalyticsData{
 			ProductID:               item.ProductID,
 			ProductName:             item.ProductName,
+			ProductPrice:            item.ProductPrice,
 			CategoryID:              item.CategoryID,
 			CategoryName:            item.CategoryName,
 			QuantitySold:            item.QuantitySold,
@@ -427,20 +429,22 @@ func DashboardAnalyticsModelToContract(resp *models.DashboardAnalyticsResponse)
 	}
 }
 
-// ProfitLossAnalyticsContractToModel transforms contract request to model
 func ProfitLossAnalyticsContractToModel(req *contract.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsRequest, error) {
 	if req == nil {
 		return nil, fmt.Errorf("request cannot be nil")
 	}
 
-	// Parse date range using utility function
 	dateFrom, dateTo, err := util.ParseDateRangeToJakartaTime(req.DateFrom, req.DateTo)
 	if err != nil {
-		return nil, fmt.Errorf("invalid date format: %w", err)
+		return nil, fmt.Errorf("invalid date range: %w", err)
 	}
 
-	if dateFrom == nil || dateTo == nil {
+	if dateFrom == nil {
-		return nil, fmt.Errorf("both date_from and date_to are required")
+		return nil, fmt.Errorf("date_from is required")
+	}
+
+	if dateTo == nil {
+		return nil, fmt.Errorf("date_to is required")
 	}
 
 	return &models.ProfitLossAnalyticsRequest{
@@ -452,13 +456,16 @@ func ProfitLossAnalyticsContractToModel(req *contract.ProfitLossAnalyticsRequest
 	}, nil
 }
 
-// ProfitLossAnalyticsModelToContract transforms model response to contract
 func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse) *contract.ProfitLossAnalyticsResponse {
 	if resp == nil {
 		return nil
 	}
 
-	// Transform profit/loss data
+	mainSummary := make([]contract.ProfitLossSummaryRow, len(resp.MainSummary))
+	for i, row := range resp.MainSummary {
+		mainSummary[i] = profitLossSummaryRowModelToContract(row)
+	}
+
 	data := make([]contract.ProfitLossData, len(resp.Data))
 	for i, item := range resp.Data {
 		data[i] = contract.ProfitLossData{
@@ -475,7 +482,6 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		}
 	}
 
-	// Transform product profit data
 	productData := make([]contract.ProductProfitData, len(resp.ProductData))
 	for i, item := range resp.ProductData {
 		productData[i] = contract.ProductProfitData{
@@ -494,6 +500,14 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		}
 	}
 
+	opsItems := make([]contract.OperationalExpenseItem, len(resp.OperationalExpenses))
+	for i, item := range resp.OperationalExpenses {
+		opsItems[i] = contract.OperationalExpenseItem{
+			Item:    item.Item,
+			Nominal: item.Nominal,
+		}
+	}
+
 	return &contract.ProfitLossAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
@@ -513,7 +527,27 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 			AverageProfit:      resp.Summary.AverageProfit,
 			ProfitabilityRatio: resp.Summary.ProfitabilityRatio,
 		},
-		Data:        data,
+		Data:                     data,
-		ProductData: productData,
+		ProductData:              productData,
+		MainSummary:              mainSummary,
+		OperationalExpenses:      opsItems,
+		OperationalExpensesTotal: resp.OperationalExpensesTotal,
+	}
+}
+
+func profitLossSummaryRowModelToContract(row models.ProfitLossSummaryRow) contract.ProfitLossSummaryRow {
+	subItems := make([]contract.ProfitLossSummaryRow, len(row.SubItems))
+	for i, sub := range row.SubItems {
+		subItems[i] = profitLossSummaryRowModelToContract(sub)
+	}
+	return contract.ProfitLossSummaryRow{
+		ID:           row.ID,
+		Label:        row.Label,
+		IsBold:       row.IsBold,
+		TodayNominal: row.TodayNominal,
+		TodayPct:     row.TodayPct,
+		MtdNominal:   row.MtdNominal,
+		MtdPct:       row.MtdPct,
+		SubItems:     subItems,
 	}
 }

internal/transformer/analytics_transformer_test.go

@@ -74,3 +74,81 @@ func TestPurchasingAnalyticsModelToContractOmitsNilOutletName(t *testing.T) {
 	require.NoError(t, err)
 	require.NotContains(t, string(payload), "outlet_name")
 }
+
+func TestProfitLossAnalyticsContractToModelParsesDateRange(t *testing.T) {
+	orgID := uuid.New()
+	outletID := uuid.New().String()
+
+	result, err := ProfitLossAnalyticsContractToModel(&contract.ProfitLossAnalyticsRequest{
+		OrganizationID: orgID,
+		OutletID:       &outletID,
+		DateFrom:       "01-05-2026",
+		DateTo:         "29-05-2026",
+		GroupBy:        "week",
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, orgID, result.OrganizationID)
+	require.NotNil(t, result.OutletID)
+	require.Equal(t, outletID, result.OutletID.String())
+	require.Equal(t, "week", result.GroupBy)
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	require.NoError(t, err)
+	require.Equal(t, time.Date(2026, 5, 1, 0, 0, 0, 0, location), result.DateFrom)
+	require.Equal(t, time.Date(2026, 5, 29, 23, 59, 59, int(time.Second-time.Nanosecond), location), result.DateTo)
+}
+
+func TestProfitLossAnalyticsModelToContractCopiesDateRange(t *testing.T) {
+	dateFrom := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	dateTo := time.Date(2026, 5, 29, 23, 59, 59, int(time.Second-time.Nanosecond), time.UTC)
+	productID := uuid.New()
+	categoryID := uuid.New()
+
+	result := ProfitLossAnalyticsModelToContract(&models.ProfitLossAnalyticsResponse{
+		OrganizationID: uuid.New(),
+		DateFrom:       dateFrom,
+		DateTo:         dateTo,
+		GroupBy:        "month",
+		Summary: models.ProfitLossSummary{
+			TotalRevenue: 1000,
+			NetProfit:    500,
+		},
+		Data: []models.ProfitLossData{
+			{
+				Date:      dateFrom,
+				Revenue:   1000,
+				NetProfit: 500,
+			},
+		},
+		ProductData: []models.ProductProfitData{
+			{
+				ProductID:    productID,
+				ProductName:  "Nasi",
+				CategoryID:   categoryID,
+				CategoryName: "Food",
+				Revenue:      1000,
+				GrossProfit:  500,
+			},
+		},
+		MainSummary: []models.ProfitLossSummaryRow{
+			{
+				ID:           "total_omset",
+				Label:        "TOTAL OMSET",
+				TodayNominal: 1000,
+			},
+		},
+	})
+
+	require.NotNil(t, result)
+	require.Equal(t, dateFrom, result.DateFrom)
+	require.Equal(t, dateTo, result.DateTo)
+	require.Equal(t, "month", result.GroupBy)
+	require.Equal(t, float64(1000), result.Summary.TotalRevenue)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(500), result.Data[0].NetProfit)
+	require.Len(t, result.ProductData, 1)
+	require.Equal(t, productID, result.ProductData[0].ProductID)
+	require.Len(t, result.MainSummary, 1)
+	require.Equal(t, "total_omset", result.MainSummary[0].ID)
+}

internal/transformer/expense_transformer.go

@@ -0,0 +1,136 @@
+package transformer
+
+import (
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/models"
+)
+
+func CreateExpenseRequestToModel(req *contract.CreateExpenseRequest) *models.CreateExpenseRequest {
+	items := make([]models.CreateExpenseItemRequest, len(req.Items))
+	for i, item := range req.Items {
+		items[i] = CreateExpenseItemRequestToModel(&item)
+	}
+
+	return &models.CreateExpenseRequest{
+		Receiver:        req.Receiver,
+		TransactionDate: req.TransactionDate,
+		CodeNumber:      req.CodeNumber,
+		OutletID:        req.OutletID,
+		Status:          req.Status,
+		Description:     req.Description,
+		Tax:             req.Tax,
+		Total:           req.Total,
+		Items:           items,
+	}
+}
+
+func CreateExpenseItemRequestToModel(req *contract.CreateExpenseItemRequest) models.CreateExpenseItemRequest {
+	return models.CreateExpenseItemRequest{
+		ChartOfAccountID: req.ChartOfAccountID,
+		Item:             req.Item,
+		Description:      req.Description,
+		Amount:           req.Amount,
+	}
+}
+
+func UpdateExpenseRequestToModel(req *contract.UpdateExpenseRequest) *models.UpdateExpenseRequest {
+	modelReq := &models.UpdateExpenseRequest{
+		Receiver:        req.Receiver,
+		TransactionDate: req.TransactionDate,
+		CodeNumber:      req.CodeNumber,
+		OutletID:        req.OutletID,
+		Status:          req.Status,
+		Description:     req.Description,
+		Tax:             req.Tax,
+		Total:           req.Total,
+		Reserved1:       req.Reserved1,
+	}
+
+	if req.Items != nil {
+		items := make([]models.UpdateExpenseItemRequest, len(req.Items))
+		for i, item := range req.Items {
+			items[i] = UpdateExpenseItemRequestToModel(&item)
+		}
+		modelReq.Items = items
+	}
+
+	return modelReq
+}
+
+func UpdateExpenseItemRequestToModel(req *contract.UpdateExpenseItemRequest) models.UpdateExpenseItemRequest {
+	return models.UpdateExpenseItemRequest{
+		ChartOfAccountID: req.ChartOfAccountID,
+		Item:             req.Item,
+		Description:      req.Description,
+		Amount:           req.Amount,
+	}
+}
+
+func ListExpenseRequestToModel(req *contract.ListExpenseRequest) *models.ListExpenseRequest {
+	return &models.ListExpenseRequest{
+		Page:      req.Page,
+		Limit:     req.Limit,
+		Search:    req.Search,
+		OutletID:  req.OutletID,
+		Status:    req.Status,
+		StartDate: req.StartDate,
+		EndDate:   req.EndDate,
+	}
+}
+
+func ExpenseModelResponseToResponse(expense *models.ExpenseResponse) *contract.ExpenseResponse {
+	if expense == nil {
+		return nil
+	}
+
+	items := make([]contract.ExpenseItemResponse, len(expense.Items))
+	for i, item := range expense.Items {
+		items[i] = ExpenseItemModelResponseToResponse(&item)
+	}
+
+	return &contract.ExpenseResponse{
+		ID:              expense.ID,
+		OrganizationID:  expense.OrganizationID,
+		OutletID:        expense.OutletID,
+		Receiver:        expense.Receiver,
+		TransactionDate: expense.TransactionDate,
+		CodeNumber:      expense.CodeNumber,
+		Status:          expense.Status,
+		Description:     expense.Description,
+		Tax:             expense.Tax,
+		Total:           expense.Total,
+		Reserved1:       expense.Reserved1,
+		CreatedAt:       expense.CreatedAt,
+		UpdatedAt:       expense.UpdatedAt,
+		Items:           items,
+	}
+}
+
+func ExpenseItemModelResponseToResponse(item *models.ExpenseItemResponse) contract.ExpenseItemResponse {
+	return contract.ExpenseItemResponse{
+		ID:                 item.ID,
+		ExpenseID:          item.ExpenseID,
+		ChartOfAccountID:   item.ChartOfAccountID,
+		ChartOfAccountName: item.ChartOfAccountName,
+		Item:               item.Item,
+		Description:        item.Description,
+		Amount:             item.Amount,
+		CreatedAt:          item.CreatedAt,
+		UpdatedAt:          item.UpdatedAt,
+	}
+}
+
+func ExpenseModelResponsesToResponses(expenses []*models.ExpenseResponse) []contract.ExpenseResponse {
+	if expenses == nil {
+		return nil
+	}
+
+	responses := make([]contract.ExpenseResponse, len(expenses))
+	for i, expense := range expenses {
+		response := ExpenseModelResponseToResponse(expense)
+		if response != nil {
+			responses[i] = *response
+		}
+	}
+	return responses
+}

internal/transformer/purchase_order_transformer.go

@@ -25,10 +25,14 @@ func CreatePurchaseOrderRequestToModel(req *contract.CreatePurchaseOrderRequest)
 		return nil, err
 	}
 
-	// Parse due date
+	// Parse due date if provided
-	dueDate, err := time.Parse("2006-01-02", req.DueDate)
+	var dueDate *time.Time
-	if err != nil {
+	if req.DueDate != nil && *req.DueDate != "" {
-		return nil, err
+		parsedDate, err := time.Parse("2006-01-02", *req.DueDate)
+		if err != nil {
+			return nil, err
+		}
+		dueDate = &parsedDate
 	}
 
 	return &models.CreatePurchaseOrderRequest{

internal/transformer/purchase_order_transformer_test.go

@@ -0,0 +1,43 @@
+package transformer
+
+import (
+	"encoding/json"
+	"testing"
+
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCreatePurchaseOrderRequestToModelAllowsMissingDueDate(t *testing.T) {
+	result, err := CreatePurchaseOrderRequestToModel(&contract.CreatePurchaseOrderRequest{
+		VendorID:        uuid.New(),
+		PONumber:        "PO-001",
+		TransactionDate: "2026-05-29",
+		Items: []contract.CreatePurchaseOrderItemRequest{
+			{
+				IngredientID: uuid.New(),
+				Quantity:     1,
+				UnitID:       uuid.New(),
+				Amount:       1000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, result.DueDate)
+}
+
+func TestPurchaseOrderModelResponseToResponseIncludesNullDueDate(t *testing.T) {
+	result := PurchaseOrderModelResponseToResponse(&models.PurchaseOrderResponse{
+		ID:       uuid.New(),
+		VendorID: uuid.New(),
+		PONumber: "PO-001",
+	})
+
+	payload, err := json.Marshal(result)
+	require.NoError(t, err)
+	require.Contains(t, string(payload), `"due_date":null`)
+}

internal/util/http_util.go

@@ -16,6 +16,12 @@ func HandleResponse(w http.ResponseWriter, r *http.Request, response *contract.R
 	} else {
 		responseError := response.GetErrors()[0]
 		statusCode = MapErrorCodeToHttpStatus(responseError.GetCode())
+		logger.FromContext(r.Context()).WithFields(map[string]interface{}{
+			"error_code":   responseError.GetCode(),
+			"error_entity": responseError.GetEntity(),
+			"error_cause":  responseError.GetCause(),
+			"status_code":  statusCode,
+		}).Error(methodName)
 	}
 	WriteResponse(w, r, *response, statusCode, methodName)
 }

internal/validator/expense_validator.go

@@ -0,0 +1,159 @@
+package validator
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+
+	"github.com/google/uuid"
+)
+
+type ExpenseValidator interface {
+	ValidateCreateExpenseRequest(req *contract.CreateExpenseRequest) (error, string)
+	ValidateUpdateExpenseRequest(req *contract.UpdateExpenseRequest) (error, string)
+	ValidateListExpenseRequest(req *contract.ListExpenseRequest) (error, string)
+}
+
+type ExpenseValidatorImpl struct{}
+
+func NewExpenseValidator() *ExpenseValidatorImpl {
+	return &ExpenseValidatorImpl{}
+}
+
+func (v *ExpenseValidatorImpl) ValidateCreateExpenseRequest(req *contract.CreateExpenseRequest) (error, string) {
+	if req == nil {
+		return errors.New("request body is required"), constants.MissingFieldErrorCode
+	}
+
+	if strings.TrimSpace(req.Receiver) == "" {
+		return errors.New("receiver is required"), constants.MissingFieldErrorCode
+	}
+
+	if strings.TrimSpace(req.TransactionDate) == "" {
+		return errors.New("transaction_date is required"), constants.MissingFieldErrorCode
+	}
+
+	if strings.TrimSpace(req.CodeNumber) == "" {
+		return errors.New("code_number is required"), constants.MissingFieldErrorCode
+	}
+
+	if strings.TrimSpace(req.OutletID) == "" {
+		return errors.New("outlet_id is required"), constants.MissingFieldErrorCode
+	}
+
+	if _, err := uuid.Parse(req.OutletID); err != nil {
+		return errors.New("outlet_id must be a valid UUID"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Status != nil && !constants.IsValidExpenseStatus(constants.ExpenseStatus(*req.Status)) {
+		return errors.New("status must be one of: draft, sent, approved, cancel"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Total <= 0 {
+		return errors.New("total must be greater than 0"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Tax < 0 {
+		return errors.New("tax cannot be negative"), constants.MalformedFieldErrorCode
+	}
+
+	if len(req.Items) == 0 {
+		return errors.New("at least one item is required"), constants.MissingFieldErrorCode
+	}
+
+	for i, item := range req.Items {
+		if strings.TrimSpace(item.ChartOfAccountID) == "" {
+			return fmt.Errorf("item %d: chart_of_account_id is required", i), constants.MissingFieldErrorCode
+		}
+		if strings.TrimSpace(item.Item) == "" {
+			return fmt.Errorf("item %d: item is required", i), constants.MissingFieldErrorCode
+		}
+		if _, err := uuid.Parse(item.ChartOfAccountID); err != nil {
+			return fmt.Errorf("item %d: chart_of_account_id must be a valid UUID", i), constants.MalformedFieldErrorCode
+		}
+		if item.Amount <= 0 {
+			return fmt.Errorf("item %d: amount must be greater than 0", i), constants.MalformedFieldErrorCode
+		}
+	}
+
+	return nil, ""
+}
+
+func (v *ExpenseValidatorImpl) ValidateUpdateExpenseRequest(req *contract.UpdateExpenseRequest) (error, string) {
+	if req == nil {
+		return errors.New("request body is required"), constants.MissingFieldErrorCode
+	}
+
+	if req.Receiver != nil && strings.TrimSpace(*req.Receiver) == "" {
+		return errors.New("receiver cannot be empty"), constants.MalformedFieldErrorCode
+	}
+
+	if req.CodeNumber != nil && strings.TrimSpace(*req.CodeNumber) == "" {
+		return errors.New("code_number cannot be empty"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Status != nil && !constants.IsValidExpenseStatus(constants.ExpenseStatus(*req.Status)) {
+		return errors.New("status must be one of: draft, sent, approved, cancel"), constants.MalformedFieldErrorCode
+	}
+
+	if req.OutletID != nil {
+		if strings.TrimSpace(*req.OutletID) == "" {
+			return errors.New("outlet_id cannot be empty"), constants.MalformedFieldErrorCode
+		}
+		if _, err := uuid.Parse(*req.OutletID); err != nil {
+			return errors.New("outlet_id must be a valid UUID"), constants.MalformedFieldErrorCode
+		}
+	}
+
+	if req.Total != nil && *req.Total <= 0 {
+		return errors.New("total must be greater than 0"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Tax != nil && *req.Tax < 0 {
+		return errors.New("tax cannot be negative"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Items != nil {
+		for i, item := range req.Items {
+			if item.ChartOfAccountID != nil {
+				if strings.TrimSpace(*item.ChartOfAccountID) == "" {
+					return fmt.Errorf("item %d: chart_of_account_id cannot be empty", i), constants.MalformedFieldErrorCode
+				}
+				if _, err := uuid.Parse(*item.ChartOfAccountID); err != nil {
+					return fmt.Errorf("item %d: chart_of_account_id must be a valid UUID", i), constants.MalformedFieldErrorCode
+				}
+			}
+			if item.Item != nil && strings.TrimSpace(*item.Item) == "" {
+				return fmt.Errorf("item %d: item cannot be empty", i), constants.MalformedFieldErrorCode
+			}
+			if item.Amount != nil && *item.Amount <= 0 {
+				return fmt.Errorf("item %d: amount must be greater than 0", i), constants.MalformedFieldErrorCode
+			}
+		}
+	}
+
+	return nil, ""
+}
+
+func (v *ExpenseValidatorImpl) ValidateListExpenseRequest(req *contract.ListExpenseRequest) (error, string) {
+	if req == nil {
+		return errors.New("request body is required"), constants.MissingFieldErrorCode
+	}
+
+	if req.Page < 1 {
+		return errors.New("page must be at least 1"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Limit < 1 || req.Limit > 100 {
+		return errors.New("limit must be between 1 and 100"), constants.MalformedFieldErrorCode
+	}
+
+	if req.Status != "" && !constants.IsValidExpenseStatus(constants.ExpenseStatus(req.Status)) {
+		return errors.New("status must be one of: draft, sent, approved, cancel"), constants.MalformedFieldErrorCode
+	}
+
+	return nil, ""
+}

internal/validator/expense_validator_test.go

@@ -0,0 +1,158 @@
+package validator
+
+import (
+	"testing"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func TestExpenseValidatorCreateRequiresItemName(t *testing.T) {
+	v := NewExpenseValidator()
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MissingFieldErrorCode, code)
+	require.Contains(t, err.Error(), "item 0: item is required")
+}
+
+func TestExpenseValidatorCreateDoesNotRequireHeaderExpenseName(t *testing.T) {
+	v := NewExpenseValidator()
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestExpenseValidatorCreateAllowsValidOptionalStatus(t *testing.T) {
+	v := NewExpenseValidator()
+	status := "approved"
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestExpenseValidatorCreateRejectsInvalidStatus(t *testing.T) {
+	v := NewExpenseValidator()
+	status := "cancelled"
+
+	req := &contract.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []contract.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	}
+
+	err, code := v.ValidateCreateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "status must be one of: draft, sent, approved, cancel")
+}
+
+func TestExpenseValidatorUpdateRejectsEmptyItemNameWhenProvided(t *testing.T) {
+	v := NewExpenseValidator()
+	empty := " "
+
+	req := &contract.UpdateExpenseRequest{
+		Items: []contract.UpdateExpenseItemRequest{
+			{Item: &empty},
+		},
+	}
+
+	err, code := v.ValidateUpdateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "item 0: item cannot be empty")
+}
+
+func TestExpenseValidatorUpdateRejectsInvalidStatus(t *testing.T) {
+	v := NewExpenseValidator()
+	status := "cancelled"
+
+	req := &contract.UpdateExpenseRequest{Status: &status}
+
+	err, code := v.ValidateUpdateExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "status must be one of: draft, sent, approved, cancel")
+}
+
+func TestExpenseValidatorListRejectsInvalidStatus(t *testing.T) {
+	v := NewExpenseValidator()
+
+	req := &contract.ListExpenseRequest{
+		Page:   1,
+		Limit:  10,
+		Status: "cancelled",
+	}
+
+	err, code := v.ValidateListExpenseRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "status must be one of: draft, sent, approved, cancel")
+}

internal/validator/purchase_order_validator.go

@@ -47,18 +47,19 @@ func (v *PurchaseOrderValidatorImpl) ValidateCreatePurchaseOrderRequest(req *con
 		return errors.New("transaction_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
 	}
 
-	// Validate due date
+	if req.DueDate != nil {
-	if strings.TrimSpace(req.DueDate) == "" {
+		if strings.TrimSpace(*req.DueDate) == "" {
-		return errors.New("due_date is required"), constants.MissingFieldErrorCode
+			return errors.New("due_date cannot be empty"), constants.MalformedFieldErrorCode
-	}
+		}
-	dueDate, err := time.Parse("2006-01-02", req.DueDate)
-	if err != nil {
-		return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
-	}
 
-	// Check if due date is after transaction date
+		dueDate, err := time.Parse("2006-01-02", *req.DueDate)
-	if dueDate.Before(transactionDate) {
+		if err != nil {
-		return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
+			return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		}
+
+		if dueDate.Before(transactionDate) {
+			return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
+		}
 	}
 
 	if req.Reference != nil && len(*req.Reference) > 100 {
@@ -100,22 +101,27 @@ func (v *PurchaseOrderValidatorImpl) ValidateUpdatePurchaseOrderRequest(req *con
 		}
 	}
 
-	// Validate dates if both are provided
+	var transactionDate *time.Time
-	if req.TransactionDate != nil && req.DueDate != nil {
+	if req.TransactionDate != nil && *req.TransactionDate != "" {
-		if *req.TransactionDate != "" && *req.DueDate != "" {
+		parsedDate, err := time.Parse("2006-01-02", *req.TransactionDate)
-			transactionDate, err := time.Parse("2006-01-02", *req.TransactionDate)
+		if err != nil {
-			if err != nil {
+			return errors.New("transaction_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
-				return errors.New("transaction_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		}
-			}
+		transactionDate = &parsedDate
-			
+	}
-			dueDate, err := time.Parse("2006-01-02", *req.DueDate)
+
-			if err != nil {
+	if req.DueDate != nil {
-				return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		if strings.TrimSpace(*req.DueDate) == "" {
-			}
+			return errors.New("due_date cannot be empty"), constants.MalformedFieldErrorCode
-			
+		}
-			if dueDate.Before(transactionDate) {
+
-				return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
+		dueDate, err := time.Parse("2006-01-02", *req.DueDate)
-			}
+		if err != nil {
+			return errors.New("due_date must be in YYYY-MM-DD format"), constants.MalformedFieldErrorCode
+		}
+
+		if transactionDate != nil && dueDate.Before(*transactionDate) {
+			return errors.New("due_date must be after transaction_date"), constants.MalformedFieldErrorCode
 		}
 	}
 

internal/validator/purchase_order_validator_test.go

@@ -0,0 +1,62 @@
+package validator
+
+import (
+	"testing"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func validCreatePurchaseOrderRequest() *contract.CreatePurchaseOrderRequest {
+	return &contract.CreatePurchaseOrderRequest{
+		VendorID:        uuid.New(),
+		PONumber:        "PO-001",
+		TransactionDate: "2026-05-29",
+		Items: []contract.CreatePurchaseOrderItemRequest{
+			{
+				IngredientID: uuid.New(),
+				Quantity:     1,
+				UnitID:       uuid.New(),
+				Amount:       1000,
+			},
+		},
+	}
+}
+
+func TestPurchaseOrderValidatorCreateAllowsMissingDueDate(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(validCreatePurchaseOrderRequest())
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestPurchaseOrderValidatorCreateRejectsInvalidDueDate(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+	req := validCreatePurchaseOrderRequest()
+	dueDate := "29-05-2026"
+	req.DueDate = &dueDate
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "due_date must be in YYYY-MM-DD format")
+}
+
+func TestPurchaseOrderValidatorCreateRejectsDueDateBeforeTransactionDate(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+	req := validCreatePurchaseOrderRequest()
+	dueDate := "2026-05-28"
+	req.DueDate = &dueDate
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
+
+	require.Error(t, err)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
+	require.Contains(t, err.Error(), "due_date must be after transaction_date")
+}

migrations/000071_create_expenses_table.down.sql

@@ -0,0 +1,2 @@
+DROP TABLE IF EXISTS expense_items;
+DROP TABLE IF EXISTS expenses;

migrations/000071_create_expenses_table.up.sql

@@ -0,0 +1,33 @@
+CREATE TABLE expenses (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    organization_id UUID NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
+    outlet_id UUID NOT NULL REFERENCES outlets(id) ON DELETE CASCADE,
+    receiver VARCHAR(255) NOT NULL,
+    transaction_date DATE NOT NULL,
+    code_number VARCHAR(50) NOT NULL,
+    description TEXT,
+    tax DECIMAL(15,2) NOT NULL DEFAULT 0,
+    total DECIMAL(15,2) NOT NULL DEFAULT 0,
+    reserved1 TEXT,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+CREATE INDEX idx_expenses_organization_id ON expenses(organization_id);
+CREATE INDEX idx_expenses_outlet_id ON expenses(outlet_id);
+CREATE INDEX idx_expenses_transaction_date ON expenses(transaction_date);
+CREATE INDEX idx_expenses_code_number ON expenses(code_number);
+CREATE INDEX idx_expenses_created_at ON expenses(created_at);
+
+CREATE TABLE expense_items (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    expense_id UUID NOT NULL REFERENCES expenses(id) ON DELETE CASCADE,
+    chart_of_account_id UUID NOT NULL REFERENCES chart_of_accounts(id) ON DELETE RESTRICT,
+    description TEXT,
+    amount DECIMAL(15,2) NOT NULL DEFAULT 0,
+    created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
+    updated_at TIMESTAMP WITH TIME ZONE DEFAULT NOW()
+);
+
+CREATE INDEX idx_expense_items_expense_id ON expense_items(expense_id);
+CREATE INDEX idx_expense_items_chart_of_account_id ON expense_items(chart_of_account_id);

migrations/000072_add_expense_name_to_expenses.down.sql

@@ -0,0 +1,16 @@
+ALTER TABLE expenses ADD COLUMN IF NOT EXISTS expense_name VARCHAR(255) NOT NULL DEFAULT '';
+
+UPDATE expenses e
+SET expense_name = first_item.item
+FROM (
+    SELECT DISTINCT ON (expense_id) expense_id, item
+    FROM expense_items
+    WHERE COALESCE(item, '') != ''
+    ORDER BY expense_id, created_at ASC
+) first_item
+WHERE e.id = first_item.expense_id
+  AND COALESCE(e.expense_name, '') = '';
+
+CREATE INDEX IF NOT EXISTS idx_expenses_expense_name ON expenses(expense_name);
+DROP INDEX IF EXISTS idx_expense_items_item;
+ALTER TABLE expense_items DROP COLUMN IF EXISTS item;

migrations/000072_add_expense_name_to_expenses.up.sql

@@ -0,0 +1,21 @@
+ALTER TABLE expense_items ADD COLUMN IF NOT EXISTS item VARCHAR(255) NOT NULL DEFAULT '';
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.columns
+        WHERE table_name = 'expenses'
+          AND column_name = 'expense_name'
+    ) THEN
+        UPDATE expense_items ei
+        SET item = e.expense_name
+        FROM expenses e
+        WHERE ei.expense_id = e.id
+          AND COALESCE(ei.item, '') = '';
+    END IF;
+END $$;
+
+DROP INDEX IF EXISTS idx_expenses_expense_name;
+ALTER TABLE expenses DROP COLUMN IF EXISTS expense_name;
+CREATE INDEX IF NOT EXISTS idx_expense_items_item ON expense_items(item);

migrations/000073_add_status_to_expenses.down.sql

@@ -0,0 +1,3 @@
+DROP INDEX IF EXISTS idx_expenses_status;
+ALTER TABLE expenses DROP CONSTRAINT IF EXISTS expenses_status_check;
+ALTER TABLE expenses DROP COLUMN IF EXISTS status;

migrations/000073_add_status_to_expenses.up.sql

@@ -0,0 +1,10 @@
+ALTER TABLE expenses ADD COLUMN IF NOT EXISTS status VARCHAR(20) NOT NULL DEFAULT 'draft';
+
+UPDATE expenses
+SET status = 'approved'
+WHERE status = 'draft';
+
+ALTER TABLE expenses DROP CONSTRAINT IF EXISTS expenses_status_check;
+ALTER TABLE expenses ADD CONSTRAINT expenses_status_check CHECK (status IN ('draft', 'sent', 'approved', 'cancel'));
+
+CREATE INDEX IF NOT EXISTS idx_expenses_status ON expenses(status);

migrations/000074_make_purchase_order_due_date_nullable.down.sql

@@ -0,0 +1,6 @@
+UPDATE purchase_orders
+SET due_date = transaction_date
+WHERE due_date IS NULL;
+
+ALTER TABLE purchase_orders
+    ALTER COLUMN due_date SET NOT NULL;

migrations/000074_make_purchase_order_due_date_nullable.up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE purchase_orders
+    ALTER COLUMN due_date DROP NOT NULL;