feat: cash advance

Reviewed-on: #26

.gitignore

@@ -9,3 +9,7 @@ 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

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

Makefile

@@ -1,9 +1,21 @@
 #PROJECT_NAME = "enaklo-pos-backend"
-DB_USERNAME :=apskel
-DB_PASSWORD :=7a8UJbM2GgBWaseh0lnP3O5i1i5nINXk
-DB_HOST :=62.72.45.250
-DB_PORT :=5433
-DB_NAME :=apskel_pos
+
+# ─── 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_URL = postgres://$(DB_USERNAME):$(DB_PASSWORD)@$(DB_HOST):$(DB_PORT)/$(DB_NAME)?sslmode=disable
 
@@ -16,15 +28,19 @@ endif
 .SILENT: help
 help:
 	@echo
-	@echo "Usage: make [command]"
+	@echo "Usage: make [command] [ENV=staging|production]"
 	@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"
@@ -83,6 +99,12 @@ migration-up:
 migration-down:
 	@migrate -database $(DB_URL) -path ./migrations down 1
 
+# Force migration to specific version
+
+.SILENT: migration-force
+migration-force:
+	@migrate -database $(DB_URL) -path ./migrations force $(version)
+
 .SILENT: seeder-create
 seeder-create:
 	@migrate create -ext sql -dir ./seeders -seq $(name)
@@ -108,7 +130,11 @@ fmt:
 	@go fmt ./...
 
 start:
-	go run main.go --env-path .env
+	ENV_MODE=$(ENV) go run cmd/server/main.go
+
+.SILENT: run
+run:
+	ENV_MODE=$(ENV) go run cmd/server/main.go
 
 # Default
 

README.md

@@ -15,15 +15,19 @@ Makefile requires installed dependecies:
 ```shell
 $ make
 
-Usage: make [command]
+Usage: make [command] [ENV=staging|production]
 
 Commands:
+ run                           Run server (default: staging)
+ run ENV=production            Run server with production config
+
  rename-project name={name}    Rename project
- 
+
  build-http                    Build http server
 
  migration-create name={name}  Create migration
  migration-up                  Up migrations
+ migration-up ENV=production   Up migrations (production DB)
  migration-down                Down last migration
 
  docker-up                     Up docker services
@@ -36,24 +40,16 @@ Commands:
 
 ## HTTP Server
 
-```shell
-$ ./bin/http-server --help
-
-Usage: http-server
-
-Flags:
-  -h, --help               Show mycontext-sensitive help.
-      --env-path=STRING    Path to env config file
-```
-
-**Configuration** is based on the environment variables. See [.env.template](.env).
+The server takes no CLI flags. It reads `ENV_MODE` and loads the matching YAML file from
+[infra/](infra/) — see [Running the Application](#running-the-application) for details.
 
 ```shell
-# Expose env vars before and start server
-$ ./bin/http-server
+# Build, then start with the staging config (default)
+$ go build -o ./bin/http-server ./cmd/server/main.go
+$ ENV_MODE=staging ./bin/http-server
 
-# Expose env vars from the file and start server
-$ ./bin/http-server --env-path ./config/env/.env
+# Start with the production config
+$ ENV_MODE=production ./bin/http-server
 ```
 
 ## API Docs
@@ -124,7 +120,7 @@ Handler → Service → Processor → Repository
 ## API Endpoints
 
 ### Health Check
-- `GET /api/v1/health` - Health check endpoint
+- `GET /health` - Health check endpoint (registered at the root, not under `/api/v1`)
 
 ### Organizations
 - `POST /api/v1/organizations` - Create organization
@@ -157,73 +153,139 @@ Handler → Service → Processor → Repository
 - `PUT /api/v1/order-items/{id}` - Update order item
 - `DELETE /api/v1/order-items/{id}` - Remove order item
 
-## Installation
+## Running the Application
 
-1. **Clone the repository**
-   ```bash
-   git clone <repository-url>
-   cd apskel-pos-backend
-   ```
+### Prerequisites
 
-2. **Install dependencies**
-   ```bash
-   go mod tidy
-   ```
+| Tool | Version | Needed for |
+|------|---------|------------|
+| [Go](https://go.dev/doc/install) | 1.24+ | building & running the server |
+| [golang-migrate](https://github.com/golang-migrate/migrate) | latest | `make migration-*` targets |
+| [make](https://www.gnu.org/software/make/) | any | shortcut commands (Windows: use Git Bash / WSL, see note below) |
+| [docker & docker-compose](https://docs.docker.com/compose/) | optional | running Postgres/Redis locally |
+| [air](https://github.com/air-verse/air) | optional | hot reload during development (`.air.toml` is already configured) |
 
-3. **Set up database**
-   ```bash
-   # Set your PostgreSQL database URL
-   export DATABASE_URL="postgres://username:password@localhost:5432/apskel_pos?sslmode=disable"
-   ```
-
-4. **Run migrations**
-   ```bash
-   make migration-up
-   ```
-
-## Usage
-
-### Development
+### 1. Clone & install dependencies
 
 ```bash
-# Start the server
-go run cmd/server/main.go -port 8080 -db-url "postgres://username:password@localhost:5432/apskel_pos?sslmode=disable"
-
-# Or using environment variable
-export DATABASE_URL="postgres://username:password@localhost:5432/apskel_pos?sslmode=disable"
-go run cmd/server/main.go -port 8080
+git clone <repository-url>
+cd apskel-pos-backend
+go mod download
 ```
 
-### Using Make Commands
+### 2. Configuration
+
+Configuration is **not** read from `.env` files — it is loaded from YAML files in [infra/](infra/)
+by [config/configs.go](config/configs.go) using viper.
+
+The file is selected by the `ENV_MODE` environment variable:
+
+| `ENV_MODE` | Config file loaded |
+|------------|--------------------|
+| `local` | `infra/local.yaml` |
+| `development` | `infra/development.yaml` |
+| `staging` *(default)* | `infra/staging.yaml` |
+| `production` | `infra/production.yaml` |
+
+Any other/unset value falls back to `staging`. Only `staging.yaml` and `production.yaml` are
+committed — for `local`/`development` copy one of them first:
 
 ```bash
-# Run the application
-make start
-
-# Format code
-make fmt
-
-# Run tests
-make test
-
-# Build for production
-make build-http
-
-# Docker operations
-make docker-up
-make docker-down
-
-# Database migrations
-make migration-create name=create_users_table
-make migration-up
-make migration-down
+cp infra/staging.yaml infra/local.yaml
 ```
 
+Two important notes:
+
+* The config path is **relative to the working directory**, so always run the server from the
+  repository root, otherwise viper panics with `failed to read config file`.
+* Push notifications need `infra/firebase-service-account.json` (git-ignored). Without it, obtain
+  the file from the team before enabling FCM features.
+
+### 3. Run migrations
+
+The migration targets build the DB URL from the credentials at the top of the [Makefile](Makefile):
+
+```bash
+make migration-up                  # staging DB (default)
+make migration-up ENV=production   # production DB
+
+make migration-create name=create_cash_advances_table
+make migration-down                # roll back the last migration
+make migration-force version=87    # clear a dirty migration state
+```
+
+### 4. Start the server
+
+```bash
+make run                    # ENV_MODE=staging
+make run ENV=production     # ENV_MODE=production
+```
+
+`make run` is just a wrapper around:
+
+```bash
+ENV_MODE=staging go run cmd/server/main.go
+```
+
+The server listens on the `server.port` value from the loaded YAML (**4000** for both staging and
+production). Verify it is up:
+
+```bash
+curl http://localhost:4000/health
+```
+
+All application routes live under `/api/v1` (see [internal/router/router.go](internal/router/router.go)).
+
+#### Windows note
+
+The `run`/`start` targets use POSIX inline env-var syntax, which `cmd.exe` and PowerShell do not
+understand. Either run `make` from Git Bash / WSL, or start the server directly:
+
+```powershell
+# PowerShell
+$env:ENV_MODE = "staging"; go run cmd/server/main.go
+```
+
+```cmd
+:: cmd.exe
+set ENV_MODE=staging && go run cmd/server/main.go
+```
+
+#### Hot reload
+
+```bash
+ENV_MODE=local air     # rebuilds ./tmp/main on every .go change
+```
+
+### 5. Other commands
+
+```bash
+make            # show all available targets
+make fmt        # go fmt ./...
+make test       # go test ./... -v
+
+# Build a binary (make build-http still points at the old ./cmd/http path)
+go build -o ./bin/http-server ./cmd/server/main.go
+```
+
+### Running with Docker
+
+`docker-compose.yaml` provides Postgres (`5432`), Redis (`6379`), and the API image. See
+[DOCKER.md](DOCKER.md) for the full workflow.
+
+```bash
+make docker-up      # docker-compose up -d
+make docker-down    # docker-compose down
+```
+
+If you use the containerised Postgres/Redis, point `infra/local.yaml` at `localhost:5432` /
+`localhost:6379` instead of the remote hosts baked into `staging.yaml`.
+
 ## Example API Usage
 
 ### Create Organization
 ```bash
-curl -X POST http://localhost:8080/api/v1/organizations \
+curl -X POST http://localhost:4000/api/v1/organizations \
   -H "Content-Type: application/json" \
   -d '{
     "name": "My Restaurant",
@@ -233,7 +295,7 @@ curl -X POST http://localhost:8080/api/v1/organizations \
 
 ### Create User
 ```bash
-curl -X POST http://localhost:8080/api/v1/users \
+curl -X POST http://localhost:4000/api/v1/users \
   -H "Content-Type: application/json" \
   -d '{
     "organization_id": "uuid-here",
@@ -247,7 +309,7 @@ curl -X POST http://localhost:8080/api/v1/users \
 
 ### Create Order with Items
 ```bash
-curl -X POST http://localhost:8080/api/v1/orders \
+curl -X POST http://localhost:4000/api/v1/orders \
   -H "Content-Type: application/json" \
   -d '{
     "outlet_id": "uuid-here",

config/configs.go

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

deployment.sh

@@ -2,23 +2,61 @@
 set -euo pipefail
 
 APP_NAME="apskel-pos"
-PORT="4000"
+
+# ─── 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
 
 echo "🔄 Pulling latest code..."
 git pull
 
-echo "🐳 Building Docker image (production target)..."
-docker build --target production -t $APP_NAME:latest .
+echo "🐳 Building Docker image ($ENV_MODE)..."
+docker build --target production -t "$IMAGE_NAME" .
 
 echo "🛑 Stopping and removing old container..."
-docker rm -f $APP_NAME 2>/dev/null || true
+docker rm -f "$CONTAINER_NAME" 2>/dev/null || true
 
 echo "🚀 Running new container..."
-docker run -d --name $APP_NAME \
-  -p $PORT:$PORT \
+docker run -d --name "$CONTAINER_NAME" \
+  -p "$PORT:4000" \
   -e TZ=Asia/Jakarta \
+  -e ENV_MODE="$ENV_MODE" \
   -v "$(pwd)/infra":/infra:ro \
   -v "$(pwd)/templates":/templates:ro \
-  $APP_NAME:latest
+  "$IMAGE_NAME"
 
-echo "✅ Deployment complete."
+echo ""
+echo "✅ Deployment $ENV_MODE complete."
+echo "   Container : $CONTAINER_NAME"
+echo "   Port      : $PORT"

go.sum

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

infra/production.yaml

@@ -1,7 +1,7 @@
 server:
   base-url:
   local-url:
-  self-order-url: http://localhost:5173
+  self-order-url:
   port: 4000
 
 jwt:
@@ -9,7 +9,7 @@ jwt:
     expires-ttl: 144000
     secret: "5Lm25V3Qd7aut8dr4QUxm5PZUrSFs"
   refresh_token:
-    expires-ttl: 7776000  # 3 months in minutes (90 days * 24 hours * 60 minutes)
+    expires-ttl: 7776000
     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: 'debug'
+  log_format: "json"
+  log_level: "info"
 
 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

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

@@ -48,6 +48,7 @@ func (a *App) Initialize(cfg *config.Config) error {
 	// Initialize omset milestone scheduler
 	a.omsetScheduler = service.NewOmsetMilestoneScheduler(
 		repos.organizationRepo,
+		repos.outletRepo,
 		repos.userRepo,
 		processors.notificationProcessor,
 	)
@@ -107,6 +108,8 @@ func (a *App) Initialize(cfg *config.Config) error {
 		validators.vendorValidator,
 		services.purchaseOrderService,
 		validators.purchaseOrderValidator,
+		services.purchaseCategoryService,
+		validators.purchaseCategoryValidator,
 		services.unitConverterService,
 		validators.unitConverterValidator,
 		services.chartOfAccountTypeService,
@@ -137,15 +140,18 @@ func (a *App) Initialize(cfg *config.Config) error {
 		selfOrderHandler,
 		services.expenseService,
 		validators.expenseValidator,
+		services.cashAdvanceService,
+		validators.cashAdvanceValidator,
+		a.redisClient,
 	)
 
 	return nil
 }
 
 func (a *App) Start(port string) error {
-	// Start the omset milestone scheduler (checks every hour)
+	// Start the omset milestone scheduler (checks every 5 minutes for daily omset milestones)
 	if a.omsetScheduler != nil {
-		a.omsetScheduler.Start(1 * time.Hour)
+		a.omsetScheduler.Start(5 * time.Minute)
 	}
 
 	engine := a.router.Init()
@@ -214,6 +220,7 @@ type repositories struct {
 	productRecipeRepo              *repository.ProductRecipeRepository
 	vendorRepo                     *repository.VendorRepositoryImpl
 	purchaseOrderRepo              *repository.PurchaseOrderRepositoryImpl
+	purchaseCategoryRepo           *repository.PurchaseCategoryRepositoryImpl
 	unitConverterRepo              *repository.IngredientUnitConverterRepositoryImpl
 	chartOfAccountTypeRepo         *repository.ChartOfAccountTypeRepositoryImpl
 	chartOfAccountRepo             *repository.ChartOfAccountRepositoryImpl
@@ -239,6 +246,7 @@ type repositories struct {
 	notificationDeliveryRepo       *repository.NotificationDeliveryRepositoryImpl
 	productOutletPriceRepo         *repository.ProductOutletPriceRepositoryImpl
 	expenseRepo                    *repository.ExpenseRepositoryImpl
+	cashAdvanceRepo                *repository.CashAdvanceRepositoryImpl
 }
 
 func (a *App) initRepositories() *repositories {
@@ -267,6 +275,7 @@ func (a *App) initRepositories() *repositories {
 		productRecipeRepo:              repository.NewProductRecipeRepository(a.db),
 		vendorRepo:                     repository.NewVendorRepositoryImpl(a.db),
 		purchaseOrderRepo:              repository.NewPurchaseOrderRepositoryImpl(a.db),
+		purchaseCategoryRepo:           repository.NewPurchaseCategoryRepositoryImpl(a.db),
 		unitConverterRepo:              repository.NewIngredientUnitConverterRepositoryImpl(a.db).(*repository.IngredientUnitConverterRepositoryImpl),
 		chartOfAccountTypeRepo:         repository.NewChartOfAccountTypeRepositoryImpl(a.db),
 		chartOfAccountRepo:             repository.NewChartOfAccountRepositoryImpl(a.db),
@@ -292,6 +301,7 @@ func (a *App) initRepositories() *repositories {
 		notificationDeliveryRepo:       repository.NewNotificationDeliveryRepository(a.db),
 		productOutletPriceRepo:         repository.NewProductOutletPriceRepositoryImpl(a.db),
 		expenseRepo:                    repository.NewExpenseRepositoryImpl(a.db),
+		cashAdvanceRepo:                repository.NewCashAdvanceRepositoryImpl(a.db),
 	}
 }
 
@@ -315,6 +325,7 @@ type processors struct {
 	productRecipeProcessor              *processor.ProductRecipeProcessorImpl
 	vendorProcessor                     *processor.VendorProcessorImpl
 	purchaseOrderProcessor              *processor.PurchaseOrderProcessorImpl
+	purchaseCategoryProcessor           *processor.PurchaseCategoryProcessorImpl
 	unitConverterProcessor              *processor.IngredientUnitConverterProcessorImpl
 	chartOfAccountTypeProcessor         *processor.ChartOfAccountTypeProcessorImpl
 	chartOfAccountProcessor             *processor.ChartOfAccountProcessorImpl
@@ -338,6 +349,7 @@ type processors struct {
 	notificationProcessor               *processor.NotificationProcessorImpl
 	productOutletPriceProcessor         processor.ProductOutletPriceProcessor
 	expenseProcessor                    *processor.ExpenseProcessorImpl
+	cashAdvanceProcessor                *processor.CashAdvanceProcessorImpl
 }
 
 func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
@@ -365,7 +377,8 @@ 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.unitRepo, repos.fileRepo, inventoryMovementService, repos.unitConverterRepo),
+		purchaseOrderProcessor:              processor.NewPurchaseOrderProcessorImpl(repos.purchaseOrderRepo, repos.vendorRepo, repos.ingredientRepo, repos.purchaseCategoryRepo, repos.categoryRepo, repos.cashAdvanceRepo, 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),
 		chartOfAccountProcessor:             processor.NewChartOfAccountProcessorImpl(repos.chartOfAccountRepo, repos.chartOfAccountTypeRepo),
@@ -388,7 +401,8 @@ 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),
+		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo, repos.purchaseCategoryRepo, repos.cashAdvanceRepo),
+		cashAdvanceProcessor:                processor.NewCashAdvanceProcessorImpl(repos.cashAdvanceRepo, repos.categoryRepo),
 	}
 }
 
@@ -414,6 +428,7 @@ type services struct {
 	productRecipeService              *service.ProductRecipeServiceImpl
 	vendorService                     *service.VendorServiceImpl
 	purchaseOrderService              *service.PurchaseOrderServiceImpl
+	purchaseCategoryService           service.PurchaseCategoryService
 	unitConverterService              *service.IngredientUnitConverterServiceImpl
 	chartOfAccountTypeService         service.ChartOfAccountTypeService
 	chartOfAccountService             service.ChartOfAccountService
@@ -429,6 +444,7 @@ type services struct {
 	notificationService               service.NotificationService
 	productOutletPriceService         service.ProductOutletPriceService
 	expenseService                    *service.ExpenseServiceImpl
+	cashAdvanceService                *service.CashAdvanceServiceImpl
 }
 
 func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
@@ -453,6 +469,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	productRecipeService := service.NewProductRecipeService(processors.productRecipeProcessor)
 	vendorService := service.NewVendorService(processors.vendorProcessor)
 	purchaseOrderService := service.NewPurchaseOrderService(processors.purchaseOrderProcessor)
+	purchaseCategoryService := service.NewPurchaseCategoryService(processors.purchaseCategoryProcessor)
 	unitConverterService := service.NewIngredientUnitConverterService(processors.unitConverterProcessor)
 	chartOfAccountTypeService := service.NewChartOfAccountTypeService(processors.chartOfAccountTypeProcessor)
 	chartOfAccountService := service.NewChartOfAccountService(processors.chartOfAccountProcessor)
@@ -492,6 +509,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		productRecipeService:              productRecipeService,
 		vendorService:                     vendorService,
 		purchaseOrderService:              purchaseOrderService,
+		purchaseCategoryService:           purchaseCategoryService,
 		unitConverterService:              unitConverterService,
 		chartOfAccountTypeService:         chartOfAccountTypeService,
 		chartOfAccountService:             chartOfAccountService,
@@ -507,6 +525,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		notificationService:               notificationService,
 		productOutletPriceService:         service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
 		expenseService:                    service.NewExpenseService(processors.expenseProcessor),
+		cashAdvanceService:                service.NewCashAdvanceService(processors.cashAdvanceProcessor),
 	}
 }
 
@@ -537,6 +556,7 @@ type validators struct {
 	tableValidator                      *validator.TableValidator
 	vendorValidator                     *validator.VendorValidatorImpl
 	purchaseOrderValidator              *validator.PurchaseOrderValidatorImpl
+	purchaseCategoryValidator           *validator.PurchaseCategoryValidatorImpl
 	unitConverterValidator              *validator.IngredientUnitConverterValidatorImpl
 	chartOfAccountTypeValidator         *validator.ChartOfAccountTypeValidatorImpl
 	chartOfAccountValidator             *validator.ChartOfAccountValidatorImpl
@@ -550,6 +570,7 @@ type validators struct {
 	notificationValidator               *validator.NotificationValidatorImpl
 	productOutletPriceValidator         *validator.ProductOutletPriceValidatorImpl
 	expenseValidator                    *validator.ExpenseValidatorImpl
+	cashAdvanceValidator                *validator.CashAdvanceValidatorImpl
 }
 
 func (a *App) initValidators() *validators {
@@ -568,6 +589,7 @@ func (a *App) initValidators() *validators {
 		tableValidator:                      validator.NewTableValidator(),
 		vendorValidator:                     validator.NewVendorValidator(),
 		purchaseOrderValidator:              validator.NewPurchaseOrderValidator(),
+		purchaseCategoryValidator:           validator.NewPurchaseCategoryValidator(),
 		unitConverterValidator:              validator.NewIngredientUnitConverterValidator().(*validator.IngredientUnitConverterValidatorImpl),
 		chartOfAccountTypeValidator:         validator.NewChartOfAccountTypeValidator().(*validator.ChartOfAccountTypeValidatorImpl),
 		chartOfAccountValidator:             validator.NewChartOfAccountValidator().(*validator.ChartOfAccountValidatorImpl),
@@ -581,6 +603,7 @@ func (a *App) initValidators() *validators {
 		notificationValidator:               validator.NewNotificationValidator(),
 		productOutletPriceValidator:         validator.NewProductOutletPriceValidator(),
 		expenseValidator:                    validator.NewExpenseValidator(),
+		cashAdvanceValidator:                validator.NewCashAdvanceValidator(),
 	}
 }
 

internal/constants/budget.go

@@ -0,0 +1,9 @@
+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/cash_advance.go

@@ -0,0 +1,62 @@
+package constants
+
+// A cash advance is money handed to a team so it can go shopping. Its status is
+// about the document only — whether the money may leave the drawer. How much of it
+// has been accounted for is a separate axis, derived from the spending charged to
+// the advance rather than stored, so the two never have to be kept in step.
+const (
+	CashAdvanceStatusDraft     = "draft"
+	CashAdvanceStatusApproved  = "approved"
+	CashAdvanceStatusRejected  = "rejected"
+	CashAdvanceStatusCancelled = "cancelled"
+)
+
+// Settlement states come out of the amount, the spending charged to the advance, and
+// the cash handed back. An advance the team overspent still counts as settled: the
+// shortfall is owed back to the team and shows up as a negative remaining amount.
+const (
+	CashAdvanceSettlementOpen    = "open"
+	CashAdvanceSettlementPartial = "partial"
+	CashAdvanceSettlementSettled = "settled"
+)
+
+func GetAllCashAdvanceStatuses() []string {
+	return []string{
+		CashAdvanceStatusDraft,
+		CashAdvanceStatusApproved,
+		CashAdvanceStatusRejected,
+		CashAdvanceStatusCancelled,
+	}
+}
+
+func IsValidCashAdvanceStatus(status string) bool {
+	for _, valid := range GetAllCashAdvanceStatuses() {
+		if status == valid {
+			return true
+		}
+	}
+	return false
+}
+
+func GetAllCashAdvanceSettlementStatuses() []string {
+	return []string{
+		CashAdvanceSettlementOpen,
+		CashAdvanceSettlementPartial,
+		CashAdvanceSettlementSettled,
+	}
+}
+
+func IsValidCashAdvanceSettlementStatus(status string) bool {
+	for _, valid := range GetAllCashAdvanceSettlementStatuses() {
+		if status == valid {
+			return true
+		}
+	}
+	return false
+}
+
+// Settlement entries name where a piece of spending was recorded.
+const (
+	CashAdvanceSettlementTypePurchaseOrder = "purchase_order"
+	CashAdvanceSettlementTypeExpense       = "expense"
+)

internal/constants/error.go

@@ -40,6 +40,7 @@ const (
 	OutletServiceEntity                  = "outlet_service"
 	VendorServiceEntity                  = "vendor_service"
 	PurchaseOrderServiceEntity           = "purchase_order_service"
+	PurchaseCategoryServiceEntity        = "purchase_category_service"
 	IngredientUnitConverterServiceEntity = "ingredient_unit_converter_service"
 	IngredientCompositionServiceEntity   = "ingredient_composition_service"
 	TableEntity                          = "table"
@@ -61,6 +62,7 @@ const (
 	NotificationHandlerEntity       = "notification_handler"
 	ProductOutletPriceServiceEntity = "product_outlet_price_service"
 	ExpenseServiceEntity            = "expense_service"
+	CashAdvanceServiceEntity        = "cash_advance_service"
 )
 
 var HttpErrorMap = map[string]int{

internal/constants/expense.go

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

internal/constants/purchase_team.go

@@ -0,0 +1,19 @@
+package constants
+
+// A purchase order is charged to a team. Teams come from the parent product
+// categories, plus Pusat for spending that belongs to no single team.
+const (
+	PurchaseTeamScopeCategory = "category"
+	PurchaseTeamScopeCentral  = "central"
+
+	// PurchaseTeamCentralName is what Pusat is called in the picker. Pusat has no
+	// row of its own, so the name lives here rather than in the database.
+	PurchaseTeamCentralName = "Pusat"
+
+	// PurchaseTeamNone is the value the list filter takes to ask for purchases
+	// that have not been charged to any team yet.
+	PurchaseTeamNone = "none"
+
+	// PurchaseTeamNoneName labels those purchases in the reports.
+	PurchaseTeamNoneName = "Tanpa Team"
+)

internal/constants/user.go

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

internal/contract/account_request.go

@@ -5,12 +5,12 @@ import (
 )
 
 type CreateAccountRequest struct {
-	ChartOfAccountID uuid.UUID  `json:"chart_of_account_id" validate:"required"`
-	Name             string     `json:"name" validate:"required,min=1,max=255"`
-	Number           string     `json:"number" validate:"required,min=1,max=50"`
-	AccountType      string     `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
-	OpeningBalance   float64    `json:"opening_balance"`
-	Description      *string    `json:"description"`
+	ChartOfAccountID uuid.UUID `json:"chart_of_account_id" validate:"required"`
+	Name             string    `json:"name" validate:"required,min=1,max=255"`
+	Number           string    `json:"number" validate:"required,min=1,max=50"`
+	AccountType      string    `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
+	OpeningBalance   float64   `json:"opening_balance"`
+	Description      *string   `json:"description"`
 }
 
 type UpdateAccountRequest struct {
@@ -24,21 +24,21 @@ type UpdateAccountRequest struct {
 }
 
 type AccountResponse struct {
-	ID               uuid.UUID                 `json:"id"`
-	OrganizationID   uuid.UUID                 `json:"organization_id"`
-	OutletID         *uuid.UUID                `json:"outlet_id"`
-	ChartOfAccountID uuid.UUID                 `json:"chart_of_account_id"`
-	Name             string                    `json:"name"`
-	Number           string                    `json:"number"`
-	AccountType      string                    `json:"account_type"`
-	OpeningBalance   float64                   `json:"opening_balance"`
-	CurrentBalance   float64                   `json:"current_balance"`
-	Description      *string                   `json:"description"`
-	IsActive         bool                      `json:"is_active"`
-	IsSystem         bool                      `json:"is_system"`
-	CreatedAt        string                    `json:"created_at"`
-	UpdatedAt        string                    `json:"updated_at"`
-	ChartOfAccount   *ChartOfAccountResponse   `json:"chart_of_account,omitempty"`
+	ID               uuid.UUID               `json:"id"`
+	OrganizationID   uuid.UUID               `json:"organization_id"`
+	OutletID         *uuid.UUID              `json:"outlet_id"`
+	ChartOfAccountID uuid.UUID               `json:"chart_of_account_id"`
+	Name             string                  `json:"name"`
+	Number           string                  `json:"number"`
+	AccountType      string                  `json:"account_type"`
+	OpeningBalance   float64                 `json:"opening_balance"`
+	CurrentBalance   float64                 `json:"current_balance"`
+	Description      *string                 `json:"description"`
+	IsActive         bool                    `json:"is_active"`
+	IsSystem         bool                    `json:"is_system"`
+	CreatedAt        string                  `json:"created_at"`
+	UpdatedAt        string                  `json:"updated_at"`
+	ChartOfAccount   *ChartOfAccountResponse `json:"chart_of_account,omitempty"`
 }
 
 type ListAccountsRequest struct {

internal/contract/analytics_contract.go

@@ -18,6 +18,7 @@ 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"`
@@ -54,6 +55,7 @@ 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"`
@@ -86,15 +88,19 @@ type SalesAnalyticsData struct {
 type PurchasingAnalyticsRequest struct {
 	OrganizationID uuid.UUID
 	OutletID       *string `form:"outlet_id,omitempty"`
-	DateFrom       string  `form:"date_from" validate:"required"`
-	DateTo         string  `form:"date_to" validate:"required"`
-	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+	// Team narrows the report to one team: a parent category id, "central" for
+	// Pusat, or "none" for purchases charged to no team. Empty covers all teams.
+	Team     string `form:"team,omitempty"`
+	DateFrom string `form:"date_from" validate:"required"`
+	DateTo   string `form:"date_to" validate:"required"`
+	GroupBy  string `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 type PurchasingAnalyticsResponse struct {
 	OrganizationID uuid.UUID                  `json:"organization_id"`
 	OutletID       *uuid.UUID                 `json:"outlet_id,omitempty"`
 	OutletName     *string                    `json:"outlet_name,omitempty"`
+	Team           string                     `json:"team,omitempty"`
 	DateFrom       time.Time                  `json:"date_from"`
 	DateTo         time.Time                  `json:"date_to"`
 	GroupBy        string                     `json:"group_by"`
@@ -102,24 +108,48 @@ type PurchasingAnalyticsResponse struct {
 	Data           []PurchasingAnalyticsData  `json:"data"`
 	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
 	VendorData     []PurchasingVendorData     `json:"vendor_data"`
+	TeamData       []PurchasingTeamData       `json:"team_data"`
+}
+
+// PurchasingTeamData is one team's share of the purchases. Scope and CategoryID
+// are exactly what the team filter takes, so a row doubles as a drill-down link.
+type PurchasingTeamData struct {
+	Scope                string     `json:"scope"`
+	CategoryID           *uuid.UUID `json:"category_id"`
+	Name                 string     `json:"name"`
+	TotalPurchases       float64    `json:"total_purchases"`
+	RawMaterialPurchases float64    `json:"raw_material_purchases"`
+	ExpensePurchases     float64    `json:"expense_purchases"`
+	PurchaseOrderCount   int64      `json:"purchase_order_count"`
+	Quantity             float64    `json:"quantity"`
+	Percentage           float64    `json:"percentage"`
 }
 
 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"`
 	TotalVendors              int64   `json:"total_vendors"`
+	TotalTeams                int64   `json:"total_teams"`
 }
 
 type PurchasingAnalyticsData struct {
-	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"`
+	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"`
 }
 
 type PurchasingIngredientData struct {
@@ -132,12 +162,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
@@ -153,6 +183,7 @@ 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"`
@@ -162,6 +193,7 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -189,6 +221,7 @@ 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"`
@@ -206,6 +239,135 @@ 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
@@ -218,6 +380,7 @@ 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"`
@@ -228,29 +391,100 @@ 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"`
+	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"`
 }
 
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
 	OutletID       *string `form:"outlet_id,omitempty"`
-	Date           string  `form:"date" validate:"required"`
+	DateFrom       string  `form:"date_from" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
+	GroupBy        string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
 }
 
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	Date                     time.Time                `json:"date"`
+	OutletName               *string                  `json:"outlet_name,omitempty"`
+	DateFrom                 time.Time                `json:"date_from"`
+	DateTo                   time.Time                `json:"date_to"`
+	GroupBy                  string                   `json:"group_by"`
+	Summary                  ProfitLossSummary        `json:"summary"`
+	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"`
+	GrossProfit        float64 `json:"gross_profit"`
+	GrossProfitMargin  float64 `json:"gross_profit_margin"`
+	TotalTax           float64 `json:"total_tax"`
+	TotalDiscount      float64 `json:"total_discount"`
+	NetProfit          float64 `json:"net_profit"`
+	NetProfitMargin    float64 `json:"net_profit_margin"`
+	TotalOrders        int64   `json:"total_orders"`
+	AverageProfit      float64 `json:"average_profit"`
+	ProfitabilityRatio float64 `json:"profitability_ratio"`
+}
+
+type ProfitLossData struct {
+	Date              time.Time `json:"date"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	Tax               float64   `json:"tax"`
+	Discount          float64   `json:"discount"`
+	NetProfit         float64   `json:"net_profit"`
+	NetProfitMargin   float64   `json:"net_profit_margin"`
+	Orders            int64     `json:"orders"`
+}
+
+type ProductProfitData struct {
+	ProductID         uuid.UUID `json:"product_id"`
+	ProductName       string    `json:"product_name"`
+	CategoryID        uuid.UUID `json:"category_id"`
+	CategoryName      string    `json:"category_name"`
+	QuantitySold      int64     `json:"quantity_sold"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	AveragePrice      float64   `json:"average_price"`
+	AverageCost       float64   `json:"average_cost"`
+	ProfitPerUnit     float64   `json:"profit_per_unit"`
+}
+
 type ProfitLossSummaryRow struct {
 	ID           string                 `json:"id"`
 	Label        string                 `json:"label"`
@@ -266,3 +500,123 @@ 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/cash_advance_contract.go

@@ -0,0 +1,92 @@
+package contract
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type CreateCashAdvanceRequest struct {
+	// OutletID falls back to the caller's outlet when omitted; an advance is cash out
+	// of one drawer, so one of the two has to be known.
+	OutletID       *uuid.UUID `json:"outlet_id,omitempty" validate:"omitempty"`
+	CodeNumber     string     `json:"code_number" validate:"required,min=1,max=50"`
+	TeamScope      string     `json:"team_scope" validate:"required,oneof=category central"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty" validate:"omitempty"`
+	Amount         float64    `json:"amount" validate:"required,gt=0"`
+	IssuedDate     string     `json:"issued_date" validate:"required"`         // Format: YYYY-MM-DD
+	DueDate        *string    `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
+	Status         *string    `json:"status,omitempty" validate:"omitempty,oneof=draft approved rejected cancelled"`
+	Description    *string    `json:"description,omitempty" validate:"omitempty"`
+}
+
+type UpdateCashAdvanceRequest struct {
+	CodeNumber *string `json:"code_number,omitempty" validate:"omitempty,min=1,max=50"`
+	// An advance always belongs to a team, so team_scope can be moved but not cleared.
+	TeamScope      *string    `json:"team_scope,omitempty" validate:"omitempty,oneof=category central"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty" validate:"omitempty"`
+	Amount         *float64   `json:"amount,omitempty" validate:"omitempty,gt=0"`
+	ReturnedAmount *float64   `json:"returned_amount,omitempty" validate:"omitempty,gte=0"`
+	IssuedDate     *string    `json:"issued_date,omitempty" validate:"omitempty"`
+	DueDate        *string    `json:"due_date,omitempty" validate:"omitempty"`
+	Status         *string    `json:"status,omitempty" validate:"omitempty,oneof=draft approved rejected cancelled"`
+	Description    *string    `json:"description,omitempty" validate:"omitempty"`
+}
+
+type CashAdvanceResponse struct {
+	ID               uuid.UUID                       `json:"id"`
+	OrganizationID   uuid.UUID                       `json:"organization_id"`
+	OutletID         uuid.UUID                       `json:"outlet_id"`
+	CodeNumber       string                          `json:"code_number"`
+	TeamScope        string                          `json:"team_scope"`
+	TeamCategoryID   *uuid.UUID                      `json:"team_category_id"`
+	Amount           float64                         `json:"amount"`
+	SettledAmount    float64                         `json:"settled_amount"`
+	ReturnedAmount   float64                         `json:"returned_amount"`
+	RemainingAmount  float64                         `json:"remaining_amount"`
+	SettlementStatus string                          `json:"settlement_status"`
+	IssuedDate       time.Time                       `json:"issued_date"`
+	DueDate          *time.Time                      `json:"due_date"`
+	Status           string                          `json:"status"`
+	Description      *string                         `json:"description"`
+	CreatedAt        time.Time                       `json:"created_at"`
+	UpdatedAt        time.Time                       `json:"updated_at"`
+	Team             *PurchaseTeamResponse           `json:"team,omitempty"`
+	Settlements      []CashAdvanceSettlementResponse `json:"settlements,omitempty"`
+}
+
+// CashAdvanceSettlementResponse is one purchase order or expense paid out of the
+// advance.
+type CashAdvanceSettlementResponse struct {
+	Type   string    `json:"type"`
+	ID     uuid.UUID `json:"id"`
+	Number string    `json:"number"`
+	Date   time.Time `json:"date"`
+	Amount float64   `json:"amount"`
+	Status string    `json:"status"`
+}
+
+type ListCashAdvancesRequest struct {
+	Page   int    `json:"page" validate:"min=1"`
+	Limit  int    `json:"limit" validate:"min=1,max=100"`
+	Search string `json:"search,omitempty"`
+	Status string `json:"status,omitempty" validate:"omitempty,oneof=draft approved rejected cancelled"`
+	// SettlementStatus filters on how much of the cash has been accounted for,
+	// which is derived from the spending charged to the advance rather than stored.
+	SettlementStatus string `json:"settlement_status,omitempty" validate:"omitempty,oneof=open partial settled"`
+	// Team is the single-value form of the two filters below, so the team picker can
+	// send back what it was given: a parent category id or "central" for Pusat.
+	Team           string     `json:"team,omitempty"`
+	TeamScope      string     `json:"team_scope,omitempty" validate:"omitempty,oneof=category central"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty"`
+	StartDate      *time.Time `json:"start_date,omitempty"`
+	EndDate        *time.Time `json:"end_date,omitempty"`
+}
+
+type ListCashAdvancesResponse struct {
+	CashAdvances []CashAdvanceResponse `json:"cash_advances"`
+	TotalCount   int                   `json:"total_count"`
+	Page         int                   `json:"page"`
+	Limit        int                   `json:"limit"`
+	TotalPages   int                   `json:"total_pages"`
+}

internal/contract/category_contract.go

@@ -11,6 +11,7 @@ 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"`
 }
@@ -20,6 +21,7 @@ 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"`
 }
@@ -27,6 +29,8 @@ 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"`
@@ -38,6 +42,8 @@ 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

@@ -7,74 +7,93 @@ import (
 )
 
 type CreateExpenseRequest struct {
-	ExpenseName     string                     `json:"expense_name" validate:"required"`
-	Receiver        string                     `json:"receiver" validate:"required"`
-	TransactionDate string                     `json:"transaction_date" validate:"required"`
-	CodeNumber      string                     `json:"code_number" validate:"required"`
-	OutletID        string                     `json:"outlet_id" validate:"required"`
-	Description     *string                    `json:"description,omitempty"`
-	Tax             float64                    `json:"tax"`
-	Total           float64                    `json:"total" validate:"required"`
-	Items           []CreateExpenseItemRequest `json:"items" validate:"required"`
+	Receiver        string  `json:"receiver" validate:"required"`
+	TransactionDate string  `json:"transaction_date" validate:"required"`
+	CodeNumber      string  `json:"code_number" validate:"required"`
+	OutletID        string  `json:"outlet_id" validate:"required"`
+	Status          *string `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
+	Description     *string `json:"description,omitempty"`
+	Tax             float64 `json:"tax"`
+	Total           float64 `json:"total" validate:"required"`
+	// CashAdvanceID marks the expense as paid out of cash advanced to a team, which is
+	// what accounts for that advance.
+	CashAdvanceID *string                    `json:"cash_advance_id,omitempty"`
+	Items         []CreateExpenseItemRequest `json:"items" validate:"required"`
 }
 
 type CreateExpenseItemRequest struct {
-	ChartOfAccountID string  `json:"chart_of_account_id" validate:"required"`
-	Description      *string `json:"description,omitempty"`
-	Amount           float64 `json:"amount" validate:"required"`
+	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"`
 }
 
 type UpdateExpenseRequest struct {
-	ExpenseName     *string                    `json:"expense_name,omitempty"`
-	Receiver        *string                    `json:"receiver,omitempty"`
-	TransactionDate *string                    `json:"transaction_date,omitempty"`
-	CodeNumber      *string                    `json:"code_number,omitempty"`
-	OutletID        *string                    `json:"outlet_id,omitempty"`
-	Description     *string                    `json:"description,omitempty"`
-	Tax             *float64                   `json:"tax,omitempty"`
-	Total           *float64                   `json:"total,omitempty"`
-	Reserved1       *string                    `json:"reserved1,omitempty"`
-	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
+	Receiver        *string  `json:"receiver,omitempty"`
+	TransactionDate *string  `json:"transaction_date,omitempty"`
+	CodeNumber      *string  `json:"code_number,omitempty"`
+	OutletID        *string  `json:"outlet_id,omitempty"`
+	Status          *string  `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
+	Description     *string  `json:"description,omitempty"`
+	Tax             *float64 `json:"tax,omitempty"`
+	Total           *float64 `json:"total,omitempty"`
+	Reserved1       *string  `json:"reserved1,omitempty"`
+	// An empty string unlinks the cash advance; omitting the field leaves it untouched.
+	CashAdvanceID *string                    `json:"cash_advance_id,omitempty"`
+	Items         []UpdateExpenseItemRequest `json:"items,omitempty"`
 }
 
 type UpdateExpenseItemRequest struct {
-	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
-	Description      *string  `json:"description,omitempty"`
-	Amount           *float64 `json:"amount,omitempty"`
+	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"`
 }
 
 type ExpenseResponse struct {
 	ID              uuid.UUID             `json:"id"`
 	OrganizationID  uuid.UUID             `json:"organization_id"`
 	OutletID        uuid.UUID             `json:"outlet_id"`
-	ExpenseName     string                `json:"expense_name"`
 	Receiver        string                `json:"receiver"`
 	TransactionDate time.Time             `json:"transaction_date"`
 	CodeNumber      string                `json:"code_number"`
+	Status          string                `json:"status"`
 	Description     *string               `json:"description"`
 	Tax             float64               `json:"tax"`
 	Total           float64               `json:"total"`
 	Reserved1       *string               `json:"reserved1,omitempty"`
+	CashAdvanceID   *uuid.UUID            `json:"cash_advance_id"`
 	CreatedAt       time.Time             `json:"created_at"`
 	UpdatedAt       time.Time             `json:"updated_at"`
 	Items           []ExpenseItemResponse `json:"items,omitempty"`
 }
 
 type ExpenseItemResponse struct {
-	ID                 uuid.UUID `json:"id"`
-	ExpenseID          uuid.UUID `json:"expense_id"`
-	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
-	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
-	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"`
+	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"`
 }
 
 type ListExpenseRequest struct {
-	Page   int    `json:"page" validate:"min=1"`
-	Limit  int    `json:"limit" validate:"min=1,max=100"`
-	Search string `json:"search,omitempty"`
+	Page      int    `json:"page" validate:"min=1"`
+	Limit     int    `json:"limit" validate:"min=1,max=100"`
+	Search    string `json:"search,omitempty"`
+	OutletID  string `json:"outlet_id,omitempty"`
+	Status    string `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved cancel"`
+	StartDate string `json:"start_date,omitempty"`
+	EndDate   string `json:"end_date,omitempty"`
 }
 
 type ListExpenseResponse struct {
@@ -84,3 +103,65 @@ type ListExpenseResponse struct {
 	Limit      int               `json:"limit"`
 	TotalPages int               `json:"total_pages"`
 }
+
+type ExpenseAnalyticsRequest struct {
+	OutletID *string `form:"outlet_id,omitempty"`
+	DateFrom string  `form:"date_from" validate:"required"`
+	DateTo   string  `form:"date_to" validate:"required"`
+	GroupBy  string  `form:"group_by,default=day" validate:"omitempty,oneof=day hour week month"`
+}
+
+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"`
+}
+
+type ExpenseAnalyticsSummary struct {
+	TotalExpenses       float64 `json:"total_expenses"`
+	TotalExpenseCount   int64   `json:"total_expense_count"`
+	TotalTax            float64 `json:"total_tax"`
+	AverageExpenseValue float64 `json:"average_expense_value"`
+	TotalCategories     int64   `json:"total_categories"`
+	TotalItems          int64   `json:"total_items"`
+}
+
+type ExpenseAnalyticsData struct {
+	Date         time.Time `json:"date"`
+	Expenses     float64   `json:"expenses"`
+	ExpenseCount int64     `json:"expense_count"`
+	Tax          float64   `json:"tax"`
+	Items        int64     `json:"items"`
+	Categories   int64     `json:"categories"`
+}
+
+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"`
+	ExpenseCount       int64     `json:"expense_count"`
+	ItemCount          int64     `json:"item_count"`
+}
+
+type ExpenseAnalyticsItemData struct {
+	Item         string  `json:"item"`
+	TotalAmount  float64 `json:"total_amount"`
+	ExpenseCount int64   `json:"expense_count"`
+	ItemCount    int64   `json:"item_count"`
+}

internal/contract/ingredient_unit_converter_contract.go

@@ -77,8 +77,7 @@ type ListIngredientUnitConvertersResponse struct {
 type IngredientUnitsResponse struct {
 	IngredientID   uuid.UUID       `json:"ingredient_id"`
 	IngredientName string          `json:"ingredient_name"`
-	BaseUnitID     uuid.UUID       `json:"base_unit_id"`
+	BaseUnitID     *uuid.UUID      `json:"base_unit_id"`
 	BaseUnitName   string          `json:"base_unit_name"`
 	Units          []*UnitResponse `json:"units"`
 }
-

internal/contract/inventory_contract.go

@@ -26,9 +26,9 @@ type AdjustInventoryRequest struct {
 }
 
 type RestockInventoryRequest struct {
-	OutletID uuid.UUID `json:"outlet_id" validate:"required"`
+	OutletID uuid.UUID     `json:"outlet_id" validate:"required"`
 	Items    []RestockItem `json:"items" validate:"required,min=1,dive"`
-	Reason   string    `json:"reason" validate:"required,min=1,max=255"`
+	Reason   string        `json:"reason" validate:"required,min=1,max=255"`
 }
 
 type RestockItem struct {
@@ -82,10 +82,10 @@ type InventoryAdjustmentResponse struct {
 }
 
 type RestockInventoryResponse struct {
-	OutletID uuid.UUID `json:"outlet_id"`
-	Items    []RestockItemResult `json:"items"`
-	Reason   string    `json:"reason"`
-	RestockedAt time.Time `json:"restocked_at"`
+	OutletID    uuid.UUID           `json:"outlet_id"`
+	Items       []RestockItemResult `json:"items"`
+	Reason      string              `json:"reason"`
+	RestockedAt time.Time           `json:"restocked_at"`
 }
 
 type RestockItemResult struct {

internal/contract/order_contract.go

@@ -98,6 +98,8 @@ type OrderItemResponse struct {
 	ProductName        string                   `json:"product_name"`
 	ProductVariantID   *uuid.UUID               `json:"product_variant_id"`
 	ProductVariantName *string                  `json:"product_variant_name,omitempty"`
+	CategoryID         *uuid.UUID               `json:"category_id,omitempty"`
+	CategoryName       *string                  `json:"category_name,omitempty"`
 	Quantity           int                      `json:"quantity"`
 	UnitPrice          float64                  `json:"unit_price"`
 	TotalPrice         float64                  `json:"total_price"`
@@ -108,6 +110,7 @@ type OrderItemResponse struct {
 	CreatedAt          time.Time                `json:"created_at"`
 	UpdatedAt          time.Time                `json:"updated_at"`
 	PrinterType        string                   `json:"printer_type"`
+	PrintToChecker     bool                     `json:"print_to_checker"`
 	PaidQuantity       int                      `json:"paid_quantity"`
 }
 

internal/contract/product_contract.go

@@ -17,6 +17,7 @@ type CreateProductRequest struct {
 	BusinessType    *string                       `json:"business_type,omitempty"`
 	ImageURL        *string                       `json:"image_url,omitempty" validate:"omitempty,max=500"`
 	PrinterType     *string                       `json:"printer_type,omitempty" validate:"omitempty,max=50"`
+	PrintToChecker  *bool                         `json:"print_to_checker,omitempty"`
 	Metadata        map[string]interface{}        `json:"metadata,omitempty"`
 	IsActive        *bool                         `json:"is_active,omitempty"`
 	Variants        []CreateProductVariantRequest `json:"variants,omitempty"`
@@ -26,19 +27,20 @@ type CreateProductRequest struct {
 }
 
 type UpdateProductRequest struct {
-	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
-	CategoryID   *uuid.UUID             `json:"category_id,omitempty"`
-	SKU          *string                `json:"sku,omitempty"`
-	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
-	Description  *string                `json:"description,omitempty"`
-	Price        *float64               `json:"price,omitempty" validate:"omitempty,min=0"`
-	Cost         *float64               `json:"cost,omitempty" validate:"omitempty,min=0"`
-	BusinessType *string                `json:"business_type,omitempty"`
-	ImageURL     *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
-	PrinterType  *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
-	Metadata     map[string]interface{} `json:"metadata,omitempty"`
-	IsActive     *bool                  `json:"is_active,omitempty"`
-	ReorderLevel *int                   `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
+	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
+	CategoryID     *uuid.UUID             `json:"category_id,omitempty"`
+	SKU            *string                `json:"sku,omitempty"`
+	Name           *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
+	Description    *string                `json:"description,omitempty"`
+	Price          *float64               `json:"price,omitempty" validate:"omitempty,min=0"`
+	Cost           *float64               `json:"cost,omitempty" validate:"omitempty,min=0"`
+	BusinessType   *string                `json:"business_type,omitempty"`
+	ImageURL       *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
+	PrinterType    *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
+	PrintToChecker *bool                  `json:"print_to_checker,omitempty"`
+	Metadata       map[string]interface{} `json:"metadata,omitempty"`
+	IsActive       *bool                  `json:"is_active,omitempty"`
+	ReorderLevel   *int                   `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
 }
 
 type CreateProductVariantRequest struct {
@@ -71,6 +73,7 @@ type ProductResponse struct {
 	BusinessType   string                       `json:"business_type"`
 	ImageURL       *string                      `json:"image_url"`
 	PrinterType    string                       `json:"printer_type"`
+	PrintToChecker bool                         `json:"print_to_checker"`
 	Metadata       map[string]interface{}       `json:"metadata"`
 	IsActive       bool                         `json:"is_active"`
 	CreatedAt      time.Time                    `json:"created_at"`

internal/contract/product_outlet_price_contract.go

@@ -7,23 +7,26 @@ import (
 )
 
 type CreateProductOutletPriceRequest struct {
-	ProductID uuid.UUID `json:"product_id" validate:"required"`
-	OutletID  uuid.UUID `json:"outlet_id" validate:"required"`
-	Price     float64   `json:"price" validate:"required,min=0"`
+	ProductID      uuid.UUID `json:"product_id" validate:"required"`
+	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
+	Price          float64   `json:"price" validate:"required,min=0"`
+	PrintToChecker bool      `json:"print_to_checker"`
 }
 
 type UpdateProductOutletPriceRequest struct {
-	Price float64 `json:"price" validate:"required,min=0"`
+	Price          float64 `json:"price" validate:"required,min=0"`
+	PrintToChecker *bool   `json:"print_to_checker"`
 }
 
 type ProductOutletPriceResponse struct {
-	ID         uuid.UUID `json:"id,omitempty"`
-	ProductID  uuid.UUID `json:"product_id,omitempty"`
-	OutletID   uuid.UUID `json:"outlet_id"`
-	OutletName string    `json:"outlet_name,omitempty"`
-	Price      float64   `json:"price"`
-	CreatedAt  time.Time `json:"created_at,omitempty"`
-	UpdatedAt  time.Time `json:"updated_at,omitempty"`
+	ID             uuid.UUID `json:"id,omitempty"`
+	ProductID      uuid.UUID `json:"product_id,omitempty"`
+	OutletID       uuid.UUID `json:"outlet_id"`
+	OutletName     string    `json:"outlet_name,omitempty"`
+	Price          float64   `json:"price"`
+	PrintToChecker bool      `json:"print_to_checker"`
+	CreatedAt      time.Time `json:"created_at,omitempty"`
+	UpdatedAt      time.Time `json:"updated_at,omitempty"`
 }
 
 type ListProductOutletPricesResponse struct {
@@ -37,6 +40,7 @@ type BulkCreateProductOutletPriceRequest struct {
 }
 
 type CreateProductOutletPricePerOutletRequest struct {
-	OutletID uuid.UUID `json:"outlet_id" validate:"required"`
-	Price    float64   `json:"price" validate:"required,min=0"`
+	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
+	Price          float64   `json:"price" validate:"required,min=0"`
+	PrintToChecker bool      `json:"print_to_checker"`
 }

internal/contract/product_recipe_contract.go

@@ -34,34 +34,34 @@ type BulkCreateProductRecipeRequest struct {
 
 // Response structures
 type ProductRecipeResponse struct {
-	ID              uuid.UUID                      `json:"id"`
-	OrganizationID  uuid.UUID                      `json:"organization_id"`
-	OutletID        *uuid.UUID                     `json:"outlet_id"`
-	ProductID       uuid.UUID                      `json:"product_id"`
-	VariantID       *uuid.UUID                     `json:"variant_id"`
-	IngredientID    uuid.UUID                      `json:"ingredient_id"`
-	Quantity        float64                        `json:"quantity"`
-	WastePercentage float64                        `json:"waste_percentage"`
-	CreatedAt       time.Time                      `json:"created_at"`
-	UpdatedAt       time.Time                      `json:"updated_at"`
-	Product         *ProductResponse               `json:"product,omitempty"`
-	ProductVariant  *ProductVariantResponse        `json:"product_variant,omitempty"`
+	ID              uuid.UUID                        `json:"id"`
+	OrganizationID  uuid.UUID                        `json:"organization_id"`
+	OutletID        *uuid.UUID                       `json:"outlet_id"`
+	ProductID       uuid.UUID                        `json:"product_id"`
+	VariantID       *uuid.UUID                       `json:"variant_id"`
+	IngredientID    uuid.UUID                        `json:"ingredient_id"`
+	Quantity        float64                          `json:"quantity"`
+	WastePercentage float64                          `json:"waste_percentage"`
+	CreatedAt       time.Time                        `json:"created_at"`
+	UpdatedAt       time.Time                        `json:"updated_at"`
+	Product         *ProductResponse                 `json:"product,omitempty"`
+	ProductVariant  *ProductVariantResponse          `json:"product_variant,omitempty"`
 	Ingredient      *ProductRecipeIngredientResponse `json:"ingredient,omitempty"`
 }
 
 type ProductRecipeIngredientResponse struct {
-	ID             uuid.UUID                 `json:"id"`
-	OrganizationID uuid.UUID                 `json:"organization_id"`
-	OutletID       *uuid.UUID                `json:"outlet_id"`
-	Name           string                    `json:"name"`
-	UnitID         uuid.UUID                 `json:"unit_id"`
-	Cost           float64                   `json:"cost"`
-	Stock          float64                   `json:"stock"`
-	IsSemiFinished bool                      `json:"is_semi_finished"`
-	IsActive       bool                      `json:"is_active"`
-	Metadata       map[string]interface{}    `json:"metadata"`
-	CreatedAt      time.Time                 `json:"created_at"`
-	UpdatedAt      time.Time                 `json:"updated_at"`
+	ID             uuid.UUID                  `json:"id"`
+	OrganizationID uuid.UUID                  `json:"organization_id"`
+	OutletID       *uuid.UUID                 `json:"outlet_id"`
+	Name           string                     `json:"name"`
+	UnitID         *uuid.UUID                 `json:"unit_id"`
+	Cost           float64                    `json:"cost"`
+	Stock          float64                    `json:"stock"`
+	IsSemiFinished bool                       `json:"is_semi_finished"`
+	IsActive       bool                       `json:"is_active"`
+	Metadata       map[string]interface{}     `json:"metadata"`
+	CreatedAt      time.Time                  `json:"created_at"`
+	UpdatedAt      time.Time                  `json:"updated_at"`
 	Unit           *ProductRecipeUnitResponse `json:"unit,omitempty"`
 }
 
@@ -71,4 +71,4 @@ type ProductRecipeUnitResponse struct {
 	Symbol    string    `json:"symbol"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`
-}
+}

internal/contract/purchase_category_contract.go

@@ -0,0 +1,57 @@
+package contract
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+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"`
+	SortOrder *int       `json:"sort_order,omitempty"`
+	IsActive  *bool      `json:"is_active,omitempty"`
+}
+
+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"`
+	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"`
+	Search   string     `json:"search,omitempty"`
+	IsActive *bool      `json:"is_active,omitempty"`
+	Page     int        `json:"page" validate:"required,min=1"`
+	Limit    int        `json:"limit" validate:"required,min=1,max=100"`
+}
+
+type PurchaseCategoryResponse struct {
+	ID             uuid.UUID  `json:"id"`
+	OrganizationID uuid.UUID  `json:"organization_id"`
+	PresetID       *uuid.UUID `json:"preset_id"`
+	ParentID       *uuid.UUID `json:"parent_id"`
+	Code           string     `json:"code"`
+	Name           string     `json:"name"`
+	Type           string     `json:"type"`
+	SortOrder      int        `json:"sort_order"`
+	IsSystem       bool       `json:"is_system"`
+	IsActive       bool       `json:"is_active"`
+	CreatedAt      time.Time  `json:"created_at"`
+	UpdatedAt      time.Time  `json:"updated_at"`
+}
+
+type ListPurchaseCategoriesResponse struct {
+	PurchaseCategories []PurchaseCategoryResponse `json:"purchase_categories"`
+	TotalCount         int                        `json:"total_count"`
+	Page               int                        `json:"page"`
+	Limit              int                        `json:"limit"`
+	TotalPages         int                        `json:"total_pages"`
+}

internal/contract/purchase_order_contract.go

@@ -7,76 +7,108 @@ import (
 )
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
-	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate   string                           `json:"transaction_date" validate:"required"` // Format: YYYY-MM-DD
-	DueDate           string                           `json:"due_date" validate:"required"`          // Format: YYYY-MM-DD
-	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
-	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
-	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
+	VendorID        *uuid.UUID `json:"vendor_id,omitempty" validate:"omitempty"`
+	PONumber        string     `json:"po_number" validate:"required,min=1,max=50"`
+	TransactionDate string     `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
+	DueDate         *string    `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
+	Reference       *string    `json:"reference,omitempty" validate:"omitempty,max=100"`
+	Status          *string    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
+	Message         *string    `json:"message,omitempty" validate:"omitempty"`
+	TeamScope       *string    `json:"team_scope,omitempty" validate:"omitempty,oneof=category central"`
+	TeamCategoryID  *uuid.UUID `json:"team_category_id,omitempty" validate:"omitempty"`
+	// CashAdvanceID marks the purchase as paid out of cash advanced to the team. Sending
+	// it without a team charges the purchase to the cash advance's team.
+	CashAdvanceID     *uuid.UUID                       `json:"cash_advance_id,omitempty" validate:"omitempty"`
 	Items             []CreatePurchaseOrderItemRequest `json:"items" validate:"required,min=1,dive"`
 	AttachmentFileIDs []uuid.UUID                      `json:"attachment_file_ids,omitempty"`
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	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"`
+	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"`
 }
 
 type UpdatePurchaseOrderRequest struct {
-	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
-	PONumber          *string                          `json:"po_number,omitempty" validate:"omitempty,min=1,max=50"`
-	TransactionDate   *string                          `json:"transaction_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
-	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`          // Format: YYYY-MM-DD
-	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
-	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
-	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
+	VendorID        *uuid.UUID `json:"vendor_id,omitempty" validate:"omitempty"`
+	PONumber        *string    `json:"po_number,omitempty" validate:"omitempty,min=1,max=50"`
+	TransactionDate *string    `json:"transaction_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
+	DueDate         *string    `json:"due_date,omitempty" validate:"omitempty"`         // Format: YYYY-MM-DD
+	Reference       *string    `json:"reference,omitempty" validate:"omitempty,max=100"`
+	Status          *string    `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
+	Message         *string    `json:"message,omitempty" validate:"omitempty"`
+	// An empty string clears the team; omitting the field leaves it untouched.
+	TeamScope      *string    `json:"team_scope,omitempty" validate:"omitempty"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty" validate:"omitempty"`
+	// An all-zero uuid unlinks the cash advance; omitting the field leaves it untouched.
+	CashAdvanceID     *uuid.UUID                       `json:"cash_advance_id,omitempty" validate:"omitempty"`
 	Items             []UpdatePurchaseOrderItemRequest `json:"items,omitempty" validate:"omitempty,dive"`
 	AttachmentFileIDs []uuid.UUID                      `json:"attachment_file_ids,omitempty"`
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	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"`
+	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"`
 }
 
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	VendorID        uuid.UUID                         `json:"vendor_id"`
+	OutletID        *uuid.UUID                        `json:"outlet_id"`
+	VendorID        *uuid.UUID                        `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
 	TotalAmount     float64                           `json:"total_amount"`
+	TeamScope       *string                           `json:"team_scope"`
+	TeamCategoryID  *uuid.UUID                        `json:"team_category_id"`
+	CashAdvanceID   *uuid.UUID                        `json:"cash_advance_id"`
 	CreatedAt       time.Time                         `json:"created_at"`
 	UpdatedAt       time.Time                         `json:"updated_at"`
+	Team            *PurchaseTeamResponse             `json:"team,omitempty"`
 	Vendor          *VendorResponse                   `json:"vendor,omitempty"`
 	Items           []PurchaseOrderItemResponse       `json:"items,omitempty"`
 	Attachments     []PurchaseOrderAttachmentResponse `json:"attachments,omitempty"`
 }
 
+// PurchaseTeamResponse is one entry of the team picker. Teams come from the parent
+// product categories; Pusat is the extra entry that has no category behind it, so
+// its CategoryID is null.
+type PurchaseTeamResponse struct {
+	Scope      string     `json:"scope"`
+	CategoryID *uuid.UUID `json:"category_id"`
+	Name       string     `json:"name"`
+}
+
+type ListPurchaseTeamsResponse struct {
+	Teams []PurchaseTeamResponse `json:"teams"`
+}
+
 type PurchaseOrderItemResponse struct {
-	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"`
+	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"`
 }
 
 type PurchaseOrderAttachmentResponse struct {
@@ -88,13 +120,20 @@ type PurchaseOrderAttachmentResponse struct {
 }
 
 type ListPurchaseOrdersRequest struct {
-	Page      int        `json:"page" validate:"min=1"`
-	Limit     int        `json:"limit" validate:"min=1,max=100"`
-	Search    string     `json:"search,omitempty"`
-	Status    string     `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
-	VendorID  *uuid.UUID `json:"vendor_id,omitempty"`
-	StartDate *time.Time `json:"start_date,omitempty"`
-	EndDate   *time.Time `json:"end_date,omitempty"`
+	Page     int        `json:"page" validate:"min=1"`
+	Limit    int        `json:"limit" validate:"min=1,max=100"`
+	Search   string     `json:"search,omitempty"`
+	Status   string     `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
+	VendorID *uuid.UUID `json:"vendor_id,omitempty"`
+	// Team is the single-value form of the two filters below, so the team picker
+	// can send back what it was given: a parent category id, "central" for Pusat,
+	// or "none" for purchases with no team yet. It replaces them rather than
+	// narrowing alongside them.
+	Team           string     `json:"team,omitempty"`
+	TeamScope      string     `json:"team_scope,omitempty" validate:"omitempty,oneof=category central"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty"`
+	StartDate      *time.Time `json:"start_date,omitempty"`
+	EndDate        *time.Time `json:"end_date,omitempty"`
 }
 
 type ListPurchaseOrdersResponse 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"`
+	Role           string                 `json:"role" validate:"required,oneof=admin manager cashier waiter owner purchasing"`
 	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"`
+	Role        *string                 `json:"role,omitempty" validate:"omitempty,oneof=admin manager cashier waiter owner purchasing"`
 	OutletID    *uuid.UUID              `json:"outlet_id,omitempty"`
 	IsActive    *bool                   `json:"is_active,omitempty"`
 	Permissions *map[string]interface{} `json:"permissions,omitempty"`

internal/entities/analytics.go

@@ -27,6 +27,14 @@ type SalesAnalytics struct {
 	NetSales float64   `json:"net_sales"`
 }
 
+// PurchaseTeamFilter narrows purchasing figures to a single team: a parent
+// category, Pusat, or the purchases that carry no team at all. A nil filter
+// leaves the figures spanning every team.
+type PurchaseTeamFilter struct {
+	Scope      string
+	CategoryID *uuid.UUID
+}
+
 // PurchasingAnalytics represents purchasing analytics data
 type PurchasingAnalytics struct {
 	OutletName     *string                    `json:"outlet_name,omitempty"`
@@ -34,24 +42,49 @@ type PurchasingAnalytics struct {
 	Data           []PurchasingAnalyticsData  `json:"data"`
 	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
 	VendorData     []PurchasingVendorData     `json:"vendor_data"`
+	TeamData       []PurchasingTeamData       `json:"team_data"`
+}
+
+// PurchasingTeamData is one team's share of the purchases: a parent category,
+// Pusat, or the purchases charged to no team at all. Scope and CategoryID are
+// what the team filter takes back, so a row can be clicked straight through.
+type PurchasingTeamData struct {
+	Scope                string     `json:"scope"`
+	CategoryID           *uuid.UUID `json:"category_id"`
+	Name                 string     `json:"name"`
+	TotalPurchases       float64    `json:"total_purchases"`
+	RawMaterialPurchases float64    `json:"raw_material_purchases"`
+	ExpensePurchases     float64    `json:"expense_purchases"`
+	PurchaseOrderCount   int64      `json:"purchase_order_count"`
+	Quantity             float64    `json:"quantity"`
+	Percentage           float64    `json:"percentage"`
 }
 
 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"`
 	TotalVendors              int64   `json:"total_vendors"`
+	TotalTeams                int64   `json:"total_teams"`
 }
 
 type PurchasingAnalyticsData struct {
-	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"`
+	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"`
 }
 
 type PurchasingIngredientData struct {
@@ -64,18 +97,19 @@ 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 {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -103,6 +137,39 @@ 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"`
@@ -111,16 +178,78 @@ 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 {
-	TodayRevenue            float64
-	TodayCost               float64
-	MtdRevenue              float64
-	MtdCost                 float64
-	TodayExpenseByCategory  []ExpenseCategoryTotal
-	MtdExpenseByCategory    []ExpenseCategoryTotal
-	OperationalExpenseItems []OperationalExpenseItem
+	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
+}
+
+type ProfitLossSummary struct {
+	TotalRevenue       float64
+	TotalCost          float64
+	GrossProfit        float64
+	GrossProfitMargin  float64
+	TotalTax           float64
+	TotalDiscount      float64
+	NetProfit          float64
+	NetProfitMargin    float64
+	TotalOrders        int64
+	AverageProfit      float64
+	ProfitabilityRatio float64
+}
+
+type ProfitLossData struct {
+	Date              time.Time
+	Revenue           float64
+	Cost              float64
+	GrossProfit       float64
+	GrossProfitMargin float64
+	Tax               float64
+	Discount          float64
+	NetProfit         float64
+	NetProfitMargin   float64
+	Orders            int64
+}
+
+type ProductProfitData struct {
+	ProductID         uuid.UUID
+	ProductName       string
+	CategoryID        uuid.UUID
+	CategoryName      string
+	QuantitySold      int64
+	Revenue           float64
+	Cost              float64
+	GrossProfit       float64
+	GrossProfitMargin float64
+	AveragePrice      float64
+	AverageCost       float64
+	ProfitPerUnit     float64
 }
 
 type ExpenseCategoryTotal struct {
@@ -129,6 +258,45 @@ type ExpenseCategoryTotal struct {
 }
 
 type OperationalExpenseItem struct {
-	Description string
-	Amount      float64
+	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/cash_advance.go

@@ -0,0 +1,63 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+
+	"gorm.io/gorm"
+)
+
+// CashAdvance is money handed to a team up front so it can go shopping — kasbon in
+// the Indonesian UI. While the cash is out it is still the outlet's, not a cost, so
+// nothing about what the team bought lives here: that is read back from the purchase
+// orders and expenses charged to the advance.
+type CashAdvance struct {
+	ID             uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id"`
+	OutletID       uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
+	CodeNumber     string    `gorm:"not null;size:50" json:"code_number"`
+	// An advance is always handed to a team, so unlike a purchase order it has no
+	// "not chosen yet" state. TeamCategoryID is set only when the scope is category.
+	TeamScope      string     `gorm:"not null;size:20;index" json:"team_scope"`
+	TeamCategoryID *uuid.UUID `gorm:"type:uuid;index" json:"team_category_id"`
+	Amount         float64    `gorm:"type:decimal(15,2);not null;default:0" json:"amount"`
+	ReturnedAmount float64    `gorm:"type:decimal(15,2);not null;default:0" json:"returned_amount"`
+	IssuedDate     time.Time  `gorm:"type:date;not null" json:"issued_date"`
+	DueDate        *time.Time `gorm:"type:date" json:"due_date"`
+	Status         string     `gorm:"not null;size:20;default:'draft'" json:"status"`
+	Description    *string    `gorm:"type:text" json:"description"`
+	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
+
+	// SettledAmount is filled in by the read queries from the spending charged to
+	// this advance. It has no column of its own, so it can never drift out of step
+	// with the purchases behind it; the arrow tag keeps writes from touching it.
+	SettledAmount float64 `gorm:"->;-:migration" json:"settled_amount"`
+
+	Organization *Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       *Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	TeamCategory *Category     `gorm:"foreignKey:TeamCategoryID" json:"team_category,omitempty"`
+}
+
+func (k *CashAdvance) BeforeCreate(tx *gorm.DB) error {
+	if k.ID == uuid.Nil {
+		k.ID = uuid.New()
+	}
+	return nil
+}
+
+func (CashAdvance) TableName() string {
+	return "cash_advances"
+}
+
+// CashAdvanceSettlement is one piece of spending charged to an advance. It is read
+// out of purchase_orders and expenses, so it has no table of its own.
+type CashAdvanceSettlement struct {
+	Type   string    `json:"type"`
+	ID     uuid.UUID `json:"id"`
+	Number string    `json:"number"`
+	Date   time.Time `json:"date"`
+	Amount float64   `json:"amount"`
+	Status string    `json:"status"`
+}

internal/entities/category.go

@@ -34,6 +34,8 @@ 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/entities.go

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

internal/entities/expense.go

@@ -12,22 +12,75 @@ type Expense struct {
 	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
 	OrganizationID  uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id"`
 	OutletID        uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
-	ExpenseName     string    `gorm:"not null;size:255" json:"expense_name"`
 	Receiver        string    `gorm:"not null;size:255" json:"receiver"`
 	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date"`
 	CodeNumber      string    `gorm:"not null;size:50" json:"code_number"`
+	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status"`
 	Description     *string   `gorm:"type:text" json:"description"`
 	Tax             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"tax"`
 	Total           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total"`
 	Reserved1       *string   `gorm:"type:text" json:"reserved1"`
-	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	// CashAdvanceID is set when the expense was paid out of cash advanced to a team.
+	CashAdvanceID *uuid.UUID `gorm:"type:uuid;index" json:"cash_advance_id"`
+	CreatedAt     time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt     time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
 	Outlet       *Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	CashAdvance  *CashAdvance  `gorm:"foreignKey:CashAdvanceID" json:"cash_advance,omitempty"`
 	Items        []ExpenseItem `gorm:"foreignKey:ExpenseID" json:"items,omitempty"`
 }
 
+type ExpenseAnalytics struct {
+	Summary            ExpenseAnalyticsSummary
+	Data               []ExpenseAnalyticsData
+	CategoryData       []ExpenseAnalyticsCategoryData
+	ChartOfAccountData []ExpenseAnalyticsChartOfAccountData
+	ItemData           []ExpenseAnalyticsItemData
+}
+
+type ExpenseAnalyticsSummary struct {
+	TotalExpenses       float64
+	TotalExpenseCount   int64
+	TotalTax            float64
+	AverageExpenseValue float64
+	TotalCategories     int64
+	TotalItems          int64
+}
+
+type ExpenseAnalyticsData struct {
+	Date         time.Time
+	Expenses     float64
+	ExpenseCount int64
+	Tax          float64
+	Items        int64
+	Categories   int64
+}
+
+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
+	ExpenseCount       int64
+	ItemCount          int64
+}
+
+type ExpenseAnalyticsItemData struct {
+	Item         string
+	TotalAmount  float64
+	ExpenseCount int64
+	ItemCount    int64
+}
+
 func (e *Expense) BeforeCreate(tx *gorm.DB) error {
 	if e.ID == uuid.Nil {
 		e.ID = uuid.New()

internal/entities/expense_item.go

@@ -9,16 +9,19 @@ 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"`
-	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"`
+	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"`
 
-	Expense        *Expense        `gorm:"foreignKey:ExpenseID" json:"expense,omitempty"`
-	ChartOfAccount *ChartOfAccount `gorm:"foreignKey:ChartOfAccountID" json:"chart_of_account,omitempty"`
+	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"`
 }
 
 func (e *ExpenseItem) BeforeCreate(tx *gorm.DB) error {

internal/entities/ingredient.go

@@ -11,7 +11,7 @@ type Ingredient struct {
 	OrganizationID uuid.UUID               `gorm:"type:uuid;not null;index" json:"organization_id"`
 	OutletID       *uuid.UUID              `gorm:"type:uuid;index" json:"outlet_id"`
 	Name           string                  `gorm:"not null;size:255" json:"name"`
-	UnitID         uuid.UUID               `gorm:"type:uuid;not null;index" json:"unit_id"`
+	UnitID         *uuid.UUID              `gorm:"type:uuid;index" json:"unit_id"`
 	Cost           float64                 `gorm:"type:decimal(10,2);default:0.00" json:"cost"`
 	Stock          float64                 `gorm:"type:decimal(10,2);default:0.00" json:"stock"`
 	IsSemiFinished bool                    `gorm:"default:false" json:"is_semi_finished"`

internal/entities/ingredient_unit_converter.go

@@ -39,4 +39,3 @@ func (iuc *IngredientUnitConverter) BeforeCreate() error {
 	}
 	return nil
 }
-

internal/entities/inventory_movement.go

@@ -36,34 +36,36 @@ 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"`
-	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"`
+	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"`
 
-	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"`
+	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"`
 }
 
 func (im *InventoryMovement) BeforeCreate(tx *gorm.DB) error {

internal/entities/order_ingredient_transaction.go

@@ -26,14 +26,14 @@ type OrderIngredientTransaction struct {
 	UpdatedAt        time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	// Relations
-	Organization   Organization   `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Outlet         *Outlet        `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
-	Order          Order          `gorm:"foreignKey:OrderID" json:"order,omitempty"`
-	OrderItem      *OrderItem     `gorm:"foreignKey:OrderItemID" json:"order_item,omitempty"`
-	Product        Product        `gorm:"foreignKey:ProductID" json:"product,omitempty"`
+	Organization   Organization    `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet         *Outlet         `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	Order          Order           `gorm:"foreignKey:OrderID" json:"order,omitempty"`
+	OrderItem      *OrderItem      `gorm:"foreignKey:OrderItemID" json:"order_item,omitempty"`
+	Product        Product         `gorm:"foreignKey:ProductID" json:"product,omitempty"`
 	ProductVariant *ProductVariant `gorm:"foreignKey:ProductVariantID" json:"product_variant,omitempty"`
-	Ingredient     Ingredient     `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
-	CreatedByUser  User           `gorm:"foreignKey:CreatedBy" json:"created_by_user,omitempty"`
+	Ingredient     Ingredient      `gorm:"foreignKey:IngredientID" json:"ingredient,omitempty"`
+	CreatedByUser  User            `gorm:"foreignKey:CreatedBy" json:"created_by_user,omitempty"`
 }
 
 func (oit *OrderIngredientTransaction) BeforeCreate(tx *gorm.DB) error {

internal/entities/product.go

@@ -26,13 +26,14 @@ type Product struct {
 	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
 	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
-	Organization    Organization     `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
-	Category        Category         `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
-	Unit            *Unit            `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
-	ProductVariants []ProductVariant `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
-	ProductRecipes  []ProductRecipe  `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
-	Inventory       []Inventory      `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
-	OrderItems      []OrderItem      `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
+	Organization        Organization         `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Category            Category             `gorm:"foreignKey:CategoryID" json:"category,omitempty"`
+	Unit                *Unit                `gorm:"foreignKey:UnitID" json:"unit,omitempty"`
+	ProductVariants     []ProductVariant     `gorm:"foreignKey:ProductID" json:"variants,omitempty"`
+	ProductRecipes      []ProductRecipe      `gorm:"foreignKey:ProductID" json:"product_recipes,omitempty"`
+	Inventory           []Inventory          `gorm:"foreignKey:ProductID" json:"inventory,omitempty"`
+	OrderItems          []OrderItem          `gorm:"foreignKey:ProductID" json:"order_items,omitempty"`
+	ProductOutletPrices []ProductOutletPrice `gorm:"foreignKey:ProductID" json:"product_outlet_prices,omitempty"`
 }
 
 func (p *Product) BeforeCreate(tx *gorm.DB) error {

internal/entities/product_ingredient.go

@@ -7,15 +7,15 @@ import (
 )
 
 type ProductIngredient struct {
-	ID               uuid.UUID  `json:"id" db:"id"`
-	OrganizationID   uuid.UUID  `json:"organization_id" db:"organization_id"`
-	OutletID         *uuid.UUID `json:"outlet_id" db:"outlet_id"`
-	ProductID        uuid.UUID  `json:"product_id" db:"product_id"`
-	IngredientID     uuid.UUID  `json:"ingredient_id" db:"ingredient_id"`
-	Quantity         float64    `json:"quantity" db:"quantity"`
-	WastePercentage  float64    `json:"waste_percentage" db:"waste_percentage"`
-	CreatedAt        time.Time  `json:"created_at" db:"created_at"`
-	UpdatedAt        time.Time  `json:"updated_at" db:"updated_at"`
+	ID              uuid.UUID  `json:"id" db:"id"`
+	OrganizationID  uuid.UUID  `json:"organization_id" db:"organization_id"`
+	OutletID        *uuid.UUID `json:"outlet_id" db:"outlet_id"`
+	ProductID       uuid.UUID  `json:"product_id" db:"product_id"`
+	IngredientID    uuid.UUID  `json:"ingredient_id" db:"ingredient_id"`
+	Quantity        float64    `json:"quantity" db:"quantity"`
+	WastePercentage float64    `json:"waste_percentage" db:"waste_percentage"`
+	CreatedAt       time.Time  `json:"created_at" db:"created_at"`
+	UpdatedAt       time.Time  `json:"updated_at" db:"updated_at"`
 
 	// Relations
 	Product    *Product    `json:"product,omitempty"`

internal/entities/product_outlet_price.go

@@ -8,12 +8,13 @@ import (
 )
 
 type ProductOutletPrice struct {
-	ID        uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	ProductID uuid.UUID `gorm:"type:uuid;not null;index" json:"product_id"`
-	OutletID  uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
-	Price     float64   `gorm:"type:decimal(10,2);not null" json:"price"`
-	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"`
+	ProductID      uuid.UUID `gorm:"type:uuid;not null;index" json:"product_id"`
+	OutletID       uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
+	Price          float64   `gorm:"type:decimal(10,2);not null" json:"price"`
+	PrintToChecker bool      `gorm:"not null;default:true" json:"print_to_checker"`
+	CreatedAt      time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Product Product `gorm:"foreignKey:ProductID" json:"product,omitempty"`
 	Outlet  Outlet  `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`

internal/entities/product_recipe.go

@@ -34,4 +34,4 @@ func (pr *ProductRecipe) BeforeCreate(tx *gorm.DB) error {
 
 func (ProductRecipe) TableName() string {
 	return "product_recipes"
-}
+}

internal/entities/purchase_category.go

@@ -0,0 +1,71 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type PurchaseCategoryType string
+
+const (
+	PurchaseCategoryTypeRawMaterial PurchaseCategoryType = "raw_material"
+	PurchaseCategoryTypeExpense     PurchaseCategoryType = "expense"
+)
+
+type PurchaseCategoryPreset struct {
+	ID        uuid.UUID            `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	ParentID  *uuid.UUID           `gorm:"type:uuid;index" json:"parent_id"`
+	Code      string               `gorm:"not null;unique;size:100" json:"code"`
+	Name      string               `gorm:"not null;size:255" json:"name"`
+	Type      PurchaseCategoryType `gorm:"not null;size:20" json:"type"`
+	SortOrder int                  `gorm:"not null;default:0" json:"sort_order"`
+	IsActive  bool                 `gorm:"not null;default:true" json:"is_active"`
+	CreatedAt time.Time            `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt time.Time            `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Parent *PurchaseCategoryPreset `gorm:"foreignKey:ParentID" json:"parent,omitempty"`
+}
+
+func (p *PurchaseCategoryPreset) BeforeCreate(tx *gorm.DB) error {
+	if p.ID == uuid.Nil {
+		p.ID = uuid.New()
+	}
+	return nil
+}
+
+func (PurchaseCategoryPreset) TableName() string {
+	return "purchase_category_presets"
+}
+
+type PurchaseCategory 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"`
+	PresetID       *uuid.UUID           `gorm:"type:uuid;index" json:"preset_id"`
+	ParentID       *uuid.UUID           `gorm:"type:uuid;index" json:"parent_id"`
+	Code           string               `gorm:"not null;size:100" json:"code"`
+	Name           string               `gorm:"not null;size:255" json:"name"`
+	Type           PurchaseCategoryType `gorm:"not null;size:20" json:"type"`
+	SortOrder      int                  `gorm:"not null;default:0" json:"sort_order"`
+	IsSystem       bool                 `gorm:"not null;default:false" json:"is_system"`
+	IsActive       bool                 `gorm:"not null;default:true" json:"is_active"`
+	CreatedAt      time.Time            `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time            `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Organization *Organization           `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Preset       *PurchaseCategoryPreset `gorm:"foreignKey:PresetID" json:"preset,omitempty"`
+	Parent       *PurchaseCategory       `gorm:"foreignKey:ParentID" json:"parent,omitempty"`
+	Children     []PurchaseCategory      `gorm:"foreignKey:ParentID" json:"children,omitempty"`
+}
+
+func (c *PurchaseCategory) BeforeCreate(tx *gorm.DB) error {
+	if c.ID == uuid.Nil {
+		c.ID = uuid.New()
+	}
+	return nil
+}
+
+func (PurchaseCategory) TableName() string {
+	return "purchase_categories"
+}

internal/entities/purchase_order.go

@@ -9,21 +9,32 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID  uuid.UUID `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
-	VendorID        uuid.UUID `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
-	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;not null" json:"due_date" validate:"required"`
-	Reference       *string   `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
-	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
-	Message         *string   `gorm:"type:text" json:"message" validate:"omitempty"`
-	TotalAmount     float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total_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"`
+	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"`
+	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"`
+	Reference       *string    `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
+	Status          string     `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
+	Message         *string    `gorm:"type:text" json:"message" validate:"omitempty"`
+	TotalAmount     float64    `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
+	// TeamScope is 'category' when the purchase is charged to a parent category, or
+	// 'central' for Pusat. Nil means no team was chosen, which is not the same as Pusat.
+	TeamScope      *string    `gorm:"size:20;index" json:"team_scope" validate:"omitempty,oneof=category central"`
+	TeamCategoryID *uuid.UUID `gorm:"type:uuid;index" json:"team_category_id" validate:"omitempty"`
+	// CashAdvanceID is set when the purchase was paid out of cash advanced to the team.
+	// It is what accounts for that advance, so the cash advance holds no copy of the items.
+	CashAdvanceID *uuid.UUID `gorm:"type:uuid;index" json:"cash_advance_id" validate:"omitempty"`
+	CreatedAt     time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt     time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       *Outlet                   `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`
+	TeamCategory *Category                 `gorm:"foreignKey:TeamCategoryID" json:"team_category,omitempty"`
+	CashAdvance  *CashAdvance              `gorm:"foreignKey:CashAdvanceID" json:"cash_advance,omitempty"`
 	Items        []PurchaseOrderItem       `gorm:"foreignKey:PurchaseOrderID" json:"items,omitempty"`
 	Attachments  []PurchaseOrderAttachment `gorm:"foreignKey:PurchaseOrderID" json:"attachments,omitempty"`
 }
@@ -41,19 +52,21 @@ func (PurchaseOrder) TableName() string {
 }
 
 type PurchaseOrderItem struct {
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	PurchaseOrderID uuid.UUID `gorm:"type:uuid;not null" json:"purchase_order_id" validate:"required"`
-	IngredientID    uuid.UUID `gorm:"type:uuid;not null" json:"ingredient_id" validate:"required"`
-	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"`
+	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"`
 
-	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"`
+	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"`
 }
 
 func (poi *PurchaseOrderItem) BeforeCreate(tx *gorm.DB) error {

internal/entities/user.go

@@ -13,10 +13,12 @@ import (
 type UserRole string
 
 const (
-	RoleAdmin   UserRole = "admin"
-	RoleManager UserRole = "manager"
-	RoleCashier UserRole = "cashier"
-	RoleWaiter  UserRole = "waiter"
+	RoleAdmin      UserRole = "admin"
+	RoleManager    UserRole = "manager"
+	RoleCashier    UserRole = "cashier"
+	RoleWaiter     UserRole = "waiter"
+	RoleOwner      UserRole = "owner"
+	RolePurchasing UserRole = "purchasing"
 )
 
 type Permissions map[string]interface{}
@@ -46,7 +48,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"`
+	Role           UserRole     `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter owner purchasing"`
 	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,6 +157,55 @@ 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)
@@ -210,3 +259,87 @@ 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/cash_advance_handler.go

@@ -0,0 +1,232 @@
+package handler
+
+import (
+	"strconv"
+	"time"
+
+	"apskel-pos-be/internal/appcontext"
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/service"
+	"apskel-pos-be/internal/util"
+	"apskel-pos-be/internal/validator"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type CashAdvanceHandler struct {
+	cashAdvanceService   service.CashAdvanceService
+	cashAdvanceValidator validator.CashAdvanceValidator
+}
+
+func NewCashAdvanceHandler(cashAdvanceService service.CashAdvanceService, cashAdvanceValidator validator.CashAdvanceValidator) *CashAdvanceHandler {
+	return &CashAdvanceHandler{
+		cashAdvanceService:   cashAdvanceService,
+		cashAdvanceValidator: cashAdvanceValidator,
+	}
+}
+
+func (h *CashAdvanceHandler) CreateCashAdvance(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.CreateCashAdvanceRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("CashAdvanceHandler::CreateCashAdvance -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::CreateCashAdvance")
+		return
+	}
+
+	validationError, validationErrorCode := h.cashAdvanceValidator.ValidateCreateCashAdvanceRequest(&req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::CreateCashAdvance")
+		return
+	}
+
+	response := h.cashAdvanceService.CreateCashAdvance(ctx, contextInfo, &req)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::CreateCashAdvance -> Failed to create cash advance from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::CreateCashAdvance")
+}
+
+func (h *CashAdvanceHandler) UpdateCashAdvance(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	cashAdvanceID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("CashAdvanceHandler::UpdateCashAdvance -> Invalid cash advance ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid cash advance ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::UpdateCashAdvance")
+		return
+	}
+
+	var req contract.UpdateCashAdvanceRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("CashAdvanceHandler::UpdateCashAdvance -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Invalid request body")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::UpdateCashAdvance")
+		return
+	}
+
+	validationError, validationErrorCode := h.cashAdvanceValidator.ValidateUpdateCashAdvanceRequest(&req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::UpdateCashAdvance")
+		return
+	}
+
+	response := h.cashAdvanceService.UpdateCashAdvance(ctx, contextInfo, cashAdvanceID, &req)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::UpdateCashAdvance -> Failed to update cash advance from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::UpdateCashAdvance")
+}
+
+func (h *CashAdvanceHandler) DeleteCashAdvance(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	cashAdvanceID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("CashAdvanceHandler::DeleteCashAdvance -> Invalid cash advance ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid cash advance ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::DeleteCashAdvance")
+		return
+	}
+
+	response := h.cashAdvanceService.DeleteCashAdvance(ctx, contextInfo, cashAdvanceID)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::DeleteCashAdvance -> Failed to delete cash advance from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::DeleteCashAdvance")
+}
+
+func (h *CashAdvanceHandler) GetCashAdvance(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	cashAdvanceID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("CashAdvanceHandler::GetCashAdvance -> Invalid cash advance ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid cash advance ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::GetCashAdvance")
+		return
+	}
+
+	response := h.cashAdvanceService.GetCashAdvanceByID(ctx, contextInfo, cashAdvanceID)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::GetCashAdvance -> Failed to get cash advance from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::GetCashAdvance")
+}
+
+func (h *CashAdvanceHandler) ListCashAdvances(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	req := &contract.ListCashAdvancesRequest{
+		Page:  1,
+		Limit: 10,
+	}
+
+	if pageStr := c.Query("page"); pageStr != "" {
+		if page, err := strconv.Atoi(pageStr); err == nil {
+			req.Page = page
+		}
+	}
+
+	if limitStr := c.Query("limit"); limitStr != "" {
+		if limit, err := strconv.Atoi(limitStr); err == nil {
+			req.Limit = limit
+		}
+	}
+
+	req.Search = c.Query("search")
+	req.Status = c.Query("status")
+	req.SettlementStatus = c.Query("settlement_status")
+	req.Team = c.Query("team")
+	req.TeamScope = c.Query("team_scope")
+
+	if teamCategoryIDStr := c.Query("team_category_id"); teamCategoryIDStr != "" {
+		if teamCategoryID, err := uuid.Parse(teamCategoryIDStr); err == nil {
+			req.TeamCategoryID = &teamCategoryID
+		}
+	}
+
+	if startDateStr := c.Query("start_date"); startDateStr != "" {
+		if startDate, err := time.Parse("2006-01-02", startDateStr); err == nil {
+			req.StartDate = &startDate
+		}
+	}
+
+	if endDateStr := c.Query("end_date"); endDateStr != "" {
+		if endDate, err := time.Parse("2006-01-02", endDateStr); err == nil {
+			req.EndDate = &endDate
+		}
+	}
+
+	validationError, validationErrorCode := h.cashAdvanceValidator.ValidateListCashAdvancesRequest(req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::ListCashAdvances")
+		return
+	}
+
+	response := h.cashAdvanceService.ListCashAdvances(ctx, contextInfo, req)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::ListCashAdvances -> Failed to list cash advances from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::ListCashAdvances")
+}
+
+func (h *CashAdvanceHandler) UpdateCashAdvanceStatus(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	cashAdvanceID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("CashAdvanceHandler::UpdateCashAdvanceStatus -> Invalid cash advance ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid cash advance ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::UpdateCashAdvanceStatus")
+		return
+	}
+
+	status := c.Param("status")
+	if status == "" {
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Status parameter is required")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "CashAdvanceHandler::UpdateCashAdvanceStatus")
+		return
+	}
+
+	response := h.cashAdvanceService.UpdateCashAdvanceStatus(ctx, contextInfo, cashAdvanceID, status)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::UpdateCashAdvanceStatus -> Failed to update cash advance status from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::UpdateCashAdvanceStatus")
+}
+
+// ListCashAdvanceTeams serves the team picker for the advance form: the parent
+// categories of the caller's outlet, plus Pusat. Same list the purchase form uses.
+func (h *CashAdvanceHandler) ListCashAdvanceTeams(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	response := h.cashAdvanceService.ListCashAdvanceTeams(ctx, contextInfo)
+	if response.HasErrors() {
+		logger.FromContext(ctx).WithError(response.GetErrors()[0]).Error("CashAdvanceHandler::ListCashAdvanceTeams -> Failed to list cash advance teams from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, response, "CashAdvanceHandler::ListCashAdvanceTeams")
+}

internal/handler/category_handler.go

@@ -191,6 +191,18 @@ 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/chart_of_account_type_handler.go

@@ -99,7 +99,7 @@ func (h *ChartOfAccountTypeHandler) DeleteChartOfAccountType(c *gin.Context) {
 func (h *ChartOfAccountTypeHandler) ListChartOfAccountTypes(c *gin.Context) {
 	// Parse query parameters
 	filters := make(map[string]interface{})
-	
+
 	if isActive := c.Query("is_active"); isActive != "" {
 		if isActiveBool, err := strconv.ParseBool(isActive); err == nil {
 			filters["is_active"] = isActiveBool

internal/handler/common.go

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

internal/handler/expense_handler.go

@@ -164,6 +164,26 @@ func (h *ExpenseHandler) ListExpenses(c *gin.Context) {
 		req.Search = search
 	}
 
+	if status := c.Query("status"); status != "" {
+		req.Status = status
+	}
+
+	// Prioritize outlet_id from context (e.g. outlet-scoped user),
+	// fall back to query param if context has no outlet.
+	if contextInfo.OutletID != uuid.Nil {
+		req.OutletID = contextInfo.OutletID.String()
+	} else if outletID := c.Query("outlet_id"); outletID != "" {
+		req.OutletID = outletID
+	}
+
+	if startDate := c.Query("start_date"); startDate != "" {
+		req.StartDate = startDate
+	}
+
+	if endDate := c.Query("end_date"); endDate != "" {
+		req.EndDate = endDate
+	}
+
 	validationError, validationErrorCode := h.expenseValidator.ValidateListExpenseRequest(req)
 	if validationError != nil {
 		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
@@ -179,3 +199,31 @@ func (h *ExpenseHandler) ListExpenses(c *gin.Context) {
 
 	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::ListExpenses")
 }
+
+func (h *ExpenseHandler) GetExpenseAnalytics(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.ExpenseAnalyticsRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ExpenseHandler::GetExpenseAnalytics -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ExpenseHandler::GetExpenseAnalytics")
+		return
+	}
+
+	if contextInfo.OutletID != uuid.Nil {
+		outletID := contextInfo.OutletID.String()
+		req.OutletID = &outletID
+	} else if outletID := c.Query("outlet_id"); outletID != "" {
+		req.OutletID = &outletID
+	}
+
+	expenseResponse := h.expenseService.GetExpenseAnalytics(ctx, contextInfo, &req)
+	if expenseResponse.HasErrors() {
+		errorResp := expenseResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ExpenseHandler::GetExpenseAnalytics -> Failed to get expense analytics from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, expenseResponse, "ExpenseHandler::GetExpenseAnalytics")
+}

internal/handler/ingredient_unit_converter_handler.go

@@ -275,4 +275,3 @@ func (h *IngredientUnitConverterHandler) GetUnitsByIngredientID(c *gin.Context)
 
 	util.HandleResponse(c.Writer, c.Request, unitsResponse, "IngredientUnitConverterHandler::GetUnitsByIngredientID")
 }
-

internal/handler/product_recipe_handler.go

@@ -219,4 +219,4 @@ func (h *ProductRecipeHandler) BulkCreate(c *gin.Context) {
 	}
 
 	c.JSON(http.StatusCreated, contract.BuildSuccessResponse(recipes))
-}
+}

internal/handler/purchase_category_handler.go

@@ -0,0 +1,160 @@
+package handler
+
+import (
+	"strconv"
+
+	"apskel-pos-be/internal/appcontext"
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/service"
+	"apskel-pos-be/internal/util"
+	"apskel-pos-be/internal/validator"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type PurchaseCategoryHandler struct {
+	purchaseCategoryService   service.PurchaseCategoryService
+	purchaseCategoryValidator validator.PurchaseCategoryValidator
+}
+
+func NewPurchaseCategoryHandler(purchaseCategoryService service.PurchaseCategoryService, purchaseCategoryValidator validator.PurchaseCategoryValidator) *PurchaseCategoryHandler {
+	return &PurchaseCategoryHandler{
+		purchaseCategoryService:   purchaseCategoryService,
+		purchaseCategoryValidator: purchaseCategoryValidator,
+	}
+}
+
+func (h *PurchaseCategoryHandler) CreatePurchaseCategory(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.CreatePurchaseCategoryRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("PurchaseCategoryHandler::CreatePurchaseCategory -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::CreatePurchaseCategory")
+		return
+	}
+
+	if validationError, validationErrorCode := h.purchaseCategoryValidator.ValidateCreatePurchaseCategoryRequest(&req); validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::CreatePurchaseCategory")
+		return
+	}
+
+	response := h.purchaseCategoryService.CreatePurchaseCategory(ctx, contextInfo, &req)
+	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::CreatePurchaseCategory")
+}
+
+func (h *PurchaseCategoryHandler) UpdatePurchaseCategory(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	categoryID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid purchase category ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::UpdatePurchaseCategory")
+		return
+	}
+
+	var req contract.UpdatePurchaseCategoryRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("PurchaseCategoryHandler::UpdatePurchaseCategory -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::UpdatePurchaseCategory")
+		return
+	}
+
+	if validationError, validationErrorCode := h.purchaseCategoryValidator.ValidateUpdatePurchaseCategoryRequest(&req); validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::UpdatePurchaseCategory")
+		return
+	}
+
+	response := h.purchaseCategoryService.UpdatePurchaseCategory(ctx, contextInfo, categoryID, &req)
+	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::UpdatePurchaseCategory")
+}
+
+func (h *PurchaseCategoryHandler) DeletePurchaseCategory(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	categoryID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid purchase category ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::DeletePurchaseCategory")
+		return
+	}
+
+	response := h.purchaseCategoryService.DeletePurchaseCategory(ctx, contextInfo, categoryID)
+	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::DeletePurchaseCategory")
+}
+
+func (h *PurchaseCategoryHandler) GetPurchaseCategory(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	categoryID, err := uuid.Parse(c.Param("id"))
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid purchase category ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::GetPurchaseCategory")
+		return
+	}
+
+	response := h.purchaseCategoryService.GetPurchaseCategoryByID(ctx, contextInfo, categoryID)
+	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::GetPurchaseCategory")
+}
+
+func (h *PurchaseCategoryHandler) ListPurchaseCategories(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	req := &contract.ListPurchaseCategoriesRequest{
+		Page:  1,
+		Limit: 100,
+	}
+
+	if pageStr := c.Query("page"); pageStr != "" {
+		if page, err := strconv.Atoi(pageStr); err == nil {
+			req.Page = page
+		}
+	}
+
+	if limitStr := c.Query("limit"); limitStr != "" {
+		if limit, err := strconv.Atoi(limitStr); err == nil {
+			req.Limit = limit
+		}
+	}
+
+	if parentIDStr := c.Query("parent_id"); parentIDStr != "" {
+		if parentID, err := uuid.Parse(parentIDStr); err == nil {
+			req.ParentID = &parentID
+		}
+	}
+
+	if categoryType := c.Query("type"); categoryType != "" {
+		req.Type = categoryType
+	}
+
+	if search := c.Query("search"); search != "" {
+		req.Search = search
+	}
+
+	if isActiveStr := c.Query("is_active"); isActiveStr != "" {
+		if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
+			req.IsActive = &isActive
+		}
+	}
+
+	if validationError, validationErrorCode := h.purchaseCategoryValidator.ValidateListPurchaseCategoriesRequest(req); validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "PurchaseCategoryHandler::ListPurchaseCategories")
+		return
+	}
+
+	response := h.purchaseCategoryService.ListPurchaseCategories(ctx, contextInfo, req)
+	util.HandleResponse(c.Writer, c.Request, response, "PurchaseCategoryHandler::ListPurchaseCategories")
+}

internal/handler/purchase_order_handler.go

@@ -176,6 +176,20 @@ func (h *PurchaseOrderHandler) ListPurchaseOrders(c *gin.Context) {
 		}
 	}
 
+	if team := c.Query("team"); team != "" {
+		req.Team = team
+	}
+
+	if teamScope := c.Query("team_scope"); teamScope != "" {
+		req.TeamScope = teamScope
+	}
+
+	if teamCategoryIDStr := c.Query("team_category_id"); teamCategoryIDStr != "" {
+		if teamCategoryID, err := uuid.Parse(teamCategoryIDStr); err == nil {
+			req.TeamCategoryID = &teamCategoryID
+		}
+	}
+
 	if startDateStr := c.Query("start_date"); startDateStr != "" {
 		if startDate, err := time.Parse("2006-01-02", startDateStr); err == nil {
 			req.StartDate = &startDate
@@ -224,6 +238,21 @@ func (h *PurchaseOrderHandler) GetPurchaseOrdersByStatus(c *gin.Context) {
 	util.HandleResponse(c.Writer, c.Request, poResponse, "PurchaseOrderHandler::GetPurchaseOrdersByStatus")
 }
 
+// ListPurchaseTeams serves the team picker for the purchase form: the parent
+// categories of the caller's outlet, plus Pusat.
+func (h *PurchaseOrderHandler) ListPurchaseTeams(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	teamsResponse := h.purchaseOrderService.ListPurchaseTeams(ctx, contextInfo)
+	if teamsResponse.HasErrors() {
+		errorResp := teamsResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("PurchaseOrderHandler::ListPurchaseTeams -> Failed to list purchase teams from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, teamsResponse, "PurchaseOrderHandler::ListPurchaseTeams")
+}
+
 func (h *PurchaseOrderHandler) GetOverduePurchaseOrders(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)

internal/handler/report_handler.go

@@ -66,3 +66,35 @@ 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/cash_advance_mapper.go

@@ -0,0 +1,128 @@
+package mappers
+
+import (
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+)
+
+// Amounts are money rounded to two decimals, so anything under half a cent apart
+// is the same figure. Comparing them directly would leave an advance a hundredth of
+// a rupiah short of settled.
+const cashAdvanceAmountEpsilon = 0.005
+
+// cashAdvanceTeamFromEntity renders the team an advance was handed to. Unlike a
+// purchase order there is always one, so this never returns nil. The category name
+// is only filled in when TeamCategory was preloaded.
+func cashAdvanceTeamFromEntity(entity *entities.CashAdvance) *models.PurchaseTeam {
+	team := &models.PurchaseTeam{Scope: entity.TeamScope}
+
+	switch entity.TeamScope {
+	case constants.PurchaseTeamScopeCentral:
+		team.Name = constants.PurchaseTeamCentralName
+	case constants.PurchaseTeamScopeCategory:
+		team.CategoryID = entity.TeamCategoryID
+		if entity.TeamCategory != nil {
+			team.Name = entity.TeamCategory.Name
+		}
+	}
+
+	return team
+}
+
+// cashAdvanceSettlementStatus reads the money rather than any stored flag: cash is
+// accounted for by spending charged to the advance plus what was handed back. A
+// team that overspent still counts as settled — the excess is owed back to them.
+func cashAdvanceSettlementStatus(amount, settled, returned float64) string {
+	accounted := settled + returned
+
+	switch {
+	case accounted <= cashAdvanceAmountEpsilon:
+		return constants.CashAdvanceSettlementOpen
+	case amount-accounted > cashAdvanceAmountEpsilon:
+		return constants.CashAdvanceSettlementPartial
+	default:
+		return constants.CashAdvanceSettlementSettled
+	}
+}
+
+func CashAdvanceEntityToModel(entity *entities.CashAdvance) *models.CashAdvance {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.CashAdvance{
+		ID:             entity.ID,
+		OrganizationID: entity.OrganizationID,
+		OutletID:       entity.OutletID,
+		CodeNumber:     entity.CodeNumber,
+		TeamScope:      entity.TeamScope,
+		TeamCategoryID: entity.TeamCategoryID,
+		Amount:         entity.Amount,
+		ReturnedAmount: entity.ReturnedAmount,
+		IssuedDate:     entity.IssuedDate,
+		DueDate:        entity.DueDate,
+		Status:         entity.Status,
+		Description:    entity.Description,
+		CreatedAt:      entity.CreatedAt,
+		UpdatedAt:      entity.UpdatedAt,
+	}
+}
+
+func CashAdvanceEntityToResponse(entity *entities.CashAdvance) *models.CashAdvanceResponse {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.CashAdvanceResponse{
+		ID:               entity.ID,
+		OrganizationID:   entity.OrganizationID,
+		OutletID:         entity.OutletID,
+		CodeNumber:       entity.CodeNumber,
+		TeamScope:        entity.TeamScope,
+		TeamCategoryID:   entity.TeamCategoryID,
+		Amount:           entity.Amount,
+		SettledAmount:    entity.SettledAmount,
+		ReturnedAmount:   entity.ReturnedAmount,
+		RemainingAmount:  entity.Amount - entity.SettledAmount - entity.ReturnedAmount,
+		SettlementStatus: cashAdvanceSettlementStatus(entity.Amount, entity.SettledAmount, entity.ReturnedAmount),
+		IssuedDate:       entity.IssuedDate,
+		DueDate:          entity.DueDate,
+		Status:           entity.Status,
+		Description:      entity.Description,
+		CreatedAt:        entity.CreatedAt,
+		UpdatedAt:        entity.UpdatedAt,
+		Team:             cashAdvanceTeamFromEntity(entity),
+	}
+}
+
+func CashAdvanceEntitiesToResponses(entities []*entities.CashAdvance) []*models.CashAdvanceResponse {
+	if entities == nil {
+		return nil
+	}
+
+	responses := make([]*models.CashAdvanceResponse, len(entities))
+	for i, entity := range entities {
+		responses[i] = CashAdvanceEntityToResponse(entity)
+	}
+	return responses
+}
+
+func CashAdvanceSettlementEntitiesToModels(settlements []*entities.CashAdvanceSettlement) []models.CashAdvanceSettlement {
+	if settlements == nil {
+		return nil
+	}
+
+	result := make([]models.CashAdvanceSettlement, len(settlements))
+	for i, settlement := range settlements {
+		result[i] = models.CashAdvanceSettlement{
+			Type:   settlement.Type,
+			ID:     settlement.ID,
+			Number: settlement.Number,
+			Date:   settlement.Date,
+			Amount: settlement.Amount,
+			Status: settlement.Status,
+		}
+	}
+	return result
+}

internal/mappers/cash_advance_mapper_test.go

@@ -0,0 +1,101 @@
+package mappers
+
+import (
+	"testing"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCashAdvanceSettlementStatusFollowsTheMoney(t *testing.T) {
+	tests := []struct {
+		name              string
+		amount            float64
+		settled           float64
+		returned          float64
+		expectedStatus    string
+		expectedRemaining float64
+	}{
+		{
+			name:              "nothing spent or returned is still open",
+			amount:            500000,
+			expectedStatus:    constants.CashAdvanceSettlementOpen,
+			expectedRemaining: 500000,
+		},
+		{
+			name:              "some spending leaves it partial",
+			amount:            500000,
+			settled:           200000,
+			expectedStatus:    constants.CashAdvanceSettlementPartial,
+			expectedRemaining: 300000,
+		},
+		{
+			name:              "cash handed back counts the same as spending",
+			amount:            500000,
+			settled:           300000,
+			returned:          100000,
+			expectedStatus:    constants.CashAdvanceSettlementPartial,
+			expectedRemaining: 100000,
+		},
+		{
+			name:              "spending plus cash back covering the advance settles it",
+			amount:            500000,
+			settled:           420000,
+			returned:          80000,
+			expectedStatus:    constants.CashAdvanceSettlementSettled,
+			expectedRemaining: 0,
+		},
+		{
+			// The team paid the difference out of pocket, so the outlet owes them.
+			name:              "overspending settles the cash advance and goes negative",
+			amount:            500000,
+			settled:           620000,
+			expectedStatus:    constants.CashAdvanceSettlementSettled,
+			expectedRemaining: -120000,
+		},
+		{
+			// Two decimals of money should not leave a cash advance a fraction short.
+			name:              "a rounding crumb short still settles",
+			amount:            100000,
+			settled:           99999.999,
+			expectedStatus:    constants.CashAdvanceSettlementSettled,
+			expectedRemaining: 0.001,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			response := CashAdvanceEntityToResponse(&entities.CashAdvance{
+				ID:             uuid.New(),
+				TeamScope:      constants.PurchaseTeamScopeCentral,
+				Amount:         tt.amount,
+				SettledAmount:  tt.settled,
+				ReturnedAmount: tt.returned,
+			})
+
+			require.Equal(t, tt.expectedStatus, response.SettlementStatus)
+			require.InDelta(t, tt.expectedRemaining, response.RemainingAmount, 0.0001)
+		})
+	}
+}
+
+func TestCashAdvanceTeamAlwaysRendered(t *testing.T) {
+	categoryID := uuid.New()
+
+	central := CashAdvanceEntityToResponse(&entities.CashAdvance{TeamScope: constants.PurchaseTeamScopeCentral})
+	require.NotNil(t, central.Team)
+	require.Equal(t, constants.PurchaseTeamCentralName, central.Team.Name)
+	require.Nil(t, central.Team.CategoryID)
+
+	category := CashAdvanceEntityToResponse(&entities.CashAdvance{
+		TeamScope:      constants.PurchaseTeamScopeCategory,
+		TeamCategoryID: &categoryID,
+		TeamCategory:   &entities.Category{ID: categoryID, Name: "Dapur"},
+	})
+	require.NotNil(t, category.Team)
+	require.Equal(t, "Dapur", category.Team.Name)
+	require.Equal(t, &categoryID, category.Team.CategoryID)
+}

internal/mappers/category_mapper.go

@@ -61,6 +61,7 @@ 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,
@@ -85,10 +86,19 @@ 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,
@@ -127,6 +137,10 @@ 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

@@ -14,10 +14,10 @@ func ExpenseEntityToModel(entity *entities.Expense) *models.Expense {
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
 		OutletID:        entity.OutletID,
-		ExpenseName:     entity.ExpenseName,
 		Receiver:        entity.Receiver,
 		TransactionDate: entity.TransactionDate,
 		CodeNumber:      entity.CodeNumber,
+		Status:          entity.Status,
 		Description:     entity.Description,
 		Tax:             entity.Tax,
 		Total:           entity.Total,
@@ -36,10 +36,10 @@ func ExpenseModelToEntity(model *models.Expense) *entities.Expense {
 		ID:              model.ID,
 		OrganizationID:  model.OrganizationID,
 		OutletID:        model.OutletID,
-		ExpenseName:     model.ExpenseName,
 		Receiver:        model.Receiver,
 		TransactionDate: model.TransactionDate,
 		CodeNumber:      model.CodeNumber,
+		Status:          model.Status,
 		Description:     model.Description,
 		Tax:             model.Tax,
 		Total:           model.Total,
@@ -58,14 +58,15 @@ func ExpenseEntityToResponse(entity *entities.Expense) *models.ExpenseResponse {
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
 		OutletID:        entity.OutletID,
-		ExpenseName:     entity.ExpenseName,
 		Receiver:        entity.Receiver,
 		TransactionDate: entity.TransactionDate,
 		CodeNumber:      entity.CodeNumber,
+		Status:          entity.Status,
 		Description:     entity.Description,
 		Tax:             entity.Tax,
 		Total:           entity.Total,
 		Reserved1:       entity.Reserved1,
+		CashAdvanceID:   entity.CashAdvanceID,
 		CreatedAt:       entity.CreatedAt,
 		UpdatedAt:       entity.UpdatedAt,
 	}
@@ -95,19 +96,27 @@ func ExpenseItemEntityToResponse(entity *entities.ExpenseItem) *models.ExpenseIt
 	}
 
 	response := &models.ExpenseItemResponse{
-		ID:               entity.ID,
-		ExpenseID:        entity.ExpenseID,
-		ChartOfAccountID: entity.ChartOfAccountID,
-		Description:      entity.Description,
-		Amount:           entity.Amount,
-		CreatedAt:        entity.CreatedAt,
-		UpdatedAt:        entity.UpdatedAt,
+		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,
 	}
 
 	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/order_mapper.go

@@ -82,7 +82,7 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
 		}
 
 		for i, item := range order.OrderItems {
-			resp := OrderItemEntityToResponse(&item)
+			resp := OrderItemEntityToResponse(&item, order.OutletID)
 			if resp != nil {
 				resp.PaidQuantity = paidQtyByOrderItem[item.ID]
 				response.OrderItems[i] = *resp
@@ -101,11 +101,20 @@ func OrderEntityToResponse(order *entities.Order) *models.OrderResponse {
 	return response
 }
 
-func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemResponse {
+func OrderItemEntityToResponse(item *entities.OrderItem, outletID uuid.UUID) *models.OrderItemResponse {
 	if item == nil {
 		return nil
 	}
 
+	// Resolve print_to_checker from preloaded outlet prices
+	printToChecker := true // default
+	for _, op := range item.Product.ProductOutletPrices {
+		if op.OutletID == outletID {
+			printToChecker = op.PrintToChecker
+			break
+		}
+	}
+
 	response := &models.OrderItemResponse{
 		ID:                  item.ID,
 		OrderID:             item.OrderID,
@@ -130,10 +139,19 @@ func OrderItemEntityToResponse(item *entities.OrderItem) *models.OrderItemRespon
 		CreatedAt:           item.CreatedAt,
 		UpdatedAt:           item.UpdatedAt,
 		PrinterType:         item.Product.PrinterType,
+		PrintToChecker:      printToChecker,
 	}
 
 	if item.Product.ID != uuid.Nil {
 		response.ProductName = item.Product.Name
+		if item.Product.CategoryID != uuid.Nil {
+			categoryID := item.Product.CategoryID
+			response.CategoryID = &categoryID
+		}
+		if item.Product.Category.ID != uuid.Nil {
+			categoryName := item.Product.Category.Name
+			response.CategoryName = &categoryName
+		}
 	}
 
 	if item.ProductVariant != nil {
@@ -316,14 +334,14 @@ func OrderEntitiesToResponses(orders []*entities.Order) []models.OrderResponse {
 	return responses
 }
 
-func OrderItemEntitiesToResponses(items []*entities.OrderItem) []models.OrderItemResponse {
+func OrderItemEntitiesToResponses(items []*entities.OrderItem, outletID uuid.UUID) []models.OrderItemResponse {
 	if items == nil {
 		return nil
 	}
 
 	responses := make([]models.OrderItemResponse, len(items))
 	for i, item := range items {
-		response := OrderItemEntityToResponse(item)
+		response := OrderItemEntityToResponse(item, outletID)
 		if response != nil {
 			responses[i] = *response
 		}

internal/mappers/order_mapper_test.go

@@ -45,7 +45,7 @@ func TestOrderItemEntityToResponse_WithProductNames(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem)
+	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
 
 	// Assert
 	assert.NotNil(t, result)
@@ -89,7 +89,7 @@ func TestOrderItemEntityToResponse_WithoutProductVariant(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem)
+	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
 
 	// Assert
 	assert.NotNil(t, result)
@@ -129,7 +129,7 @@ func TestOrderItemEntityToResponse_WithoutProductPreload(t *testing.T) {
 	}
 
 	// Act
-	result := OrderItemEntityToResponse(orderItem)
+	result := OrderItemEntityToResponse(orderItem, uuid.Nil)
 
 	// Assert
 	assert.NotNil(t, result)

internal/mappers/product_ingredient_mapper.go

@@ -11,17 +11,17 @@ func MapProductIngredientEntityToModel(entity *entities.ProductIngredient) *mode
 	}
 
 	return &models.ProductIngredient{
-		ID:               entity.ID,
-		OrganizationID:   entity.OrganizationID,
-		OutletID:         entity.OutletID,
-		ProductID:        entity.ProductID,
-		IngredientID:     entity.IngredientID,
-		Quantity:         entity.Quantity,
-		WastePercentage:  entity.WastePercentage,
-		CreatedAt:        entity.CreatedAt,
-		UpdatedAt:        entity.UpdatedAt,
-		Product:          ProductEntityToModel(entity.Product),
-		Ingredient:       MapIngredientEntityToModel(entity.Ingredient),
+		ID:              entity.ID,
+		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
+		ProductID:       entity.ProductID,
+		IngredientID:    entity.IngredientID,
+		Quantity:        entity.Quantity,
+		WastePercentage: entity.WastePercentage,
+		CreatedAt:       entity.CreatedAt,
+		UpdatedAt:       entity.UpdatedAt,
+		Product:         ProductEntityToModel(entity.Product),
+		Ingredient:      MapIngredientEntityToModel(entity.Ingredient),
 	}
 }
 
@@ -31,17 +31,17 @@ func MapProductIngredientModelToEntity(model *models.ProductIngredient) *entitie
 	}
 
 	return &entities.ProductIngredient{
-		ID:               model.ID,
-		OrganizationID:   model.OrganizationID,
-		OutletID:         model.OutletID,
-		ProductID:        model.ProductID,
-		IngredientID:     model.IngredientID,
-		Quantity:         model.Quantity,
-		WastePercentage:  model.WastePercentage,
-		CreatedAt:        model.CreatedAt,
-		UpdatedAt:        model.UpdatedAt,
-		Product:          ProductModelToEntity(model.Product),
-		Ingredient:       MapIngredientModelToEntity(model.Ingredient),
+		ID:              model.ID,
+		OrganizationID:  model.OrganizationID,
+		OutletID:        model.OutletID,
+		ProductID:       model.ProductID,
+		IngredientID:    model.IngredientID,
+		Quantity:        model.Quantity,
+		WastePercentage: model.WastePercentage,
+		CreatedAt:       model.CreatedAt,
+		UpdatedAt:       model.UpdatedAt,
+		Product:         ProductModelToEntity(model.Product),
+		Ingredient:      MapIngredientModelToEntity(model.Ingredient),
 	}
 }
 

internal/mappers/product_outlet_price_mapper.go

@@ -11,12 +11,13 @@ func ProductOutletPriceEntityToModel(entity *entities.ProductOutletPrice) *model
 	}
 
 	return &models.ProductOutletPrice{
-		ID:        entity.ID,
-		ProductID: entity.ProductID,
-		OutletID:  entity.OutletID,
-		Price:     entity.Price,
-		CreatedAt: entity.CreatedAt,
-		UpdatedAt: entity.UpdatedAt,
+		ID:             entity.ID,
+		ProductID:      entity.ProductID,
+		OutletID:       entity.OutletID,
+		Price:          entity.Price,
+		PrintToChecker: entity.PrintToChecker,
+		CreatedAt:      entity.CreatedAt,
+		UpdatedAt:      entity.UpdatedAt,
 	}
 }
 
@@ -26,12 +27,13 @@ func ProductOutletPriceModelToEntity(model *models.ProductOutletPrice) *entities
 	}
 
 	return &entities.ProductOutletPrice{
-		ID:        model.ID,
-		ProductID: model.ProductID,
-		OutletID:  model.OutletID,
-		Price:     model.Price,
-		CreatedAt: model.CreatedAt,
-		UpdatedAt: model.UpdatedAt,
+		ID:             model.ID,
+		ProductID:      model.ProductID,
+		OutletID:       model.OutletID,
+		Price:          model.Price,
+		PrintToChecker: model.PrintToChecker,
+		CreatedAt:      model.CreatedAt,
+		UpdatedAt:      model.UpdatedAt,
 	}
 }
 

internal/mappers/purchase_category_mapper.go

@@ -0,0 +1,53 @@
+package mappers
+
+import (
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+)
+
+func CreatePurchaseCategoryRequestToEntity(req *models.CreatePurchaseCategoryRequest) *entities.PurchaseCategory {
+	if req == nil {
+		return nil
+	}
+
+	return &entities.PurchaseCategory{
+		OrganizationID: req.OrganizationID,
+		ParentID:       req.ParentID,
+		Name:           req.Name,
+		Type:           entities.PurchaseCategoryType(req.Type),
+		SortOrder:      req.SortOrder,
+		IsActive:       req.IsActive,
+	}
+}
+
+func PurchaseCategoryEntityToResponse(entity *entities.PurchaseCategory) *models.PurchaseCategoryResponse {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.PurchaseCategoryResponse{
+		ID:             entity.ID,
+		OrganizationID: entity.OrganizationID,
+		PresetID:       entity.PresetID,
+		ParentID:       entity.ParentID,
+		Code:           entity.Code,
+		Name:           entity.Name,
+		Type:           string(entity.Type),
+		SortOrder:      entity.SortOrder,
+		IsSystem:       entity.IsSystem,
+		IsActive:       entity.IsActive,
+		CreatedAt:      entity.CreatedAt,
+		UpdatedAt:      entity.UpdatedAt,
+	}
+}
+
+func PurchaseCategoryEntitiesToResponses(categoryEntities []*entities.PurchaseCategory) []models.PurchaseCategoryResponse {
+	responses := make([]models.PurchaseCategoryResponse, len(categoryEntities))
+	for i, entity := range categoryEntities {
+		response := PurchaseCategoryEntityToResponse(entity)
+		if response != nil {
+			responses[i] = *response
+		}
+	}
+	return responses
+}

internal/mappers/purchase_order_mapper.go

@@ -1,10 +1,33 @@
 package mappers
 
 import (
+	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 )
 
+// purchaseTeamFromEntity renders the team a purchase order is charged to. It returns
+// nil when no team was chosen, which is distinct from a purchase charged to Pusat.
+// The category name is only filled in when TeamCategory was preloaded.
+func purchaseTeamFromEntity(entity *entities.PurchaseOrder) *models.PurchaseTeam {
+	if entity.TeamScope == nil {
+		return nil
+	}
+
+	team := &models.PurchaseTeam{Scope: *entity.TeamScope}
+	switch *entity.TeamScope {
+	case constants.PurchaseTeamScopeCentral:
+		team.Name = constants.PurchaseTeamCentralName
+	case constants.PurchaseTeamScopeCategory:
+		team.CategoryID = entity.TeamCategoryID
+		if entity.TeamCategory != nil {
+			team.Name = entity.TeamCategory.Name
+		}
+	}
+
+	return team
+}
+
 func PurchaseOrderEntityToModel(entity *entities.PurchaseOrder) *models.PurchaseOrder {
 	if entity == nil {
 		return nil
@@ -13,6 +36,7 @@ func PurchaseOrderEntityToModel(entity *entities.PurchaseOrder) *models.Purchase
 	return &models.PurchaseOrder{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -21,6 +45,9 @@ func PurchaseOrderEntityToModel(entity *entities.PurchaseOrder) *models.Purchase
 		Status:          entity.Status,
 		Message:         entity.Message,
 		TotalAmount:     entity.TotalAmount,
+		TeamScope:       entity.TeamScope,
+		TeamCategoryID:  entity.TeamCategoryID,
+		CashAdvanceID:   entity.CashAdvanceID,
 		CreatedAt:       entity.CreatedAt,
 		UpdatedAt:       entity.UpdatedAt,
 	}
@@ -34,6 +61,7 @@ func PurchaseOrderModelToEntity(model *models.PurchaseOrder) *entities.PurchaseO
 	return &entities.PurchaseOrder{
 		ID:              model.ID,
 		OrganizationID:  model.OrganizationID,
+		OutletID:        model.OutletID,
 		VendorID:        model.VendorID,
 		PONumber:        model.PONumber,
 		TransactionDate: model.TransactionDate,
@@ -42,6 +70,9 @@ func PurchaseOrderModelToEntity(model *models.PurchaseOrder) *entities.PurchaseO
 		Status:          model.Status,
 		Message:         model.Message,
 		TotalAmount:     model.TotalAmount,
+		TeamScope:       model.TeamScope,
+		TeamCategoryID:  model.TeamCategoryID,
+		CashAdvanceID:   model.CashAdvanceID,
 		CreatedAt:       model.CreatedAt,
 		UpdatedAt:       model.UpdatedAt,
 	}
@@ -55,6 +86,7 @@ func PurchaseOrderEntityToResponse(entity *entities.PurchaseOrder) *models.Purch
 	response := &models.PurchaseOrderResponse{
 		ID:              entity.ID,
 		OrganizationID:  entity.OrganizationID,
+		OutletID:        entity.OutletID,
 		VendorID:        entity.VendorID,
 		PONumber:        entity.PONumber,
 		TransactionDate: entity.TransactionDate,
@@ -63,8 +95,12 @@ func PurchaseOrderEntityToResponse(entity *entities.PurchaseOrder) *models.Purch
 		Status:          entity.Status,
 		Message:         entity.Message,
 		TotalAmount:     entity.TotalAmount,
+		TeamScope:       entity.TeamScope,
+		TeamCategoryID:  entity.TeamCategoryID,
+		CashAdvanceID:   entity.CashAdvanceID,
 		CreatedAt:       entity.CreatedAt,
 		UpdatedAt:       entity.UpdatedAt,
+		Team:            purchaseTeamFromEntity(entity),
 	}
 
 	// Map vendor if present
@@ -91,15 +127,16 @@ func PurchaseOrderItemEntityToModel(entity *entities.PurchaseOrderItem) *models.
 	}
 
 	return &models.PurchaseOrderItem{
-		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,
+		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,
 	}
 }
 
@@ -109,15 +146,16 @@ func PurchaseOrderItemModelToEntity(model *models.PurchaseOrderItem) *entities.P
 	}
 
 	return &entities.PurchaseOrderItem{
-		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,
+		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,
 	}
 }
 
@@ -127,15 +165,16 @@ func PurchaseOrderItemEntityToResponse(entity *entities.PurchaseOrderItem) *mode
 	}
 
 	response := &models.PurchaseOrderItemResponse{
-		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,
+		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,
 	}
 
 	// Map ingredient if present
@@ -146,6 +185,10 @@ 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,7 +82,11 @@ func (m *AuthMiddleware) RequireRole(allowedRoles ...string) gin.HandlerFunc {
 }
 
 func (m *AuthMiddleware) RequireAdminOrManager() gin.HandlerFunc {
-	return m.RequireRole("superadmin", "admin", "manager")
+	return m.RequireRole("superadmin", "admin", "manager", "owner",  "purchasing")
+}
+
+func (m *AuthMiddleware) RequireAdminOrManagerOrPurchasing() gin.HandlerFunc {
+	return m.RequireRole("superadmin", "admin", "manager", "owner", "purchasing")
 }
 
 func (m *AuthMiddleware) RequireAdmin() gin.HandlerFunc {

internal/middleware/idempotency.go

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

internal/models/account.go

@@ -25,12 +25,12 @@ type AccountResponse struct {
 }
 
 type CreateAccountRequest struct {
-	ChartOfAccountID uuid.UUID  `json:"chart_of_account_id" validate:"required"`
-	Name             string     `json:"name" validate:"required,min=1,max=255"`
-	Number           string     `json:"number" validate:"required,min=1,max=50"`
-	AccountType      string     `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
-	OpeningBalance   float64    `json:"opening_balance"`
-	Description      *string    `json:"description"`
+	ChartOfAccountID uuid.UUID `json:"chart_of_account_id" validate:"required"`
+	Name             string    `json:"name" validate:"required,min=1,max=255"`
+	Number           string    `json:"number" validate:"required,min=1,max=50"`
+	AccountType      string    `json:"account_type" validate:"required,oneof=cash wallet bank credit debit asset liability equity revenue expense"`
+	OpeningBalance   float64   `json:"opening_balance"`
+	Description      *string   `json:"description"`
 }
 
 type UpdateAccountRequest struct {

internal/models/analytics.go

@@ -1,8 +1,12 @@
 package models
 
 import (
+	"fmt"
 	"time"
 
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/entities"
+
 	"github.com/google/uuid"
 )
 
@@ -19,6 +23,7 @@ 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"`
@@ -58,6 +63,7 @@ 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"`
@@ -91,9 +97,34 @@ type SalesAnalyticsData struct {
 type PurchasingAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
-	DateFrom       time.Time  `validate:"required"`
-	DateTo         time.Time  `validate:"required"`
-	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
+	// Team is the raw value the team picker sends: a parent category id,
+	// "central" for Pusat, "none" for purchases with no team, or empty for all.
+	Team     string
+	DateFrom time.Time `validate:"required"`
+	DateTo   time.Time `validate:"required"`
+	GroupBy  string    `validate:"omitempty,oneof=day hour week month"`
+}
+
+// ParsePurchaseTeamFilter turns the team value the picker sends into the scope and
+// category the purchasing queries filter on. An empty value spans every team; an
+// unknown one is an error rather than a report that quietly ignores the filter.
+func ParsePurchaseTeamFilter(team string) (*entities.PurchaseTeamFilter, error) {
+	switch team {
+	case "":
+		return nil, nil
+	case constants.PurchaseTeamScopeCentral, constants.PurchaseTeamNone:
+		return &entities.PurchaseTeamFilter{Scope: team}, nil
+	}
+
+	categoryID, err := uuid.Parse(team)
+	if err != nil || categoryID == uuid.Nil {
+		return nil, fmt.Errorf("team must be one of: central, none, or a category id")
+	}
+
+	return &entities.PurchaseTeamFilter{
+		Scope:      constants.PurchaseTeamScopeCategory,
+		CategoryID: &categoryID,
+	}, nil
 }
 
 // PurchasingAnalyticsResponse represents the response for purchasing analytics
@@ -101,6 +132,7 @@ type PurchasingAnalyticsResponse struct {
 	OrganizationID uuid.UUID                  `json:"organization_id"`
 	OutletID       *uuid.UUID                 `json:"outlet_id,omitempty"`
 	OutletName     *string                    `json:"outlet_name,omitempty"`
+	Team           string                     `json:"team,omitempty"`
 	DateFrom       time.Time                  `json:"date_from"`
 	DateTo         time.Time                  `json:"date_to"`
 	GroupBy        string                     `json:"group_by"`
@@ -108,26 +140,49 @@ type PurchasingAnalyticsResponse struct {
 	Data           []PurchasingAnalyticsData  `json:"data"`
 	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
 	VendorData     []PurchasingVendorData     `json:"vendor_data"`
+	TeamData       []PurchasingTeamData       `json:"team_data"`
+}
+
+// PurchasingTeamData represents purchasing analytics for a single team
+type PurchasingTeamData struct {
+	Scope                string     `json:"scope"`
+	CategoryID           *uuid.UUID `json:"category_id"`
+	Name                 string     `json:"name"`
+	TotalPurchases       float64    `json:"total_purchases"`
+	RawMaterialPurchases float64    `json:"raw_material_purchases"`
+	ExpensePurchases     float64    `json:"expense_purchases"`
+	PurchaseOrderCount   int64      `json:"purchase_order_count"`
+	Quantity             float64    `json:"quantity"`
+	Percentage           float64    `json:"percentage"`
 }
 
 // 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"`
 	TotalVendors              int64   `json:"total_vendors"`
+	TotalTeams                int64   `json:"total_teams"`
 }
 
 // PurchasingAnalyticsData represents purchasing analytics by time period
 type PurchasingAnalyticsData struct {
-	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"`
+	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"`
 }
 
 // PurchasingIngredientData represents purchasing analytics for an ingredient
@@ -142,12 +197,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
@@ -163,6 +218,7 @@ 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"`
@@ -172,6 +228,7 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -199,6 +256,7 @@ 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"`
@@ -216,6 +274,135 @@ 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"`
@@ -228,6 +415,7 @@ 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"`
@@ -238,29 +426,100 @@ 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"`
+	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"`
 }
 
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
-	Date           time.Time  `validate:"required"`
+	DateFrom       time.Time  `validate:"required"`
+	DateTo         time.Time  `validate:"required"`
+	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
 }
 
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
-	Date                     time.Time                `json:"date"`
+	OutletName               *string                  `json:"outlet_name,omitempty"`
+	DateFrom                 time.Time                `json:"date_from"`
+	DateTo                   time.Time                `json:"date_to"`
+	GroupBy                  string                   `json:"group_by"`
+	Summary                  ProfitLossSummary        `json:"summary"`
+	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"`
+	GrossProfit        float64 `json:"gross_profit"`
+	GrossProfitMargin  float64 `json:"gross_profit_margin"`
+	TotalTax           float64 `json:"total_tax"`
+	TotalDiscount      float64 `json:"total_discount"`
+	NetProfit          float64 `json:"net_profit"`
+	NetProfitMargin    float64 `json:"net_profit_margin"`
+	TotalOrders        int64   `json:"total_orders"`
+	AverageProfit      float64 `json:"average_profit"`
+	ProfitabilityRatio float64 `json:"profitability_ratio"`
+}
+
+type ProfitLossData struct {
+	Date              time.Time `json:"date"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	Tax               float64   `json:"tax"`
+	Discount          float64   `json:"discount"`
+	NetProfit         float64   `json:"net_profit"`
+	NetProfitMargin   float64   `json:"net_profit_margin"`
+	Orders            int64     `json:"orders"`
+}
+
+type ProductProfitData struct {
+	ProductID         uuid.UUID `json:"product_id"`
+	ProductName       string    `json:"product_name"`
+	CategoryID        uuid.UUID `json:"category_id"`
+	CategoryName      string    `json:"category_name"`
+	QuantitySold      int64     `json:"quantity_sold"`
+	Revenue           float64   `json:"revenue"`
+	Cost              float64   `json:"cost"`
+	GrossProfit       float64   `json:"gross_profit"`
+	GrossProfitMargin float64   `json:"gross_profit_margin"`
+	AveragePrice      float64   `json:"average_price"`
+	AverageCost       float64   `json:"average_cost"`
+	ProfitPerUnit     float64   `json:"profit_per_unit"`
+}
+
 type ProfitLossSummaryRow struct {
 	ID           string                 `json:"id"`
 	Label        string                 `json:"label"`
@@ -276,3 +535,123 @@ 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/cash_advance.go

@@ -0,0 +1,104 @@
+package models
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type CashAdvance struct {
+	ID             uuid.UUID  `json:"id"`
+	OrganizationID uuid.UUID  `json:"organization_id"`
+	OutletID       uuid.UUID  `json:"outlet_id"`
+	CodeNumber     string     `json:"code_number"`
+	TeamScope      string     `json:"team_scope"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id"`
+	Amount         float64    `json:"amount"`
+	ReturnedAmount float64    `json:"returned_amount"`
+	IssuedDate     time.Time  `json:"issued_date"`
+	DueDate        *time.Time `json:"due_date"`
+	Status         string     `json:"status"`
+	Description    *string    `json:"description"`
+	CreatedAt      time.Time  `json:"created_at"`
+	UpdatedAt      time.Time  `json:"updated_at"`
+}
+
+type CashAdvanceResponse struct {
+	ID             uuid.UUID  `json:"id"`
+	OrganizationID uuid.UUID  `json:"organization_id"`
+	OutletID       uuid.UUID  `json:"outlet_id"`
+	CodeNumber     string     `json:"code_number"`
+	TeamScope      string     `json:"team_scope"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id"`
+	Amount         float64    `json:"amount"`
+	// SettledAmount is the spending charged to this advance, ReturnedAmount the cash
+	// handed back, and RemainingAmount what is still out with the team. A negative
+	// remaining amount means the team overspent and is owed the difference.
+	SettledAmount    float64                 `json:"settled_amount"`
+	ReturnedAmount   float64                 `json:"returned_amount"`
+	RemainingAmount  float64                 `json:"remaining_amount"`
+	SettlementStatus string                  `json:"settlement_status"`
+	IssuedDate       time.Time               `json:"issued_date"`
+	DueDate          *time.Time              `json:"due_date"`
+	Status           string                  `json:"status"`
+	Description      *string                 `json:"description"`
+	CreatedAt        time.Time               `json:"created_at"`
+	UpdatedAt        time.Time               `json:"updated_at"`
+	Team             *PurchaseTeam           `json:"team,omitempty"`
+	Settlements      []CashAdvanceSettlement `json:"settlements,omitempty"`
+}
+
+// CashAdvanceSettlement is one purchase order or expense paid out of the advance.
+type CashAdvanceSettlement struct {
+	Type   string    `json:"type"`
+	ID     uuid.UUID `json:"id"`
+	Number string    `json:"number"`
+	Date   time.Time `json:"date"`
+	Amount float64   `json:"amount"`
+	Status string    `json:"status"`
+}
+
+type CreateCashAdvanceRequest struct {
+	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
+	CodeNumber     string     `json:"code_number"`
+	TeamScope      string     `json:"team_scope"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty"`
+	Amount         float64    `json:"amount"`
+	IssuedDate     time.Time  `json:"issued_date"`
+	DueDate        *time.Time `json:"due_date,omitempty"`
+	Status         *string    `json:"status,omitempty"`
+	Description    *string    `json:"description,omitempty"`
+}
+
+type UpdateCashAdvanceRequest struct {
+	CodeNumber     *string    `json:"code_number,omitempty"`
+	TeamScope      *string    `json:"team_scope,omitempty"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty"`
+	Amount         *float64   `json:"amount,omitempty"`
+	ReturnedAmount *float64   `json:"returned_amount,omitempty"`
+	IssuedDate     *time.Time `json:"issued_date,omitempty"`
+	DueDate        *time.Time `json:"due_date,omitempty"`
+	Status         *string    `json:"status,omitempty"`
+	Description    *string    `json:"description,omitempty"`
+}
+
+type ListCashAdvancesRequest struct {
+	Page             int        `json:"page"`
+	Limit            int        `json:"limit"`
+	Search           string     `json:"search,omitempty"`
+	Status           string     `json:"status,omitempty"`
+	SettlementStatus string     `json:"settlement_status,omitempty"`
+	Team             string     `json:"team,omitempty"`
+	TeamScope        string     `json:"team_scope,omitempty"`
+	TeamCategoryID   *uuid.UUID `json:"team_category_id,omitempty"`
+	StartDate        *time.Time `json:"start_date,omitempty"`
+	EndDate          *time.Time `json:"end_date,omitempty"`
+}
+
+type ListCashAdvancesResponse struct {
+	CashAdvances []CashAdvanceResponse `json:"cash_advances"`
+	TotalCount   int                   `json:"total_count"`
+	Page         int                   `json:"page"`
+	Limit        int                   `json:"limit"`
+	TotalPages   int                   `json:"total_pages"`
+}

internal/models/category.go

@@ -22,6 +22,7 @@ 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"`
@@ -33,6 +34,7 @@ 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
 }
@@ -41,6 +43,8 @@ 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/customer.go

@@ -23,17 +23,17 @@ type UpdateCustomerRequest struct {
 }
 
 type CustomerResponse struct {
-	ID             uuid.UUID `json:"id"`
-	OrganizationID uuid.UUID `json:"organization_id"`
-	Name           string    `json:"name"`
-	Email          *string   `json:"email,omitempty"`
-	Phone          *string   `json:"phone,omitempty"`
-	Address        *string   `json:"address,omitempty"`
-	IsDefault      bool      `json:"is_default"`
-	IsActive       bool      `json:"is_active"`
-	Metadata       entities.Metadata  `json:"metadata"`
-	CreatedAt      time.Time `json:"created_at"`
-	UpdatedAt      time.Time `json:"updated_at"`
+	ID             uuid.UUID         `json:"id"`
+	OrganizationID uuid.UUID         `json:"organization_id"`
+	Name           string            `json:"name"`
+	Email          *string           `json:"email,omitempty"`
+	Phone          *string           `json:"phone,omitempty"`
+	Address        *string           `json:"address,omitempty"`
+	IsDefault      bool              `json:"is_default"`
+	IsActive       bool              `json:"is_active"`
+	Metadata       entities.Metadata `json:"metadata"`
+	CreatedAt      time.Time         `json:"created_at"`
+	UpdatedAt      time.Time         `json:"updated_at"`
 }
 
 // ListCustomersQuery represents query parameters for listing customers

internal/models/expense.go

@@ -10,10 +10,10 @@ type Expense struct {
 	ID              uuid.UUID `json:"id"`
 	OrganizationID  uuid.UUID `json:"organization_id"`
 	OutletID        uuid.UUID `json:"outlet_id"`
-	ExpenseName     string    `json:"expense_name"`
 	Receiver        string    `json:"receiver"`
 	TransactionDate time.Time `json:"transaction_date"`
 	CodeNumber      string    `json:"code_number"`
+	Status          string    `json:"status"`
 	Description     *string   `json:"description"`
 	Tax             float64   `json:"tax"`
 	Total           float64   `json:"total"`
@@ -23,84 +23,102 @@ 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"`
-	Description      *string   `json:"description"`
-	Amount           float64   `json:"amount"`
-	CreatedAt        time.Time `json:"created_at"`
-	UpdatedAt        time.Time `json:"updated_at"`
-}
-
-type ExpenseResponse struct {
-	ID              uuid.UUID             `json:"id"`
-	OrganizationID  uuid.UUID             `json:"organization_id"`
-	OutletID        uuid.UUID             `json:"outlet_id"`
-	ExpenseName     string                `json:"expense_name"`
-	Receiver        string                `json:"receiver"`
-	TransactionDate time.Time             `json:"transaction_date"`
-	CodeNumber      string                `json:"code_number"`
-	Description     *string               `json:"description"`
-	Tax             float64               `json:"tax"`
-	Total           float64               `json:"total"`
-	Reserved1       *string               `json:"reserved1"`
-	CreatedAt       time.Time             `json:"created_at"`
-	UpdatedAt       time.Time             `json:"updated_at"`
-	Items           []ExpenseItemResponse `json:"items,omitempty"`
-}
-
-type ExpenseItemResponse struct {
 	ID                 uuid.UUID `json:"id"`
 	ExpenseID          uuid.UUID `json:"expense_id"`
 	ChartOfAccountID   uuid.UUID `json:"chart_of_account_id"`
-	ChartOfAccountName string    `json:"chart_of_account_name,omitempty"`
+	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"`
 }
 
+type ExpenseResponse struct {
+	ID              uuid.UUID             `json:"id"`
+	OrganizationID  uuid.UUID             `json:"organization_id"`
+	OutletID        uuid.UUID             `json:"outlet_id"`
+	Receiver        string                `json:"receiver"`
+	TransactionDate time.Time             `json:"transaction_date"`
+	CodeNumber      string                `json:"code_number"`
+	Status          string                `json:"status"`
+	Description     *string               `json:"description"`
+	Tax             float64               `json:"tax"`
+	Total           float64               `json:"total"`
+	Reserved1       *string               `json:"reserved1"`
+	CashAdvanceID   *uuid.UUID            `json:"cash_advance_id"`
+	CreatedAt       time.Time             `json:"created_at"`
+	UpdatedAt       time.Time             `json:"updated_at"`
+	Items           []ExpenseItemResponse `json:"items,omitempty"`
+}
+
+type ExpenseItemResponse struct {
+	ID                   uuid.UUID                 `json:"id"`
+	ExpenseID            uuid.UUID                 `json:"expense_id"`
+	ChartOfAccountID     uuid.UUID                 `json:"chart_of_account_id"`
+	ChartOfAccountName   string                    `json:"chart_of_account_name,omitempty"`
+	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"`
+}
+
 type CreateExpenseRequest struct {
-	ExpenseName     string                     `json:"expense_name"`
 	Receiver        string                     `json:"receiver"`
 	TransactionDate string                     `json:"transaction_date"`
 	CodeNumber      string                     `json:"code_number"`
 	OutletID        string                     `json:"outlet_id"`
+	Status          *string                    `json:"status,omitempty"`
 	Description     *string                    `json:"description"`
 	Tax             float64                    `json:"tax"`
 	Total           float64                    `json:"total"`
+	CashAdvanceID   *string                    `json:"cash_advance_id,omitempty"`
 	Items           []CreateExpenseItemRequest `json:"items"`
 }
 
 type CreateExpenseItemRequest struct {
-	ChartOfAccountID string  `json:"chart_of_account_id"`
-	Description      *string `json:"description,omitempty"`
-	Amount           float64 `json:"amount"`
+	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"`
 }
 
 type UpdateExpenseRequest struct {
-	ExpenseName     *string                    `json:"expense_name,omitempty"`
 	Receiver        *string                    `json:"receiver,omitempty"`
 	TransactionDate *string                    `json:"transaction_date,omitempty"`
 	CodeNumber      *string                    `json:"code_number,omitempty"`
 	OutletID        *string                    `json:"outlet_id,omitempty"`
+	Status          *string                    `json:"status,omitempty"`
 	Description     *string                    `json:"description,omitempty"`
 	Tax             *float64                   `json:"tax,omitempty"`
 	Total           *float64                   `json:"total,omitempty"`
 	Reserved1       *string                    `json:"reserved1,omitempty"`
+	CashAdvanceID   *string                    `json:"cash_advance_id,omitempty"`
 	Items           []UpdateExpenseItemRequest `json:"items,omitempty"`
 }
 
 type UpdateExpenseItemRequest struct {
-	ChartOfAccountID *string  `json:"chart_of_account_id,omitempty"`
-	Description      *string  `json:"description,omitempty"`
-	Amount           *float64 `json:"amount,omitempty"`
+	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"`
 }
 
 type ListExpenseRequest struct {
-	Page   int    `json:"page"`
-	Limit  int    `json:"limit"`
-	Search string `json:"search,omitempty"`
+	Page      int    `json:"page"`
+	Limit     int    `json:"limit"`
+	Search    string `json:"search,omitempty"`
+	OutletID  string `json:"outlet_id,omitempty"`
+	Status    string `json:"status,omitempty"`
+	StartDate string `json:"start_date,omitempty"`
+	EndDate   string `json:"end_date,omitempty"`
 }
 
 type ListExpenseResponse struct {
@@ -110,3 +128,66 @@ type ListExpenseResponse struct {
 	Limit      int                `json:"limit"`
 	TotalPages int                `json:"total_pages"`
 }
+
+type ExpenseAnalyticsRequest 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"`
+}
+
+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"`
+}
+
+type ExpenseAnalyticsSummary struct {
+	TotalExpenses       float64 `json:"total_expenses"`
+	TotalExpenseCount   int64   `json:"total_expense_count"`
+	TotalTax            float64 `json:"total_tax"`
+	AverageExpenseValue float64 `json:"average_expense_value"`
+	TotalCategories     int64   `json:"total_categories"`
+	TotalItems          int64   `json:"total_items"`
+}
+
+type ExpenseAnalyticsData struct {
+	Date         time.Time `json:"date"`
+	Expenses     float64   `json:"expenses"`
+	ExpenseCount int64     `json:"expense_count"`
+	Tax          float64   `json:"tax"`
+	Items        int64     `json:"items"`
+	Categories   int64     `json:"categories"`
+}
+
+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"`
+	ExpenseCount       int64     `json:"expense_count"`
+	ItemCount          int64     `json:"item_count"`
+}
+
+type ExpenseAnalyticsItemData struct {
+	Item         string  `json:"item"`
+	TotalAmount  float64 `json:"total_amount"`
+	ExpenseCount int64   `json:"expense_count"`
+	ItemCount    int64   `json:"item_count"`
+}

internal/models/ingredient.go

@@ -12,7 +12,7 @@ type Ingredient struct {
 	OrganizationID uuid.UUID         `json:"organization_id"`
 	OutletID       *uuid.UUID        `json:"outlet_id"`
 	Name           string            `json:"name"`
-	UnitID         uuid.UUID         `json:"unit_id"`
+	UnitID         *uuid.UUID        `json:"unit_id"`
 	Cost           float64           `json:"cost"`
 	Stock          float64           `json:"stock"`
 	IsSemiFinished bool              `json:"is_semi_finished"`
@@ -29,7 +29,7 @@ type CreateIngredientRequest struct {
 	OrganizationID uuid.UUID                `json:"organization_id"`
 	OutletID       *uuid.UUID               `json:"outlet_id"`
 	Name           string                   `json:"name" validate:"required,min=1,max=255"`
-	UnitID         uuid.UUID                `json:"unit_id" validate:"required"`
+	UnitID         *uuid.UUID               `json:"unit_id" validate:"omitempty"`
 	Cost           float64                  `json:"cost" validate:"min=0"`
 	Stock          float64                  `json:"stock" validate:"min=0"`
 	IsSemiFinished bool                     `json:"is_semi_finished"`
@@ -48,7 +48,7 @@ type CompositionItemRequest struct {
 type UpdateIngredientRequest struct {
 	OutletID       *uuid.UUID        `json:"outlet_id"`
 	Name           string            `json:"name" validate:"required,min=1,max=255"`
-	UnitID         uuid.UUID         `json:"unit_id" validate:"required"`
+	UnitID         *uuid.UUID        `json:"unit_id" validate:"omitempty"`
 	Cost           float64           `json:"cost" validate:"min=0"`
 	Stock          float64           `json:"stock" validate:"min=0"`
 	IsSemiFinished bool              `json:"is_semi_finished"`
@@ -61,7 +61,7 @@ type IngredientResponse struct {
 	OrganizationID uuid.UUID                        `json:"organization_id"`
 	OutletID       *uuid.UUID                       `json:"outlet_id"`
 	Name           string                           `json:"name"`
-	UnitID         uuid.UUID                        `json:"unit_id"`
+	UnitID         *uuid.UUID                       `json:"unit_id"`
 	Cost           float64                          `json:"cost"`
 	Stock          float64                          `json:"stock"`
 	IsSemiFinished bool                             `json:"is_semi_finished"`

internal/models/ingredient_unit_converter.go

@@ -97,8 +97,7 @@ type ListIngredientUnitConvertersResponse struct {
 type IngredientUnitsResponse struct {
 	IngredientID   uuid.UUID       `json:"ingredient_id"`
 	IngredientName string          `json:"ingredient_name"`
-	BaseUnitID     uuid.UUID       `json:"base_unit_id"`
+	BaseUnitID     *uuid.UUID      `json:"base_unit_id"`
 	BaseUnitName   string          `json:"base_unit_name"`
 	Units          []*UnitResponse `json:"units"`
 }
-

internal/models/order.go

@@ -188,6 +188,8 @@ type OrderItemResponse struct {
 	ProductName         string
 	ProductVariantID    *uuid.UUID
 	ProductVariantName  *string
+	CategoryID          *uuid.UUID
+	CategoryName        *string
 	Quantity            int
 	UnitPrice           float64
 	TotalPrice          float64
@@ -207,6 +209,7 @@ type OrderItemResponse struct {
 	CreatedAt           time.Time
 	UpdatedAt           time.Time
 	PrinterType         string
+	PrintToChecker      bool
 	PaidQuantity        int
 }
 

internal/models/order_ingredient_transaction.go

@@ -52,8 +52,8 @@ type UpdateOrderIngredientTransactionRequest struct {
 	GrossQty        *float64   `json:"gross_qty,omitempty" validate:"omitempty,gt=0"`
 	NetQty          *float64   `json:"net_qty,omitempty" validate:"omitempty,gt=0"`
 	WasteQty        *float64   `json:"waste_qty,omitempty" validate:"min=0"`
-	Unit             *string   `json:"unit,omitempty" validate:"omitempty,max=50"`
-	TransactionDate  *time.Time `json:"transaction_date,omitempty"`
+	Unit            *string    `json:"unit,omitempty" validate:"omitempty,max=50"`
+	TransactionDate *time.Time `json:"transaction_date,omitempty"`
 }
 
 type OrderIngredientTransactionResponse struct {
@@ -98,11 +98,11 @@ type ListOrderIngredientTransactionsRequest struct {
 }
 
 type OrderIngredientTransactionSummary struct {
-	IngredientID     uuid.UUID `json:"ingredient_id"`
-	IngredientName   string    `json:"ingredient_name"`
-	TotalGrossQty    float64   `json:"total_gross_qty"`
-	TotalNetQty      float64   `json:"total_net_qty"`
-	TotalWasteQty    float64   `json:"total_waste_qty"`
-	WastePercentage  float64   `json:"waste_percentage"`
-	Unit             string    `json:"unit"`
+	IngredientID    uuid.UUID `json:"ingredient_id"`
+	IngredientName  string    `json:"ingredient_name"`
+	TotalGrossQty   float64   `json:"total_gross_qty"`
+	TotalNetQty     float64   `json:"total_net_qty"`
+	TotalWasteQty   float64   `json:"total_waste_qty"`
+	WastePercentage float64   `json:"waste_percentage"`
+	Unit            string    `json:"unit"`
 }

internal/models/product.go

@@ -50,6 +50,7 @@ type CreateProductRequest struct {
 	BusinessType   constants.BusinessType `validate:"required"`
 	ImageURL       *string                `validate:"omitempty,max=500"`
 	PrinterType    *string                `validate:"omitempty,max=50"`
+	PrintToChecker *bool                  `validate:"omitempty"`
 	UnitID         *uuid.UUID             `validate:"omitempty"`
 	HasIngredients bool                   `validate:"omitempty"`
 	Metadata       map[string]interface{}
@@ -70,6 +71,7 @@ type UpdateProductRequest struct {
 	Cost           *float64   `validate:"omitempty,min=0"`
 	ImageURL       *string    `validate:"omitempty,max=500"`
 	PrinterType    *string    `validate:"omitempty,max=50"`
+	PrintToChecker *bool      `validate:"omitempty"`
 	UnitID         *uuid.UUID `validate:"omitempty"`
 	HasIngredients *bool      `validate:"omitempty"`
 	Metadata       map[string]interface{}
@@ -108,6 +110,7 @@ type ProductResponse struct {
 	BusinessType   constants.BusinessType
 	ImageURL       *string
 	PrinterType    string
+	PrintToChecker bool
 	UnitID         *uuid.UUID
 	HasIngredients bool
 	Metadata       map[string]interface{}
@@ -118,9 +121,10 @@ type ProductResponse struct {
 }
 
 type OutletPrice struct {
-	OutletID   uuid.UUID
-	OutletName string
-	Price      float64
+	OutletID       uuid.UUID
+	OutletName     string
+	Price          float64
+	PrintToChecker bool
 }
 
 type ProductVariantResponse struct {

internal/models/product_ingredient.go

@@ -7,15 +7,15 @@ import (
 )
 
 type ProductIngredient struct {
-	ID               uuid.UUID  `json:"id"`
-	OrganizationID   uuid.UUID  `json:"organization_id"`
-	OutletID         *uuid.UUID `json:"outlet_id"`
-	ProductID        uuid.UUID  `json:"product_id"`
-	IngredientID     uuid.UUID  `json:"ingredient_id"`
-	Quantity         float64    `json:"quantity"`
-	WastePercentage  float64    `json:"waste_percentage"`
-	CreatedAt        time.Time  `json:"created_at"`
-	UpdatedAt        time.Time  `json:"updated_at"`
+	ID              uuid.UUID  `json:"id"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
+	OutletID        *uuid.UUID `json:"outlet_id"`
+	ProductID       uuid.UUID  `json:"product_id"`
+	IngredientID    uuid.UUID  `json:"ingredient_id"`
+	Quantity        float64    `json:"quantity"`
+	WastePercentage float64    `json:"waste_percentage"`
+	CreatedAt       time.Time  `json:"created_at"`
+	UpdatedAt       time.Time  `json:"updated_at"`
 
 	// Relations
 	Product    *Product    `json:"product,omitempty"`
@@ -37,15 +37,15 @@ type UpdateProductIngredientRequest struct {
 }
 
 type ProductIngredientResponse struct {
-	ID               uuid.UUID  `json:"id"`
-	OrganizationID   uuid.UUID  `json:"organization_id"`
-	OutletID         *uuid.UUID `json:"outlet_id"`
-	ProductID        uuid.UUID  `json:"product_id"`
-	IngredientID     uuid.UUID  `json:"ingredient_id"`
-	Quantity         float64    `json:"quantity"`
-	WastePercentage  float64    `json:"waste_percentage"`
-	CreatedAt        time.Time  `json:"created_at"`
-	UpdatedAt        time.Time  `json:"updated_at"`
+	ID              uuid.UUID  `json:"id"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
+	OutletID        *uuid.UUID `json:"outlet_id"`
+	ProductID       uuid.UUID  `json:"product_id"`
+	IngredientID    uuid.UUID  `json:"ingredient_id"`
+	Quantity        float64    `json:"quantity"`
+	WastePercentage float64    `json:"waste_percentage"`
+	CreatedAt       time.Time  `json:"created_at"`
+	UpdatedAt       time.Time  `json:"updated_at"`
 
 	// Relations
 	Product    *Product    `json:"product,omitempty"`

internal/models/product_outlet_price.go

@@ -7,22 +7,25 @@ import (
 )
 
 type ProductOutletPrice struct {
-	ID        uuid.UUID
-	ProductID uuid.UUID
-	OutletID  uuid.UUID
-	Price     float64
-	CreatedAt time.Time
-	UpdatedAt time.Time
+	ID             uuid.UUID
+	ProductID      uuid.UUID
+	OutletID       uuid.UUID
+	Price          float64
+	PrintToChecker bool
+	CreatedAt      time.Time
+	UpdatedAt      time.Time
 }
 
 type CreateProductOutletPriceRequest struct {
-	ProductID uuid.UUID `validate:"required"`
-	OutletID  uuid.UUID `validate:"required"`
-	Price     float64   `validate:"required,min=0"`
+	ProductID      uuid.UUID `validate:"required"`
+	OutletID       uuid.UUID `validate:"required"`
+	Price          float64   `validate:"required,min=0"`
+	PrintToChecker bool
 }
 
 type UpdateProductOutletPriceRequest struct {
-	Price *float64 `validate:"required,min=0"`
+	Price          *float64 `validate:"required,min=0"`
+	PrintToChecker *bool
 }
 
 type ProductOutletPriceResponse struct {

internal/models/product_recipe.go

@@ -56,4 +56,4 @@ type ProductRecipeResponse struct {
 	Product        *Product        `json:"product,omitempty"`
 	ProductVariant *ProductVariant `json:"product_variant,omitempty"`
 	Ingredient     *Ingredient     `json:"ingredient,omitempty"`
-}
+}

internal/models/purchase_category.go

@@ -0,0 +1,51 @@
+package models
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type PurchaseCategoryResponse struct {
+	ID             uuid.UUID
+	OrganizationID uuid.UUID
+	PresetID       *uuid.UUID
+	ParentID       *uuid.UUID
+	Code           string
+	Name           string
+	Type           string
+	SortOrder      int
+	IsSystem       bool
+	IsActive       bool
+	CreatedAt      time.Time
+	UpdatedAt      time.Time
+}
+
+type CreatePurchaseCategoryRequest struct {
+	OrganizationID uuid.UUID
+	ParentID       *uuid.UUID
+	Code           *string
+	Name           string
+	Type           string
+	SortOrder      int
+	IsActive       bool
+}
+
+type UpdatePurchaseCategoryRequest struct {
+	ParentID  *uuid.UUID
+	Code      *string
+	Name      *string
+	Type      *string
+	SortOrder *int
+	IsActive  *bool
+}
+
+type ListPurchaseCategoriesRequest struct {
+	OrganizationID uuid.UUID
+	ParentID       *uuid.UUID
+	Type           string
+	Search         string
+	IsActive       *bool
+	Page           int
+	Limit          int
+}

internal/models/purchase_order.go

@@ -7,30 +7,43 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `json:"id"`
-	OrganizationID  uuid.UUID `json:"organization_id"`
-	VendorID        uuid.UUID `json:"vendor_id"`
-	PONumber        string    `json:"po_number"`
-	TransactionDate time.Time `json:"transaction_date"`
-	DueDate         time.Time `json:"due_date"`
-	Reference       *string   `json:"reference"`
-	Status          string    `json:"status"`
-	Message         *string   `json:"message"`
-	TotalAmount     float64   `json:"total_amount"`
-	CreatedAt       time.Time `json:"created_at"`
-	UpdatedAt       time.Time `json:"updated_at"`
+	ID              uuid.UUID  `json:"id"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
+	OutletID        *uuid.UUID `json:"outlet_id"`
+	VendorID        *uuid.UUID `json:"vendor_id"`
+	PONumber        string     `json:"po_number"`
+	TransactionDate time.Time  `json:"transaction_date"`
+	DueDate         *time.Time `json:"due_date"`
+	Reference       *string    `json:"reference"`
+	Status          string     `json:"status"`
+	Message         *string    `json:"message"`
+	TotalAmount     float64    `json:"total_amount"`
+	TeamScope       *string    `json:"team_scope"`
+	TeamCategoryID  *uuid.UUID `json:"team_category_id"`
+	CashAdvanceID   *uuid.UUID `json:"cash_advance_id"`
+	CreatedAt       time.Time  `json:"created_at"`
+	UpdatedAt       time.Time  `json:"updated_at"`
+}
+
+// PurchaseTeam is one entry of the team picker: either a parent category or Pusat.
+// Pusat carries no CategoryID because it has no category of its own.
+type PurchaseTeam struct {
+	Scope      string     `json:"scope"`
+	CategoryID *uuid.UUID `json:"category_id"`
+	Name       string     `json:"name"`
 }
 
 type PurchaseOrderItem struct {
-	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"`
+	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"`
 }
 
 type PurchaseOrderAttachment struct {
@@ -43,33 +56,40 @@ type PurchaseOrderAttachment struct {
 type PurchaseOrderResponse struct {
 	ID              uuid.UUID                         `json:"id"`
 	OrganizationID  uuid.UUID                         `json:"organization_id"`
-	VendorID        uuid.UUID                         `json:"vendor_id"`
+	OutletID        *uuid.UUID                        `json:"outlet_id"`
+	VendorID        *uuid.UUID                        `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
 	TotalAmount     float64                           `json:"total_amount"`
+	TeamScope       *string                           `json:"team_scope"`
+	TeamCategoryID  *uuid.UUID                        `json:"team_category_id"`
+	CashAdvanceID   *uuid.UUID                        `json:"cash_advance_id"`
 	CreatedAt       time.Time                         `json:"created_at"`
 	UpdatedAt       time.Time                         `json:"updated_at"`
+	Team            *PurchaseTeam                     `json:"team,omitempty"`
 	Vendor          *VendorResponse                   `json:"vendor,omitempty"`
 	Items           []PurchaseOrderItemResponse       `json:"items,omitempty"`
 	Attachments     []PurchaseOrderAttachmentResponse `json:"attachments,omitempty"`
 }
 
 type PurchaseOrderItemResponse struct {
-	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"`
+	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"`
 }
 
 type PurchaseOrderAttachmentResponse struct {
@@ -81,23 +101,28 @@ type PurchaseOrderAttachmentResponse struct {
 }
 
 type CreatePurchaseOrderRequest struct {
-	VendorID          uuid.UUID                        `json:"vendor_id"`
+	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty"`
+	OutletID          *uuid.UUID                       `json:"outlet_id,omitempty"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
-	DueDate           time.Time                        `json:"due_date"`
+	DueDate           *time.Time                       `json:"due_date,omitempty"`
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`
+	TeamScope         *string                          `json:"team_scope,omitempty"`
+	TeamCategoryID    *uuid.UUID                       `json:"team_category_id,omitempty"`
+	CashAdvanceID     *uuid.UUID                       `json:"cash_advance_id,omitempty"`
 	Items             []CreatePurchaseOrderItemRequest `json:"items"`
 	AttachmentFileIDs []uuid.UUID                      `json:"attachment_file_ids,omitempty"`
 }
 
 type CreatePurchaseOrderItemRequest struct {
-	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"`
+	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"`
 }
 
 type UpdatePurchaseOrderRequest struct {
@@ -108,27 +133,38 @@ type UpdatePurchaseOrderRequest struct {
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`
+	TeamScope         *string                          `json:"team_scope,omitempty"`
+	TeamCategoryID    *uuid.UUID                       `json:"team_category_id,omitempty"`
+	CashAdvanceID     *uuid.UUID                       `json:"cash_advance_id,omitempty"`
 	Items             []UpdatePurchaseOrderItemRequest `json:"items,omitempty"`
 	AttachmentFileIDs []uuid.UUID                      `json:"attachment_file_ids,omitempty"`
 }
 
 type UpdatePurchaseOrderItemRequest struct {
-	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"`
+	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"`
 }
 
 type ListPurchaseOrdersRequest struct {
-	Page      int        `json:"page" validate:"min=1"`
-	Limit     int        `json:"limit" validate:"min=1,max=100"`
-	Search    string     `json:"search,omitempty"`
-	Status    string     `json:"status,omitempty"`
-	VendorID  *uuid.UUID `json:"vendor_id,omitempty"`
-	StartDate *time.Time `json:"start_date,omitempty"`
-	EndDate   *time.Time `json:"end_date,omitempty"`
+	Page           int        `json:"page" validate:"min=1"`
+	Limit          int        `json:"limit" validate:"min=1,max=100"`
+	Search         string     `json:"search,omitempty"`
+	Status         string     `json:"status,omitempty"`
+	VendorID       *uuid.UUID `json:"vendor_id,omitempty"`
+	Team           string     `json:"team,omitempty"`
+	TeamScope      string     `json:"team_scope,omitempty"`
+	TeamCategoryID *uuid.UUID `json:"team_category_id,omitempty"`
+	StartDate      *time.Time `json:"start_date,omitempty"`
+	EndDate        *time.Time `json:"end_date,omitempty"`
+}
+
+type ListPurchaseTeamsResponse struct {
+	Teams []PurchaseTeam `json:"teams"`
 }
 
 type ListPurchaseOrdersResponse struct {

internal/models/user.go

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

internal/processor/analytics_processor.go

@@ -6,9 +6,12 @@ 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 {
@@ -17,8 +20,13 @@ 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 {
@@ -33,6 +41,18 @@ 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")
@@ -87,6 +107,7 @@ 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,
@@ -161,6 +182,7 @@ 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,
@@ -178,7 +200,12 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 		req.GroupBy = "day"
 	}
 
-	result, err := p.analyticsRepo.GetPurchasingAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
+	teamFilter, err := models.ParsePurchaseTeamFilter(req.Team)
+	if err != nil {
+		return nil, err
+	}
+
+	result, err := p.analyticsRepo.GetPurchasingAnalytics(ctx, req.OrganizationID, req.OutletID, teamFilter, req.DateFrom, req.DateTo, req.GroupBy)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get purchasing analytics: %w", err)
 	}
@@ -186,12 +213,16 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 	data := make([]models.PurchasingAnalyticsData, len(result.Data))
 	for i, item := range result.Data {
 		data[i] = models.PurchasingAnalyticsData{
-			Date:           item.Date,
-			Purchases:      item.Purchases,
-			PurchaseOrders: item.PurchaseOrders,
-			Quantity:       item.Quantity,
-			Ingredients:    item.Ingredients,
-			Vendors:        item.Vendors,
+			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,
 		}
 	}
 
@@ -219,24 +250,46 @@ func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req
 		}
 	}
 
+	teamData := make([]models.PurchasingTeamData, len(result.TeamData))
+	for i, item := range result.TeamData {
+		teamData[i] = models.PurchasingTeamData{
+			Scope:                item.Scope,
+			CategoryID:           item.CategoryID,
+			Name:                 item.Name,
+			TotalPurchases:       item.TotalPurchases,
+			RawMaterialPurchases: item.RawMaterialPurchases,
+			ExpensePurchases:     item.ExpensePurchases,
+			PurchaseOrderCount:   item.PurchaseOrderCount,
+			Quantity:             item.Quantity,
+			Percentage:           item.Percentage,
+		}
+	}
+
 	return &models.PurchasingAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
 		OutletName:     result.OutletName,
+		Team:           req.Team,
 		DateFrom:       req.DateFrom,
 		DateTo:         req.DateTo,
 		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,
 			TotalVendors:              result.Summary.TotalVendors,
+			TotalTeams:                result.Summary.TotalTeams,
 		},
 		Data:           data,
 		IngredientData: ingredientData,
 		VendorData:     vendorData,
+		TeamData:       teamData,
 	}, nil
 }
 
@@ -264,6 +317,7 @@ func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *m
 			ProductID:               data.ProductID,
 			ProductName:             data.ProductName,
 			ProductSku:              data.ProductSku,
+			ProductPrice:            data.ProductPrice,
 			CategoryID:              data.CategoryID,
 			CategoryName:            data.CategoryName,
 			CategoryOrder:           data.CategoryOrder,
@@ -283,6 +337,7 @@ 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,
@@ -320,12 +375,249 @@ 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) {
@@ -381,15 +673,19 @@ 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,
+			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,
 		},
 		TopProducts:    topProducts.Data,
 		PaymentMethods: paymentMethods.Data,
@@ -398,24 +694,101 @@ func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req
 }
 
 func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
-	if req.Date.IsZero() {
-		return nil, fmt.Errorf("date is required")
+	if req.DateFrom.IsZero() {
+		return nil, fmt.Errorf("date_from is required")
 	}
 
-	result, err := p.analyticsRepo.GetProfitLossAnalytics(ctx, req.OrganizationID, req.OutletID, req.Date)
+	if req.DateTo.IsZero() {
+		return nil, fmt.Errorf("date_to is required")
+	}
+
+	if req.DateFrom.After(req.DateTo) {
+		return nil, fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	if req.GroupBy == "" {
+		req.GroupBy = "day"
+	}
+
+	result, err := p.analyticsRepo.GetProfitLossAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get profit/loss analytics: %w", err)
 	}
 
-	todayPromosi := getExpenseAmountByCategory(result.TodayExpenseByCategory, "promosi")
-	todayLainLain := getExpenseAmountByCategory(result.TodayExpenseByCategory, "lain")
-	todayTotalOps := todayPromosi + todayLainLain
-	todayGaji := getExpenseAmountByCategory(result.TodayExpenseByCategory, "gaji")
+	data := make([]models.ProfitLossData, len(result.Data))
+	for i, item := range result.Data {
+		data[i] = models.ProfitLossData{
+			Date:              item.Date,
+			Revenue:           item.Revenue,
+			Cost:              item.Cost,
+			GrossProfit:       item.GrossProfit,
+			GrossProfitMargin: item.GrossProfitMargin,
+			Tax:               item.Tax,
+			Discount:          item.Discount,
+			NetProfit:         item.NetProfit,
+			NetProfitMargin:   item.NetProfitMargin,
+			Orders:            item.Orders,
+		}
+	}
 
-	mtdPromosi := getExpenseAmountByCategory(result.MtdExpenseByCategory, "promosi")
-	mtdLainLain := getExpenseAmountByCategory(result.MtdExpenseByCategory, "lain")
-	mtdTotalOps := mtdPromosi + mtdLainLain
-	mtdGaji := getExpenseAmountByCategory(result.MtdExpenseByCategory, "gaji")
+	productData := make([]models.ProductProfitData, len(result.ProductData))
+	for i, item := range result.ProductData {
+		productData[i] = models.ProductProfitData{
+			ProductID:         item.ProductID,
+			ProductName:       item.ProductName,
+			CategoryID:        item.CategoryID,
+			CategoryName:      item.CategoryName,
+			QuantitySold:      item.QuantitySold,
+			Revenue:           item.Revenue,
+			Cost:              item.Cost,
+			GrossProfit:       item.GrossProfit,
+			GrossProfitMargin: item.GrossProfitMargin,
+			AveragePrice:      item.AveragePrice,
+			AverageCost:       item.AverageCost,
+			ProfitPerUnit:     item.ProfitPerUnit,
+		}
+	}
+
+	type categoryAmount struct {
+		Name     string
+		TodayAmt float64
+		MtdAmt   float64
+	}
+
+	categoryMap := make(map[string]*categoryAmount)
+	var categoryOrder []string
+
+	for _, cat := range result.TodayExpenseByCategory {
+		name := cat.CategoryName
+		if _, exists := categoryMap[name]; !exists {
+			categoryMap[name] = &categoryAmount{Name: name}
+			categoryOrder = append(categoryOrder, name)
+		}
+		categoryMap[name].TodayAmt = cat.Amount
+	}
+
+	for _, cat := range result.MtdExpenseByCategory {
+		name := cat.CategoryName
+		if _, exists := categoryMap[name]; !exists {
+			categoryMap[name] = &categoryAmount{Name: name}
+			categoryOrder = append(categoryOrder, name)
+		}
+		categoryMap[name].MtdAmt = cat.Amount
+	}
+
+	var todayTotalOps float64
+	var mtdTotalOps float64
+	var todayGaji float64
+	var mtdGaji float64
+	for _, cat := range categoryMap {
+		if isSalaryExpenseCategory(cat.Name) {
+			todayGaji += cat.TodayAmt
+			mtdGaji += cat.MtdAmt
+			continue
+		}
+		todayTotalOps += cat.TodayAmt
+		mtdTotalOps += cat.MtdAmt
+	}
 
 	todayGrossProfit := result.TodayRevenue - result.TodayCost
 	mtdGrossProfit := result.MtdRevenue - result.MtdCost
@@ -439,6 +812,33 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		return (nominal / result.MtdRevenue) * 100
 	}
 
+	opsSubItems := make([]models.ProfitLossSummaryRow, 0, len(categoryOrder)+1)
+	opsCategoryCount := 0
+	for _, name := range categoryOrder {
+		cat := categoryMap[name]
+		if isSalaryExpenseCategory(cat.Name) {
+			continue
+		}
+		opsCategoryCount++
+		opsSubItems = append(opsSubItems, models.ProfitLossSummaryRow{
+			ID:           fmt.Sprintf("by_%s", slugify(name)),
+			Label:        fmt.Sprintf("%d. %s", opsCategoryCount, cat.Name),
+			TodayNominal: cat.TodayAmt,
+			TodayPct:     todayPct(cat.TodayAmt),
+			MtdNominal:   cat.MtdAmt,
+			MtdPct:       mtdPct(cat.MtdAmt),
+		})
+	}
+	opsSubItems = append(opsSubItems, models.ProfitLossSummaryRow{
+		ID:           "total_biaya_ops",
+		Label:        fmt.Sprintf("Total Biaya OPS (%d kategori)", opsCategoryCount),
+		IsBold:       true,
+		TodayNominal: todayTotalOps,
+		TodayPct:     todayPct(todayTotalOps),
+		MtdNominal:   mtdTotalOps,
+		MtdPct:       mtdPct(mtdTotalOps),
+	})
+
 	mainSummary := []models.ProfitLossSummaryRow{
 		{
 			ID: "total_omset", Label: "TOTAL OMSET",
@@ -459,23 +859,7 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 			ID: "biaya_ops", Label: "BIAYA OPS",
 			TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
 			MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
-			SubItems: []models.ProfitLossSummaryRow{
-				{
-					ID: "by_promosi", Label: "1. By Promosi",
-					TodayNominal: todayPromosi, TodayPct: todayPct(todayPromosi),
-					MtdNominal: mtdPromosi, MtdPct: mtdPct(mtdPromosi),
-				},
-				{
-					ID: "by_lain_lain", Label: "2. By Lain lain",
-					TodayNominal: todayLainLain, TodayPct: todayPct(todayLainLain),
-					MtdNominal: mtdLainLain, MtdPct: mtdPct(mtdLainLain),
-				},
-				{
-					ID: "total_biaya_ops", Label: "Total Biaya OPS (4.1+4.2)", IsBold: true,
-					TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
-					MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
-				},
-			},
+			SubItems: opsSubItems,
 		},
 		{
 			ID: "laba_rugi_sblm_gaji", Label: "Laba/Rugi sblm Gaji (3-4)",
@@ -498,27 +882,357 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 	var opsTotal float64
 	for i, item := range result.OperationalExpenseItems {
 		opsItems[i] = models.OperationalExpenseItem{
-			Item:    item.Description,
+			Item:    item.Item,
 			Nominal: item.Amount,
 		}
 		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,
-		Date:                     req.Date,
-		MainSummary:              mainSummary,
+		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
+		OutletName:     p.resolveOutletName(ctx, req.OrganizationID, req.OutletID),
+		DateFrom:       req.DateFrom,
+		DateTo:         req.DateTo,
+		GroupBy:        req.GroupBy,
+		Summary: models.ProfitLossSummary{
+			TotalRevenue:       result.Summary.TotalRevenue,
+			TotalCost:          result.Summary.TotalCost,
+			GrossProfit:        result.Summary.GrossProfit,
+			GrossProfitMargin:  result.Summary.GrossProfitMargin,
+			TotalTax:           result.Summary.TotalTax,
+			TotalDiscount:      result.Summary.TotalDiscount,
+			NetProfit:          result.Summary.NetProfit,
+			NetProfitMargin:    result.Summary.NetProfitMargin,
+			TotalOrders:        result.Summary.TotalOrders,
+			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,
+		},
 		OperationalExpenses:      opsItems,
 		OperationalExpensesTotal: opsTotal,
 	}, nil
 }
 
-func getExpenseAmountByCategory(categories []entities.ExpenseCategoryTotal, keyword string) float64 {
-	for _, cat := range categories {
-		if strings.Contains(strings.ToLower(cat.CategoryName), keyword) {
-			return cat.Amount
+func isSalaryExpenseCategory(name string) bool {
+	name = strings.ToLower(name)
+	return strings.Contains(name, "gaji") || strings.Contains(name, "salary")
+}
+
+func slugify(s string) string {
+	result := make([]byte, 0, len(s))
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		switch {
+		case c >= 'a' && c <= 'z':
+			result = append(result, c)
+		case c >= 'A' && c <= 'Z':
+			result = append(result, c+32)
+		case c >= '0' && c <= '9':
+			result = append(result, c)
+		default:
+			if len(result) == 0 || result[len(result)-1] != '_' {
+				result = append(result, '_')
+			}
 		}
 	}
-	return 0
+	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

@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 
@@ -13,7 +14,16 @@ import (
 )
 
 type analyticsRepositoryStub struct {
-	purchasingResult *entities.PurchasingAnalytics
+	purchasingResult        *entities.PurchasingAnalytics
+	purchasingTeam          *entities.PurchaseTeamFilter
+	budgetCutOffWeeks       []*entities.BudgetCutOffWeek
+	profitLossResult        *entities.ProfitLossAnalytics
+	exclusiveSummaryResults []*entities.ExclusiveSummaryAnalytics
+	bankBalances            []entities.ExclusiveSummaryBankBalance
+	profitLossGroup         string
+	exclusiveSummaryCalls   int
+	exclusiveSummaryFrom    []time.Time
+	exclusiveSummaryTo      []time.Time
 }
 
 func (analyticsRepositoryStub) GetPaymentMethodAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time) ([]*entities.PaymentMethodAnalytics, error) {
@@ -24,7 +34,8 @@ func (analyticsRepositoryStub) GetSalesAnalytics(context.Context, uuid.UUID, *uu
 	return nil, nil
 }
 
-func (s analyticsRepositoryStub) GetPurchasingAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) (*entities.PurchasingAnalytics, error) {
+func (s *analyticsRepositoryStub) GetPurchasingAnalytics(_ context.Context, _ uuid.UUID, _ *uuid.UUID, team *entities.PurchaseTeamFilter, _, _ time.Time, _ string) (*entities.PurchasingAnalytics, error) {
+	s.purchasingTeam = team
 	return s.purchasingResult, nil
 }
 
@@ -36,12 +47,45 @@ 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
 }
 
-func (analyticsRepositoryStub) GetProfitLossAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time) (*entities.ProfitLossAnalytics, error) {
-	return nil, nil
+func (s analyticsRepositoryStub) GetProfitLossAnalytics(_ context.Context, _ uuid.UUID, _ *uuid.UUID, _, _ time.Time, groupBy string) (*entities.ProfitLossAnalytics, error) {
+	s.profitLossGroup = groupBy
+	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{}
@@ -58,6 +102,9 @@ func (expenseRepositoryStub) Delete(context.Context, uuid.UUID) error         {
 func (expenseRepositoryStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.Expense, int64, error) {
 	return nil, 0, nil
 }
+func (expenseRepositoryStub) GetAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) (*entities.ExpenseAnalytics, error) {
+	return nil, nil
+}
 func (expenseRepositoryStub) CreateItem(context.Context, *entities.ExpenseItem) error { return nil }
 func (expenseRepositoryStub) DeleteItemsByExpenseID(context.Context, uuid.UUID) error { return nil }
 
@@ -65,11 +112,27 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	outletID := uuid.New()
 	outletName := "Main Outlet"
 	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
-	processor := NewAnalyticsProcessorImpl(analyticsRepositoryStub{
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
 		purchasingResult: &entities.PurchasingAnalytics{
 			OutletName: &outletName,
 			Summary: entities.PurchasingSummary{
-				TotalPurchases: 125,
+				TotalPurchases:            300,
+				RawMaterialPurchases:      125,
+				ExpensePurchases:          175,
+				TotalPurchaseOrders:       3,
+				RawMaterialPurchaseOrders: 1,
+				ExpenseCount:              2,
+			},
+			Data: []entities.PurchasingAnalyticsData{
+				{
+					Date:                      now,
+					Purchases:                 300,
+					RawMaterialPurchases:      125,
+					ExpensePurchases:          175,
+					PurchaseOrders:            3,
+					RawMaterialPurchaseOrders: 1,
+					ExpenseCount:              2,
+				},
 			},
 		},
 	}, expenseRepositoryStub{})
@@ -86,5 +149,424 @@ func TestAnalyticsProcessorGetPurchasingAnalyticsPassesOutletName(t *testing.T)
 	require.Equal(t, &outletID, result.OutletID)
 	require.NotNil(t, result.OutletName)
 	require.Equal(t, outletName, *result.OutletName)
-	require.Equal(t, float64(125), result.Summary.TotalPurchases)
+	require.Equal(t, float64(300), result.Summary.TotalPurchases)
+	require.Equal(t, float64(125), result.Summary.RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Summary.ExpensePurchases)
+	require.Equal(t, int64(3), result.Summary.TotalPurchaseOrders)
+	require.Equal(t, int64(1), result.Summary.RawMaterialPurchaseOrders)
+	require.Equal(t, int64(2), result.Summary.ExpenseCount)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(300), result.Data[0].Purchases)
+	require.Equal(t, float64(125), result.Data[0].RawMaterialPurchases)
+	require.Equal(t, float64(175), result.Data[0].ExpensePurchases)
+}
+
+func TestAnalyticsProcessorGetPurchasingAnalyticsPassesTeamFilter(t *testing.T) {
+	categoryID := uuid.New()
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name string
+		team string
+		want *entities.PurchaseTeamFilter
+	}{
+		{name: "all teams", team: "", want: nil},
+		{name: "pusat", team: constants.PurchaseTeamScopeCentral, want: &entities.PurchaseTeamFilter{Scope: constants.PurchaseTeamScopeCentral}},
+		{name: "no team", team: constants.PurchaseTeamNone, want: &entities.PurchaseTeamFilter{Scope: constants.PurchaseTeamNone}},
+		{
+			name: "category team",
+			team: categoryID.String(),
+			want: &entities.PurchaseTeamFilter{Scope: constants.PurchaseTeamScopeCategory, CategoryID: &categoryID},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			repo := &analyticsRepositoryStub{purchasingResult: &entities.PurchasingAnalytics{}}
+			processor := NewAnalyticsProcessorImpl(repo, expenseRepositoryStub{})
+
+			result, err := processor.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				Team:           tt.team,
+				DateFrom:       now,
+				DateTo:         now,
+			})
+
+			require.NoError(t, err)
+			require.Equal(t, tt.team, result.Team)
+			require.Equal(t, tt.want, repo.purchasingTeam)
+		})
+	}
+}
+
+func TestAnalyticsProcessorGetPurchasingAnalyticsMapsTeamBreakdown(t *testing.T) {
+	categoryID := uuid.New()
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
+		purchasingResult: &entities.PurchasingAnalytics{
+			Summary: entities.PurchasingSummary{TotalPurchases: 300, TotalTeams: 2},
+			TeamData: []entities.PurchasingTeamData{
+				{
+					Scope:                constants.PurchaseTeamScopeCategory,
+					CategoryID:           &categoryID,
+					Name:                 "Kitchen",
+					TotalPurchases:       200,
+					RawMaterialPurchases: 150,
+					ExpensePurchases:     50,
+					PurchaseOrderCount:   2,
+					Quantity:             12,
+					Percentage:           66.67,
+				},
+				{
+					Scope:              constants.PurchaseTeamNone,
+					Name:               constants.PurchaseTeamNoneName,
+					TotalPurchases:     100,
+					PurchaseOrderCount: 1,
+					Percentage:         33.33,
+				},
+			},
+		},
+	}, expenseRepositoryStub{})
+
+	result, err := processor.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, int64(2), result.Summary.TotalTeams)
+	require.Len(t, result.TeamData, 2)
+	require.Equal(t, constants.PurchaseTeamScopeCategory, result.TeamData[0].Scope)
+	require.Equal(t, &categoryID, result.TeamData[0].CategoryID)
+	require.Equal(t, "Kitchen", result.TeamData[0].Name)
+	require.Equal(t, float64(200), result.TeamData[0].TotalPurchases)
+	require.Equal(t, float64(150), result.TeamData[0].RawMaterialPurchases)
+	require.Equal(t, 66.67, result.TeamData[0].Percentage)
+	require.Equal(t, constants.PurchaseTeamNone, result.TeamData[1].Scope)
+	require.Nil(t, result.TeamData[1].CategoryID)
+	require.Equal(t, constants.PurchaseTeamNoneName, result.TeamData[1].Name)
+}
+
+func TestAnalyticsProcessorGetPurchasingAnalyticsRejectsUnknownTeam(t *testing.T) {
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	repo := &analyticsRepositoryStub{purchasingResult: &entities.PurchasingAnalytics{}}
+	processor := NewAnalyticsProcessorImpl(repo, expenseRepositoryStub{})
+
+	result, err := processor.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		Team:           "marketing",
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.Nil(t, result)
+	require.Error(t, err)
+	require.Contains(t, err.Error(), "team must be one of")
+}
+
+func TestAnalyticsProcessorGetProfitLossAnalyticsMapsOverviewAndReportFields(t *testing.T) {
+	productID := uuid.New()
+	categoryID := uuid.New()
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
+		profitLossResult: &entities.ProfitLossAnalytics{
+			Summary: entities.ProfitLossSummary{
+				TotalRevenue:       1000,
+				TotalCost:          400,
+				GrossProfit:        600,
+				GrossProfitMargin:  60,
+				TotalTax:           50,
+				TotalDiscount:      25,
+				NetProfit:          575,
+				NetProfitMargin:    57.5,
+				TotalOrders:        10,
+				AverageProfit:      57.5,
+				ProfitabilityRatio: 150,
+			},
+			Data: []entities.ProfitLossData{
+				{
+					Date:              now,
+					Revenue:           1000,
+					Cost:              400,
+					GrossProfit:       600,
+					GrossProfitMargin: 60,
+					Tax:               50,
+					Discount:          25,
+					NetProfit:         575,
+					NetProfitMargin:   57.5,
+					Orders:            10,
+				},
+			},
+			ProductData: []entities.ProductProfitData{
+				{
+					ProductID:         productID,
+					ProductName:       "Nasi",
+					CategoryID:        categoryID,
+					CategoryName:      "Food",
+					QuantitySold:      5,
+					Revenue:           500,
+					Cost:              200,
+					GrossProfit:       300,
+					GrossProfitMargin: 60,
+					AveragePrice:      100,
+					AverageCost:       40,
+					ProfitPerUnit:     60,
+				},
+			},
+			TodayRevenue: 1000,
+			TodayCost:    400,
+			MtdRevenue:   2000,
+			MtdCost:      800,
+		},
+	}, expenseRepositoryStub{})
+
+	result, err := processor.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.Equal(t, "day", result.GroupBy)
+	require.Equal(t, float64(1000), result.Summary.TotalRevenue)
+	require.Len(t, result.Data, 1)
+	require.Equal(t, float64(575), result.Data[0].NetProfit)
+	require.Len(t, result.ProductData, 1)
+	require.Equal(t, productID, result.ProductData[0].ProductID)
+	require.NotEmpty(t, result.MainSummary)
+	require.Equal(t, "total_omset", result.MainSummary[0].ID)
+}
+
+func TestAnalyticsProcessorGetProfitLossAnalyticsDynamicExpenseCategories(t *testing.T) {
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+	processor := NewAnalyticsProcessorImpl(&analyticsRepositoryStub{
+		profitLossResult: &entities.ProfitLossAnalytics{
+			Summary: entities.ProfitLossSummary{
+				TotalRevenue: 10000,
+				TotalCost:    4000,
+			},
+			TodayRevenue: 10000,
+			TodayCost:    4000,
+			MtdRevenue:   20000,
+			MtdCost:      8000,
+			TodayExpenseByCategory: []entities.ExpenseCategoryTotal{
+				{CategoryName: "Gaji", Amount: 1500},
+				{CategoryName: "Promosi", Amount: 300},
+				{CategoryName: "Sewa", Amount: 500},
+			},
+			MtdExpenseByCategory: []entities.ExpenseCategoryTotal{
+				{CategoryName: "Gaji", Amount: 3000},
+				{CategoryName: "Promosi", Amount: 600},
+				{CategoryName: "Sewa", Amount: 1000},
+			},
+		},
+	}, expenseRepositoryStub{})
+
+	result, err := processor.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+
+	require.Len(t, result.MainSummary, 7)
+
+	require.Equal(t, "total_omset", result.MainSummary[0].ID)
+	require.Equal(t, float64(10000), result.MainSummary[0].TodayNominal)
+	require.Equal(t, float64(20000), result.MainSummary[0].MtdNominal)
+
+	require.Equal(t, "hpp", result.MainSummary[1].ID)
+	require.Equal(t, float64(4000), result.MainSummary[1].TodayNominal)
+	require.Equal(t, float64(8000), result.MainSummary[1].MtdNominal)
+
+	require.Equal(t, "laba_kotor", result.MainSummary[2].ID)
+	require.Equal(t, float64(6000), result.MainSummary[2].TodayNominal)
+	require.Equal(t, float64(12000), result.MainSummary[2].MtdNominal)
+
+	require.Equal(t, "biaya_ops", result.MainSummary[3].ID)
+	require.Equal(t, float64(800), result.MainSummary[3].TodayNominal)
+	require.Equal(t, float64(1600), result.MainSummary[3].MtdNominal)
+	require.Len(t, result.MainSummary[3].SubItems, 3) // 2 operational categories + 1 total
+
+	require.Equal(t, "by_promosi", result.MainSummary[3].SubItems[0].ID)
+	require.Equal(t, float64(300), result.MainSummary[3].SubItems[0].TodayNominal)
+	require.Equal(t, float64(600), result.MainSummary[3].SubItems[0].MtdNominal)
+
+	require.Equal(t, "by_sewa", result.MainSummary[3].SubItems[1].ID)
+	require.Equal(t, float64(500), result.MainSummary[3].SubItems[1].TodayNominal)
+	require.Equal(t, float64(1000), result.MainSummary[3].SubItems[1].MtdNominal)
+
+	require.Equal(t, "total_biaya_ops", result.MainSummary[3].SubItems[2].ID)
+	require.True(t, result.MainSummary[3].SubItems[2].IsBold)
+	require.Equal(t, float64(800), result.MainSummary[3].SubItems[2].TodayNominal)
+	require.Equal(t, float64(1600), result.MainSummary[3].SubItems[2].MtdNominal)
+
+	require.Equal(t, "laba_rugi_sblm_gaji", result.MainSummary[4].ID)
+	require.Equal(t, float64(5200), result.MainSummary[4].TodayNominal)
+	require.Equal(t, float64(10400), result.MainSummary[4].MtdNominal)
+
+	require.Equal(t, "biaya_gaji", result.MainSummary[5].ID)
+	require.Equal(t, float64(1500), result.MainSummary[5].TodayNominal)
+	require.Equal(t, float64(3000), result.MainSummary[5].MtdNominal)
+
+	require.Equal(t, "laba_rugi", result.MainSummary[6].ID)
+	require.Equal(t, float64(3700), result.MainSummary[6].TodayNominal)
+	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

@@ -0,0 +1,152 @@
+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/cash_advance_processor.go

@@ -0,0 +1,286 @@
+package processor
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+)
+
+type CashAdvanceProcessor interface {
+	CreateCashAdvance(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, req *models.CreateCashAdvanceRequest) (*models.CashAdvanceResponse, error)
+	UpdateCashAdvance(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdateCashAdvanceRequest) (*models.CashAdvanceResponse, error)
+	DeleteCashAdvance(ctx context.Context, id, organizationID uuid.UUID) error
+	GetCashAdvanceByID(ctx context.Context, id, organizationID uuid.UUID) (*models.CashAdvanceResponse, error)
+	ListCashAdvances(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.CashAdvanceResponse, int, error)
+	UpdateCashAdvanceStatus(ctx context.Context, id, organizationID uuid.UUID, status string) (*models.CashAdvanceResponse, error)
+	ListCashAdvanceTeams(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID) (*models.ListPurchaseTeamsResponse, error)
+}
+
+type CashAdvanceProcessorImpl struct {
+	cashAdvanceRepo CashAdvanceRepository
+	categoryRepo    CategoryRepository
+}
+
+func NewCashAdvanceProcessorImpl(cashAdvanceRepo CashAdvanceRepository, categoryRepo CategoryRepository) *CashAdvanceProcessorImpl {
+	return &CashAdvanceProcessorImpl{
+		cashAdvanceRepo: cashAdvanceRepo,
+		categoryRepo:    categoryRepo,
+	}
+}
+
+func (p *CashAdvanceProcessorImpl) CreateCashAdvance(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, req *models.CreateCashAdvanceRequest) (*models.CashAdvanceResponse, error) {
+	// The cash leaves one drawer, so the outlet has to be known: either the caller
+	// named it or it comes from the outlet they are signed in to.
+	resolvedOutletID := req.OutletID
+	if resolvedOutletID == nil {
+		resolvedOutletID = outletID
+	}
+	if resolvedOutletID == nil || *resolvedOutletID == uuid.Nil {
+		return nil, fmt.Errorf("outlet_id is required")
+	}
+
+	teamScope, teamCategoryID, err := p.resolveCashAdvanceTeam(ctx, organizationID, resolvedOutletID, &req.TeamScope, req.TeamCategoryID)
+	if err != nil {
+		return nil, err
+	}
+
+	existing, err := p.cashAdvanceRepo.GetByCodeNumber(ctx, req.CodeNumber, organizationID)
+	if err == nil && existing != nil {
+		return nil, fmt.Errorf("cash advance with code number %s already exists in this organization", req.CodeNumber)
+	}
+
+	status := constants.CashAdvanceStatusDraft
+	if req.Status != nil {
+		status = *req.Status
+	}
+
+	cashAdvance := &entities.CashAdvance{
+		OrganizationID: organizationID,
+		OutletID:       *resolvedOutletID,
+		CodeNumber:     req.CodeNumber,
+		TeamScope:      teamScope,
+		TeamCategoryID: teamCategoryID,
+		Amount:         req.Amount,
+		IssuedDate:     req.IssuedDate,
+		DueDate:        req.DueDate,
+		Status:         status,
+		Description:    req.Description,
+	}
+
+	if err := p.cashAdvanceRepo.Create(ctx, cashAdvance); err != nil {
+		return nil, fmt.Errorf("failed to create cash advance: %w", err)
+	}
+
+	created, err := p.cashAdvanceRepo.GetByID(ctx, cashAdvance.ID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get created cash advance: %w", err)
+	}
+
+	return mappers.CashAdvanceEntityToResponse(created), nil
+}
+
+func (p *CashAdvanceProcessorImpl) UpdateCashAdvance(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdateCashAdvanceRequest) (*models.CashAdvanceResponse, error) {
+	cashAdvance, err := p.cashAdvanceRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("cash advance not found: %w", err)
+	}
+
+	if req.CodeNumber != nil && *req.CodeNumber != cashAdvance.CodeNumber {
+		existing, err := p.cashAdvanceRepo.GetByCodeNumber(ctx, *req.CodeNumber, organizationID)
+		if err == nil && existing != nil {
+			return nil, fmt.Errorf("cash advance with code number %s already exists in this organization", *req.CodeNumber)
+		}
+		cashAdvance.CodeNumber = *req.CodeNumber
+	}
+
+	if req.TeamScope != nil {
+		teamScope, teamCategoryID, err := p.resolveCashAdvanceTeam(ctx, organizationID, &cashAdvance.OutletID, req.TeamScope, req.TeamCategoryID)
+		if err != nil {
+			return nil, err
+		}
+		cashAdvance.TeamScope = teamScope
+		cashAdvance.TeamCategoryID = teamCategoryID
+	}
+
+	if req.Amount != nil {
+		cashAdvance.Amount = *req.Amount
+	}
+	if req.ReturnedAmount != nil {
+		cashAdvance.ReturnedAmount = *req.ReturnedAmount
+	}
+	if req.IssuedDate != nil {
+		cashAdvance.IssuedDate = *req.IssuedDate
+	}
+	if req.DueDate != nil {
+		cashAdvance.DueDate = req.DueDate
+	}
+	if req.Status != nil {
+		if err := p.guardStatusChange(ctx, cashAdvance, *req.Status); err != nil {
+			return nil, err
+		}
+		cashAdvance.Status = *req.Status
+	}
+	if req.Description != nil {
+		cashAdvance.Description = req.Description
+	}
+
+	// Cash handed back can only ever be part of the cash handed out.
+	if cashAdvance.ReturnedAmount > cashAdvance.Amount {
+		return nil, fmt.Errorf("returned_amount cannot be greater than the cash advance amount")
+	}
+
+	if err := p.cashAdvanceRepo.Update(ctx, cashAdvance); err != nil {
+		return nil, fmt.Errorf("failed to update cash advance: %w", err)
+	}
+
+	updated, err := p.cashAdvanceRepo.GetByID(ctx, cashAdvance.ID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get updated cash advance: %w", err)
+	}
+
+	return mappers.CashAdvanceEntityToResponse(updated), nil
+}
+
+func (p *CashAdvanceProcessorImpl) DeleteCashAdvance(ctx context.Context, id, organizationID uuid.UUID) error {
+	if _, err := p.cashAdvanceRepo.GetByIDAndOrganizationID(ctx, id, organizationID); err != nil {
+		return fmt.Errorf("cash advance not found: %w", err)
+	}
+
+	// The foreign keys would refuse this anyway, but not in words anyone can act on.
+	count, err := p.cashAdvanceRepo.CountSettlements(ctx, id)
+	if err != nil {
+		return fmt.Errorf("failed to check cash advance settlements: %w", err)
+	}
+	if count > 0 {
+		return fmt.Errorf("cash advance cannot be deleted because %d purchase orders or expenses are charged to it", count)
+	}
+
+	if err := p.cashAdvanceRepo.Delete(ctx, id); err != nil {
+		return fmt.Errorf("failed to delete cash advance: %w", err)
+	}
+
+	return nil
+}
+
+func (p *CashAdvanceProcessorImpl) GetCashAdvanceByID(ctx context.Context, id, organizationID uuid.UUID) (*models.CashAdvanceResponse, error) {
+	cashAdvance, err := p.cashAdvanceRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("cash advance not found: %w", err)
+	}
+
+	response := mappers.CashAdvanceEntityToResponse(cashAdvance)
+
+	// The detail view is where someone checks a cash advance off, so it carries the
+	// spending behind the settled figure. The list deliberately does not.
+	settlements, err := p.cashAdvanceRepo.ListSettlements(ctx, id)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list cash advance settlements: %w", err)
+	}
+	response.Settlements = mappers.CashAdvanceSettlementEntitiesToModels(settlements)
+
+	return response, nil
+}
+
+func (p *CashAdvanceProcessorImpl) ListCashAdvances(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.CashAdvanceResponse, int, error) {
+	offset := (page - 1) * limit
+	cashAdvances, total, err := p.cashAdvanceRepo.List(ctx, organizationID, filters, limit, offset)
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to list cash advances: %w", err)
+	}
+
+	responses := mappers.CashAdvanceEntitiesToResponses(cashAdvances)
+	totalPages := int((total + int64(limit) - 1) / int64(limit))
+
+	return responses, totalPages, nil
+}
+
+func (p *CashAdvanceProcessorImpl) UpdateCashAdvanceStatus(ctx context.Context, id, organizationID uuid.UUID, status string) (*models.CashAdvanceResponse, error) {
+	cashAdvance, err := p.cashAdvanceRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("cash advance not found: %w", err)
+	}
+
+	if !constants.IsValidCashAdvanceStatus(status) {
+		return nil, fmt.Errorf("status must be one of: %s", strings.Join(constants.GetAllCashAdvanceStatuses(), ", "))
+	}
+
+	if err := p.guardStatusChange(ctx, cashAdvance, status); err != nil {
+		return nil, err
+	}
+
+	cashAdvance.Status = status
+	if err := p.cashAdvanceRepo.Update(ctx, cashAdvance); err != nil {
+		return nil, fmt.Errorf("failed to update cash advance status: %w", err)
+	}
+
+	updated, err := p.cashAdvanceRepo.GetByID(ctx, cashAdvance.ID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get updated cash advance: %w", err)
+	}
+
+	return mappers.CashAdvanceEntityToResponse(updated), nil
+}
+
+func (p *CashAdvanceProcessorImpl) ListCashAdvanceTeams(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID) (*models.ListPurchaseTeamsResponse, error) {
+	return listTeams(ctx, p.categoryRepo, organizationID, outletID)
+}
+
+// guardStatusChange refuses to withdraw an advance that spending already points at.
+// Rejecting or cancelling it would leave those purchases claiming to have been paid
+// out of cash the books say never went out.
+func (p *CashAdvanceProcessorImpl) guardStatusChange(ctx context.Context, cashAdvance *entities.CashAdvance, status string) error {
+	if status != constants.CashAdvanceStatusRejected && status != constants.CashAdvanceStatusCancelled {
+		return nil
+	}
+
+	count, err := p.cashAdvanceRepo.CountSettlements(ctx, cashAdvance.ID)
+	if err != nil {
+		return fmt.Errorf("failed to check cash advance settlements: %w", err)
+	}
+	if count > 0 {
+		return fmt.Errorf("cash advance cannot be %s because %d purchase orders or expenses are charged to it", status, count)
+	}
+
+	return nil
+}
+
+// resolveCashAdvanceTeam is resolveTeamSelection with the one rule an advance adds:
+// the cash is handed to a team, so there is no such thing as one without a team.
+func (p *CashAdvanceProcessorImpl) resolveCashAdvanceTeam(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, scope *string, categoryID *uuid.UUID) (string, *uuid.UUID, error) {
+	resolvedScope, resolvedCategoryID, err := resolveTeamSelection(ctx, p.categoryRepo, organizationID, outletID, scope, categoryID)
+	if err != nil {
+		return "", nil, err
+	}
+	if resolvedScope == nil {
+		return "", nil, fmt.Errorf("team_scope is required")
+	}
+
+	return *resolvedScope, resolvedCategoryID, nil
+}
+
+// resolveSpendingCashAdvance checks that a purchase order or expense may be charged
+// to the advance it names: same organization and outlet, and the money actually
+// approved to leave the drawer. Draft or cancelled advances cannot be spent against.
+func resolveSpendingCashAdvance(ctx context.Context, cashAdvanceRepo CashAdvanceRepository, cashAdvanceID, organizationID uuid.UUID, outletID *uuid.UUID) (*entities.CashAdvance, error) {
+	cashAdvance, err := cashAdvanceRepo.GetByIDAndOrganizationID(ctx, cashAdvanceID, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("cash advance not found: %w", err)
+	}
+
+	if cashAdvance.Status != constants.CashAdvanceStatusApproved {
+		return nil, fmt.Errorf("cash advance %s is %s, only an approved cash advance can be spent against", cashAdvance.CodeNumber, cashAdvance.Status)
+	}
+
+	if outletID != nil && *outletID != uuid.Nil && cashAdvance.OutletID != *outletID {
+		return nil, fmt.Errorf("cash advance %s belongs to a different outlet", cashAdvance.CodeNumber)
+	}
+
+	return cashAdvance, nil
+}

internal/processor/cash_advance_repository.go

@@ -0,0 +1,20 @@
+package processor
+
+import (
+	"apskel-pos-be/internal/entities"
+	"context"
+
+	"github.com/google/uuid"
+)
+
+type CashAdvanceRepository interface {
+	Create(ctx context.Context, cashAdvance *entities.CashAdvance) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.CashAdvance, error)
+	GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.CashAdvance, error)
+	GetByCodeNumber(ctx context.Context, codeNumber string, organizationID uuid.UUID) (*entities.CashAdvance, error)
+	Update(ctx context.Context, cashAdvance *entities.CashAdvance) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.CashAdvance, int64, error)
+	ListSettlements(ctx context.Context, cashAdvanceID uuid.UUID) ([]*entities.CashAdvanceSettlement, error)
+	CountSettlements(ctx context.Context, cashAdvanceID uuid.UUID) (int64, error)
+}

internal/processor/category_processor.go

@@ -24,6 +24,7 @@ type CategoryRepository interface {
 	GetByID(ctx context.Context, id uuid.UUID) (*entities.Category, error)
 	GetWithProducts(ctx context.Context, id uuid.UUID) (*entities.Category, error)
 	GetByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.Category, error)
+	ListParentCategories(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID) ([]*entities.Category, error)
 	GetByBusinessType(ctx context.Context, businessType string) ([]*entities.Category, error)
 	Update(ctx context.Context, category *entities.Category) error
 	Delete(ctx context.Context, id uuid.UUID) error
@@ -53,6 +54,18 @@ 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)
 
@@ -63,6 +76,7 @@ func (p *CategoryProcessorImpl) CreateCategory(ctx context.Context, req *models.
 
 	// Map entity to response model
 	response := mappers.CategoryEntityToResponse(categoryEntity)
+	response.ParentName = parentName
 	return response, nil
 }
 
@@ -84,6 +98,23 @@ 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

@@ -3,8 +3,10 @@ package processor
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
+	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/mappers"
 	"apskel-pos-be/internal/models"
@@ -18,15 +20,20 @@ type ExpenseProcessor interface {
 	DeleteExpense(ctx context.Context, id, organizationID uuid.UUID) error
 	GetExpenseByID(ctx context.Context, id, organizationID uuid.UUID) (*models.ExpenseResponse, error)
 	ListExpenses(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, page, limit int) ([]*models.ExpenseResponse, int, error)
+	GetExpenseAnalytics(ctx context.Context, req *models.ExpenseAnalyticsRequest) (*models.ExpenseAnalyticsResponse, error)
 }
 
 type ExpenseProcessorImpl struct {
-	expenseRepo ExpenseRepository
+	expenseRepo          ExpenseRepository
+	purchaseCategoryRepo PurchaseCategoryRepository
+	cashAdvanceRepo      CashAdvanceRepository
 }
 
-func NewExpenseProcessorImpl(expenseRepo ExpenseRepository) *ExpenseProcessorImpl {
+func NewExpenseProcessorImpl(expenseRepo ExpenseRepository, purchaseCategoryRepo PurchaseCategoryRepository, cashAdvanceRepo CashAdvanceRepository) *ExpenseProcessorImpl {
 	return &ExpenseProcessorImpl{
-		expenseRepo: expenseRepo,
+		expenseRepo:          expenseRepo,
+		purchaseCategoryRepo: purchaseCategoryRepo,
+		cashAdvanceRepo:      cashAdvanceRepo,
 	}
 }
 
@@ -41,16 +48,51 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		return nil, fmt.Errorf("invalid transaction_date format, expected YYYY-MM-DD: %w", err)
 	}
 
+	status := string(constants.ExpenseStatusDraft)
+	if req.Status != nil {
+		status = *req.Status
+	}
+
+	cashAdvanceID, err := p.resolveExpenseCashAdvance(ctx, organizationID, outletID, req.CashAdvanceID)
+	if err != nil {
+		return nil, err
+	}
+
+	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,
-		ExpenseName:     req.ExpenseName,
 		Receiver:        req.Receiver,
 		TransactionDate: transactionDate,
 		CodeNumber:      req.CodeNumber,
+		Status:          status,
 		Description:     req.Description,
 		Tax:             req.Tax,
 		Total:           req.Total,
+		CashAdvanceID:   cashAdvanceID,
 	}
 
 	err = p.expenseRepo.Create(ctx, expenseEntity)
@@ -58,20 +100,10 @@ func (p *ExpenseProcessorImpl) CreateExpense(ctx context.Context, organizationID
 		return nil, fmt.Errorf("failed to create expense: %w", err)
 	}
 
-	for _, itemReq := range req.Items {
-		chartOfAccountID, err := uuid.Parse(itemReq.ChartOfAccountID)
-		if err != nil {
-			return nil, fmt.Errorf("invalid chart_of_account_id for item: %w", err)
-		}
+	for i := range items {
+		items[i].ExpenseID = expenseEntity.ID
 
-		itemEntity := &entities.ExpenseItem{
-			ExpenseID:        expenseEntity.ID,
-			ChartOfAccountID: chartOfAccountID,
-			Description:      itemReq.Description,
-			Amount:           itemReq.Amount,
-		}
-
-		err = p.expenseRepo.CreateItem(ctx, itemEntity)
+		err = p.expenseRepo.CreateItem(ctx, &items[i])
 		if err != nil {
 			return nil, fmt.Errorf("failed to create expense item: %w", err)
 		}
@@ -91,9 +123,6 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 		return nil, fmt.Errorf("expense not found: %w", err)
 	}
 
-	if req.ExpenseName != nil {
-		expenseEntity.ExpenseName = *req.ExpenseName
-	}
 	if req.Receiver != nil {
 		expenseEntity.Receiver = *req.Receiver
 	}
@@ -107,6 +136,9 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 	if req.CodeNumber != nil {
 		expenseEntity.CodeNumber = *req.CodeNumber
 	}
+	if req.Status != nil {
+		expenseEntity.Status = *req.Status
+	}
 	if req.OutletID != nil {
 		outletID, err := uuid.Parse(*req.OutletID)
 		if err != nil {
@@ -126,14 +158,19 @@ func (p *ExpenseProcessorImpl) UpdateExpense(ctx context.Context, id, organizati
 	if req.Reserved1 != nil {
 		expenseEntity.Reserved1 = req.Reserved1
 	}
-
-	if req.Items != nil {
-		err = p.expenseRepo.DeleteItemsByExpenseID(ctx, expenseEntity.ID)
+	// An empty cash_advance_id unlinks the expense; omitting the field leaves it alone.
+	if req.CashAdvanceID != nil {
+		cashAdvanceID, err := p.resolveExpenseCashAdvance(ctx, organizationID, expenseEntity.OutletID, req.CashAdvanceID)
 		if err != nil {
-			return nil, fmt.Errorf("failed to delete existing items: %w", err)
+			return nil, err
 		}
+		expenseEntity.CashAdvanceID = cashAdvanceID
+	}
 
-		for _, itemReq := range req.Items {
+	var items []entities.ExpenseItem
+	if req.Items != nil {
+		items = make([]entities.ExpenseItem, len(req.Items))
+		for i, itemReq := range req.Items {
 			chartOfAccountID := uuid.Nil
 			if itemReq.ChartOfAccountID != nil {
 				chartOfAccountID, err = uuid.Parse(*itemReq.ChartOfAccountID)
@@ -142,19 +179,43 @@ 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
 			}
-
-			itemEntity := &entities.ExpenseItem{
-				ExpenseID:        expenseEntity.ID,
-				ChartOfAccountID: chartOfAccountID,
-				Description:      itemReq.Description,
-				Amount:           amount,
+			item := ""
+			if itemReq.Item != nil {
+				item = *itemReq.Item
 			}
 
-			err = p.expenseRepo.CreateItem(ctx, itemEntity)
+			items[i] = entities.ExpenseItem{
+				ExpenseID:          expenseEntity.ID,
+				ChartOfAccountID:   chartOfAccountID,
+				PurchaseCategoryID: purchaseCategoryID,
+				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])
 			if err != nil {
 				return nil, fmt.Errorf("failed to create expense item: %w", err)
 			}
@@ -209,3 +270,119 @@ func (p *ExpenseProcessorImpl) ListExpenses(ctx context.Context, organizationID
 
 	return expenseResponses, totalPages, nil
 }
+
+func (p *ExpenseProcessorImpl) GetExpenseAnalytics(ctx context.Context, req *models.ExpenseAnalyticsRequest) (*models.ExpenseAnalyticsResponse, error) {
+	if req.DateFrom.After(req.DateTo) {
+		return nil, fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	if req.GroupBy == "" {
+		req.GroupBy = "day"
+	}
+
+	result, err := p.expenseRepo.GetAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get expense analytics: %w", err)
+	}
+
+	data := make([]models.ExpenseAnalyticsData, len(result.Data))
+	for i, item := range result.Data {
+		data[i] = models.ExpenseAnalyticsData{
+			Date:         item.Date,
+			Expenses:     item.Expenses,
+			ExpenseCount: item.ExpenseCount,
+			Tax:          item.Tax,
+			Items:        item.Items,
+			Categories:   item.Categories,
+		}
+	}
+
+	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,
+			ExpenseCount:       item.ExpenseCount,
+			ItemCount:          item.ItemCount,
+		}
+	}
+
+	itemData := make([]models.ExpenseAnalyticsItemData, len(result.ItemData))
+	for i, item := range result.ItemData {
+		itemData[i] = models.ExpenseAnalyticsItemData{
+			Item:         item.Item,
+			TotalAmount:  item.TotalAmount,
+			ExpenseCount: item.ExpenseCount,
+			ItemCount:    item.ItemCount,
+		}
+	}
+
+	return &models.ExpenseAnalyticsResponse{
+		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
+		DateFrom:       req.DateFrom,
+		DateTo:         req.DateTo,
+		GroupBy:        req.GroupBy,
+		Summary: models.ExpenseAnalyticsSummary{
+			TotalExpenses:       result.Summary.TotalExpenses,
+			TotalExpenseCount:   result.Summary.TotalExpenseCount,
+			TotalTax:            result.Summary.TotalTax,
+			AverageExpenseValue: result.Summary.AverageExpenseValue,
+			TotalCategories:     result.Summary.TotalCategories,
+			TotalItems:          result.Summary.TotalItems,
+		},
+		Data:               data,
+		CategoryData:       categoryData,
+		ChartOfAccountData: chartOfAccountData,
+		ItemData:           itemData,
+	}, nil
+}
+
+// resolveExpenseCashAdvance checks the expense may be charged to the cash advance it names.
+// An empty value means no cash advance at all, which is how an update unlinks one.
+func (p *ExpenseProcessorImpl) resolveExpenseCashAdvance(ctx context.Context, organizationID, outletID uuid.UUID, raw *string) (*uuid.UUID, error) {
+	if raw == nil || strings.TrimSpace(*raw) == "" {
+		return nil, nil
+	}
+
+	cashAdvanceID, err := uuid.Parse(strings.TrimSpace(*raw))
+	if err != nil {
+		return nil, fmt.Errorf("invalid cash_advance_id: %w", err)
+	}
+
+	if _, err := resolveSpendingCashAdvance(ctx, p.cashAdvanceRepo, cashAdvanceID, organizationID, &outletID); err != nil {
+		return nil, err
+	}
+
+	return &cashAdvanceID, 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

@@ -0,0 +1,321 @@
+package processor
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+type expenseRepositoryCaptureStub struct {
+	createdExpense *entities.Expense
+	createdItems   []*entities.ExpenseItem
+	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()
+	}
+	s.createdExpense = expense
+	return nil
+}
+
+func (s *expenseRepositoryCaptureStub) GetByID(context.Context, uuid.UUID) (*entities.Expense, error) {
+	if s.createdExpense == nil {
+		return nil, nil
+	}
+	items := make([]entities.ExpenseItem, len(s.createdItems))
+	for i, item := range s.createdItems {
+		items[i] = *item
+	}
+	s.createdExpense.Items = items
+	return s.createdExpense, nil
+}
+
+func (*expenseRepositoryCaptureStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.Expense, error) {
+	return nil, nil
+}
+func (*expenseRepositoryCaptureStub) Update(context.Context, *entities.Expense) error { return nil }
+func (*expenseRepositoryCaptureStub) Delete(context.Context, uuid.UUID) error         { return nil }
+func (*expenseRepositoryCaptureStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.Expense, int64, error) {
+	return nil, 0, nil
+}
+func (s *expenseRepositoryCaptureStub) GetAnalytics(context.Context, uuid.UUID, *uuid.UUID, time.Time, time.Time, string) (*entities.ExpenseAnalytics, error) {
+	return s.analytics, nil
+}
+func (s *expenseRepositoryCaptureStub) CreateItem(_ context.Context, item *entities.ExpenseItem) error {
+	if item.ID == uuid.Nil {
+		item.ID = uuid.New()
+	}
+	s.createdItems = append(s.createdItems, item)
+	return nil
+}
+func (*expenseRepositoryCaptureStub) DeleteItemsByExpenseID(context.Context, uuid.UUID) error {
+	return nil
+}
+
+// Expenses in these tests are paid straight out of the drawer, so nothing here
+// reaches the cash advance repository.
+type expenseCashAdvanceRepositoryStub struct{}
+
+func (*expenseCashAdvanceRepositoryStub) Create(context.Context, *entities.CashAdvance) error {
+	return nil
+}
+func (*expenseCashAdvanceRepositoryStub) GetByID(context.Context, uuid.UUID) (*entities.CashAdvance, error) {
+	return nil, nil
+}
+func (*expenseCashAdvanceRepositoryStub) GetByIDAndOrganizationID(context.Context, uuid.UUID, uuid.UUID) (*entities.CashAdvance, error) {
+	return nil, nil
+}
+func (*expenseCashAdvanceRepositoryStub) GetByCodeNumber(context.Context, string, uuid.UUID) (*entities.CashAdvance, error) {
+	return nil, nil
+}
+func (*expenseCashAdvanceRepositoryStub) Update(context.Context, *entities.CashAdvance) error {
+	return nil
+}
+func (*expenseCashAdvanceRepositoryStub) Delete(context.Context, uuid.UUID) error { return nil }
+func (*expenseCashAdvanceRepositoryStub) List(context.Context, uuid.UUID, map[string]interface{}, int, int) ([]*entities.CashAdvance, int64, error) {
+	return nil, 0, nil
+}
+func (*expenseCashAdvanceRepositoryStub) ListSettlements(context.Context, uuid.UUID) ([]*entities.CashAdvanceSettlement, error) {
+	return nil, nil
+}
+func (*expenseCashAdvanceRepositoryStub) CountSettlements(context.Context, uuid.UUID) (int64, error) {
+	return 0, nil
+}
+
+func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	purchaseCategoryID := uuid.New()
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense), &expenseCashAdvanceRepositoryStub{})
+	chartOfAccountID := uuid.New()
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID:   chartOfAccountID.String(),
+				PurchaseCategoryID: purchaseCategoryID.String(),
+				Item:               "Cleaning supplies",
+				Amount:             10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Len(t, repo.createdItems, 1)
+	require.Equal(t, "Cleaning supplies", repo.createdItems[0].Item)
+	require.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), &expenseCashAdvanceRepositoryStub{})
+
+	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.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "draft", repo.createdExpense.Status)
+	require.Equal(t, "draft", resp.Status)
+}
+
+func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	purchaseCategoryID := uuid.New()
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense), &expenseCashAdvanceRepositoryStub{})
+	status := "approved"
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID:   uuid.NewString(),
+				PurchaseCategoryID: purchaseCategoryID.String(),
+				Item:               "Cleaning supplies",
+				Amount:             10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "approved", repo.createdExpense.Status)
+	require.Equal(t, "approved", resp.Status)
+}
+
+func TestExpenseProcessorCreateRejectsRawMaterialPurchaseCategory(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	purchaseCategoryID := uuid.New()
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeRawMaterial), &expenseCashAdvanceRepositoryStub{})
+
+	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{
+		analytics: &entities.ExpenseAnalytics{
+			Summary: entities.ExpenseAnalyticsSummary{
+				TotalExpenses:       100000,
+				TotalExpenseCount:   2,
+				TotalTax:            10000,
+				AverageExpenseValue: 50000,
+				TotalCategories:     1,
+				TotalItems:          2,
+			},
+			Data: []entities.ExpenseAnalyticsData{
+				{
+					Date:         now,
+					Expenses:     100000,
+					ExpenseCount: 2,
+					Tax:          10000,
+					Items:        2,
+					Categories:   1,
+				},
+			},
+			CategoryData: []entities.ExpenseAnalyticsCategoryData{
+				{
+					PurchaseCategoryID:   purchaseCategoryID,
+					PurchaseCategoryName: "Operational Supplies",
+					PurchaseCategoryType: "expense",
+					TotalAmount:          100000,
+					ExpenseCount:         2,
+					ItemCount:            2,
+				},
+			},
+			ChartOfAccountData: []entities.ExpenseAnalyticsChartOfAccountData{
+				{
+					ChartOfAccountID:   coaID,
+					ChartOfAccountName: "Operational",
+					TotalAmount:        100000,
+					ExpenseCount:       2,
+					ItemCount:          2,
+				},
+			},
+			ItemData: []entities.ExpenseAnalyticsItemData{
+				{
+					Item:         "Cleaning supplies",
+					TotalAmount:  100000,
+					ExpenseCount: 2,
+					ItemCount:    2,
+				},
+			},
+		},
+	}
+	p := NewExpenseProcessorImpl(repo, newExpensePurchaseCategoryRepo(purchaseCategoryID, entities.PurchaseCategoryTypeExpense), &expenseCashAdvanceRepositoryStub{})
+
+	resp, err := p.GetExpenseAnalytics(context.Background(), &models.ExpenseAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		OutletID:       &outletID,
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "day", resp.GroupBy)
+	require.Equal(t, &outletID, resp.OutletID)
+	require.Equal(t, float64(100000), resp.Summary.TotalExpenses)
+	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.Len(t, resp.ItemData, 1)
+	require.Equal(t, "Cleaning supplies", resp.ItemData[0].Item)
+}

internal/processor/expense_repository.go

@@ -3,6 +3,7 @@ package processor
 import (
 	"apskel-pos-be/internal/entities"
 	"context"
+	"time"
 
 	"github.com/google/uuid"
 )
@@ -14,6 +15,7 @@ type ExpenseRepository interface {
 	Update(ctx context.Context, expense *entities.Expense) error
 	Delete(ctx context.Context, id uuid.UUID) error
 	List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error)
+	GetAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ExpenseAnalytics, error)
 	CreateItem(ctx context.Context, item *entities.ExpenseItem) error
 	DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error
 }

internal/processor/ingredient_processor.go

@@ -27,8 +27,11 @@ func NewIngredientProcessor(ingredientRepo IngredientRepository, unitRepo UnitRe
 }
 
 func (p *IngredientProcessorImpl) CreateIngredient(ctx context.Context, req *models.CreateIngredientRequest) (*models.IngredientResponse, error) {
-	if _, err := p.unitRepo.GetByID(ctx, req.UnitID, req.OrganizationID); err != nil {
-		return nil, err
+	// The unit is optional, so it is only validated when one is supplied.
+	if req.UnitID != nil {
+		if _, err := p.unitRepo.GetByID(ctx, *req.UnitID, req.OrganizationID); err != nil {
+			return nil, err
+		}
 	}
 
 	ingredient := &entities.Ingredient{
@@ -107,8 +110,8 @@ func (p *IngredientProcessorImpl) UpdateIngredient(ctx context.Context, id uuid.
 		return nil, err
 	}
 
-	if req.UnitID != existing.UnitID {
-		if _, err := p.unitRepo.GetByID(ctx, req.UnitID, organizationID); err != nil {
+	if req.UnitID != nil && (existing.UnitID == nil || *req.UnitID != *existing.UnitID) {
+		if _, err := p.unitRepo.GetByID(ctx, *req.UnitID, organizationID); err != nil {
 			return nil, err
 		}
 	}

internal/processor/ingredient_unit_converter_processor.go

@@ -266,15 +266,27 @@ func (p *IngredientUnitConverterProcessorImpl) GetUnitsByIngredientID(ctx contex
 		return nil, fmt.Errorf("failed to get ingredient: %w", err)
 	}
 
-	// Get the base unit details
-	baseUnit, err := p.unitRepo.GetByID(ctx, ingredient.UnitID, organizationID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get base unit: %w", err)
+	response := &models.IngredientUnitsResponse{
+		IngredientID:   ingredientID,
+		IngredientName: ingredient.Name,
 	}
 
-	// Start with the base unit
-	units := []*models.UnitResponse{
-		mappers.MapUnitEntityToResponse(baseUnit),
+	units := make([]*models.UnitResponse, 0)
+	unitMap := make(map[uuid.UUID]bool)
+
+	// An ingredient does not necessarily have a unit assigned yet. When it has
+	// none there is no base unit to start from, so the only units on offer are
+	// the ones its converters mention.
+	if ingredient.UnitID != nil {
+		baseUnit, err := p.unitRepo.GetByID(ctx, *ingredient.UnitID, organizationID)
+		if err != nil {
+			return nil, fmt.Errorf("failed to get base unit: %w", err)
+		}
+
+		units = append(units, mappers.MapUnitEntityToResponse(baseUnit))
+		unitMap[baseUnit.ID] = true
+		response.BaseUnitID = &baseUnit.ID
+		response.BaseUnitName = baseUnit.Name
 	}
 
 	// Get all converters for this ingredient
@@ -283,10 +295,6 @@ func (p *IngredientUnitConverterProcessorImpl) GetUnitsByIngredientID(ctx contex
 		return nil, fmt.Errorf("failed to get converters: %w", err)
 	}
 
-	// Add unique units from converters
-	unitMap := make(map[uuid.UUID]bool)
-	unitMap[baseUnit.ID] = true
-
 	for _, converter := range converters {
 		if converter.IsActive {
 			// Add FromUnit if not already added
@@ -309,13 +317,7 @@ func (p *IngredientUnitConverterProcessorImpl) GetUnitsByIngredientID(ctx contex
 		}
 	}
 
-	response := &models.IngredientUnitsResponse{
-		IngredientID:   ingredientID,
-		IngredientName: ingredient.Name,
-		BaseUnitID:     baseUnit.ID,
-		BaseUnitName:   baseUnit.Name,
-		Units:          units,
-	}
+	response.Units = units
 
 	return response, nil
 }

internal/processor/order_ingredient_transaction_processor.go

@@ -371,8 +371,8 @@ func (p *OrderIngredientTransactionProcessorImpl) CalculateWasteQuantities(ctx c
 
 		// Get unit name
 		unitName := "unit" // default
-		if ingredient.UnitID != uuid.Nil {
-			unit, err := p.unitRepo.GetByID(ctx, ingredient.UnitID, organizationID)
+		if ingredient.UnitID != nil {
+			unit, err := p.unitRepo.GetByID(ctx, *ingredient.UnitID, organizationID)
 			if err == nil {
 				unitName = unit.Name
 			}

internal/processor/order_processor.go

@@ -1,7 +1,6 @@
 package processor
 
 import (
-	"apskel-pos-be/internal/constants"
 	"context"
 	"errors"
 	"fmt"
@@ -87,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) 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, purchaseOrderItemID *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
 }
 
@@ -339,7 +338,7 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 			ProductID:        itemReq.ProductID,
 			ProductVariantID: itemReq.ProductVariantID,
 			Quantity:         itemReq.Quantity,
-			UnitPrice:        unitPrice, // Use price from database
+			UnitPrice:        unitPrice,
 			TotalPrice:       itemTotalPrice,
 			UnitCost:         unitCost,
 			TotalCost:        itemTotalCost,
@@ -388,31 +387,10 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 			return nil, fmt.Errorf("failed to create order item: %w", err)
 		}
 
-		itemResponse := models.OrderItemResponse{
-			ID:                  orderItem.ID,
-			OrderID:             orderItem.OrderID,
-			ProductID:           orderItem.ProductID,
-			ProductVariantID:    orderItem.ProductVariantID,
-			Quantity:            orderItem.Quantity,
-			UnitPrice:           orderItem.UnitPrice,
-			TotalPrice:          orderItem.TotalPrice,
-			UnitCost:            orderItem.UnitCost,
-			TotalCost:           orderItem.TotalCost,
-			RefundAmount:        orderItem.RefundAmount,
-			RefundQuantity:      orderItem.RefundQuantity,
-			IsPartiallyRefunded: orderItem.IsPartiallyRefunded,
-			IsFullyRefunded:     orderItem.IsFullyRefunded,
-			RefundReason:        orderItem.RefundReason,
-			RefundedAt:          orderItem.RefundedAt,
-			RefundedBy:          orderItem.RefundedBy,
-			Modifiers:           []map[string]interface{}(orderItem.Modifiers),
-			Notes:               orderItem.Notes,
-			Metadata:            map[string]interface{}(orderItem.Metadata),
-			Status:              constants.OrderItemStatus(orderItem.Status),
-			CreatedAt:           orderItem.CreatedAt,
-			UpdatedAt:           orderItem.UpdatedAt,
+		itemResponse := mappers.OrderItemEntityToResponse(orderItem, order.OutletID)
+		if itemResponse != nil {
+			addedItemResponses = append(addedItemResponses, *itemResponse)
 		}
-		addedItemResponses = append(addedItemResponses, itemResponse)
 	}
 
 	orderWithRelations, err := p.orderRepo.GetWithRelations(ctx, orderID)
@@ -616,6 +594,10 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 				return fmt.Errorf("order item does not belong to this order")
 			}
 
+			if orderItem.Status == entities.OrderItemStatusCancelled {
+				return fmt.Errorf("order item %s is already cancelled", orderItemID)
+			}
+
 			if itemVoid.Quantity > orderItem.Quantity {
 				return fmt.Errorf("void quantity cannot exceed original quantity for item %d", itemVoid.OrderItemID)
 			}
@@ -636,9 +618,15 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 			return fmt.Errorf("outlet not found: %w", err)
 		}
 
+		// Reload order to get latest state
+		order, err = p.orderRepo.GetByID(ctx, req.OrderID)
+		if err != nil {
+			return fmt.Errorf("failed to reload order: %w", err)
+		}
+
 		order.Subtotal -= totalVoidedAmount
 		order.TotalCost -= totalVoidedCost
-		order.TaxAmount = order.Subtotal * outlet.TaxRate // Recalculate tax using outlet's tax rate
+		order.TaxAmount = order.Subtotal * outlet.TaxRate
 		order.TotalAmount = order.Subtotal + order.TaxAmount - order.DiscountAmount
 
 		if err := p.orderRepo.Update(ctx, order); err != nil {