Merge pull request from main into feature/expense

.gitignore

@@ -9,7 +9,3 @@ vendor
 
 # Firebase service account credentials
 infra/firebase-service-account.json
-
-# Config files containing secrets (manage manually on each server)
-# infra/production.yaml
-# infra/staging.yaml

.vscode/settings.json

@@ -1 +0,0 @@
-{}

Makefile

@@ -1,21 +1,9 @@
 #PROJECT_NAME = "enaklo-pos-backend"
-
-# ─── Environment (default: staging) ──────────────────────────────────────────
-ENV ?= staging
-
-ifeq ($(ENV),production)
-	DB_USERNAME :=apskel
-	DB_PASSWORD :=7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk
-	DB_HOST     :=62.72.45.250
-	DB_PORT     :=5433
-	DB_NAME     :=apskel_pos
-else
-	DB_USERNAME :=apskel
-	DB_PASSWORD :=7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk
-	DB_HOST     :=62.72.45.250
-	DB_PORT     :=5433
-	DB_NAME     :=apskel_pos_staging
-endif
+DB_USERNAME :=apskel
+DB_PASSWORD :=7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk
+DB_HOST :=62.72.45.250
+DB_PORT :=5433
+DB_NAME :=apskel_pos
 
 DB_URL = postgres://$(DB_USERNAME):$(DB_PASSWORD)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=disable
 
@@ -28,19 +16,15 @@ endif
 .SILENT: help
 help:
 	@echo
-	@echo "Usage: make [command] [ENV=staging|production]"
+	@echo "Usage: make [command]"
 	@echo
 	@echo "Commands:"
-	@echo " run                           Run server (default: staging)"
-	@echo " run ENV=production            Run server with production config"
-	@echo
 	@echo " rename-project name={name}    Rename project"
 	@echo
 	@echo " build-http                    Build http server"
 	@echo
 	@echo " migration-create name={name}  Create migration"
 	@echo " migration-up                  Up migrations"
-	@echo " migration-up ENV=production   Up migrations (production DB)"
 	@echo " migration-down                Down last migration"
 	@echo
 	@echo " docker-up                     Up docker services"
@@ -130,11 +114,7 @@ fmt:
 	@go fmt ./...
 
 start:
-	ENV_MODE=$(ENV) go run cmd/server/main.go
-
-.SILENT: run
-run:
-	ENV_MODE=$(ENV) go run cmd/server/main.go
+	go run main.go --env-path .env
 
 # Default
 

config/configs.go

@@ -12,14 +12,13 @@ import (
 const (
 	YAML_PATH        = "infra/%s"
 	ENV_MODE         = "ENV_MODE"
-	DEFAULT_ENV_MODE = "staging"
+	DEFAULT_ENV_MODE = "development"
 )
 
 var (
 	validEnvMode = map[string]struct{}{
 		"local":       {},
 		"development": {},
-		"staging":     {},
 		"production":  {},
 	}
 )

deployment.sh

@@ -2,61 +2,23 @@
 set -euo pipefail
 
 APP_NAME="apskel-pos"
-
-# ─── Deteksi environment dari branch aktif ───────────────────────────────────
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-
-case "$CURRENT_BRANCH" in
-  main)
-    ENV_MODE="production"
-    PORT="4000"
-    ;;
-  staging)
-    ENV_MODE="staging"
-    PORT="4001"
-    ;;
-  *)
-    echo "❌ Branch '$CURRENT_BRANCH' tidak dikenali untuk deployment."
-    echo "   Gunakan branch 'main' (production) atau 'staging' (staging)."
-    exit 1
-    ;;
-esac
-
-CONTAINER_NAME="$APP_NAME"
-IMAGE_NAME="$APP_NAME:$ENV_MODE"
-
-echo "📦 Environment : $ENV_MODE"
-echo "🌿 Branch      : $CURRENT_BRANCH"
-echo "🐳 Container   : $CONTAINER_NAME"
-echo "🔌 Port        : $PORT"
-echo ""
-
-# ─── Pastikan config file ada ─────────────────────────────────────────────────
-CONFIG_FILE="infra/$ENV_MODE.yaml"
-if [ ! -f "$CONFIG_FILE" ]; then
-  echo "❌ Config file '$CONFIG_FILE' tidak ditemukan."
-  exit 1
-fi
+PORT="4000"
 
 echo "🔄 Pulling latest code..."
 git pull
 
-echo "🐳 Building Docker image ($ENV_MODE)..."
-docker build --target production -t "$IMAGE_NAME" .
+echo "🐳 Building Docker image (production target)..."
+docker build --target production -t $APP_NAME:latest .
 
 echo "🛑 Stopping and removing old container..."
-docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
+docker rm -f $APP_NAME 2>/dev/null || true
 
 echo "🚀 Running new container..."
-docker run -d --name "$CONTAINER_NAME" \
-  -p "$PORT:4000" \
+docker run -d --name $APP_NAME \
+  -p $PORT:$PORT \
   -e TZ=Asia/Jakarta \
-  -e ENV_MODE="$ENV_MODE" \
   -v "$(pwd)/infra":/infra:ro \
   -v "$(pwd)/templates":/templates:ro \
-  "$IMAGE_NAME"
+  $APP_NAME:latest
 
-echo ""
-echo "✅ Deployment $ENV_MODE complete."
-echo "   Container : $CONTAINER_NAME"
-echo "   Port      : $PORT"
+echo "✅ Deployment complete."

go.sum

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

infra/development.yaml

@@ -1,7 +1,7 @@
 server:
   base-url:
   local-url:
-  self-order-url:
+  self-order-url: http://localhost:5173
   port: 4000
 
 jwt:
@@ -9,7 +9,7 @@ jwt:
     expires-ttl: 144000
     secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
   refresh_token:
-    expires-ttl: 7776000
+    expires-ttl: 7776000  # 3 months in minutes (90 days * 24 hours * 60 minutes)
     secret: "R3fr3sh_T0k3n_S3cr3t_K3y_2024_P0S"
   customer:
     expires-ttl: 7776000
@@ -21,7 +21,7 @@ postgresql:
   driver: postgres
   db: apskel_pos
   username: apskel
-  password: "7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk"
+  password: '7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk'
   ssl-mode: disable
   max-idle-connections-in-second: 600
   max-open-connections-in-second: 600
@@ -45,11 +45,11 @@ s3:
   endpoint: sin1.contabostorage.com
   bucket_name: enaklo
   log_level: Error
-  host_url: "https://sin1.contabostorage.com/fda98c2228f246f29a7e466b86b3b9e7:"
+  host_url: 'https://sin1.contabostorage.com/fda98c2228f246f29a7e466b86b3b9e7:'
 
 log:
-  log_format: "json"
-  log_level: "info"
+  log_format: 'json'
+  log_level: 'debug'
 
 fonnte:
   api_url: "https://api.fonnte.com/send"
@@ -58,4 +58,4 @@ fonnte:
 
 fcm:
   credentials_file: "infra/firebase-service-account.json"
-  project_id: "apskel-pos-v2"
+  project_id: "apskel-pos-v2"

infra/staging.yaml

@@ -1,61 +0,0 @@
-server:
-  base-url:
-  local-url:
-  self-order-url:
-  port: 4000
-
-jwt:
-  token:
-    expires-ttl: 144000
-    secret: "eZ7LAZJuSOGSHxb1ZYaZCkrBo5YBvc"
-  refresh_token:
-    expires-ttl: 7776000
-    secret: "EMx2DKPtMp0jQNpLvzzCsZkoUHe0d9"
-  customer:
-    expires-ttl: 7776000
-    secret: "layCV2rne0X57acWzSS3NxENmYJs7B"
-
-postgresql:
-  host: 62.72.45.250
-  port: 5433
-  driver: postgres
-  db: apskel_pos_staging
-  username: apskel
-  password: "7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk"
-  ssl-mode: disable
-  max-idle-connections-in-second: 600
-  max-open-connections-in-second: 600
-  connection-max-life-time-in-second: 600
-  debug: false
-
-redis:
-  host: 62.72.45.250
-  port: 6380
-  password: "CmICdmnX1EZPhVBYzQPEGw==U"
-  db: 1
-  dial_timeout: 5s
-  read_timeout: 3s
-  write_timeout: 3s
-  pool_size: 10
-  min_idle_connections: 5
-
-s3:
-  access_key_id: cf9a475e18bc7626cbdbf09709d82a64
-  access_key_secret: 91f3321294d3e23035427a0ecb893ada
-  endpoint: sin1.contabostorage.com
-  bucket_name: enaklo
-  log_level: Error
-  host_url: "https://sin1.contabostorage.com/fda98c2228f246f29a7e466b86b3b9e7:"
-
-log:
-  log_format: "json"
-  log_level: "info"
-
-fonnte:
-  api_url: "https://api.fonnte.com/send"
-  token: "bADQrf9NTXfLZQCK2wGg"
-  timeout: 30
-
-fcm:
-  credentials_file: "infra/firebase-service-account.json"
-  project_id: "apskel-pos-v2"

internal/app/app.go

@@ -372,7 +372,7 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		ingredientProcessor:                 processor.NewIngredientProcessor(repos.ingredientRepo, repos.unitRepo, repos.ingredientCompositionRepo),
 		productRecipeProcessor:              processor.NewProductRecipeProcessor(repos.productRecipeRepo, repos.productRepo, repos.ingredientRepo),
 		vendorProcessor:                     processor.NewVendorProcessorImpl(repos.vendorRepo),
-		purchaseOrderProcessor:              processor.NewPurchaseOrderProcessorImpl(repos.purchaseOrderRepo, repos.vendorRepo, repos.ingredientRepo, repos.purchaseCategoryRepo, repos.unitRepo, repos.fileRepo, inventoryMovementService, repos.unitConverterRepo),
+		purchaseOrderProcessor:              processor.NewPurchaseOrderProcessorImpl(repos.purchaseOrderRepo, repos.vendorRepo, repos.ingredientRepo, repos.unitRepo, repos.fileRepo, inventoryMovementService, repos.unitConverterRepo),
 		purchaseCategoryProcessor:           processor.NewPurchaseCategoryProcessorImpl(repos.purchaseCategoryRepo),
 		unitConverterProcessor:              processor.NewIngredientUnitConverterProcessorImpl(repos.unitConverterRepo, repos.ingredientRepo, repos.unitRepo),
 		chartOfAccountTypeProcessor:         processor.NewChartOfAccountTypeProcessorImpl(repos.chartOfAccountTypeRepo),
@@ -396,7 +396,7 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		userDeviceProcessor:                 processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
 		notificationProcessor:               buildNotificationProcessor(cfg, repos),
 		productOutletPriceProcessor:         processor.NewProductOutletPriceProcessorImpl(repos.productOutletPriceRepo, repos.productRepo, repos.outletRepo),
-		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo, repos.purchaseCategoryRepo),
+		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo),
 	}
 }
 

internal/constants/budget.go

@@ -1,9 +0,0 @@
-package constants
-
-// Budget allocation of revenue used by the parent category cut-off report.
-// The three shares are expected to add up to 100.
-const (
-	BudgetLimitPurchasePercent = 60.0
-	BudgetLimitOwnerPercent    = 20.0
-	BudgetLimitTeamPercent     = 20.0
-)

internal/constants/user.go

@@ -3,12 +3,11 @@ package constants
 type UserRole string
 
 const (
-	RoleAdmin      UserRole = "admin"
-	RoleManager    UserRole = "manager"
-	RoleCashier    UserRole = "cashier"
-	RoleWaiter     UserRole = "waiter"
-	RoleOwner      UserRole = "owner"
-	RolePurchasing UserRole = "purchasing"
+	RoleAdmin   UserRole = "admin"
+	RoleManager UserRole = "manager"
+	RoleCashier UserRole = "cashier"
+	RoleWaiter  UserRole = "waiter"
+	RoleOwner   UserRole = "owner"
 )
 
 func GetAllUserRoles() []UserRole {
@@ -18,7 +17,6 @@ func GetAllUserRoles() []UserRole {
 		RoleCashier,
 		RoleWaiter,
 		RoleOwner,
-		RolePurchasing,
 	}
 }
 

internal/contract/analytics_contract.go

@@ -18,7 +18,6 @@ type PaymentMethodAnalyticsRequest struct {
 type PaymentMethodAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	GroupBy        string                       `json:"group_by"`
@@ -55,7 +54,6 @@ type SalesAnalyticsRequest struct {
 type SalesAnalyticsResponse struct {
 	OrganizationID uuid.UUID            `json:"organization_id"`
 	OutletID       *uuid.UUID           `json:"outlet_id,omitempty"`
-	OutletName     *string              `json:"outlet_name,omitempty"`
 	DateFrom       time.Time            `json:"date_from"`
 	DateTo         time.Time            `json:"date_to"`
 	GroupBy        string               `json:"group_by"`
@@ -108,11 +106,7 @@ 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"`
@@ -120,16 +114,12 @@ type PurchasingSummary struct {
 }
 
 type PurchasingAnalyticsData struct {
-	Date                      time.Time `json:"date"`
-	Purchases                 float64   `json:"purchases"`
-	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	ExpensePurchases          float64   `json:"expense_purchases"`
-	PurchaseOrders            int64     `json:"purchase_orders"`
-	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64     `json:"expense_count"`
-	Quantity                  float64   `json:"quantity"`
-	Ingredients               int64     `json:"ingredients"`
-	Vendors                   int64     `json:"vendors"`
+	Date           time.Time `json:"date"`
+	Purchases      float64   `json:"purchases"`
+	PurchaseOrders int64     `json:"purchase_orders"`
+	Quantity       float64   `json:"quantity"`
+	Ingredients    int64     `json:"ingredients"`
+	Vendors        int64     `json:"vendors"`
 }
 
 type PurchasingIngredientData struct {
@@ -142,12 +132,12 @@ type PurchasingIngredientData struct {
 }
 
 type PurchasingVendorData struct {
-	VendorID           *uuid.UUID `json:"vendor_id"`
-	VendorName         string     `json:"vendor_name"`
-	TotalCost          float64    `json:"total_cost"`
-	PurchaseOrderCount int64      `json:"purchase_order_count"`
-	IngredientCount    int64      `json:"ingredient_count"`
-	Quantity           float64    `json:"quantity"`
+	VendorID           uuid.UUID `json:"vendor_id"`
+	VendorName         string    `json:"vendor_name"`
+	TotalCost          float64   `json:"total_cost"`
+	PurchaseOrderCount int64     `json:"purchase_order_count"`
+	IngredientCount    int64     `json:"ingredient_count"`
+	Quantity           float64   `json:"quantity"`
 }
 
 // ProductAnalyticsRequest represents the request for product analytics
@@ -163,7 +153,6 @@ type ProductAnalyticsRequest struct {
 type ProductAnalyticsResponse struct {
 	OrganizationID uuid.UUID              `json:"organization_id"`
 	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
-	OutletName     *string                `json:"outlet_name,omitempty"`
 	DateFrom       time.Time              `json:"date_from"`
 	DateTo         time.Time              `json:"date_to"`
 	Data           []ProductAnalyticsData `json:"data"`
@@ -201,7 +190,6 @@ type ProductAnalyticsPerCategoryRequest struct {
 type ProductAnalyticsPerCategoryResponse struct {
 	OrganizationID uuid.UUID                         `json:"organization_id"`
 	OutletID       *uuid.UUID                        `json:"outlet_id,omitempty"`
-	OutletName     *string                           `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                         `json:"date_from"`
 	DateTo         time.Time                         `json:"date_to"`
 	Data           []ProductAnalyticsPerCategoryData `json:"data"`
@@ -219,135 +207,6 @@ type ProductAnalyticsPerCategoryData struct {
 	TotalMovingAverageHpp float64   `json:"total_moving_average_hpp"`
 }
 
-// ProductAnalyticsPerParentCategoryRequest represents the request for product analytics per parent category
-type ProductAnalyticsPerParentCategoryRequest struct {
-	OrganizationID uuid.UUID
-	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
-}
-
-// ProductAnalyticsPerParentCategoryResponse represents the response for product analytics per parent category
-type ProductAnalyticsPerParentCategoryResponse struct {
-	OrganizationID uuid.UUID                               `json:"organization_id"`
-	OutletID       *uuid.UUID                              `json:"outlet_id,omitempty"`
-	OutletName     *string                                 `json:"outlet_name,omitempty"`
-	DateFrom       time.Time                               `json:"date_from"`
-	DateTo         time.Time                               `json:"date_to"`
-	Data           []ProductAnalyticsPerParentCategoryData `json:"data"`
-	Budget         BudgetCutOff                            `json:"budget"`
-}
-
-type ProductAnalyticsPerParentCategoryData struct {
-	ParentCategoryID      uuid.UUID `json:"parent_category_id"`
-	ParentCategoryName    string    `json:"parent_category_name"`
-	TotalRevenue          float64   `json:"total_revenue"`
-	TotalQuantity         int64     `json:"total_quantity"`
-	CategoryCount         int64     `json:"category_count"`
-	ProductCount          int64     `json:"product_count"`
-	OrderCount            int64     `json:"order_count"`
-	TotalStandardHpp      float64   `json:"total_standard_hpp"`
-	TotalFifoHpp          float64   `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64   `json:"total_moving_average_hpp"`
-}
-
-// ParentCategoryAnalyticsDetailRequest represents the request for the drill-down of one parent category
-type ParentCategoryAnalyticsDetailRequest struct {
-	OrganizationID   uuid.UUID
-	ParentCategoryID string
-	OutletID         *string `form:"outlet_id,omitempty"`
-	DateFrom         string  `form:"date_from" validate:"required"`
-	DateTo           string  `form:"date_to" validate:"required"`
-}
-
-// ParentCategoryAnalyticsDetailResponse represents the drill-down of one parent category
-type ParentCategoryAnalyticsDetailResponse struct {
-	OrganizationID     uuid.UUID                            `json:"organization_id"`
-	OutletID           *uuid.UUID                           `json:"outlet_id,omitempty"`
-	OutletName         *string                              `json:"outlet_name,omitempty"`
-	DateFrom           time.Time                            `json:"date_from"`
-	DateTo             time.Time                            `json:"date_to"`
-	ParentCategoryID   uuid.UUID                            `json:"parent_category_id"`
-	ParentCategoryName string                               `json:"parent_category_name"`
-	Summary            ParentCategoryAnalyticsDetailSummary `json:"summary"`
-	Categories         []ParentCategoryAnalyticsDetailData  `json:"categories"`
-	Budget             BudgetCutOff                         `json:"budget"`
-}
-
-type ParentCategoryAnalyticsDetailSummary struct {
-	TotalRevenue          float64 `json:"total_revenue"`
-	TotalQuantity         int64   `json:"total_quantity"`
-	CategoryCount         int64   `json:"category_count"`
-	ProductCount          int64   `json:"product_count"`
-	OrderCount            int64   `json:"order_count"`
-	TotalStandardHpp      float64 `json:"total_standard_hpp"`
-	TotalFifoHpp          float64 `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64 `json:"total_moving_average_hpp"`
-}
-
-type ParentCategoryAnalyticsDetailData struct {
-	CategoryID            uuid.UUID                            `json:"category_id"`
-	CategoryName          string                               `json:"category_name"`
-	TotalRevenue          float64                              `json:"total_revenue"`
-	TotalQuantity         int64                                `json:"total_quantity"`
-	ProductCount          int64                                `json:"product_count"`
-	OrderCount            int64                                `json:"order_count"`
-	TotalStandardHpp      float64                              `json:"total_standard_hpp"`
-	TotalFifoHpp          float64                              `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64                              `json:"total_moving_average_hpp"`
-	Products              []ParentCategoryAnalyticsProductData `json:"products"`
-}
-
-type ParentCategoryAnalyticsProductData struct {
-	ProductID               uuid.UUID `json:"product_id"`
-	ProductName             string    `json:"product_name"`
-	ProductSku              string    `json:"product_sku"`
-	ProductPrice            float64   `json:"product_price"`
-	QuantitySold            int64     `json:"quantity_sold"`
-	Revenue                 float64   `json:"revenue"`
-	AveragePrice            float64   `json:"average_price"`
-	OrderCount              int64     `json:"order_count"`
-	StandardHppPerUnit      float64   `json:"standard_hpp_per_unit"`
-	StandardHppTotal        float64   `json:"standard_hpp_total"`
-	FifoHppPerUnit          float64   `json:"fifo_hpp_per_unit"`
-	FifoHppTotal            float64   `json:"fifo_hpp_total"`
-	MovingAverageHppPerUnit float64   `json:"moving_average_hpp_per_unit"`
-	MovingAverageHppTotal   float64   `json:"moving_average_hpp_total"`
-}
-
-// BudgetCutOff is the Monday-to-Sunday spending limit breakdown attached to the
-// parent category reports.
-type BudgetCutOff struct {
-	Percentages BudgetPercentages   `json:"percentages"`
-	CutOffFrom  time.Time           `json:"cut_off_from"`
-	CutOffTo    time.Time           `json:"cut_off_to"`
-	Total       BudgetPeriod        `json:"total"`
-	Weekly      []BudgetPeriod      `json:"weekly"`
-	Monthly     []BudgetMonthPeriod `json:"monthly"`
-}
-
-type BudgetPercentages struct {
-	Purchase float64 `json:"purchase"`
-	Owner    float64 `json:"owner"`
-	Team     float64 `json:"team"`
-}
-
-type BudgetPeriod struct {
-	PeriodStart   time.Time `json:"period_start"`
-	PeriodEnd     time.Time `json:"period_end"`
-	Revenue       float64   `json:"revenue"`
-	OrderCount    int64     `json:"order_count"`
-	LimitPurchase float64   `json:"limit_purchase"`
-	LimitOwner    float64   `json:"limit_owner"`
-	LimitTeam     float64   `json:"limit_team"`
-}
-
-type BudgetMonthPeriod struct {
-	Month     string `json:"month"`
-	WeekCount int    `json:"week_count"`
-	BudgetPeriod
-}
-
 // DashboardAnalyticsRequest represents the request for dashboard analytics
 type DashboardAnalyticsRequest struct {
 	OrganizationID uuid.UUID
@@ -360,7 +219,6 @@ type DashboardAnalyticsRequest struct {
 type DashboardAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	Overview       DashboardOverview            `json:"overview"`
@@ -371,15 +229,12 @@ type DashboardAnalyticsResponse struct {
 
 // DashboardOverview represents the overview data for dashboard
 type DashboardOverview struct {
-	TotalSales         float64 `json:"total_sales"`
-	TotalOrders        int64   `json:"total_orders"`
-	AverageOrderValue  float64 `json:"average_order_value"`
-	TotalCustomers     int64   `json:"total_customers"`
-	VoidedOrders       int64   `json:"voided_orders"`
-	RefundedOrders     int64   `json:"refunded_orders"`
-	TotalItemSold      int64   `json:"total_item_sold"`
-	TotalLowStock      int64   `json:"total_low_stock"`
-	TotalProductActive int64   `json:"total_product_active"`
+	TotalSales        float64 `json:"total_sales"`
+	TotalOrders       int64   `json:"total_orders"`
+	AverageOrderValue float64 `json:"average_order_value"`
+	TotalCustomers    int64   `json:"total_customers"`
+	VoidedOrders      int64   `json:"voided_orders"`
+	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
 type ProfitLossAnalyticsRequest struct {
@@ -393,7 +248,6 @@ type ProfitLossAnalyticsRequest struct {
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	OutletName               *string                  `json:"outlet_name,omitempty"`
 	DateFrom                 time.Time                `json:"date_from"`
 	DateTo                   time.Time                `json:"date_to"`
 	GroupBy                  string                   `json:"group_by"`
@@ -401,28 +255,10 @@ type ProfitLossAnalyticsResponse struct {
 	Data                     []ProfitLossData         `json:"data"`
 	ProductData              []ProductProfitData      `json:"product_data"`
 	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
-	Purchasing               ProfitLossPurchasing     `json:"purchasing"`
 	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
 	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
-type ProfitLossPurchasing struct {
-	TodayTotal       float64                    `json:"today_total"`
-	MtdTotal         float64                    `json:"mtd_total"`
-	TodayRawMaterial float64                    `json:"today_raw_material"`
-	MtdRawMaterial   float64                    `json:"mtd_raw_material"`
-	TodayExpense     float64                    `json:"today_expense"`
-	MtdExpense       float64                    `json:"mtd_expense"`
-	Items            []ProfitLossPurchasingItem `json:"items"`
-}
-
-type ProfitLossPurchasingItem struct {
-	Date     time.Time `json:"date"`
-	Item     string    `json:"item"`
-	Quantity float64   `json:"quantity"`
-	Nominal  float64   `json:"nominal"`
-}
-
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -480,123 +316,3 @@ 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 ExclusiveSummaryMTDRequest struct {
-	OrganizationID                uuid.UUID
-	OutletID                      *string `form:"outlet_id,omitempty"`
-	DateTo                        string  `form:"date_to" validate:"required"`
-	ExcludeGajiStaffFromReimburse bool    `form:"exclude_gaji_staff_from_reimburse"`
-}
-
-type ExclusiveSummaryPeriodResponse struct {
-	OrganizationID              uuid.UUID                           `json:"organization_id"`
-	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`
-	OutletName                  *string                             `json:"outlet_name,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"`
-	OutletName     *string                         `json:"outlet_name,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/category_contract.go

@@ -11,7 +11,6 @@ type CreateCategoryRequest struct {
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
 	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
-	ParentID     *uuid.UUID             `json:"parent_id,omitempty"`
 	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
@@ -21,7 +20,6 @@ type UpdateCategoryRequest struct {
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
 	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
-	ParentID     *uuid.UUID             `json:"parent_id,omitempty"`
 	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
@@ -29,8 +27,6 @@ type UpdateCategoryRequest struct {
 type ListCategoriesRequest struct {
 	OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
 	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
-	ParentID       *uuid.UUID `json:"parent_id,omitempty"`
-	Type           string     `json:"type,omitempty" validate:"omitempty,oneof=parent child"`
 	BusinessType   string     `json:"business_type,omitempty"`
 	Search         string     `json:"search,omitempty"`
 	Page           int        `json:"page" validate:"required,min=1"`
@@ -42,8 +38,6 @@ type CategoryResponse struct {
 	ID             uuid.UUID              `json:"id"`
 	OrganizationID uuid.UUID              `json:"organization_id"`
 	OutletID       *uuid.UUID             `json:"outlet_id"`
-	ParentID       *uuid.UUID             `json:"parent_id,omitempty"`
-	ParentName     *string                `json:"parent_name,omitempty"`
 	Name           string                 `json:"name"`
 	Description    *string                `json:"description"`
 	BusinessType   string                 `json:"business_type"`

internal/contract/expense_contract.go

@@ -19,11 +19,10 @@ type CreateExpenseRequest struct {
 }
 
 type CreateExpenseItemRequest struct {
-	ChartOfAccountID   string  `json:"chart_of_account_id" validate:"required"`
-	PurchaseCategoryID string  `json:"purchase_category_id" validate:"required"`
-	Item               string  `json:"item" validate:"required"`
-	Description        *string `json:"description,omitempty"`
-	Amount             float64 `json:"amount" validate:"required"`
+	ChartOfAccountID string  `json:"chart_of_account_id" validate:"required"`
+	Item             string  `json:"item" validate:"required"`
+	Description      *string `json:"description,omitempty"`
+	Amount           float64 `json:"amount" validate:"required"`
 }
 
 type UpdateExpenseRequest struct {
@@ -40,11 +39,10 @@ type UpdateExpenseRequest struct {
 }
 
 type UpdateExpenseItemRequest struct {
-	ChartOfAccountID   *string  `json:"chart_of_account_id,omitempty"`
-	PurchaseCategoryID *string  `json:"purchase_category_id,omitempty"`
-	Item               *string  `json:"item,omitempty"`
-	Description        *string  `json:"description,omitempty"`
-	Amount             *float64 `json:"amount,omitempty"`
+	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
+	Item             *string  `json:"item,omitempty"`
+	Description      *string  `json:"description,omitempty"`
+	Amount           *float64 `json:"amount,omitempty"`
 }
 
 type ExpenseResponse struct {
@@ -65,19 +63,15 @@ type ExpenseResponse struct {
 }
 
 type ExpenseItemResponse struct {
-	ID                   uuid.UUID                 `json:"id"`
-	ExpenseID            uuid.UUID                 `json:"expense_id"`
-	ChartOfAccountID     uuid.UUID                 `json:"chart_of_account_id"`
-	ChartOfAccountName   string                    `json:"chart_of_account_name,omitempty"`
-	PurchaseCategoryID   uuid.UUID                 `json:"purchase_category_id"`
-	PurchaseCategoryName string                    `json:"purchase_category_name,omitempty"`
-	PurchaseCategoryType string                    `json:"purchase_category_type,omitempty"`
-	PurchaseCategory     *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Item                 string                    `json:"item"`
-	Description          *string                   `json:"description"`
-	Amount               float64                   `json:"amount"`
-	CreatedAt            time.Time                 `json:"created_at"`
-	UpdatedAt            time.Time                 `json:"updated_at"`
+	ID                 uuid.UUID `json:"id"`
+	ExpenseID          uuid.UUID `json:"expense_id"`
+	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
+	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	Item               string    `json:"item"`
+	Description        *string   `json:"description"`
+	Amount             float64   `json:"amount"`
+	CreatedAt          time.Time `json:"created_at"`
+	UpdatedAt          time.Time `json:"updated_at"`
 }
 
 type ListExpenseRequest struct {
@@ -106,16 +100,15 @@ type ExpenseAnalyticsRequest struct {
 }
 
 type ExpenseAnalyticsResponse struct {
-	OrganizationID     uuid.UUID                            `json:"organization_id"`
-	OutletID           *uuid.UUID                           `json:"outlet_id,omitempty"`
-	DateFrom           time.Time                            `json:"date_from"`
-	DateTo             time.Time                            `json:"date_to"`
-	GroupBy            string                               `json:"group_by"`
-	Summary            ExpenseAnalyticsSummary              `json:"summary"`
-	Data               []ExpenseAnalyticsData               `json:"data"`
-	CategoryData       []ExpenseAnalyticsCategoryData       `json:"category_data"`
-	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData `json:"chart_of_account_data"`
-	ItemData           []ExpenseAnalyticsItemData           `json:"item_data"`
+	OrganizationID uuid.UUID                      `json:"organization_id"`
+	OutletID       *uuid.UUID                     `json:"outlet_id,omitempty"`
+	DateFrom       time.Time                      `json:"date_from"`
+	DateTo         time.Time                      `json:"date_to"`
+	GroupBy        string                         `json:"group_by"`
+	Summary        ExpenseAnalyticsSummary        `json:"summary"`
+	Data           []ExpenseAnalyticsData         `json:"data"`
+	CategoryData   []ExpenseAnalyticsCategoryData `json:"category_data"`
+	ItemData       []ExpenseAnalyticsItemData     `json:"item_data"`
 }
 
 type ExpenseAnalyticsSummary struct {
@@ -137,15 +130,6 @@ type ExpenseAnalyticsData struct {
 }
 
 type ExpenseAnalyticsCategoryData struct {
-	PurchaseCategoryID   uuid.UUID `json:"purchase_category_id"`
-	PurchaseCategoryName string    `json:"purchase_category_name"`
-	PurchaseCategoryType string    `json:"purchase_category_type"`
-	TotalAmount          float64   `json:"total_amount"`
-	ExpenseCount         int64     `json:"expense_count"`
-	ItemCount            int64     `json:"item_count"`
-}
-
-type ExpenseAnalyticsChartOfAccountData struct {
 	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
 	ChartOfAccountName string    `json:"chart_of_account_name"`
 	TotalAmount        float64   `json:"total_amount"`

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 expense"`
+	Type      string     `json:"type" validate:"required,oneof=raw_material non_inventory"`
 	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 expense"`
+	Type      *string    `json:"type,omitempty" validate:"omitempty,oneof=raw_material non_inventory"`
 	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 expense"`
+	Type     string     `json:"type,omitempty" validate:"omitempty,oneof=raw_material non_inventory"`
 	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

@@ -7,7 +7,7 @@ import (
 )
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
+	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
 	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
 	TransactionDate   string                           `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
 	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
@@ -19,12 +19,11 @@ type CreatePurchaseOrderRequest struct {
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
-	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id" validate:"required"`
-	Description        *string    `json:"description,omitempty" validate:"omitempty"`
-	Quantity           *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
-	Amount             float64    `json:"amount" validate:"required,gte=0"`
+	IngredientID uuid.UUID `json:"ingredient_id" validate:"required"`
+	Description  *string   `json:"description,omitempty" validate:"omitempty"`
+	Quantity     float64   `json:"quantity" validate:"required,gt=0"`
+	UnitID       uuid.UUID `json:"unit_id" validate:"required"`
+	Amount       float64   `json:"amount" validate:"required,gte=0"`
 }
 
 type UpdatePurchaseOrderRequest struct {
@@ -40,20 +39,18 @@ type UpdatePurchaseOrderRequest struct {
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	ID                 *uuid.UUID `json:"id,omitempty"` // For existing items
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
-	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id,omitempty" validate:"omitempty"`
-	Description        *string    `json:"description,omitempty" validate:"omitempty"`
-	Quantity           *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
-	Amount             *float64   `json:"amount,omitempty" validate:"omitempty,gte=0"`
+	ID           *uuid.UUID `json:"id,omitempty"` // For existing items
+	IngredientID *uuid.UUID `json:"ingredient_id,omitempty" validate:"omitempty"`
+	Description  *string    `json:"description,omitempty" validate:"omitempty"`
+	Quantity     *float64   `json:"quantity,omitempty" validate:"omitempty,gt=0"`
+	UnitID       *uuid.UUID `json:"unit_id,omitempty" validate:"omitempty"`
+	Amount       *float64   `json:"amount,omitempty" validate:"omitempty,gte=0"`
 }
 
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	OutletID        *uuid.UUID                        `json:"outlet_id"`
-	VendorID        *uuid.UUID                        `json:"vendor_id"`
+	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
 	DueDate         *time.Time                        `json:"due_date"`
@@ -69,19 +66,17 @@ type PurchaseOrderResponse struct {
 }
 
 type PurchaseOrderItemResponse struct {
-	ID                 uuid.UUID                 `json:"id"`
-	PurchaseOrderID    uuid.UUID                 `json:"purchase_order_id"`
-	IngredientID       *uuid.UUID                `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID                 `json:"purchase_category_id"`
-	Description        *string                   `json:"description"`
-	Quantity           *float64                  `json:"quantity"`
-	UnitID             *uuid.UUID                `json:"unit_id"`
-	Amount             float64                   `json:"amount"`
-	CreatedAt          time.Time                 `json:"created_at"`
-	UpdatedAt          time.Time                 `json:"updated_at"`
-	Ingredient         *IngredientResponse       `json:"ingredient,omitempty"`
-	PurchaseCategory   *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Unit               *UnitResponse             `json:"unit,omitempty"`
+	ID              uuid.UUID           `json:"id"`
+	PurchaseOrderID uuid.UUID           `json:"purchase_order_id"`
+	IngredientID    uuid.UUID           `json:"ingredient_id"`
+	Description     *string             `json:"description"`
+	Quantity        float64             `json:"quantity"`
+	UnitID          uuid.UUID           `json:"unit_id"`
+	Amount          float64             `json:"amount"`
+	CreatedAt       time.Time           `json:"created_at"`
+	UpdatedAt       time.Time           `json:"updated_at"`
+	Ingredient      *IngredientResponse `json:"ingredient,omitempty"`
+	Unit            *UnitResponse       `json:"unit,omitempty"`
 }
 
 type PurchaseOrderAttachmentResponse struct {

internal/contract/user_contract.go

@@ -12,14 +12,14 @@ type CreateUserRequest struct {
 	Name           string                 `json:"name" validate:"required,min=1,max=255"`
 	Email          string                 `json:"email" validate:"required,email"`
 	Password       string                 `json:"password" validate:"required,min=6"`
-	Role           string                 `json:"role" validate:"required,oneof=admin manager cashier waiter owner purchasing"`
+	Role           string                 `json:"role" validate:"required,oneof=admin manager cashier waiter"`
 	Permissions    map[string]interface{} `json:"permissions,omitempty"`
 }
 
 type UpdateUserRequest struct {
 	Name        *string                 `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
 	Email       *string                 `json:"email,omitempty" validate:"omitempty,email"`
-	Role        *string                 `json:"role,omitempty" validate:"omitempty,oneof=admin manager cashier waiter owner purchasing"`
+	Role        *string                 `json:"role,omitempty" validate:"omitempty,oneof=admin manager cashier waiter"`
 	OutletID    *uuid.UUID              `json:"outlet_id,omitempty"`
 	IsActive    *bool                   `json:"is_active,omitempty"`
 	Permissions *map[string]interface{} `json:"permissions,omitempty"`

internal/entities/analytics.go

@@ -38,11 +38,7 @@ 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"`
@@ -50,16 +46,12 @@ type PurchasingSummary struct {
 }
 
 type PurchasingAnalyticsData struct {
-	Date                      time.Time `json:"date"`
-	Purchases                 float64   `json:"purchases"`
-	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	ExpensePurchases          float64   `json:"expense_purchases"`
-	PurchaseOrders            int64     `json:"purchase_orders"`
-	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64     `json:"expense_count"`
-	Quantity                  float64   `json:"quantity"`
-	Ingredients               int64     `json:"ingredients"`
-	Vendors                   int64     `json:"vendors"`
+	Date           time.Time `json:"date"`
+	Purchases      float64   `json:"purchases"`
+	PurchaseOrders int64     `json:"purchase_orders"`
+	Quantity       float64   `json:"quantity"`
+	Ingredients    int64     `json:"ingredients"`
+	Vendors        int64     `json:"vendors"`
 }
 
 type PurchasingIngredientData struct {
@@ -72,12 +64,12 @@ type PurchasingIngredientData struct {
 }
 
 type PurchasingVendorData struct {
-	VendorID           *uuid.UUID `json:"vendor_id"`
-	VendorName         string     `json:"vendor_name"`
-	TotalCost          float64    `json:"total_cost"`
-	PurchaseOrderCount int64      `json:"purchase_order_count"`
-	IngredientCount    int64      `json:"ingredient_count"`
-	Quantity           float64    `json:"quantity"`
+	VendorID           uuid.UUID `json:"vendor_id"`
+	VendorName         string    `json:"vendor_name"`
+	TotalCost          float64   `json:"total_cost"`
+	PurchaseOrderCount int64     `json:"purchase_order_count"`
+	IngredientCount    int64     `json:"ingredient_count"`
+	Quantity           float64   `json:"quantity"`
 }
 
 type ProductAnalytics struct {
@@ -112,39 +104,6 @@ type ProductAnalyticsPerCategory struct {
 	TotalMovingAverageHpp float64   `json:"total_moving_average_hpp"`
 }
 
-// ProductAnalyticsPerParentCategory rolls the per-category figures up to the
-// top-level category. A category without a parent is its own group.
-type ProductAnalyticsPerParentCategory struct {
-	ParentCategoryID      uuid.UUID `json:"parent_category_id"`
-	ParentCategoryName    string    `json:"parent_category_name"`
-	TotalRevenue          float64   `json:"total_revenue"`
-	TotalQuantity         int64     `json:"total_quantity"`
-	CategoryCount         int64     `json:"category_count"`
-	ProductCount          int64     `json:"product_count"`
-	OrderCount            int64     `json:"order_count"`
-	TotalStandardHpp      float64   `json:"total_standard_hpp"`
-	TotalFifoHpp          float64   `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64   `json:"total_moving_average_hpp"`
-}
-
-// ParentCategoryAnalyticsDetail is the drill-down for a single parent category:
-// its own totals, the sub-categories underneath it, and the products in each.
-type ParentCategoryAnalyticsDetail struct {
-	ParentCategoryID   uuid.UUID
-	ParentCategoryName string
-	Summary            *ProductAnalyticsPerParentCategory
-	Categories         []*ProductAnalyticsPerCategory
-	Products           []*ProductAnalytics
-}
-
-// BudgetCutOffWeek is one Monday-to-Sunday bucket of revenue, used to derive the
-// weekly spending limits.
-type BudgetCutOffWeek struct {
-	WeekStart  time.Time `json:"week_start"`
-	Revenue    float64   `json:"revenue"`
-	OrderCount int64     `json:"order_count"`
-}
-
 // DashboardOverview represents dashboard overview data
 type DashboardOverview struct {
 	TotalSales        float64 `json:"total_sales"`
@@ -153,36 +112,19 @@ type DashboardOverview struct {
 	TotalCustomers    int64   `json:"total_customers"`
 	VoidedOrders      int64   `json:"voided_orders"`
 	RefundedOrders    int64   `json:"refunded_orders"`
-	TotalItemSold     int64   `json:"total_item_sold"`
-	TotalLowStock     int64   `json:"total_low_stock"`
-	TotalProductActive int64  `json:"total_product_active"`
 }
 
 type ProfitLossAnalytics struct {
-	Summary                    ProfitLossSummary
-	Data                       []ProfitLossData
-	ProductData                []ProductProfitData
-	TodayRevenue               float64
-	TodayCost                  float64
-	MtdRevenue                 float64
-	MtdCost                    float64
-	TodayPurchasing            float64
-	MtdPurchasing              float64
-	TodayPurchasingRawMaterial float64
-	MtdPurchasingRawMaterial   float64
-	TodayPurchasingExpense     float64
-	MtdPurchasingExpense       float64
-	PurchasingItems            []PurchasingItemDetail
-	TodayExpenseByCategory     []ExpenseCategoryTotal
-	MtdExpenseByCategory       []ExpenseCategoryTotal
-	OperationalExpenseItems    []OperationalExpenseItem
-}
-
-type PurchasingItemDetail struct {
-	Date     time.Time
-	Item     string
-	Quantity float64
-	Amount   float64
+	Summary                 ProfitLossSummary
+	Data                    []ProfitLossData
+	ProductData             []ProductProfitData
+	TodayRevenue            float64
+	TodayCost               float64
+	MtdRevenue              float64
+	MtdCost                 float64
+	TodayExpenseByCategory  []ExpenseCategoryTotal
+	MtdExpenseByCategory    []ExpenseCategoryTotal
+	OperationalExpenseItems []OperationalExpenseItem
 }
 
 type ProfitLossSummary struct {
@@ -236,42 +178,3 @@ 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/category.go

@@ -34,8 +34,6 @@ type Category struct {
 	ID             uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
 	OrganizationID uuid.UUID  `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
 	OutletID       *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id"`
-	ParentID       *uuid.UUID `gorm:"type:uuid;index" json:"parent_id"`
-	Parent         *Category  `gorm:"foreignKey:ParentID" json:"parent,omitempty"`
 	Name           string     `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
 	Description    *string    `gorm:"type:text" json:"description"`
 	Order          int        `gorm:"default:0" json:"order"`

internal/entities/expense.go

@@ -29,11 +29,10 @@ type Expense struct {
 }
 
 type ExpenseAnalytics struct {
-	Summary            ExpenseAnalyticsSummary
-	Data               []ExpenseAnalyticsData
-	CategoryData       []ExpenseAnalyticsCategoryData
-	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData
-	ItemData           []ExpenseAnalyticsItemData
+	Summary      ExpenseAnalyticsSummary
+	Data         []ExpenseAnalyticsData
+	CategoryData []ExpenseAnalyticsCategoryData
+	ItemData     []ExpenseAnalyticsItemData
 }
 
 type ExpenseAnalyticsSummary struct {
@@ -55,15 +54,6 @@ type ExpenseAnalyticsData struct {
 }
 
 type ExpenseAnalyticsCategoryData struct {
-	PurchaseCategoryID   uuid.UUID
-	PurchaseCategoryName string
-	PurchaseCategoryType string
-	TotalAmount          float64
-	ExpenseCount         int64
-	ItemCount            int64
-}
-
-type ExpenseAnalyticsChartOfAccountData struct {
 	ChartOfAccountID   uuid.UUID
 	ChartOfAccountName string
 	TotalAmount        float64

internal/entities/expense_item.go

@@ -9,19 +9,17 @@ import (
 )
 
 type ExpenseItem struct {
-	ID                 uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	ExpenseID          uuid.UUID `gorm:"type:uuid;not null;index" json:"expense_id"`
-	ChartOfAccountID   uuid.UUID `gorm:"type:uuid;not null;index" json:"chart_of_account_id"`
-	PurchaseCategoryID uuid.UUID `gorm:"type:uuid;not null;index" json:"purchase_category_id"`
-	Item               string    `gorm:"not null;size:255" json:"item"`
-	Description        *string   `gorm:"type:text" json:"description"`
-	Amount             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"amount"`
-	CreatedAt          time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt          time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	ID               uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ExpenseID        uuid.UUID `gorm:"type:uuid;not null;index" json:"expense_id"`
+	ChartOfAccountID uuid.UUID `gorm:"type:uuid;not null;index" json:"chart_of_account_id"`
+	Item             string    `gorm:"not null;size:255" json:"item"`
+	Description      *string   `gorm:"type:text" json:"description"`
+	Amount           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"amount"`
+	CreatedAt        time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt        time.Time `gorm:"autoUpdateTime" json:"updated_at"`
 
-	Expense          *Expense          `gorm:"foreignKey:ExpenseID" json:"expense,omitempty"`
-	ChartOfAccount   *ChartOfAccount   `gorm:"foreignKey:ChartOfAccountID" json:"chart_of_account,omitempty"`
-	PurchaseCategory *PurchaseCategory `gorm:"foreignKey:PurchaseCategoryID" json:"purchase_category,omitempty"`
+	Expense        *Expense        `gorm:"foreignKey:ExpenseID" json:"expense,omitempty"`
+	ChartOfAccount *ChartOfAccount `gorm:"foreignKey:ChartOfAccountID" json:"chart_of_account,omitempty"`
 }
 
 func (e *ExpenseItem) BeforeCreate(tx *gorm.DB) error {

internal/entities/inventory_movement.go

@@ -36,36 +36,34 @@ const (
 )
 
 type InventoryMovement struct {
-	ID                  uuid.UUID                       `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID      uuid.UUID                       `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
-	OutletID            uuid.UUID                       `gorm:"type:uuid;not null;index" json:"outlet_id" validate:"required"`
-	ItemID              uuid.UUID                       `gorm:"type:uuid;not null;index" json:"item_id" validate:"required"`
-	ItemType            string                          `gorm:"not null;size:20" json:"item_type" validate:"required"` // "PRODUCT" or "INGREDIENT"
-	MovementType        InventoryMovementType           `gorm:"not null;size:50" json:"movement_type" validate:"required"`
-	Quantity            float64                         `gorm:"type:decimal(12,3);not null" json:"quantity" validate:"required"`
-	PreviousQuantity    float64                         `gorm:"type:decimal(12,3)" json:"previous_quantity"`
-	NewQuantity         float64                         `gorm:"type:decimal(12,3)" json:"new_quantity"`
-	UnitCost            float64                         `gorm:"type:decimal(12,2);default:0.00" json:"unit_cost"`
-	TotalCost           float64                         `gorm:"type:decimal(12,2);default:0.00" json:"total_cost"`
-	ReferenceType       *InventoryMovementReferenceType `gorm:"size:50" json:"reference_type"`
-	ReferenceID         *uuid.UUID                      `gorm:"type:uuid;index" json:"reference_id"`
-	PurchaseOrderItemID *uuid.UUID                      `gorm:"type:uuid;index" json:"purchase_order_item_id"`
-	OrderID             *uuid.UUID                      `gorm:"type:uuid;index" json:"order_id"`
-	PaymentID           *uuid.UUID                      `gorm:"type:uuid;index" json:"payment_id"`
-	UserID              uuid.UUID                       `gorm:"type:uuid;not null;index" json:"user_id" validate:"required"`
-	Reason              *string                         `gorm:"size:255" json:"reason"`
-	Notes               *string                         `gorm:"type:text" json:"notes"`
-	Metadata            Metadata                        `gorm:"type:jsonb;default:'{}'" json:"metadata"`
-	CreatedAt           time.Time                       `gorm:"autoCreateTime" json:"created_at"`
+	ID               uuid.UUID                       `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID   uuid.UUID                       `gorm:"type:uuid;not null;index" json:"organization_id" validate:"required"`
+	OutletID         uuid.UUID                       `gorm:"type:uuid;not null;index" json:"outlet_id" validate:"required"`
+	ItemID           uuid.UUID                       `gorm:"type:uuid;not null;index" json:"item_id" validate:"required"`
+	ItemType         string                          `gorm:"not null;size:20" json:"item_type" validate:"required"` // "PRODUCT" or "INGREDIENT"
+	MovementType     InventoryMovementType           `gorm:"not null;size:50" json:"movement_type" validate:"required"`
+	Quantity         float64                         `gorm:"type:decimal(12,3);not null" json:"quantity" validate:"required"`
+	PreviousQuantity float64                         `gorm:"type:decimal(12,3)" json:"previous_quantity"`
+	NewQuantity      float64                         `gorm:"type:decimal(12,3)" json:"new_quantity"`
+	UnitCost         float64                         `gorm:"type:decimal(12,2);default:0.00" json:"unit_cost"`
+	TotalCost        float64                         `gorm:"type:decimal(12,2);default:0.00" json:"total_cost"`
+	ReferenceType    *InventoryMovementReferenceType `gorm:"size:50" json:"reference_type"`
+	ReferenceID      *uuid.UUID                      `gorm:"type:uuid;index" json:"reference_id"`
+	OrderID          *uuid.UUID                      `gorm:"type:uuid;index" json:"order_id"`
+	PaymentID        *uuid.UUID                      `gorm:"type:uuid;index" json:"payment_id"`
+	UserID           uuid.UUID                       `gorm:"type:uuid;not null;index" json:"user_id" validate:"required"`
+	Reason           *string                         `gorm:"size:255" json:"reason"`
+	Notes            *string                         `gorm:"type:text" json:"notes"`
+	Metadata         Metadata                        `gorm:"type:jsonb;default:'{}'" json:"metadata"`
+	CreatedAt        time.Time                       `gorm:"autoCreateTime" json:"created_at"`
 
-	Organization      Organization       `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet            Outlet             `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-	Product           *Product           `gorm:"foreignKey:ItemID" json:"product,omitempty"`
-	Ingredient        *Ingredient        `gorm:"foreignKey:ItemID" json:"ingredient,omitempty"`
-	PurchaseOrderItem *PurchaseOrderItem `gorm:"foreignKey:PurchaseOrderItemID" json:"purchase_order_item,omitempty"`
-	Order             *Order             `gorm:"foreignKey:OrderID" json:"order,omitempty"`
-	Payment           *Payment           `gorm:"foreignKey:PaymentID" json:"payment,omitempty"`
-	User              User               `gorm:"foreignKey:UserID" json:"user,omitempty"`
+	Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	Product      *Product     `gorm:"foreignKey:ItemID" json:"product,omitempty"`
+	Ingredient   *Ingredient  `gorm:"foreignKey:ItemID" json:"ingredient,omitempty"`
+	Order        *Order       `gorm:"foreignKey:OrderID" json:"order,omitempty"`
+	Payment      *Payment     `gorm:"foreignKey:PaymentID" json:"payment,omitempty"`
+	User         User         `gorm:"foreignKey:UserID" json:"user,omitempty"`
 }
 
 func (im *InventoryMovement) BeforeCreate(tx *gorm.DB) error {

internal/entities/purchase_category.go

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

internal/entities/purchase_order.go

@@ -11,8 +11,7 @@ import (
 type PurchaseOrder struct {
 	ID              uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
 	OrganizationID  uuid.UUID  `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
-	OutletID        *uuid.UUID `gorm:"type:uuid;index" json:"outlet_id" validate:"omitempty"`
-	VendorID        *uuid.UUID `gorm:"type:uuid" json:"vendor_id" validate:"omitempty"`
+	VendorID        uuid.UUID  `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
 	PONumber        string     `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
 	TransactionDate time.Time  `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
 	DueDate         *time.Time `gorm:"type:date" json:"due_date" validate:"omitempty"`
@@ -24,7 +23,6 @@ type PurchaseOrder struct {
 	UpdatedAt       time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet       *Outlet                   `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`
 	Items        []PurchaseOrderItem       `gorm:"foreignKey:PurchaseOrderID" json:"items,omitempty"`
 	Attachments  []PurchaseOrderAttachment `gorm:"foreignKey:PurchaseOrderID" json:"attachments,omitempty"`
@@ -43,21 +41,19 @@ func (PurchaseOrder) TableName() string {
 }
 
 type PurchaseOrderItem struct {
-	ID                 uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	PurchaseOrderID    uuid.UUID  `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
-	IngredientID       *uuid.UUID `gorm:"type:uuid" json:"ingredient_id" validate:"omitempty"`
-	PurchaseCategoryID uuid.UUID  `gorm:"type:uuid;not null;index" json:"purchase_category_id" validate:"required"`
-	Description        *string    `gorm:"type:text" json:"description" validate:"omitempty"`
-	Quantity           *float64   `gorm:"type:decimal(10,3)" json:"quantity" validate:"omitempty,gt=0"`
-	UnitID             *uuid.UUID `gorm:"type:uuid" json:"unit_id" validate:"omitempty"`
-	Amount             float64    `gorm:"type:decimal(15,2);not null" json:"amount" validate:"required,gte=0"`
-	CreatedAt          time.Time  `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt          time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
+	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	PurchaseOrderID uuid.UUID `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
+	IngredientID    uuid.UUID `gorm:"type:uuid;not null" json:"ingredient_id" validate:"required"`
+	Description     *string   `gorm:"type:text" json:"description" validate:"omitempty"`
+	Quantity        float64   `gorm:"type:decimal(10,3);not null" json:"quantity" validate:"required,gt=0"`
+	UnitID          uuid.UUID `gorm:"type:uuid;not null" json:"unit_id" validate:"required"`
+	Amount          float64   `gorm:"type:decimal(15,2);not null" json:"amount" validate:"required,gte=0"`
+	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
 
-	PurchaseOrder    *PurchaseOrder    `gorm:"foreignKey:PurchaseOrderID" json:"purchase_order,omitempty"`
-	Ingredient       *Ingredient       `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
-	PurchaseCategory *PurchaseCategory `gorm:"foreignKey:PurchaseCategoryID" json:"purchase_category,omitempty"`
-	Unit             *Unit             `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
+	PurchaseOrder *PurchaseOrder `gorm:"foreignKey:PurchaseOrderID" json:"purchase_order,omitempty"`
+	Ingredient    *Ingredient    `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
+	Unit          *Unit          `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
 }
 
 func (poi *PurchaseOrderItem) BeforeCreate(tx *gorm.DB) error {

internal/entities/user.go

@@ -13,12 +13,10 @@ import (
 type UserRole string
 
 const (
-	RoleAdmin      UserRole = "admin"
-	RoleManager    UserRole = "manager"
-	RoleCashier    UserRole = "cashier"
-	RoleWaiter     UserRole = "waiter"
-	RoleOwner      UserRole = "owner"
-	RolePurchasing UserRole = "purchasing"
+	RoleAdmin   UserRole = "admin"
+	RoleManager UserRole = "manager"
+	RoleCashier UserRole = "cashier"
+	RoleWaiter  UserRole = "waiter"
 )
 
 type Permissions map[string]interface{}
@@ -48,7 +46,7 @@ type User struct {
 	Name           string       `gorm:"not null;size:255" json:"name" validate:"required,min=1,max=255"`
 	Email          string       `gorm:"uniqueIndex;not null;size:255" json:"email" validate:"required,email"`
 	PasswordHash   string       `gorm:"not null;size:255" json:"-"`
-	Role           UserRole     `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter owner purchasing"`
+	Role           UserRole     `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter"`
 	Permissions    Permissions  `gorm:"type:jsonb;default:'{}'" json:"permissions"`
 	IsActive       bool         `gorm:"default:true" json:"is_active"`
 	CreatedAt      time.Time    `gorm:"autoCreateTime" json:"created_at"`

internal/handler/analytics_handler.go

@@ -157,55 +157,6 @@ func (h *AnalyticsHandler) GetProductAnalyticsPerCategory(c *gin.Context) {
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetProductAnalyticsPerCategory")
 }
 
-func (h *AnalyticsHandler) GetProductAnalyticsPerParentCategory(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ProductAnalyticsPerParentCategoryRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetProductAnalyticsPerParentCategory", err.Error())}), "AnalyticsHandler::GetProductAnalyticsPerParentCategory")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq := transformer.ProductAnalyticsPerParentCategoryContractToModel(&req)
-
-	response, err := h.analyticsService.GetProductAnalyticsPerParentCategory(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetProductAnalyticsPerParentCategory", err.Error())}), "AnalyticsHandler::GetProductAnalyticsPerParentCategory")
-		return
-	}
-
-	contractResp := transformer.ProductAnalyticsPerParentCategoryModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetProductAnalyticsPerParentCategory")
-}
-
-func (h *AnalyticsHandler) GetParentCategoryAnalyticsDetail(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ParentCategoryAnalyticsDetailRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetParentCategoryAnalyticsDetail", err.Error())}), "AnalyticsHandler::GetParentCategoryAnalyticsDetail")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.ParentCategoryID = c.Param("parent_category_id")
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq := transformer.ParentCategoryAnalyticsDetailContractToModel(&req)
-
-	response, err := h.analyticsService.GetParentCategoryAnalyticsDetail(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetParentCategoryAnalyticsDetail", err.Error())}), "AnalyticsHandler::GetParentCategoryAnalyticsDetail")
-		return
-	}
-
-	contractResp := transformer.ParentCategoryAnalyticsDetailModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetParentCategoryAnalyticsDetail")
-}
-
 func (h *AnalyticsHandler) GetDashboardAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)
@@ -259,87 +210,3 @@ 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")
-}
-
-func (h *AnalyticsHandler) GetExclusiveSummaryMTD(c *gin.Context) {
-	ctx := c.Request.Context()
-	contextInfo := appcontext.FromGinContext(ctx)
-
-	var req contract.ExclusiveSummaryMTDRequest
-	if err := c.ShouldBindQuery(&req); err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
-		return
-	}
-
-	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
-	modelReq, err := transformer.ExclusiveSummaryMTDContractToModel(&req)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
-		return
-	}
-
-	response, err := h.analyticsService.GetExclusiveSummaryMTD(ctx, modelReq)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetExclusiveSummaryMTD", err.Error())}), "AnalyticsHandler::GetExclusiveSummaryMTD")
-		return
-	}
-
-	contractResp := transformer.ExclusiveSummaryPeriodModelToContract(response)
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetExclusiveSummaryMTD")
-}

internal/handler/category_handler.go

@@ -191,18 +191,6 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 			req.OutletID = &outletID
 		}
 	}
-	if parentIDStr := c.Query("parent_id"); parentIDStr != "" {
-		if parentID, err := uuid.Parse(parentIDStr); err == nil {
-			req.ParentID = &parentID
-		}
-	}
-
-	// type=parent -> top level categories only
-	// type=child  -> leaf categories (sub categories + top level ones without children)
-	if categoryType := c.Query("type"); categoryType != "" {
-		req.Type = categoryType
-	}
-
 	validationError, validationErrorCode := h.categoryValidator.ValidateListCategoriesRequest(req)
 	if validationError != nil {
 		logger.FromContext(ctx).WithError(validationError).Error("CategoryHandler::ListCategories -> request validation failed")

internal/handler/report_handler.go

@@ -66,35 +66,3 @@ func (h *ReportHandler) GetDailyTransactionReportPDF(c *gin.Context) {
 		"file_name": fileName,
 	}), "ReportHandler::GetDailyTransactionReportPDF")
 }
-
-func (h *ReportHandler) GetProfitLossReportPDF(c *gin.Context) {
-	ctx := c.Request.Context()
-	ci := appcontext.FromGinContext(ctx)
-
-	outletID := h.resolveOutletID(c, ci.OutletID)
-	var dayPtr *time.Time
-	if d := c.Query("date"); d != "" {
-		if t, err := time.Parse("2006-01-02", d); err == nil {
-			dayPtr = &t
-		}
-	}
-
-	user, err := h.userService.GetUserByID(ctx, ci.UserID)
-	var genBy string
-	if err != nil {
-		genBy = ci.UserID.String()
-	} else {
-		genBy = user.Name
-	}
-
-	publicURL, fileName, err := h.reportService.GenerateProfitLossPDF(ctx, ci.OrganizationID.String(), outletID, dayPtr, genBy)
-	if err != nil {
-		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "ReportHandler::GetProfitLossReportPDF", err.Error())}), "ReportHandler::GetProfitLossReportPDF")
-		return
-	}
-
-	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(map[string]string{
-		"url":       publicURL,
-		"file_name": fileName,
-	}), "ReportHandler::GetProfitLossReportPDF")
-}

internal/mappers/category_mapper.go

@@ -61,7 +61,6 @@ func CreateCategoryRequestToEntity(req *models.CreateCategoryRequest) *entities.
 	return &entities.Category{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		ParentID:       req.ParentID,
 		Name:           req.Name,
 		Description:    req.Description,
 		Order:          req.Order,
@@ -86,19 +85,10 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 		}
 	}
 
-	// Parent name is only available when the Parent association is preloaded
-	var parentName *string
-	if entity.Parent != nil {
-		name := entity.Parent.Name
-		parentName = &name
-	}
-
 	return &models.CategoryResponse{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
 		OutletID:       entity.OutletID,
-		ParentID:       entity.ParentID,
-		ParentName:     parentName,
 		Name:           entity.Name,
 		Description:    entity.Description,
 		ImageURL:       imageURL,
@@ -137,10 +127,6 @@ func UpdateCategoryEntityFromRequest(entity *entities.Category, req *models.Upda
 	if req.OutletID != nil {
 		entity.OutletID = req.OutletID
 	}
-
-	if req.ParentID != nil {
-		entity.ParentID = req.ParentID
-	}
 }
 
 func CategoryEntitiesToModels(entities []*entities.Category) []*models.Category {

internal/mappers/expense_mapper.go

@@ -95,27 +95,20 @@ func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseIt
 	}
 
 	response := &models.ExpenseItemResponse{
-		ID:                 entity.ID,
-		ExpenseID:          entity.ExpenseID,
-		ChartOfAccountID:   entity.ChartOfAccountID,
-		PurchaseCategoryID: entity.PurchaseCategoryID,
-		Item:               entity.Item,
-		Description:        entity.Description,
-		Amount:             entity.Amount,
-		CreatedAt:          entity.CreatedAt,
-		UpdatedAt:          entity.UpdatedAt,
+		ID:               entity.ID,
+		ExpenseID:        entity.ExpenseID,
+		ChartOfAccountID: entity.ChartOfAccountID,
+		Item:             entity.Item,
+		Description:      entity.Description,
+		Amount:           entity.Amount,
+		CreatedAt:        entity.CreatedAt,
+		UpdatedAt:        entity.UpdatedAt,
 	}
 
 	if entity.ChartOfAccount != nil {
 		response.ChartOfAccountName = entity.ChartOfAccount.Name
 	}
 
-	if entity.PurchaseCategory != nil {
-		response.PurchaseCategoryName = entity.PurchaseCategory.Name
-		response.PurchaseCategoryType = string(entity.PurchaseCategory.Type)
-		response.PurchaseCategory = PurchaseCategoryEntityToResponse(entity.PurchaseCategory)
-	}
-
 	return response
 }
 

internal/mappers/purchase_order_mapper.go

@@ -13,7 +13,6 @@ func PurchaseOrderEntityToModel(entity *entities.PurchaseOrder) *models.Purchase
 	return &models.PurchaseOrder{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -35,7 +34,6 @@ func PurchaseOrderModelToEntity(model *models.PurchaseOrder) *entities.PurchaseO
 	return &entities.PurchaseOrder{
 		ID:              model.ID,
 		OrganizationID:  model.OrganizationID,
-		OutletID:        model.OutletID,
 		VendorID:        model.VendorID,
 		PONumber:        model.PONumber,
 		TransactionDate: model.TransactionDate,
@@ -57,7 +55,6 @@ func PurchaseOrderEntityToResponse(entity *entities.PurchaseOrder) *models.Purch
 	response := &models.PurchaseOrderResponse{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
-		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -94,16 +91,15 @@ func PurchaseOrderItemEntityToModel(entity *entities.PurchaseOrderItem) *models.
 	}
 
 	return &models.PurchaseOrderItem{
-		ID:                 entity.ID,
-		PurchaseOrderID:    entity.PurchaseOrderID,
-		IngredientID:       entity.IngredientID,
-		PurchaseCategoryID: entity.PurchaseCategoryID,
-		Description:        entity.Description,
-		Quantity:           entity.Quantity,
-		UnitID:             entity.UnitID,
-		Amount:             entity.Amount,
-		CreatedAt:          entity.CreatedAt,
-		UpdatedAt:          entity.UpdatedAt,
+		ID:              entity.ID,
+		PurchaseOrderID: entity.PurchaseOrderID,
+		IngredientID:    entity.IngredientID,
+		Description:     entity.Description,
+		Quantity:        entity.Quantity,
+		UnitID:          entity.UnitID,
+		Amount:          entity.Amount,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
 	}
 }
 
@@ -113,16 +109,15 @@ func PurchaseOrderItemModelToEntity(model *models.PurchaseOrderItem) *entities.P
 	}
 
 	return &entities.PurchaseOrderItem{
-		ID:                 model.ID,
-		PurchaseOrderID:    model.PurchaseOrderID,
-		IngredientID:       model.IngredientID,
-		PurchaseCategoryID: model.PurchaseCategoryID,
-		Description:        model.Description,
-		Quantity:           model.Quantity,
-		UnitID:             model.UnitID,
-		Amount:             model.Amount,
-		CreatedAt:          model.CreatedAt,
-		UpdatedAt:          model.UpdatedAt,
+		ID:              model.ID,
+		PurchaseOrderID: model.PurchaseOrderID,
+		IngredientID:    model.IngredientID,
+		Description:     model.Description,
+		Quantity:        model.Quantity,
+		UnitID:          model.UnitID,
+		Amount:          model.Amount,
+		CreatedAt:       model.CreatedAt,
+		UpdatedAt:       model.UpdatedAt,
 	}
 }
 
@@ -132,16 +127,15 @@ func PurchaseOrderItemEntityToResponse(entity *entities.PurchaseOrderItem) *mode
 	}
 
 	response := &models.PurchaseOrderItemResponse{
-		ID:                 entity.ID,
-		PurchaseOrderID:    entity.PurchaseOrderID,
-		IngredientID:       entity.IngredientID,
-		PurchaseCategoryID: entity.PurchaseCategoryID,
-		Description:        entity.Description,
-		Quantity:           entity.Quantity,
-		UnitID:             entity.UnitID,
-		Amount:             entity.Amount,
-		CreatedAt:          entity.CreatedAt,
-		UpdatedAt:          entity.UpdatedAt,
+		ID:              entity.ID,
+		PurchaseOrderID: entity.PurchaseOrderID,
+		IngredientID:    entity.IngredientID,
+		Description:     entity.Description,
+		Quantity:        entity.Quantity,
+		UnitID:          entity.UnitID,
+		Amount:          entity.Amount,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
 	}
 
 	// Map ingredient if present
@@ -152,10 +146,6 @@ func PurchaseOrderItemEntityToResponse(entity *entities.PurchaseOrderItem) *mode
 		}
 	}
 
-	if entity.PurchaseCategory != nil {
-		response.PurchaseCategory = PurchaseCategoryEntityToResponse(entity.PurchaseCategory)
-	}
-
 	// Map unit if present
 	if entity.Unit != nil {
 		response.Unit = &models.UnitResponse{

internal/middleware/auth_middleware.go

@@ -82,11 +82,7 @@ func (m *AuthMiddleware) RequireRole(allowedRoles ...string) gin.HandlerFunc {
 }
 
 func (m *AuthMiddleware) RequireAdminOrManager() gin.HandlerFunc {
-	return m.RequireRole("superadmin", "admin", "manager", "owner",  "purchasing")
-}
-
-func (m *AuthMiddleware) RequireAdminOrManagerOrPurchasing() gin.HandlerFunc {
-	return m.RequireRole("superadmin", "admin", "manager", "owner", "purchasing")
+	return m.RequireRole("superadmin", "admin", "manager")
 }
 
 func (m *AuthMiddleware) RequireAdmin() gin.HandlerFunc {

internal/models/analytics.go

@@ -19,7 +19,6 @@ type PaymentMethodAnalyticsRequest struct {
 type PaymentMethodAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	GroupBy        string                       `json:"group_by"`
@@ -59,7 +58,6 @@ type SalesAnalyticsRequest struct {
 type SalesAnalyticsResponse struct {
 	OrganizationID uuid.UUID            `json:"organization_id"`
 	OutletID       *uuid.UUID           `json:"outlet_id,omitempty"`
-	OutletName     *string              `json:"outlet_name,omitempty"`
 	DateFrom       time.Time            `json:"date_from"`
 	DateTo         time.Time            `json:"date_to"`
 	GroupBy        string               `json:"group_by"`
@@ -115,11 +113,7 @@ 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"`
@@ -128,16 +122,12 @@ type PurchasingSummary struct {
 
 // PurchasingAnalyticsData represents purchasing analytics by time period
 type PurchasingAnalyticsData struct {
-	Date                      time.Time `json:"date"`
-	Purchases                 float64   `json:"purchases"`
-	RawMaterialPurchases      float64   `json:"raw_material_purchases"`
-	ExpensePurchases          float64   `json:"expense_purchases"`
-	PurchaseOrders            int64     `json:"purchase_orders"`
-	RawMaterialPurchaseOrders int64     `json:"raw_material_purchase_orders"`
-	ExpenseCount              int64     `json:"expense_count"`
-	Quantity                  float64   `json:"quantity"`
-	Ingredients               int64     `json:"ingredients"`
-	Vendors                   int64     `json:"vendors"`
+	Date           time.Time `json:"date"`
+	Purchases      float64   `json:"purchases"`
+	PurchaseOrders int64     `json:"purchase_orders"`
+	Quantity       float64   `json:"quantity"`
+	Ingredients    int64     `json:"ingredients"`
+	Vendors        int64     `json:"vendors"`
 }
 
 // PurchasingIngredientData represents purchasing analytics for an ingredient
@@ -152,12 +142,12 @@ type PurchasingIngredientData struct {
 
 // PurchasingVendorData represents purchasing analytics for a vendor
 type PurchasingVendorData struct {
-	VendorID           *uuid.UUID `json:"vendor_id"`
-	VendorName         string     `json:"vendor_name"`
-	TotalCost          float64    `json:"total_cost"`
-	PurchaseOrderCount int64      `json:"purchase_order_count"`
-	IngredientCount    int64      `json:"ingredient_count"`
-	Quantity           float64    `json:"quantity"`
+	VendorID           uuid.UUID `json:"vendor_id"`
+	VendorName         string    `json:"vendor_name"`
+	TotalCost          float64   `json:"total_cost"`
+	PurchaseOrderCount int64     `json:"purchase_order_count"`
+	IngredientCount    int64     `json:"ingredient_count"`
+	Quantity           float64   `json:"quantity"`
 }
 
 // ProductAnalyticsRequest represents the request for product analytics
@@ -173,7 +163,6 @@ type ProductAnalyticsRequest struct {
 type ProductAnalyticsResponse struct {
 	OrganizationID uuid.UUID              `json:"organization_id"`
 	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
-	OutletName     *string                `json:"outlet_name,omitempty"`
 	DateFrom       time.Time              `json:"date_from"`
 	DateTo         time.Time              `json:"date_to"`
 	Data           []ProductAnalyticsData `json:"data"`
@@ -211,7 +200,6 @@ type ProductAnalyticsPerCategoryRequest struct {
 type ProductAnalyticsPerCategoryResponse struct {
 	OrganizationID uuid.UUID                         `json:"organization_id"`
 	OutletID       *uuid.UUID                        `json:"outlet_id,omitempty"`
-	OutletName     *string                           `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                         `json:"date_from"`
 	DateTo         time.Time                         `json:"date_to"`
 	Data           []ProductAnalyticsPerCategoryData `json:"data"`
@@ -229,135 +217,6 @@ type ProductAnalyticsPerCategoryData struct {
 	TotalMovingAverageHpp float64   `json:"total_moving_average_hpp"`
 }
 
-// ProductAnalyticsPerParentCategoryRequest represents the request for product analytics per parent category
-type ProductAnalyticsPerParentCategoryRequest struct {
-	OrganizationID uuid.UUID  `validate:"required"`
-	OutletID       *uuid.UUID `validate:"omitempty"`
-	DateFrom       time.Time  `validate:"required"`
-	DateTo         time.Time  `validate:"required"`
-}
-
-// ProductAnalyticsPerParentCategoryResponse represents the response for product analytics per parent category
-type ProductAnalyticsPerParentCategoryResponse struct {
-	OrganizationID uuid.UUID                               `json:"organization_id"`
-	OutletID       *uuid.UUID                              `json:"outlet_id,omitempty"`
-	OutletName     *string                                 `json:"outlet_name,omitempty"`
-	DateFrom       time.Time                               `json:"date_from"`
-	DateTo         time.Time                               `json:"date_to"`
-	Data           []ProductAnalyticsPerParentCategoryData `json:"data"`
-	Budget         BudgetCutOff                            `json:"budget"`
-}
-
-type ProductAnalyticsPerParentCategoryData struct {
-	ParentCategoryID      uuid.UUID `json:"parent_category_id"`
-	ParentCategoryName    string    `json:"parent_category_name"`
-	TotalRevenue          float64   `json:"total_revenue"`
-	TotalQuantity         int64     `json:"total_quantity"`
-	CategoryCount         int64     `json:"category_count"`
-	ProductCount          int64     `json:"product_count"`
-	OrderCount            int64     `json:"order_count"`
-	TotalStandardHpp      float64   `json:"total_standard_hpp"`
-	TotalFifoHpp          float64   `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64   `json:"total_moving_average_hpp"`
-}
-
-// ParentCategoryAnalyticsDetailRequest represents the request for the drill-down of one parent category
-type ParentCategoryAnalyticsDetailRequest struct {
-	OrganizationID   uuid.UUID  `validate:"required"`
-	ParentCategoryID uuid.UUID  `validate:"required"`
-	OutletID         *uuid.UUID `validate:"omitempty"`
-	DateFrom         time.Time  `validate:"required"`
-	DateTo           time.Time  `validate:"required"`
-}
-
-// ParentCategoryAnalyticsDetailResponse represents the drill-down of one parent category
-type ParentCategoryAnalyticsDetailResponse struct {
-	OrganizationID     uuid.UUID                            `json:"organization_id"`
-	OutletID           *uuid.UUID                           `json:"outlet_id,omitempty"`
-	OutletName         *string                              `json:"outlet_name,omitempty"`
-	DateFrom           time.Time                            `json:"date_from"`
-	DateTo             time.Time                            `json:"date_to"`
-	ParentCategoryID   uuid.UUID                            `json:"parent_category_id"`
-	ParentCategoryName string                               `json:"parent_category_name"`
-	Summary            ParentCategoryAnalyticsDetailSummary `json:"summary"`
-	Categories         []ParentCategoryAnalyticsDetailData  `json:"categories"`
-	Budget             BudgetCutOff                         `json:"budget"`
-}
-
-type ParentCategoryAnalyticsDetailSummary struct {
-	TotalRevenue          float64 `json:"total_revenue"`
-	TotalQuantity         int64   `json:"total_quantity"`
-	CategoryCount         int64   `json:"category_count"`
-	ProductCount          int64   `json:"product_count"`
-	OrderCount            int64   `json:"order_count"`
-	TotalStandardHpp      float64 `json:"total_standard_hpp"`
-	TotalFifoHpp          float64 `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64 `json:"total_moving_average_hpp"`
-}
-
-type ParentCategoryAnalyticsDetailData struct {
-	CategoryID            uuid.UUID                            `json:"category_id"`
-	CategoryName          string                               `json:"category_name"`
-	TotalRevenue          float64                              `json:"total_revenue"`
-	TotalQuantity         int64                                `json:"total_quantity"`
-	ProductCount          int64                                `json:"product_count"`
-	OrderCount            int64                                `json:"order_count"`
-	TotalStandardHpp      float64                              `json:"total_standard_hpp"`
-	TotalFifoHpp          float64                              `json:"total_fifo_hpp"`
-	TotalMovingAverageHpp float64                              `json:"total_moving_average_hpp"`
-	Products              []ParentCategoryAnalyticsProductData `json:"products"`
-}
-
-type ParentCategoryAnalyticsProductData struct {
-	ProductID               uuid.UUID `json:"product_id"`
-	ProductName             string    `json:"product_name"`
-	ProductSku              string    `json:"product_sku"`
-	ProductPrice            float64   `json:"product_price"`
-	QuantitySold            int64     `json:"quantity_sold"`
-	Revenue                 float64   `json:"revenue"`
-	AveragePrice            float64   `json:"average_price"`
-	OrderCount              int64     `json:"order_count"`
-	StandardHppPerUnit      float64   `json:"standard_hpp_per_unit"`
-	StandardHppTotal        float64   `json:"standard_hpp_total"`
-	FifoHppPerUnit          float64   `json:"fifo_hpp_per_unit"`
-	FifoHppTotal            float64   `json:"fifo_hpp_total"`
-	MovingAverageHppPerUnit float64   `json:"moving_average_hpp_per_unit"`
-	MovingAverageHppTotal   float64   `json:"moving_average_hpp_total"`
-}
-
-// BudgetCutOff is the Monday-to-Sunday spending limit breakdown attached to the
-// parent category reports.
-type BudgetCutOff struct {
-	Percentages BudgetPercentages   `json:"percentages"`
-	CutOffFrom  time.Time           `json:"cut_off_from"`
-	CutOffTo    time.Time           `json:"cut_off_to"`
-	Total       BudgetPeriod        `json:"total"`
-	Weekly      []BudgetPeriod      `json:"weekly"`
-	Monthly     []BudgetMonthPeriod `json:"monthly"`
-}
-
-type BudgetPercentages struct {
-	Purchase float64 `json:"purchase"`
-	Owner    float64 `json:"owner"`
-	Team     float64 `json:"team"`
-}
-
-type BudgetPeriod struct {
-	PeriodStart   time.Time `json:"period_start"`
-	PeriodEnd     time.Time `json:"period_end"`
-	Revenue       float64   `json:"revenue"`
-	OrderCount    int64     `json:"order_count"`
-	LimitPurchase float64   `json:"limit_purchase"`
-	LimitOwner    float64   `json:"limit_owner"`
-	LimitTeam     float64   `json:"limit_team"`
-}
-
-type BudgetMonthPeriod struct {
-	Month     string `json:"month"`
-	WeekCount int    `json:"week_count"`
-	BudgetPeriod
-}
-
 // DashboardAnalyticsRequest represents the request for dashboard analytics
 type DashboardAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
@@ -370,7 +229,6 @@ type DashboardAnalyticsRequest struct {
 type DashboardAnalyticsResponse struct {
 	OrganizationID uuid.UUID                    `json:"organization_id"`
 	OutletID       *uuid.UUID                   `json:"outlet_id,omitempty"`
-	OutletName     *string                      `json:"outlet_name,omitempty"`
 	DateFrom       time.Time                    `json:"date_from"`
 	DateTo         time.Time                    `json:"date_to"`
 	Overview       DashboardOverview            `json:"overview"`
@@ -381,15 +239,12 @@ type DashboardAnalyticsResponse struct {
 
 // DashboardOverview represents the overview data for dashboard
 type DashboardOverview struct {
-	TotalSales         float64 `json:"total_sales"`
-	TotalOrders        int64   `json:"total_orders"`
-	AverageOrderValue  float64 `json:"average_order_value"`
-	TotalCustomers     int64   `json:"total_customers"`
-	VoidedOrders       int64   `json:"voided_orders"`
-	RefundedOrders     int64   `json:"refunded_orders"`
-	TotalItemSold      int64   `json:"total_item_sold"`
-	TotalLowStock      int64   `json:"total_low_stock"`
-	TotalProductActive int64   `json:"total_product_active"`
+	TotalSales        float64 `json:"total_sales"`
+	TotalOrders       int64   `json:"total_orders"`
+	AverageOrderValue float64 `json:"average_order_value"`
+	TotalCustomers    int64   `json:"total_customers"`
+	VoidedOrders      int64   `json:"voided_orders"`
+	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
 type ProfitLossAnalyticsRequest struct {
@@ -403,7 +258,6 @@ type ProfitLossAnalyticsRequest struct {
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	OutletName               *string                  `json:"outlet_name,omitempty"`
 	DateFrom                 time.Time                `json:"date_from"`
 	DateTo                   time.Time                `json:"date_to"`
 	GroupBy                  string                   `json:"group_by"`
@@ -411,28 +265,10 @@ type ProfitLossAnalyticsResponse struct {
 	Data                     []ProfitLossData         `json:"data"`
 	ProductData              []ProductProfitData      `json:"product_data"`
 	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
-	Purchasing               ProfitLossPurchasing     `json:"purchasing"`
 	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
 	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
-type ProfitLossPurchasing struct {
-	TodayTotal       float64                `json:"today_total"`
-	MtdTotal         float64                `json:"mtd_total"`
-	TodayRawMaterial float64                `json:"today_raw_material"`
-	MtdRawMaterial   float64                `json:"mtd_raw_material"`
-	TodayExpense     float64                `json:"today_expense"`
-	MtdExpense       float64                `json:"mtd_expense"`
-	Items            []ProfitLossPurchasingItem `json:"items"`
-}
-
-type ProfitLossPurchasingItem struct {
-	Date     time.Time `json:"date"`
-	Item     string    `json:"item"`
-	Quantity float64   `json:"quantity"`
-	Nominal  float64   `json:"nominal"`
-}
-
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -490,123 +326,3 @@ 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 ExclusiveSummaryMTDRequest struct {
-	OrganizationID                uuid.UUID  `validate:"required"`
-	OutletID                      *uuid.UUID `validate:"omitempty"`
-	DateTo                        time.Time  `validate:"required"`
-	ExcludeGajiStaffFromReimburse bool       `validate:"omitempty"`
-}
-
-type ExclusiveSummaryPeriodResponse struct {
-	OrganizationID              uuid.UUID                           `json:"organization_id"`
-	OutletID                    *uuid.UUID                          `json:"outlet_id,omitempty"`
-	OutletName                  *string                             `json:"outlet_name,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"`
-	OutletName     *string                         `json:"outlet_name,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/category.go

@@ -22,7 +22,6 @@ type Category struct {
 type CreateCategoryRequest struct {
 	OrganizationID uuid.UUID `validate:"required"`
 	OutletID       *uuid.UUID
-	ParentID       *uuid.UUID
 	Name           string  `validate:"required,min=1,max=255"`
 	Description    *string `validate:"omitempty,max=1000"`
 	ImageURL       *string `validate:"omitempty,url"`
@@ -34,7 +33,6 @@ type UpdateCategoryRequest struct {
 	Description *string `validate:"omitempty,max=1000"`
 	ImageURL    *string `validate:"omitempty,url"`
 	OutletID    *uuid.UUID
-	ParentID    *uuid.UUID
 	Order       *int `validate:"omitempty,min=0"`
 	IsActive    *bool
 }
@@ -43,8 +41,6 @@ type CategoryResponse struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
 	OutletID       *uuid.UUID
-	ParentID       *uuid.UUID
-	ParentName     *string
 	Name           string
 	Description    *string
 	ImageURL       *string

internal/models/expense.go

@@ -23,15 +23,14 @@ type Expense struct {
 }
 
 type ExpenseItem struct {
-	ID                 uuid.UUID `json:"id"`
-	ExpenseID          uuid.UUID `json:"expense_id"`
-	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
-	PurchaseCategoryID uuid.UUID `json:"purchase_category_id"`
-	Item               string    `json:"item"`
-	Description        *string   `json:"description"`
-	Amount             float64   `json:"amount"`
-	CreatedAt          time.Time `json:"created_at"`
-	UpdatedAt          time.Time `json:"updated_at"`
+	ID               uuid.UUID `json:"id"`
+	ExpenseID        uuid.UUID `json:"expense_id"`
+	ChartOfAccountID uuid.UUID `json:"chart_of_account_id"`
+	Item             string    `json:"item"`
+	Description      *string   `json:"description"`
+	Amount           float64   `json:"amount"`
+	CreatedAt        time.Time `json:"created_at"`
+	UpdatedAt        time.Time `json:"updated_at"`
 }
 
 type ExpenseResponse struct {
@@ -52,19 +51,15 @@ type ExpenseResponse struct {
 }
 
 type ExpenseItemResponse struct {
-	ID                   uuid.UUID                 `json:"id"`
-	ExpenseID            uuid.UUID                 `json:"expense_id"`
-	ChartOfAccountID     uuid.UUID                 `json:"chart_of_account_id"`
-	ChartOfAccountName   string                    `json:"chart_of_account_name,omitempty"`
-	PurchaseCategoryID   uuid.UUID                 `json:"purchase_category_id"`
-	PurchaseCategoryName string                    `json:"purchase_category_name,omitempty"`
-	PurchaseCategoryType string                    `json:"purchase_category_type,omitempty"`
-	PurchaseCategory     *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Item                 string                    `json:"item"`
-	Description          *string                   `json:"description"`
-	Amount               float64                   `json:"amount"`
-	CreatedAt            time.Time                 `json:"created_at"`
-	UpdatedAt            time.Time                 `json:"updated_at"`
+	ID                 uuid.UUID `json:"id"`
+	ExpenseID          uuid.UUID `json:"expense_id"`
+	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
+	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	Item               string    `json:"item"`
+	Description        *string   `json:"description"`
+	Amount             float64   `json:"amount"`
+	CreatedAt          time.Time `json:"created_at"`
+	UpdatedAt          time.Time `json:"updated_at"`
 }
 
 type CreateExpenseRequest struct {
@@ -80,11 +75,10 @@ type CreateExpenseRequest struct {
 }
 
 type CreateExpenseItemRequest struct {
-	ChartOfAccountID   string  `json:"chart_of_account_id"`
-	PurchaseCategoryID string  `json:"purchase_category_id"`
-	Item               string  `json:"item"`
-	Description        *string `json:"description,omitempty"`
-	Amount             float64 `json:"amount"`
+	ChartOfAccountID string  `json:"chart_of_account_id"`
+	Item             string  `json:"item"`
+	Description      *string `json:"description,omitempty"`
+	Amount           float64 `json:"amount"`
 }
 
 type UpdateExpenseRequest struct {
@@ -101,11 +95,10 @@ type UpdateExpenseRequest struct {
 }
 
 type UpdateExpenseItemRequest struct {
-	ChartOfAccountID   *string  `json:"chart_of_account_id,omitempty"`
-	PurchaseCategoryID *string  `json:"purchase_category_id,omitempty"`
-	Item               *string  `json:"item,omitempty"`
-	Description        *string  `json:"description,omitempty"`
-	Amount             *float64 `json:"amount,omitempty"`
+	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
+	Item             *string  `json:"item,omitempty"`
+	Description      *string  `json:"description,omitempty"`
+	Amount           *float64 `json:"amount,omitempty"`
 }
 
 type ListExpenseRequest struct {
@@ -135,16 +128,15 @@ type ExpenseAnalyticsRequest struct {
 }
 
 type ExpenseAnalyticsResponse struct {
-	OrganizationID     uuid.UUID                            `json:"organization_id"`
-	OutletID           *uuid.UUID                           `json:"outlet_id,omitempty"`
-	DateFrom           time.Time                            `json:"date_from"`
-	DateTo             time.Time                            `json:"date_to"`
-	GroupBy            string                               `json:"group_by"`
-	Summary            ExpenseAnalyticsSummary              `json:"summary"`
-	Data               []ExpenseAnalyticsData               `json:"data"`
-	CategoryData       []ExpenseAnalyticsCategoryData       `json:"category_data"`
-	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData `json:"chart_of_account_data"`
-	ItemData           []ExpenseAnalyticsItemData           `json:"item_data"`
+	OrganizationID uuid.UUID                      `json:"organization_id"`
+	OutletID       *uuid.UUID                     `json:"outlet_id,omitempty"`
+	DateFrom       time.Time                      `json:"date_from"`
+	DateTo         time.Time                      `json:"date_to"`
+	GroupBy        string                         `json:"group_by"`
+	Summary        ExpenseAnalyticsSummary        `json:"summary"`
+	Data           []ExpenseAnalyticsData         `json:"data"`
+	CategoryData   []ExpenseAnalyticsCategoryData `json:"category_data"`
+	ItemData       []ExpenseAnalyticsItemData     `json:"item_data"`
 }
 
 type ExpenseAnalyticsSummary struct {
@@ -166,15 +158,6 @@ type ExpenseAnalyticsData struct {
 }
 
 type ExpenseAnalyticsCategoryData struct {
-	PurchaseCategoryID   uuid.UUID `json:"purchase_category_id"`
-	PurchaseCategoryName string    `json:"purchase_category_name"`
-	PurchaseCategoryType string    `json:"purchase_category_type"`
-	TotalAmount          float64   `json:"total_amount"`
-	ExpenseCount         int64     `json:"expense_count"`
-	ItemCount            int64     `json:"item_count"`
-}
-
-type ExpenseAnalyticsChartOfAccountData struct {
 	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
 	ChartOfAccountName string    `json:"chart_of_account_name"`
 	TotalAmount        float64   `json:"total_amount"`

internal/models/purchase_order.go

@@ -9,8 +9,7 @@ import (
 type PurchaseOrder struct {
 	ID              uuid.UUID  `json:"id"`
 	OrganizationID  uuid.UUID  `json:"organization_id"`
-	OutletID        *uuid.UUID `json:"outlet_id"`
-	VendorID        *uuid.UUID `json:"vendor_id"`
+	VendorID        uuid.UUID  `json:"vendor_id"`
 	PONumber        string     `json:"po_number"`
 	TransactionDate time.Time  `json:"transaction_date"`
 	DueDate         *time.Time `json:"due_date"`
@@ -23,16 +22,15 @@ type PurchaseOrder struct {
 }
 
 type PurchaseOrderItem struct {
-	ID                 uuid.UUID  `json:"id"`
-	PurchaseOrderID    uuid.UUID  `json:"purchase_order_id"`
-	IngredientID       *uuid.UUID `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
-	Description        *string    `json:"description"`
-	Quantity           *float64   `json:"quantity"`
-	UnitID             *uuid.UUID `json:"unit_id"`
-	Amount             float64    `json:"amount"`
-	CreatedAt          time.Time  `json:"created_at"`
-	UpdatedAt          time.Time  `json:"updated_at"`
+	ID              uuid.UUID `json:"id"`
+	PurchaseOrderID uuid.UUID `json:"purchase_order_id"`
+	IngredientID    uuid.UUID `json:"ingredient_id"`
+	Description     *string   `json:"description"`
+	Quantity        float64   `json:"quantity"`
+	UnitID          uuid.UUID `json:"unit_id"`
+	Amount          float64   `json:"amount"`
+	CreatedAt       time.Time `json:"created_at"`
+	UpdatedAt       time.Time `json:"updated_at"`
 }
 
 type PurchaseOrderAttachment struct {
@@ -45,8 +43,7 @@ type PurchaseOrderAttachment struct {
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	OutletID        *uuid.UUID                        `json:"outlet_id"`
-	VendorID        *uuid.UUID                        `json:"vendor_id"`
+	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
 	DueDate         *time.Time                        `json:"due_date"`
@@ -62,19 +59,17 @@ type PurchaseOrderResponse struct {
 }
 
 type PurchaseOrderItemResponse struct {
-	ID                 uuid.UUID                 `json:"id"`
-	PurchaseOrderID    uuid.UUID                 `json:"purchase_order_id"`
-	IngredientID       *uuid.UUID                `json:"ingredient_id"`
-	PurchaseCategoryID uuid.UUID                 `json:"purchase_category_id"`
-	Description        *string                   `json:"description"`
-	Quantity           *float64                  `json:"quantity"`
-	UnitID             *uuid.UUID                `json:"unit_id"`
-	Amount             float64                   `json:"amount"`
-	CreatedAt          time.Time                 `json:"created_at"`
-	UpdatedAt          time.Time                 `json:"updated_at"`
-	Ingredient         *IngredientResponse       `json:"ingredient,omitempty"`
-	PurchaseCategory   *PurchaseCategoryResponse `json:"purchase_category,omitempty"`
-	Unit               *UnitResponse             `json:"unit,omitempty"`
+	ID              uuid.UUID           `json:"id"`
+	PurchaseOrderID uuid.UUID           `json:"purchase_order_id"`
+	IngredientID    uuid.UUID           `json:"ingredient_id"`
+	Description     *string             `json:"description"`
+	Quantity        float64             `json:"quantity"`
+	UnitID          uuid.UUID           `json:"unit_id"`
+	Amount          float64             `json:"amount"`
+	CreatedAt       time.Time           `json:"created_at"`
+	UpdatedAt       time.Time           `json:"updated_at"`
+	Ingredient      *IngredientResponse `json:"ingredient,omitempty"`
+	Unit            *UnitResponse       `json:"unit,omitempty"`
 }
 
 type PurchaseOrderAttachmentResponse struct {
@@ -86,8 +81,7 @@ type PurchaseOrderAttachmentResponse struct {
 }
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty"`
-	OutletID          *uuid.UUID                       `json:"outlet_id,omitempty"`
+	VendorID          uuid.UUID                        `json:"vendor_id"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
 	DueDate           *time.Time                       `json:"due_date,omitempty"`
@@ -99,12 +93,11 @@ type CreatePurchaseOrderRequest struct {
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty"`
-	PurchaseCategoryID uuid.UUID  `json:"purchase_category_id"`
-	Description        *string    `json:"description,omitempty"`
-	Quantity           *float64   `json:"quantity,omitempty"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty"`
-	Amount             float64    `json:"amount"`
+	IngredientID uuid.UUID `json:"ingredient_id"`
+	Description  *string   `json:"description,omitempty"`
+	Quantity     float64   `json:"quantity"`
+	UnitID       uuid.UUID `json:"unit_id"`
+	Amount       float64   `json:"amount"`
 }
 
 type UpdatePurchaseOrderRequest struct {
@@ -120,13 +113,12 @@ type UpdatePurchaseOrderRequest struct {
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	ID                 *uuid.UUID `json:"id,omitempty"` // For existing items
-	IngredientID       *uuid.UUID `json:"ingredient_id,omitempty"`
-	PurchaseCategoryID *uuid.UUID `json:"purchase_category_id,omitempty"`
-	Description        *string    `json:"description,omitempty"`
-	Quantity           *float64   `json:"quantity,omitempty"`
-	UnitID             *uuid.UUID `json:"unit_id,omitempty"`
-	Amount             *float64   `json:"amount,omitempty"`
+	ID           *uuid.UUID `json:"id,omitempty"` // For existing items
+	IngredientID *uuid.UUID `json:"ingredient_id,omitempty"`
+	Description  *string    `json:"description,omitempty"`
+	Quantity     *float64   `json:"quantity,omitempty"`
+	UnitID       *uuid.UUID `json:"unit_id,omitempty"`
+	Amount       *float64   `json:"amount,omitempty"`
 }
 
 type ListPurchaseOrdersRequest struct {

internal/models/user.go

@@ -63,12 +63,10 @@ type UserResponse struct {
 
 func (u *User) HasPermission(requiredRole constants.UserRole) bool {
 	roleHierarchy := map[constants.UserRole]int{
-		constants.RoleWaiter:     1,
-		constants.RoleCashier:    2,
-		constants.RolePurchasing: 3,
-		constants.RoleManager:    4,
-		constants.RoleAdmin:      5,
-		constants.RoleOwner:      6,
+		constants.RoleWaiter:  1,
+		constants.RoleCashier: 2,
+		constants.RoleManager: 3,
+		constants.RoleAdmin:   4,
 	}
 
 	userLevel := roleHierarchy[u.Role]

internal/processor/analytics_processor.go

@@ -6,12 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"apskel-pos-be/internal/constants"
-	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
-
-	"github.com/google/uuid"
 )
 
 type AnalyticsProcessor interface {
@@ -20,13 +16,8 @@ type AnalyticsProcessor interface {
 	GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error)
 	GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error)
 	GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
-	GetProductAnalyticsPerParentCategory(ctx context.Context, req *models.ProductAnalyticsPerParentCategoryRequest) (*models.ProductAnalyticsPerParentCategoryResponse, error)
-	GetParentCategoryAnalyticsDetail(ctx context.Context, req *models.ParentCategoryAnalyticsDetailRequest) (*models.ParentCategoryAnalyticsDetailResponse, 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)
-	GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error)
 }
 
 type AnalyticsProcessorImpl struct {
@@ -41,18 +32,6 @@ func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository, exp
 	}
 }
 
-// resolveOutletName fetches the outlet name from the database if outletID is provided
-func (p *AnalyticsProcessorImpl) resolveOutletName(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID) *string {
-	if outletID == nil {
-		return nil
-	}
-	name, err := p.analyticsRepo.GetOutletName(ctx, organizationID, *outletID)
-	if err != nil || name == "" {
-		return nil
-	}
-	return &name
-}
-
 func (p *AnalyticsProcessorImpl) GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error) {
 	if req.DateFrom.After(req.DateTo) {
 		return nil, fmt.Errorf("date_from cannot be after date_to")
@@ -107,7 +86,6 @@ func (p *AnalyticsProcessorImpl) GetPaymentMethodAnalytics(ctx context.Context,
 	return &models.PaymentMethodAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		GroupBy:        req.GroupBy,
@@ -182,7 +160,6 @@ func (p *AnalyticsProcessorImpl) GetSalesAnalytics(ctx context.Context, req *mod
 	return &models.SalesAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		GroupBy:        req.GroupBy,
@@ -208,16 +185,12 @@ 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,
-			Purchases:                 item.Purchases,
-			RawMaterialPurchases:      item.RawMaterialPurchases,
-			ExpensePurchases:          item.ExpensePurchases,
-			PurchaseOrders:            item.PurchaseOrders,
-			RawMaterialPurchaseOrders: item.RawMaterialPurchaseOrders,
-			ExpenseCount:              item.ExpenseCount,
-			Quantity:                  item.Quantity,
-			Ingredients:               item.Ingredients,
-			Vendors:                   item.Vendors,
+			Date:           item.Date,
+			Purchases:      item.Purchases,
+			PurchaseOrders: item.PurchaseOrders,
+			Quantity:       item.Quantity,
+			Ingredients:    item.Ingredients,
+			Vendors:        item.Vendors,
 		}
 	}
 
@@ -254,11 +227,7 @@ 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,
@@ -314,7 +283,6 @@ func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *m
 	return &models.ProductAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		Data:           resultData,
@@ -352,249 +320,12 @@ func (p *AnalyticsProcessorImpl) GetProductAnalyticsPerCategory(ctx context.Cont
 	return &models.ProductAnalyticsPerCategoryResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		Data:           resultData,
 	}, nil
 }
 
-func (p *AnalyticsProcessorImpl) GetProductAnalyticsPerParentCategory(ctx context.Context, req *models.ProductAnalyticsPerParentCategoryRequest) (*models.ProductAnalyticsPerParentCategoryResponse, error) {
-	// Validate date range
-	if req.DateFrom.After(req.DateTo) {
-		return nil, fmt.Errorf("date_from cannot be after date_to")
-	}
-
-	// Get analytics data from repository
-	analyticsData, err := p.analyticsRepo.GetProductAnalyticsPerParentCategory(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get product analytics per parent category: %w", err)
-	}
-
-	// Transform data
-	var resultData []models.ProductAnalyticsPerParentCategoryData
-	for _, data := range analyticsData {
-		resultData = append(resultData, models.ProductAnalyticsPerParentCategoryData{
-			ParentCategoryID:      data.ParentCategoryID,
-			ParentCategoryName:    data.ParentCategoryName,
-			TotalRevenue:          data.TotalRevenue,
-			TotalQuantity:         data.TotalQuantity,
-			CategoryCount:         data.CategoryCount,
-			ProductCount:          data.ProductCount,
-			OrderCount:            data.OrderCount,
-			TotalStandardHpp:      data.TotalStandardHpp,
-			TotalFifoHpp:          data.TotalFifoHpp,
-			TotalMovingAverageHpp: data.TotalMovingAverageHpp,
-		})
-	}
-
-	budget, err := p.buildBudgetCutOff(ctx, req.OrganizationID, req.OutletID, nil, req.DateFrom, req.DateTo)
-	if err != nil {
-		return nil, err
-	}
-
-	return &models.ProductAnalyticsPerParentCategoryResponse{
-		OrganizationID: req.OrganizationID,
-		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
-		DateFrom:       req.DateFrom,
-		DateTo:         req.DateTo,
-		Data:           resultData,
-		Budget:         budget,
-	}, nil
-}
-
-func (p *AnalyticsProcessorImpl) GetParentCategoryAnalyticsDetail(ctx context.Context, req *models.ParentCategoryAnalyticsDetailRequest) (*models.ParentCategoryAnalyticsDetailResponse, error) {
-	// Validate date range
-	if req.DateFrom.After(req.DateTo) {
-		return nil, fmt.Errorf("date_from cannot be after date_to")
-	}
-
-	detail, err := p.analyticsRepo.GetParentCategoryAnalyticsDetail(ctx, req.OrganizationID, req.OutletID, req.ParentCategoryID, req.DateFrom, req.DateTo)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get parent category analytics detail: %w", err)
-	}
-
-	// Bucket the product rows by the category they belong to
-	productsByCategory := make(map[uuid.UUID][]models.ParentCategoryAnalyticsProductData)
-	for _, product := range detail.Products {
-		productsByCategory[product.CategoryID] = append(productsByCategory[product.CategoryID], models.ParentCategoryAnalyticsProductData{
-			ProductID:               product.ProductID,
-			ProductName:             product.ProductName,
-			ProductSku:              product.ProductSku,
-			ProductPrice:            product.ProductPrice,
-			QuantitySold:            product.QuantitySold,
-			Revenue:                 product.Revenue,
-			AveragePrice:            product.AveragePrice,
-			OrderCount:              product.OrderCount,
-			StandardHppPerUnit:      product.StandardHppPerUnit,
-			StandardHppTotal:        product.StandardHppTotal,
-			FifoHppPerUnit:          product.FifoHppPerUnit,
-			FifoHppTotal:            product.FifoHppTotal,
-			MovingAverageHppPerUnit: product.MovingAverageHppPerUnit,
-			MovingAverageHppTotal:   product.MovingAverageHppTotal,
-		})
-	}
-
-	categories := make([]models.ParentCategoryAnalyticsDetailData, 0, len(detail.Categories))
-	for _, category := range detail.Categories {
-		products := productsByCategory[category.CategoryID]
-		if products == nil {
-			products = []models.ParentCategoryAnalyticsProductData{}
-		}
-
-		categories = append(categories, models.ParentCategoryAnalyticsDetailData{
-			CategoryID:            category.CategoryID,
-			CategoryName:          category.CategoryName,
-			TotalRevenue:          category.TotalRevenue,
-			TotalQuantity:         category.TotalQuantity,
-			ProductCount:          category.ProductCount,
-			OrderCount:            category.OrderCount,
-			TotalStandardHpp:      category.TotalStandardHpp,
-			TotalFifoHpp:          category.TotalFifoHpp,
-			TotalMovingAverageHpp: category.TotalMovingAverageHpp,
-			Products:              products,
-		})
-	}
-
-	summary := models.ParentCategoryAnalyticsDetailSummary{}
-	if detail.Summary != nil {
-		summary = models.ParentCategoryAnalyticsDetailSummary{
-			TotalRevenue:          detail.Summary.TotalRevenue,
-			TotalQuantity:         detail.Summary.TotalQuantity,
-			CategoryCount:         detail.Summary.CategoryCount,
-			ProductCount:          detail.Summary.ProductCount,
-			OrderCount:            detail.Summary.OrderCount,
-			TotalStandardHpp:      detail.Summary.TotalStandardHpp,
-			TotalFifoHpp:          detail.Summary.TotalFifoHpp,
-			TotalMovingAverageHpp: detail.Summary.TotalMovingAverageHpp,
-		}
-	}
-
-	budget, err := p.buildBudgetCutOff(ctx, req.OrganizationID, req.OutletID, &req.ParentCategoryID, req.DateFrom, req.DateTo)
-	if err != nil {
-		return nil, err
-	}
-
-	return &models.ParentCategoryAnalyticsDetailResponse{
-		OrganizationID:     req.OrganizationID,
-		OutletID:           req.OutletID,
-		OutletName:         p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
-		DateFrom:           req.DateFrom,
-		DateTo:             req.DateTo,
-		ParentCategoryID:   detail.ParentCategoryID,
-		ParentCategoryName: detail.ParentCategoryName,
-		Summary:            summary,
-		Categories:         categories,
-		Budget:             budget,
-	}, nil
-}
-
-// startOfWeek returns the Monday 00:00 of the week containing t, in t's own location.
-func startOfWeek(t time.Time) time.Time {
-	daysSinceMonday := (int(t.Weekday()) + 6) % 7
-	year, month, day := t.Date()
-	return time.Date(year, month, day-daysSinceMonday, 0, 0, 0, 0, t.Location())
-}
-
-// endOfWeek returns the Sunday 23:59:59.999999999 of the week containing t.
-func endOfWeek(t time.Time) time.Time {
-	return startOfWeek(t).AddDate(0, 0, 7).Add(-time.Nanosecond)
-}
-
-// newBudgetPeriod splits a period's revenue into the spending limits.
-func newBudgetPeriod(start, end time.Time, revenue float64, orderCount int64) models.BudgetPeriod {
-	return models.BudgetPeriod{
-		PeriodStart:   start,
-		PeriodEnd:     end,
-		Revenue:       revenue,
-		OrderCount:    orderCount,
-		LimitPurchase: revenue * constants.BudgetLimitPurchasePercent / 100,
-		LimitOwner:    revenue * constants.BudgetLimitOwnerPercent / 100,
-		LimitTeam:     revenue * constants.BudgetLimitTeamPercent / 100,
-	}
-}
-
-// buildBudgetCutOff produces the weekly cut-off breakdown for the given scope. Weeks
-// are always whole Monday-to-Sunday blocks, so the covered range is widened to the
-// week boundaries around the requested dates. A nil parentCategoryID covers every
-// category.
-func (p *AnalyticsProcessorImpl) buildBudgetCutOff(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, parentCategoryID *uuid.UUID, dateFrom, dateTo time.Time) (models.BudgetCutOff, error) {
-	cutOffFrom := startOfWeek(dateFrom)
-	cutOffTo := endOfWeek(dateTo)
-
-	budget := models.BudgetCutOff{
-		Percentages: models.BudgetPercentages{
-			Purchase: constants.BudgetLimitPurchasePercent,
-			Owner:    constants.BudgetLimitOwnerPercent,
-			Team:     constants.BudgetLimitTeamPercent,
-		},
-		CutOffFrom: cutOffFrom,
-		CutOffTo:   cutOffTo,
-		Weekly:     []models.BudgetPeriod{},
-		Monthly:    []models.BudgetMonthPeriod{},
-	}
-
-	rows, err := p.analyticsRepo.GetBudgetCutOffWeekly(ctx, organizationID, outletID, parentCategoryID, cutOffFrom, cutOffTo)
-	if err != nil {
-		return budget, fmt.Errorf("failed to get budget cut off: %w", err)
-	}
-
-	// Key the rows by their Monday so weeks without any sales can still be emitted
-	rowsByWeek := make(map[string]*entities.BudgetCutOffWeek, len(rows))
-	for _, row := range rows {
-		rowsByWeek[row.WeekStart.In(cutOffFrom.Location()).Format("2006-01-02")] = row
-	}
-
-	var (
-		totalRevenue     float64
-		totalOrders      int64
-		monthOrder       []string
-		monthAccumulator = map[string]*models.BudgetMonthPeriod{}
-	)
-
-	for week := cutOffFrom; !week.After(cutOffTo); week = week.AddDate(0, 0, 7) {
-		var revenue float64
-		var orderCount int64
-		if row, ok := rowsByWeek[week.Format("2006-01-02")]; ok {
-			revenue, orderCount = row.Revenue, row.OrderCount
-		}
-
-		period := newBudgetPeriod(week, endOfWeek(week), revenue, orderCount)
-		budget.Weekly = append(budget.Weekly, period)
-
-		totalRevenue += revenue
-		totalOrders += orderCount
-
-		// A week belongs to the month of its Monday, so every week is counted once
-		monthKey := week.Format("2006-01")
-		month, ok := monthAccumulator[monthKey]
-		if !ok {
-			month = &models.BudgetMonthPeriod{Month: monthKey}
-			month.PeriodStart = period.PeriodStart
-			monthAccumulator[monthKey] = month
-			monthOrder = append(monthOrder, monthKey)
-		}
-		month.WeekCount++
-		month.PeriodEnd = period.PeriodEnd
-		month.Revenue += revenue
-		month.OrderCount += orderCount
-	}
-
-	for _, monthKey := range monthOrder {
-		month := monthAccumulator[monthKey]
-		budget.Monthly = append(budget.Monthly, models.BudgetMonthPeriod{
-			Month:        month.Month,
-			WeekCount:    month.WeekCount,
-			BudgetPeriod: newBudgetPeriod(month.PeriodStart, month.PeriodEnd, month.Revenue, month.OrderCount),
-		})
-	}
-
-	budget.Total = newBudgetPeriod(cutOffFrom, cutOffTo, totalRevenue, totalOrders)
-
-	return budget, nil
-}
-
 func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error) {
 	// Validate date range
 	if req.DateFrom.After(req.DateTo) {
@@ -650,19 +381,15 @@ func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req
 	return &models.DashboardAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		Overview: models.DashboardOverview{
-			TotalSales:         overview.TotalSales,
-			TotalOrders:        overview.TotalOrders,
-			AverageOrderValue:  overview.AverageOrderValue,
-			TotalCustomers:     overview.TotalCustomers,
-			VoidedOrders:       overview.VoidedOrders,
-			RefundedOrders:     overview.RefundedOrders,
-			TotalItemSold:      overview.TotalItemSold,
-			TotalLowStock:      overview.TotalLowStock,
-			TotalProductActive: overview.TotalProductActive,
+			TotalSales:        overview.TotalSales,
+			TotalOrders:       overview.TotalOrders,
+			AverageOrderValue: overview.AverageOrderValue,
+			TotalCustomers:    overview.TotalCustomers,
+			VoidedOrders:      overview.VoidedOrders,
+			RefundedOrders:    overview.RefundedOrders,
 		},
 		TopProducts:    topProducts.Data,
 		PaymentMethods: paymentMethods.Data,
@@ -865,20 +592,9 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		opsTotal += item.Amount
 	}
 
-	purchasingItems := make([]models.ProfitLossPurchasingItem, len(result.PurchasingItems))
-	for i, item := range result.PurchasingItems {
-		purchasingItems[i] = models.ProfitLossPurchasingItem{
-			Date:     item.Date,
-			Item:     item.Item,
-			Quantity: item.Quantity,
-			Nominal:  item.Amount,
-		}
-	}
-
 	return &models.ProfitLossAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		GroupBy:        req.GroupBy,
@@ -895,18 +611,9 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 			AverageProfit:      result.Summary.AverageProfit,
 			ProfitabilityRatio: result.Summary.ProfitabilityRatio,
 		},
-		Data:        data,
-		ProductData: productData,
-		MainSummary: mainSummary,
-		Purchasing: models.ProfitLossPurchasing{
-			TodayTotal:       result.TodayPurchasing,
-			MtdTotal:         result.MtdPurchasing,
-			TodayRawMaterial: result.TodayPurchasingRawMaterial,
-			MtdRawMaterial:   result.MtdPurchasingRawMaterial,
-			TodayExpense:     result.TodayPurchasingExpense,
-			MtdExpense:       result.MtdPurchasingExpense,
-			Items:            purchasingItems,
-		},
+		Data:                     data,
+		ProductData:              productData,
+		MainSummary:              mainSummary,
 		OperationalExpenses:      opsItems,
 		OperationalExpensesTotal: opsTotal,
 	}, nil
@@ -936,280 +643,3 @@ 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,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, 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) GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
-	mtdStart := time.Date(req.DateTo.Year(), req.DateTo.Month(), 1, 0, 0, 0, 0, req.DateTo.Location())
-
-	return p.buildExclusiveSummaryPeriod(ctx, &models.ExclusiveSummaryPeriodRequest{
-		OrganizationID:                req.OrganizationID,
-		OutletID:                      req.OutletID,
-		DateFrom:                      mtdStart,
-		DateTo:                        req.DateTo,
-		ExcludeGajiStaffFromReimburse: req.ExcludeGajiStaffFromReimburse,
-	})
-}
-
-func (p *AnalyticsProcessorImpl) buildExclusiveSummaryPeriod(ctx context.Context, req *models.ExclusiveSummaryPeriodRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
-	result, err := p.analyticsRepo.GetExclusiveSummaryAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo)
-	if err != nil {
-		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,
-		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, 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,15 +13,9 @@ import (
 )
 
 type analyticsRepositoryStub struct {
-	purchasingResult        *entities.PurchasingAnalytics
-	budgetCutOffWeeks       []*entities.BudgetCutOffWeek
-	profitLossResult        *entities.ProfitLossAnalytics
-	exclusiveSummaryResults []*entities.ExclusiveSummaryAnalytics
-	bankBalances            []entities.ExclusiveSummaryBankBalance
-	profitLossGroup         string
-	exclusiveSummaryCalls   int
-	exclusiveSummaryFrom    []time.Time
-	exclusiveSummaryTo      []time.Time
+	purchasingResult *entities.PurchasingAnalytics
+	profitLossResult *entities.ProfitLossAnalytics
+	profitLossGroup  string
 }
 
 func (analyticsRepositoryStub) GetPaymentMethodAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.PaymentMethodAnalytics, error) {
@@ -44,18 +38,6 @@ func (analyticsRepositoryStub) GetProductAnalyticsPerCategory(context.Context, u
 	return nil, nil
 }
 
-func (analyticsRepositoryStub) GetProductAnalyticsPerParentCategory(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.ProductAnalyticsPerParentCategory, error) {
-	return nil, nil
-}
-
-func (analyticsRepositoryStub) GetParentCategoryAnalyticsDetail(context.Context, uuid.UUID, *uuid.UUID, uuid.UUID, time.Time, time.Time) (*entities.ParentCategoryAnalyticsDetail, error) {
-	return nil, nil
-}
-
-func (s analyticsRepositoryStub) GetBudgetCutOffWeekly(context.Context, uuid.UUID, *uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.BudgetCutOffWeek, error) {
-	return s.budgetCutOffWeeks, nil
-}
-
 func (analyticsRepositoryStub) GetDashboardOverview(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) (*entities.DashboardOverview, error) {
 	return nil, nil
 }
@@ -65,26 +47,6 @@ func (s analyticsRepositoryStub) GetProfitLossAnalytics(_ context.Context, _ uui
 	return s.profitLossResult, nil
 }
 
-func (s *analyticsRepositoryStub) GetExclusiveSummaryAnalytics(_ context.Context, _ uuid.UUID, _ *uuid.UUID, dateFrom, dateTo time.Time) (*entities.ExclusiveSummaryAnalytics, error) {
-	s.exclusiveSummaryFrom = append(s.exclusiveSummaryFrom, dateFrom)
-	s.exclusiveSummaryTo = append(s.exclusiveSummaryTo, dateTo)
-	if s.exclusiveSummaryCalls < len(s.exclusiveSummaryResults) {
-		result := s.exclusiveSummaryResults[s.exclusiveSummaryCalls]
-		s.exclusiveSummaryCalls++
-		return result, nil
-	}
-	s.exclusiveSummaryCalls++
-	return &entities.ExclusiveSummaryAnalytics{}, nil
-}
-
-func (s *analyticsRepositoryStub) GetExclusiveSummaryBankBalances(context.Context, uuid.UUID, *uuid.UUID) ([]entities.ExclusiveSummaryBankBalance, error) {
-	return s.bankBalances, nil
-}
-
-func (analyticsRepositoryStub) GetOutletName(context.Context, uuid.UUID, uuid.UUID) (string, error) {
-	return "", nil
-}
-
 type expenseRepositoryStub struct{}
 
 func (expenseRepositoryStub) Create(context.Context, *entities.Expense) error { return nil }
@@ -109,27 +71,11 @@ 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:            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,
-				},
+				TotalPurchases: 125,
 			},
 		},
 	}, expenseRepositoryStub{})
@@ -146,23 +92,14 @@ 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(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)
+	require.Equal(t, float64(125), result.Summary.TotalPurchases)
 }
 
 func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *testing.T) {
 	productID := uuid.New()
 	categoryID := uuid.New()
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
 		profitLossResult: &entities.ProfitLossAnalytics{
 			Summary: entities.ProfitLossSummary{
 				TotalRevenue:       1000,
@@ -234,7 +171,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,
@@ -311,155 +248,3 @@ 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)
-}
-
-func TestAnalyticsProcessorGetExclusiveSummaryMTDBuildsMonthToDateBreakdown(t *testing.T) {
-	location, err := time.LoadLocation("Asia/Jakarta")
-	require.NoError(t, err)
-	dateTo := time.Date(2026, 6, 18, 23, 59, 59, int(time.Second-time.Nanosecond), location)
-	stub := &analyticsRepositoryStub{
-		exclusiveSummaryResults: []*entities.ExclusiveSummaryAnalytics{
-			{
-				SalesTotal: 1000,
-				HPPBreakdown: []entities.ExclusiveSummaryCategoryTotal{
-					{CategoryCode: "RAW", CategoryName: "Raw Material", Amount: 400},
-				},
-				OperationalExpenseBreakdown: []entities.ExclusiveSummaryCategoryTotal{
-					{CategoryCode: "OPS", CategoryName: "Operational", Amount: 100},
-				},
-				DailySummary: []entities.ExclusiveSummaryDailySummary{
-					{Date: dateTo, TransactionCount: 2, TotalCost: 500},
-				},
-				DailyTransactions: []entities.ExclusiveSummaryDailyTransaction{
-					{Date: dateTo, CategoryCode: "RAW", CategoryName: "Raw Material", Description: "beras", Amount: 400, Source: "purchase_order"},
-					{Date: dateTo, CategoryCode: "OPS", CategoryName: "Operational", Description: "atk", Amount: 100, Source: "expense"},
-				},
-			},
-		},
-	}
-	processor := NewAnalyticsProcessorImpl(stub, expenseRepositoryStub{})
-
-	result, err := processor.GetExclusiveSummaryMTD(context.Background(), &models.ExclusiveSummaryMTDRequest{
-		OrganizationID: uuid.New(),
-		DateTo:         dateTo,
-	})
-
-	require.NoError(t, err)
-	require.NotNil(t, result)
-	require.Len(t, stub.exclusiveSummaryFrom, 1)
-	require.Equal(t, time.Date(2026, 6, 1, 0, 0, 0, 0, location), stub.exclusiveSummaryFrom[0])
-	require.Equal(t, dateTo, stub.exclusiveSummaryTo[0])
-	require.Equal(t, stub.exclusiveSummaryFrom[0], result.Period.DateFrom)
-	require.Equal(t, dateTo, result.Period.DateTo)
-	require.Equal(t, float64(1000), result.Summary.Sales)
-	require.Equal(t, float64(400), result.Summary.HPP)
-	require.Equal(t, float64(500), result.Summary.TotalCost)
-	require.Equal(t, float64(500), result.Summary.NetProfit)
-	require.Len(t, result.HPPBreakdown, 1)
-	require.Equal(t, float64(100), result.HPPBreakdown[0].Percentage)
-	require.Len(t, result.OperationalExpenseBreakdown, 1)
-	require.Len(t, result.DailySummary, 1)
-	require.Len(t, result.DailyTransactions, 2)
-}

internal/processor/budget_cutoff_test.go

@@ -1,152 +0,0 @@
-package processor
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"apskel-pos-be/internal/entities"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
-)
-
-func jakarta(t *testing.T) *time.Location {
-	t.Helper()
-	loc, err := time.LoadLocation("Asia/Jakarta")
-	require.NoError(t, err)
-	return loc
-}
-
-func TestStartOfWeekLandsOnMonday(t *testing.T) {
-	loc := jakarta(t)
-
-	// 3 Aug 2026 is a Monday, so the whole week must collapse onto it
-	monday := time.Date(2026, 8, 3, 0, 0, 0, 0, loc)
-
-	for offset := 0; offset < 7; offset++ {
-		day := monday.AddDate(0, 0, offset).Add(13 * time.Hour)
-
-		got := startOfWeek(day)
-		require.Equal(t, monday, got, "day %s should map to %s", day, monday)
-		require.Equal(t, time.Monday, got.Weekday())
-	}
-}
-
-func TestEndOfWeekLandsOnSunday(t *testing.T) {
-	loc := jakarta(t)
-
-	// Sunday 9 Aug 2026 closes the week that starts Monday 3 Aug
-	got := endOfWeek(time.Date(2026, 8, 5, 9, 30, 0, 0, loc))
-
-	require.Equal(t, time.Sunday, got.Weekday())
-	require.Equal(t, 2026, got.Year())
-	require.Equal(t, time.August, got.Month())
-	require.Equal(t, 9, got.Day())
-	require.Equal(t, 23, got.Hour())
-	require.Equal(t, 59, got.Minute())
-}
-
-func TestBuildBudgetCutOffWidensToWholeWeeks(t *testing.T) {
-	loc := jakarta(t)
-	processor := &AnalyticsProcessorImpl{analyticsRepo: &analyticsRepositoryStub{}}
-
-	// Saturday 1 Aug to Monday 31 Aug 2026: both ends fall mid-week
-	from := time.Date(2026, 8, 1, 0, 0, 0, 0, loc)
-	to := time.Date(2026, 8, 31, 23, 59, 59, 0, loc)
-
-	budget, err := processor.buildBudgetCutOff(context.Background(), uuid.New(), nil, nil, from, to)
-	require.NoError(t, err)
-
-	// Reaches back into July and forward into September to keep weeks whole
-	require.Equal(t, time.Monday, budget.CutOffFrom.Weekday())
-	require.Equal(t, time.July, budget.CutOffFrom.Month())
-	require.Equal(t, 27, budget.CutOffFrom.Day())
-	require.Equal(t, time.Sunday, budget.CutOffTo.Weekday())
-	require.Equal(t, time.September, budget.CutOffTo.Month())
-	require.Equal(t, 6, budget.CutOffTo.Day())
-
-	require.Len(t, budget.Weekly, 6)
-	for _, week := range budget.Weekly {
-		require.Equal(t, time.Monday, week.PeriodStart.Weekday())
-		require.Equal(t, time.Sunday, week.PeriodEnd.Weekday())
-	}
-
-	// A week is filed under the month of its Monday, so the 27 Jul week counts as July
-	require.Len(t, budget.Monthly, 2)
-	require.Equal(t, "2026-07", budget.Monthly[0].Month)
-	require.Equal(t, 1, budget.Monthly[0].WeekCount)
-	require.Equal(t, "2026-08", budget.Monthly[1].Month)
-	require.Equal(t, 5, budget.Monthly[1].WeekCount)
-}
-
-func TestBuildBudgetCutOffAppliesLimits(t *testing.T) {
-	loc := jakarta(t)
-	weekStart := time.Date(2026, 8, 3, 0, 0, 0, 0, loc)
-
-	stub := &analyticsRepositoryStub{budgetCutOffWeeks: []*entities.BudgetCutOffWeek{
-		{WeekStart: weekStart, Revenue: 10_000_000, OrderCount: 120},
-	}}
-	processor := &AnalyticsProcessorImpl{analyticsRepo: stub}
-
-	budget, err := processor.buildBudgetCutOff(context.Background(), uuid.New(), nil, nil, weekStart, weekStart.AddDate(0, 0, 6))
-	require.NoError(t, err)
-	require.Len(t, budget.Weekly, 1)
-
-	// 60 / 20 / 20 of the week's revenue
-	week := budget.Weekly[0]
-	require.Equal(t, float64(6_000_000), week.LimitPurchase)
-	require.Equal(t, float64(2_000_000), week.LimitOwner)
-	require.Equal(t, float64(2_000_000), week.LimitTeam)
-	require.Equal(t, int64(120), week.OrderCount)
-
-	// Totals mirror the single week
-	require.Equal(t, week.Revenue, budget.Total.Revenue)
-	require.Equal(t, week.LimitPurchase, budget.Total.LimitPurchase)
-}
-
-func TestBuildBudgetCutOffAccumulatesMonthlyFromWeeks(t *testing.T) {
-	loc := jakarta(t)
-	first := time.Date(2026, 8, 3, 0, 0, 0, 0, loc)
-
-	stub := &analyticsRepositoryStub{budgetCutOffWeeks: []*entities.BudgetCutOffWeek{
-		{WeekStart: first, Revenue: 10_000_000, OrderCount: 100},
-		{WeekStart: first.AddDate(0, 0, 7), Revenue: 5_000_000, OrderCount: 60},
-	}}
-	processor := &AnalyticsProcessorImpl{analyticsRepo: stub}
-
-	budget, err := processor.buildBudgetCutOff(context.Background(), uuid.New(), nil, nil, first, first.AddDate(0, 0, 9))
-	require.NoError(t, err)
-
-	require.Len(t, budget.Monthly, 1)
-	month := budget.Monthly[0]
-	require.Equal(t, "2026-08", month.Month)
-	require.Equal(t, 2, month.WeekCount)
-	require.Equal(t, float64(15_000_000), month.Revenue)
-	require.Equal(t, int64(160), month.OrderCount)
-
-	// The month limit is the accumulation of its weeks
-	require.Equal(t, float64(9_000_000), month.LimitPurchase)
-	require.Equal(t, budget.Weekly[0].LimitPurchase+budget.Weekly[1].LimitPurchase, month.LimitPurchase)
-}
-
-func TestBuildBudgetCutOffEmitsWeeksWithoutSales(t *testing.T) {
-	loc := jakarta(t)
-	first := time.Date(2026, 8, 3, 0, 0, 0, 0, loc)
-
-	// Only the third week has sales; the two quiet weeks must still be reported
-	stub := &analyticsRepositoryStub{budgetCutOffWeeks: []*entities.BudgetCutOffWeek{
-		{WeekStart: first.AddDate(0, 0, 14), Revenue: 4_000_000, OrderCount: 40},
-	}}
-	processor := &AnalyticsProcessorImpl{analyticsRepo: stub}
-
-	budget, err := processor.buildBudgetCutOff(context.Background(), uuid.New(), nil, nil, first, first.AddDate(0, 0, 16))
-	require.NoError(t, err)
-
-	require.Len(t, budget.Weekly, 3)
-	require.Zero(t, budget.Weekly[0].Revenue)
-	require.Zero(t, budget.Weekly[0].LimitPurchase)
-	require.Zero(t, budget.Weekly[1].Revenue)
-	require.Equal(t, float64(4_000_000), budget.Weekly[2].Revenue)
-	require.Equal(t, float64(4_000_000), budget.Total.Revenue)
-}

internal/processor/category_processor.go

@@ -53,18 +53,6 @@ func (p *CategoryProcessorImpl) CreateCategory(ctx context.Context, req *models.
 		return nil, fmt.Errorf("category with name '%s' already exists for this organization", req.Name)
 	}
 
-	var parentName *string
-	if req.ParentID != nil {
-		parentCategory, err := p.categoryRepo.GetByID(ctx, *req.ParentID)
-		if err != nil {
-			return nil, fmt.Errorf("parent category not found: %w", err)
-		}
-		if parentCategory.OrganizationID != req.OrganizationID {
-			return nil, fmt.Errorf("parent category must belong to the same organization")
-		}
-		parentName = &parentCategory.Name
-	}
-
 	// Map request to entity
 	categoryEntity := mappers.CreateCategoryRequestToEntity(req)
 
@@ -75,7 +63,6 @@ func (p *CategoryProcessorImpl) CreateCategory(ctx context.Context, req *models.
 
 	// Map entity to response model
 	response := mappers.CategoryEntityToResponse(categoryEntity)
-	response.ParentName = parentName
 	return response, nil
 }
 
@@ -97,23 +84,6 @@ func (p *CategoryProcessorImpl) UpdateCategory(ctx context.Context, id uuid.UUID
 		}
 	}
 
-	if req.ParentID != nil {
-		if *req.ParentID == id {
-			return nil, fmt.Errorf("category cannot be its own parent")
-		}
-
-		parentCategory, err := p.categoryRepo.GetByID(ctx, *req.ParentID)
-		if err != nil {
-			return nil, fmt.Errorf("parent category not found: %w", err)
-		}
-		if parentCategory.OrganizationID != existingCategory.OrganizationID {
-			return nil, fmt.Errorf("parent category must belong to the same organization")
-		}
-
-		// Refresh the preloaded association so the response carries the new parent
-		existingCategory.Parent = parentCategory
-	}
-
 	// Apply updates to entity
 	mappers.UpdateCategoryEntityFromRequest(existingCategory, req)
 

internal/processor/expense_processor.go

@@ -23,14 +23,12 @@ type ExpenseProcessor interface {
 }
 
 type ExpenseProcessorImpl struct {
-	expenseRepo          ExpenseRepository
-	purchaseCategoryRepo PurchaseCategoryRepository
+	expenseRepo ExpenseRepository
 }
 
-func NewExpenseProcessorImpl(expenseRepo ExpenseRepository, purchaseCategoryRepo PurchaseCategoryRepository) *ExpenseProcessorImpl {
+func NewExpenseProcessorImpl(expenseRepo ExpenseRepository) *ExpenseProcessorImpl {
 	return &ExpenseProcessorImpl{
-		expenseRepo:          expenseRepo,
-		purchaseCategoryRepo: purchaseCategoryRepo,
+		expenseRepo: expenseRepo,
 	}
 }
 
@@ -50,30 +48,6 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		status = *req.Status
 	}
 
-	items := make([]entities.ExpenseItem, len(req.Items))
-	for i, itemReq := range req.Items {
-		chartOfAccountID, err := uuid.Parse(itemReq.ChartOfAccountID)
-		if err != nil {
-			return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
-		}
-
-		purchaseCategoryID, err := uuid.Parse(itemReq.PurchaseCategoryID)
-		if err != nil {
-			return nil, fmt.Errorf("invalid purchase_category_id for item: %w", err)
-		}
-		if err := p.validateExpensePurchaseCategory(ctx, purchaseCategoryID, organizationID); err != nil {
-			return nil, err
-		}
-
-		items[i] = entities.ExpenseItem{
-			ChartOfAccountID:   chartOfAccountID,
-			PurchaseCategoryID: purchaseCategoryID,
-			Item:               itemReq.Item,
-			Description:        itemReq.Description,
-			Amount:             itemReq.Amount,
-		}
-	}
-
 	expenseEntity := &entities.Expense{
 		OrganizationID:  organizationID,
 		OutletID:        outletID,
@@ -91,10 +65,21 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		return nil, fmt.Errorf("failed to create expense: %w", err)
 	}
 
-	for i := range items {
-		items[i].ExpenseID = expenseEntity.ID
+	for _, itemReq := range req.Items {
+		chartOfAccountID, err := uuid.Parse(itemReq.ChartOfAccountID)
+		if err != nil {
+			return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
+		}
 
-		err = p.expenseRepo.CreateItem(ctx, &items[i])
+		itemEntity := &entities.ExpenseItem{
+			ExpenseID:        expenseEntity.ID,
+			ChartOfAccountID: chartOfAccountID,
+			Item:             itemReq.Item,
+			Description:      itemReq.Description,
+			Amount:           itemReq.Amount,
+		}
+
+		err = p.expenseRepo.CreateItem(ctx, itemEntity)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create expense item: %w", err)
 		}
@@ -150,10 +135,13 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 		expenseEntity.Reserved1 = req.Reserved1
 	}
 
-	var items []entities.ExpenseItem
 	if req.Items != nil {
-		items = make([]entities.ExpenseItem, len(req.Items))
-		for i, itemReq := range req.Items {
+		err = p.expenseRepo.DeleteItemsByExpenseID(ctx, expenseEntity.ID)
+		if err != nil {
+			return nil, fmt.Errorf("failed to delete existing items: %w", err)
+		}
+
+		for _, itemReq := range req.Items {
 			chartOfAccountID := uuid.Nil
 			if itemReq.ChartOfAccountID != nil {
 				chartOfAccountID, err = uuid.Parse(*itemReq.ChartOfAccountID)
@@ -162,17 +150,6 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 				}
 			}
 
-			if itemReq.PurchaseCategoryID == nil {
-				return nil, fmt.Errorf("purchase_category_id is required for item")
-			}
-			purchaseCategoryID, err := uuid.Parse(*itemReq.PurchaseCategoryID)
-			if err != nil {
-				return nil, fmt.Errorf("invalid purchase_category_id for item: %w", err)
-			}
-			if err := p.validateExpensePurchaseCategory(ctx, purchaseCategoryID, organizationID); err != nil {
-				return nil, err
-			}
-
 			amount := 0.0
 			if itemReq.Amount != nil {
 				amount = *itemReq.Amount
@@ -182,23 +159,15 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 				item = *itemReq.Item
 			}
 
-			items[i] = entities.ExpenseItem{
-				ExpenseID:          expenseEntity.ID,
-				ChartOfAccountID:   chartOfAccountID,
-				PurchaseCategoryID: purchaseCategoryID,
-				Item:               item,
-				Description:        itemReq.Description,
-				Amount:             amount,
+			itemEntity := &entities.ExpenseItem{
+				ExpenseID:        expenseEntity.ID,
+				ChartOfAccountID: chartOfAccountID,
+				Item:             item,
+				Description:      itemReq.Description,
+				Amount:           amount,
 			}
-		}
 
-		err = p.expenseRepo.DeleteItemsByExpenseID(ctx, expenseEntity.ID)
-		if err != nil {
-			return nil, fmt.Errorf("failed to delete existing items: %w", err)
-		}
-
-		for i := range items {
-			err = p.expenseRepo.CreateItem(ctx, &items[i])
+			err = p.expenseRepo.CreateItem(ctx, itemEntity)
 			if err != nil {
 				return nil, fmt.Errorf("failed to create expense item: %w", err)
 			}
@@ -283,18 +252,6 @@ func (p *ExpenseProcessorImpl) GetExpenseAnalytics(ctx context.Context, req *mod
 	categoryData := make([]models.ExpenseAnalyticsCategoryData, len(result.CategoryData))
 	for i, item := range result.CategoryData {
 		categoryData[i] = models.ExpenseAnalyticsCategoryData{
-			PurchaseCategoryID:   item.PurchaseCategoryID,
-			PurchaseCategoryName: item.PurchaseCategoryName,
-			PurchaseCategoryType: item.PurchaseCategoryType,
-			TotalAmount:          item.TotalAmount,
-			ExpenseCount:         item.ExpenseCount,
-			ItemCount:            item.ItemCount,
-		}
-	}
-
-	chartOfAccountData := make([]models.ExpenseAnalyticsChartOfAccountData, len(result.ChartOfAccountData))
-	for i, item := range result.ChartOfAccountData {
-		chartOfAccountData[i] = models.ExpenseAnalyticsChartOfAccountData{
 			ChartOfAccountID:   item.ChartOfAccountID,
 			ChartOfAccountName: item.ChartOfAccountName,
 			TotalAmount:        item.TotalAmount,
@@ -327,26 +284,8 @@ func (p *ExpenseProcessorImpl) GetExpenseAnalytics(ctx context.Context, req *mod
 			TotalCategories:     result.Summary.TotalCategories,
 			TotalItems:          result.Summary.TotalItems,
 		},
-		Data:               data,
-		CategoryData:       categoryData,
-		ChartOfAccountData: chartOfAccountData,
-		ItemData:           itemData,
+		Data:         data,
+		CategoryData: categoryData,
+		ItemData:     itemData,
 	}, nil
 }
-
-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)
-	}
-
-	if !category.IsActive {
-		return fmt.Errorf("purchase category is inactive")
-	}
-
-	if category.Type != entities.PurchaseCategoryTypeExpense {
-		return fmt.Errorf("purchase category must be expense")
-	}
-
-	return nil
-}

internal/processor/expense_processor_test.go

@@ -18,45 +18,6 @@ type expenseRepositoryCaptureStub struct {
 	analytics      *entities.ExpenseAnalytics
 }
 
-type expensePurchaseCategoryRepositoryStub struct {
-	category *entities.PurchaseCategory
-}
-
-func (*expensePurchaseCategoryRepositoryStub) Create(context.Context, *entities.PurchaseCategory) error {
-	return nil
-}
-
-func (s *expensePurchaseCategoryRepositoryStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.PurchaseCategory, error) {
-	return s.category, nil
-}
-
-func (*expensePurchaseCategoryRepositoryStub) Update(context.Context, *entities.PurchaseCategory) error {
-	return nil
-}
-
-func (*expensePurchaseCategoryRepositoryStub) SoftDelete(context.Context, uuid.UUID, uuid.UUID) error {
-	return nil
-}
-
-func (*expensePurchaseCategoryRepositoryStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.PurchaseCategory, int64, error) {
-	return nil, 0, nil
-}
-
-func (*expensePurchaseCategoryRepositoryStub) ExistsByCode(context.Context, uuid.UUID, string, *uuid.UUID) (bool, error) {
-	return false, nil
-}
-
-func newExpensePurchaseCategoryRepo(categoryID uuid.UUID, categoryType entities.PurchaseCategoryType) *expensePurchaseCategoryRepositoryStub {
-	return &expensePurchaseCategoryRepositoryStub{
-		category: &entities.PurchaseCategory{
-			ID:       categoryID,
-			Name:     "Operational",
-			Type:     categoryType,
-			IsActive: true,
-		},
-	}
-}
-
 func (s *expenseRepositoryCaptureStub) Create(_ context.Context, expense *entities.Expense) error {
 	if expense.ID == uuid.Nil {
 		expense.ID = uuid.New()
@@ -101,8 +62,7 @@ func (*expenseRepositoryCaptureStub) DeleteItemsByExpenseID(context.Context, uui
 
 func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
 	repo := &expenseRepositoryCaptureStub{}
-	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
+	p := NewExpenseProcessorImpl(repo)
 	chartOfAccountID := uuid.New()
 
 	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
@@ -113,10 +73,9 @@ func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
 		Total:           10000,
 		Items: []models.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   chartOfAccountID.String(),
-				PurchaseCategoryID: purchaseCategoryID.String(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
+				ChartOfAccountID: chartOfAccountID.String(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
 			},
 		},
 	})
@@ -125,15 +84,13 @@ func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
 	require.NotNil(t, resp)
 	require.Len(t, repo.createdItems, 1)
 	require.Equal(t, "Cleaning supplies", repo.createdItems[0].Item)
-	require.Equal(t, purchaseCategoryID, repo.createdItems[0].PurchaseCategoryID)
 	require.Len(t, resp.Items, 1)
 	require.Equal(t, "Cleaning supplies", resp.Items[0].Item)
 }
 
 func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
 	repo := &expenseRepositoryCaptureStub{}
-	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
+	p := NewExpenseProcessorImpl(repo)
 
 	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
 		Receiver:        "Cashier",
@@ -143,10 +100,9 @@ func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
 		Total:           10000,
 		Items: []models.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: purchaseCategoryID.String(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
 			},
 		},
 	})
@@ -159,8 +115,7 @@ func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
 
 func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
 	repo := &expenseRepositoryCaptureStub{}
-	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
+	p := NewExpenseProcessorImpl(repo)
 	status := "approved"
 
 	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
@@ -172,10 +127,9 @@ func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
 		Total:           10000,
 		Items: []models.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: purchaseCategoryID.String(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
 			},
 		},
 	})
@@ -186,35 +140,8 @@ func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
 	require.Equal(t, "approved", resp.Status)
 }
 
-func TestExpenseProcessorCreateRejectsRawMaterialPurchaseCategory(t *testing.T) {
-	repo := &expenseRepositoryCaptureStub{}
-	purchaseCategoryID := uuid.New()
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeRawMaterial))
-
-	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
-		Receiver:        "Cashier",
-		TransactionDate: "2026-05-29",
-		CodeNumber:      "EXP-001",
-		OutletID:        uuid.NewString(),
-		Total:           10000,
-		Items: []models.CreateExpenseItemRequest{
-			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: purchaseCategoryID.String(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
-			},
-		},
-	})
-
-	require.Error(t, err)
-	require.Nil(t, resp)
-	require.Contains(t, err.Error(), "expense")
-}
-
 func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *testing.T) {
 	coaID := uuid.New()
-	purchaseCategoryID := uuid.New()
 	outletID := uuid.New()
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
 	repo := &expenseRepositoryCaptureStub{
@@ -238,16 +165,6 @@ func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *te
 				},
 			},
 			CategoryData: []entities.ExpenseAnalyticsCategoryData{
-				{
-					PurchaseCategoryID:   purchaseCategoryID,
-					PurchaseCategoryName: "Operational Supplies",
-					PurchaseCategoryType: "expense",
-					TotalAmount:          100000,
-					ExpenseCount:         2,
-					ItemCount:            2,
-				},
-			},
-			ChartOfAccountData: []entities.ExpenseAnalyticsChartOfAccountData{
 				{
 					ChartOfAccountID:   coaID,
 					ChartOfAccountName: "Operational",
@@ -266,7 +183,7 @@ func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *te
 			},
 		},
 	}
-	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense))
+	p := NewExpenseProcessorImpl(repo)
 
 	resp, err := p.GetExpenseAnalytics(context.Background(), &models.ExpenseAnalyticsRequest{
 		OrganizationID: uuid.New(),
@@ -283,9 +200,7 @@ func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *te
 	require.Len(t, resp.Data, 1)
 	require.Equal(t, int64(2), resp.Data[0].ExpenseCount)
 	require.Len(t, resp.CategoryData, 1)
-	require.Equal(t, purchaseCategoryID, resp.CategoryData[0].PurchaseCategoryID)
-	require.Len(t, resp.ChartOfAccountData, 1)
-	require.Equal(t, coaID, resp.ChartOfAccountData[0].ChartOfAccountID)
+	require.Equal(t, coaID, resp.CategoryData[0].ChartOfAccountID)
 	require.Len(t, resp.ItemData, 1)
 	require.Equal(t, "Cleaning supplies", resp.ItemData[0].Item)
 }

internal/processor/order_processor.go

@@ -86,7 +86,7 @@ type CustomerRepository interface {
 }
 
 type InventoryMovementService interface {
-	CreateIngredientMovement(ctx context.Context, ingredientID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID, purchaseOrderItemID *uuid.UUID) error
+	CreateIngredientMovement(ctx context.Context, ingredientID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID) error
 	CreateProductMovement(ctx context.Context, productID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID) error
 }
 

internal/processor/purchase_order_processor.go

@@ -11,8 +11,8 @@ import (
 )
 
 type PurchaseOrderProcessor interface {
-	CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
-	UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, outletID *uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
+	CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
+	UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error)
 	DeletePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID) error
 	GetPurchaseOrderByID(ctx context.Context, id, organizationID uuid.UUID) (*models.PurchaseOrderResponse, error)
 	ListPurchaseOrders(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.PurchaseOrderResponse, int, error)
@@ -25,7 +25,6 @@ type PurchaseOrderProcessorImpl struct {
 	purchaseOrderRepo        PurchaseOrderRepository
 	vendorRepo               VendorRepository
 	ingredientRepo           IngredientRepository
-	purchaseCategoryRepo     PurchaseCategoryRepository
 	unitRepo                 UnitRepository
 	fileRepo                 FileRepository
 	inventoryMovementService InventoryMovementService
@@ -36,7 +35,6 @@ func NewPurchaseOrderProcessorImpl(
 	purchaseOrderRepo PurchaseOrderRepository,
 	vendorRepo VendorRepository,
 	ingredientRepo IngredientRepository,
-	purchaseCategoryRepo PurchaseCategoryRepository,
 	unitRepo UnitRepository,
 	fileRepo FileRepository,
 	inventoryMovementService InventoryMovementService,
@@ -46,7 +44,6 @@ func NewPurchaseOrderProcessorImpl(
 		purchaseOrderRepo:        purchaseOrderRepo,
 		vendorRepo:               vendorRepo,
 		ingredientRepo:           ingredientRepo,
-		purchaseCategoryRepo:     purchaseCategoryRepo,
 		unitRepo:                 unitRepo,
 		fileRepo:                 fileRepo,
 		inventoryMovementService: inventoryMovementService,
@@ -54,13 +51,11 @@ func NewPurchaseOrderProcessorImpl(
 	}
 }
 
-func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
-	// Check if vendor exists and belongs to organization when provided.
-	if req.VendorID != nil {
-		_, err := p.vendorRepo.GetByIDAndOrganizationID(ctx, *req.VendorID, organizationID)
-		if err != nil {
-			return nil, fmt.Errorf("vendor not found: %w", err)
-		}
+func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, organizationID uuid.UUID, req *models.CreatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
+	// Check if vendor exists and belongs to organization
+	_, err := p.vendorRepo.GetByIDAndOrganizationID(ctx, req.VendorID, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("vendor not found: %w", err)
 	}
 
 	// Check if PO number already exists in organization
@@ -69,53 +64,28 @@ 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 categories and inventory fields per item type.
+	// Validate ingredients and units exist
 	for i, item := range req.Items {
-		category, err := p.validatePurchaseCategory(ctx, item.PurchaseCategoryID, organizationID, i)
+		_, err := p.ingredientRepo.GetByID(ctx, item.IngredientID, organizationID)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("ingredient not found for item %d: %w", i, err)
 		}
 
-		switch category.Type {
-		case entities.PurchaseCategoryTypeRawMaterial:
-			if item.IngredientID == nil {
-				return nil, fmt.Errorf("ingredient_id is required for raw_material item %d", i)
-			}
-			if item.Quantity == nil {
-				return nil, fmt.Errorf("quantity is required for raw_material item %d", i)
-			}
-			if item.UnitID == nil {
-				return nil, fmt.Errorf("unit_id is required for raw_material item %d", i)
-			}
-
-			_, err := p.ingredientRepo.GetByID(ctx, *item.IngredientID, organizationID)
-			if err != nil {
-				return nil, fmt.Errorf("ingredient not found for item %d: %w", i, err)
-			}
-
-			_, err = p.unitRepo.GetByID(ctx, *item.UnitID, organizationID)
-			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)
+		_, err = p.unitRepo.GetByID(ctx, item.UnitID, organizationID)
+		if err != nil {
+			return nil, fmt.Errorf("unit not found for item %d: %w", i, err)
 		}
 	}
 
 	// Calculate total amount
 	totalAmount := 0.0
 	for _, item := range req.Items {
-		totalAmount += calculatePurchaseOrderItemTotal(item.Quantity, item.Amount)
+		totalAmount += item.Amount
 	}
 
 	// Create purchase order entity
 	poEntity := &entities.PurchaseOrder{
 		OrganizationID:  organizationID,
-		OutletID:        outletID,
 		VendorID:        req.VendorID,
 		PONumber:        req.PONumber,
 		TransactionDate: req.TransactionDate,
@@ -139,13 +109,12 @@ func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, or
 	// Create purchase order items
 	for _, itemReq := range req.Items {
 		itemEntity := &entities.PurchaseOrderItem{
-			PurchaseOrderID:    poEntity.ID,
-			IngredientID:       itemReq.IngredientID,
-			PurchaseCategoryID: itemReq.PurchaseCategoryID,
-			Description:        itemReq.Description,
-			Quantity:           itemReq.Quantity,
-			UnitID:             itemReq.UnitID,
-			Amount:             itemReq.Amount,
+			PurchaseOrderID: poEntity.ID,
+			IngredientID:    itemReq.IngredientID,
+			Description:     itemReq.Description,
+			Quantity:        itemReq.Quantity,
+			UnitID:          itemReq.UnitID,
+			Amount:          itemReq.Amount,
 		}
 
 		err = p.purchaseOrderRepo.CreateItem(ctx, itemEntity)
@@ -176,15 +145,12 @@ func (p *PurchaseOrderProcessorImpl) CreatePurchaseOrder(ctx context.Context, or
 	return mappers.PurchaseOrderEntityToResponse(createdPO), nil
 }
 
-func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, outletID *uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
+func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdatePurchaseOrderRequest) (*models.PurchaseOrderResponse, error) {
 	// Get existing purchase order
 	poEntity, err := p.purchaseOrderRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
 	if err != nil {
 		return nil, fmt.Errorf("purchase order not found: %w", err)
 	}
-	if poEntity.OutletID == nil && outletID != nil {
-		poEntity.OutletID = outletID
-	}
 
 	// Check if vendor exists and belongs to organization (if vendor is being updated)
 	if req.VendorID != nil {
@@ -192,7 +158,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 		if err != nil {
 			return nil, fmt.Errorf("vendor not found: %w", err)
 		}
-		poEntity.VendorID = req.VendorID
+		poEntity.VendorID = *req.VendorID
 	}
 
 	// Check if PO number already exists (if PO number is being updated)
@@ -223,80 +189,68 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrder(ctx context.Context, id
 
 	// Update items if provided
 	if req.Items != nil {
-		totalAmount := 0.0
-		items := make([]*entities.PurchaseOrderItem, len(req.Items))
-		for i, itemReq := range req.Items {
-			if itemReq.PurchaseCategoryID == nil {
-				return nil, fmt.Errorf("purchase_category_id is required for item %d", i)
-			}
-
-			ingredientID := itemReq.IngredientID
-			purchaseCategoryID := *itemReq.PurchaseCategoryID
-			unitID := itemReq.UnitID
-			quantity := itemReq.Quantity
-			amount := 0.0
-			if itemReq.Amount != nil {
-				amount = *itemReq.Amount
-			}
-			description := itemReq.Description
-
-			category, err := p.validatePurchaseCategory(ctx, purchaseCategoryID, organizationID, i)
-			if err != nil {
-				return nil, err
-			}
-
-			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,
-				Description:        description,
-				Quantity:           quantity,
-				UnitID:             unitID,
-				Amount:             amount,
-			}
-			totalAmount += calculatePurchaseOrderItemTotal(quantity, amount)
-		}
-
-		// Delete and recreate only after all replacement items are valid.
+		// Delete existing items
 		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 {
+		// Create new items
+		totalAmount := 0.0
+		for _, itemReq := range req.Items {
+			// Validate ingredients and units exist
+			if itemReq.IngredientID != nil {
+				_, err := p.ingredientRepo.GetByID(ctx, *itemReq.IngredientID, organizationID)
+				if err != nil {
+					return nil, fmt.Errorf("ingredient not found: %w", err)
+				}
+			}
+
+			if itemReq.UnitID != nil {
+				_, err := p.unitRepo.GetByID(ctx, *itemReq.UnitID, organizationID)
+				if err != nil {
+					return nil, fmt.Errorf("unit not found: %w", err)
+				}
+			}
+
+			// Use existing values if not provided
+			ingredientID := poEntity.Items[0].IngredientID // This is a simplified approach
+			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.Quantity != nil {
+				quantity = *itemReq.Quantity
+			}
+			if itemReq.Amount != nil {
+				amount = *itemReq.Amount
+			}
+			if itemReq.Description != nil {
+				description = itemReq.Description
+			}
+
+			itemEntity := &entities.PurchaseOrderItem{
+				PurchaseOrderID: poEntity.ID,
+				IngredientID:    ingredientID,
+				Description:     description,
+				Quantity:        quantity,
+				UnitID:          unitID,
+				Amount:          amount,
+			}
+
 			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
@@ -425,27 +379,19 @@ 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
-			if *item.UnitID != ingredient.UnitID {
+			quantityToAdd := item.Quantity
+			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
 			}
@@ -453,7 +399,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 			// Calculate unit cost in ingredient's base unit
 			unitCost := 0.0
 			if quantityToAdd > 0 {
-				unitCost = calculatePurchaseOrderItemTotal(item.Quantity, item.Amount) / quantityToAdd
+				unitCost = item.Amount / quantityToAdd
 			}
 
 			// Create inventory movement for ingredient purchase
@@ -463,7 +409,7 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 
 			err = p.inventoryMovementService.CreateIngredientMovement(
 				ctx,
-				*item.IngredientID,
+				item.IngredientID,
 				organizationID,
 				outletID,
 				userID,
@@ -473,21 +419,15 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 				reason,
 				&referenceType,
 				referenceID,
-				&item.ID,
 			)
 			if err != nil {
-				return nil, fmt.Errorf("failed to create inventory movement for ingredient %s: %w", *item.IngredientID, err)
+				return nil, fmt.Errorf("failed to create inventory movement for ingredient %s: %w", item.IngredientID, err)
 			}
 		}
 	}
 
 	// Update the purchase order status
-	statusOutletID := po.OutletID
-	if statusOutletID == nil && outletID != uuid.Nil {
-		statusOutletID = &outletID
-	}
-
-	err = p.purchaseOrderRepo.UpdateStatusAndOutlet(ctx, id, status, statusOutletID)
+	err = p.purchaseOrderRepo.UpdateStatus(ctx, id, status)
 	if err != nil {
 		return nil, fmt.Errorf("failed to update purchase order status: %w", err)
 	}
@@ -500,28 +440,3 @@ func (p *PurchaseOrderProcessorImpl) UpdatePurchaseOrderStatus(ctx context.Conte
 
 	return mappers.PurchaseOrderEntityToResponse(updatedPO), nil
 }
-
-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 nil, fmt.Errorf("purchase category not found for item %d: %w", itemIndex, err)
-	}
-
-	if !category.IsActive {
-		return nil, fmt.Errorf("purchase category for item %d is inactive", itemIndex)
-	}
-
-	if category.Type != entities.PurchaseCategoryTypeRawMaterial && category.Type != entities.PurchaseCategoryTypeExpense {
-		return nil, fmt.Errorf("purchase category for item %d must be raw_material or expense", itemIndex)
-	}
-
-	return category, nil
-}
-
-func calculatePurchaseOrderItemTotal(quantity *float64, amount float64) float64 {
-	if quantity == nil {
-		return amount
-	}
-
-	return *quantity * amount
-}

internal/processor/purchase_order_repository.go

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

internal/repository/category_repository.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/google/uuid"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 type CategoryRepositoryImpl struct {
@@ -26,7 +25,7 @@ func (r *CategoryRepositoryImpl) Create(ctx context.Context, category *entities.
 
 func (r *CategoryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Category, error) {
 	var category entities.Category
-	err := r.db.WithContext(ctx).Preload("Parent").First(&category, "id = ?", id).Error
+	err := r.db.WithContext(ctx).First(&category, "id = ?", id).Error
 	if err != nil {
 		return nil, err
 	}
@@ -55,29 +54,13 @@ func (r *CategoryRepositoryImpl) GetByBusinessType(ctx context.Context, business
 }
 
 func (r *CategoryRepositoryImpl) Update(ctx context.Context, category *entities.Category) error {
-	// Omit associations so a preloaded Parent is not upserted back over parent_id
-	return r.db.WithContext(ctx).Omit(clause.Associations).Save(category).Error
+	return r.db.WithContext(ctx).Save(category).Error
 }
 
 func (r *CategoryRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
 	return r.db.WithContext(ctx).Delete(&entities.Category{}, "id = ?", id).Error
 }
 
-// applyCategoryTypeFilter narrows the query by position in the category tree.
-//   - "parent": top level categories only (no parent of their own)
-//   - "child":  leaf categories — sub categories plus top level categories that
-//     have no sub categories, i.e. everything a product can be assigned to
-func applyCategoryTypeFilter(query *gorm.DB, value interface{}) *gorm.DB {
-	switch value {
-	case "parent":
-		return query.Where("parent_id IS NULL")
-	case "child":
-		return query.Where("NOT EXISTS (SELECT 1 FROM categories AS sub WHERE sub.parent_id = categories.id)")
-	default:
-		return query
-	}
-}
-
 func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Category, int64, error) {
 	var categories []*entities.Category
 	var total int64
@@ -92,8 +75,6 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
 		case "outlet_id":
 			// Include outlet-specific categories AND global categories (outlet_id IS NULL)
 			query = query.Where("outlet_id = ? OR outlet_id IS NULL", value)
-		case "type":
-			query = applyCategoryTypeFilter(query, value)
 		default:
 			query = query.Where(key+" = ?", value)
 		}
@@ -103,7 +84,7 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
 		return nil, 0, err
 	}
 
-	err := query.Preload("Parent").Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
+	err := query.Order("\"order\" ASC").Limit(limit).Offset(offset).Find(&categories).Error
 	return categories, total, err
 }
 
@@ -116,10 +97,6 @@ func (r *CategoryRepositoryImpl) Count(ctx context.Context, filters map[string]i
 		case "search":
 			searchValue := "%" + value.(string) + "%"
 			query = query.Where("name ILIKE ? OR description ILIKE ?", searchValue, searchValue)
-		case "outlet_id":
-			query = query.Where("outlet_id = ? OR outlet_id IS NULL", value)
-		case "type":
-			query = applyCategoryTypeFilter(query, value)
 		default:
 			query = query.Where(key+" = ?", value)
 		}

internal/repository/expense_repository.go

@@ -30,7 +30,6 @@ func (r *ExpenseRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*ent
 	var expense entities.Expense
 	err := r.db.WithContext(ctx).
 		Preload("Items.ChartOfAccount").
-		Preload("Items.PurchaseCategory").
 		First(&expense, "id = ?", id).Error
 	if err != nil {
 		return nil, err
@@ -42,7 +41,6 @@ func (r *ExpenseRepositoryImpl) GetByIDAndOrganizationID(ctx context.Context, id
 	var expense entities.Expense
 	err := r.db.WithContext(ctx).
 		Preload("Items.ChartOfAccount").
-		Preload("Items.PurchaseCategory").
 		Where("id = ? AND organization_id = ?", id, organizationID).
 		First(&expense).Error
 	if err != nil {
@@ -109,7 +107,6 @@ func (r *ExpenseRepositoryImpl) List(ctx context.Context, organizationID uuid.UU
 
 	err := query.
 		Preload("Items.ChartOfAccount").
-		Preload("Items.PurchaseCategory").
 		Order("created_at DESC").
 		Limit(limit).
 		Offset(offset).
@@ -142,7 +139,7 @@ func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID
 		Table("expense_items ei").
 		Select(`
 			COUNT(ei.id) as total_items,
-			COUNT(DISTINCT ei.purchase_category_id) as total_categories
+			COUNT(DISTINCT ei.chart_of_account_id) as total_categories
 		`).
 		Joins("JOIN expenses e ON ei.expense_id = e.id").
 		Where("e.organization_id = ?", organizationID).
@@ -177,7 +174,7 @@ func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID
 			COALESCE(SUM(item_counts.categories), 0) as categories
 		`).
 		Joins(`LEFT JOIN (
-			SELECT expense_id, COUNT(id) as items, COUNT(DISTINCT purchase_category_id) as categories
+			SELECT expense_id, COUNT(id) as items, COUNT(DISTINCT chart_of_account_id) as categories
 			FROM expense_items
 			GROUP BY expense_id
 		) item_counts ON item_counts.expense_id = e.id`).
@@ -195,32 +192,6 @@ func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID
 
 	var categoryData []entities.ExpenseAnalyticsCategoryData
 	categoryQuery := r.db.WithContext(ctx).
-		Table("expense_items ei").
-		Select(`
-			pc.id as purchase_category_id,
-			pc.name as purchase_category_name,
-			pc.type as purchase_category_type,
-			COALESCE(SUM(ei.amount), 0) as total_amount,
-			COUNT(DISTINCT e.id) as expense_count,
-			COUNT(ei.id) as item_count
-		`).
-		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.PurchaseCategoryTypeExpense).
-		Where("e.status = ?", "approved").
-		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo).
-		Group("pc.id, pc.name, pc.type").
-		Order("total_amount DESC")
-	if outletID != nil {
-		categoryQuery = categoryQuery.Where("e.outlet_id = ?", *outletID)
-	}
-	if err := categoryQuery.Scan(&categoryData).Error; err != nil {
-		return nil, err
-	}
-
-	var chartOfAccountData []entities.ExpenseAnalyticsChartOfAccountData
-	chartOfAccountQuery := r.db.WithContext(ctx).
 		Table("expense_items ei").
 		Select(`
 			COALESCE(parent_coa.id, coa.id) as chart_of_account_id,
@@ -238,9 +209,9 @@ func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID
 		Group("COALESCE(parent_coa.id, coa.id), COALESCE(parent_coa.name, coa.name, 'Lain-lain')").
 		Order("total_amount DESC")
 	if outletID != nil {
-		chartOfAccountQuery = chartOfAccountQuery.Where("e.outlet_id = ?", *outletID)
+		categoryQuery = categoryQuery.Where("e.outlet_id = ?", *outletID)
 	}
-	if err := chartOfAccountQuery.Scan(&chartOfAccountData).Error; err != nil {
+	if err := categoryQuery.Scan(&categoryData).Error; err != nil {
 		return nil, err
 	}
 
@@ -268,11 +239,10 @@ func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID
 	}
 
 	return &entities.ExpenseAnalytics{
-		Summary:            summary,
-		Data:               data,
-		CategoryData:       categoryData,
-		ChartOfAccountData: chartOfAccountData,
-		ItemData:           itemData,
+		Summary:      summary,
+		Data:         data,
+		CategoryData: categoryData,
+		ItemData:     itemData,
 	}, nil
 }
 

internal/repository/product_repository.go

@@ -101,8 +101,6 @@ func (r *ProductRepositoryImpl) List(ctx context.Context, filters map[string]int
 			query = query.Where("price >= ?", value)
 		case "price_max":
 			query = query.Where("price <= ?", value)
-		case "category_id":
-			query = query.Where("category_id IN (?)", r.categoryAndChildrenIDs(value))
 		default:
 			query = query.Where(key+" = ?", value)
 		}
@@ -112,21 +110,10 @@ func (r *ProductRepositoryImpl) List(ctx context.Context, filters map[string]int
 		return nil, 0, err
 	}
 
-	// id is a tie-breaker so LIMIT/OFFSET paging stays stable when several products
-	// share the same created_at.
-	err := query.Order("created_at DESC, id DESC").Limit(limit).Offset(offset).Find(&products).Error
+	err := query.Limit(limit).Offset(offset).Find(&products).Error
 	return products, total, err
 }
 
-// categoryAndChildrenIDs builds a subquery resolving to the category itself plus its
-// direct children, so filtering by a parent category also returns the children's
-// products. For a category without children it resolves to just that category.
-func (r *ProductRepositoryImpl) categoryAndChildrenIDs(categoryID interface{}) *gorm.DB {
-	return r.db.Model(&entities.Category{}).
-		Select("id").
-		Where("id = ? OR parent_id = ?", categoryID, categoryID)
-}
-
 func (r *ProductRepositoryImpl) Count(ctx context.Context, filters map[string]interface{}) (int64, error) {
 	var count int64
 	query := r.db.WithContext(ctx).Model(&entities.Product{})
@@ -140,8 +127,6 @@ func (r *ProductRepositoryImpl) Count(ctx context.Context, filters map[string]in
 			query = query.Where("price >= ?", value)
 		case "price_max":
 			query = query.Where("price <= ?", value)
-		case "category_id":
-			query = query.Where("category_id IN (?)", r.categoryAndChildrenIDs(value))
 		default:
 			query = query.Where(key+" = ?", value)
 		}
@@ -247,8 +232,6 @@ func (r *ProductRepositoryImpl) ListWithOutletPrice(ctx context.Context, filters
 			query = query.Where("products.price >= ?", value)
 		case "price_max":
 			query = query.Where("products.price <= ?", value)
-		case "category_id":
-			query = query.Where("products.category_id IN (?)", r.categoryAndChildrenIDs(value))
 		default:
 			query = query.Where("products."+key+" = ?", value)
 		}
@@ -267,8 +250,6 @@ func (r *ProductRepositoryImpl) ListWithOutletPrice(ctx context.Context, filters
 		return nil, 0, err
 	}
 
-	// Columns are qualified because the outlet join brings a second created_at/id
-	// into scope. id is a tie-breaker for stable LIMIT/OFFSET paging.
-	err := query.Order("products.created_at DESC, products.id DESC").Limit(limit).Offset(offset).Find(&products).Error
+	err := query.Limit(limit).Offset(offset).Find(&products).Error
 	return products, total, err
 }

internal/repository/purchase_order_repository.go

@@ -31,7 +31,6 @@ func (r *PurchaseOrderRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID)
 	err := r.db.WithContext(ctx).
 		Preload("Vendor").
 		Preload("Items.Ingredient").
-		Preload("Items.PurchaseCategory").
 		Preload("Items.Unit").
 		Preload("Attachments.File").
 		First(&po, "id = ?", id).Error
@@ -46,7 +45,6 @@ func (r *PurchaseOrderRepositoryImpl) GetByIDAndOrganizationID(ctx context.Conte
 	err := r.db.WithContext(ctx).
 		Preload("Vendor").
 		Preload("Items.Ingredient").
-		Preload("Items.PurchaseCategory").
 		Preload("Items.Unit").
 		Preload("Attachments.File").
 		Where("id = ? AND organization_id = ?", id, organizationID).
@@ -107,7 +105,6 @@ func (r *PurchaseOrderRepositoryImpl) List(ctx context.Context, organizationID u
 	err := query.
 		Preload("Vendor").
 		Preload("Items.Ingredient").
-		Preload("Items.PurchaseCategory").
 		Preload("Items.Unit").
 		Preload("Attachments.File").
 		Order("created_at DESC").
@@ -171,7 +168,6 @@ func (r *PurchaseOrderRepositoryImpl) GetByStatus(ctx context.Context, organizat
 		Where("organization_id = ? AND status = ?", organizationID, status).
 		Preload("Vendor").
 		Preload("Items.Ingredient").
-		Preload("Items.PurchaseCategory").
 		Preload("Items.Unit").
 		Find(&pos).Error
 	return pos, err
@@ -183,7 +179,6 @@ func (r *PurchaseOrderRepositoryImpl) GetOverdue(ctx context.Context, organizati
 		Where("organization_id = ? AND due_date < ? AND status IN (?)", organizationID, time.Now(), []string{"draft", "sent", "approved"}).
 		Preload("Vendor").
 		Preload("Items.Ingredient").
-		Preload("Items.PurchaseCategory").
 		Preload("Items.Unit").
 		Find(&pos).Error
 	return pos, err
@@ -196,18 +191,6 @@ func (r *PurchaseOrderRepositoryImpl) UpdateStatus(ctx context.Context, id uuid.
 		Update("status", status).Error
 }
 
-func (r *PurchaseOrderRepositoryImpl) UpdateStatusAndOutlet(ctx context.Context, id uuid.UUID, status string, outletID *uuid.UUID) error {
-	updates := map[string]interface{}{"status": status}
-	if outletID != nil {
-		updates["outlet_id"] = *outletID
-	}
-
-	return r.db.WithContext(ctx).
-		Model(&entities.PurchaseOrder{}).
-		Where("id = ?", id).
-		Updates(updates).Error
-}
-
 func (r *PurchaseOrderRepositoryImpl) UpdateTotalAmount(ctx context.Context, id uuid.UUID, totalAmount float64) error {
 	return r.db.WithContext(ctx).
 		Model(&entities.PurchaseOrder{}).
@@ -236,7 +219,6 @@ func (r *PurchaseOrderRepositoryImpl) GetItemsByPurchaseOrderID(ctx context.Cont
 	var items []*entities.PurchaseOrderItem
 	err := r.db.WithContext(ctx).
 		Preload("Ingredient").
-		Preload("PurchaseCategory").
 		Preload("Unit").
 		Where("purchase_order_id = ?", purchaseOrderID).
 		Find(&items).Error

internal/router/router.go

@@ -335,13 +335,8 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				analytics.GET("/purchasing", r.analyticsHandler.GetPurchasingAnalytics)
 				analytics.GET("/products", r.analyticsHandler.GetProductAnalytics)
 				analytics.GET("/categories", r.analyticsHandler.GetProductAnalyticsPerCategory)
-				analytics.GET("/parent-categories", r.analyticsHandler.GetProductAnalyticsPerParentCategory)
-				analytics.GET("/parent-categories/:parent_category_id", r.analyticsHandler.GetParentCategoryAnalyticsDetail)
 				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)
-				analytics.GET("/exclusive-summary/mtd", r.analyticsHandler.GetExclusiveSummaryMTD)
 			}
 
 			tables := protected.Group("/tables")
@@ -358,7 +353,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			}
 
 			ingredients := protected.Group("/ingredients")
-			ingredients.Use(r.authMiddleware.RequireAdminOrManagerOrPurchasing())
+			ingredients.Use(r.authMiddleware.RequireAdminOrManager())
 			{
 				ingredients.POST("", r.ingredientHandler.Create)
 				ingredients.GET("", r.ingredientHandler.GetAll)
@@ -371,7 +366,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			}
 
 			vendors := protected.Group("/vendors")
-			vendors.Use(r.authMiddleware.RequireAdminOrManagerOrPurchasing())
+			vendors.Use(r.authMiddleware.RequireAdminOrManager())
 			{
 				vendors.POST("", r.vendorHandler.CreateVendor)
 				vendors.GET("", r.vendorHandler.ListVendors)
@@ -382,7 +377,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			}
 
 			purchaseOrders := protected.Group("/purchase-orders")
-			purchaseOrders.Use(r.authMiddleware.RequireAdminOrManagerOrPurchasing())
+			purchaseOrders.Use(r.authMiddleware.RequireAdminOrManager())
 			{
 				purchaseOrders.POST("", r.purchaseOrderHandler.CreatePurchaseOrder)
 				purchaseOrders.GET("", r.purchaseOrderHandler.ListPurchaseOrders)
@@ -395,7 +390,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			}
 
 			purchaseCategories := protected.Group("/purchase-categories")
-			purchaseCategories.Use(r.authMiddleware.RequireAdminOrManagerOrPurchasing())
+			purchaseCategories.Use(r.authMiddleware.RequireAdminOrManager())
 			{
 				purchaseCategories.POST("", r.purchaseCategoryHandler.CreatePurchaseCategory)
 				purchaseCategories.GET("", r.purchaseCategoryHandler.ListPurchaseCategories)
@@ -405,7 +400,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			}
 
 			unitConverters := protected.Group("/unit-converters")
-			unitConverters.Use(r.authMiddleware.RequireAdminOrManagerOrPurchasing())
+			unitConverters.Use(r.authMiddleware.RequireAdminOrManager())
 			{
 				unitConverters.POST("", r.unitConverterHandler.CreateIngredientUnitConverter)
 				unitConverters.GET("", r.unitConverterHandler.ListIngredientUnitConverters)
@@ -467,7 +462,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			}
 
 			expenses := protected.Group("/expenses")
-			expenses.Use(r.authMiddleware.RequireAdminOrManagerOrPurchasing())
+			expenses.Use(r.authMiddleware.RequireAdminOrManager())
 			{
 				expenses.POST("", r.expenseHandler.CreateExpense)
 				expenses.GET("", r.expenseHandler.ListExpenses)
@@ -622,7 +617,6 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				outlets.GET("/:outlet_id/tables/occupied", r.tableHandler.GetOccupiedTables)
 				// Reports
 				outlets.GET("/:outlet_id/reports/daily-transaction.pdf", r.reportHandler.GetDailyTransactionReportPDF)
-				outlets.GET("/:outlet_id/reports/profit-loss.pdf", r.reportHandler.GetProfitLossReportPDF)
 			}
 
 			// User device routes - accessible by authenticated users for their own devices

internal/service/analytics_service.go

@@ -16,13 +16,8 @@ type AnalyticsService interface {
 	GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error)
 	GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error)
 	GetProductAnalyticsPerCategory(ctx context.Context, req *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error)
-	GetProductAnalyticsPerParentCategory(ctx context.Context, req *models.ProductAnalyticsPerParentCategoryRequest) (*models.ProductAnalyticsPerParentCategoryResponse, error)
-	GetParentCategoryAnalyticsDetail(ctx context.Context, req *models.ParentCategoryAnalyticsDetailRequest) (*models.ParentCategoryAnalyticsDetailResponse, 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)
-	GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error)
 }
 
 type AnalyticsServiceImpl struct {
@@ -106,36 +101,6 @@ func (s *AnalyticsServiceImpl) GetProductAnalyticsPerCategory(ctx context.Contex
 	return response, nil
 }
 
-func (s *AnalyticsServiceImpl) GetProductAnalyticsPerParentCategory(ctx context.Context, req *models.ProductAnalyticsPerParentCategoryRequest) (*models.ProductAnalyticsPerParentCategoryResponse, error) {
-	// Validate request
-	if err := s.validateProductAnalyticsPerParentCategoryRequest(req); err != nil {
-		return nil, fmt.Errorf("validation error: %w", err)
-	}
-
-	// Process analytics request
-	response, err := s.analyticsProcessor.GetProductAnalyticsPerParentCategory(ctx, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get product analytics per parent category: %w", err)
-	}
-
-	return response, nil
-}
-
-func (s *AnalyticsServiceImpl) GetParentCategoryAnalyticsDetail(ctx context.Context, req *models.ParentCategoryAnalyticsDetailRequest) (*models.ParentCategoryAnalyticsDetailResponse, error) {
-	// Validate request
-	if err := s.validateParentCategoryAnalyticsDetailRequest(req); err != nil {
-		return nil, fmt.Errorf("validation error: %w", err)
-	}
-
-	// Process analytics request
-	response, err := s.analyticsProcessor.GetParentCategoryAnalyticsDetail(ctx, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get parent category analytics detail: %w", err)
-	}
-
-	return response, nil
-}
-
 func (s *AnalyticsServiceImpl) GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error) {
 	// Validate request
 	if err := s.validateDashboardAnalyticsRequest(req); err != nil {
@@ -285,50 +250,6 @@ func (s *AnalyticsServiceImpl) validateProductAnalyticsPerCategoryRequest(req *m
 	return nil
 }
 
-func (s *AnalyticsServiceImpl) validateProductAnalyticsPerParentCategoryRequest(req *models.ProductAnalyticsPerParentCategoryRequest) error {
-	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) validateParentCategoryAnalyticsDetailRequest(req *models.ParentCategoryAnalyticsDetailRequest) error {
-	if req.OrganizationID == uuid.Nil {
-		return fmt.Errorf("organization ID is required")
-	}
-
-	if req.ParentCategoryID == uuid.Nil {
-		return fmt.Errorf("parent category 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) validateDashboardAnalyticsRequest(req *models.DashboardAnalyticsRequest) error {
 	if req.OrganizationID == uuid.Nil {
 		return fmt.Errorf("organization ID is required")
@@ -399,98 +320,3 @@ 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) GetExclusiveSummaryMTD(ctx context.Context, req *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
-	if err := s.validateExclusiveSummaryMTDRequest(req); err != nil {
-		return nil, fmt.Errorf("validation error: %w", err)
-	}
-
-	response, err := s.analyticsProcessor.GetExclusiveSummaryMTD(ctx, req)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get exclusive summary mtd: %w", err)
-	}
-
-	return response, nil
-}
-
-func (s *AnalyticsServiceImpl) validateExclusiveSummaryPeriodRequest(req *models.ExclusiveSummaryPeriodRequest) error {
-	if req == nil {
-		return fmt.Errorf("request cannot be nil")
-	}
-
-	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) validateExclusiveSummaryMTDRequest(req *models.ExclusiveSummaryMTDRequest) error {
-	if req == nil {
-		return fmt.Errorf("request cannot be nil")
-	}
-
-	if req.OrganizationID == uuid.Nil {
-		return fmt.Errorf("organization_id is required")
-	}
-
-	if req.DateTo.IsZero() {
-		return fmt.Errorf("date_to is required")
-	}
-
-	return nil
-}
-
-func (s *AnalyticsServiceImpl) validateExclusiveSummaryMonthlyRequest(req *models.ExclusiveSummaryMonthlyRequest) error {
-	if req == nil {
-		return fmt.Errorf("request cannot be nil")
-	}
-
-	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

@@ -33,14 +33,6 @@ func (analyticsProcessorStub) GetProductAnalyticsPerCategory(context.Context, *m
 	return nil, nil
 }
 
-func (analyticsProcessorStub) GetProductAnalyticsPerParentCategory(context.Context, *models.ProductAnalyticsPerParentCategoryRequest) (*models.ProductAnalyticsPerParentCategoryResponse, error) {
-	return nil, nil
-}
-
-func (analyticsProcessorStub) GetParentCategoryAnalyticsDetail(context.Context, *models.ParentCategoryAnalyticsDetailRequest) (*models.ParentCategoryAnalyticsDetailResponse, error) {
-	return nil, nil
-}
-
 func (analyticsProcessorStub) GetDashboardAnalytics(context.Context, *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error) {
 	return nil, nil
 }
@@ -49,18 +41,6 @@ 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 (analyticsProcessorStub) GetExclusiveSummaryMTD(context.Context, *models.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryPeriodResponse, error) {
-	return &models.ExclusiveSummaryPeriodResponse{}, nil
-}
-
 func TestAnalyticsServiceGetPurchasingAnalyticsValidation(t *testing.T) {
 	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
@@ -210,100 +190,3 @@ func TestAnalyticsServiceGetProfitLossAnalyticsAllowsEmptyGroupBy(t *testing.T)
 	require.NoError(t, err)
 	require.Nil(t, resp)
 }
-
-func TestAnalyticsServiceGetExclusiveSummaryPeriodValidation(t *testing.T) {
-	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
-	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-
-	tests := []struct {
-		name    string
-		req     *models.ExclusiveSummaryPeriodRequest
-		wantErr string
-	}{
-		{
-			name:    "nil request",
-			req:     nil,
-			wantErr: "request cannot be nil",
-		},
-		{
-			name: "missing organization",
-			req: &models.ExclusiveSummaryPeriodRequest{
-				DateFrom: now,
-				DateTo:   now,
-			},
-			wantErr: "organization_id is required",
-		},
-		{
-			name: "reversed dates",
-			req: &models.ExclusiveSummaryPeriodRequest{
-				OrganizationID: uuid.New(),
-				DateFrom:       now.AddDate(0, 0, 1),
-				DateTo:         now,
-			},
-			wantErr: "date_from cannot be after date_to",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resp, err := service.GetExclusiveSummaryPeriod(context.Background(), tt.req)
-
-			require.Nil(t, resp)
-			require.Error(t, err)
-			require.Contains(t, err.Error(), tt.wantErr)
-		})
-	}
-}
-
-func TestAnalyticsServiceGetExclusiveSummaryMonthlyValidation(t *testing.T) {
-	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
-
-	resp, err := service.GetExclusiveSummaryMonthly(context.Background(), &models.ExclusiveSummaryMonthlyRequest{
-		OrganizationID: uuid.New(),
-	})
-
-	require.Nil(t, resp)
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "month is required")
-}
-
-func TestAnalyticsServiceGetExclusiveSummaryMTDValidation(t *testing.T) {
-	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
-	now := time.Date(2026, 6, 18, 23, 59, 59, 0, time.UTC)
-
-	tests := []struct {
-		name    string
-		req     *models.ExclusiveSummaryMTDRequest
-		wantErr string
-	}{
-		{
-			name:    "nil request",
-			req:     nil,
-			wantErr: "request cannot be nil",
-		},
-		{
-			name: "missing organization",
-			req: &models.ExclusiveSummaryMTDRequest{
-				DateTo: now,
-			},
-			wantErr: "organization_id is required",
-		},
-		{
-			name: "missing date_to",
-			req: &models.ExclusiveSummaryMTDRequest{
-				OrganizationID: uuid.New(),
-			},
-			wantErr: "date_to is required",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resp, err := service.GetExclusiveSummaryMTD(context.Background(), tt.req)
-
-			require.Nil(t, resp)
-			require.Error(t, err)
-			require.Contains(t, err.Error(), tt.wantErr)
-		})
-	}
-}

internal/service/category_service.go

@@ -91,12 +91,6 @@ func (s *CategoryServiceImpl) ListCategories(ctx context.Context, req *contract.
 	if req.BusinessType != "" {
 		filters["business_type"] = req.BusinessType
 	}
-	if req.ParentID != nil {
-		filters["parent_id"] = *req.ParentID
-	}
-	if req.Type != "" {
-		filters["type"] = req.Type
-	}
 	if req.Search != "" {
 		filters["search"] = req.Search
 	}

internal/service/inventory_movement_service.go

@@ -10,7 +10,7 @@ import (
 )
 
 type InventoryMovementService interface {
-	CreateIngredientMovement(ctx context.Context, ingredientID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID, purchaseOrderItemID *uuid.UUID) error
+	CreateIngredientMovement(ctx context.Context, ingredientID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID) error
 	CreateProductMovement(ctx context.Context, productID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID) error
 }
 
@@ -26,7 +26,7 @@ func NewInventoryMovementService(inventoryMovementRepo repository.InventoryMovem
 	}
 }
 
-func (s *InventoryMovementServiceImpl) CreateIngredientMovement(ctx context.Context, ingredientID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID, purchaseOrderItemID *uuid.UUID) error {
+func (s *InventoryMovementServiceImpl) CreateIngredientMovement(ctx context.Context, ingredientID, organizationID, outletID, userID uuid.UUID, movementType entities.InventoryMovementType, quantity float64, unitCost float64, reason string, referenceType *entities.InventoryMovementReferenceType, referenceID *uuid.UUID) error {
 	ingredient, err := s.ingredientRepo.GetByID(ctx, ingredientID, organizationID)
 	if err != nil {
 		return err
@@ -36,23 +36,22 @@ func (s *InventoryMovementServiceImpl) CreateIngredientMovement(ctx context.Cont
 	newQuantity := previousQuantity + quantity
 
 	movement := &entities.InventoryMovement{
-		ID:                  uuid.New(),
-		OrganizationID:      organizationID,
-		OutletID:            outletID,
-		ItemID:              ingredientID,
-		ItemType:            "INGREDIENT",
-		MovementType:        movementType,
-		Quantity:            quantity,
-		PreviousQuantity:    previousQuantity,
-		NewQuantity:         newQuantity,
-		UnitCost:            unitCost,
-		TotalCost:           unitCost * quantity,
-		ReferenceType:       referenceType,
-		ReferenceID:         referenceID,
-		PurchaseOrderItemID: purchaseOrderItemID,
-		UserID:              userID,
-		Reason:              &reason,
-		CreatedAt:           time.Now(),
+		ID:               uuid.New(),
+		OrganizationID:   organizationID,
+		OutletID:         outletID,
+		ItemID:           ingredientID,
+		ItemType:         "INGREDIENT",
+		MovementType:     movementType,
+		Quantity:         quantity,
+		PreviousQuantity: previousQuantity,
+		NewQuantity:      newQuantity,
+		UnitCost:         unitCost,
+		TotalCost:        unitCost * quantity,
+		ReferenceType:    referenceType,
+		ReferenceID:      referenceID,
+		UserID:           userID,
+		Reason:           &reason,
+		CreatedAt:        time.Now(),
 	}
 
 	err = s.inventoryMovementRepo.Create(ctx, movement)

internal/service/purchase_order_service.go

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

internal/service/report_service.go

@@ -17,7 +17,6 @@ import (
 type ReportService interface {
 	// Returns (publicURL, fileName, error)
 	GenerateDailyTransactionPDF(ctx context.Context, organizationID string, outletID string, reportDate *time.Time, generatedBy string) (string, string, error)
-	GenerateProfitLossPDF(ctx context.Context, organizationID string, outletID string, reportDate *time.Time, generatedBy string) (string, string, error)
 }
 
 type ReportServiceImpl struct {
@@ -219,296 +218,3 @@ func getPLPctByID(rows []models.ProfitLossSummaryRow, id string) float64 {
 	}
 	return 0
 }
-
-// profitLossReportData holds data for the profit/loss PDF template
-type profitLossReportData struct {
-	OrganizationName   string
-	MonthName          string
-	ReportDate         string
-	ReportDateUpper    string
-	TotalPenjualan     string
-	TotalBiaya         string
-	LabaRugi           string
-	LabaRugiClass      string
-	LabaRugiValueClass string
-	LabaRugiMtd        string
-	LabaRugiMtdClass   string
-	LabaRugiMtdValueClass string
-	MainSummary        []profitLossSummaryRowView
-	PurchasingItems    []profitLossPurchasingItem
-	PurchasingTotal    string
-	GeneratedBy        string
-	PrintTime          string
-}
-
-type profitLossSummaryRowView struct {
-	Number       string
-	Label        string
-	TodayNominal string
-	TodayPct     string
-	MtdNominal   string
-	MtdPct       string
-	RowClass     string
-	SubItems     []profitLossSummaryRowView
-}
-
-type profitLossPurchasingItem struct {
-	Name   string
-	Amount string
-}
-
-func (s *ReportServiceImpl) GenerateProfitLossPDF(ctx context.Context, organizationID string, outletID string, reportDate *time.Time, generatedBy string) (string, string, error) {
-	orgID, err := uuid.Parse(organizationID)
-	if err != nil {
-		return "", "", fmt.Errorf("invalid organization id: %w", err)
-	}
-
-	var outID *uuid.UUID
-	if outletID != "" {
-		parsed, err := uuid.Parse(outletID)
-		if err != nil {
-			return "", "", fmt.Errorf("invalid outlet id: %w", err)
-		}
-		outID = &parsed
-	}
-
-	org, err := s.organizationRepo.GetByID(ctx, orgID)
-	if err != nil {
-		return "", "", fmt.Errorf("organization not found: %w", err)
-	}
-
-	var tzName string
-	if outID != nil {
-		outlet, err := s.outletRepo.GetByID(ctx, *outID)
-		if err == nil && outlet.Timezone != nil && *outlet.Timezone != "" {
-			tzName = *outlet.Timezone
-		}
-	}
-	if tzName == "" {
-		tzName = "Asia/Jakarta"
-	}
-
-	loc, locErr := time.LoadLocation(tzName)
-	if locErr != nil || loc == nil {
-		loc = time.Local
-	}
-
-	var day time.Time
-	if reportDate != nil {
-		t := reportDate.UTC()
-		day = time.Date(t.Year(), t.Month(), t.Day(), 0, 0, 0, 0, loc)
-	} else {
-		now := time.Now().In(loc)
-		day = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
-	}
-
-	dayStart := day
-	dayEnd := day.Add(24*time.Hour - time.Nanosecond)
-
-	// MTD: from 1st of month to end of the report day
-	mtdStart := time.Date(day.Year(), day.Month(), 1, 0, 0, 0, 0, loc)
-	mtdEnd := dayEnd
-
-	// Get profit/loss analytics for the day
-	plReq := &models.ProfitLossAnalyticsRequest{
-		OrganizationID: orgID,
-		OutletID:       outID,
-		DateFrom:       dayStart,
-		DateTo:         mtdEnd,
-		GroupBy:        "day",
-	}
-	pl, err := s.analyticsService.GetProfitLossAnalytics(ctx, plReq)
-	if err != nil {
-		return "", "", fmt.Errorf("get profit/loss analytics: %w", err)
-	}
-
-	// Get purchasing analytics for the day (Rincian Biaya / Catatan)
-	purchReq := &models.PurchasingAnalyticsRequest{
-		OrganizationID: orgID,
-		OutletID:       outID,
-		DateFrom:       dayStart,
-		DateTo:         dayEnd,
-		GroupBy:        "day",
-	}
-	purch, err := s.analyticsService.GetPurchasingAnalytics(ctx, purchReq)
-	if err != nil {
-		return "", "", fmt.Errorf("get purchasing analytics: %w", err)
-	}
-
-	// Build summary values
-	totalOmset := getPLNominalByID(pl.MainSummary, "total_omset")
-	hpp := getPLNominalByID(pl.MainSummary, "hpp")
-	_ = mtdStart // used above
-
-	// Total biaya = HPP + operational expenses for the day
-	totalBiayaToday := hpp + pl.OperationalExpensesTotal
-
-	// Laba/Rugi today
-	labaRugiToday := totalOmset - totalBiayaToday
-
-	// MTD values
-	mtdOmset := getMtdNominalByID(pl.MainSummary, "total_omset")
-	mtdCost := getMtdNominalByID(pl.MainSummary, "hpp")
-	mtdOps := getMtdNominalByID(pl.MainSummary, "biaya_ops")
-	mtdGaji := getMtdNominalByID(pl.MainSummary, "biaya_gaji")
-	labaRugiMtd := mtdOmset - mtdCost - mtdOps - mtdGaji
-
-	// Month name in Indonesian
-	monthNames := []string{"", "Januari", "Februari", "Maret", "April", "Mei", "Juni", "Juli", "Agustus", "September", "Oktober", "November", "Desember"}
-	monthName := fmt.Sprintf("%s %d", monthNames[day.Month()], day.Year())
-
-	reportDateStr := fmt.Sprintf("%d %s %d", day.Day(), monthNames[day.Month()], day.Year())
-	reportDateUpper := fmt.Sprintf("%d %s %d", day.Day(), strings.ToUpper(monthNames[day.Month()]), day.Year())
-
-	// Build main summary rows
-	mainSummaryRows := buildProfitLossSummaryRows(pl.MainSummary)
-
-	// Build purchasing items from ingredient data
-	purchItems := make([]profitLossPurchasingItem, 0)
-	var purchTotal float64
-	for _, item := range purch.IngredientData {
-		purchItems = append(purchItems, profitLossPurchasingItem{
-			Name:   item.IngredientName,
-			Amount: formatCurrency(item.TotalCost),
-		})
-		purchTotal += item.TotalCost
-	}
-
-	// Determine highlight classes
-	labaRugiClass := ""
-	labaRugiValueClass := ""
-	if labaRugiToday < 0 {
-		labaRugiClass = "highlight-red"
-		labaRugiValueClass = "negative"
-	} else {
-		labaRugiClass = "highlight-green"
-		labaRugiValueClass = "positive"
-	}
-
-	labaRugiMtdClass := ""
-	labaRugiMtdValueClass := ""
-	if labaRugiMtd < 0 {
-		labaRugiMtdClass = "highlight-red"
-		labaRugiMtdValueClass = "negative"
-	} else {
-		labaRugiMtdClass = "highlight-green"
-		labaRugiMtdValueClass = "positive"
-	}
-
-	data := profitLossReportData{
-		OrganizationName:      org.Name,
-		MonthName:             monthName,
-		ReportDate:            reportDateStr,
-		ReportDateUpper:       reportDateUpper,
-		TotalPenjualan:        formatCurrency(totalOmset),
-		TotalBiaya:            formatCurrency(totalBiayaToday),
-		LabaRugi:              formatCurrencySigned(labaRugiToday),
-		LabaRugiClass:         labaRugiClass,
-		LabaRugiValueClass:    labaRugiValueClass,
-		LabaRugiMtd:           formatCurrencySigned(labaRugiMtd),
-		LabaRugiMtdClass:      labaRugiMtdClass,
-		LabaRugiMtdValueClass: labaRugiMtdValueClass,
-		MainSummary:           mainSummaryRows,
-		PurchasingItems:       purchItems,
-		PurchasingTotal:       formatCurrency(purchTotal),
-		GeneratedBy:           generatedBy,
-		PrintTime:             time.Now().In(loc).Format("02/01/2006 15:04:05"),
-	}
-
-	templatePath := filepath.Join("templates", "profit_loss_report.html")
-	pdfBytes, err := renderTemplateToPDF(templatePath, data)
-	if err != nil {
-		return "", "", fmt.Errorf("render pdf: %w", err)
-	}
-
-	safeOrg := orgID.String()
-	safeOutlet := "all"
-	if outID != nil {
-		safeOutlet = outID.String()
-	}
-
-	fileName := fmt.Sprintf("laporan-laba-rugi-%s-%s.pdf", day.Format("2006-01-02"), time.Now().Format("20060102-150405"))
-	objectKey := fmt.Sprintf("/reports/%s/%s/%s", safeOrg, safeOutlet, fileName)
-	publicURL, err := s.fileClient.UploadFile(ctx, objectKey, pdfBytes)
-	if err != nil {
-		return "", "", fmt.Errorf("upload pdf: %w", err)
-	}
-
-	return publicURL, fileName, nil
-}
-
-func getMtdNominalByID(rows []models.ProfitLossSummaryRow, id string) float64 {
-	for _, row := range rows {
-		if row.ID == id {
-			return row.MtdNominal
-		}
-	}
-	return 0
-}
-
-func buildProfitLossSummaryRows(rows []models.ProfitLossSummaryRow) []profitLossSummaryRowView {
-	result := make([]profitLossSummaryRowView, 0, len(rows))
-	for i, row := range rows {
-		rowClass := ""
-		if row.IsBold {
-			rowClass = "highlight-green-row"
-		}
-		// Highlight laba kotor row
-		if row.ID == "laba_kotor" {
-			rowClass = "highlight-row"
-		}
-
-		number := ""
-		if row.ID != "" {
-			number = fmt.Sprintf("%d", i+1)
-		}
-
-		subItems := make([]profitLossSummaryRowView, 0)
-		for _, sub := range row.SubItems {
-			subItems = append(subItems, profitLossSummaryRowView{
-				Label:        sub.Label,
-				TodayNominal: formatCurrencyOrDash(sub.TodayNominal),
-				TodayPct:     formatPct(sub.TodayPct),
-				MtdNominal:   formatCurrencyOrDash(sub.MtdNominal),
-				MtdPct:       formatPct(sub.MtdPct),
-				RowClass:     "",
-			})
-		}
-
-		result = append(result, profitLossSummaryRowView{
-			Number:       number,
-			Label:        row.Label,
-			TodayNominal: formatCurrencyOrDash(row.TodayNominal),
-			TodayPct:     formatPct(row.TodayPct),
-			MtdNominal:   formatCurrencyOrDash(row.MtdNominal),
-			MtdPct:       formatPct(row.MtdPct),
-			RowClass:     rowClass,
-			SubItems:     subItems,
-		})
-	}
-	return result
-}
-
-func formatCurrencyOrDash(amount float64) string {
-	if amount == 0 {
-		return "-"
-	}
-	if amount < 0 {
-		return formatCurrencySigned(amount)
-	}
-	return formatCurrency(amount)
-}
-
-func formatCurrencySigned(amount float64) string {
-	if amount < 0 {
-		return "(Rp " + addThousandsSep(fmt.Sprintf("%.0f", -amount)) + ")"
-	}
-	return "Rp " + addThousandsSep(fmt.Sprintf("%.0f", amount))
-}
-
-func formatPct(pct float64) string {
-	if pct == 0 {
-		return "0%"
-	}
-	return fmt.Sprintf("%.0f%%", pct)
-}

internal/transformer/analytics_transformer.go

@@ -66,7 +66,6 @@ func PaymentMethodAnalyticsModelToContract(resp *models.PaymentMethodAnalyticsRe
 	return &contract.PaymentMethodAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
 		DateFrom:       resp.DateFrom,
 		DateTo:         resp.DateTo,
 		GroupBy:        resp.GroupBy,
@@ -123,7 +122,6 @@ func SalesAnalyticsModelToContract(resp *models.SalesAnalyticsResponse) *contrac
 	return &contract.SalesAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
 		DateFrom:       resp.DateFrom,
 		DateTo:         resp.DateTo,
 		GroupBy:        resp.GroupBy,
@@ -171,16 +169,12 @@ 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,
-			Purchases:                 item.Purchases,
-			RawMaterialPurchases:      item.RawMaterialPurchases,
-			ExpensePurchases:          item.ExpensePurchases,
-			PurchaseOrders:            item.PurchaseOrders,
-			RawMaterialPurchaseOrders: item.RawMaterialPurchaseOrders,
-			ExpenseCount:              item.ExpenseCount,
-			Quantity:                  item.Quantity,
-			Ingredients:               item.Ingredients,
-			Vendors:                   item.Vendors,
+			Date:           item.Date,
+			Purchases:      item.Purchases,
+			PurchaseOrders: item.PurchaseOrders,
+			Quantity:       item.Quantity,
+			Ingredients:    item.Ingredients,
+			Vendors:        item.Vendors,
 		}
 	}
 
@@ -217,11 +211,7 @@ 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,
@@ -287,7 +277,6 @@ func ProductAnalyticsModelToContract(resp *models.ProductAnalyticsResponse) *con
 	return &contract.ProductAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
 		DateFrom:       resp.DateFrom,
 		DateTo:         resp.DateTo,
 		Data:           data,
@@ -340,202 +329,12 @@ func ProductAnalyticsPerCategoryModelToContract(resp *models.ProductAnalyticsPer
 	return &contract.ProductAnalyticsPerCategoryResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
 		DateFrom:       resp.DateFrom,
 		DateTo:         resp.DateTo,
 		Data:           data,
 	}
 }
 
-// ProductAnalyticsPerParentCategoryContractToModel converts contract request to model
-func ProductAnalyticsPerParentCategoryContractToModel(req *contract.ProductAnalyticsPerParentCategoryRequest) *models.ProductAnalyticsPerParentCategoryRequest {
-	var dateFrom, dateTo time.Time
-
-	// Parse date range using utility function
-	if fromTime, toTime, err := util.ParseDateRangeToJakartaTime(req.DateFrom, req.DateTo); err == nil {
-		if fromTime != nil {
-			dateFrom = *fromTime
-		}
-		if toTime != nil {
-			dateTo = *toTime
-		}
-	}
-
-	return &models.ProductAnalyticsPerParentCategoryRequest{
-		OrganizationID: req.OrganizationID,
-		OutletID:       parseOutletID(req.OutletID),
-		DateFrom:       dateFrom,
-		DateTo:         dateTo,
-	}
-}
-
-// ProductAnalyticsPerParentCategoryModelToContract converts model response to contract
-func ProductAnalyticsPerParentCategoryModelToContract(resp *models.ProductAnalyticsPerParentCategoryResponse) *contract.ProductAnalyticsPerParentCategoryResponse {
-	if resp == nil {
-		return nil
-	}
-
-	var data []contract.ProductAnalyticsPerParentCategoryData
-	for _, item := range resp.Data {
-		data = append(data, contract.ProductAnalyticsPerParentCategoryData{
-			ParentCategoryID:      item.ParentCategoryID,
-			ParentCategoryName:    item.ParentCategoryName,
-			TotalRevenue:          item.TotalRevenue,
-			TotalQuantity:         item.TotalQuantity,
-			CategoryCount:         item.CategoryCount,
-			ProductCount:          item.ProductCount,
-			OrderCount:            item.OrderCount,
-			TotalStandardHpp:      item.TotalStandardHpp,
-			TotalFifoHpp:          item.TotalFifoHpp,
-			TotalMovingAverageHpp: item.TotalMovingAverageHpp,
-		})
-	}
-
-	return &contract.ProductAnalyticsPerParentCategoryResponse{
-		OrganizationID: resp.OrganizationID,
-		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
-		DateFrom:       resp.DateFrom,
-		DateTo:         resp.DateTo,
-		Data:           data,
-		Budget:         BudgetCutOffModelToContract(resp.Budget),
-	}
-}
-
-// budgetPeriodModelToContract converts one budget period to contract
-func budgetPeriodModelToContract(period models.BudgetPeriod) contract.BudgetPeriod {
-	return contract.BudgetPeriod{
-		PeriodStart:   period.PeriodStart,
-		PeriodEnd:     period.PeriodEnd,
-		Revenue:       period.Revenue,
-		OrderCount:    period.OrderCount,
-		LimitPurchase: period.LimitPurchase,
-		LimitOwner:    period.LimitOwner,
-		LimitTeam:     period.LimitTeam,
-	}
-}
-
-// BudgetCutOffModelToContract converts the budget cut-off block to contract
-func BudgetCutOffModelToContract(budget models.BudgetCutOff) contract.BudgetCutOff {
-	weekly := make([]contract.BudgetPeriod, 0, len(budget.Weekly))
-	for _, week := range budget.Weekly {
-		weekly = append(weekly, budgetPeriodModelToContract(week))
-	}
-
-	monthly := make([]contract.BudgetMonthPeriod, 0, len(budget.Monthly))
-	for _, month := range budget.Monthly {
-		monthly = append(monthly, contract.BudgetMonthPeriod{
-			Month:        month.Month,
-			WeekCount:    month.WeekCount,
-			BudgetPeriod: budgetPeriodModelToContract(month.BudgetPeriod),
-		})
-	}
-
-	return contract.BudgetCutOff{
-		Percentages: contract.BudgetPercentages{
-			Purchase: budget.Percentages.Purchase,
-			Owner:    budget.Percentages.Owner,
-			Team:     budget.Percentages.Team,
-		},
-		CutOffFrom: budget.CutOffFrom,
-		CutOffTo:   budget.CutOffTo,
-		Total:      budgetPeriodModelToContract(budget.Total),
-		Weekly:     weekly,
-		Monthly:    monthly,
-	}
-}
-
-// ParentCategoryAnalyticsDetailContractToModel converts contract request to model
-func ParentCategoryAnalyticsDetailContractToModel(req *contract.ParentCategoryAnalyticsDetailRequest) *models.ParentCategoryAnalyticsDetailRequest {
-	var dateFrom, dateTo time.Time
-
-	// Parse date range using utility function
-	if fromTime, toTime, err := util.ParseDateRangeToJakartaTime(req.DateFrom, req.DateTo); err == nil {
-		if fromTime != nil {
-			dateFrom = *fromTime
-		}
-		if toTime != nil {
-			dateTo = *toTime
-		}
-	}
-
-	// An unparseable id stays uuid.Nil and is rejected by the service validator
-	parentCategoryID, _ := uuid.Parse(req.ParentCategoryID)
-
-	return &models.ParentCategoryAnalyticsDetailRequest{
-		OrganizationID:   req.OrganizationID,
-		ParentCategoryID: parentCategoryID,
-		OutletID:         parseOutletID(req.OutletID),
-		DateFrom:         dateFrom,
-		DateTo:           dateTo,
-	}
-}
-
-// ParentCategoryAnalyticsDetailModelToContract converts model response to contract
-func ParentCategoryAnalyticsDetailModelToContract(resp *models.ParentCategoryAnalyticsDetailResponse) *contract.ParentCategoryAnalyticsDetailResponse {
-	if resp == nil {
-		return nil
-	}
-
-	categories := make([]contract.ParentCategoryAnalyticsDetailData, 0, len(resp.Categories))
-	for _, category := range resp.Categories {
-		products := make([]contract.ParentCategoryAnalyticsProductData, 0, len(category.Products))
-		for _, product := range category.Products {
-			products = append(products, contract.ParentCategoryAnalyticsProductData{
-				ProductID:               product.ProductID,
-				ProductName:             product.ProductName,
-				ProductSku:              product.ProductSku,
-				ProductPrice:            product.ProductPrice,
-				QuantitySold:            product.QuantitySold,
-				Revenue:                 product.Revenue,
-				AveragePrice:            product.AveragePrice,
-				OrderCount:              product.OrderCount,
-				StandardHppPerUnit:      product.StandardHppPerUnit,
-				StandardHppTotal:        product.StandardHppTotal,
-				FifoHppPerUnit:          product.FifoHppPerUnit,
-				FifoHppTotal:            product.FifoHppTotal,
-				MovingAverageHppPerUnit: product.MovingAverageHppPerUnit,
-				MovingAverageHppTotal:   product.MovingAverageHppTotal,
-			})
-		}
-
-		categories = append(categories, contract.ParentCategoryAnalyticsDetailData{
-			CategoryID:            category.CategoryID,
-			CategoryName:          category.CategoryName,
-			TotalRevenue:          category.TotalRevenue,
-			TotalQuantity:         category.TotalQuantity,
-			ProductCount:          category.ProductCount,
-			OrderCount:            category.OrderCount,
-			TotalStandardHpp:      category.TotalStandardHpp,
-			TotalFifoHpp:          category.TotalFifoHpp,
-			TotalMovingAverageHpp: category.TotalMovingAverageHpp,
-			Products:              products,
-		})
-	}
-
-	return &contract.ParentCategoryAnalyticsDetailResponse{
-		OrganizationID:     resp.OrganizationID,
-		OutletID:           resp.OutletID,
-		OutletName:         resp.OutletName,
-		DateFrom:           resp.DateFrom,
-		DateTo:             resp.DateTo,
-		ParentCategoryID:   resp.ParentCategoryID,
-		ParentCategoryName: resp.ParentCategoryName,
-		Summary: contract.ParentCategoryAnalyticsDetailSummary{
-			TotalRevenue:          resp.Summary.TotalRevenue,
-			TotalQuantity:         resp.Summary.TotalQuantity,
-			CategoryCount:         resp.Summary.CategoryCount,
-			ProductCount:          resp.Summary.ProductCount,
-			OrderCount:            resp.Summary.OrderCount,
-			TotalStandardHpp:      resp.Summary.TotalStandardHpp,
-			TotalFifoHpp:          resp.Summary.TotalFifoHpp,
-			TotalMovingAverageHpp: resp.Summary.TotalMovingAverageHpp,
-		},
-		Categories: categories,
-		Budget:     BudgetCutOffModelToContract(resp.Budget),
-	}
-}
-
 // DashboardAnalyticsContractToModel converts contract request to model
 func DashboardAnalyticsContractToModel(req *contract.DashboardAnalyticsRequest) *models.DashboardAnalyticsRequest {
 	var dateFrom, dateTo time.Time
@@ -614,19 +413,15 @@ func DashboardAnalyticsModelToContract(resp *models.DashboardAnalyticsResponse)
 	return &contract.DashboardAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
 		DateFrom:       resp.DateFrom,
 		DateTo:         resp.DateTo,
 		Overview: contract.DashboardOverview{
-			TotalSales:         resp.Overview.TotalSales,
-			TotalOrders:        resp.Overview.TotalOrders,
-			AverageOrderValue:  resp.Overview.AverageOrderValue,
-			TotalCustomers:     resp.Overview.TotalCustomers,
-			VoidedOrders:       resp.Overview.VoidedOrders,
-			RefundedOrders:     resp.Overview.RefundedOrders,
-			TotalItemSold:      resp.Overview.TotalItemSold,
-			TotalLowStock:      resp.Overview.TotalLowStock,
-			TotalProductActive: resp.Overview.TotalProductActive,
+			TotalSales:        resp.Overview.TotalSales,
+			TotalOrders:       resp.Overview.TotalOrders,
+			AverageOrderValue: resp.Overview.AverageOrderValue,
+			TotalCustomers:    resp.Overview.TotalCustomers,
+			VoidedOrders:      resp.Overview.VoidedOrders,
+			RefundedOrders:    resp.Overview.RefundedOrders,
 		},
 		TopProducts:    topProducts,
 		PaymentMethods: paymentMethods,
@@ -713,20 +508,9 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 		}
 	}
 
-	purchasingItems := make([]contract.ProfitLossPurchasingItem, len(resp.Purchasing.Items))
-	for i, item := range resp.Purchasing.Items {
-		purchasingItems[i] = contract.ProfitLossPurchasingItem{
-			Date:     item.Date,
-			Item:     item.Item,
-			Quantity: item.Quantity,
-			Nominal:  item.Nominal,
-		}
-	}
-
 	return &contract.ProfitLossAnalyticsResponse{
 		OrganizationID: resp.OrganizationID,
 		OutletID:       resp.OutletID,
-		OutletName:     resp.OutletName,
 		DateFrom:       resp.DateFrom,
 		DateTo:         resp.DateTo,
 		GroupBy:        resp.GroupBy,
@@ -743,18 +527,9 @@ func ProfitLossAnalyticsModelToContract(resp *models.ProfitLossAnalyticsResponse
 			AverageProfit:      resp.Summary.AverageProfit,
 			ProfitabilityRatio: resp.Summary.ProfitabilityRatio,
 		},
-		Data:        data,
-		ProductData: productData,
-		MainSummary: mainSummary,
-		Purchasing: contract.ProfitLossPurchasing{
-			TodayTotal:       resp.Purchasing.TodayTotal,
-			MtdTotal:         resp.Purchasing.MtdTotal,
-			TodayRawMaterial: resp.Purchasing.TodayRawMaterial,
-			MtdRawMaterial:   resp.Purchasing.MtdRawMaterial,
-			TodayExpense:     resp.Purchasing.TodayExpense,
-			MtdExpense:       resp.Purchasing.MtdExpense,
-			Items:            purchasingItems,
-		},
+		Data:                     data,
+		ProductData:              productData,
+		MainSummary:              mainSummary,
 		OperationalExpenses:      opsItems,
 		OperationalExpensesTotal: resp.OperationalExpensesTotal,
 	}
@@ -776,268 +551,3 @@ 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 ExclusiveSummaryMTDContractToModel(req *contract.ExclusiveSummaryMTDRequest) (*models.ExclusiveSummaryMTDRequest, error) {
-	if req == nil {
-		return nil, fmt.Errorf("request cannot be nil")
-	}
-
-	dateTo, err := parseFlexibleDateToJakartaTime(req.DateTo, true)
-	if err != nil {
-		return nil, fmt.Errorf("invalid date_to: %w", err)
-	}
-	if dateTo == nil {
-		return nil, fmt.Errorf("date_to is required")
-	}
-
-	return &models.ExclusiveSummaryMTDRequest{
-		OrganizationID:                req.OrganizationID,
-		OutletID:                      parseOutletID(req.OutletID),
-		DateTo:                        *dateTo,
-		ExcludeGajiStaffFromReimburse: req.ExcludeGajiStaffFromReimburse,
-	}, nil
-}
-
-func ExclusiveSummaryPeriodModelToContract(resp *models.ExclusiveSummaryPeriodResponse) *contract.ExclusiveSummaryPeriodResponse {
-	if resp == nil {
-		return nil
-	}
-
-	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,
-		OutletName:     resp.OutletName,
-		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,
-		OutletName:     resp.OutletName,
-		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 parseFlexibleDateToJakartaTime(dateStr string, endOfDay bool) (*time.Time, error) {
-	if dateStr == "" {
-		return nil, nil
-	}
-
-	fromTime, toTime, err := util.ParseDateRangeToJakartaTime(dateStr, dateStr)
-	if err == nil {
-		if endOfDay {
-			return toTime, nil
-		}
-		return fromTime, nil
-	}
-
-	return parseISODateToJakartaTime(dateStr, endOfDay)
-}
-
-func parseMonthToJakartaTime(month string) (time.Time, error) {
-	location, err := time.LoadLocation("Asia/Jakarta")
-	if err != nil {
-		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,47 +52,17 @@ 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) {
@@ -182,43 +152,3 @@ 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/category_transformer.go

@@ -14,7 +14,6 @@ func CreateCategoryRequestToModel(apctx *appcontext.ContextInfo, req *contract.C
 	return &models.CreateCategoryRequest{
 		OrganizationID: apctx.OrganizationID,
 		OutletID:       req.OutletID,
-		ParentID:       req.ParentID,
 		Name:           req.Name,
 		Description:    req.Description,
 		ImageURL:       nil,
@@ -28,7 +27,6 @@ func UpdateCategoryRequestToModel(req *contract.UpdateCategoryRequest) *models.U
 		Description: req.Description,
 		ImageURL:    nil,
 		OutletID:    req.OutletID,
-		ParentID:    req.ParentID,
 		Order:       req.Order,
 		IsActive:    nil,
 	}
@@ -43,8 +41,6 @@ func CategoryModelResponseToResponse(cat *models.CategoryResponse) *contract.Cat
 		ID:             cat.ID,
 		OrganizationID: cat.OrganizationID,
 		OutletID:       cat.OutletID,
-		ParentID:       cat.ParentID,
-		ParentName:     cat.ParentName,
 		Name:           cat.Name,
 		Description:    cat.Description,
 		BusinessType:   "restaurant",

internal/transformer/expense_transformer.go

@@ -27,11 +27,10 @@ func CreateExpenseRequestToModel(req *contract.CreateExpenseRequest) *models.Cre
 
 func CreateExpenseItemRequestToModel(req *contract.CreateExpenseItemRequest) models.CreateExpenseItemRequest {
 	return models.CreateExpenseItemRequest{
-		ChartOfAccountID:   req.ChartOfAccountID,
-		PurchaseCategoryID: req.PurchaseCategoryID,
-		Item:               req.Item,
-		Description:        req.Description,
-		Amount:             req.Amount,
+		ChartOfAccountID: req.ChartOfAccountID,
+		Item:             req.Item,
+		Description:      req.Description,
+		Amount:           req.Amount,
 	}
 }
 
@@ -61,11 +60,10 @@ func UpdateExpenseRequestToModel(req *contract.UpdateExpenseRequest) *models.Upd
 
 func UpdateExpenseItemRequestToModel(req *contract.UpdateExpenseItemRequest) models.UpdateExpenseItemRequest {
 	return models.UpdateExpenseItemRequest{
-		ChartOfAccountID:   req.ChartOfAccountID,
-		PurchaseCategoryID: req.PurchaseCategoryID,
-		Item:               req.Item,
-		Description:        req.Description,
-		Amount:             req.Amount,
+		ChartOfAccountID: req.ChartOfAccountID,
+		Item:             req.Item,
+		Description:      req.Description,
+		Amount:           req.Amount,
 	}
 }
 
@@ -111,19 +109,15 @@ func ExpenseModelResponseToResponse(expense *models.ExpenseResponse) *contract.E
 
 func ExpenseItemModelResponseToResponse(item *models.ExpenseItemResponse) contract.ExpenseItemResponse {
 	return contract.ExpenseItemResponse{
-		ID:                   item.ID,
-		ExpenseID:            item.ExpenseID,
-		ChartOfAccountID:     item.ChartOfAccountID,
-		ChartOfAccountName:   item.ChartOfAccountName,
-		PurchaseCategoryID:   item.PurchaseCategoryID,
-		PurchaseCategoryName: item.PurchaseCategoryName,
-		PurchaseCategoryType: item.PurchaseCategoryType,
-		PurchaseCategory:     PurchaseCategoryModelResponseToResponse(item.PurchaseCategory),
-		Item:                 item.Item,
-		Description:          item.Description,
-		Amount:               item.Amount,
-		CreatedAt:            item.CreatedAt,
-		UpdatedAt:            item.UpdatedAt,
+		ID:                 item.ID,
+		ExpenseID:          item.ExpenseID,
+		ChartOfAccountID:   item.ChartOfAccountID,
+		ChartOfAccountName: item.ChartOfAccountName,
+		Item:               item.Item,
+		Description:        item.Description,
+		Amount:             item.Amount,
+		CreatedAt:          item.CreatedAt,
+		UpdatedAt:          item.UpdatedAt,
 	}
 }
 
@@ -182,18 +176,6 @@ func ExpenseAnalyticsModelToContract(resp *models.ExpenseAnalyticsResponse) *con
 	categoryData := make([]contract.ExpenseAnalyticsCategoryData, len(resp.CategoryData))
 	for i, item := range resp.CategoryData {
 		categoryData[i] = contract.ExpenseAnalyticsCategoryData{
-			PurchaseCategoryID:   item.PurchaseCategoryID,
-			PurchaseCategoryName: item.PurchaseCategoryName,
-			PurchaseCategoryType: item.PurchaseCategoryType,
-			TotalAmount:          item.TotalAmount,
-			ExpenseCount:         item.ExpenseCount,
-			ItemCount:            item.ItemCount,
-		}
-	}
-
-	chartOfAccountData := make([]contract.ExpenseAnalyticsChartOfAccountData, len(resp.ChartOfAccountData))
-	for i, item := range resp.ChartOfAccountData {
-		chartOfAccountData[i] = contract.ExpenseAnalyticsChartOfAccountData{
 			ChartOfAccountID:   item.ChartOfAccountID,
 			ChartOfAccountName: item.ChartOfAccountName,
 			TotalAmount:        item.TotalAmount,
@@ -226,9 +208,8 @@ func ExpenseAnalyticsModelToContract(resp *models.ExpenseAnalyticsResponse) *con
 			TotalCategories:     resp.Summary.TotalCategories,
 			TotalItems:          resp.Summary.TotalItems,
 		},
-		Data:               data,
-		CategoryData:       categoryData,
-		ChartOfAccountData: chartOfAccountData,
-		ItemData:           itemData,
+		Data:         data,
+		CategoryData: categoryData,
+		ItemData:     itemData,
 	}
 }

internal/transformer/purchase_order_transformer.go

@@ -11,12 +11,11 @@ func CreatePurchaseOrderRequestToModel(req *contract.CreatePurchaseOrderRequest)
 	items := make([]models.CreatePurchaseOrderItemRequest, len(req.Items))
 	for i, item := range req.Items {
 		items[i] = models.CreatePurchaseOrderItemRequest{
-			IngredientID:       item.IngredientID,
-			PurchaseCategoryID: item.PurchaseCategoryID,
-			Description:        item.Description,
-			Quantity:           item.Quantity,
-			UnitID:             item.UnitID,
-			Amount:             item.Amount,
+			IngredientID: item.IngredientID,
+			Description:  item.Description,
+			Quantity:     item.Quantity,
+			UnitID:       item.UnitID,
+			Amount:       item.Amount,
 		}
 	}
 
@@ -55,13 +54,12 @@ func UpdatePurchaseOrderRequestToModel(req *contract.UpdatePurchaseOrderRequest)
 		items = make([]models.UpdatePurchaseOrderItemRequest, len(req.Items))
 		for i, item := range req.Items {
 			items[i] = models.UpdatePurchaseOrderItemRequest{
-				ID:                 item.ID,
-				IngredientID:       item.IngredientID,
-				PurchaseCategoryID: item.PurchaseCategoryID,
-				Description:        item.Description,
-				Quantity:           item.Quantity,
-				UnitID:             item.UnitID,
-				Amount:             item.Amount,
+				ID:           item.ID,
+				IngredientID: item.IngredientID,
+				Description:  item.Description,
+				Quantity:     item.Quantity,
+				UnitID:       item.UnitID,
+				Amount:       item.Amount,
 			}
 		}
 	}
@@ -120,7 +118,6 @@ func PurchaseOrderModelResponseToResponse(po *models.PurchaseOrderResponse) *con
 	response := &contract.PurchaseOrderResponse{
 		ID:              po.ID,
 		OrganizationID:  po.OrganizationID,
-		OutletID:        po.OutletID,
 		VendorID:        po.VendorID,
 		PONumber:        po.PONumber,
 		TransactionDate: po.TransactionDate,
@@ -157,16 +154,15 @@ func PurchaseOrderModelResponseToResponse(po *models.PurchaseOrderResponse) *con
 		response.Items = make([]contract.PurchaseOrderItemResponse, len(po.Items))
 		for i, item := range po.Items {
 			response.Items[i] = contract.PurchaseOrderItemResponse{
-				ID:                 item.ID,
-				PurchaseOrderID:    item.PurchaseOrderID,
-				IngredientID:       item.IngredientID,
-				PurchaseCategoryID: item.PurchaseCategoryID,
-				Description:        item.Description,
-				Quantity:           item.Quantity,
-				UnitID:             item.UnitID,
-				Amount:             item.Amount,
-				CreatedAt:          item.CreatedAt,
-				UpdatedAt:          item.UpdatedAt,
+				ID:              item.ID,
+				PurchaseOrderID: item.PurchaseOrderID,
+				IngredientID:    item.IngredientID,
+				Description:     item.Description,
+				Quantity:        item.Quantity,
+				UnitID:          item.UnitID,
+				Amount:          item.Amount,
+				CreatedAt:       item.CreatedAt,
+				UpdatedAt:       item.UpdatedAt,
 			}
 
 			// Map ingredient if present
@@ -177,10 +173,6 @@ func PurchaseOrderModelResponseToResponse(po *models.PurchaseOrderResponse) *con
 				}
 			}
 
-			if item.PurchaseCategory != nil {
-				response.Items[i].PurchaseCategory = PurchaseCategoryModelResponseToResponse(item.PurchaseCategory)
-			}
-
 			// Map unit if present
 			if item.Unit != nil {
 				response.Items[i].Unit = &contract.UnitResponse{

internal/transformer/purchase_order_transformer_test.go

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

internal/validator/category_validator.go

@@ -59,7 +59,7 @@ func (v *CategoryValidatorImpl) ValidateUpdateCategoryRequest(req *contract.Upda
 	}
 
 	// At least one field should be provided for update
-	if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.ParentID == nil && req.Metadata == nil {
+	if req.Name == nil && req.Description == nil && req.BusinessType == nil && req.Metadata == nil {
 		return errors.New("at least one field must be provided for update"), constants.MissingFieldErrorCode
 	}
 
@@ -118,9 +118,5 @@ func (v *CategoryValidatorImpl) ValidateListCategoriesRequest(req *contract.List
 		}
 	}
 
-	if req.Type != "" && req.Type != "parent" && req.Type != "child" {
-		return errors.New("type must be either 'parent' or 'child'"), constants.MalformedFieldErrorCode
-	}
-
 	return nil, ""
 }

internal/validator/expense_validator.go

@@ -68,18 +68,12 @@ func (v *ExpenseValidatorImpl) ValidateCreateExpenseRequest(req *contract.Create
 		if strings.TrimSpace(item.ChartOfAccountID) == "" {
 			return fmt.Errorf("item %d: chart_of_account_id is required", i), constants.MissingFieldErrorCode
 		}
-		if strings.TrimSpace(item.PurchaseCategoryID) == "" {
-			return fmt.Errorf("item %d: purchase_category_id is required", i), constants.MissingFieldErrorCode
-		}
 		if strings.TrimSpace(item.Item) == "" {
 			return fmt.Errorf("item %d: item is required", i), constants.MissingFieldErrorCode
 		}
 		if _, err := uuid.Parse(item.ChartOfAccountID); err != nil {
 			return fmt.Errorf("item %d: chart_of_account_id must be a valid UUID", i), constants.MalformedFieldErrorCode
 		}
-		if _, err := uuid.Parse(item.PurchaseCategoryID); err != nil {
-			return fmt.Errorf("item %d: purchase_category_id must be a valid UUID", i), constants.MalformedFieldErrorCode
-		}
 		if item.Amount <= 0 {
 			return fmt.Errorf("item %d: amount must be greater than 0", i), constants.MalformedFieldErrorCode
 		}
@@ -132,15 +126,6 @@ func (v *ExpenseValidatorImpl) ValidateUpdateExpenseRequest(req *contract.Update
 					return fmt.Errorf("item %d: chart_of_account_id must be a valid UUID", i), constants.MalformedFieldErrorCode
 				}
 			}
-			if item.PurchaseCategoryID == nil {
-				return fmt.Errorf("item %d: purchase_category_id is required", i), constants.MissingFieldErrorCode
-			}
-			if strings.TrimSpace(*item.PurchaseCategoryID) == "" {
-				return fmt.Errorf("item %d: purchase_category_id cannot be empty", i), constants.MalformedFieldErrorCode
-			}
-			if _, err := uuid.Parse(*item.PurchaseCategoryID); err != nil {
-				return fmt.Errorf("item %d: purchase_category_id must be a valid UUID", i), constants.MalformedFieldErrorCode
-			}
 			if item.Item != nil && strings.TrimSpace(*item.Item) == "" {
 				return fmt.Errorf("item %d: item cannot be empty", i), constants.MalformedFieldErrorCode
 			}

internal/validator/expense_validator_test.go

@@ -21,9 +21,8 @@ func TestExpenseValidatorCreateRequiresItemName(t *testing.T) {
 		Total:           10000,
 		Items: []contract.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: uuid.NewString(),
-				Amount:             10000,
+				ChartOfAccountID: uuid.NewString(),
+				Amount:           10000,
 			},
 		},
 	}
@@ -46,10 +45,9 @@ func TestExpenseValidatorCreateDoesNotRequireHeaderExpenseName(t *testing.T) {
 		Total:           10000,
 		Items: []contract.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: uuid.NewString(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
 			},
 		},
 	}
@@ -73,10 +71,9 @@ func TestExpenseValidatorCreateAllowsValidOptionalStatus(t *testing.T) {
 		Total:           10000,
 		Items: []contract.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: uuid.NewString(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
 			},
 		},
 	}
@@ -100,10 +97,9 @@ func TestExpenseValidatorCreateRejectsInvalidStatus(t *testing.T) {
 		Total:           10000,
 		Items: []contract.CreateExpenseItemRequest{
 			{
-				ChartOfAccountID:   uuid.NewString(),
-				PurchaseCategoryID: uuid.NewString(),
-				Item:               "Cleaning supplies",
-				Amount:             10000,
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
 			},
 		},
 	}
@@ -118,11 +114,10 @@ func TestExpenseValidatorCreateRejectsInvalidStatus(t *testing.T) {
 func TestExpenseValidatorUpdateRejectsEmptyItemNameWhenProvided(t *testing.T) {
 	v := NewExpenseValidator()
 	empty := " "
-	purchaseCategoryID := uuid.NewString()
 
 	req := &contract.UpdateExpenseRequest{
 		Items: []contract.UpdateExpenseItemRequest{
-			{PurchaseCategoryID: &purchaseCategoryID, Item: &empty},
+			{Item: &empty},
 		},
 	}
 

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 expense"), constants.MalformedFieldErrorCode
+		return errors.New("type must be raw_material or non_inventory"), 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 expense"), constants.MalformedFieldErrorCode
+		return errors.New("type must be raw_material or non_inventory"), 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 expense"), constants.MalformedFieldErrorCode
+		return errors.New("type must be raw_material or non_inventory"), constants.MalformedFieldErrorCode
 	}
 
 	return nil, ""
@@ -95,7 +95,7 @@ func (v *PurchaseCategoryValidatorImpl) ValidateListPurchaseCategoriesRequest(re
 
 func isValidPurchaseCategoryType(categoryType string) bool {
 	switch categoryType {
-	case "raw_material", "expense":
+	case "raw_material", "non_inventory":
 		return true
 	default:
 		return false

internal/validator/purchase_order_validator.go

@@ -2,14 +2,11 @@ package validator
 
 import (
 	"errors"
-	"strconv"
 	"strings"
 	"time"
 
 	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/contract"
-
-	"github.com/google/uuid"
 )
 
 type PurchaseOrderValidator interface {
@@ -29,8 +26,8 @@ func (v *PurchaseOrderValidatorImpl) ValidateCreatePurchaseOrderRequest(req *con
 		return errors.New("request body is required"), constants.MissingFieldErrorCode
 	}
 
-	if req.VendorID != nil && *req.VendorID == uuid.Nil {
-		return errors.New("vendor_id cannot be empty"), constants.MalformedFieldErrorCode
+	if req.VendorID.String() == "" {
+		return errors.New("vendor_id is required"), constants.MissingFieldErrorCode
 	}
 
 	if strings.TrimSpace(req.PONumber) == "" {
@@ -181,48 +178,32 @@ func (v *PurchaseOrderValidatorImpl) ValidateListPurchaseOrdersRequest(req *cont
 }
 
 func (v *PurchaseOrderValidatorImpl) validatePurchaseOrderItem(item *contract.CreatePurchaseOrderItemRequest, index int) (error, string) {
-	if item.PurchaseCategoryID == uuid.Nil {
-		return errors.New("items[" + strconv.Itoa(index) + "].purchase_category_id is required"), constants.MissingFieldErrorCode
+	if item.IngredientID.String() == "" {
+		return errors.New("items[" + string(rune(index)) + "].ingredient_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.Quantity <= 0 {
+		return errors.New("items[" + string(rune(index)) + "].quantity must be greater than 0"), 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 != nil && *item.UnitID == uuid.Nil {
-		return errors.New("items[" + strconv.Itoa(index) + "].unit_id cannot be empty"), constants.MalformedFieldErrorCode
+	if item.UnitID.String() == "" {
+		return errors.New("items[" + string(rune(index)) + "].unit_id is required"), constants.MissingFieldErrorCode
 	}
 
 	if item.Amount < 0 {
-		return errors.New("items[" + strconv.Itoa(index) + "].amount must be greater than or equal to 0"), constants.MalformedFieldErrorCode
+		return errors.New("items[" + string(rune(index)) + "].amount must be greater than or equal to 0"), constants.MalformedFieldErrorCode
 	}
 
 	return nil, ""
 }
 
 func (v *PurchaseOrderValidatorImpl) validateUpdatePurchaseOrderItem(item *contract.UpdatePurchaseOrderItemRequest, index int) (error, string) {
-	if item.PurchaseCategoryID == nil || *item.PurchaseCategoryID == uuid.Nil {
-		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
+		return errors.New("items[" + string(rune(index)) + "].quantity must be greater than 0"), constants.MalformedFieldErrorCode
 	}
 
 	if item.Amount != nil && *item.Amount < 0 {
-		return errors.New("items[" + strconv.Itoa(index) + "].amount must be greater than or equal to 0"), constants.MalformedFieldErrorCode
+		return errors.New("items[" + string(rune(index)) + "].amount must be greater than or equal to 0"), constants.MalformedFieldErrorCode
 	}
 
 	return nil, ""

internal/validator/purchase_order_validator_test.go

@@ -11,51 +11,21 @@ import (
 )
 
 func validCreatePurchaseOrderRequest() *contract.CreatePurchaseOrderRequest {
-	vendorID := uuid.New()
-	ingredientID := uuid.New()
-	quantity := 1.0
-	unitID := uuid.New()
-
 	return &contract.CreatePurchaseOrderRequest{
-		VendorID:        &vendorID,
+		VendorID:        uuid.New(),
 		PONumber:        "PO-001",
 		TransactionDate: "2026-05-29",
 		Items: []contract.CreatePurchaseOrderItemRequest{
 			{
-				IngredientID:       &ingredientID,
-				PurchaseCategoryID: uuid.New(),
-				Quantity:           &quantity,
-				UnitID:             &unitID,
-				Amount:             1000,
+				IngredientID: uuid.New(),
+				Quantity:     1,
+				UnitID:       uuid.New(),
+				Amount:       1000,
 			},
 		},
 	}
 }
 
-func TestPurchaseOrderValidatorCreateAllowsMissingVendor(t *testing.T) {
-	validator := NewPurchaseOrderValidator()
-	req := validCreatePurchaseOrderRequest()
-	req.VendorID = nil
-
-	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
-
-	require.NoError(t, err)
-	require.Empty(t, code)
-}
-
-func TestPurchaseOrderValidatorCreateRejectsEmptyVendor(t *testing.T) {
-	validator := NewPurchaseOrderValidator()
-	req := validCreatePurchaseOrderRequest()
-	vendorID := uuid.Nil
-	req.VendorID = &vendorID
-
-	err, code := validator.ValidateCreatePurchaseOrderRequest(req)
-
-	require.Error(t, err)
-	require.Equal(t, constants.MalformedFieldErrorCode, code)
-	require.Contains(t, err.Error(), "vendor_id cannot be empty")
-}
-
 func TestPurchaseOrderValidatorCreateAllowsMissingDueDate(t *testing.T) {
 	validator := NewPurchaseOrderValidator()
 

internal/validator/user_validator.go

@@ -140,12 +140,10 @@ func (v *UserValidatorImpl) ValidateUserID(userID uuid.UUID) (error, string) {
 
 func isValidUserRole(role string) bool {
 	validRoles := map[string]bool{
-		string(constants.RoleAdmin):      true,
-		string(constants.RoleManager):    true,
-		string(constants.RoleCashier):    true,
-		string(constants.RoleWaiter):     true,
-		string(constants.RoleOwner):      true,
-		string(constants.RolePurchasing): true,
+		string(constants.RoleAdmin):   true,
+		string(constants.RoleManager): true,
+		string(constants.RoleCashier): true,
+		string(constants.RoleWaiter):  true,
 	}
 	return validRoles[role]
 }

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', 'expense')),
+    type VARCHAR(20) NOT NULL CHECK (type IN ('raw_material', 'non_inventory')),
     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', 'expense')),
+    type VARCHAR(20) NOT NULL CHECK (type IN ('raw_material', 'non_inventory')),
     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
-    ('bahan_baku', 'Bahan Baku', 'raw_material', 1),
-    ('biaya_lain_lain', 'Biaya Lain-lain', 'expense', 2)
+    ('hpp', 'HPP', 'raw_material', 1),
+    ('biaya_lain_lain', 'Biaya Lain-lain', 'non_inventory', 2)
 ON CONFLICT (code) DO NOTHING;
 
 INSERT INTO purchase_category_presets (parent_id, code, name, type, sort_order)
@@ -47,14 +47,18 @@ SELECT parent.id, child.code, child.name, child.type, child.sort_order
 FROM purchase_category_presets parent
 JOIN (
     VALUES
-        ('biaya_lain_lain', 'biaya_atk_perlengkapan', 'ATK & Perlengkapan', 'expense', 1),
-        ('biaya_lain_lain', 'biaya_makan_karyawan', 'Makan Karyawan', 'expense', 2),
-        ('biaya_lain_lain', 'biaya_bensin_parkir', 'Bensin & Parkir', 'expense', 3),
-        ('biaya_lain_lain', 'biaya_kebersihan_keamanan', 'Kebersihan & Keamanan', 'expense', 4),
-        ('biaya_lain_lain', 'biaya_gaji_dw', 'Gaji DW', 'expense', 5),
-        ('biaya_lain_lain', 'biaya_gaji_staff', 'Gaji Staff', 'expense', 6),
-        ('biaya_lain_lain', 'biaya_internet_server', 'Internet & Server', 'expense', 7),
-        ('biaya_lain_lain', 'biaya_air_listrik', 'Air & Listrik', 'expense', 8),
-        ('biaya_lain_lain', 'biaya_promosi', 'Promosi', 'expense', 9)
+        ('hpp', 'hpp_bakso_mie_ayam', 'Bakso & Mie Ayam', 'raw_material', 1),
+        ('hpp', 'hpp_nusantara', 'Nusantara', 'raw_material', 2),
+        ('hpp', 'hpp_ramen', 'Ramen', 'raw_material', 3),
+        ('hpp', 'hpp_minuman_kopi', 'Minuman/Kopi', 'raw_material', 4),
+        ('biaya_lain_lain', 'biaya_atk_perlengkapan', 'ATK & Perlengkapan', 'non_inventory', 1),
+        ('biaya_lain_lain', 'biaya_makan_karyawan', 'Makan Karyawan', 'non_inventory', 2),
+        ('biaya_lain_lain', 'biaya_bensin_parkir', 'Bensin & Parkir', 'non_inventory', 3),
+        ('biaya_lain_lain', 'biaya_kebersihan_keamanan', 'Kebersihan & Keamanan', 'non_inventory', 4),
+        ('biaya_lain_lain', 'biaya_gaji_dw', 'Gaji DW', 'non_inventory', 5),
+        ('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/000078_add_purchase_category_to_purchase_order_items.down.sql

@@ -1,5 +0,0 @@
-DROP INDEX IF EXISTS idx_inventory_movements_purchase_order_item_id;
-ALTER TABLE inventory_movements DROP COLUMN IF EXISTS purchase_order_item_id;
-
-DROP INDEX IF EXISTS idx_purchase_order_items_purchase_category_id;
-ALTER TABLE purchase_order_items DROP COLUMN IF EXISTS purchase_category_id;

migrations/000078_add_purchase_category_to_purchase_order_items.up.sql

@@ -1,11 +0,0 @@
-ALTER TABLE purchase_order_items
-ADD COLUMN IF NOT EXISTS purchase_category_id UUID REFERENCES purchase_categories(id) ON DELETE RESTRICT;
-
-CREATE INDEX IF NOT EXISTS idx_purchase_order_items_purchase_category_id
-ON purchase_order_items(purchase_category_id);
-
-ALTER TABLE inventory_movements
-ADD COLUMN IF NOT EXISTS purchase_order_item_id UUID REFERENCES purchase_order_items(id) ON DELETE SET NULL;
-
-CREATE INDEX IF NOT EXISTS idx_inventory_movements_purchase_order_item_id
-ON inventory_movements(purchase_order_item_id);

migrations/000079_add_purchase_category_to_expense_items.down.sql

@@ -1,2 +0,0 @@
-DROP INDEX IF EXISTS idx_expense_items_purchase_category_id;
-ALTER TABLE expense_items DROP COLUMN IF EXISTS purchase_category_id;

migrations/000079_add_purchase_category_to_expense_items.up.sql

@@ -1,5 +0,0 @@
-ALTER TABLE expense_items
-ADD COLUMN IF NOT EXISTS purchase_category_id UUID REFERENCES purchase_categories(id) ON DELETE RESTRICT;
-
-CREATE INDEX IF NOT EXISTS idx_expense_items_purchase_category_id
-ON expense_items(purchase_category_id);

migrations/000080_rename_non_inventory_purchase_categories.down.sql

@@ -1,32 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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;

migrations/000081_make_purchase_order_vendor_nullable.down.sql

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

migrations/000081_make_purchase_order_vendor_nullable.up.sql

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

migrations/000082_add_outlet_id_to_purchase_orders.down.sql

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

migrations/000082_add_outlet_id_to_purchase_orders.up.sql

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

migrations/000083_add_owner_purchasing_roles.down.sql

@@ -1,4 +0,0 @@
--- Revert to original roles
-ALTER TABLE users DROP CONSTRAINT IF EXISTS users_role_check;
-UPDATE users SET role = 'admin' WHERE role NOT IN ('admin', 'manager', 'cashier', 'waiter');
-ALTER TABLE users ADD CONSTRAINT users_role_check CHECK (role IN ('admin', 'manager', 'cashier', 'waiter'));

migrations/000083_add_owner_purchasing_roles.up.sql

@@ -1,4 +0,0 @@
--- Add 'owner' and 'purchasing' roles to users table
-ALTER TABLE users DROP CONSTRAINT IF EXISTS users_role_check;
-UPDATE users SET role = 'admin' WHERE role NOT IN ('admin', 'manager', 'cashier', 'waiter', 'owner', 'purchasing');
-ALTER TABLE users ADD CONSTRAINT users_role_check CHECK (role IN ('admin', 'manager', 'cashier', 'waiter', 'owner', 'purchasing'));

migrations/000084_add_parent_id_to_categories.down.sql

@@ -1,6 +0,0 @@
-ALTER TABLE categories
-DROP CONSTRAINT IF EXISTS categories_parent_id_fkey;
-ALTER TABLE categories
-DROP COLUMN IF EXISTS parent_id;
-
-DROP INDEX IF EXISTS idx_categories_parent_id;

migrations/000084_add_parent_id_to_categories.up.sql

@@ -1,4 +0,0 @@
-ALTER TABLE categories
-ADD COLUMN parent_id UUID REFERENCES categories(id) ON DELETE SET NULL;
-
-CREATE INDEX idx_categories_parent_id ON categories(parent_id);

templates/profit_loss_report.html

@@ -1,394 +0,0 @@
-<!doctype html>
-<html lang="id">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Laporan Penjualan Harian</title>
-    <style>
-      @page {
-        size: A4;
-        margin: 10mm 12mm;
-      }
-      * {
-        margin: 0;
-        padding: 0;
-        box-sizing: border-box;
-      }
-      body {
-        font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
-        background: #ffffff;
-        color: #2d3748;
-        line-height: 1.4;
-        font-size: 11px;
-      }
-      .report-container {
-        max-width: 210mm;
-        margin: 0 auto;
-        padding: 0;
-      }
-
-      /* Header */
-      .report-header {
-        text-align: center;
-        margin-bottom: 20px;
-      }
-      .header-logo {
-        display: inline-block;
-        width: 60px;
-        height: 60px;
-        border-radius: 10px;
-        overflow: hidden;
-        margin-bottom: 8px;
-        background: #dc2626;
-        padding: 10px;
-      }
-      .header-logo svg {
-        width: 40px;
-        height: 40px;
-      }
-      .header-title {
-        font-size: 22px;
-        font-weight: 800;
-        color: #1a1a1a;
-        margin-bottom: 4px;
-      }
-      .header-org {
-        font-size: 14px;
-        font-weight: 700;
-        color: #dc2626;
-        margin-bottom: 2px;
-      }
-      .header-period {
-        font-size: 11px;
-        color: #666;
-        font-style: italic;
-      }
-
-      /* Summary Boxes */
-      .summary-boxes {
-        display: grid;
-        grid-template-columns: 1fr 1fr;
-        gap: 0;
-        margin-bottom: 20px;
-        border: 2px solid #1a1a1a;
-      }
-      .summary-box {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 10px 14px;
-        border-bottom: 1px solid #1a1a1a;
-      }
-      .summary-box:nth-child(odd) {
-        border-right: 1px solid #1a1a1a;
-      }
-      .summary-box:nth-child(n + 3) {
-        border-bottom: none;
-      }
-      .summary-box.highlight-green {
-        background: #dcfce7;
-      }
-      .summary-box.highlight-red {
-        background: #fee2e2;
-      }
-      .summary-box-label {
-        font-size: 10px;
-        font-weight: 700;
-        color: #1a1a1a;
-        text-transform: uppercase;
-      }
-      .summary-box-value {
-        font-size: 13px;
-        font-weight: 800;
-        color: #1a1a1a;
-        font-family: "Courier New", monospace;
-      }
-      .summary-box-value.negative {
-        color: #dc2626;
-      }
-      .summary-box-value.positive {
-        color: #16a34a;
-      }
-
-      /* Section Title */
-      .section-title {
-        font-size: 14px;
-        font-weight: 800;
-        color: #dc2626;
-        margin-bottom: 10px;
-        margin-top: 20px;
-      }
-
-      /* Main Summary Table */
-      .summary-table {
-        width: 100%;
-        border-collapse: collapse;
-        margin-bottom: 20px;
-        font-size: 11px;
-      }
-      .summary-table thead th {
-        background: #dc2626;
-        color: #ffffff;
-        padding: 8px 10px;
-        text-align: center;
-        font-size: 10px;
-        font-weight: 700;
-        text-transform: uppercase;
-        border: 1px solid #dc2626;
-      }
-      .summary-table thead th:first-child {
-        width: 30px;
-      }
-      .summary-table thead th:nth-child(2) {
-        text-align: left;
-        width: 35%;
-      }
-      .summary-table tbody td {
-        padding: 7px 10px;
-        border: 1px solid #e5e7eb;
-        font-size: 11px;
-      }
-      .summary-table tbody td:first-child {
-        text-align: center;
-        font-weight: 600;
-      }
-      .summary-table tbody td.nominal {
-        text-align: right;
-        font-family: "Courier New", monospace;
-        font-weight: 600;
-      }
-      .summary-table tbody td.pct {
-        text-align: center;
-        font-weight: 600;
-      }
-      .summary-table tbody tr.bold-row td {
-        font-weight: 800;
-        background: #f9fafb;
-      }
-      .summary-table tbody tr.highlight-row td {
-        font-weight: 800;
-        background: #fef3c7;
-      }
-      .summary-table tbody tr.highlight-green-row td {
-        font-weight: 800;
-        background: #dcfce7;
-      }
-      .summary-table tbody tr.sub-item td {
-        padding-left: 30px;
-        font-size: 10px;
-        color: #4b5563;
-      }
-
-      /* Rincian Biaya Table */
-      .detail-table {
-        width: 100%;
-        border-collapse: collapse;
-        margin-bottom: 20px;
-        font-size: 11px;
-      }
-      .detail-table thead th {
-        background: #dc2626;
-        color: #ffffff;
-        padding: 8px 10px;
-        text-align: center;
-        font-size: 10px;
-        font-weight: 700;
-        text-transform: uppercase;
-        border: 1px solid #dc2626;
-      }
-      .detail-table thead th:first-child {
-        width: 30px;
-      }
-      .detail-table thead th:nth-child(2) {
-        text-align: left;
-      }
-      .detail-table thead th:last-child {
-        text-align: right;
-        width: 25%;
-      }
-      .detail-table tbody td {
-        padding: 7px 10px;
-        border: 1px solid #e5e7eb;
-        font-size: 11px;
-      }
-      .detail-table tbody td:first-child {
-        text-align: center;
-        font-weight: 600;
-      }
-      .detail-table tbody td:last-child {
-        text-align: right;
-        font-family: "Courier New", monospace;
-        font-weight: 600;
-      }
-      .detail-table tbody tr.total-row td {
-        font-weight: 800;
-        background: #fef3c7;
-        border-top: 2px solid #1a1a1a;
-      }
-
-      /* Footer */
-      .report-footer {
-        margin-top: 20px;
-        padding-top: 10px;
-        border-top: 1px solid #e5e7eb;
-        font-size: 9px;
-        color: #9ca3af;
-        text-align: center;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="report-container">
-      <!-- HEADER -->
-      <div class="report-header">
-        <div class="header-logo">
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="0 0 500 500"
-            width="40"
-            height="40"
-          >
-            <rect fill="#dc2626" x="0" y="0" width="500" height="500" rx="60" />
-            <g transform="translate(250,250) scale(3.2)">
-              <rect
-                x="-40"
-                y="-50"
-                width="80"
-                height="10"
-                rx="3"
-                fill="white"
-              />
-              <rect
-                x="-30"
-                y="-35"
-                width="60"
-                height="60"
-                rx="5"
-                fill="none"
-                stroke="white"
-                stroke-width="5"
-              />
-              <circle cx="0" cy="-55" r="8" fill="white" />
-              <line
-                x1="-10"
-                y1="-60"
-                x2="10"
-                y2="-50"
-                stroke="white"
-                stroke-width="3"
-              />
-              <line
-                x1="10"
-                y1="-60"
-                x2="-10"
-                y2="-50"
-                stroke="white"
-                stroke-width="3"
-              />
-            </g>
-          </svg>
-        </div>
-        <div class="header-title">LAPORAN PENJUALAN HARIAN</div>
-        <div class="header-org">{{.OrganizationName}}</div>
-        <div class="header-period">
-          Bulan: {{.MonthName}} / Tanggal Report: {{.ReportDate}}
-        </div>
-      </div>
-
-      <!-- SUMMARY BOXES -->
-      <div class="summary-boxes">
-        <div class="summary-box">
-          <span class="summary-box-label"
-            >TOTAL PENJUALAN {{.ReportDateUpper}}</span
-          >
-          <span class="summary-box-value">{{.TotalPenjualan}}</span>
-        </div>
-        <div class="summary-box">
-          <span class="summary-box-label"
-            >TOTAL BIAYA {{.ReportDateUpper}}</span
-          >
-          <span class="summary-box-value">{{.TotalBiaya}}</span>
-        </div>
-        <div class="summary-box {{.LabaRugiClass}}">
-          <span class="summary-box-label">LABA/RUGI {{.ReportDateUpper}}</span>
-          <span class="summary-box-value {{.LabaRugiValueClass}}"
-            >{{.LabaRugi}}</span
-          >
-        </div>
-        <div class="summary-box {{.LabaRugiMtdClass}}">
-          <span class="summary-box-label">LABA/RUGI MTD</span>
-          <span class="summary-box-value {{.LabaRugiMtdValueClass}}"
-            >{{.LabaRugiMtd}}</span
-          >
-        </div>
-      </div>
-
-      <!-- 1. RINGKASAN LAPORAN -->
-      <div class="section-title">1. Ringkasan Laporan</div>
-      <table class="summary-table">
-        <thead>
-          <tr>
-            <th>NO</th>
-            <th>KETERANGAN</th>
-            <th>TANGGAL REPORT<br />Nominal</th>
-            <th>%</th>
-            <th>MTD<br />Nominal</th>
-            <th>%</th>
-          </tr>
-        </thead>
-        <tbody>
-          {{range $i, $row := .MainSummary}}
-          <tr class="{{$row.RowClass}}">
-            <td>{{if $row.Number}}{{$row.Number}}{{end}}</td>
-            <td>{{$row.Label}}</td>
-            <td class="nominal">{{$row.TodayNominal}}</td>
-            <td class="pct">{{$row.TodayPct}}</td>
-            <td class="nominal">{{$row.MtdNominal}}</td>
-            <td class="pct">{{$row.MtdPct}}</td>
-          </tr>
-          {{range $j, $sub := $row.SubItems}}
-          <tr class="sub-item">
-            <td></td>
-            <td>{{$sub.Label}}</td>
-            <td class="nominal">{{$sub.TodayNominal}}</td>
-            <td class="pct">{{$sub.TodayPct}}</td>
-            <td class="nominal">{{$sub.MtdNominal}}</td>
-            <td class="pct">{{$sub.MtdPct}}</td>
-          </tr>
-          {{end}} {{end}}
-        </tbody>
-      </table>
-
-      <!-- 2. RINCIAN BIAYA / CATATAN -->
-      <div class="section-title">2. Rincian Biaya / Catatan</div>
-      <table class="detail-table">
-        <thead>
-          <tr>
-            <th>NO</th>
-            <th>KETERANGAN</th>
-            <th>JUMLAH</th>
-          </tr>
-        </thead>
-        <tbody>
-          {{range $i, $item := .PurchasingItems}}
-          <tr>
-            <td>{{add $i 1}}</td>
-            <td>{{$item.Name}}</td>
-            <td>{{$item.Amount}}</td>
-          </tr>
-          {{end}}
-          <tr class="total-row">
-            <td></td>
-            <td>TOTAL</td>
-            <td>{{.PurchasingTotal}}</td>
-          </tr>
-        </tbody>
-      </table>
-
-      <!-- FOOTER -->
-      <div class="report-footer">
-        Dicetak oleh: {{.GeneratedBy}} | {{.PrintTime}} | Powered by APSKEL
-      </div>
-    </div>
-  </body>
-</html>