fix: product price

This reverts commit 657a201fc0.

go.sum

@@ -351,6 +351,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
 github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
+github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs=
+github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -380,7 +382,6 @@ go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=

internal/contract/analytics_contract.go

@@ -140,7 +140,7 @@ type PurchasingIngredientData struct {
 }
 
 type PurchasingVendorData struct {
-	VendorID           uuid.UUID `json:"vendor_id"`
+	VendorID           *uuid.UUID `json:"vendor_id"`
 	VendorName         string     `json:"vendor_name"`
 	TotalCost          float64    `json:"total_cost"`
 	PurchaseOrderCount int64      `json:"purchase_order_count"`
@@ -339,6 +339,13 @@ type ExclusiveSummaryMonthlyRequest struct {
 	Month          string  `form:"month" validate:"required"`
 }
 
+type ExclusiveSummaryMTDRequest struct {
+	OrganizationID                uuid.UUID
+	OutletID                      *string `form:"outlet_id,omitempty"`
+	DateTo                        string  `form:"date_to" validate:"required"`
+	ExcludeGajiStaffFromReimburse bool    `form:"exclude_gaji_staff_from_reimburse"`
+}
+
 type ExclusiveSummaryPeriodResponse struct {
 	OrganizationID              uuid.UUID                           `json:"organization_id"`
 	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`

internal/contract/purchase_order_contract.go

@@ -7,7 +7,7 @@ import (
 )
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
+	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
 	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
 	TransactionDate   string                           `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
 	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
@@ -19,11 +19,11 @@ type CreatePurchaseOrderRequest struct {
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	IngredientID       uuid.UUID `json:"ingredient_id" validate:"required"`
+	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
 	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id" validate:"required"`
 	Description        *string    `json:"description,omitempty" validate:"omitempty"`
-	Quantity           float64   `json:"quantity" validate:"required,gt=0"`
+	Quantity           *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
-	UnitID             uuid.UUID `json:"unit_id" validate:"required"`
+	UnitID             *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
 	Amount             float64    `json:"amount" validate:"required,gte=0"`
 }
 
@@ -40,19 +40,20 @@ type UpdatePurchaseOrderRequest struct {
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	ID                 *uuid.UUID `json:"id,omitempty"` // Ignored. Supplying items replaces all existing PO items.
+	ID                 *uuid.UUID `json:"id,omitempty"` // For existing items
-	IngredientID       *uuid.UUID `json:"ingredient_id" validate:"required"`
+	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
-	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id" validate:"required"`
+	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id,omitempty" validate:"omitempty"`
 	Description        *string    `json:"description,omitempty" validate:"omitempty"`
-	Quantity           *float64   `json:"quantity" validate:"required,gt=0"`
+	Quantity           *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
-	UnitID             *uuid.UUID `json:"unit_id" validate:"required"`
+	UnitID             *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
 	Amount             *float64   `json:"amount,omitempty" validate:"omitempty,gte=0"`
 }
 
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	VendorID        uuid.UUID                         `json:"vendor_id"`
+	OutletID        *uuid.UUID                        `json:"outlet_id"`
+	VendorID        *uuid.UUID                        `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
 	DueDate         *time.Time                        `json:"due_date"`
@@ -70,11 +71,11 @@ type PurchaseOrderResponse struct {
 type PurchaseOrderItemResponse struct {
 	ID                 uuid.UUID                 `json:"id"`
 	PurchaseOrderID    uuid.UUID                 `json:"purchase_order_id"`
-	IngredientID       uuid.UUID                 `json:"ingredient_id"`
+	IngredientID       *uuid.UUID                `json:"ingredient_id"`
 	PurchaseCategoryID uuid.UUID                 `json:"purchase_category_id"`
 	Description        *string                   `json:"description"`
-	Quantity           float64                   `json:"quantity"`
+	Quantity           *float64                  `json:"quantity"`
-	UnitID             uuid.UUID                 `json:"unit_id"`
+	UnitID             *uuid.UUID                `json:"unit_id"`
 	Amount             float64                   `json:"amount"`
 	CreatedAt          time.Time                 `json:"created_at"`
 	UpdatedAt          time.Time                 `json:"updated_at"`

internal/entities/analytics.go

@@ -72,7 +72,7 @@ type PurchasingIngredientData struct {
 }
 
 type PurchasingVendorData struct {
-	VendorID           uuid.UUID `json:"vendor_id"`
+	VendorID           *uuid.UUID `json:"vendor_id"`
 	VendorName         string     `json:"vendor_name"`
 	TotalCost          float64    `json:"total_cost"`
 	PurchaseOrderCount int64      `json:"purchase_order_count"`
@@ -216,3 +216,12 @@ type ExclusiveSummaryDailyTransaction struct {
 	Amount       float64
 	Source       string
 }
+
+type ExclusiveSummaryBankBalance struct {
+	Bank             string
+	OpeningBalance   *float64
+	IncomingMutation *float64
+	OutgoingMutation *float64
+	ClosingBalance   *float64
+	Notes            *string
+}

internal/entities/purchase_order.go

@@ -11,7 +11,8 @@ import (
 type PurchaseOrder struct {
 	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"`
-	VendorID        uuid.UUID  `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
+	OutletID        *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id" validate:"omitempty"`
+	VendorID        *uuid.UUID `gorm:"type:uuid" json:"vendor_id" validate:"omitempty"`
 	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"`
 	DueDate         *time.Time `gorm:"type:date" json:"due_date" validate:"omitempty"`
@@ -23,6 +24,7 @@ type PurchaseOrder struct {
 	UpdatedAt       time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       *Outlet                   `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`
 	Items        []PurchaseOrderItem       `gorm:"foreignKey:PurchaseOrderID" json:"items,omitempty"`
 	Attachments  []PurchaseOrderAttachment `gorm:"foreignKey:PurchaseOrderID" json:"attachments,omitempty"`
@@ -43,11 +45,11 @@ func (PurchaseOrder) TableName() string {
 type PurchaseOrderItem struct {
 	ID                 uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
 	PurchaseOrderID    uuid.UUID  `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
-	IngredientID       uuid.UUID `gorm:"type:uuid;not null" json:"ingredient_id" validate:"required"`
+	IngredientID       *uuid.UUID `gorm:"type:uuid" json:"ingredient_id" validate:"omitempty"`
 	PurchaseCategoryID uuid.UUID  `gorm:"type:uuid;not null;index" json:"purchase_category_id" validate:"required"`
 	Description        *string    `gorm:"type:text" json:"description" validate:"omitempty"`
-	Quantity           float64   `gorm:"type:decimal(10,3);not null" json:"quantity" validate:"required,gt=0"`
+	Quantity           *float64   `gorm:"type:decimal(10,3)" json:"quantity" validate:"omitempty,gt=0"`
-	UnitID             uuid.UUID `gorm:"type:uuid;not null" json:"unit_id" validate:"required"`
+	UnitID             *uuid.UUID `gorm:"type:uuid" json:"unit_id" validate:"omitempty"`
 	Amount             float64    `gorm:"type:decimal(15,2);not null" json:"amount" validate:"required,gte=0"`
 	CreatedAt          time.Time  `gorm:"autoCreateTime" json:"created_at"`
 	UpdatedAt          time.Time  `gorm:"autoUpdateTime" json:"updated_at"`

internal/handler/analytics_handler.go

@@ -266,3 +266,31 @@ func (h *AnalyticsHandler) GetExclusiveSummaryMonthly(c *gin.Context) {
 	contractResp := transformer.ExclusiveSummaryMonthlyModelToContract(response)
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetExclusiveSummaryMonthly")
 }
+
+func (h *AnalyticsHandler) GetExclusiveSummaryMTD(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.ExclusiveSummaryMTDRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
+		return
+	}
+
+	req.OrganizationID = contextInfo.OrganizationID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	modelReq, err := transformer.ExclusiveSummaryMTDContractToModel(&req)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
+		return
+	}
+
+	response, err := h.analyticsService.GetExclusiveSummaryMTD(ctx, modelReq)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
+		return
+	}
+
+	contractResp := transformer.ExclusiveSummaryPeriodModelToContract(response)
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetExclusiveSummaryMTD")
+}

internal/mappers/purchase_order_mapper.go

@@ -13,6 +13,7 @@ func PurchaseOrderEntityToModel(entity *entities.PurchaseOrder) *models.Purchase
 	return &models.PurchaseOrder{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -34,6 +35,7 @@ func PurchaseOrderModelToEntity(model *models.PurchaseOrder) *entities.PurchaseO
 	return &entities.PurchaseOrder{
 		ID:              model.ID,
 		OrganizationID:  model.OrganizationID,
+		OutletID:        model.OutletID,
 		VendorID:        model.VendorID,
 		PONumber:        model.PONumber,
 		TransactionDate: model.TransactionDate,
@@ -55,6 +57,7 @@ func PurchaseOrderEntityToResponse(entity *entities.PurchaseOrder) *models.Purch
 	response := &models.PurchaseOrderResponse{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,

internal/models/analytics.go

@@ -150,7 +150,7 @@ type PurchasingIngredientData struct {
 
 // PurchasingVendorData represents purchasing analytics for a vendor
 type PurchasingVendorData struct {
-	VendorID           uuid.UUID `json:"vendor_id"`
+	VendorID           *uuid.UUID `json:"vendor_id"`
 	VendorName         string     `json:"vendor_name"`
 	TotalCost          float64    `json:"total_cost"`
 	PurchaseOrderCount int64      `json:"purchase_order_count"`
@@ -349,6 +349,13 @@ type ExclusiveSummaryMonthlyRequest struct {
 	Month          time.Time  `validate:"required"`
 }
 
+type ExclusiveSummaryMTDRequest struct {
+	OrganizationID                uuid.UUID  `validate:"required"`
+	OutletID                      *uuid.UUID `validate:"omitempty"`
+	DateTo                        time.Time  `validate:"required"`
+	ExcludeGajiStaffFromReimburse bool       `validate:"omitempty"`
+}
+
 type ExclusiveSummaryPeriodResponse struct {
 	OrganizationID              uuid.UUID                           `json:"organization_id"`
 	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`

internal/models/purchase_order.go

@@ -9,7 +9,8 @@ import (
 type PurchaseOrder struct {
 	ID              uuid.UUID  `json:"id"`
 	OrganizationID  uuid.UUID  `json:"organization_id"`
-	VendorID        uuid.UUID  `json:"vendor_id"`
+	OutletID        *uuid.UUID `json:"outlet_id"`
+	VendorID        *uuid.UUID `json:"vendor_id"`
 	PONumber        string     `json:"po_number"`
 	TransactionDate time.Time  `json:"transaction_date"`
 	DueDate         *time.Time `json:"due_date"`
@@ -24,11 +25,11 @@ type PurchaseOrder struct {
 type PurchaseOrderItem struct {
 	ID                 uuid.UUID  `json:"id"`
 	PurchaseOrderID    uuid.UUID  `json:"purchase_order_id"`
-	IngredientID       uuid.UUID `json:"ingredient_id"`
+	IngredientID       *uuid.UUID `json:"ingredient_id"`
 	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
 	Description        *string    `json:"description"`
-	Quantity           float64   `json:"quantity"`
+	Quantity           *float64   `json:"quantity"`
-	UnitID             uuid.UUID `json:"unit_id"`
+	UnitID             *uuid.UUID `json:"unit_id"`
 	Amount             float64    `json:"amount"`
 	CreatedAt          time.Time  `json:"created_at"`
 	UpdatedAt          time.Time  `json:"updated_at"`
@@ -44,7 +45,8 @@ type PurchaseOrderAttachment struct {
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	VendorID        uuid.UUID                         `json:"vendor_id"`
+	OutletID        *uuid.UUID                        `json:"outlet_id"`
+	VendorID        *uuid.UUID                        `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
 	DueDate         *time.Time                        `json:"due_date"`
@@ -62,11 +64,11 @@ type PurchaseOrderResponse struct {
 type PurchaseOrderItemResponse struct {
 	ID                 uuid.UUID                 `json:"id"`
 	PurchaseOrderID    uuid.UUID                 `json:"purchase_order_id"`
-	IngredientID       uuid.UUID                 `json:"ingredient_id"`
+	IngredientID       *uuid.UUID                `json:"ingredient_id"`
 	PurchaseCategoryID uuid.UUID                 `json:"purchase_category_id"`
 	Description        *string                   `json:"description"`
-	Quantity           float64                   `json:"quantity"`
+	Quantity           *float64                  `json:"quantity"`
-	UnitID             uuid.UUID                 `json:"unit_id"`
+	UnitID             *uuid.UUID                `json:"unit_id"`
 	Amount             float64                   `json:"amount"`
 	CreatedAt          time.Time                 `json:"created_at"`
 	UpdatedAt          time.Time                 `json:"updated_at"`
@@ -84,7 +86,8 @@ type PurchaseOrderAttachmentResponse struct {
 }
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          uuid.UUID                        `json:"vendor_id"`
+	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty"`
+	OutletID          *uuid.UUID                       `json:"outlet_id,omitempty"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
 	DueDate           *time.Time                       `json:"due_date,omitempty"`
@@ -96,11 +99,11 @@ type CreatePurchaseOrderRequest struct {
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	IngredientID       uuid.UUID `json:"ingredient_id"`
+	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty"`
 	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
 	Description        *string    `json:"description,omitempty"`
-	Quantity           float64   `json:"quantity"`
+	Quantity           *float64   `json:"quantity,omitempty"`
-	UnitID             uuid.UUID `json:"unit_id"`
+	UnitID             *uuid.UUID `json:"unit_id,omitempty"`
 	Amount             float64    `json:"amount"`
 }
 
@@ -117,7 +120,7 @@ type UpdatePurchaseOrderRequest struct {
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	ID                 *uuid.UUID `json:"id,omitempty"` // Ignored. Supplying items replaces all existing PO items.
+	ID                 *uuid.UUID `json:"id,omitempty"` // For existing items
 	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty"`
 	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id,omitempty"`
 	Description        *string    `json:"description,omitempty"`

internal/processor/analytics_processor.go

@@ -21,6 +21,7 @@ type AnalyticsProcessor interface {
 	GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error)
 	GetExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error)
 	GetExclusiveSummaryMonthly(ctx context.Context, req *models.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyResponse, error)
+	GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error)
 }
 
 type AnalyticsProcessorImpl struct {
@@ -656,14 +657,6 @@ func slugify(s string) string {
 }
 
 func (p *AnalyticsProcessorImpl) GetExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, 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")
 	}
@@ -672,10 +665,6 @@ func (p *AnalyticsProcessorImpl) GetExclusiveSummaryPeriod(ctx context.Context,
 }
 
 func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMonthly(ctx context.Context, req *models.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyResponse, error) {
-	if req.Month.IsZero() {
-		return nil, fmt.Errorf("month is required")
-	}
-
 	monthStart := time.Date(req.Month.Year(), req.Month.Month(), 1, 0, 0, 0, 0, req.Month.Location())
 	monthEnd := monthStart.AddDate(0, 1, 0).Add(-time.Nanosecond)
 
@@ -689,9 +678,8 @@ func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMonthly(ctx context.Context,
 		return nil, err
 	}
 
-	buckets := buildExclusiveSummaryMonthlyBuckets(monthStart)
+	periods := make([]models.ExclusiveSummaryMonthlyPeriod, 0)
-	periods := make([]models.ExclusiveSummaryMonthlyPeriod, 0, len(buckets))
+	for _, bucket := range buildExclusiveSummaryMonthlyBuckets(monthStart) {
-	for _, bucket := range buckets {
 		period, err := p.buildExclusiveSummaryPeriod(ctx, &models.ExclusiveSummaryPeriodRequest{
 			OrganizationID: req.OrganizationID,
 			OutletID:       req.OutletID,
@@ -702,7 +690,6 @@ func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMonthly(ctx context.Context,
 			return nil, err
 		}
 
-		grossMargin := percentage(period.Summary.GrossProfit, period.Summary.Sales)
 		periods = append(periods, models.ExclusiveSummaryMonthlyPeriod{
 			Label:       bucket.Label,
 			DateFrom:    bucket.DateFrom,
@@ -710,10 +697,27 @@ func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMonthly(ctx context.Context,
 			Sales:       period.Summary.Sales,
 			HPP:         period.Summary.HPP,
 			GrossProfit: period.Summary.GrossProfit,
-			GrossMargin: grossMargin,
+			GrossMargin: percentage(period.Summary.GrossProfit, period.Summary.Sales),
 		})
 	}
 
+	bankBalances, err := p.analyticsRepo.GetExclusiveSummaryBankBalances(ctx, req.OrganizationID, req.OutletID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get exclusive summary bank balances: %w", err)
+	}
+
+	bankBalance := make([]models.ExclusiveSummaryBankBalance, len(bankBalances))
+	for i, item := range bankBalances {
+		bankBalance[i] = models.ExclusiveSummaryBankBalance{
+			Bank:             item.Bank,
+			OpeningBalance:   item.OpeningBalance,
+			IncomingMutation: item.IncomingMutation,
+			OutgoingMutation: item.OutgoingMutation,
+			ClosingBalance:   item.ClosingBalance,
+			Notes:            item.Notes,
+		}
+	}
+
 	return &models.ExclusiveSummaryMonthlyResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
@@ -728,13 +732,22 @@ func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMonthly(ctx context.Context,
 			NetProfitMargin:          percentage(fullPeriod.Summary.NetProfit, fullPeriod.Summary.Sales),
 		},
 		Periods:     periods,
-		BankBalance: []models.ExclusiveSummaryBankBalance{
+		BankBalance: bankBalance,
-			{Bank: "BCA"},
-			{Bank: "BRI"},
-		},
 	}, nil
 }
 
+func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
+	mtdStart := time.Date(req.DateTo.Year(), req.DateTo.Month(), 1, 0, 0, 0, 0, req.DateTo.Location())
+
+	return p.buildExclusiveSummaryPeriod(ctx, &models.ExclusiveSummaryPeriodRequest{
+		OrganizationID:                req.OrganizationID,
+		OutletID:                      req.OutletID,
+		DateFrom:                      mtdStart,
+		DateTo:                        req.DateTo,
+		ExcludeGajiStaffFromReimburse: req.ExcludeGajiStaffFromReimburse,
+	})
+}
+
 func (p *AnalyticsProcessorImpl) buildExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
 	result, err := p.analyticsRepo.GetExclusiveSummaryAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo)
 	if err != nil {
@@ -836,16 +849,16 @@ func exclusiveSummarySalaryBreakdown(transactions []entities.ExclusiveSummaryDai
 	var salaryOther float64
 
 	for _, transaction := range transactions {
-		if transaction.Source != "expense" || !isExclusiveSummarySalary(transaction.CategoryCode, transaction.CategoryName, transaction.Description) {
+		if !isExclusiveSummarySalary(transaction.CategoryCode, transaction.CategoryName, transaction.Description) {
 			continue
 		}
 
 		classification := strings.ToLower(transaction.CategoryCode + " " + transaction.CategoryName + " " + transaction.Description)
 		switch {
-		case strings.Contains(classification, "dw"):
-			salaryDW += transaction.Amount
 		case strings.Contains(classification, "staff") || strings.Contains(classification, "kary") || strings.Contains(classification, "karyawan"):
 			salaryStaff += transaction.Amount
+		case strings.Contains(classification, "dw"):
+			salaryDW += transaction.Amount
 		default:
 			salaryOther += transaction.Amount
 		}

internal/processor/analytics_processor_test.go

@@ -15,8 +15,12 @@ import (
 type analyticsRepositoryStub struct {
 	purchasingResult        *entities.PurchasingAnalytics
 	profitLossResult        *entities.ProfitLossAnalytics
-	exclusiveResult  *entities.ExclusiveSummaryAnalytics
+	exclusiveSummaryResults []*entities.ExclusiveSummaryAnalytics
+	bankBalances            []entities.ExclusiveSummaryBankBalance
 	profitLossGroup         string
+	exclusiveSummaryCalls   int
+	exclusiveSummaryFrom    []time.Time
+	exclusiveSummaryTo      []time.Time
 }
 
 func (analyticsRepositoryStub) GetPaymentMethodAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.PaymentMethodAnalytics, error) {
@@ -48,8 +52,20 @@ func (s analyticsRepositoryStub) GetProfitLossAnalytics(_ context.Context, _ uui
 	return s.profitLossResult, nil
 }
 
-func (s analyticsRepositoryStub) GetExclusiveSummaryAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) (*entities.ExclusiveSummaryAnalytics, error) {
+func (s *analyticsRepositoryStub) GetExclusiveSummaryAnalytics(_ context.Context, _ uuid.UUID, _ *uuid.UUID, dateFrom, dateTo time.Time) (*entities.ExclusiveSummaryAnalytics, error) {
-	return s.exclusiveResult, nil
+	s.exclusiveSummaryFrom = append(s.exclusiveSummaryFrom, dateFrom)
+	s.exclusiveSummaryTo = append(s.exclusiveSummaryTo, dateTo)
+	if s.exclusiveSummaryCalls < len(s.exclusiveSummaryResults) {
+		result := s.exclusiveSummaryResults[s.exclusiveSummaryCalls]
+		s.exclusiveSummaryCalls++
+		return result, nil
+	}
+	s.exclusiveSummaryCalls++
+	return &entities.ExclusiveSummaryAnalytics{}, nil
+}
+
+func (s *analyticsRepositoryStub) GetExclusiveSummaryBankBalances(context.Context, uuid.UUID, *uuid.UUID) ([]entities.ExclusiveSummaryBankBalance, error) {
+	return s.bankBalances, nil
 }
 
 type expenseRepositoryStub struct{}
@@ -76,7 +92,7 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	outletID := uuid.New()
 	outletName := "Main Outlet"
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
 		purchasingResult: &entities.PurchasingAnalytics{
 			OutletName: &outletName,
 			Summary: entities.PurchasingSummary{
@@ -129,7 +145,7 @@ func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *
 	productID := uuid.New()
 	categoryID := uuid.New()
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
 		profitLossResult: &entities.ProfitLossAnalytics{
 			Summary: entities.ProfitLossSummary{
 				TotalRevenue:       1000,
@@ -201,7 +217,7 @@ func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *
 
 func TestAnalyticsProcessorGetProfitLossAnalyticsDynamicExpenseCategories(t *testing.T) {
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
 		profitLossResult: &entities.ProfitLossAnalytics{
 			Summary: entities.ProfitLossSummary{
 				TotalRevenue: 10000,
@@ -279,21 +295,28 @@ func TestAnalyticsProcessorGetProfitLossAnalyticsDynamicExpenseCategories(t *tes
 	require.True(t, result.MainSummary[6].IsBold)
 }
 
-func TestAnalyticsProcessorGetExclusiveSummaryPeriodCalculatesSummaryAndReimburse(t *testing.T) {
+func TestAnalyticsProcessorGetExclusiveSummaryPeriodCalculatesTotalsAndReimburse(t *testing.T) {
 	now := time.Date(2026, 5, 26, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
-		exclusiveResult: &entities.ExclusiveSummaryAnalytics{
+		exclusiveSummaryResults: []*entities.ExclusiveSummaryAnalytics{
-			SalesTotal: 35619000,
+			{
+				SalesTotal: 1000,
 				HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{
-				{CategoryCode: "hpp_nusantara", CategoryName: "Nusantara", Amount: 19010552},
+					{CategoryCode: "RAW", CategoryName: "Raw", Amount: 400},
 				},
 				OperationalExpenseBreakdown: []entities.ExclusiveSummaryCategoryTotal{
-				{CategoryCode: "biaya_gaji", CategoryName: "Gaji", Amount: 51758333},
+					{CategoryCode: "GAJI", CategoryName: "Gaji", Amount: 250},
-				{CategoryCode: "biaya_lain", CategoryName: "Biaya Lain-lain", Amount: 1608605},
+					{CategoryCode: "OPS", CategoryName: "Operasional", Amount: 100},
+				},
+				DailySummary: []entities.ExclusiveSummaryDailySummary{
+					{Date: now, TransactionCount: 3, TotalCost: 750},
 				},
 				DailyTransactions: []entities.ExclusiveSummaryDailyTransaction{
-				{Date: now, CategoryCode: "biaya_gaji", CategoryName: "Gaji", Description: "gaji kary", Amount: 48203333, Source: "expense"},
+					{Date: now, CategoryCode: "RAW", CategoryName: "Raw", Description: "beras", Amount: 400, Source: "purchase_order"},
-				{Date: now, CategoryCode: "biaya_gaji_dw", CategoryName: "Gaji DW", Description: "gaji karyawan", Amount: 3555000, Source: "expense"},
+					{Date: now, CategoryCode: "GAJI", CategoryName: "Gaji", Description: "gaji karyawan", Amount: 200, Source: "purchase_order"},
+					{Date: now, CategoryCode: "GAJI", CategoryName: "Gaji", Description: "DW", Amount: 50, Source: "purchase_order"},
+					{Date: now, CategoryCode: "OPS", CategoryName: "Operasional", Description: "atk", Amount: 100, Source: "purchase_order"},
+				},
 			},
 		},
 	}, expenseRepositoryStub{})
@@ -307,34 +330,45 @@ func TestAnalyticsProcessorGetExclusiveSummaryPeriodCalculatesSummaryAndReimburs
 
 	require.NoError(t, err)
 	require.NotNil(t, result)
-	require.Equal(t, float64(35619000), result.Summary.Sales)
+	require.Equal(t, float64(1000), result.Summary.Sales)
-	require.Equal(t, float64(19010552), result.Summary.HPP)
+	require.Equal(t, float64(400), result.Summary.HPP)
-	require.Equal(t, float64(16608448), result.Summary.GrossProfit)
+	require.Equal(t, float64(600), result.Summary.GrossProfit)
-	require.Equal(t, float64(51758333), result.Summary.SalaryTotal)
+	require.Equal(t, float64(350), result.Summary.OperationalExpensesTotal)
-	require.Equal(t, float64(3555000), result.Summary.SalaryDW)
+	require.Equal(t, float64(750), result.Summary.TotalCost)
-	require.Equal(t, float64(48203333), result.Summary.SalaryStaff)
+	require.Equal(t, float64(250), result.Summary.NetProfit)
-	require.Equal(t, float64(53366938), result.Summary.OperationalExpensesTotal)
+	require.Equal(t, float64(250), result.Summary.SalaryTotal)
-	require.Equal(t, float64(72377490), result.Summary.TotalCost)
+	require.Equal(t, float64(50), result.Summary.SalaryDW)
-	require.Equal(t, float64(-36758490), result.Summary.NetProfit)
+	require.Equal(t, float64(200), result.Summary.SalaryStaff)
-	require.Equal(t, float64(48203333), result.Reimburse.ExcludedSalaryStaff)
+	require.Equal(t, float64(100), result.Summary.OtherOperationalExpenses)
-	require.Equal(t, float64(24174157), result.Reimburse.TotalReimburse)
+	require.Equal(t, float64(200), result.Reimburse.ExcludedSalaryStaff)
+	require.Equal(t, float64(550), result.Reimburse.TotalReimburse)
+	require.Len(t, result.HPPBreakdown, 1)
+	require.Equal(t, float64(100), result.HPPBreakdown[0].Percentage)
+	require.Len(t, result.DailySummary, 1)
+	require.Len(t, result.DailyTransactions, 4)
 }
 
-func TestAnalyticsProcessorGetExclusiveSummaryMonthlyBuildsCalendarBucketsAndBankTemplate(t *testing.T) {
+func TestAnalyticsProcessorGetExclusiveSummaryMonthlyBuildsSummaryAndBuckets(t *testing.T) {
 	location, err := time.LoadLocation("Asia/Jakarta")
 	require.NoError(t, err)
 	month := time.Date(2026, 5, 1, 0, 0, 0, 0, location)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	openingBalance := 5000000.0
-		exclusiveResult: &entities.ExclusiveSummaryAnalytics{
+	closingBalance := 5000000.0
-			SalesTotal: 1000,
+	notes := "Main cash account for daily transactions"
-			HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{
+	stub := &analyticsRepositoryStub{
-				{CategoryCode: "hpp", CategoryName: "HPP", Amount: 400},
+		exclusiveSummaryResults: []*entities.ExclusiveSummaryAnalytics{
+			{SalesTotal: 1000, HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 400}}, OperationalExpenseBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 100}}},
+			{SalesTotal: 100, HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 40}}},
+			{SalesTotal: 200, HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 80}}},
+			{SalesTotal: 300, HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 120}}},
+			{SalesTotal: 400, HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 160}}},
+			{SalesTotal: 500, HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{{Amount: 200}}},
 		},
-			OperationalExpenseBreakdown: []entities.ExclusiveSummaryCategoryTotal{
+		bankBalances: []entities.ExclusiveSummaryBankBalance{
-				{CategoryCode: "ops", CategoryName: "OPS", Amount: 100},
+			{Bank: "Cash and Bank", OpeningBalance: &openingBalance, ClosingBalance: &closingBalance, Notes: &notes},
 		},
-		},
+	}
-	}, expenseRepositoryStub{})
+	processor := NewAnalyticsProcessorImpl(stub, expenseRepositoryStub{})
 
 	result, err := processor.GetExclusiveSummaryMonthly(context.Background(), &models.ExclusiveSummaryMonthlyRequest{
 		OrganizationID: uuid.New(),
@@ -345,11 +379,70 @@ func TestAnalyticsProcessorGetExclusiveSummaryMonthlyBuildsCalendarBucketsAndBan
 	require.NotNil(t, result)
 	require.Equal(t, "2026-05", result.Month)
 	require.Equal(t, float64(1000), result.Summary.TotalSales)
+	require.Equal(t, float64(400), result.Summary.HPP)
 	require.Equal(t, float64(500), result.Summary.NetProfit)
+	require.InDelta(t, float64(50), result.Summary.NetProfitMargin, 0.0001)
 	require.Len(t, result.Periods, 5)
 	require.Equal(t, "1 - 3 Mei", result.Periods[0].Label)
 	require.Equal(t, "25 - 31 Mei", result.Periods[4].Label)
-	require.Len(t, result.BankBalance, 2)
+	require.Len(t, result.BankBalance, 1)
-	require.Equal(t, "BCA", result.BankBalance[0].Bank)
+	require.Equal(t, "Cash and Bank", result.BankBalance[0].Bank)
-	require.Equal(t, "BRI", result.BankBalance[1].Bank)
+	require.NotNil(t, result.BankBalance[0].OpeningBalance)
+	require.Equal(t, openingBalance, *result.BankBalance[0].OpeningBalance)
+	require.NotNil(t, result.BankBalance[0].ClosingBalance)
+	require.Equal(t, closingBalance, *result.BankBalance[0].ClosingBalance)
+	require.Nil(t, result.BankBalance[0].IncomingMutation)
+	require.Nil(t, result.BankBalance[0].OutgoingMutation)
+	require.NotNil(t, result.BankBalance[0].Notes)
+	require.Equal(t, notes, *result.BankBalance[0].Notes)
+	require.Equal(t, 6, stub.exclusiveSummaryCalls)
+}
+
+func TestAnalyticsProcessorGetExclusiveSummaryMTDBuildsMonthToDateBreakdown(t *testing.T) {
+	location, err := time.LoadLocation("Asia/Jakarta")
+	require.NoError(t, err)
+	dateTo := time.Date(2026, 6, 18, 23, 59, 59, int(time.Second-time.Nanosecond), location)
+	stub := &analyticsRepositoryStub{
+		exclusiveSummaryResults: []*entities.ExclusiveSummaryAnalytics{
+			{
+				SalesTotal: 1000,
+				HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{
+					{CategoryCode: "RAW", CategoryName: "Raw Material", Amount: 400},
+				},
+				OperationalExpenseBreakdown: []entities.ExclusiveSummaryCategoryTotal{
+					{CategoryCode: "OPS", CategoryName: "Operational", Amount: 100},
+				},
+				DailySummary: []entities.ExclusiveSummaryDailySummary{
+					{Date: dateTo, TransactionCount: 2, TotalCost: 500},
+				},
+				DailyTransactions: []entities.ExclusiveSummaryDailyTransaction{
+					{Date: dateTo, CategoryCode: "RAW", CategoryName: "Raw Material", Description: "beras", Amount: 400, Source: "purchase_order"},
+					{Date: dateTo, CategoryCode: "OPS", CategoryName: "Operational", Description: "atk", Amount: 100, Source: "expense"},
+				},
+			},
+		},
+	}
+	processor := NewAnalyticsProcessorImpl(stub, expenseRepositoryStub{})
+
+	result, err := processor.GetExclusiveSummaryMTD(context.Background(), &models.ExclusiveSummaryMTDRequest{
+		OrganizationID: uuid.New(),
+		DateTo:         dateTo,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Len(t, stub.exclusiveSummaryFrom, 1)
+	require.Equal(t, time.Date(2026, 6, 1, 0, 0, 0, 0, location), stub.exclusiveSummaryFrom[0])
+	require.Equal(t, dateTo, stub.exclusiveSummaryTo[0])
+	require.Equal(t, stub.exclusiveSummaryFrom[0], result.Period.DateFrom)
+	require.Equal(t, dateTo, result.Period.DateTo)
+	require.Equal(t, float64(1000), result.Summary.Sales)
+	require.Equal(t, float64(400), result.Summary.HPP)
+	require.Equal(t, float64(500), result.Summary.TotalCost)
+	require.Equal(t, float64(500), result.Summary.NetProfit)
+	require.Len(t, result.HPPBreakdown, 1)
+	require.Equal(t, float64(100), result.HPPBreakdown[0].Percentage)
+	require.Len(t, result.OperationalExpenseBreakdown, 1)
+	require.Len(t, result.DailySummary, 1)
+	require.Len(t, result.DailyTransactions, 2)
 }

internal/processor/purchase_order_processor.go

@@ -11,8 +11,8 @@ import (
 )
 
 type PurchaseOrderProcessor interface {
-	CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
+	CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
-	UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
+	UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, outletID *uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
 	DeletePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID) error
 	GetPurchaseOrderByID(ctx context.Context, id, organizationID uuid.UUID) (*models.PurchaseOrderResponse, error)
 	ListPurchaseOrders(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.PurchaseOrderResponse, int, error)
@@ -54,12 +54,14 @@ func NewPurchaseOrderProcessorImpl(
 	}
 }
 
-func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
+func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
-	// Check if vendor exists and belongs to organization
+	// Check if vendor exists and belongs to organization when provided.
-	_, err := p.vendorRepo.GetByIDAndOrganizationID(ctx, req.VendorID, organizationID)
+	if req.VendorID != nil {
+		_, err := p.vendorRepo.GetByIDAndOrganizationID(ctx, *req.VendorID, organizationID)
 		if err != nil {
 			return nil, fmt.Errorf("vendor not found: %w", err)
 		}
+	}
 
 	// Check if PO number already exists in organization
 	existingPO, err := p.purchaseOrderRepo.GetByPONumber(ctx, req.PONumber, organizationID)
@@ -67,32 +69,53 @@ func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, or
 		return nil, fmt.Errorf("purchase order with PO number %s already exists in this organization", req.PONumber)
 	}
 
-	// Purchase orders are raw-material only because they affect ingredient stock.
+	// Validate categories and inventory fields per item type.
 	for i, item := range req.Items {
-		if err := p.validateRawMaterialPurchaseCategory(ctx, item.PurchaseCategoryID, organizationID, i); err != nil {
+		category, err := p.validatePurchaseCategory(ctx, item.PurchaseCategoryID, organizationID, i)
+		if err != nil {
 			return nil, err
 		}
 
-		_, err := p.ingredientRepo.GetByID(ctx, item.IngredientID, organizationID)
+		switch category.Type {
+		case entities.PurchaseCategoryTypeRawMaterial:
+			if item.IngredientID == nil {
+				return nil, fmt.Errorf("ingredient_id is required for raw_material item %d", i)
+			}
+			if item.Quantity == nil {
+				return nil, fmt.Errorf("quantity is required for raw_material item %d", i)
+			}
+			if item.UnitID == nil {
+				return nil, fmt.Errorf("unit_id is required for raw_material item %d", i)
+			}
+
+			_, err := p.ingredientRepo.GetByID(ctx, *item.IngredientID, organizationID)
 			if err != nil {
 				return nil, fmt.Errorf("ingredient not found for item %d: %w", i, err)
 			}
 
-		_, err = p.unitRepo.GetByID(ctx, item.UnitID, organizationID)
+			_, err = p.unitRepo.GetByID(ctx, *item.UnitID, organizationID)
 			if err != nil {
 				return nil, fmt.Errorf("unit not found for item %d: %w", i, err)
 			}
+		case entities.PurchaseCategoryTypeExpense:
+			if item.IngredientID != nil || item.Quantity != nil || item.UnitID != nil {
+				return nil, fmt.Errorf("ingredient_id, quantity, and unit_id must be empty for expense item %d", i)
+			}
+		default:
+			return nil, fmt.Errorf("purchase category for item %d has unsupported type %s", i, category.Type)
+		}
 	}
 
 	// Calculate total amount
 	totalAmount := 0.0
 	for _, item := range req.Items {
-		totalAmount += item.Amount
+		totalAmount += calculatePurchaseOrderItemTotal(item.Quantity, item.Amount)
 	}
 
 	// Create purchase order entity
 	poEntity := &entities.PurchaseOrder{
 		OrganizationID:  organizationID,
+		OutletID:        outletID,
 		VendorID:        req.VendorID,
 		PONumber:        req.PONumber,
 		TransactionDate: req.TransactionDate,
@@ -153,12 +176,15 @@ func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, or
 	return mappers.PurchaseOrderEntityToResponse(createdPO), nil
 }
 
-func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
+func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, outletID *uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
 	// Get existing purchase order
 	poEntity, err := p.purchaseOrderRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
 	if err != nil {
 		return nil, fmt.Errorf("purchase order not found: %w", err)
 	}
+	if poEntity.OutletID == nil && outletID != nil {
+		poEntity.OutletID = outletID
+	}
 
 	// Check if vendor exists and belongs to organization (if vendor is being updated)
 	if req.VendorID != nil {
@@ -166,7 +192,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 		if err != nil {
 			return nil, fmt.Errorf("vendor not found: %w", err)
 		}
-		poEntity.VendorID = *req.VendorID
+		poEntity.VendorID = req.VendorID
 	}
 
 	// Check if PO number already exists (if PO number is being updated)
@@ -204,39 +230,49 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 				return nil, fmt.Errorf("purchase_category_id is required for item %d", i)
 			}
 
-			if itemReq.IngredientID == nil {
+			ingredientID := itemReq.IngredientID
-				return nil, fmt.Errorf("ingredient_id is required for raw_material item %d", i)
-			}
-			if itemReq.Quantity == nil {
-				return nil, fmt.Errorf("quantity is required for raw_material item %d", i)
-			}
-			if itemReq.UnitID == nil {
-				return nil, fmt.Errorf("unit_id is required for raw_material item %d", i)
-			}
-
-			ingredientID := *itemReq.IngredientID
 			purchaseCategoryID := *itemReq.PurchaseCategoryID
-			unitID := *itemReq.UnitID
+			unitID := itemReq.UnitID
-			quantity := *itemReq.Quantity
+			quantity := itemReq.Quantity
 			amount := 0.0
 			if itemReq.Amount != nil {
 				amount = *itemReq.Amount
 			}
 			description := itemReq.Description
 
-			if err := p.validateRawMaterialPurchaseCategory(ctx, purchaseCategoryID, organizationID, i); err != nil {
+			category, err := p.validatePurchaseCategory(ctx, purchaseCategoryID, organizationID, i)
+			if err != nil {
 				return nil, err
 			}
 
-			_, err := p.ingredientRepo.GetByID(ctx, ingredientID, organizationID)
+			switch category.Type {
+			case entities.PurchaseCategoryTypeRawMaterial:
+				if ingredientID == nil {
+					return nil, fmt.Errorf("ingredient_id is required for raw_material item %d", i)
+				}
+				if quantity == nil {
+					return nil, fmt.Errorf("quantity is required for raw_material item %d", i)
+				}
+				if unitID == nil {
+					return nil, fmt.Errorf("unit_id is required for raw_material item %d", i)
+				}
+
+				_, err := p.ingredientRepo.GetByID(ctx, *ingredientID, organizationID)
 				if err != nil {
 					return nil, fmt.Errorf("ingredient not found: %w", err)
 				}
 
-			_, err = p.unitRepo.GetByID(ctx, unitID, organizationID)
+				_, err = p.unitRepo.GetByID(ctx, *unitID, organizationID)
 				if err != nil {
 					return nil, fmt.Errorf("unit not found: %w", err)
 				}
+			case entities.PurchaseCategoryTypeExpense:
+				if ingredientID != nil || quantity != nil || unitID != nil {
+					return nil, fmt.Errorf("ingredient_id, quantity, and unit_id must be empty for expense item %d", i)
+				}
+			default:
+				return nil, fmt.Errorf("purchase category for item %d has unsupported type %s", i, category.Type)
+			}
 
 			items[i] = &entities.PurchaseOrderItem{
 				PurchaseOrderID:    poEntity.ID,
@@ -247,7 +283,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 				UnitID:             unitID,
 				Amount:             amount,
 			}
-			totalAmount += amount
+			totalAmount += calculatePurchaseOrderItemTotal(quantity, amount)
 		}
 
 		// Delete and recreate only after all replacement items are valid.
@@ -377,6 +413,8 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 		return nil, fmt.Errorf("purchase order not found: %w", err)
 	}
 
+	fmt.Println("status:", po.Status)
+
 	// Check if status is changing to "received" and current status is not "received"
 	if status == "received" && po.Status != "received" {
 		// Get purchase order with items for inventory update
@@ -387,19 +425,27 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 
 		// Update inventory for each item
 		for _, item := range poWithItems.Items {
+			if item.PurchaseCategory != nil && item.PurchaseCategory.Type == entities.PurchaseCategoryTypeExpense {
+				continue
+			}
+
+			if item.IngredientID == nil || item.UnitID == nil || item.Quantity == nil {
+				return nil, fmt.Errorf("purchase order item %s is missing raw material inventory fields", item.ID)
+			}
+
 			// Get ingredient to find its base unit
-			ingredient, err := p.ingredientRepo.GetByID(ctx, item.IngredientID, organizationID)
+			ingredient, err := p.ingredientRepo.GetByID(ctx, *item.IngredientID, organizationID)
 			if err != nil {
-				return nil, fmt.Errorf("failed to get ingredient %s: %w", item.IngredientID, err)
+				return nil, fmt.Errorf("failed to get ingredient %s: %w", *item.IngredientID, err)
 			}
 
 			// Convert quantity to ingredient's base unit if needed
-			quantityToAdd := item.Quantity
+			quantityToAdd := *item.Quantity
-			if item.UnitID != ingredient.UnitID {
+			if *item.UnitID != ingredient.UnitID {
 				// Convert from purchase unit to ingredient's base unit
-				convertedQuantity, err := p.unitConverterRepo.ConvertQuantity(ctx, item.IngredientID, item.UnitID, ingredient.UnitID, organizationID, item.Quantity)
+				convertedQuantity, err := p.unitConverterRepo.ConvertQuantity(ctx, *item.IngredientID, *item.UnitID, ingredient.UnitID, organizationID, *item.Quantity)
 				if err != nil {
-					return nil, fmt.Errorf("failed to convert quantity for ingredient %s from unit %s to %s: %w", item.IngredientID, item.UnitID, ingredient.UnitID, err)
+					return nil, fmt.Errorf("failed to convert quantity for ingredient %s from unit %s to %s: %w", *item.IngredientID, *item.UnitID, ingredient.UnitID, err)
 				}
 				quantityToAdd = convertedQuantity
 			}
@@ -407,7 +453,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 			// Calculate unit cost in ingredient's base unit
 			unitCost := 0.0
 			if quantityToAdd > 0 {
-				unitCost = item.Amount / quantityToAdd
+				unitCost = calculatePurchaseOrderItemTotal(item.Quantity, item.Amount) / quantityToAdd
 			}
 
 			// Create inventory movement for ingredient purchase
@@ -417,7 +463,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 
 			err = p.inventoryMovementService.CreateIngredientMovement(
 				ctx,
-				item.IngredientID,
+				*item.IngredientID,
 				organizationID,
 				outletID,
 				userID,
@@ -430,13 +476,18 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 				&item.ID,
 			)
 			if err != nil {
-				return nil, fmt.Errorf("failed to create inventory movement for ingredient %s: %w", item.IngredientID, err)
+				return nil, fmt.Errorf("failed to create inventory movement for ingredient %s: %w", *item.IngredientID, err)
 			}
 		}
 	}
 
 	// Update the purchase order status
-	err = p.purchaseOrderRepo.UpdateStatus(ctx, id, status)
+	statusOutletID := po.OutletID
+	if statusOutletID == nil && outletID != uuid.Nil {
+		statusOutletID = &outletID
+	}
+
+	err = p.purchaseOrderRepo.UpdateStatusAndOutlet(ctx, id, status, statusOutletID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to update purchase order status: %w", err)
 	}
@@ -450,19 +501,27 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 	return mappers.PurchaseOrderEntityToResponse(updatedPO), nil
 }
 
-func (p *PurchaseOrderProcessorImpl) validateRawMaterialPurchaseCategory(ctx context.Context, categoryID, organizationID uuid.UUID, itemIndex int) error {
+func (p *PurchaseOrderProcessorImpl) validatePurchaseCategory(ctx context.Context, categoryID, organizationID uuid.UUID, itemIndex int) (*entities.PurchaseCategory, error) {
 	category, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, categoryID, organizationID)
 	if err != nil {
-		return fmt.Errorf("purchase category not found for item %d: %w", itemIndex, err)
+		return nil, fmt.Errorf("purchase category not found for item %d: %w", itemIndex, err)
 	}
 
 	if !category.IsActive {
-		return fmt.Errorf("purchase category for item %d is inactive", itemIndex)
+		return nil, fmt.Errorf("purchase category for item %d is inactive", itemIndex)
 	}
 
-	if category.Type != entities.PurchaseCategoryTypeRawMaterial {
+	if category.Type != entities.PurchaseCategoryTypeRawMaterial && category.Type != entities.PurchaseCategoryTypeExpense {
-		return fmt.Errorf("purchase category for item %d must be raw_material", itemIndex)
+		return nil, fmt.Errorf("purchase category for item %d must be raw_material or expense", itemIndex)
 	}
 
-	return nil
+	return category, nil
+}
+
+func calculatePurchaseOrderItemTotal(quantity *float64, amount float64) float64 {
+	if quantity == nil {
+		return amount
+	}
+
+	return *quantity * amount
 }

internal/processor/purchase_order_repository.go

@@ -19,6 +19,7 @@ type PurchaseOrderRepository interface {
 	GetByStatus(ctx context.Context, organizationID uuid.UUID, status string) ([]*entities.PurchaseOrder, error)
 	GetOverdue(ctx context.Context, organizationID uuid.UUID) ([]*entities.PurchaseOrder, error)
 	UpdateStatus(ctx context.Context, id uuid.UUID, status string) error
+	UpdateStatusAndOutlet(ctx context.Context, id uuid.UUID, status string, outletID *uuid.UUID) error
 	UpdateTotalAmount(ctx context.Context, id uuid.UUID, totalAmount float64) error
 	CreateItem(ctx context.Context, item *entities.PurchaseOrderItem) error
 	UpdateItem(ctx context.Context, item *entities.PurchaseOrderItem) error

internal/repository/analytics_repository.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"sort"
 	"time"
 
 	"apskel-pos-be/internal/entities"
@@ -19,6 +20,7 @@ type AnalyticsRepository interface {
 	GetDashboardOverview(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (*entities.DashboardOverview, error)
 	GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ProfitLossAnalytics, error)
 	GetExclusiveSummaryAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (*entities.ExclusiveSummaryAnalytics, error)
+	GetExclusiveSummaryBankBalances(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID) ([]entities.ExclusiveSummaryBankBalance, error)
 }
 
 type AnalyticsRepositoryImpl struct {
@@ -38,6 +40,18 @@ func (r *AnalyticsRepositoryImpl) resolveOutletID(query *gorm.DB, outletID *uuid
 	return query
 }
 
+func purchaseOrderItemTotalAmountSQL() string {
+	return "CASE WHEN pc.type = '" + string(entities.PurchaseCategoryTypeRawMaterial) + "' THEN COALESCE(poi.quantity, 0) * poi.amount ELSE poi.amount END"
+}
+
+func purchaseOrderRawMaterialAmountSQL() string {
+	return "CASE WHEN pc.type = '" + string(entities.PurchaseCategoryTypeRawMaterial) + "' THEN " + purchaseOrderItemTotalAmountSQL() + " ELSE 0 END"
+}
+
+func purchaseOrderExpenseAmountSQL() string {
+	return "CASE WHEN pc.type = '" + string(entities.PurchaseCategoryTypeExpense) + "' THEN " + purchaseOrderItemTotalAmountSQL() + " ELSE 0 END"
+}
+
 func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error) {
 	var results []*entities.PaymentMethodAnalytics
 
@@ -152,28 +166,27 @@ func (r *AnalyticsRepositoryImpl) getPurchaseOrderPurchasingAnalytics(ctx contex
 	summaryQuery := r.db.WithContext(ctx).
 		Table("purchase_orders po").
 		Select(`
-			COALESCE(SUM(poi.amount), 0) as total_purchases,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as total_purchases,
-			COALESCE(SUM(poi.amount), 0) as raw_material_purchases,
+			COALESCE(SUM(`+purchaseOrderRawMaterialAmountSQL()+`), 0) as raw_material_purchases,
-			0 as expense_purchases,
+			COALESCE(SUM(`+purchaseOrderExpenseAmountSQL()+`), 0) as expense_purchases,
 			COUNT(DISTINCT po.id) as total_purchase_orders,
-			COUNT(DISTINCT po.id) as raw_material_purchase_orders,
+			COUNT(DISTINCT CASE WHEN pc.type = '`+string(entities.PurchaseCategoryTypeRawMaterial)+`' THEN po.id END) as raw_material_purchase_orders,
-			0 as expense_count,
+			COUNT(CASE WHEN pc.type = '`+string(entities.PurchaseCategoryTypeExpense)+`' THEN poi.id END) as expense_count,
 			COALESCE(SUM(poi.quantity), 0) as total_quantity,
 			CASE
 				WHEN COUNT(DISTINCT po.id) > 0
-				THEN COALESCE(SUM(poi.amount), 0) / COUNT(DISTINCT po.id)
+				THEN COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) / COUNT(DISTINCT po.id)
 				ELSE 0
 			END as average_purchase_order_value,
 			COUNT(DISTINCT i.id) as total_ingredients,
-			COUNT(DISTINCT po.vendor_id) as total_vendors
+			COUNT(DISTINCT COALESCE(po.vendor_id::text, 'no-vendor')) as total_vendors
 		`).
-		Joins("JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
+		Joins("LEFT JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
-		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Joins("LEFT JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
-		Joins("JOIN ingredients i ON poi.ingredient_id = i.id").
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
-		Joins("JOIN units u ON poi.unit_id = u.id").
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
 		Where("po.organization_id = ?", organizationID).
-		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
+		Where("po.status != ?", "cancelled").
-		Where("po.status = ?", "received").
 		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo)
 	summaryQuery = r.applyPurchaseOrderItemOutletFilter(summaryQuery, outletID)
 
@@ -198,23 +211,23 @@ func (r *AnalyticsRepositoryImpl) getPurchaseOrderPurchasingAnalytics(ctx contex
 		Table("purchase_orders po").
 		Select(`
 			`+dateFormat+` as date,
-			COALESCE(SUM(poi.amount), 0) as purchases,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as purchases,
-			COALESCE(SUM(poi.amount), 0) as raw_material_purchases,
+			COALESCE(SUM(`+purchaseOrderRawMaterialAmountSQL()+`), 0) as raw_material_purchases,
-			0 as expense_purchases,
+			COALESCE(SUM(`+purchaseOrderExpenseAmountSQL()+`), 0) as expense_purchases,
 			COUNT(DISTINCT po.id) as purchase_orders,
-			COUNT(DISTINCT po.id) as raw_material_purchase_orders,
+			COUNT(DISTINCT CASE WHEN pc.type = '`+string(entities.PurchaseCategoryTypeRawMaterial)+`' THEN po.id END) as raw_material_purchase_orders,
-			0 as expense_count,
+			COUNT(CASE WHEN pc.type = '`+string(entities.PurchaseCategoryTypeExpense)+`' THEN poi.id END) as expense_count,
 			COALESCE(SUM(poi.quantity), 0) as quantity,
 			COUNT(DISTINCT i.id) as ingredients,
-			COUNT(DISTINCT po.vendor_id) as vendors
+			COUNT(DISTINCT COALESCE(po.vendor_id::text, 'no-vendor')) as vendors
 		`).
-		Joins("JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
+		Joins("LEFT JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
-		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Joins("LEFT JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
-		Joins("JOIN ingredients i ON poi.ingredient_id = i.id").
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
-		Joins("JOIN units u ON poi.unit_id = u.id").
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
 		Where("po.organization_id = ?", organizationID).
+		Where("po.status != ?", "cancelled").
 		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
-		Where("po.status = ?", "received").
 		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
 		Group(dateFormat).
 		Order(dateFormat)
@@ -231,10 +244,10 @@ func (r *AnalyticsRepositoryImpl) getPurchaseOrderPurchasingAnalytics(ctx contex
 			i.id as ingredient_id,
 			i.name as ingredient_name,
 			COALESCE(SUM(poi.quantity), 0) as quantity,
-			COALESCE(SUM(poi.amount), 0) as total_cost,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as total_cost,
 			CASE
 				WHEN SUM(poi.quantity) > 0
-				THEN COALESCE(SUM(poi.amount), 0) / SUM(poi.quantity)
+				THEN COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) / SUM(poi.quantity)
 				ELSE 0
 			END as average_unit_cost,
 			COUNT(DISTINCT po.id) as purchase_order_count
@@ -244,8 +257,7 @@ func (r *AnalyticsRepositoryImpl) getPurchaseOrderPurchasingAnalytics(ctx contex
 		Joins("JOIN ingredients i ON poi.ingredient_id = i.id").
 		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
 		Where("po.organization_id = ?", organizationID).
-		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
+		Where("po.status != ?", "cancelled").
-		Where("po.status = ?", "received").
 		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
 		Group("i.id, i.name").
 		Order("total_cost DESC")
@@ -260,22 +272,21 @@ func (r *AnalyticsRepositoryImpl) getPurchaseOrderPurchasingAnalytics(ctx contex
 		Table("purchase_orders po").
 		Select(`
 			v.id as vendor_id,
-			v.name as vendor_name,
+			COALESCE(v.name, 'No Vendor') as vendor_name,
-			COALESCE(SUM(poi.amount), 0) as total_cost,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as total_cost,
 			COUNT(DISTINCT po.id) as purchase_order_count,
 			COUNT(DISTINCT i.id) as ingredient_count,
 			COALESCE(SUM(poi.quantity), 0) as quantity
 		`).
-		Joins("JOIN vendors v ON po.vendor_id = v.id").
+		Joins("LEFT JOIN vendors v ON po.vendor_id = v.id").
-		Joins("JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
+		Joins("LEFT JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
-		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Joins("LEFT JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
-		Joins("JOIN ingredients i ON poi.ingredient_id = i.id").
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
-		Joins("JOIN units u ON poi.unit_id = u.id").
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
 		Where("po.organization_id = ?", organizationID).
-		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
+		Where("po.status != ?", "cancelled").
-		Where("po.status = ?", "received").
 		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
-		Group("v.id, v.name").
+		Group("v.id, COALESCE(v.name, 'No Vendor')").
 		Order("total_cost DESC")
 	vendorQuery = r.applyPurchaseOrderItemOutletFilter(vendorQuery, outletID)
 
@@ -296,15 +307,7 @@ func (r *AnalyticsRepositoryImpl) applyPurchaseOrderItemOutletFilter(query *gorm
 	if outletID == nil {
 		return query
 	}
-	return query.Where(`
+	return query.Where("po.outlet_id = ?", *outletID)
-		EXISTS (
-			SELECT 1
-			FROM inventory_movements im
-			WHERE im.purchase_order_item_id = poi.id
-			  AND im.movement_type = ?
-			  AND im.outlet_id = ?
-		)
-	`, entities.InventoryMovementTypePurchase, *outletID)
 }
 
 func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, limit int) ([]*entities.ProductAnalytics, error) {
@@ -315,7 +318,13 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Select(`
 			p.id as product_id,
 			p.name as product_name,
-			p.price as product_price,
+			p.sku as product_sku,
+			COALESCE(
+				NULLIF(pop.price, 0),
+				(SELECT price FROM product_outlet_prices WHERE product_id = p.id ORDER BY updated_at DESC LIMIT 1),
+				NULLIF(p.price, 0),
+				0
+			) as product_price,
 			c.id as category_id,
 			c.name as category_name,
 			c.order as category_order,
@@ -349,6 +358,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Joins("JOIN products p ON oi.product_id = p.id").
 		Joins("JOIN categories c ON p.category_id = c.id").
 		Joins("JOIN orders o ON oi.order_id = o.id").
+		Joins("LEFT JOIN product_outlet_prices pop ON pop.product_id = p.id AND pop.outlet_id = o.outlet_id").
 		Joins("LEFT JOIN (?) mahpp ON mahpp.product_id = p.id",
 			r.db.Table("product_recipes pr2").
 				Select("pr2.product_id, SUM(pr2.quantity * (1 + COALESCE(pr2.waste_percentage, 0)/100.0) * COALESCE(ma.moving_avg_cost, ing.cost)) as hpp_per_unit").
@@ -374,7 +384,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.price, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
+		Group("p.id, p.name, p.sku, p.price, p.cost, pop.price, c.id, c.name, c.order, mahpp.hpp_per_unit").
 		Order("revenue DESC").
 		Limit(limit).
 		Scan(&results).Error
@@ -510,6 +520,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 	if err := summaryQuery.Scan(&summary).Error; err != nil {
 		return nil, err
 	}
+	periodHPP, err := r.getPurchaseOrderRawMaterialTotal(ctx, organizationID, outletID, dateFrom, dateTo)
+	if err != nil {
+		return nil, err
+	}
+	applyProfitLossSummaryCost(&summary, periodHPP)
 
 	var timeFormat string
 	switch groupBy {
@@ -557,6 +572,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 	if err := dataQuery.Scan(&data).Error; err != nil {
 		return nil, err
 	}
+	poCostData, err := r.getPurchaseOrderRawMaterialCostByPeriod(ctx, organizationID, outletID, dateFrom, dateTo, groupBy)
+	if err != nil {
+		return nil, err
+	}
+	data = mergeProfitLossDataWithPurchaseOrderCost(data, poCostData)
 
 	var productData []entities.ProductProfitData
 	productQuery := r.db.WithContext(ctx).
@@ -617,6 +637,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 	if err := todayQuery.Scan(&todayRC).Error; err != nil {
 		return nil, err
 	}
+	todayHPP, err := r.getPurchaseOrderRawMaterialTotal(ctx, organizationID, outletID, todayStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+	todayRC.Cost = todayHPP
 
 	var mtdRC revenueCostResult
 	mtdQuery := r.db.WithContext(ctx).
@@ -634,21 +659,41 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 	if err := mtdQuery.Scan(&mtdRC).Error; err != nil {
 		return nil, err
 	}
+	mtdHPP, err := r.getPurchaseOrderRawMaterialTotal(ctx, organizationID, outletID, mtdStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+	mtdRC.Cost = mtdHPP
 
 	todayExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, todayStart, todayEnd)
 	if err != nil {
 		return nil, err
 	}
+	todayPOExpenseByCategory, err := r.getPurchaseOrderExpenseByCategory(ctx, organizationID, outletID, todayStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+	todayExpenseByCategory = mergeExpenseCategoryTotals(todayExpenseByCategory, todayPOExpenseByCategory)
 
 	mtdExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, mtdStart, todayEnd)
 	if err != nil {
 		return nil, err
 	}
+	mtdPOExpenseByCategory, err := r.getPurchaseOrderExpenseByCategory(ctx, organizationID, outletID, mtdStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+	mtdExpenseByCategory = mergeExpenseCategoryTotals(mtdExpenseByCategory, mtdPOExpenseByCategory)
 
 	opsItems, err := r.getOperationalExpenseItems(ctx, organizationID, outletID, mtdStart, todayEnd)
 	if err != nil {
 		return nil, err
 	}
+	poOpsItems, err := r.getPurchaseOrderExpenseItems(ctx, organizationID, outletID, mtdStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+	opsItems = mergeOperationalExpenseItems(opsItems, poOpsItems)
 
 	return &entities.ProfitLossAnalytics{
 		Summary:                 summary,
@@ -664,16 +709,210 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 	}, nil
 }
 
+func (r *AnalyticsRepositoryImpl) getPurchaseOrderRawMaterialTotal(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (float64, error) {
+	type totalResult struct {
+		Total float64
+	}
+	var result totalResult
+
+	query := r.db.WithContext(ctx).
+		Table("purchase_order_items poi").
+		Select(`COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as total`).
+		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
+		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Where("po.organization_id = ?", organizationID).
+		Where("po.status = ?", "received").
+		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo)
+	query = r.applyPurchaseOrderItemOutletFilter(query, outletID)
+
+	if err := query.Scan(&result).Error; err != nil {
+		return 0, err
+	}
+	return result.Total, nil
+}
+
+func (r *AnalyticsRepositoryImpl) getPurchaseOrderRawMaterialCostByPeriod(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) ([]entities.ProfitLossData, error) {
+	var dateFormat string
+	switch groupBy {
+	case "hour":
+		dateFormat = "DATE_TRUNC('hour', po.transaction_date::timestamp)"
+	case "week":
+		dateFormat = "DATE_TRUNC('week', po.transaction_date::timestamp)"
+	case "month":
+		dateFormat = "DATE_TRUNC('month', po.transaction_date::timestamp)"
+	default:
+		dateFormat = "DATE_TRUNC('day', po.transaction_date::timestamp)"
+	}
+
+	var results []entities.ProfitLossData
+	query := r.db.WithContext(ctx).
+		Table("purchase_order_items poi").
+		Select(`
+			`+dateFormat+` as date,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as cost
+		`).
+		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
+		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Where("po.organization_id = ?", organizationID).
+		Where("po.status = ?", "received").
+		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
+		Group(dateFormat).
+		Order(dateFormat)
+	query = r.applyPurchaseOrderItemOutletFilter(query, outletID)
+
+	if err := query.Scan(&results).Error; err != nil {
+		return nil, err
+	}
+	return results, nil
+}
+
+func applyProfitLossSummaryCost(summary *entities.ProfitLossSummary, cost float64) {
+	summary.TotalCost = cost
+	summary.GrossProfit = summary.TotalRevenue - cost
+	summary.GrossProfitMargin = ratio(summary.GrossProfit, summary.TotalRevenue)
+	summary.NetProfit = summary.TotalRevenue - cost - summary.TotalDiscount
+	summary.NetProfitMargin = ratio(summary.NetProfit, summary.TotalRevenue)
+	if summary.TotalOrders > 0 {
+		summary.AverageProfit = summary.NetProfit / float64(summary.TotalOrders)
+	} else {
+		summary.AverageProfit = 0
+	}
+	summary.ProfitabilityRatio = ratio(summary.GrossProfit, cost)
+}
+
+func mergeProfitLossDataWithPurchaseOrderCost(data, costs []entities.ProfitLossData) []entities.ProfitLossData {
+	indexByDate := make(map[time.Time]int, len(data))
+	for i, item := range data {
+		data[i].Cost = 0
+		indexByDate[item.Date] = i
+	}
+
+	for _, cost := range costs {
+		if i, ok := indexByDate[cost.Date]; ok {
+			data[i].Cost = cost.Cost
+			continue
+		}
+
+		indexByDate[cost.Date] = len(data)
+		data = append(data, entities.ProfitLossData{Date: cost.Date, Cost: cost.Cost})
+	}
+
+	for i := range data {
+		data[i].GrossProfit = data[i].Revenue - data[i].Cost
+		data[i].GrossProfitMargin = ratio(data[i].GrossProfit, data[i].Revenue)
+		data[i].NetProfit = data[i].Revenue - data[i].Cost - data[i].Discount
+		data[i].NetProfitMargin = ratio(data[i].NetProfit, data[i].Revenue)
+	}
+
+	sort.Slice(data, func(i, j int) bool {
+		return data[i].Date.Before(data[j].Date)
+	})
+	return data
+}
+
+func ratio(numerator, denominator float64) float64 {
+	if denominator == 0 {
+		return 0
+	}
+	return (numerator / denominator) * 100
+}
+
+func (r *AnalyticsRepositoryImpl) getPurchaseOrderExpenseByCategory(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("purchase_order_items poi").
+		Select(`
+			pc.name as category_name,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as amount
+		`).
+		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
+		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Where("po.organization_id = ?", organizationID).
+		Where("po.status = ?", "received").
+		Where("pc.type = ?", entities.PurchaseCategoryTypeExpense).
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
+		Group("pc.id, pc.name, pc.sort_order").
+		Order("pc.sort_order ASC, pc.name ASC")
+	query = r.applyPurchaseOrderItemOutletFilter(query, outletID)
+
+	if err := query.Scan(&results).Error; err != nil {
+		return nil, err
+	}
+	return results, nil
+}
+
+func (r *AnalyticsRepositoryImpl) getPurchaseOrderExpenseItems(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("purchase_order_items poi").
+		Select(`
+			COALESCE(NULLIF(poi.description, ''), pc.name) as item,
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as amount
+		`).
+		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
+		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
+		Where("po.organization_id = ?", organizationID).
+		Where("po.status = ?", "received").
+		Where("pc.type = ?", entities.PurchaseCategoryTypeExpense).
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
+		Group("COALESCE(NULLIF(poi.description, ''), pc.name)").
+		Order("amount DESC")
+	query = r.applyPurchaseOrderItemOutletFilter(query, outletID)
+
+	if err := query.Scan(&results).Error; err != nil {
+		return nil, err
+	}
+	return results, nil
+}
+
+func mergeExpenseCategoryTotals(base, extra []entities.ExpenseCategoryTotal) []entities.ExpenseCategoryTotal {
+	indexByName := make(map[string]int, len(base))
+	for i, item := range base {
+		indexByName[item.CategoryName] = i
+	}
+
+	for _, item := range extra {
+		if i, ok := indexByName[item.CategoryName]; ok {
+			base[i].Amount += item.Amount
+			continue
+		}
+		indexByName[item.CategoryName] = len(base)
+		base = append(base, item)
+	}
+	return base
+}
+
+func mergeOperationalExpenseItems(base, extra []entities.OperationalExpenseItem) []entities.OperationalExpenseItem {
+	indexByName := make(map[string]int, len(base))
+	for i, item := range base {
+		indexByName[item.Item] = i
+	}
+
+	for _, item := range extra {
+		if i, ok := indexByName[item.Item]; ok {
+			base[i].Amount += item.Amount
+			continue
+		}
+		indexByName[item.Item] = len(base)
+		base = append(base, item)
+	}
+	return base
+}
+
 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(`pc.name as category_name, COALESCE(SUM(ei.amount), 0) as amount`).
+		Select(`COALESCE(parent_coa.name, 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 purchase_categories pc ON ei.purchase_category_id = pc.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("pc.type = ?", entities.PurchaseCategoryTypeExpense).
 		Where("e.status = ?", "approved").
 		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
 
@@ -682,8 +921,8 @@ func (r *AnalyticsRepositoryImpl) getExpenseByCategory(ctx context.Context, orga
 	}
 
 	err := query.
-		Group("pc.id, pc.name, pc.sort_order").
+		Group("COALESCE(parent_coa.name, coa.name, 'Lain-lain')").
-		Order("pc.sort_order ASC, pc.name ASC").
+		Order("COALESCE(parent_coa.name, coa.name, 'Lain-lain')").
 		Scan(&results).Error
 
 	return results, err
@@ -694,11 +933,10 @@ func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context
 
 	query := r.db.WithContext(ctx).
 		Table("expense_items ei").
-		Select(`COALESCE(NULLIF(ei.item, ''), ei.description, pc.name) as item, COALESCE(SUM(ei.amount), 0) as amount`).
+		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 purchase_categories pc ON ei.purchase_category_id = pc.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
 		Where("e.organization_id = ?", organizationID).
-		Where("pc.type = ?", entities.PurchaseCategoryTypeExpense).
 		Where("e.status = ?", "approved").
 		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
 
@@ -707,7 +945,7 @@ func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context
 	}
 
 	err := query.
-		Group("COALESCE(NULLIF(ei.item, ''), ei.description, pc.name)").
+		Group("COALESCE(NULLIF(ei.item, ''), ei.description, coa.name)").
 		Order("amount DESC").
 		Scan(&results).Error
 
@@ -775,11 +1013,11 @@ func (r *AnalyticsRepositoryImpl) getExclusiveSummaryHPPBreakdown(ctx context.Co
 		Select(`
 			pc.code as category_code,
 			pc.name as category_name,
-			COALESCE(SUM(poi.amount), 0) as amount
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as amount
 		`).
 		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
 		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
-		Joins("JOIN ingredients i ON poi.ingredient_id = i.id").
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
 		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
 		Where("po.organization_id = ?", organizationID).
 		Where("pc.type = ?", entities.PurchaseCategoryTypeRawMaterial).
@@ -799,22 +1037,19 @@ func (r *AnalyticsRepositoryImpl) getExclusiveSummaryOperationalExpenseBreakdown
 	var results []entities.ExclusiveSummaryCategoryTotal
 
 	query := r.db.WithContext(ctx).
-		Table("expense_items ei").
+		Table("purchase_order_items poi").
 		Select(`
 			pc.code as category_code,
 			pc.name as category_name,
-			COALESCE(SUM(ei.amount), 0) as amount
+			COALESCE(SUM(`+purchaseOrderItemTotalAmountSQL()+`), 0) as amount
 		`).
-		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
-		Joins("JOIN purchase_categories pc ON ei.purchase_category_id = pc.id").
+		Joins("JOIN purchase_categories pc ON poi.purchase_category_id = pc.id").
-		Where("e.organization_id = ?", organizationID).
+		Where("po.organization_id = ?", organizationID).
 		Where("pc.type = ?", entities.PurchaseCategoryTypeExpense).
-		Where("e.status = ?", "approved").
+		Where("po.status = ?", "received").
-		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo)
-
+	query = r.applyPurchaseOrderItemOutletFilter(query, outletID)
-	if outletID != nil {
-		query = query.Where("e.outlet_id = ?", *outletID)
-	}
 
 	err := query.
 		Group("pc.id, pc.code, pc.name, pc.sort_order").
@@ -826,7 +1061,7 @@ func (r *AnalyticsRepositoryImpl) getExclusiveSummaryOperationalExpenseBreakdown
 
 func (r *AnalyticsRepositoryImpl) getExclusiveSummaryDailySummary(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExclusiveSummaryDailySummary, error) {
 	var results []entities.ExclusiveSummaryDailySummary
-	rawQuery, args := r.exclusiveSummaryTransactionUnionQuery(organizationID, outletID, dateFrom, dateTo)
+	rawQuery, args := r.exclusiveSummaryPurchaseOrderItemQuery(organizationID, outletID, dateFrom, dateTo)
 
 	err := r.db.WithContext(ctx).Raw(`
 		SELECT date, COUNT(*) as transaction_count, COALESCE(SUM(amount), 0) as total_cost
@@ -840,49 +1075,28 @@ func (r *AnalyticsRepositoryImpl) getExclusiveSummaryDailySummary(ctx context.Co
 
 func (r *AnalyticsRepositoryImpl) getExclusiveSummaryDailyTransactions(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExclusiveSummaryDailyTransaction, error) {
 	var results []entities.ExclusiveSummaryDailyTransaction
-	rawQuery, args := r.exclusiveSummaryTransactionUnionQuery(organizationID, outletID, dateFrom, dateTo)
+	rawQuery, args := r.exclusiveSummaryPurchaseOrderItemQuery(organizationID, outletID, dateFrom, dateTo)
 
 	err := r.db.WithContext(ctx).Raw(`
 		SELECT date, category_code, category_name, description, amount, source
 		FROM (`+rawQuery+`) transactions
-		ORDER BY date ASC, source ASC, category_name ASC, description ASC
+		ORDER BY date ASC, category_name ASC, description ASC
 	`, args...).Scan(&results).Error
 
 	return results, err
 }
 
-func (r *AnalyticsRepositoryImpl) exclusiveSummaryTransactionUnionQuery(organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (string, []interface{}) {
+func (r *AnalyticsRepositoryImpl) exclusiveSummaryPurchaseOrderItemQuery(organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (string, []interface{}) {
-	poOutletFilter := ""
+	outletFilter := ""
-	expenseOutletFilter := ""
 	args := []interface{}{
 		organizationID,
-		entities.PurchaseCategoryTypeRawMaterial,
 		"received",
 		dateFrom,
 		dateTo,
 	}
 
 	if outletID != nil {
-		poOutletFilter = `AND EXISTS (
+		outletFilter = "AND po.outlet_id = ?"
-			SELECT 1
-			FROM inventory_movements im
-			WHERE im.purchase_order_item_id = poi.id
-			  AND im.movement_type = 'purchase'
-			  AND im.outlet_id = ?
-		)`
-		args = append(args, *outletID)
-	}
-
-	args = append(args,
-		organizationID,
-		entities.PurchaseCategoryTypeExpense,
-		"approved",
-		dateFrom,
-		dateTo,
-	)
-
-	if outletID != nil {
-		expenseOutletFilter = "AND e.outlet_id = ?"
 		args = append(args, *outletID)
 	}
 
@@ -892,37 +1106,62 @@ func (r *AnalyticsRepositoryImpl) exclusiveSummaryTransactionUnionQuery(organiza
 			pc.code as category_code,
 			pc.name as category_name,
 			COALESCE(NULLIF(poi.description, ''), i.name, pc.name) as description,
-			poi.amount as amount,
+			` + purchaseOrderItemTotalAmountSQL() + ` as amount,
 			'purchase_order' as source
 		FROM purchase_order_items poi
 		JOIN purchase_orders po ON poi.purchase_order_id = po.id
 		JOIN purchase_categories pc ON poi.purchase_category_id = pc.id
-		JOIN ingredients i ON poi.ingredient_id = i.id
+		LEFT JOIN ingredients i ON poi.ingredient_id = i.id
 		LEFT JOIN units u ON poi.unit_id = u.id
 		WHERE po.organization_id = ?
-		  AND pc.type = ?
 		  AND po.status = ?
 		  AND po.transaction_date >= ? AND po.transaction_date <= ?
-		  ` + poOutletFilter + `
+		  ` + outletFilter + `
-
-		UNION ALL
-
-		SELECT
-			DATE(e.transaction_date) as date,
-			pc.code as category_code,
-			pc.name as category_name,
-			COALESCE(NULLIF(ei.item, ''), NULLIF(ei.description, ''), pc.name) as description,
-			ei.amount as amount,
-			'expense' as source
-		FROM expense_items ei
-		JOIN expenses e ON ei.expense_id = e.id
-		JOIN purchase_categories pc ON ei.purchase_category_id = pc.id
-		WHERE e.organization_id = ?
-		  AND pc.type = ?
-		  AND e.status = ?
-		  AND e.transaction_date >= ? AND e.transaction_date <= ?
-		  ` + expenseOutletFilter + `
 	`
 
 	return query, args
 }
+
+func (r *AnalyticsRepositoryImpl) GetExclusiveSummaryBankBalances(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID) ([]entities.ExclusiveSummaryBankBalance, error) {
+	type accountBalance struct {
+		Name           string
+		OpeningBalance float64
+		CurrentBalance float64
+		Description    *string
+	}
+
+	var accounts []accountBalance
+	query := r.db.WithContext(ctx).
+		Table("accounts").
+		Select("name, opening_balance, current_balance, description").
+		Where("organization_id = ?", organizationID).
+		Where("account_type IN ?", []entities.AccountType{entities.AccountTypeCash, entities.AccountTypeWallet, entities.AccountTypeBank}).
+		Where("is_active = ?", true)
+
+	if outletID != nil {
+		query = query.Where("outlet_id = ? OR outlet_id IS NULL", *outletID)
+	} else {
+		query = query.Where("outlet_id IS NULL")
+	}
+
+	err := query.
+		Order("number ASC, name ASC").
+		Scan(&accounts).Error
+	if err != nil {
+		return nil, err
+	}
+
+	balances := make([]entities.ExclusiveSummaryBankBalance, len(accounts))
+	for i, account := range accounts {
+		openingBalance := account.OpeningBalance
+		closingBalance := account.CurrentBalance
+		balances[i] = entities.ExclusiveSummaryBankBalance{
+			Bank:           account.Name,
+			OpeningBalance: &openingBalance,
+			ClosingBalance: &closingBalance,
+			Notes:          account.Description,
+		}
+	}
+
+	return balances, nil
+}

internal/repository/purchase_order_repository.go

@@ -196,6 +196,18 @@ func (r *PurchaseOrderRepositoryImpl) UpdateStatus(ctx context.Context, id uuid.
 		Update("status", status).Error
 }
 
+func (r *PurchaseOrderRepositoryImpl) UpdateStatusAndOutlet(ctx context.Context, id uuid.UUID, status string, outletID *uuid.UUID) error {
+	updates := map[string]interface{}{"status": status}
+	if outletID != nil {
+		updates["outlet_id"] = *outletID
+	}
+
+	return r.db.WithContext(ctx).
+		Model(&entities.PurchaseOrder{}).
+		Where("id = ?", id).
+		Updates(updates).Error
+}
+
 func (r *PurchaseOrderRepositoryImpl) UpdateTotalAmount(ctx context.Context, id uuid.UUID, totalAmount float64) error {
 	return r.db.WithContext(ctx).
 		Model(&entities.PurchaseOrder{}).

internal/router/router.go

@@ -339,6 +339,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				analytics.GET("/profit-loss", r.analyticsHandler.GetProfitLossAnalytics)
 				analytics.GET("/exclusive-summary/period", r.analyticsHandler.GetExclusiveSummaryPeriod)
 				analytics.GET("/exclusive-summary/monthly", r.analyticsHandler.GetExclusiveSummaryMonthly)
+				analytics.GET("/exclusive-summary/mtd", r.analyticsHandler.GetExclusiveSummaryMTD)
 			}
 
 			tables := protected.Group("/tables")

internal/service/analytics_service.go

@@ -20,6 +20,7 @@ type AnalyticsService interface {
 	GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error)
 	GetExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error)
 	GetExclusiveSummaryMonthly(ctx context.Context, req *models.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyResponse, error)
+	GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error)
 }
 
 type AnalyticsServiceImpl struct {
@@ -349,6 +350,19 @@ func (s *AnalyticsServiceImpl) GetExclusiveSummaryMonthly(ctx context.Context, r
 	return response, nil
 }
 
+func (s *AnalyticsServiceImpl) GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
+	if err := s.validateExclusiveSummaryMTDRequest(req); err != nil {
+		return nil, fmt.Errorf("validation error: %w", err)
+	}
+
+	response, err := s.analyticsProcessor.GetExclusiveSummaryMTD(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get exclusive summary mtd: %w", err)
+	}
+
+	return response, nil
+}
+
 func (s *AnalyticsServiceImpl) validateExclusiveSummaryPeriodRequest(req *models.ExclusiveSummaryPeriodRequest) error {
 	if req == nil {
 		return fmt.Errorf("request cannot be nil")
@@ -373,6 +387,22 @@ func (s *AnalyticsServiceImpl) validateExclusiveSummaryPeriodRequest(req *models
 	return nil
 }
 
+func (s *AnalyticsServiceImpl) validateExclusiveSummaryMTDRequest(req *models.ExclusiveSummaryMTDRequest) error {
+	if req == nil {
+		return fmt.Errorf("request cannot be nil")
+	}
+
+	if req.OrganizationID == uuid.Nil {
+		return fmt.Errorf("organization_id is required")
+	}
+
+	if req.DateTo.IsZero() {
+		return fmt.Errorf("date_to is required")
+	}
+
+	return nil
+}
+
 func (s *AnalyticsServiceImpl) validateExclusiveSummaryMonthlyRequest(req *models.ExclusiveSummaryMonthlyRequest) error {
 	if req == nil {
 		return fmt.Errorf("request cannot be nil")

internal/service/analytics_service_test.go

@@ -49,6 +49,10 @@ func (analyticsProcessorStub) GetExclusiveSummaryMonthly(context.Context, *model
 	return &models.ExclusiveSummaryMonthlyResponse{}, nil
 }
 
+func (analyticsProcessorStub) GetExclusiveSummaryMTD(context.Context, *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
+	return &models.ExclusiveSummaryPeriodResponse{}, nil
+}
+
 func TestAnalyticsServiceGetPurchasingAnalyticsValidation(t *testing.T) {
 	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
@@ -198,3 +202,100 @@ func TestAnalyticsServiceGetProfitLossAnalyticsAllowsEmptyGroupBy(t *testing.T)
 	require.NoError(t, err)
 	require.Nil(t, resp)
 }
+
+func TestAnalyticsServiceGetExclusiveSummaryPeriodValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name    string
+		req     *models.ExclusiveSummaryPeriodRequest
+		wantErr string
+	}{
+		{
+			name:    "nil request",
+			req:     nil,
+			wantErr: "request cannot be nil",
+		},
+		{
+			name: "missing organization",
+			req: &models.ExclusiveSummaryPeriodRequest{
+				DateFrom: now,
+				DateTo:   now,
+			},
+			wantErr: "organization_id is required",
+		},
+		{
+			name: "reversed dates",
+			req: &models.ExclusiveSummaryPeriodRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now.AddDate(0, 0, 1),
+				DateTo:         now,
+			},
+			wantErr: "date_from cannot be after date_to",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp, err := service.GetExclusiveSummaryPeriod(context.Background(), tt.req)
+
+			require.Nil(t, resp)
+			require.Error(t, err)
+			require.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
+}
+
+func TestAnalyticsServiceGetExclusiveSummaryMonthlyValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+
+	resp, err := service.GetExclusiveSummaryMonthly(context.Background(), &models.ExclusiveSummaryMonthlyRequest{
+		OrganizationID: uuid.New(),
+	})
+
+	require.Nil(t, resp)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "month is required")
+}
+
+func TestAnalyticsServiceGetExclusiveSummaryMTDValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 6, 18, 23, 59, 59, 0, time.UTC)
+
+	tests := []struct {
+		name    string
+		req     *models.ExclusiveSummaryMTDRequest
+		wantErr string
+	}{
+		{
+			name:    "nil request",
+			req:     nil,
+			wantErr: "request cannot be nil",
+		},
+		{
+			name: "missing organization",
+			req: &models.ExclusiveSummaryMTDRequest{
+				DateTo: now,
+			},
+			wantErr: "organization_id is required",
+		},
+		{
+			name: "missing date_to",
+			req: &models.ExclusiveSummaryMTDRequest{
+				OrganizationID: uuid.New(),
+			},
+			wantErr: "date_to is required",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp, err := service.GetExclusiveSummaryMTD(context.Background(), tt.req)
+
+			require.Nil(t, resp)
+			require.Error(t, err)
+			require.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
+}

internal/service/purchase_order_service.go

@@ -40,7 +40,12 @@ func (s *PurchaseOrderServiceImpl) CreatePurchaseOrder(ctx context.Context, apct
 		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
 	}
 
-	poResponse, err := s.purchaseOrderProcessor.CreatePurchaseOrder(ctx, apctx.OrganizationID, modelReq)
+	var outletID *uuid.UUID
+	if apctx.OutletID != uuid.Nil {
+		outletID = &apctx.OutletID
+	}
+
+	poResponse, err := s.purchaseOrderProcessor.CreatePurchaseOrder(ctx, apctx.OrganizationID, outletID, modelReq)
 	if err != nil {
 		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.PurchaseOrderServiceEntity, err.Error())
 		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
@@ -57,7 +62,12 @@ func (s *PurchaseOrderServiceImpl) UpdatePurchaseOrder(ctx context.Context, apct
 		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})
 	}
 
-	poResponse, err := s.purchaseOrderProcessor.UpdatePurchaseOrder(ctx, id, apctx.OrganizationID, modelReq)
+	var outletID *uuid.UUID
+	if apctx.OutletID != uuid.Nil {
+		outletID = &apctx.OutletID
+	}
+
+	poResponse, err := s.purchaseOrderProcessor.UpdatePurchaseOrder(ctx, id, apctx.OrganizationID, outletID, modelReq)
 	if err != nil {
 		errorResp := contract.NewResponseError(constants.InternalServerErrorCode, constants.PurchaseOrderServiceEntity, err.Error())
 		return contract.BuildErrorResponse([]*contract.ResponseError{errorResp})

internal/transformer/analytics_transformer.go

@@ -604,6 +604,27 @@ func ExclusiveSummaryMonthlyContractToModel(req *contract.ExclusiveSummaryMonthl
 	}, nil
 }
 
+func ExclusiveSummaryMTDContractToModel(req *contract.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryMTDRequest, error) {
+	if req == nil {
+		return nil, fmt.Errorf("request cannot be nil")
+	}
+
+	dateTo, err := parseFlexibleDateToJakartaTime(req.DateTo, true)
+	if err != nil {
+		return nil, fmt.Errorf("invalid date_to: %w", err)
+	}
+	if dateTo == nil {
+		return nil, fmt.Errorf("date_to is required")
+	}
+
+	return &models.ExclusiveSummaryMTDRequest{
+		OrganizationID:                req.OrganizationID,
+		OutletID:                      parseOutletID(req.OutletID),
+		DateTo:                        *dateTo,
+		ExcludeGajiStaffFromReimburse: req.ExcludeGajiStaffFromReimburse,
+	}, nil
+}
+
 func ExclusiveSummaryPeriodModelToContract(resp *models.ExclusiveSummaryPeriodResponse) *contract.ExclusiveSummaryPeriodResponse {
 	if resp == nil {
 		return nil
@@ -772,6 +793,22 @@ func parseISODateToJakartaTime(dateStr string, endOfDay bool) (*time.Time, error
 	return &result, nil
 }
 
+func parseFlexibleDateToJakartaTime(dateStr string, endOfDay bool) (*time.Time, error) {
+	if dateStr == "" {
+		return nil, nil
+	}
+
+	fromTime, toTime, err := util.ParseDateRangeToJakartaTime(dateStr, dateStr)
+	if err == nil {
+		if endOfDay {
+			return toTime, nil
+		}
+		return fromTime, nil
+	}
+
+	return parseISODateToJakartaTime(dateStr, endOfDay)
+}
+
 func parseMonthToJakartaTime(month string) (time.Time, error) {
 	location, err := time.LoadLocation("Asia/Jakarta")
 	if err != nil {

internal/transformer/analytics_transformer_test.go

@@ -183,7 +183,7 @@ func TestProfitLossAnalyticsModelToContractCopiesDateRange(t *testing.T) {
 	require.Equal(t, "total_omset", result.MainSummary[0].ID)
 }
 
-func TestExclusiveSummaryPeriodContractToModelParsesISODateRange(t *testing.T) {
+func TestExclusiveSummaryPeriodContractToModelParsesFlexibleDates(t *testing.T) {
 	orgID := uuid.New()
 	outletID := uuid.New().String()
 
@@ -217,6 +217,7 @@ func TestExclusiveSummaryMonthlyContractToModelParsesMonth(t *testing.T) {
 
 	require.NoError(t, err)
 	require.Equal(t, orgID, result.OrganizationID)
+
 	location, err := time.LoadLocation("Asia/Jakarta")
 	require.NoError(t, err)
 	require.Equal(t, time.Date(2026, 5, 1, 0, 0, 0, 0, location), result.Month)

internal/transformer/purchase_order_transformer.go

@@ -120,6 +120,7 @@ func PurchaseOrderModelResponseToResponse(po *models.PurchaseOrderResponse) *con
 	response := &contract.PurchaseOrderResponse{
 		ID:              po.ID,
 		OrganizationID:  po.OrganizationID,
+		OutletID:        po.OutletID,
 		VendorID:        po.VendorID,
 		PONumber:        po.PONumber,
 		TransactionDate: po.TransactionDate,

internal/transformer/purchase_order_transformer_test.go

@@ -12,15 +12,20 @@ import (
 )
 
 func TestCreatePurchaseOrderRequestToModelAllowsMissingDueDate(t *testing.T) {
+	vendorID := uuid.New()
+	ingredientID := uuid.New()
+	quantity := 1.0
+	unitID := uuid.New()
+
 	result, err := CreatePurchaseOrderRequestToModel(&contract.CreatePurchaseOrderRequest{
-		VendorID:        uuid.New(),
+		VendorID:        &vendorID,
 		PONumber:        "PO-001",
 		TransactionDate: "2026-05-29",
 		Items: []contract.CreatePurchaseOrderItemRequest{
 			{
-				IngredientID: uuid.New(),
+				IngredientID: &ingredientID,
-				Quantity:     1,
+				Quantity:     &quantity,
-				UnitID:       uuid.New(),
+				UnitID:       &unitID,
 				Amount:       1000,
 			},
 		},
@@ -31,9 +36,10 @@ func TestCreatePurchaseOrderRequestToModelAllowsMissingDueDate(t *testing.T) {
 }
 
 func TestPurchaseOrderModelResponseToResponseIncludesNullDueDate(t *testing.T) {
+	vendorID := uuid.New()
 	result := PurchaseOrderModelResponseToResponse(&models.PurchaseOrderResponse{
 		ID:       uuid.New(),
-		VendorID: uuid.New(),
+		VendorID: &vendorID,
 		PONumber: "PO-001",
 	})
 
@@ -41,3 +47,19 @@ func TestPurchaseOrderModelResponseToResponseIncludesNullDueDate(t *testing.T) {
 	require.NoError(t, err)
 	require.Contains(t, string(payload), `"due_date":null`)
 }
+
+func TestCreatePurchaseOrderRequestToModelAllowsMissingVendor(t *testing.T) {
+	result, err := CreatePurchaseOrderRequestToModel(&contract.CreatePurchaseOrderRequest{
+		PONumber:        "PO-001",
+		TransactionDate: "2026-05-29",
+		Items: []contract.CreatePurchaseOrderItemRequest{
+			{
+				PurchaseCategoryID: uuid.New(),
+				Amount:             1000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, result.VendorID)
+}

internal/validator/purchase_order_validator.go

@@ -29,8 +29,8 @@ func (v *PurchaseOrderValidatorImpl) ValidateCreatePurchaseOrderRequest(req *con
 		return errors.New("request body is required"), constants.MissingFieldErrorCode
 	}
 
-	if req.VendorID == uuid.Nil {
+	if req.VendorID != nil && *req.VendorID == uuid.Nil {
-		return errors.New("vendor_id is required"), constants.MissingFieldErrorCode
+		return errors.New("vendor_id cannot be empty"), constants.MalformedFieldErrorCode
 	}
 
 	if strings.TrimSpace(req.PONumber) == "" {
@@ -181,20 +181,20 @@ func (v *PurchaseOrderValidatorImpl) ValidateListPurchaseOrdersRequest(req *cont
 }
 
 func (v *PurchaseOrderValidatorImpl) validatePurchaseOrderItem(item *contract.CreatePurchaseOrderItemRequest, index int) (error, string) {
-	if item.IngredientID == uuid.Nil {
-		return errors.New("items[" + strconv.Itoa(index) + "].ingredient_id is required"), constants.MissingFieldErrorCode
-	}
-
 	if item.PurchaseCategoryID == uuid.Nil {
 		return errors.New("items[" + strconv.Itoa(index) + "].purchase_category_id is required"), constants.MissingFieldErrorCode
 	}
 
-	if item.Quantity <= 0 {
+	if item.IngredientID != nil && *item.IngredientID == uuid.Nil {
+		return errors.New("items[" + strconv.Itoa(index) + "].ingredient_id cannot be empty"), constants.MalformedFieldErrorCode
+	}
+
+	if item.Quantity != nil && *item.Quantity <= 0 {
 		return errors.New("items[" + strconv.Itoa(index) + "].quantity must be greater than 0"), constants.MalformedFieldErrorCode
 	}
 
-	if item.UnitID == uuid.Nil {
+	if item.UnitID != nil && *item.UnitID == uuid.Nil {
-		return errors.New("items[" + strconv.Itoa(index) + "].unit_id is required"), constants.MissingFieldErrorCode
+		return errors.New("items[" + strconv.Itoa(index) + "].unit_id cannot be empty"), constants.MalformedFieldErrorCode
 	}
 
 	if item.Amount < 0 {
@@ -209,15 +209,15 @@ func (v *PurchaseOrderValidatorImpl) validateUpdatePurchaseOrderItem(item *contr
 		return errors.New("items[" + strconv.Itoa(index) + "].purchase_category_id is required"), constants.MissingFieldErrorCode
 	}
 
-	if item.IngredientID == nil || *item.IngredientID == uuid.Nil {
+	if item.IngredientID != nil && *item.IngredientID == uuid.Nil {
-		return errors.New("items[" + strconv.Itoa(index) + "].ingredient_id is required"), constants.MissingFieldErrorCode
+		return errors.New("items[" + strconv.Itoa(index) + "].ingredient_id cannot be empty"), constants.MalformedFieldErrorCode
 	}
 
-	if item.UnitID == nil || *item.UnitID == uuid.Nil {
+	if item.UnitID != nil && *item.UnitID == uuid.Nil {
-		return errors.New("items[" + strconv.Itoa(index) + "].unit_id is required"), constants.MissingFieldErrorCode
+		return errors.New("items[" + strconv.Itoa(index) + "].unit_id cannot be empty"), constants.MalformedFieldErrorCode
 	}
 
-	if item.Quantity == nil || *item.Quantity <= 0 {
+	if item.Quantity != nil && *item.Quantity <= 0 {
 		return errors.New("items[" + strconv.Itoa(index) + "].quantity must be greater than 0"), constants.MalformedFieldErrorCode
 	}
 

internal/validator/purchase_order_validator_test.go

@@ -11,32 +11,49 @@ import (
 )
 
 func validCreatePurchaseOrderRequest() *contract.CreatePurchaseOrderRequest {
+	vendorID := uuid.New()
+	ingredientID := uuid.New()
+	quantity := 1.0
+	unitID := uuid.New()
+
 	return &contract.CreatePurchaseOrderRequest{
-		VendorID:        uuid.New(),
+		VendorID:        &vendorID,
 		PONumber:        "PO-001",
 		TransactionDate: "2026-05-29",
 		Items: []contract.CreatePurchaseOrderItemRequest{
 			{
-				IngredientID:       uuid.New(),
+				IngredientID:       &ingredientID,
 				PurchaseCategoryID: uuid.New(),
-				Quantity:           1,
+				Quantity:           &quantity,
-				UnitID:             uuid.New(),
+				UnitID:             &unitID,
 				Amount:             1000,
 			},
 		},
 	}
 }
 
-func TestPurchaseOrderValidatorCreateRejectsMissingRawMaterialFields(t *testing.T) {
+func TestPurchaseOrderValidatorCreateAllowsMissingVendor(t *testing.T) {
 	validator := NewPurchaseOrderValidator()
 	req := validCreatePurchaseOrderRequest()
-	req.Items[0].IngredientID = uuid.Nil
+	req.VendorID = nil
+
+	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
+
+	require.NoError(t, err)
+	require.Empty(t, code)
+}
+
+func TestPurchaseOrderValidatorCreateRejectsEmptyVendor(t *testing.T) {
+	validator := NewPurchaseOrderValidator()
+	req := validCreatePurchaseOrderRequest()
+	vendorID := uuid.Nil
+	req.VendorID = &vendorID
 
 	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
 
 	require.Error(t, err)
-	require.Equal(t, constants.MissingFieldErrorCode, code)
+	require.Equal(t, constants.MalformedFieldErrorCode, code)
-	require.Contains(t, err.Error(), "ingredient_id is required")
+	require.Contains(t, err.Error(), "vendor_id cannot be empty")
 }
 
 func TestPurchaseOrderValidatorCreateAllowsMissingDueDate(t *testing.T) {
@@ -73,31 +90,3 @@ func TestPurchaseOrderValidatorCreateRejectsDueDateBeforeTransactionDate(t *test
 	require.Equal(t, constants.MalformedFieldErrorCode, code)
 	require.Contains(t, err.Error(), "due_date must be after transaction_date")
 }
-
-func TestPurchaseOrderValidatorUpdateItemsRequireFullReplacementFields(t *testing.T) {
-	validator := NewPurchaseOrderValidator()
-	req := &contract.UpdatePurchaseOrderRequest{
-		Items: []contract.UpdatePurchaseOrderItemRequest{
-			{
-				PurchaseCategoryID: ptrUUID(uuid.New()),
-				Quantity:           ptrFloat64(1),
-				UnitID:             ptrUUID(uuid.New()),
-				Amount:             ptrFloat64(1000),
-			},
-		},
-	}
-
-	err, code := validator.ValidateUpdatePurchaseOrderRequest(req)
-
-	require.Error(t, err)
-	require.Equal(t, constants.MissingFieldErrorCode, code)
-	require.Contains(t, err.Error(), "ingredient_id is required")
-}
-
-func ptrUUID(id uuid.UUID) *uuid.UUID {
-	return &id
-}
-
-func ptrFloat64(value float64) *float64 {
-	return &value
-}

migrations/000081_enforce_raw_material_purchase_order_items.down.sql

@@ -1,8 +0,0 @@
-DROP TRIGGER IF EXISTS trigger_validate_purchase_order_item_raw_material ON purchase_order_items;
-DROP FUNCTION IF EXISTS validate_purchase_order_item_raw_material();
-
-ALTER TABLE purchase_order_items
-    ALTER COLUMN purchase_category_id DROP NOT NULL,
-    ALTER COLUMN ingredient_id DROP NOT NULL,
-    ALTER COLUMN quantity DROP NOT NULL,
-    ALTER COLUMN unit_id DROP NOT NULL;

migrations/000081_enforce_raw_material_purchase_order_items.up.sql

@@ -1,53 +0,0 @@
-UPDATE purchase_order_items poi
-SET purchase_category_id = pc.id
-FROM purchase_orders po
-JOIN purchase_categories pc ON pc.organization_id = po.organization_id
-    AND pc.code = 'bahan_baku'
-    AND pc.type = 'raw_material'
-WHERE poi.purchase_order_id = po.id
-  AND poi.purchase_category_id IS NULL;
-
-DO $$
-BEGIN
-    IF EXISTS (
-        SELECT 1
-        FROM purchase_order_items poi
-        LEFT JOIN purchase_categories pc ON pc.id = poi.purchase_category_id
-        WHERE poi.purchase_category_id IS NULL
-           OR pc.id IS NULL
-           OR pc.type <> 'raw_material'
-           OR poi.ingredient_id IS NULL
-           OR poi.quantity IS NULL
-           OR poi.unit_id IS NULL
-    ) THEN
-        RAISE EXCEPTION 'purchase_order_items contains non-raw-material or incomplete raw-material rows. Move expense rows to expenses and fill ingredient_id, quantity, and unit_id before running this migration.';
-    END IF;
-END $$;
-
-ALTER TABLE purchase_order_items
-    ALTER COLUMN purchase_category_id SET NOT NULL,
-    ALTER COLUMN ingredient_id SET NOT NULL,
-    ALTER COLUMN quantity SET NOT NULL,
-    ALTER COLUMN unit_id SET NOT NULL;
-
-CREATE OR REPLACE FUNCTION validate_purchase_order_item_raw_material()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1
-        FROM purchase_categories pc
-        WHERE pc.id = NEW.purchase_category_id
-          AND pc.type = 'raw_material'
-    ) THEN
-        RAISE EXCEPTION 'purchase_order_items.purchase_category_id must reference a raw_material purchase category';
-    END IF;
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-DROP TRIGGER IF EXISTS trigger_validate_purchase_order_item_raw_material ON purchase_order_items;
-CREATE TRIGGER trigger_validate_purchase_order_item_raw_material
-    BEFORE INSERT OR UPDATE OF purchase_category_id ON purchase_order_items
-    FOR EACH ROW
-    EXECUTE FUNCTION validate_purchase_order_item_raw_material();

migrations/000081_make_purchase_order_vendor_nullable.down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE purchase_orders
+    ALTER COLUMN vendor_id SET NOT NULL;

migrations/000081_make_purchase_order_vendor_nullable.up.sql

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

migrations/000082_add_outlet_id_to_purchase_orders.down.sql

@@ -0,0 +1,4 @@
+DROP INDEX IF EXISTS idx_purchase_orders_outlet_id;
+
+ALTER TABLE purchase_orders
+DROP COLUMN IF EXISTS outlet_id;

migrations/000082_add_outlet_id_to_purchase_orders.up.sql

@@ -0,0 +1,66 @@
+ALTER TABLE purchase_orders
+ADD COLUMN IF NOT EXISTS outlet_id UUID REFERENCES outlets(id) ON DELETE SET NULL;
+
+CREATE INDEX IF NOT EXISTS idx_purchase_orders_outlet_id
+ON purchase_orders(outlet_id);
+
+WITH movement_outlets AS (
+    SELECT
+        poi.purchase_order_id,
+        MIN(im.outlet_id) AS outlet_id
+    FROM inventory_movements im
+    JOIN purchase_order_items poi ON im.purchase_order_item_id = poi.id
+    WHERE im.outlet_id IS NOT NULL
+      AND im.purchase_order_item_id IS NOT NULL
+    GROUP BY poi.purchase_order_id
+    HAVING COUNT(DISTINCT im.outlet_id) = 1
+)
+UPDATE purchase_orders po
+SET outlet_id = movement_outlets.outlet_id
+FROM movement_outlets
+WHERE po.id = movement_outlets.purchase_order_id
+  AND po.outlet_id IS NULL;
+
+WITH candidate_item_outlets AS (
+    SELECT
+        poi.purchase_order_id,
+        i.outlet_id
+    FROM purchase_order_items poi
+    JOIN ingredients i ON poi.ingredient_id = i.id
+    WHERE i.outlet_id IS NOT NULL
+
+    UNION ALL
+
+    SELECT
+        poi.purchase_order_id,
+        u.outlet_id
+    FROM purchase_order_items poi
+    JOIN units u ON poi.unit_id = u.id
+    WHERE u.outlet_id IS NOT NULL
+), item_outlets AS (
+    SELECT
+        purchase_order_id,
+        MIN(outlet_id) AS outlet_id
+    FROM candidate_item_outlets
+    GROUP BY purchase_order_id
+    HAVING COUNT(DISTINCT outlet_id) = 1
+)
+UPDATE purchase_orders po
+SET outlet_id = item_outlets.outlet_id
+FROM item_outlets
+WHERE po.id = item_outlets.purchase_order_id
+  AND po.outlet_id IS NULL;
+
+WITH single_outlet_organizations AS (
+    SELECT
+        organization_id,
+        MIN(id) AS outlet_id
+    FROM outlets
+    GROUP BY organization_id
+    HAVING COUNT(*) = 1
+)
+UPDATE purchase_orders po
+SET outlet_id = single_outlet_organizations.outlet_id
+FROM single_outlet_organizations
+WHERE po.organization_id = single_outlet_organizations.organization_id
+  AND po.outlet_id IS NULL;

migrations/000082_enforce_expense_items_expense_categories.down.sql

@@ -1,5 +0,0 @@
-DROP TRIGGER IF EXISTS trigger_validate_expense_item_expense_category ON expense_items;
-DROP FUNCTION IF EXISTS validate_expense_item_expense_category();
-
-ALTER TABLE expense_items
-    ALTER COLUMN purchase_category_id DROP NOT NULL;

migrations/000082_enforce_expense_items_expense_categories.up.sql

@@ -1,55 +0,0 @@
-UPDATE expense_items ei
-SET purchase_category_id = pc.id
-FROM expenses e
-JOIN purchase_categories pc ON pc.organization_id = e.organization_id
-    AND pc.code = 'biaya_lain_lain'
-    AND pc.type = 'expense'
-WHERE ei.expense_id = e.id
-  AND (
-      ei.purchase_category_id IS NULL
-      OR NOT EXISTS (
-          SELECT 1
-          FROM purchase_categories current_pc
-          WHERE current_pc.id = ei.purchase_category_id
-            AND current_pc.type = 'expense'
-      )
-  );
-
-DO $$
-BEGIN
-    IF EXISTS (
-        SELECT 1
-        FROM expense_items ei
-        LEFT JOIN purchase_categories pc ON pc.id = ei.purchase_category_id
-        WHERE ei.purchase_category_id IS NULL
-           OR pc.id IS NULL
-           OR pc.type <> 'expense'
-    ) THEN
-        RAISE EXCEPTION 'expense_items contains missing or non-expense purchase categories. Assign valid expense categories before running this migration.';
-    END IF;
-END $$;
-
-ALTER TABLE expense_items
-    ALTER COLUMN purchase_category_id SET NOT NULL;
-
-CREATE OR REPLACE FUNCTION validate_expense_item_expense_category()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF NOT EXISTS (
-        SELECT 1
-        FROM purchase_categories pc
-        WHERE pc.id = NEW.purchase_category_id
-          AND pc.type = 'expense'
-    ) THEN
-        RAISE EXCEPTION 'expense_items.purchase_category_id must reference an expense purchase category';
-    END IF;
-
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-DROP TRIGGER IF EXISTS trigger_validate_expense_item_expense_category ON expense_items;
-CREATE TRIGGER trigger_validate_expense_item_expense_category
-    BEFORE INSERT OR UPDATE OF purchase_category_id ON expense_items
-    FOR EACH ROW
-    EXECUTE FUNCTION validate_expense_item_expense_category();