Fix bank

internal/contract/analytics_contract.go

@@ -106,7 +106,11 @@ type PurchasingAnalyticsResponse struct {
 
 type PurchasingSummary struct {
 	TotalPurchases            float64 `json:"total_purchases"`
+	RawMaterialPurchases      float64 `json:"raw_material_purchases"`
+	ExpensePurchases          float64 `json:"expense_purchases"`
 	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
+	RawMaterialPurchaseOrders int64   `json:"raw_material_purchase_orders"`
+	ExpenseCount              int64   `json:"expense_count"`
 	TotalQuantity             float64 `json:"total_quantity"`
 	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
 	TotalIngredients          int64   `json:"total_ingredients"`
@@ -114,12 +118,16 @@ type PurchasingSummary struct {
 }
 
 type PurchasingAnalyticsData struct {
-	Date           time.Time `json:"date"`
+	Date                      time.Time `json:"date"`
-	Purchases      float64   `json:"purchases"`
+	Purchases                 float64   `json:"purchases"`
-	PurchaseOrders int64     `json:"purchase_orders"`
+	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	Quantity       float64   `json:"quantity"`
+	ExpensePurchases          float64   `json:"expense_purchases"`
-	Ingredients    int64     `json:"ingredients"`
+	PurchaseOrders            int64     `json:"purchase_orders"`
-	Vendors        int64     `json:"vendors"`
+	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
+	ExpenseCount              int64     `json:"expense_count"`
+	Quantity                  float64   `json:"quantity"`
+	Ingredients               int64     `json:"ingredients"`
+	Vendors                   int64     `json:"vendors"`
 }
 
 type PurchasingIngredientData struct {
@@ -316,3 +324,114 @@ type OperationalExpenseItem struct {
 	Item    string  `json:"item"`
 	Nominal float64 `json:"nominal"`
 }
+
+type ExclusiveSummaryPeriodRequest struct {
+	OrganizationID                uuid.UUID
+	OutletID                      *string `form:"outlet_id,omitempty"`
+	DateFrom                      string  `form:"date_from" validate:"required"`
+	DateTo                        string  `form:"date_to" validate:"required"`
+	ExcludeGajiStaffFromReimburse bool    `form:"exclude_gaji_staff_from_reimburse"`
+}
+
+type ExclusiveSummaryMonthlyRequest struct {
+	OrganizationID uuid.UUID
+	OutletID       *string `form:"outlet_id,omitempty"`
+	Month          string  `form:"month" validate:"required"`
+}
+
+type ExclusiveSummaryPeriodResponse struct {
+	OrganizationID              uuid.UUID                           `json:"organization_id"`
+	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`
+	Period                      ExclusiveSummaryPeriodRange         `json:"period"`
+	Summary                     ExclusiveSummaryPeriodSummary       `json:"summary"`
+	Reimburse                   ExclusiveSummaryReimburse           `json:"reimburse"`
+	HPPBreakdown                []ExclusiveSummaryCategoryBreakdown `json:"hpp_breakdown"`
+	OperationalExpenseBreakdown []ExclusiveSummaryCategoryBreakdown `json:"operational_expense_breakdown"`
+	DailySummary                []ExclusiveSummaryDailySummary      `json:"daily_summary"`
+	DailyTransactions           []ExclusiveSummaryDailyTransaction  `json:"daily_transactions"`
+}
+
+type ExclusiveSummaryPeriodRange struct {
+	DateFrom time.Time `json:"date_from"`
+	DateTo   time.Time `json:"date_to"`
+}
+
+type ExclusiveSummaryPeriodSummary struct {
+	Sales                    float64 `json:"sales"`
+	HPP                      float64 `json:"hpp"`
+	GrossProfit              float64 `json:"gross_profit"`
+	SalaryTotal              float64 `json:"salary_total"`
+	SalaryDW                 float64 `json:"salary_dw"`
+	SalaryStaff              float64 `json:"salary_staff"`
+	SalaryOther              float64 `json:"salary_other"`
+	OtherOperationalExpenses float64 `json:"other_operational_expenses"`
+	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
+	TotalCost                float64 `json:"total_cost"`
+	NetProfit                float64 `json:"net_profit"`
+}
+
+type ExclusiveSummaryReimburse struct {
+	TotalCost           float64 `json:"total_cost"`
+	ExcludedSalaryStaff float64 `json:"excluded_salary_staff"`
+	TotalReimburse      float64 `json:"total_reimburse"`
+}
+
+type ExclusiveSummaryCategoryBreakdown struct {
+	CategoryCode string  `json:"category_code"`
+	CategoryName string  `json:"category_name"`
+	Amount       float64 `json:"amount"`
+	Percentage   float64 `json:"percentage"`
+}
+
+type ExclusiveSummaryDailySummary struct {
+	Date             time.Time `json:"date"`
+	TransactionCount int64     `json:"transaction_count"`
+	TotalCost        float64   `json:"total_cost"`
+}
+
+type ExclusiveSummaryDailyTransaction struct {
+	Date         time.Time `json:"date"`
+	CategoryCode string    `json:"category_code"`
+	CategoryName string    `json:"category_name"`
+	Description  string    `json:"description"`
+	Amount       float64   `json:"amount"`
+	Source       string    `json:"source"`
+}
+
+type ExclusiveSummaryMonthlyResponse struct {
+	OrganizationID uuid.UUID                       `json:"organization_id"`
+	OutletID       *uuid.UUID                      `json:"outlet_id,omitempty"`
+	Month          string                          `json:"month"`
+	Summary        ExclusiveSummaryMonthlySummary  `json:"summary"`
+	Periods        []ExclusiveSummaryMonthlyPeriod `json:"periods"`
+	BankBalance    []ExclusiveSummaryBankBalance   `json:"bank_balance"`
+}
+
+type ExclusiveSummaryMonthlySummary struct {
+	TotalSales               float64 `json:"total_sales"`
+	HPP                      float64 `json:"hpp"`
+	GrossProfit              float64 `json:"gross_profit"`
+	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
+	TotalCost                float64 `json:"total_cost"`
+	NetProfit                float64 `json:"net_profit"`
+	NetProfitMargin          float64 `json:"net_profit_margin"`
+}
+
+type ExclusiveSummaryMonthlyPeriod struct {
+	Label       string    `json:"label"`
+	DateFrom    time.Time `json:"date_from"`
+	DateTo      time.Time `json:"date_to"`
+	Sales       float64   `json:"sales"`
+	HPP         float64   `json:"hpp"`
+	GrossProfit float64   `json:"gross_profit"`
+	GrossMargin float64   `json:"gross_margin"`
+}
+
+type ExclusiveSummaryBankBalance struct {
+	Bank             string   `json:"bank"`
+	OpeningBalance   *float64 `json:"opening_balance"`
+	IncomingMutation *float64 `json:"incoming_mutation"`
+	OutgoingMutation *float64 `json:"outgoing_mutation"`
+	ClosingBalance   *float64 `json:"closing_balance"`
+	Notes            *string  `json:"notes"`
+}

internal/contract/purchase_category_contract.go

@@ -10,7 +10,7 @@ type CreatePurchaseCategoryRequest struct {
 	ParentID  *uuid.UUID `json:"parent_id,omitempty"`
 	Code      *string    `json:"code,omitempty"`
 	Name      string     `json:"name" validate:"required,min=1,max=255"`
-	Type      string     `json:"type" validate:"required,oneof=raw_material non_inventory"`
+	Type      string     `json:"type" validate:"required,oneof=raw_material expense"`
 	SortOrder *int       `json:"sort_order,omitempty"`
 	IsActive  *bool      `json:"is_active,omitempty"`
 }
@@ -19,14 +19,14 @@ type UpdatePurchaseCategoryRequest struct {
 	ParentID  *uuid.UUID `json:"parent_id,omitempty"`
 	Code      *string    `json:"code,omitempty"`
 	Name      *string    `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
-	Type      *string    `json:"type,omitempty" validate:"omitempty,oneof=raw_material non_inventory"`
+	Type      *string    `json:"type,omitempty" validate:"omitempty,oneof=raw_material expense"`
 	SortOrder *int       `json:"sort_order,omitempty"`
 	IsActive  *bool      `json:"is_active,omitempty"`
 }
 
 type ListPurchaseCategoriesRequest struct {
 	ParentID *uuid.UUID `json:"parent_id,omitempty"`
-	Type     string     `json:"type,omitempty" validate:"omitempty,oneof=raw_material non_inventory"`
+	Type     string     `json:"type,omitempty" validate:"omitempty,oneof=raw_material expense"`
 	Search   string     `json:"search,omitempty"`
 	IsActive *bool      `json:"is_active,omitempty"`
 	Page     int        `json:"page" validate:"required,min=1"`

internal/contract/purchase_order_contract.go

@@ -19,12 +19,12 @@ 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"`
+	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id" validate:"required"`
-	Description        *string   `json:"description,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" validate:"required,gte=0"`
+	Amount             float64    `json:"amount" validate:"required,gte=0"`
 }
 
 type UpdatePurchaseOrderRequest struct {
@@ -70,11 +70,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

@@ -38,7 +38,11 @@ type PurchasingAnalytics struct {
 
 type PurchasingSummary struct {
 	TotalPurchases            float64 `json:"total_purchases"`
+	RawMaterialPurchases      float64 `json:"raw_material_purchases"`
+	ExpensePurchases          float64 `json:"expense_purchases"`
 	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
+	RawMaterialPurchaseOrders int64   `json:"raw_material_purchase_orders"`
+	ExpenseCount              int64   `json:"expense_count"`
 	TotalQuantity             float64 `json:"total_quantity"`
 	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
 	TotalIngredients          int64   `json:"total_ingredients"`
@@ -46,12 +50,16 @@ type PurchasingSummary struct {
 }
 
 type PurchasingAnalyticsData struct {
-	Date           time.Time `json:"date"`
+	Date                      time.Time `json:"date"`
-	Purchases      float64   `json:"purchases"`
+	Purchases                 float64   `json:"purchases"`
-	PurchaseOrders int64     `json:"purchase_orders"`
+	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	Quantity       float64   `json:"quantity"`
+	ExpensePurchases          float64   `json:"expense_purchases"`
-	Ingredients    int64     `json:"ingredients"`
+	PurchaseOrders            int64     `json:"purchase_orders"`
-	Vendors        int64     `json:"vendors"`
+	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
+	ExpenseCount              int64     `json:"expense_count"`
+	Quantity                  float64   `json:"quantity"`
+	Ingredients               int64     `json:"ingredients"`
+	Vendors                   int64     `json:"vendors"`
 }
 
 type PurchasingIngredientData struct {
@@ -178,3 +186,42 @@ type OperationalExpenseItem struct {
 	Item   string
 	Amount float64
 }
+
+type ExclusiveSummaryAnalytics struct {
+	SalesTotal                  float64
+	SalesCount                  int64
+	HPPBreakdown                []ExclusiveSummaryCategoryTotal
+	OperationalExpenseBreakdown []ExclusiveSummaryCategoryTotal
+	DailySummary                []ExclusiveSummaryDailySummary
+	DailyTransactions           []ExclusiveSummaryDailyTransaction
+}
+
+type ExclusiveSummaryCategoryTotal struct {
+	CategoryCode string
+	CategoryName string
+	Amount       float64
+}
+
+type ExclusiveSummaryDailySummary struct {
+	Date             time.Time
+	TransactionCount int64
+	TotalCost        float64
+}
+
+type ExclusiveSummaryDailyTransaction struct {
+	Date         time.Time
+	CategoryCode string
+	CategoryName string
+	Description  string
+	Amount       float64
+	Source       string
+}
+
+type ExclusiveSummaryBankBalance struct {
+	Bank             string
+	OpeningBalance   *float64
+	IncomingMutation *float64
+	OutgoingMutation *float64
+	ClosingBalance   *float64
+	Notes            *string
+}

internal/entities/purchase_category.go

@@ -10,8 +10,8 @@ import (
 type PurchaseCategoryType string
 
 const (
-	PurchaseCategoryTypeRawMaterial  PurchaseCategoryType = "raw_material"
+	PurchaseCategoryTypeRawMaterial PurchaseCategoryType = "raw_material"
-	PurchaseCategoryTypeNonInventory PurchaseCategoryType = "non_inventory"
+	PurchaseCategoryTypeExpense     PurchaseCategoryType = "expense"
 )
 
 type PurchaseCategoryPreset struct {

internal/entities/purchase_order.go

@@ -41,16 +41,16 @@ func (PurchaseOrder) TableName() string {
 }
 
 type PurchaseOrderItem struct {
-	ID                 uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ID                 uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	PurchaseOrderID    uuid.UUID `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
+	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"`
+	PurchaseCategoryID uuid.UUID  `gorm:"type:uuid;not null;index" json:"purchase_category_id" validate:"required"`
-	Description        *string   `gorm:"type:text" json:"description" validate:"omitempty"`
+	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"`
+	Amount             float64    `gorm:"type:decimal(15,2);not null" json:"amount" validate:"required,gte=0"`
-	CreatedAt          time.Time `gorm:"autoCreateTime" json:"created_at"`
+	CreatedAt          time.Time  `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt          time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	UpdatedAt          time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	PurchaseOrder    *PurchaseOrder    `gorm:"foreignKey:PurchaseOrderID" json:"purchase_order,omitempty"`
 	Ingredient       *Ingredient       `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`

internal/handler/analytics_handler.go

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

internal/models/analytics.go

@@ -113,7 +113,11 @@ type PurchasingAnalyticsResponse struct {
 // PurchasingSummary represents the summary of purchasing analytics
 type PurchasingSummary struct {
 	TotalPurchases            float64 `json:"total_purchases"`
+	RawMaterialPurchases      float64 `json:"raw_material_purchases"`
+	ExpensePurchases          float64 `json:"expense_purchases"`
 	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
+	RawMaterialPurchaseOrders int64   `json:"raw_material_purchase_orders"`
+	ExpenseCount              int64   `json:"expense_count"`
 	TotalQuantity             float64 `json:"total_quantity"`
 	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
 	TotalIngredients          int64   `json:"total_ingredients"`
@@ -122,12 +126,16 @@ type PurchasingSummary struct {
 
 // PurchasingAnalyticsData represents purchasing analytics by time period
 type PurchasingAnalyticsData struct {
-	Date           time.Time `json:"date"`
+	Date                      time.Time `json:"date"`
-	Purchases      float64   `json:"purchases"`
+	Purchases                 float64   `json:"purchases"`
-	PurchaseOrders int64     `json:"purchase_orders"`
+	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	Quantity       float64   `json:"quantity"`
+	ExpensePurchases          float64   `json:"expense_purchases"`
-	Ingredients    int64     `json:"ingredients"`
+	PurchaseOrders            int64     `json:"purchase_orders"`
-	Vendors        int64     `json:"vendors"`
+	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
+	ExpenseCount              int64     `json:"expense_count"`
+	Quantity                  float64   `json:"quantity"`
+	Ingredients               int64     `json:"ingredients"`
+	Vendors                   int64     `json:"vendors"`
 }
 
 // PurchasingIngredientData represents purchasing analytics for an ingredient
@@ -326,3 +334,114 @@ type OperationalExpenseItem struct {
 	Item    string  `json:"item"`
 	Nominal float64 `json:"nominal"`
 }
+
+type ExclusiveSummaryPeriodRequest struct {
+	OrganizationID                uuid.UUID  `validate:"required"`
+	OutletID                      *uuid.UUID `validate:"omitempty"`
+	DateFrom                      time.Time  `validate:"required"`
+	DateTo                        time.Time  `validate:"required"`
+	ExcludeGajiStaffFromReimburse bool       `validate:"omitempty"`
+}
+
+type ExclusiveSummaryMonthlyRequest struct {
+	OrganizationID uuid.UUID  `validate:"required"`
+	OutletID       *uuid.UUID `validate:"omitempty"`
+	Month          time.Time  `validate:"required"`
+}
+
+type ExclusiveSummaryPeriodResponse struct {
+	OrganizationID              uuid.UUID                           `json:"organization_id"`
+	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`
+	Period                      ExclusiveSummaryPeriodRange         `json:"period"`
+	Summary                     ExclusiveSummaryPeriodSummary       `json:"summary"`
+	Reimburse                   ExclusiveSummaryReimburse           `json:"reimburse"`
+	HPPBreakdown                []ExclusiveSummaryCategoryBreakdown `json:"hpp_breakdown"`
+	OperationalExpenseBreakdown []ExclusiveSummaryCategoryBreakdown `json:"operational_expense_breakdown"`
+	DailySummary                []ExclusiveSummaryDailySummary      `json:"daily_summary"`
+	DailyTransactions           []ExclusiveSummaryDailyTransaction  `json:"daily_transactions"`
+}
+
+type ExclusiveSummaryPeriodRange struct {
+	DateFrom time.Time `json:"date_from"`
+	DateTo   time.Time `json:"date_to"`
+}
+
+type ExclusiveSummaryPeriodSummary struct {
+	Sales                    float64 `json:"sales"`
+	HPP                      float64 `json:"hpp"`
+	GrossProfit              float64 `json:"gross_profit"`
+	SalaryTotal              float64 `json:"salary_total"`
+	SalaryDW                 float64 `json:"salary_dw"`
+	SalaryStaff              float64 `json:"salary_staff"`
+	SalaryOther              float64 `json:"salary_other"`
+	OtherOperationalExpenses float64 `json:"other_operational_expenses"`
+	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
+	TotalCost                float64 `json:"total_cost"`
+	NetProfit                float64 `json:"net_profit"`
+}
+
+type ExclusiveSummaryReimburse struct {
+	TotalCost           float64 `json:"total_cost"`
+	ExcludedSalaryStaff float64 `json:"excluded_salary_staff"`
+	TotalReimburse      float64 `json:"total_reimburse"`
+}
+
+type ExclusiveSummaryCategoryBreakdown struct {
+	CategoryCode string  `json:"category_code"`
+	CategoryName string  `json:"category_name"`
+	Amount       float64 `json:"amount"`
+	Percentage   float64 `json:"percentage"`
+}
+
+type ExclusiveSummaryDailySummary struct {
+	Date             time.Time `json:"date"`
+	TransactionCount int64     `json:"transaction_count"`
+	TotalCost        float64   `json:"total_cost"`
+}
+
+type ExclusiveSummaryDailyTransaction struct {
+	Date         time.Time `json:"date"`
+	CategoryCode string    `json:"category_code"`
+	CategoryName string    `json:"category_name"`
+	Description  string    `json:"description"`
+	Amount       float64   `json:"amount"`
+	Source       string    `json:"source"`
+}
+
+type ExclusiveSummaryMonthlyResponse struct {
+	OrganizationID uuid.UUID                       `json:"organization_id"`
+	OutletID       *uuid.UUID                      `json:"outlet_id,omitempty"`
+	Month          string                          `json:"month"`
+	Summary        ExclusiveSummaryMonthlySummary  `json:"summary"`
+	Periods        []ExclusiveSummaryMonthlyPeriod `json:"periods"`
+	BankBalance    []ExclusiveSummaryBankBalance   `json:"bank_balance"`
+}
+
+type ExclusiveSummaryMonthlySummary struct {
+	TotalSales               float64 `json:"total_sales"`
+	HPP                      float64 `json:"hpp"`
+	GrossProfit              float64 `json:"gross_profit"`
+	OperationalExpensesTotal float64 `json:"operational_expenses_total"`
+	TotalCost                float64 `json:"total_cost"`
+	NetProfit                float64 `json:"net_profit"`
+	NetProfitMargin          float64 `json:"net_profit_margin"`
+}
+
+type ExclusiveSummaryMonthlyPeriod struct {
+	Label       string    `json:"label"`
+	DateFrom    time.Time `json:"date_from"`
+	DateTo      time.Time `json:"date_to"`
+	Sales       float64   `json:"sales"`
+	HPP         float64   `json:"hpp"`
+	GrossProfit float64   `json:"gross_profit"`
+	GrossMargin float64   `json:"gross_margin"`
+}
+
+type ExclusiveSummaryBankBalance struct {
+	Bank             string   `json:"bank"`
+	OpeningBalance   *float64 `json:"opening_balance"`
+	IncomingMutation *float64 `json:"incoming_mutation"`
+	OutgoingMutation *float64 `json:"outgoing_mutation"`
+	ClosingBalance   *float64 `json:"closing_balance"`
+	Notes            *string  `json:"notes"`
+}

internal/models/purchase_order.go

@@ -22,16 +22,16 @@ type PurchaseOrder struct {
 }
 
 type PurchaseOrderItem struct {
-	ID                 uuid.UUID `json:"id"`
+	ID                 uuid.UUID  `json:"id"`
-	PurchaseOrderID    uuid.UUID `json:"purchase_order_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"`
+	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
-	Description        *string   `json:"description"`
+	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"`
+	Amount             float64    `json:"amount"`
-	CreatedAt          time.Time `json:"created_at"`
+	CreatedAt          time.Time  `json:"created_at"`
-	UpdatedAt          time.Time `json:"updated_at"`
+	UpdatedAt          time.Time  `json:"updated_at"`
 }
 
 type PurchaseOrderAttachment struct {
@@ -62,11 +62,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"`
@@ -96,12 +96,12 @@ 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"`
+	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
-	Description        *string   `json:"description,omitempty"`
+	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"`
+	Amount             float64    `json:"amount"`
 }
 
 type UpdatePurchaseOrderRequest struct {

internal/processor/analytics_processor.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 	"time"
 
+	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
 )
@@ -18,6 +19,8 @@ type AnalyticsProcessor interface {
 	GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
 	GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
 	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)
 }
 
 type AnalyticsProcessorImpl struct {
@@ -185,12 +188,16 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 	data := make([]models.PurchasingAnalyticsData, len(result.Data))
 	for i, item := range result.Data {
 		data[i] = models.PurchasingAnalyticsData{
-			Date:           item.Date,
+			Date:                      item.Date,
-			Purchases:      item.Purchases,
+			Purchases:                 item.Purchases,
-			PurchaseOrders: item.PurchaseOrders,
+			RawMaterialPurchases:      item.RawMaterialPurchases,
-			Quantity:       item.Quantity,
+			ExpensePurchases:          item.ExpensePurchases,
-			Ingredients:    item.Ingredients,
+			PurchaseOrders:            item.PurchaseOrders,
-			Vendors:        item.Vendors,
+			RawMaterialPurchaseOrders: item.RawMaterialPurchaseOrders,
+			ExpenseCount:              item.ExpenseCount,
+			Quantity:                  item.Quantity,
+			Ingredients:               item.Ingredients,
+			Vendors:                   item.Vendors,
 		}
 	}
 
@@ -227,7 +234,11 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 		GroupBy:        req.GroupBy,
 		Summary: models.PurchasingSummary{
 			TotalPurchases:            result.Summary.TotalPurchases,
+			RawMaterialPurchases:      result.Summary.RawMaterialPurchases,
+			ExpensePurchases:          result.Summary.ExpensePurchases,
 			TotalPurchaseOrders:       result.Summary.TotalPurchaseOrders,
+			RawMaterialPurchaseOrders: result.Summary.RawMaterialPurchaseOrders,
+			ExpenseCount:              result.Summary.ExpenseCount,
 			TotalQuantity:             result.Summary.TotalQuantity,
 			AveragePurchaseOrderValue: result.Summary.AveragePurchaseOrderValue,
 			TotalIngredients:          result.Summary.TotalIngredients,
@@ -643,3 +654,266 @@ func slugify(s string) string {
 	}
 	return string(result)
 }
+
+func (p *AnalyticsProcessorImpl) GetExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
+	if req.DateFrom.After(req.DateTo) {
+		return nil, fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	return p.buildExclusiveSummaryPeriod(ctx, req)
+}
+
+func (p *AnalyticsProcessorImpl) GetExclusiveSummaryMonthly(ctx context.Context, req *models.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyResponse, error) {
+	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)
+
+	fullPeriod, err := p.buildExclusiveSummaryPeriod(ctx, &models.ExclusiveSummaryPeriodRequest{
+		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
+		DateFrom:       monthStart,
+		DateTo:         monthEnd,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	periods := make([]models.ExclusiveSummaryMonthlyPeriod, 0)
+	for _, bucket := range buildExclusiveSummaryMonthlyBuckets(monthStart) {
+		period, err := p.buildExclusiveSummaryPeriod(ctx, &models.ExclusiveSummaryPeriodRequest{
+			OrganizationID: req.OrganizationID,
+			OutletID:       req.OutletID,
+			DateFrom:       bucket.DateFrom,
+			DateTo:         bucket.DateTo,
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		periods = append(periods, models.ExclusiveSummaryMonthlyPeriod{
+			Label:       bucket.Label,
+			DateFrom:    bucket.DateFrom,
+			DateTo:      bucket.DateTo,
+			Sales:       period.Summary.Sales,
+			HPP:         period.Summary.HPP,
+			GrossProfit: period.Summary.GrossProfit,
+			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,
+		Month:          monthStart.Format("2006-01"),
+		Summary: models.ExclusiveSummaryMonthlySummary{
+			TotalSales:               fullPeriod.Summary.Sales,
+			HPP:                      fullPeriod.Summary.HPP,
+			GrossProfit:              fullPeriod.Summary.GrossProfit,
+			OperationalExpensesTotal: fullPeriod.Summary.OperationalExpensesTotal,
+			TotalCost:                fullPeriod.Summary.TotalCost,
+			NetProfit:                fullPeriod.Summary.NetProfit,
+			NetProfitMargin:          percentage(fullPeriod.Summary.NetProfit, fullPeriod.Summary.Sales),
+		},
+		Periods:     periods,
+		BankBalance: bankBalance,
+	}, nil
+}
+
+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 {
+		return nil, fmt.Errorf("failed to get exclusive summary analytics: %w", err)
+	}
+
+	hppBreakdown, hppTotal := exclusiveSummaryCategoryBreakdown(result.HPPBreakdown)
+	operationalBreakdown, operationalTotal := exclusiveSummaryCategoryBreakdown(result.OperationalExpenseBreakdown)
+	salaryDW, salaryStaff, salaryOther := exclusiveSummarySalaryBreakdown(result.DailyTransactions)
+	salaryTotal := salaryDW + salaryStaff + salaryOther
+	otherOperationalExpenses := operationalTotal - salaryTotal
+	if otherOperationalExpenses < 0 {
+		otherOperationalExpenses = 0
+	}
+
+	grossProfit := result.SalesTotal - hppTotal
+	totalCost := hppTotal + operationalTotal
+	netProfit := result.SalesTotal - totalCost
+	excludedSalaryStaff := 0.0
+	if req.ExcludeGajiStaffFromReimburse {
+		excludedSalaryStaff = salaryStaff
+	}
+
+	dailySummary := make([]models.ExclusiveSummaryDailySummary, len(result.DailySummary))
+	for i, item := range result.DailySummary {
+		dailySummary[i] = models.ExclusiveSummaryDailySummary{
+			Date:             item.Date,
+			TransactionCount: item.TransactionCount,
+			TotalCost:        item.TotalCost,
+		}
+	}
+
+	dailyTransactions := make([]models.ExclusiveSummaryDailyTransaction, len(result.DailyTransactions))
+	for i, item := range result.DailyTransactions {
+		dailyTransactions[i] = models.ExclusiveSummaryDailyTransaction{
+			Date:         item.Date,
+			CategoryCode: item.CategoryCode,
+			CategoryName: item.CategoryName,
+			Description:  item.Description,
+			Amount:       item.Amount,
+			Source:       item.Source,
+		}
+	}
+
+	return &models.ExclusiveSummaryPeriodResponse{
+		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
+		Period: models.ExclusiveSummaryPeriodRange{
+			DateFrom: req.DateFrom,
+			DateTo:   req.DateTo,
+		},
+		Summary: models.ExclusiveSummaryPeriodSummary{
+			Sales:                    result.SalesTotal,
+			HPP:                      hppTotal,
+			GrossProfit:              grossProfit,
+			SalaryTotal:              salaryTotal,
+			SalaryDW:                 salaryDW,
+			SalaryStaff:              salaryStaff,
+			SalaryOther:              salaryOther,
+			OtherOperationalExpenses: otherOperationalExpenses,
+			OperationalExpensesTotal: operationalTotal,
+			TotalCost:                totalCost,
+			NetProfit:                netProfit,
+		},
+		Reimburse: models.ExclusiveSummaryReimburse{
+			TotalCost:           totalCost,
+			ExcludedSalaryStaff: excludedSalaryStaff,
+			TotalReimburse:      totalCost - excludedSalaryStaff,
+		},
+		HPPBreakdown:                hppBreakdown,
+		OperationalExpenseBreakdown: operationalBreakdown,
+		DailySummary:                dailySummary,
+		DailyTransactions:           dailyTransactions,
+	}, nil
+}
+
+func exclusiveSummaryCategoryBreakdown(items []entities.ExclusiveSummaryCategoryTotal) ([]models.ExclusiveSummaryCategoryBreakdown, float64) {
+	var total float64
+	for _, item := range items {
+		total += item.Amount
+	}
+
+	breakdown := make([]models.ExclusiveSummaryCategoryBreakdown, len(items))
+	for i, item := range items {
+		breakdown[i] = models.ExclusiveSummaryCategoryBreakdown{
+			CategoryCode: item.CategoryCode,
+			CategoryName: item.CategoryName,
+			Amount:       item.Amount,
+			Percentage:   percentage(item.Amount, total),
+		}
+	}
+
+	return breakdown, total
+}
+
+func exclusiveSummarySalaryBreakdown(transactions []entities.ExclusiveSummaryDailyTransaction) (float64, float64, float64) {
+	var salaryDW float64
+	var salaryStaff float64
+	var salaryOther float64
+
+	for _, transaction := range transactions {
+		if !isExclusiveSummarySalary(transaction.CategoryCode, transaction.CategoryName, transaction.Description) {
+			continue
+		}
+
+		classification := strings.ToLower(transaction.CategoryCode + " " + transaction.CategoryName + " " + transaction.Description)
+		switch {
+		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
+		}
+	}
+
+	return salaryDW, salaryStaff, salaryOther
+}
+
+func isExclusiveSummarySalary(parts ...string) bool {
+	text := strings.ToLower(strings.Join(parts, " "))
+	return strings.Contains(text, "gaji") || strings.Contains(text, "salary")
+}
+
+func percentage(numerator, denominator float64) float64 {
+	if denominator == 0 {
+		return 0
+	}
+	return (numerator / denominator) * 100
+}
+
+type exclusiveSummaryMonthlyBucket struct {
+	Label    string
+	DateFrom time.Time
+	DateTo   time.Time
+}
+
+func buildExclusiveSummaryMonthlyBuckets(monthStart time.Time) []exclusiveSummaryMonthlyBucket {
+	monthEnd := monthStart.AddDate(0, 1, 0).Add(-time.Nanosecond)
+	buckets := make([]exclusiveSummaryMonthlyBucket, 0, 6)
+	currentStart := monthStart
+
+	for !currentStart.After(monthEnd) {
+		currentEnd := currentStart
+		for currentEnd.Weekday() != time.Sunday && currentEnd.Day() < monthEnd.Day() {
+			currentEnd = currentEnd.AddDate(0, 0, 1)
+		}
+
+		bucketEnd := time.Date(currentEnd.Year(), currentEnd.Month(), currentEnd.Day(), 23, 59, 59, int(time.Second-time.Nanosecond), currentEnd.Location())
+		if bucketEnd.After(monthEnd) {
+			bucketEnd = monthEnd
+		}
+
+		buckets = append(buckets, exclusiveSummaryMonthlyBucket{
+			Label:    fmt.Sprintf("%d - %d %s", currentStart.Day(), bucketEnd.Day(), indonesianMonthName(currentStart.Month())),
+			DateFrom: currentStart,
+			DateTo:   bucketEnd,
+		})
+
+		currentStart = time.Date(bucketEnd.Year(), bucketEnd.Month(), bucketEnd.Day(), 0, 0, 0, 0, bucketEnd.Location()).AddDate(0, 0, 1)
+	}
+
+	return buckets
+}
+
+func indonesianMonthName(month time.Month) string {
+	names := map[time.Month]string{
+		time.January:   "Januari",
+		time.February:  "Februari",
+		time.March:     "Maret",
+		time.April:     "April",
+		time.May:       "Mei",
+		time.June:      "Juni",
+		time.July:      "Juli",
+		time.August:    "Agustus",
+		time.September: "September",
+		time.October:   "Oktober",
+		time.November:  "November",
+		time.December:  "Desember",
+	}
+	return names[month]
+}

internal/processor/analytics_processor_test.go

@@ -13,9 +13,12 @@ import (
 )
 
 type analyticsRepositoryStub struct {
-	purchasingResult *entities.PurchasingAnalytics
+	purchasingResult        *entities.PurchasingAnalytics
-	profitLossResult *entities.ProfitLossAnalytics
+	profitLossResult        *entities.ProfitLossAnalytics
-	profitLossGroup  string
+	exclusiveSummaryResults []*entities.ExclusiveSummaryAnalytics
+	bankBalances            []entities.ExclusiveSummaryBankBalance
+	profitLossGroup         string
+	exclusiveSummaryCalls   int
 }
 
 func (analyticsRepositoryStub) GetPaymentMethodAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.PaymentMethodAnalytics, error) {
@@ -47,6 +50,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) {
+	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{}
 
 func (expenseRepositoryStub) Create(context.Context, *entities.Expense) error { return nil }
@@ -71,11 +88,27 @@ 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{
-				TotalPurchases: 125,
+				TotalPurchases:            300,
+				RawMaterialPurchases:      125,
+				ExpensePurchases:          175,
+				TotalPurchaseOrders:       3,
+				RawMaterialPurchaseOrders: 1,
+				ExpenseCount:              2,
+			},
+			Data: []entities.PurchasingAnalyticsData{
+				{
+					Date:                      now,
+					Purchases:                 300,
+					RawMaterialPurchases:      125,
+					ExpensePurchases:          175,
+					PurchaseOrders:            3,
+					RawMaterialPurchaseOrders: 1,
+					ExpenseCount:              2,
+				},
 			},
 		},
 	}, expenseRepositoryStub{})
@@ -92,14 +125,23 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	require.Equal(t, &outletID, result.OutletID)
 	require.NotNil(t, result.OutletName)
 	require.Equal(t, outletName, *result.OutletName)
-	require.Equal(t, float64(125), result.Summary.TotalPurchases)
+	require.Equal(t, float64(300), result.Summary.TotalPurchases)
+	require.Equal(t, float64(125), result.Summary.RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Summary.ExpensePurchases)
+	require.Equal(t, int64(3), result.Summary.TotalPurchaseOrders)
+	require.Equal(t, int64(1), result.Summary.RawMaterialPurchaseOrders)
+	require.Equal(t, int64(2), result.Summary.ExpenseCount)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(300), result.Data[0].Purchases)
+	require.Equal(t, float64(125), result.Data[0].RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Data[0].ExpensePurchases)
 }
 
 func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *testing.T) {
 	productID := uuid.New()
 	categoryID := uuid.New()
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
 		profitLossResult: &entities.ProfitLossAnalytics{
 			Summary: entities.ProfitLossSummary{
 				TotalRevenue:       1000,
@@ -171,7 +213,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,
@@ -248,3 +290,106 @@ func TestAnalyticsProcessorGetProfitLossAnalyticsDynamicExpenseCategories(t *tes
 	require.Equal(t, float64(7400), result.MainSummary[6].MtdNominal)
 	require.True(t, result.MainSummary[6].IsBold)
 }
+
+func TestAnalyticsProcessorGetExclusiveSummaryPeriodCalculatesTotalsAndReimburse(t *testing.T) {
+	now := time.Date(2026, 5, 26, 0, 0, 0, 0, time.UTC)
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
+		exclusiveSummaryResults: []*entities.ExclusiveSummaryAnalytics{
+			{
+				SalesTotal: 1000,
+				HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{
+					{CategoryCode: "RAW", CategoryName: "Raw", Amount: 400},
+				},
+				OperationalExpenseBreakdown: []entities.ExclusiveSummaryCategoryTotal{
+					{CategoryCode: "GAJI", CategoryName: "Gaji", Amount: 250},
+					{CategoryCode: "OPS", CategoryName: "Operasional", Amount: 100},
+				},
+				DailySummary: []entities.ExclusiveSummaryDailySummary{
+					{Date: now, TransactionCount: 3, TotalCost: 750},
+				},
+				DailyTransactions: []entities.ExclusiveSummaryDailyTransaction{
+					{Date: now, CategoryCode: "RAW", CategoryName: "Raw", Description: "beras", Amount: 400, Source: "purchase_order"},
+					{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{})
+
+	result, err := processor.GetExclusiveSummaryPeriod(context.Background(), &models.ExclusiveSummaryPeriodRequest{
+		OrganizationID:                uuid.New(),
+		DateFrom:                      now,
+		DateTo:                        now,
+		ExcludeGajiStaffFromReimburse: true,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Equal(t, float64(1000), result.Summary.Sales)
+	require.Equal(t, float64(400), result.Summary.HPP)
+	require.Equal(t, float64(600), result.Summary.GrossProfit)
+	require.Equal(t, float64(350), result.Summary.OperationalExpensesTotal)
+	require.Equal(t, float64(750), result.Summary.TotalCost)
+	require.Equal(t, float64(250), result.Summary.NetProfit)
+	require.Equal(t, float64(250), result.Summary.SalaryTotal)
+	require.Equal(t, float64(50), result.Summary.SalaryDW)
+	require.Equal(t, float64(200), result.Summary.SalaryStaff)
+	require.Equal(t, float64(100), result.Summary.OtherOperationalExpenses)
+	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 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)
+	openingBalance := 5000000.0
+	closingBalance := 5000000.0
+	notes := "Main cash account for daily transactions"
+	stub := &analyticsRepositoryStub{
+		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}}},
+		},
+		bankBalances: []entities.ExclusiveSummaryBankBalance{
+			{Bank: "Cash and Bank", OpeningBalance: &openingBalance, ClosingBalance: &closingBalance, Notes: &notes},
+		},
+	}
+	processor := NewAnalyticsProcessorImpl(stub, expenseRepositoryStub{})
+
+	result, err := processor.GetExclusiveSummaryMonthly(context.Background(), &models.ExclusiveSummaryMonthlyRequest{
+		OrganizationID: uuid.New(),
+		Month:          month,
+	})
+
+	require.NoError(t, err)
+	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, 1)
+	require.Equal(t, "Cash and Bank", result.BankBalance[0].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)
+}

internal/processor/expense_processor.go

@@ -61,7 +61,7 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		if err != nil {
 			return nil, fmt.Errorf("invalid purchase_category_id for item: %w", err)
 		}
-		if err := p.validateNonInventoryPurchaseCategory(ctx, purchaseCategoryID, organizationID); err != nil {
+		if err := p.validateExpensePurchaseCategory(ctx, purchaseCategoryID, organizationID); err != nil {
 			return nil, err
 		}
 
@@ -169,7 +169,7 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 			if err != nil {
 				return nil, fmt.Errorf("invalid purchase_category_id for item: %w", err)
 			}
-			if err := p.validateNonInventoryPurchaseCategory(ctx, purchaseCategoryID, organizationID); err != nil {
+			if err := p.validateExpensePurchaseCategory(ctx, purchaseCategoryID, organizationID); err != nil {
 				return nil, err
 			}
 
@@ -334,7 +334,7 @@ func (p *ExpenseProcessorImpl) GetExpenseAnalytics(ctx context.Context, req *mod
 	}, nil
 }
 
-func (p *ExpenseProcessorImpl) validateNonInventoryPurchaseCategory(ctx context.Context, categoryID, organizationID uuid.UUID) error {
+func (p *ExpenseProcessorImpl) validateExpensePurchaseCategory(ctx context.Context, categoryID, organizationID uuid.UUID) error {
 	category, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, categoryID, organizationID)
 	if err != nil {
 		return fmt.Errorf("purchase category not found: %w", err)
@@ -344,8 +344,8 @@ func (p *ExpenseProcessorImpl) validateNonInventoryPurchaseCategory(ctx context.
 		return fmt.Errorf("purchase category is inactive")
 	}
 
-	if category.Type != entities.PurchaseCategoryTypeNonInventory {
+	if category.Type != entities.PurchaseCategoryTypeExpense {
-		return fmt.Errorf("purchase category must be non_inventory")
+		return fmt.Errorf("purchase category must be expense")
 	}
 
 	return nil

internal/processor/expense_processor_test.go

@@ -102,7 +102,7 @@ func (*expenseRepositoryCaptureStub) DeleteItemsByExpenseID(context.Context, uui
 func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
 	repo := &expenseRepositoryCaptureStub{}
 	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeNonInventory))
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
 	chartOfAccountID := uuid.New()
 
 	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
@@ -133,7 +133,7 @@ func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
 func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
 	repo := &expenseRepositoryCaptureStub{}
 	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeNonInventory))
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
 
 	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
 		Receiver:        "Cashier",
@@ -160,7 +160,7 @@ func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
 func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
 	repo := &expenseRepositoryCaptureStub{}
 	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeNonInventory))
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
 	status := "approved"
 
 	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
@@ -209,7 +209,7 @@ func TestExpenseProcessorCreateRejectsRawMaterialPurchaseCategory(t *testing.T)
 
 	require.Error(t, err)
 	require.Nil(t, resp)
-	require.Contains(t, err.Error(), "non_inventory")
+	require.Contains(t, err.Error(), "expense")
 }
 
 func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *testing.T) {
@@ -241,7 +241,7 @@ func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *te
 				{
 					PurchaseCategoryID:   purchaseCategoryID,
 					PurchaseCategoryName: "Operational Supplies",
-					PurchaseCategoryType: "non_inventory",
+					PurchaseCategoryType: "expense",
 					TotalAmount:          100000,
 					ExpenseCount:         2,
 					ItemCount:            2,
@@ -266,7 +266,7 @@ func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *te
 			},
 		},
 	}
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeNonInventory))
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
 
 	resp, err := p.GetExpenseAnalytics(context.Background(), &models.ExpenseAnalyticsRequest{
 		OrganizationID: uuid.New(),

internal/processor/purchase_order_processor.go

@@ -67,20 +67,40 @@ 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)
 	}
 
-	// Validate ingredients, raw-material categories, and units exist
+	// Validate categories and inventory fields per item type.
 	for i, item := range req.Items {
-		_, err := p.ingredientRepo.GetByID(ctx, item.IngredientID, organizationID)
+		category, err := p.validatePurchaseCategory(ctx, item.PurchaseCategoryID, organizationID, i)
 		if err != nil {
-			return nil, fmt.Errorf("ingredient not found for item %d: %w", i, err)
-		}
-
-		if err := p.validateRawMaterialPurchaseCategory(ctx, item.PurchaseCategoryID, organizationID, i); err != nil {
 			return nil, err
 		}
 
-		_, err = p.unitRepo.GetByID(ctx, item.UnitID, organizationID)
+		switch category.Type {
-		if err != nil {
+		case entities.PurchaseCategoryTypeRawMaterial:
-			return nil, fmt.Errorf("unit not found for item %d: %w", i, err)
+			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)
+			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)
 		}
 	}
 
@@ -197,64 +217,58 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 
 	// Update items if provided
 	if req.Items != nil {
-		// Delete existing items
-		err = p.purchaseOrderRepo.DeleteItemsByPurchaseOrderID(ctx, poEntity.ID)
-		if err != nil {
-			return nil, fmt.Errorf("failed to delete existing items: %w", err)
-		}
-
-		// Create new items
 		totalAmount := 0.0
+		items := make([]*entities.PurchaseOrderItem, len(req.Items))
 		for i, itemReq := range req.Items {
-			// Validate ingredients and units exist
+			if itemReq.PurchaseCategoryID == nil {
-			if itemReq.IngredientID != nil {
+				return nil, fmt.Errorf("purchase_category_id is required for item %d", i)
-				_, err := p.ingredientRepo.GetByID(ctx, *itemReq.IngredientID, organizationID)
-				if err != nil {
-					return nil, fmt.Errorf("ingredient not found: %w", err)
-				}
 			}
 
-			if itemReq.UnitID != nil {
+			ingredientID := itemReq.IngredientID
-				_, err := p.unitRepo.GetByID(ctx, *itemReq.UnitID, organizationID)
+			purchaseCategoryID := *itemReq.PurchaseCategoryID
-				if err != nil {
+			unitID := itemReq.UnitID
-					return nil, fmt.Errorf("unit not found: %w", err)
+			quantity := itemReq.Quantity
-				}
+			amount := 0.0
-			}
-
-			if itemReq.PurchaseCategoryID != nil {
-				if err := p.validateRawMaterialPurchaseCategory(ctx, *itemReq.PurchaseCategoryID, organizationID, i); err != nil {
-					return nil, err
-				}
-			}
-
-			// Use existing values if not provided
-			ingredientID := poEntity.Items[0].IngredientID // This is a simplified approach
-			purchaseCategoryID := poEntity.Items[0].PurchaseCategoryID
-			unitID := poEntity.Items[0].UnitID
-			quantity := poEntity.Items[0].Quantity
-			amount := poEntity.Items[0].Amount
-			description := poEntity.Items[0].Description
-
-			if itemReq.IngredientID != nil {
-				ingredientID = *itemReq.IngredientID
-			}
-			if itemReq.UnitID != nil {
-				unitID = *itemReq.UnitID
-			}
-			if itemReq.PurchaseCategoryID != nil {
-				purchaseCategoryID = *itemReq.PurchaseCategoryID
-			}
-			if itemReq.Quantity != nil {
-				quantity = *itemReq.Quantity
-			}
 			if itemReq.Amount != nil {
 				amount = *itemReq.Amount
 			}
-			if itemReq.Description != nil {
+			description := itemReq.Description
-				description = itemReq.Description
+
+			category, err := p.validatePurchaseCategory(ctx, purchaseCategoryID, organizationID, i)
+			if err != nil {
+				return nil, err
 			}
 
-			itemEntity := &entities.PurchaseOrderItem{
+			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)
+				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,
 				IngredientID:       ingredientID,
 				PurchaseCategoryID: purchaseCategoryID,
@@ -263,13 +277,20 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 				UnitID:             unitID,
 				Amount:             amount,
 			}
+			totalAmount += amount
+		}
 
+		// Delete and recreate only after all replacement items are valid.
+		err = p.purchaseOrderRepo.DeleteItemsByPurchaseOrderID(ctx, poEntity.ID)
+		if err != nil {
+			return nil, fmt.Errorf("failed to delete existing items: %w", err)
+		}
+
+		for _, itemEntity := range items {
 			err = p.purchaseOrderRepo.CreateItem(ctx, itemEntity)
 			if err != nil {
 				return nil, fmt.Errorf("failed to create purchase order item: %w", err)
 			}
-
-			totalAmount += amount
 		}
 
 		poEntity.TotalAmount = totalAmount
@@ -398,19 +419,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
 			}
@@ -428,7 +457,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 
 			err = p.inventoryMovementService.CreateIngredientMovement(
 				ctx,
-				item.IngredientID,
+				*item.IngredientID,
 				organizationID,
 				outletID,
 				userID,
@@ -441,7 +470,7 @@ 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)
 			}
 		}
 	}
@@ -461,19 +490,19 @@ 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
 }

internal/repository/analytics_repository.go

@@ -18,6 +18,8 @@ type AnalyticsRepository interface {
 	GetProductAnalyticsPerCategory(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.ProductAnalyticsPerCategory, error)
 	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 {
@@ -124,7 +126,6 @@ func (r *AnalyticsRepositoryImpl) GetSalesAnalytics(ctx context.Context, organiz
 }
 
 func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.PurchasingAnalytics, error) {
-	var summary entities.PurchasingSummary
 	var outletName *string
 
 	if outletID != nil {
@@ -144,29 +145,32 @@ func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, or
 			outletName = &outlet.Name
 		}
 	}
+	return r.getPurchaseOrderPurchasingAnalytics(ctx, organizationID, outletID, outletName, dateFrom, dateTo, groupBy)
+}
 
+func (r *AnalyticsRepositoryImpl) getPurchaseOrderPurchasingAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, outletName *string, dateFrom, dateTo time.Time, groupBy string) (*entities.PurchasingAnalytics, error) {
+	var summary entities.PurchasingSummary
 	summaryQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
+		Table("purchase_orders po").
 		Select(`
-			COALESCE(SUM(im.total_cost), 0) as total_purchases,
+			COALESCE(SUM(poi.amount), 0) as total_purchases,
-			COUNT(DISTINCT im.reference_id) as total_purchase_orders,
+			COUNT(DISTINCT po.id) as total_purchase_orders,
-			COALESCE(SUM(im.quantity), 0) as total_quantity,
+			COALESCE(SUM(poi.quantity), 0) as total_quantity,
 			CASE
-				WHEN COUNT(DISTINCT im.reference_id) > 0
+				WHEN COUNT(DISTINCT po.id) > 0
-				THEN COALESCE(SUM(im.total_cost), 0) / COUNT(DISTINCT im.reference_id)
+				THEN COALESCE(SUM(poi.amount), 0) / COUNT(DISTINCT po.id)
 				ELSE 0
 			END as average_purchase_order_value,
-			COUNT(DISTINCT im.item_id) as total_ingredients,
+			COUNT(DISTINCT i.id) as total_ingredients,
 			COUNT(DISTINCT po.vendor_id) as total_vendors
 		`).
-		Joins("LEFT JOIN purchase_orders po ON im.reference_id = po.id").
+		Joins("LEFT JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
-		Where("im.organization_id = ?", organizationID).
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
-		Where("im.item_type = ?", "INGREDIENT").
+		Where("po.organization_id = ?", organizationID).
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("po.status != ?", "cancelled").
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo)
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo)
-
+	summaryQuery = r.applyPurchaseOrderItemOutletFilter(summaryQuery, outletID)
-	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "im.outlet_id")
 
 	if err := summaryQuery.Scan(&summary).Error; err != nil {
 		return nil, err
@@ -175,36 +179,35 @@ func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, or
 	var dateFormat string
 	switch groupBy {
 	case "hour":
-		dateFormat = "DATE_TRUNC('hour', im.created_at)"
+		dateFormat = "DATE_TRUNC('hour', po.created_at)"
 	case "week":
-		dateFormat = "DATE_TRUNC('week', im.created_at)"
+		dateFormat = "DATE_TRUNC('week', po.transaction_date::timestamp)"
 	case "month":
-		dateFormat = "DATE_TRUNC('month', im.created_at)"
+		dateFormat = "DATE_TRUNC('month', po.transaction_date::timestamp)"
 	default:
-		dateFormat = "DATE_TRUNC('day', im.created_at)"
+		dateFormat = "DATE_TRUNC('day', po.transaction_date::timestamp)"
 	}
 
 	var data []entities.PurchasingAnalyticsData
 	dataQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
+		Table("purchase_orders po").
 		Select(`
 			`+dateFormat+` as date,
-			COALESCE(SUM(im.total_cost), 0) as purchases,
+			COALESCE(SUM(poi.amount), 0) as purchases,
-			COUNT(DISTINCT im.reference_id) as purchase_orders,
+			COUNT(DISTINCT po.id) as purchase_orders,
-			COALESCE(SUM(im.quantity), 0) as quantity,
+			COALESCE(SUM(poi.quantity), 0) as quantity,
-			COUNT(DISTINCT im.item_id) as ingredients,
+			COUNT(DISTINCT i.id) as ingredients,
 			COUNT(DISTINCT po.vendor_id) as vendors
 		`).
-		Joins("LEFT JOIN purchase_orders po ON im.reference_id = po.id").
+		Joins("LEFT JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
-		Where("im.organization_id = ?", organizationID).
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
-		Where("im.item_type = ?", "INGREDIENT").
+		Where("po.organization_id = ?", organizationID).
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("po.status != ?", "cancelled").
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
 		Group(dateFormat).
 		Order(dateFormat)
-
+	dataQuery = r.applyPurchaseOrderItemOutletFilter(dataQuery, outletID)
-	dataQuery = r.resolveOutletID(dataQuery, outletID, "im.outlet_id")
 
 	if err := dataQuery.Scan(&data).Error; err != nil {
 		return nil, err
@@ -212,29 +215,28 @@ func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, or
 
 	var ingredientData []entities.PurchasingIngredientData
 	ingredientQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
+		Table("purchase_order_items poi").
 		Select(`
 			i.id as ingredient_id,
 			i.name as ingredient_name,
-			COALESCE(SUM(im.quantity), 0) as quantity,
+			COALESCE(SUM(poi.quantity), 0) as quantity,
-			COALESCE(SUM(im.total_cost), 0) as total_cost,
+			COALESCE(SUM(poi.amount), 0) as total_cost,
 			CASE
-				WHEN SUM(im.quantity) > 0
+				WHEN SUM(poi.quantity) > 0
-				THEN COALESCE(SUM(im.total_cost), 0) / SUM(im.quantity)
+				THEN COALESCE(SUM(poi.amount), 0) / SUM(poi.quantity)
 				ELSE 0
 			END as average_unit_cost,
-			COUNT(DISTINCT im.reference_id) as purchase_order_count
+			COUNT(DISTINCT po.id) as purchase_order_count
 		`).
-		Joins("JOIN ingredients i ON im.item_id = i.id").
+		Joins("JOIN purchase_orders po ON poi.purchase_order_id = po.id").
-		Where("im.organization_id = ?", organizationID).
+		Joins("JOIN ingredients i ON poi.ingredient_id = i.id").
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
-		Where("im.item_type = ?", "INGREDIENT").
+		Where("po.organization_id = ?", organizationID).
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("po.status != ?", "cancelled").
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
 		Group("i.id, i.name").
 		Order("total_cost DESC")
-
+	ingredientQuery = r.applyPurchaseOrderItemOutletFilter(ingredientQuery, outletID)
-	ingredientQuery = r.resolveOutletID(ingredientQuery, outletID, "im.outlet_id")
 
 	if err := ingredientQuery.Scan(&ingredientData).Error; err != nil {
 		return nil, err
@@ -242,26 +244,25 @@ func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, or
 
 	var vendorData []entities.PurchasingVendorData
 	vendorQuery := r.db.WithContext(ctx).
-		Table("inventory_movements im").
+		Table("purchase_orders po").
 		Select(`
 			v.id as vendor_id,
 			v.name as vendor_name,
-			COALESCE(SUM(im.total_cost), 0) as total_cost,
+			COALESCE(SUM(poi.amount), 0) as total_cost,
-			COUNT(DISTINCT im.reference_id) as purchase_order_count,
+			COUNT(DISTINCT po.id) as purchase_order_count,
-			COUNT(DISTINCT im.item_id) as ingredient_count,
+			COUNT(DISTINCT i.id) as ingredient_count,
-			COALESCE(SUM(im.quantity), 0) as quantity
+			COALESCE(SUM(poi.quantity), 0) as quantity
 		`).
-		Joins("JOIN purchase_orders po ON im.reference_id = po.id").
 		Joins("JOIN vendors v ON po.vendor_id = v.id").
-		Where("im.organization_id = ?", organizationID).
+		Joins("LEFT JOIN purchase_order_items poi ON poi.purchase_order_id = po.id").
-		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Joins("LEFT JOIN ingredients i ON poi.ingredient_id = i.id").
-		Where("im.item_type = ?", "INGREDIENT").
+		Joins("LEFT JOIN units u ON poi.unit_id = u.id").
-		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("po.organization_id = ?", organizationID).
-		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
+		Where("po.status != ?", "cancelled").
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
 		Group("v.id, v.name").
 		Order("total_cost DESC")
-
+	vendorQuery = r.applyPurchaseOrderItemOutletFilter(vendorQuery, outletID)
-	vendorQuery = r.resolveOutletID(vendorQuery, outletID, "im.outlet_id")
 
 	if err := vendorQuery.Scan(&vendorData).Error; err != nil {
 		return nil, err
@@ -276,6 +277,13 @@ func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, or
 	}, nil
 }
 
+func (r *AnalyticsRepositoryImpl) applyPurchaseOrderItemOutletFilter(query *gorm.DB, outletID *uuid.UUID) *gorm.DB {
+	if outletID == nil {
+		return query
+	}
+	return query.Where("(i.outlet_id = ? OR u.outlet_id = ?)", *outletID, *outletID)
+}
+
 func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, limit int) ([]*entities.ProductAnalytics, error) {
 	var results []*entities.ProductAnalytics
 
@@ -284,7 +292,6 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Select(`
 			p.id as product_id,
 			p.name as product_name,
-			p.price as product_price,
 			c.id as category_id,
 			c.name as category_name,
 			c.order as category_order,
@@ -343,7 +350,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.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
 		Order("revenue DESC").
 		Limit(limit).
 		Scan(&results).Error
@@ -681,3 +688,214 @@ func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context
 
 	return results, err
 }
+
+func (r *AnalyticsRepositoryImpl) GetExclusiveSummaryAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (*entities.ExclusiveSummaryAnalytics, error) {
+	type salesResult struct {
+		SalesTotal float64
+		SalesCount int64
+	}
+
+	var sales salesResult
+	salesQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			COALESCE(SUM(o.total_amount), 0) as sales_total,
+			COUNT(o.id) as sales_count
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
+	salesQuery = r.resolveOutletID(salesQuery, outletID, "o.outlet_id")
+	if err := salesQuery.Scan(&sales).Error; err != nil {
+		return nil, err
+	}
+
+	hppBreakdown, err := r.getExclusiveSummaryHPPBreakdown(ctx, organizationID, outletID, dateFrom, dateTo)
+	if err != nil {
+		return nil, err
+	}
+
+	operationalExpenseBreakdown, err := r.getExclusiveSummaryOperationalExpenseBreakdown(ctx, organizationID, dateFrom, dateTo)
+	if err != nil {
+		return nil, err
+	}
+
+	dailySummary, err := r.getExclusiveSummaryDailySummary(ctx, organizationID, outletID, dateFrom, dateTo)
+	if err != nil {
+		return nil, err
+	}
+
+	dailyTransactions, err := r.getExclusiveSummaryDailyTransactions(ctx, organizationID, outletID, dateFrom, dateTo)
+	if err != nil {
+		return nil, err
+	}
+
+	return &entities.ExclusiveSummaryAnalytics{
+		SalesTotal:                  sales.SalesTotal,
+		SalesCount:                  sales.SalesCount,
+		HPPBreakdown:                hppBreakdown,
+		OperationalExpenseBreakdown: operationalExpenseBreakdown,
+		DailySummary:                dailySummary,
+		DailyTransactions:           dailyTransactions,
+	}, nil
+}
+
+func (r *AnalyticsRepositoryImpl) getExclusiveSummaryHPPBreakdown(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExclusiveSummaryCategoryTotal, error) {
+	var results []entities.ExclusiveSummaryCategoryTotal
+
+	query := r.db.WithContext(ctx).
+		Table("purchase_order_items poi").
+		Select(`
+			pc.code as category_code,
+			pc.name as category_name,
+			COALESCE(SUM(poi.amount), 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("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).
+		Where("po.status = ?", "received").
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo)
+	query = r.applyPurchaseOrderItemOutletFilter(query, outletID)
+
+	err := query.
+		Group("pc.id, pc.code, pc.name, pc.sort_order").
+		Order("pc.sort_order ASC, pc.name ASC").
+		Scan(&results).Error
+
+	return results, err
+}
+
+func (r *AnalyticsRepositoryImpl) getExclusiveSummaryOperationalExpenseBreakdown(ctx context.Context, organizationID uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExclusiveSummaryCategoryTotal, error) {
+	var results []entities.ExclusiveSummaryCategoryTotal
+
+	err := r.db.WithContext(ctx).
+		Table("purchase_order_items poi").
+		Select(`
+			pc.code as category_code,
+			pc.name as category_name,
+			COALESCE(SUM(poi.amount), 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("pc.type = ?", entities.PurchaseCategoryTypeExpense).
+		Where("po.status = ?", "received").
+		Where("po.transaction_date >= ? AND po.transaction_date <= ?", dateFrom, dateTo).
+		Group("pc.id, pc.code, pc.name, pc.sort_order").
+		Order("pc.sort_order ASC, pc.name ASC").
+		Scan(&results).Error
+
+	return results, err
+}
+
+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.exclusiveSummaryPurchaseOrderItemQuery(organizationID, outletID, dateFrom, dateTo)
+
+	err := r.db.WithContext(ctx).Raw(`
+		SELECT date, COUNT(*) as transaction_count, COALESCE(SUM(amount), 0) as total_cost
+		FROM (`+rawQuery+`) transactions
+		GROUP BY date
+		ORDER BY date ASC
+	`, args...).Scan(&results).Error
+
+	return results, err
+}
+
+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.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, category_name ASC, description ASC
+	`, args...).Scan(&results).Error
+
+	return results, err
+}
+
+func (r *AnalyticsRepositoryImpl) exclusiveSummaryPurchaseOrderItemQuery(organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (string, []interface{}) {
+	outletFilter := ""
+	args := []interface{}{
+		organizationID,
+		"received",
+		dateFrom,
+		dateTo,
+	}
+
+	if outletID != nil {
+		outletFilter = "AND (pc.type = ? OR i.outlet_id = ? OR u.outlet_id = ?)"
+		args = append(args, entities.PurchaseCategoryTypeExpense, *outletID, *outletID)
+	}
+
+	query := `
+		SELECT
+			DATE(po.transaction_date) as date,
+			pc.code as category_code,
+			pc.name as category_name,
+			COALESCE(NULLIF(poi.description, ''), i.name, pc.name) as description,
+			poi.amount 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
+		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 po.status = ?
+		  AND po.transaction_date >= ? AND po.transaction_date <= ?
+		  ` + outletFilter + `
+	`
+
+	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/expense_repository.go

@@ -207,7 +207,7 @@ func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID
 		Joins("JOIN expenses e ON ei.expense_id = e.id").
 		Joins("JOIN purchase_categories pc ON ei.purchase_category_id = pc.id").
 		Where("e.organization_id = ?", organizationID).
-		Where("pc.type = ?", entities.PurchaseCategoryTypeNonInventory).
+		Where("pc.type = ?", entities.PurchaseCategoryTypeExpense).
 		Where("e.status = ?", "approved").
 		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo).
 		Group("pc.id, pc.name, pc.type").

internal/router/router.go

@@ -337,6 +337,8 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				analytics.GET("/categories", r.analyticsHandler.GetProductAnalyticsPerCategory)
 				analytics.GET("/dashboard", r.analyticsHandler.GetDashboardAnalytics)
 				analytics.GET("/profit-loss", r.analyticsHandler.GetProfitLossAnalytics)
+				analytics.GET("/exclusive-summary/period", r.analyticsHandler.GetExclusiveSummaryPeriod)
+				analytics.GET("/exclusive-summary/monthly", r.analyticsHandler.GetExclusiveSummaryMonthly)
 			}
 
 			tables := protected.Group("/tables")

internal/service/analytics_service.go

@@ -18,6 +18,8 @@ type AnalyticsService interface {
 	GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
 	GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
 	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)
 }
 
 type AnalyticsServiceImpl struct {
@@ -320,3 +322,69 @@ func (s *AnalyticsServiceImpl) validateProfitLossAnalyticsRequest(req *models.Pr
 
 	return nil
 }
+
+func (s *AnalyticsServiceImpl) GetExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
+	if err := s.validateExclusiveSummaryPeriodRequest(req); err != nil {
+		return nil, fmt.Errorf("validation error: %w", err)
+	}
+
+	response, err := s.analyticsProcessor.GetExclusiveSummaryPeriod(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get exclusive summary period: %w", err)
+	}
+
+	return response, nil
+}
+
+func (s *AnalyticsServiceImpl) GetExclusiveSummaryMonthly(ctx context.Context, req *models.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyResponse, error) {
+	if err := s.validateExclusiveSummaryMonthlyRequest(req); err != nil {
+		return nil, fmt.Errorf("validation error: %w", err)
+	}
+
+	response, err := s.analyticsProcessor.GetExclusiveSummaryMonthly(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get exclusive summary monthly: %w", err)
+	}
+
+	return response, nil
+}
+
+func (s *AnalyticsServiceImpl) validateExclusiveSummaryPeriodRequest(req *models.ExclusiveSummaryPeriodRequest) 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.DateFrom.IsZero() {
+		return fmt.Errorf("date_from is required")
+	}
+
+	if req.DateTo.IsZero() {
+		return fmt.Errorf("date_to is required")
+	}
+
+	if req.DateFrom.After(req.DateTo) {
+		return fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	return nil
+}
+
+func (s *AnalyticsServiceImpl) validateExclusiveSummaryMonthlyRequest(req *models.ExclusiveSummaryMonthlyRequest) 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.Month.IsZero() {
+		return fmt.Errorf("month is required")
+	}
+
+	return nil
+}

internal/service/analytics_service_test.go

@@ -41,6 +41,14 @@ func (analyticsProcessorStub) GetProfitLossAnalytics(context.Context, *models.Pr
 	return nil, nil
 }
 
+func (analyticsProcessorStub) GetExclusiveSummaryPeriod(context.Context, *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
+	return &models.ExclusiveSummaryPeriodResponse{}, nil
+}
+
+func (analyticsProcessorStub) GetExclusiveSummaryMonthly(context.Context, *models.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyResponse, error) {
+	return &models.ExclusiveSummaryMonthlyResponse{}, nil
+}
+
 func TestAnalyticsServiceGetPurchasingAnalyticsValidation(t *testing.T) {
 	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
@@ -190,3 +198,59 @@ 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")
+}

internal/transformer/analytics_transformer.go

@@ -169,12 +169,16 @@ func PurchasingAnalyticsModelToContract(resp *models.PurchasingAnalyticsResponse
 	data := make([]contract.PurchasingAnalyticsData, len(resp.Data))
 	for i, item := range resp.Data {
 		data[i] = contract.PurchasingAnalyticsData{
-			Date:           item.Date,
+			Date:                      item.Date,
-			Purchases:      item.Purchases,
+			Purchases:                 item.Purchases,
-			PurchaseOrders: item.PurchaseOrders,
+			RawMaterialPurchases:      item.RawMaterialPurchases,
-			Quantity:       item.Quantity,
+			ExpensePurchases:          item.ExpensePurchases,
-			Ingredients:    item.Ingredients,
+			PurchaseOrders:            item.PurchaseOrders,
-			Vendors:        item.Vendors,
+			RawMaterialPurchaseOrders: item.RawMaterialPurchaseOrders,
+			ExpenseCount:              item.ExpenseCount,
+			Quantity:                  item.Quantity,
+			Ingredients:               item.Ingredients,
+			Vendors:                   item.Vendors,
 		}
 	}
 
@@ -211,7 +215,11 @@ func PurchasingAnalyticsModelToContract(resp *models.PurchasingAnalyticsResponse
 		GroupBy:        resp.GroupBy,
 		Summary: contract.PurchasingSummary{
 			TotalPurchases:            resp.Summary.TotalPurchases,
+			RawMaterialPurchases:      resp.Summary.RawMaterialPurchases,
+			ExpensePurchases:          resp.Summary.ExpensePurchases,
 			TotalPurchaseOrders:       resp.Summary.TotalPurchaseOrders,
+			RawMaterialPurchaseOrders: resp.Summary.RawMaterialPurchaseOrders,
+			ExpenseCount:              resp.Summary.ExpenseCount,
 			TotalQuantity:             resp.Summary.TotalQuantity,
 			AveragePurchaseOrderValue: resp.Summary.AveragePurchaseOrderValue,
 			TotalIngredients:          resp.Summary.TotalIngredients,
@@ -551,3 +559,229 @@ func profitLossSummaryRowModelToContract(row models.ProfitLossSummaryRow) contra
 		SubItems:     subItems,
 	}
 }
+
+func ExclusiveSummaryPeriodContractToModel(req *contract.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodRequest, error) {
+	if req == nil {
+		return nil, fmt.Errorf("request cannot be nil")
+	}
+
+	dateFrom, dateTo, err := parseFlexibleDateRangeToJakartaTime(req.DateFrom, req.DateTo)
+	if err != nil {
+		return nil, fmt.Errorf("invalid date range: %w", err)
+	}
+
+	if dateFrom == nil {
+		return nil, fmt.Errorf("date_from is required")
+	}
+
+	if dateTo == nil {
+		return nil, fmt.Errorf("date_to is required")
+	}
+
+	return &models.ExclusiveSummaryPeriodRequest{
+		OrganizationID:                req.OrganizationID,
+		OutletID:                      parseOutletID(req.OutletID),
+		DateFrom:                      *dateFrom,
+		DateTo:                        *dateTo,
+		ExcludeGajiStaffFromReimburse: req.ExcludeGajiStaffFromReimburse,
+	}, nil
+}
+
+func ExclusiveSummaryMonthlyContractToModel(req *contract.ExclusiveSummaryMonthlyRequest) (*models.ExclusiveSummaryMonthlyRequest, error) {
+	if req == nil {
+		return nil, fmt.Errorf("request cannot be nil")
+	}
+
+	month, err := parseMonthToJakartaTime(req.Month)
+	if err != nil {
+		return nil, fmt.Errorf("invalid month: %w", err)
+	}
+
+	return &models.ExclusiveSummaryMonthlyRequest{
+		OrganizationID: req.OrganizationID,
+		OutletID:       parseOutletID(req.OutletID),
+		Month:          month,
+	}, nil
+}
+
+func ExclusiveSummaryPeriodModelToContract(resp *models.ExclusiveSummaryPeriodResponse) *contract.ExclusiveSummaryPeriodResponse {
+	if resp == nil {
+		return nil
+	}
+
+	hppBreakdown := make([]contract.ExclusiveSummaryCategoryBreakdown, len(resp.HPPBreakdown))
+	for i, item := range resp.HPPBreakdown {
+		hppBreakdown[i] = exclusiveSummaryCategoryBreakdownModelToContract(item)
+	}
+
+	operationalBreakdown := make([]contract.ExclusiveSummaryCategoryBreakdown, len(resp.OperationalExpenseBreakdown))
+	for i, item := range resp.OperationalExpenseBreakdown {
+		operationalBreakdown[i] = exclusiveSummaryCategoryBreakdownModelToContract(item)
+	}
+
+	dailySummary := make([]contract.ExclusiveSummaryDailySummary, len(resp.DailySummary))
+	for i, item := range resp.DailySummary {
+		dailySummary[i] = contract.ExclusiveSummaryDailySummary{
+			Date:             item.Date,
+			TransactionCount: item.TransactionCount,
+			TotalCost:        item.TotalCost,
+		}
+	}
+
+	dailyTransactions := make([]contract.ExclusiveSummaryDailyTransaction, len(resp.DailyTransactions))
+	for i, item := range resp.DailyTransactions {
+		dailyTransactions[i] = contract.ExclusiveSummaryDailyTransaction{
+			Date:         item.Date,
+			CategoryCode: item.CategoryCode,
+			CategoryName: item.CategoryName,
+			Description:  item.Description,
+			Amount:       item.Amount,
+			Source:       item.Source,
+		}
+	}
+
+	return &contract.ExclusiveSummaryPeriodResponse{
+		OrganizationID: resp.OrganizationID,
+		OutletID:       resp.OutletID,
+		Period: contract.ExclusiveSummaryPeriodRange{
+			DateFrom: resp.Period.DateFrom,
+			DateTo:   resp.Period.DateTo,
+		},
+		Summary: contract.ExclusiveSummaryPeriodSummary{
+			Sales:                    resp.Summary.Sales,
+			HPP:                      resp.Summary.HPP,
+			GrossProfit:              resp.Summary.GrossProfit,
+			SalaryTotal:              resp.Summary.SalaryTotal,
+			SalaryDW:                 resp.Summary.SalaryDW,
+			SalaryStaff:              resp.Summary.SalaryStaff,
+			SalaryOther:              resp.Summary.SalaryOther,
+			OtherOperationalExpenses: resp.Summary.OtherOperationalExpenses,
+			OperationalExpensesTotal: resp.Summary.OperationalExpensesTotal,
+			TotalCost:                resp.Summary.TotalCost,
+			NetProfit:                resp.Summary.NetProfit,
+		},
+		Reimburse: contract.ExclusiveSummaryReimburse{
+			TotalCost:           resp.Reimburse.TotalCost,
+			ExcludedSalaryStaff: resp.Reimburse.ExcludedSalaryStaff,
+			TotalReimburse:      resp.Reimburse.TotalReimburse,
+		},
+		HPPBreakdown:                hppBreakdown,
+		OperationalExpenseBreakdown: operationalBreakdown,
+		DailySummary:                dailySummary,
+		DailyTransactions:           dailyTransactions,
+	}
+}
+
+func ExclusiveSummaryMonthlyModelToContract(resp *models.ExclusiveSummaryMonthlyResponse) *contract.ExclusiveSummaryMonthlyResponse {
+	if resp == nil {
+		return nil
+	}
+
+	periods := make([]contract.ExclusiveSummaryMonthlyPeriod, len(resp.Periods))
+	for i, item := range resp.Periods {
+		periods[i] = contract.ExclusiveSummaryMonthlyPeriod{
+			Label:       item.Label,
+			DateFrom:    item.DateFrom,
+			DateTo:      item.DateTo,
+			Sales:       item.Sales,
+			HPP:         item.HPP,
+			GrossProfit: item.GrossProfit,
+			GrossMargin: item.GrossMargin,
+		}
+	}
+
+	bankBalance := make([]contract.ExclusiveSummaryBankBalance, len(resp.BankBalance))
+	for i, item := range resp.BankBalance {
+		bankBalance[i] = contract.ExclusiveSummaryBankBalance{
+			Bank:             item.Bank,
+			OpeningBalance:   item.OpeningBalance,
+			IncomingMutation: item.IncomingMutation,
+			OutgoingMutation: item.OutgoingMutation,
+			ClosingBalance:   item.ClosingBalance,
+			Notes:            item.Notes,
+		}
+	}
+
+	return &contract.ExclusiveSummaryMonthlyResponse{
+		OrganizationID: resp.OrganizationID,
+		OutletID:       resp.OutletID,
+		Month:          resp.Month,
+		Summary: contract.ExclusiveSummaryMonthlySummary{
+			TotalSales:               resp.Summary.TotalSales,
+			HPP:                      resp.Summary.HPP,
+			GrossProfit:              resp.Summary.GrossProfit,
+			OperationalExpensesTotal: resp.Summary.OperationalExpensesTotal,
+			TotalCost:                resp.Summary.TotalCost,
+			NetProfit:                resp.Summary.NetProfit,
+			NetProfitMargin:          resp.Summary.NetProfitMargin,
+		},
+		Periods:     periods,
+		BankBalance: bankBalance,
+	}
+}
+
+func exclusiveSummaryCategoryBreakdownModelToContract(item models.ExclusiveSummaryCategoryBreakdown) contract.ExclusiveSummaryCategoryBreakdown {
+	return contract.ExclusiveSummaryCategoryBreakdown{
+		CategoryCode: item.CategoryCode,
+		CategoryName: item.CategoryName,
+		Amount:       item.Amount,
+		Percentage:   item.Percentage,
+	}
+}
+
+func parseFlexibleDateRangeToJakartaTime(dateFrom, dateTo string) (*time.Time, *time.Time, error) {
+	fromTime, toTime, err := util.ParseDateRangeToJakartaTime(dateFrom, dateTo)
+	if err == nil {
+		return fromTime, toTime, nil
+	}
+
+	fromTime, err = parseISODateToJakartaTime(dateFrom, false)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	toTime, err = parseISODateToJakartaTime(dateTo, true)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return fromTime, toTime, nil
+}
+
+func parseISODateToJakartaTime(dateStr string, endOfDay bool) (*time.Time, error) {
+	if dateStr == "" {
+		return nil, nil
+	}
+
+	date, err := time.Parse("2006-01-02", dateStr)
+	if err != nil {
+		return nil, err
+	}
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		return nil, err
+	}
+
+	if endOfDay {
+		result := time.Date(date.Year(), date.Month(), date.Day(), 23, 59, 59, 999999999, location)
+		return &result, nil
+	}
+
+	result := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, location)
+	return &result, nil
+}
+
+func parseMonthToJakartaTime(month string) (time.Time, error) {
+	location, err := time.LoadLocation("Asia/Jakarta")
+	if err != nil {
+		return time.Time{}, err
+	}
+
+	parsed, err := time.ParseInLocation("2006-01", month, location)
+	if err != nil {
+		return time.Time{}, err
+	}
+
+	return time.Date(parsed.Year(), parsed.Month(), 1, 0, 0, 0, 0, location), nil
+}

internal/transformer/analytics_transformer_test.go

@@ -52,17 +52,47 @@ func TestPurchasingAnalyticsContractToModelIgnoresInvalidOutlet(t *testing.T) {
 func TestPurchasingAnalyticsModelToContractCopiesOutletName(t *testing.T) {
 	outletID := uuid.New()
 	outletName := "Main Outlet"
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
 
 	result := PurchasingAnalyticsModelToContract(&models.PurchasingAnalyticsResponse{
 		OrganizationID: uuid.New(),
 		OutletID:       &outletID,
 		OutletName:     &outletName,
+		Summary: models.PurchasingSummary{
+			TotalPurchases:            300,
+			RawMaterialPurchases:      125,
+			ExpensePurchases:          175,
+			TotalPurchaseOrders:       3,
+			RawMaterialPurchaseOrders: 1,
+			ExpenseCount:              2,
+		},
+		Data: []models.PurchasingAnalyticsData{
+			{
+				Date:                      now,
+				Purchases:                 300,
+				RawMaterialPurchases:      125,
+				ExpensePurchases:          175,
+				PurchaseOrders:            3,
+				RawMaterialPurchaseOrders: 1,
+				ExpenseCount:              2,
+			},
+		},
 	})
 
 	require.NotNil(t, result)
 	require.Equal(t, &outletID, result.OutletID)
 	require.NotNil(t, result.OutletName)
 	require.Equal(t, outletName, *result.OutletName)
+	require.Equal(t, float64(300), result.Summary.TotalPurchases)
+	require.Equal(t, float64(125), result.Summary.RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Summary.ExpensePurchases)
+	require.Equal(t, int64(3), result.Summary.TotalPurchaseOrders)
+	require.Equal(t, int64(1), result.Summary.RawMaterialPurchaseOrders)
+	require.Equal(t, int64(2), result.Summary.ExpenseCount)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(300), result.Data[0].Purchases)
+	require.Equal(t, float64(125), result.Data[0].RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Data[0].ExpensePurchases)
 }
 
 func TestPurchasingAnalyticsModelToContractOmitsNilOutletName(t *testing.T) {
@@ -152,3 +182,43 @@ func TestProfitLossAnalyticsModelToContractCopiesDateRange(t *testing.T) {
 	require.Len(t, result.MainSummary, 1)
 	require.Equal(t, "total_omset", result.MainSummary[0].ID)
 }
+
+func TestExclusiveSummaryPeriodContractToModelParsesFlexibleDates(t *testing.T) {
+	orgID := uuid.New()
+	outletID := uuid.New().String()
+
+	result, err := ExclusiveSummaryPeriodContractToModel(&contract.ExclusiveSummaryPeriodRequest{
+		OrganizationID:                orgID,
+		OutletID:                      &outletID,
+		DateFrom:                      "2026-05-26",
+		DateTo:                        "2026-05-31",
+		ExcludeGajiStaffFromReimburse: true,
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, orgID, result.OrganizationID)
+	require.NotNil(t, result.OutletID)
+	require.Equal(t, outletID, result.OutletID.String())
+	require.True(t, result.ExcludeGajiStaffFromReimburse)
+
+	location, err := time.LoadLocation("Asia/Jakarta")
+	require.NoError(t, err)
+	require.Equal(t, time.Date(2026, 5, 26, 0, 0, 0, 0, location), result.DateFrom)
+	require.Equal(t, time.Date(2026, 5, 31, 23, 59, 59, int(time.Second-time.Nanosecond), location), result.DateTo)
+}
+
+func TestExclusiveSummaryMonthlyContractToModelParsesMonth(t *testing.T) {
+	orgID := uuid.New()
+
+	result, err := ExclusiveSummaryMonthlyContractToModel(&contract.ExclusiveSummaryMonthlyRequest{
+		OrganizationID: orgID,
+		Month:          "2026-05",
+	})
+
+	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_test.go

@@ -12,15 +12,19 @@ import (
 )
 
 func TestCreatePurchaseOrderRequestToModelAllowsMissingDueDate(t *testing.T) {
+	ingredientID := uuid.New()
+	quantity := 1.0
+	unitID := uuid.New()
+
 	result, err := CreatePurchaseOrderRequestToModel(&contract.CreatePurchaseOrderRequest{
 		VendorID:        uuid.New(),
 		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,
 			},
 		},

internal/validator/purchase_category_validator.go

@@ -34,7 +34,7 @@ func (v *PurchaseCategoryValidatorImpl) ValidateCreatePurchaseCategoryRequest(re
 	}
 
 	if !isValidPurchaseCategoryType(req.Type) {
-		return errors.New("type must be raw_material or non_inventory"), constants.MalformedFieldErrorCode
+		return errors.New("type must be raw_material or expense"), constants.MalformedFieldErrorCode
 	}
 
 	if req.Code != nil && len(strings.TrimSpace(*req.Code)) > 100 {
@@ -63,7 +63,7 @@ func (v *PurchaseCategoryValidatorImpl) ValidateUpdatePurchaseCategoryRequest(re
 	}
 
 	if req.Type != nil && !isValidPurchaseCategoryType(*req.Type) {
-		return errors.New("type must be raw_material or non_inventory"), constants.MalformedFieldErrorCode
+		return errors.New("type must be raw_material or expense"), constants.MalformedFieldErrorCode
 	}
 
 	if req.Code != nil && len(strings.TrimSpace(*req.Code)) > 100 {
@@ -87,7 +87,7 @@ func (v *PurchaseCategoryValidatorImpl) ValidateListPurchaseCategoriesRequest(re
 	}
 
 	if req.Type != "" && !isValidPurchaseCategoryType(req.Type) {
-		return errors.New("type must be raw_material or non_inventory"), constants.MalformedFieldErrorCode
+		return errors.New("type must be raw_material or expense"), constants.MalformedFieldErrorCode
 	}
 
 	return nil, ""
@@ -95,7 +95,7 @@ func (v *PurchaseCategoryValidatorImpl) ValidateListPurchaseCategoriesRequest(re
 
 func isValidPurchaseCategoryType(categoryType string) bool {
 	switch categoryType {
-	case "raw_material", "non_inventory":
+	case "raw_material", "expense":
 		return true
 	default:
 		return false

internal/validator/purchase_order_validator.go

@@ -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,6 +209,14 @@ 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 {
+		return errors.New("items[" + strconv.Itoa(index) + "].ingredient_id cannot be empty"), constants.MalformedFieldErrorCode
+	}
+
+	if item.UnitID != nil && *item.UnitID == uuid.Nil {
+		return errors.New("items[" + strconv.Itoa(index) + "].unit_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
 	}

internal/validator/purchase_order_validator_test.go

@@ -11,16 +11,20 @@ import (
 )
 
 func validCreatePurchaseOrderRequest() *contract.CreatePurchaseOrderRequest {
+	ingredientID := uuid.New()
+	quantity := 1.0
+	unitID := uuid.New()
+
 	return &contract.CreatePurchaseOrderRequest{
 		VendorID:        uuid.New(),
 		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,
 			},
 		},

migrations/000075_create_purchase_categories.up.sql

@@ -3,7 +3,7 @@ CREATE TABLE purchase_category_presets (
     parent_id UUID REFERENCES purchase_category_presets(id) ON DELETE SET NULL,
     code VARCHAR(100) NOT NULL UNIQUE,
     name VARCHAR(255) NOT NULL,
-    type VARCHAR(20) NOT NULL CHECK (type IN ('raw_material', 'non_inventory')),
+    type VARCHAR(20) NOT NULL CHECK (type IN ('raw_material', 'expense')),
     sort_order INTEGER NOT NULL DEFAULT 0,
     is_active BOOLEAN NOT NULL DEFAULT true,
     created_at TIMESTAMP WITH TIME ZONE DEFAULT NOW(),
@@ -17,7 +17,7 @@ CREATE TABLE purchase_categories (
     parent_id UUID REFERENCES purchase_categories(id) ON DELETE SET NULL,
     code VARCHAR(100) NOT NULL,
     name VARCHAR(255) NOT NULL,
-    type VARCHAR(20) NOT NULL CHECK (type IN ('raw_material', 'non_inventory')),
+    type VARCHAR(20) NOT NULL CHECK (type IN ('raw_material', 'expense')),
     sort_order INTEGER NOT NULL DEFAULT 0,
     is_system BOOLEAN NOT NULL DEFAULT false,
     is_active BOOLEAN NOT NULL DEFAULT true,
@@ -38,8 +38,8 @@ CREATE INDEX idx_purchase_categories_is_active ON purchase_categories(is_active)
 
 INSERT INTO purchase_category_presets (code, name, type, sort_order)
 VALUES
-    ('hpp', 'HPP', 'raw_material', 1),
+    ('bahan_baku', 'Bahan Baku', 'raw_material', 1),
-    ('biaya_lain_lain', 'Biaya Lain-lain', 'non_inventory', 2)
+    ('biaya_lain_lain', 'Biaya Lain-lain', 'expense', 2)
 ON CONFLICT (code) DO NOTHING;
 
 INSERT INTO purchase_category_presets (parent_id, code, name, type, sort_order)
@@ -47,18 +47,14 @@ SELECT parent.id, child.code, child.name, child.type, child.sort_order
 FROM purchase_category_presets parent
 JOIN (
     VALUES
-        ('hpp', 'hpp_bakso_mie_ayam', 'Bakso & Mie Ayam', 'raw_material', 1),
+        ('biaya_lain_lain', 'biaya_atk_perlengkapan', 'ATK & Perlengkapan', 'expense', 1),
-        ('hpp', 'hpp_nusantara', 'Nusantara', 'raw_material', 2),
+        ('biaya_lain_lain', 'biaya_makan_karyawan', 'Makan Karyawan', 'expense', 2),
-        ('hpp', 'hpp_ramen', 'Ramen', 'raw_material', 3),
+        ('biaya_lain_lain', 'biaya_bensin_parkir', 'Bensin & Parkir', 'expense', 3),
-        ('hpp', 'hpp_minuman_kopi', 'Minuman/Kopi', 'raw_material', 4),
+        ('biaya_lain_lain', 'biaya_kebersihan_keamanan', 'Kebersihan & Keamanan', 'expense', 4),
-        ('biaya_lain_lain', 'biaya_atk_perlengkapan', 'ATK & Perlengkapan', 'non_inventory', 1),
+        ('biaya_lain_lain', 'biaya_gaji_dw', 'Gaji DW', 'expense', 5),
-        ('biaya_lain_lain', 'biaya_makan_karyawan', 'Makan Karyawan', 'non_inventory', 2),
+        ('biaya_lain_lain', 'biaya_gaji_staff', 'Gaji Staff', 'expense', 6),
-        ('biaya_lain_lain', 'biaya_bensin_parkir', 'Bensin & Parkir', 'non_inventory', 3),
+        ('biaya_lain_lain', 'biaya_internet_server', 'Internet & Server', 'expense', 7),
-        ('biaya_lain_lain', 'biaya_kebersihan_keamanan', 'Kebersihan & Keamanan', 'non_inventory', 4),
+        ('biaya_lain_lain', 'biaya_air_listrik', 'Air & Listrik', 'expense', 8),
-        ('biaya_lain_lain', 'biaya_gaji_dw', 'Gaji DW', 'non_inventory', 5),
+        ('biaya_lain_lain', 'biaya_promosi', 'Promosi', 'expense', 9)
-        ('biaya_lain_lain', 'biaya_gaji_staff', 'Gaji Staff', 'non_inventory', 6),
-        ('biaya_lain_lain', 'biaya_internet_server', 'Internet & Server', 'non_inventory', 7),
-        ('biaya_lain_lain', 'biaya_air_listrik', 'Air & Listrik', 'non_inventory', 8),
-        ('biaya_lain_lain', 'biaya_promosi', 'Promosi', 'non_inventory', 9)
 ) AS child(parent_code, code, name, type, sort_order) ON parent.code = child.parent_code
 ON CONFLICT (code) DO NOTHING;

migrations/000080_rename_non_inventory_purchase_categories.down.sql

@@ -0,0 +1,32 @@
+ALTER TABLE purchase_category_presets DROP CONSTRAINT IF EXISTS purchase_category_presets_type_check;
+ALTER TABLE purchase_categories DROP CONSTRAINT IF EXISTS purchase_categories_type_check;
+
+UPDATE purchase_category_presets
+SET type = 'non_inventory'
+WHERE type = 'expense';
+
+UPDATE purchase_categories
+SET type = 'non_inventory'
+WHERE type = 'expense';
+
+UPDATE purchase_category_presets
+SET code = 'hpp', name = 'HPP'
+WHERE code = 'bahan_baku' AND type = 'raw_material';
+
+UPDATE purchase_categories
+SET code = 'hpp', name = 'HPP'
+WHERE code = 'bahan_baku' AND type = 'raw_material';
+
+UPDATE purchase_category_presets
+SET is_active = true
+WHERE code LIKE 'hpp\_%' ESCAPE '\' AND type = 'raw_material';
+
+UPDATE purchase_categories
+SET is_active = true
+WHERE code LIKE 'hpp\_%' ESCAPE '\' AND type = 'raw_material';
+
+ALTER TABLE purchase_category_presets
+ADD CONSTRAINT purchase_category_presets_type_check CHECK (type IN ('raw_material', 'non_inventory'));
+
+ALTER TABLE purchase_categories
+ADD CONSTRAINT purchase_categories_type_check CHECK (type IN ('raw_material', 'non_inventory'));

migrations/000080_rename_non_inventory_purchase_categories.up.sql

@@ -0,0 +1,36 @@
+ALTER TABLE purchase_category_presets DROP CONSTRAINT IF EXISTS purchase_category_presets_type_check;
+ALTER TABLE purchase_categories DROP CONSTRAINT IF EXISTS purchase_categories_type_check;
+
+UPDATE purchase_category_presets
+SET type = 'expense'
+WHERE type = 'non_inventory';
+
+UPDATE purchase_categories
+SET type = 'expense'
+WHERE type = 'non_inventory';
+
+UPDATE purchase_category_presets
+SET code = 'bahan_baku', name = 'Bahan Baku'
+WHERE code = 'hpp' AND type = 'raw_material';
+
+UPDATE purchase_categories
+SET code = 'bahan_baku', name = 'Bahan Baku'
+WHERE code = 'hpp' AND type = 'raw_material';
+
+UPDATE purchase_category_presets
+SET is_active = false
+WHERE code LIKE 'hpp\_%' ESCAPE '\' AND type = 'raw_material';
+
+UPDATE purchase_categories
+SET is_active = false
+WHERE code LIKE 'hpp\_%' ESCAPE '\' AND type = 'raw_material';
+
+ALTER TABLE purchase_category_presets
+ADD CONSTRAINT purchase_category_presets_type_check CHECK (type IN ('raw_material', 'expense'));
+
+ALTER TABLE purchase_categories
+ADD CONSTRAINT purchase_categories_type_check CHECK (type IN ('raw_material', 'expense'));
+
+ALTER TABLE purchase_order_items ALTER COLUMN ingredient_id DROP NOT NULL;
+ALTER TABLE purchase_order_items ALTER COLUMN quantity DROP NOT NULL;
+ALTER TABLE purchase_order_items ALTER COLUMN unit_id DROP NOT NULL;