Merge remote-tracking branch 'origin' into feature/expense

# Conflicts:
#	internal/router/router.go

Dockerfile

@@ -1,5 +1,5 @@
 # 1) Build stage
-FROM golang:1.21-alpine AS build
+FROM golang:1.24-alpine AS build
 RUN apk --no-cache add ca-certificates tzdata git curl
 WORKDIR /src
 COPY go.mod go.sum ./

Makefile

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

cmd/server/main.go

@@ -12,13 +12,18 @@ func main() {
 	cfg := config.LoadConfig()
 	logger.Setup(cfg.LogLevel(), cfg.LogFormat())
 
-	db, err := db.NewPostgres(cfg.Database)
+	pg, err := db.NewPostgres(cfg.Database)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	redisClient, err := db.NewRedisClient(cfg.Redis)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	logger.NonContext.Info("helloworld")
-	application := app.NewApp(db)
+	application := app.NewApp(pg, redisClient)
 
 	if err := application.Initialize(cfg); err != nil {
 		log.Fatalf("Failed to initialize application: %v", err)

config/configs.go

@@ -26,6 +26,7 @@ var (
 type Config struct {
 	Server   Server   `mapstructure:"server"`
 	Database Database `mapstructure:"postgresql"`
+	Redis    Redis    `mapstructure:"redis"`
 	Jwt      Jwt      `mapstructure:"jwt"`
 	Log      Log      `mapstructure:"log"`
 	S3Config S3Config `mapstructure:"s3"`

config/redis.go

@@ -0,0 +1,55 @@
+package config
+
+import (
+	"fmt"
+	"time"
+)
+
+type Redis struct {
+	Host               string `mapstructure:"host"`
+	Port               int    `mapstructure:"port"`
+	Password           string `mapstructure:"password"`
+	DB                 int    `mapstructure:"db"`
+	DialTimeout        string `mapstructure:"dial_timeout"`
+	ReadTimeout        string `mapstructure:"read_timeout"`
+	WriteTimeout       string `mapstructure:"write_timeout"`
+	PoolSize           int    `mapstructure:"pool_size"`
+	MinIdleConnections int    `mapstructure:"min_idle_connections"`
+}
+
+func (r Redis) Addr() string {
+	return fmt.Sprintf("%s:%d", r.Host, r.Port)
+}
+
+func (r Redis) ParseDialTimeout() time.Duration {
+	if r.DialTimeout == "" {
+		return 5 * time.Second
+	}
+	d, err := time.ParseDuration(r.DialTimeout)
+	if err != nil {
+		return 5 * time.Second
+	}
+	return d
+}
+
+func (r Redis) ParseReadTimeout() time.Duration {
+	if r.ReadTimeout == "" {
+		return 3 * time.Second
+	}
+	d, err := time.ParseDuration(r.ReadTimeout)
+	if err != nil {
+		return 3 * time.Second
+	}
+	return d
+}
+
+func (r Redis) ParseWriteTimeout() time.Duration {
+	if r.WriteTimeout == "" {
+		return 3 * time.Second
+	}
+	d, err := time.ParseDuration(r.WriteTimeout)
+	if err != nil {
+		return 3 * time.Second
+	}
+	return d
+}

config/server.go

@@ -4,4 +4,5 @@ type Server struct {
 	Port         string `mapstructure:"port"`
 	BaseUrl      string `mapstructure:"common-url"`
 	LocalUrl     string `mapstructure:"local-url"`
+	SelfOrderUrl string `mapstructure:"self-order-url"`
 }

go.mod

@@ -1,6 +1,6 @@
 module apskel-pos-be
 
-go 1.23.0
+go 1.24
 
 require (
 	github.com/gin-gonic/gin v1.9.1
@@ -57,7 +57,7 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
@@ -86,7 +86,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.35.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
 	go.opentelemetry.io/otel/trace v1.35.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/net v0.42.0 // indirect
@@ -108,7 +108,9 @@ require (
 require (
 	firebase.google.com/go/v4 v4.19.0
 	github.com/aws/aws-sdk-go v1.55.7
+	github.com/boombuler/barcode v1.1.0
 	github.com/golang-jwt/jwt/v5 v5.2.3
+	github.com/redis/go-redis/v9 v9.19.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.21.0

go.sum

@@ -78,6 +78,12 @@ github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE
 github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/boombuler/barcode v1.1.0 h1:ChaYjBR63fr4LFyGn8E8nt7dBSt3MiU3zMOZqFvVkHo=
+github.com/boombuler/barcode v1.1.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
@@ -255,8 +261,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.10 h1:tBs3QSyvjDyFTq3uoc/9xFpCuOsJQFNPiAhYdw2skhE=
+github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -294,6 +300,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/redis/go-redis/v9 v9.19.0 h1:XPVaaPSnG6RhYf7p+rmSa9zZfeVAnWsH5h3lxthOm/k=
+github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -370,8 +378,9 @@ go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstF
 go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
 go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=

infra/development.yaml

@@ -1,6 +1,7 @@
 server:
   base-url:
   local-url:
+  self-order-url: http://localhost:5173
   port: 4000
 
 jwt:
@@ -27,6 +28,17 @@ postgresql:
   connection-max-life-time-in-second: 600
   debug: false
 
+redis:
+  host: 194.233.78.1
+  port: 6379
+  password: "CmICdmnX1EZPhVBYzQPEGw==U"
+  db: 0
+  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
@@ -46,4 +58,4 @@ fonnte:
 
 fcm:
   credentials_file: "infra/firebase-service-account.json"
-  project_id: "your-firebase-project-id"
+  project_id: "apskel-pos-v2"

internal/app/app.go

@@ -20,19 +20,23 @@ import (
 	"apskel-pos-be/internal/service"
 	"apskel-pos-be/internal/validator"
 
+	"github.com/redis/go-redis/v9"
 	"gorm.io/gorm"
 )
 
 type App struct {
 	server         *http.Server
 	db             *gorm.DB
+	redisClient    *redis.Client
 	router         *router.Router
 	shutdown       chan os.Signal
+	omsetScheduler *service.OmsetMilestoneScheduler
 }
 
-func NewApp(db *gorm.DB) *App {
+func NewApp(db *gorm.DB, redisClient *redis.Client) *App {
 	return &App{
 		db:          db,
+		redisClient: redisClient,
 		shutdown:    make(chan os.Signal, 1),
 	}
 }
@@ -40,10 +44,30 @@ func NewApp(db *gorm.DB) *App {
 func (a *App) Initialize(cfg *config.Config) error {
 	repos := a.initRepositories()
 	processors := a.initProcessors(cfg, repos)
+
+	// Initialize omset milestone scheduler
+	a.omsetScheduler = service.NewOmsetMilestoneScheduler(
+		repos.organizationRepo,
+		repos.outletRepo,
+		repos.userRepo,
+		processors.notificationProcessor,
+	)
+
 	services := a.initServices(processors, repos, cfg)
 	validators := a.initValidators()
 	middleware := a.initMiddleware(services, cfg)
 	healthHandler := handler.NewHealthHandler()
+	selfOrderHandler := handler.NewSelfOrderHandler(
+		services.orderService,
+		services.categoryService,
+		services.productService,
+		repos.tableRepo,
+		repos.outletRepo,
+		repos.userRepo,
+		repos.sessionRepo,
+		repos.orderRepo,
+		services.productOutletPriceService,
+	)
 
 	a.router = router.NewRouter(
 		cfg,
@@ -84,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,
@@ -109,12 +135,23 @@ func (a *App) Initialize(cfg *config.Config) error {
 		validators.userDeviceValidator,
 		services.notificationService,
 		validators.notificationValidator,
+		services.productOutletPriceService,
+		validators.productOutletPriceValidator,
+		selfOrderHandler,
+		services.expenseService,
+		validators.expenseValidator,
+		a.redisClient,
 	)
 
 	return nil
 }
 
 func (a *App) Start(port string) error {
+	// Start the omset milestone scheduler (checks every 5 minutes for daily omset milestones)
+	if a.omsetScheduler != nil {
+		a.omsetScheduler.Start(5 * time.Minute)
+	}
+
 	engine := a.router.Init()
 
 	a.server = &http.Server{
@@ -150,6 +187,9 @@ func (a *App) Start(port string) error {
 }
 
 func (a *App) Shutdown() {
+	if a.omsetScheduler != nil {
+		a.omsetScheduler.Stop()
+	}
 	close(a.shutdown)
 }
 
@@ -178,6 +218,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
@@ -195,11 +236,14 @@ type repositories struct {
 	customerAuthRepo               repository.CustomerAuthRepository
 	customerPointsRepo             repository.CustomerPointsRepository
 	otpRepo                        repository.OtpRepository
+	sessionRepo                    repository.SessionRepository
 	txManager                      *repository.TxManager
 	userDeviceRepo                 *repository.UserDeviceRepositoryImpl
 	notificationRepo               *repository.NotificationRepositoryImpl
 	notificationReceiverRepo       *repository.NotificationReceiverRepositoryImpl
 	notificationDeliveryRepo       *repository.NotificationDeliveryRepositoryImpl
+	productOutletPriceRepo         *repository.ProductOutletPriceRepositoryImpl
+	expenseRepo                    *repository.ExpenseRepositoryImpl
 }
 
 func (a *App) initRepositories() *repositories {
@@ -228,6 +272,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),
@@ -245,11 +290,14 @@ func (a *App) initRepositories() *repositories {
 		customerAuthRepo:               repository.NewCustomerAuthRepository(a.db),
 		customerPointsRepo:             repository.NewCustomerPointsRepository(a.db),
 		otpRepo:                        repository.NewOtpRepository(a.db),
+		sessionRepo:                    repository.NewSessionRepository(a.redisClient),
 		txManager:                      repository.NewTxManager(a.db),
 		userDeviceRepo:                 repository.NewUserDeviceRepositoryImpl(a.db),
 		notificationRepo:               repository.NewNotificationRepository(a.db),
 		notificationReceiverRepo:       repository.NewNotificationReceiverRepository(a.db),
 		notificationDeliveryRepo:       repository.NewNotificationDeliveryRepository(a.db),
+		productOutletPriceRepo:         repository.NewProductOutletPriceRepositoryImpl(a.db),
+		expenseRepo:                    repository.NewExpenseRepositoryImpl(a.db),
 	}
 }
 
@@ -273,6 +321,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
@@ -294,6 +343,8 @@ type processors struct {
 	inventoryMovementService            service.InventoryMovementService
 	userDeviceProcessor                 *processor.UserDeviceProcessorImpl
 	notificationProcessor               *processor.NotificationProcessorImpl
+	productOutletPriceProcessor         processor.ProductOutletPriceProcessor
+	expenseProcessor                    *processor.ExpenseProcessorImpl
 }
 
 func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processors {
@@ -308,20 +359,21 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		outletProcessor:                     processor.NewOutletProcessorImpl(repos.outletRepo),
 		outletSettingProcessor:              processor.NewOutletSettingProcessorImpl(repos.outletSettingRepo, repos.outletRepo),
 		categoryProcessor:                   processor.NewCategoryProcessorImpl(repos.categoryRepo),
-		productProcessor:                    processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo),
+		productProcessor:                    processor.NewProductProcessorImpl(repos.productRepo, repos.categoryRepo, repos.productVariantRepo, repos.inventoryRepo, repos.outletRepo, repos.productOutletPriceRepo),
 		productVariantProcessor:             processor.NewProductVariantProcessorImpl(repos.productVariantRepo, repos.productRepo),
 		inventoryProcessor:                  processor.NewInventoryProcessorImpl(repos.inventoryRepo, repos.productRepo, repos.outletRepo, repos.ingredientRepo, repos.inventoryMovementRepo),
-		orderProcessor:                      processor.NewOrderProcessorImpl(repos.orderRepo, repos.orderItemRepo, repos.paymentRepo, repos.paymentOrderItemRepo, repos.productRepo, repos.paymentMethodRepo, repos.inventoryRepo, repos.inventoryMovementRepo, repos.productVariantRepo, repos.outletRepo, repos.customerRepo, repos.txManager, repos.productRecipeRepo, repos.ingredientRepo, inventoryMovementService),
+		orderProcessor:                      processor.NewOrderProcessorImpl(repos.orderRepo, repos.orderItemRepo, repos.paymentRepo, repos.paymentOrderItemRepo, repos.productRepo, repos.paymentMethodRepo, repos.inventoryRepo, repos.inventoryMovementRepo, repos.productVariantRepo, repos.outletRepo, repos.customerRepo, repos.txManager, repos.productRecipeRepo, repos.ingredientRepo, inventoryMovementService, repos.productOutletPriceRepo),
 		paymentMethodProcessor:              processor.NewPaymentMethodProcessorImpl(repos.paymentMethodRepo),
 		fileProcessor:                       processor.NewFileProcessorImpl(repos.fileRepo, fileClient),
 		customerProcessor:                   processor.NewCustomerProcessor(repos.customerRepo),
-		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo),
+		analyticsProcessor:                  processor.NewAnalyticsProcessorImpl(repos.analyticsRepo, repos.expenseRepo),
 		tableProcessor:                      processor.NewTableProcessor(repos.tableRepo, repos.orderRepo),
 		unitProcessor:                       processor.NewUnitProcessor(repos.unitRepo),
 		ingredientProcessor:                 processor.NewIngredientProcessor(repos.ingredientRepo, repos.unitRepo, repos.ingredientCompositionRepo),
 		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),
+		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),
@@ -343,6 +395,8 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		inventoryMovementService:            inventoryMovementService,
 		userDeviceProcessor:                 processor.NewUserDeviceProcessorImpl(repos.userDeviceRepo),
 		notificationProcessor:               buildNotificationProcessor(cfg, repos),
+		productOutletPriceProcessor:         processor.NewProductOutletPriceProcessorImpl(repos.productOutletPriceRepo, repos.productRepo, repos.outletRepo),
+		expenseProcessor:                    processor.NewExpenseProcessorImpl(repos.expenseRepo),
 	}
 }
 
@@ -368,6 +422,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
@@ -381,6 +436,8 @@ type services struct {
 	spinGameService                   service.SpinGameService
 	userDeviceService                 service.UserDeviceService
 	notificationService               service.NotificationService
+	productOutletPriceService         service.ProductOutletPriceService
+	expenseService                    *service.ExpenseServiceImpl
 }
 
 func (a *App) initServices(processors *processors, repos *repositories, cfg *config.Config) *services {
@@ -393,7 +450,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	productService := service.NewProductService(processors.productProcessor)
 	productVariantService := service.NewProductVariantService(processors.productVariantProcessor)
 	inventoryService := service.NewInventoryService(processors.inventoryProcessor)
-	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager) // Will be updated after orderIngredientTransactionService is created
+	orderService := service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, nil, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo, processors.notificationProcessor, repos.userRepo) // Will be updated after orderIngredientTransactionService is created
 	paymentMethodService := service.NewPaymentMethodService(processors.paymentMethodProcessor)
 	fileService := service.NewFileServiceImpl(processors.fileProcessor)
 	var customerService service.CustomerService = service.NewCustomerService(processors.customerProcessor)
@@ -405,6 +462,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)
@@ -420,7 +478,7 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	notificationService := service.NewNotificationService(processors.notificationProcessor)
 
 	// Update order service with order ingredient transaction service
-	orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager)
+	orderService = service.NewOrderServiceImpl(processors.orderProcessor, repos.tableRepo, orderIngredientTransactionService, processors.orderIngredientTransactionProcessor, *repos.productRecipeRepo, repos.txManager, repos.sessionRepo, processors.notificationProcessor, repos.userRepo)
 
 	return &services{
 		userService:                       service.NewUserService(processors.userProcessor),
@@ -444,6 +502,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,
@@ -457,6 +516,8 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		spinGameService:                   spinGameService,
 		userDeviceService:                 userDeviceService,
 		notificationService:               notificationService,
+		productOutletPriceService:         service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
+		expenseService:                    service.NewExpenseService(processors.expenseProcessor),
 	}
 }
 
@@ -487,6 +548,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
@@ -498,6 +560,8 @@ type validators struct {
 	customerAuthValidator               validator.CustomerAuthValidator
 	userDeviceValidator                 *validator.UserDeviceValidatorImpl
 	notificationValidator               *validator.NotificationValidatorImpl
+	productOutletPriceValidator         *validator.ProductOutletPriceValidatorImpl
+	expenseValidator                    *validator.ExpenseValidatorImpl
 }
 
 func (a *App) initValidators() *validators {
@@ -516,6 +580,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),
@@ -527,6 +592,8 @@ func (a *App) initValidators() *validators {
 		customerAuthValidator:               validator.NewCustomerAuthValidator(),
 		userDeviceValidator:                 validator.NewUserDeviceValidator(),
 		notificationValidator:               validator.NewNotificationValidator(),
+		productOutletPriceValidator:         validator.NewProductOutletPriceValidator(),
+		expenseValidator:                    validator.NewExpenseValidator(),
 	}
 }
 

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"
@@ -59,6 +60,8 @@ const (
 	UserDeviceServiceEntity         = "user_device_service"
 	NotificationServiceEntity       = "notification_service"
 	NotificationHandlerEntity       = "notification_handler"
+	ProductOutletPriceServiceEntity = "product_outlet_price_service"
+	ExpenseServiceEntity            = "expense_service"
 )
 
 var HttpErrorMap = map[string]int{

internal/constants/expense.go

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

internal/constants/user.go

@@ -7,6 +7,7 @@ const (
 	RoleManager UserRole = "manager"
 	RoleCashier UserRole = "cashier"
 	RoleWaiter  UserRole = "waiter"
+	RoleOwner   UserRole = "owner"
 )
 
 func GetAllUserRoles() []UserRole {
@@ -15,6 +16,7 @@ func GetAllUserRoles() []UserRole {
 		RoleManager,
 		RoleCashier,
 		RoleWaiter,
+		RoleOwner,
 	}
 }
 

internal/contract/analytics_contract.go

@@ -8,7 +8,7 @@ import (
 
 type PaymentMethodAnalyticsRequest struct {
 	OrganizationID uuid.UUID `form:"organization_id"`
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	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"`
@@ -45,7 +45,7 @@ type PaymentMethodAnalyticsData struct {
 
 type SalesAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	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"`
@@ -83,10 +83,67 @@ type SalesAnalyticsData struct {
 	NetSales float64   `json:"net_sales"`
 }
 
+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"`
+}
+
+type PurchasingAnalyticsResponse 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"`
+	Summary        PurchasingSummary          `json:"summary"`
+	Data           []PurchasingAnalyticsData  `json:"data"`
+	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
+	VendorData     []PurchasingVendorData     `json:"vendor_data"`
+}
+
+type PurchasingSummary struct {
+	TotalPurchases            float64 `json:"total_purchases"`
+	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
+	TotalQuantity             float64 `json:"total_quantity"`
+	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
+	TotalIngredients          int64   `json:"total_ingredients"`
+	TotalVendors              int64   `json:"total_vendors"`
+}
+
+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"`
+}
+
+type PurchasingIngredientData struct {
+	IngredientID       uuid.UUID `json:"ingredient_id"`
+	IngredientName     string    `json:"ingredient_name"`
+	Quantity           float64   `json:"quantity"`
+	TotalCost          float64   `json:"total_cost"`
+	AverageUnitCost    float64   `json:"average_unit_cost"`
+	PurchaseOrderCount int64     `json:"purchase_order_count"`
+}
+
+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"`
+}
+
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
 	DateFrom       string  `form:"date_from" validate:"required"`
 	DateTo         string  `form:"date_to" validate:"required"`
 	Limit          int     `form:"limit,default=1000" validate:"min=1,max=1000"`
@@ -105,6 +162,7 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -123,7 +181,7 @@ type ProductAnalyticsData struct {
 // ProductAnalyticsPerCategoryRequest represents the request for product analytics per category
 type ProductAnalyticsPerCategoryRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
 	DateFrom       string  `form:"date_from" validate:"required"`
 	DateTo         string  `form:"date_to" validate:"required"`
 }
@@ -152,7 +210,7 @@ type ProductAnalyticsPerCategoryData struct {
 // DashboardAnalyticsRequest represents the request for dashboard analytics
 type DashboardAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	OutletID       *string `form:"outlet_id,omitempty"`
 	DateFrom       string  `form:"date_from" validate:"required"`
 	DateTo         string  `form:"date_to" validate:"required"`
 }
@@ -179,16 +237,14 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
-// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
+	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"`
 }
 
-// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
@@ -198,9 +254,11 @@ type ProfitLossAnalyticsResponse struct {
 	Summary                  ProfitLossSummary        `json:"summary"`
 	Data                     []ProfitLossData         `json:"data"`
 	ProductData              []ProductProfitData      `json:"product_data"`
+	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
+	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
+	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
-// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -215,7 +273,6 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
-// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -229,7 +286,6 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
-// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -244,3 +300,19 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
+
+type ProfitLossSummaryRow struct {
+	ID           string                 `json:"id"`
+	Label        string                 `json:"label"`
+	IsBold       bool                   `json:"is_bold"`
+	TodayNominal float64                `json:"today_nominal"`
+	TodayPct     float64                `json:"today_pct"`
+	MtdNominal   float64                `json:"mtd_nominal"`
+	MtdPct       float64                `json:"mtd_pct"`
+	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
+}
+
+type OperationalExpenseItem struct {
+	Item    string  `json:"item"`
+	Nominal float64 `json:"nominal"`
+}

internal/contract/category_contract.go

@@ -10,6 +10,7 @@ type CreateCategoryRequest struct {
 	Name         string                 `json:"name" validate:"required,min=1,max=255"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
@@ -18,12 +19,14 @@ type UpdateCategoryRequest struct {
 	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
+	OutletID     *uuid.UUID             `json:"outlet_id,omitempty"`
 	Order        *int                   `json:"order,omitempty"`
 	Metadata     map[string]interface{} `json:"metadata,omitempty"`
 }
 
 type ListCategoriesRequest struct {
 	OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
+	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
 	BusinessType   string     `json:"business_type,omitempty"`
 	Search         string     `json:"search,omitempty"`
 	Page           int        `json:"page" validate:"required,min=1"`
@@ -34,6 +37,7 @@ type ListCategoriesRequest struct {
 type CategoryResponse struct {
 	ID             uuid.UUID              `json:"id"`
 	OrganizationID uuid.UUID              `json:"organization_id"`
+	OutletID       *uuid.UUID             `json:"outlet_id"`
 	Name           string                 `json:"name"`
 	Description    *string                `json:"description"`
 	BusinessType   string                 `json:"business_type"`

internal/contract/expense_contract.go

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

@@ -81,4 +81,3 @@ type IngredientUnitsResponse struct {
 	BaseUnitName   string          `json:"base_unit_name"`
 	Units          []*UnitResponse `json:"units"`
 }
-

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

@@ -8,6 +8,7 @@ import (
 
 type CreateProductRequest struct {
 	CategoryID      uuid.UUID                     `json:"category_id" validate:"required"`
+	OutletID        *uuid.UUID                    `json:"outlet_id,omitempty"`
 	SKU             *string                       `json:"sku,omitempty"`
 	Name            string                        `json:"name" validate:"required,min=1,max=255"`
 	Description     *string                       `json:"description,omitempty"`
@@ -16,15 +17,17 @@ 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"`
-	InitialStock    *int                          `json:"initial_stock,omitempty" validate:"omitempty,min=0"` // Initial stock quantity for all outlets
-	ReorderLevel    *int                          `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Reorder level for all outlets
-	CreateInventory bool                          `json:"create_inventory,omitempty"`                         // Whether to create inventory records for all outlets
+	InitialStock    *int                          `json:"initial_stock,omitempty" validate:"omitempty,min=0"`
+	ReorderLevel    *int                          `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
+	CreateInventory bool                          `json:"create_inventory,omitempty"`
 }
 
 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"`
@@ -34,10 +37,10 @@ type UpdateProductRequest 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"`
-	// Stock management fields
-	ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Update reorder level for all existing inventory records
+	ReorderLevel   *int                   `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
 }
 
 type CreateProductVariantRequest struct {
@@ -64,10 +67,13 @@ type ProductResponse struct {
 	Name           string                       `json:"name"`
 	Description    *string                      `json:"description"`
 	Price          float64                      `json:"price"`
+	OutletPrice    *float64                     `json:"outlet_price,omitempty"`
+	OutletPrices   []ProductOutletPriceResponse `json:"outlet_prices,omitempty"`
 	Cost           float64                      `json:"cost"`
 	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"`
@@ -89,6 +95,7 @@ type ProductVariantResponse struct {
 
 type ListProductsRequest struct {
 	OrganizationID *uuid.UUID `json:"organization_id,omitempty"`
+	OutletID       *uuid.UUID `json:"outlet_id,omitempty"`
 	CategoryID     *uuid.UUID `json:"category_id,omitempty"`
 	BusinessType   string     `json:"business_type,omitempty"`
 	IsActive       *bool      `json:"is_active,omitempty"`

internal/contract/product_outlet_price_contract.go

@@ -0,0 +1,46 @@
+package contract
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+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"`
+	PrintToChecker bool      `json:"print_to_checker"`
+}
+
+type UpdateProductOutletPriceRequest struct {
+	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"`
+	PrintToChecker bool      `json:"print_to_checker"`
+	CreatedAt      time.Time `json:"created_at,omitempty"`
+	UpdatedAt      time.Time `json:"updated_at,omitempty"`
+}
+
+type ListProductOutletPricesResponse struct {
+	Prices     []ProductOutletPriceResponse `json:"prices"`
+	TotalCount int                          `json:"total_count"`
+}
+
+type BulkCreateProductOutletPriceRequest struct {
+	ProductID uuid.UUID                                  `json:"product_id" validate:"required"`
+	Prices    []CreateProductOutletPricePerOutletRequest `json:"prices" validate:"required,dive"`
+}
+
+type CreateProductOutletPricePerOutletRequest struct {
+	OutletID       uuid.UUID `json:"outlet_id" validate:"required"`
+	Price          float64   `json:"price" validate:"required,min=0"`
+	PrintToChecker bool      `json:"print_to_checker"`
+}

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 non_inventory"`
+	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 non_inventory"`
+	SortOrder *int       `json:"sort_order,omitempty"`
+	IsActive  *bool      `json:"is_active,omitempty"`
+}
+
+type ListPurchaseCategoriesRequest struct {
+	ParentID *uuid.UUID `json:"parent_id,omitempty"`
+	Type     string     `json:"type,omitempty" validate:"omitempty,oneof=raw_material non_inventory"`
+	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

@@ -10,7 +10,7 @@ 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
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -53,7 +53,7 @@ type PurchaseOrderResponse struct {
 	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`

internal/contract/self_order_contract.go

@@ -0,0 +1,82 @@
+package contract
+
+import (
+	"github.com/google/uuid"
+)
+
+type SelfOrderTableTokenResponse struct {
+	SessionID      string `json:"session_id"`
+	TableID        string `json:"table_id"`
+	OrganizationID string `json:"organization_id"`
+	OutletID       string `json:"outlet_id"`
+	TableName      string `json:"table_name"`
+	OutletName     string `json:"outlet_name"`
+	Status         string `json:"status"`
+}
+
+type SelfOrderMenuRequest struct {
+	SessionID string `form:"session_id" validate:"required"`
+}
+
+type SelfOrderMenuResponse struct {
+	OutletName string                  `json:"outlet_name"`
+	TableName  string                  `json:"table_name"`
+	Categories []SelfOrderMenuCategory `json:"categories"`
+}
+
+type SelfOrderMenuCategory struct {
+	ID          uuid.UUID           `json:"id"`
+	Name        string              `json:"name"`
+	Description *string             `json:"description,omitempty"`
+	Order       int                 `json:"order"`
+	Products    []SelfOrderMenuItem `json:"products"`
+}
+
+type SelfOrderMenuItem struct {
+	ID          uuid.UUID              `json:"id"`
+	Name        string                 `json:"name"`
+	Description *string                `json:"description,omitempty"`
+	Price       float64                `json:"price"`
+	ImageURL    *string                `json:"image_url,omitempty"`
+	Variants    []SelfOrderMenuVariant `json:"variants,omitempty"`
+}
+
+type SelfOrderMenuVariant struct {
+	ID            uuid.UUID `json:"id"`
+	Name          string    `json:"name"`
+	PriceModifier float64   `json:"price_modifier"`
+}
+
+type SelfOrderCreateOrderRequest struct {
+	SessionID    string                     `json:"session_id" validate:"required"`
+	CustomerName string                     `json:"customer_name" validate:"required"`
+	OrderType    string                     `json:"order_type" validate:"required,oneof=dine_in takeaway delivery"`
+	OrderItems   []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"`
+}
+
+type SelfOrderCreateOrderItem struct {
+	ProductID        uuid.UUID  `json:"product_id" validate:"required"`
+	ProductVariantID *uuid.UUID `json:"product_variant_id,omitempty"`
+	Quantity         int        `json:"quantity" validate:"required,min=1"`
+	Notes            *string    `json:"notes,omitempty"`
+}
+
+type SelfOrderListCategoriesRequest struct {
+	OrganizationID string `form:"organization_id" validate:"required"`
+	OutletID       string `form:"outlet_id" validate:"required"`
+}
+
+type SelfOrderCategoryItem struct {
+	ID          uuid.UUID `json:"id"`
+	Name        string    `json:"name"`
+	Description *string   `json:"description,omitempty"`
+	Order       int       `json:"order"`
+}
+
+type SelfOrderListCategoriesResponse struct {
+	Categories []SelfOrderCategoryItem `json:"categories"`
+}
+
+type SelfOrderListOrdersResponse struct {
+	Orders []OrderResponse `json:"orders"`
+}

internal/db/redis.go

@@ -0,0 +1,30 @@
+package db
+
+import (
+	"apskel-pos-be/config"
+	"fmt"
+
+	"github.com/redis/go-redis/v9"
+)
+
+func NewRedisClient(c config.Redis) (*redis.Client, error) {
+	opts := &redis.Options{
+		Addr:         c.Addr(),
+		Password:     c.Password,
+		DB:           c.DB,
+		DialTimeout:  c.ParseDialTimeout(),
+		ReadTimeout:  c.ParseReadTimeout(),
+		WriteTimeout: c.ParseWriteTimeout(),
+	}
+	if c.PoolSize > 0 {
+		opts.PoolSize = c.PoolSize
+	}
+	if c.MinIdleConnections > 0 {
+		opts.MinIdleConns = c.MinIdleConnections
+	}
+
+	client := redis.NewClient(opts)
+
+	fmt.Println("Successfully connected to Redis")
+	return client, nil
+}

internal/entities/analytics.go

@@ -27,10 +27,56 @@ type SalesAnalytics struct {
 	NetSales float64   `json:"net_sales"`
 }
 
+// PurchasingAnalytics represents purchasing analytics data
+type PurchasingAnalytics struct {
+	OutletName     *string                    `json:"outlet_name,omitempty"`
+	Summary        PurchasingSummary          `json:"summary"`
+	Data           []PurchasingAnalyticsData  `json:"data"`
+	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
+	VendorData     []PurchasingVendorData     `json:"vendor_data"`
+}
+
+type PurchasingSummary struct {
+	TotalPurchases            float64 `json:"total_purchases"`
+	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
+	TotalQuantity             float64 `json:"total_quantity"`
+	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
+	TotalIngredients          int64   `json:"total_ingredients"`
+	TotalVendors              int64   `json:"total_vendors"`
+}
+
+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"`
+}
+
+type PurchasingIngredientData struct {
+	IngredientID       uuid.UUID `json:"ingredient_id"`
+	IngredientName     string    `json:"ingredient_name"`
+	Quantity           float64   `json:"quantity"`
+	TotalCost          float64   `json:"total_cost"`
+	AverageUnitCost    float64   `json:"average_unit_cost"`
+	PurchaseOrderCount int64     `json:"purchase_order_count"`
+}
+
+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"`
+}
+
 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"`
@@ -68,54 +114,67 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
-// ProfitLossAnalytics represents profit and loss analytics data
 type ProfitLossAnalytics struct {
-	Summary     ProfitLossSummary   `json:"summary"`
-	Data        []ProfitLossData    `json:"data"`
-	ProductData []ProductProfitData `json:"product_data"`
+	Summary                 ProfitLossSummary
+	Data                    []ProfitLossData
+	ProductData             []ProductProfitData
+	TodayRevenue            float64
+	TodayCost               float64
+	MtdRevenue              float64
+	MtdCost                 float64
+	TodayExpenseByCategory  []ExpenseCategoryTotal
+	MtdExpenseByCategory    []ExpenseCategoryTotal
+	OperationalExpenseItems []OperationalExpenseItem
 }
 
-// ProfitLossSummary represents profit and loss summary data
 type ProfitLossSummary struct {
-	TotalRevenue       float64 `json:"total_revenue"`
-	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"`
+	TotalRevenue       float64
+	TotalCost          float64
+	GrossProfit        float64
+	GrossProfitMargin  float64
+	TotalTax           float64
+	TotalDiscount      float64
+	NetProfit          float64
+	NetProfitMargin    float64
+	TotalOrders        int64
+	AverageProfit      float64
+	ProfitabilityRatio float64
 }
 
-// ProfitLossData represents profit and loss data by time period
 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"`
+	Date              time.Time
+	Revenue           float64
+	Cost              float64
+	GrossProfit       float64
+	GrossProfitMargin float64
+	Tax               float64
+	Discount          float64
+	NetProfit         float64
+	NetProfitMargin   float64
+	Orders            int64
 }
 
-// ProductProfitData represents profit data for individual products
 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"`
+	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 {
+	CategoryName string
+	Amount       float64
+}
+
+type OperationalExpenseItem struct {
+	Item   string
+	Amount float64
 }

internal/entities/category.go

@@ -33,6 +33,7 @@ func (m *Metadata) Scan(value interface{}) error {
 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"`
 	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

@@ -37,6 +37,12 @@ func GetAllEntities() []interface{} {
 		&OtpSession{},
 		// Analytics entities are not database tables, they are query results
 		&UserDevice{},
+		// Notification entities
+		&Notification{},
+		&NotificationReceiver{},
+		&NotificationDelivery{},
+		&ProductOutletPrice{},
+		&Expense{},
 	}
 }
 

internal/entities/expense.go

@@ -0,0 +1,80 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+
+	"gorm.io/gorm"
+)
+
+type Expense struct {
+	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID  uuid.UUID `gorm:"type:uuid;not null;index" json:"organization_id"`
+	OutletID        uuid.UUID `gorm:"type:uuid;not null;index" json:"outlet_id"`
+	Receiver        string    `gorm:"not null;size:255" json:"receiver"`
+	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date"`
+	CodeNumber      string    `gorm:"not null;size:50" json:"code_number"`
+	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status"`
+	Description     *string   `gorm:"type:text" json:"description"`
+	Tax             float64   `gorm:"type:decimal(15,2);not null;default:0" json:"tax"`
+	Total           float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total"`
+	Reserved1       *string   `gorm:"type:text" json:"reserved1"`
+	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Organization *Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
+	Outlet       *Outlet       `gorm:"foreignKey:OutletID" json:"outlet,omitempty"`
+	Items        []ExpenseItem `gorm:"foreignKey:ExpenseID" json:"items,omitempty"`
+}
+
+type ExpenseAnalytics struct {
+	Summary      ExpenseAnalyticsSummary
+	Data         []ExpenseAnalyticsData
+	CategoryData []ExpenseAnalyticsCategoryData
+	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 {
+	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()
+	}
+	return nil
+}
+
+func (Expense) TableName() string {
+	return "expenses"
+}

internal/entities/expense_item.go

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

internal/entities/ingredient_unit_converter.go

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

internal/entities/product.go

@@ -33,6 +33,7 @@ type Product struct {
 	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_outlet_price.go

@@ -0,0 +1,32 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+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"`
+	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"`
+}
+
+func (p *ProductOutletPrice) BeforeCreate(tx *gorm.DB) error {
+	if p.ID == uuid.Nil {
+		p.ID = uuid.New()
+	}
+	return nil
+}
+
+func (ProductOutletPrice) TableName() string {
+	return "product_outlet_prices"
+}

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"
+	PurchaseCategoryTypeNonInventory PurchaseCategoryType = "non_inventory"
+)
+
+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

@@ -14,7 +14,7 @@ type PurchaseOrder struct {
 	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"`
+	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"`

internal/entities/table.go

@@ -1,6 +1,7 @@
 package entities
 
 import (
+	"apskel-pos-be/internal/pkg/tabletoken"
 	"time"
 
 	"github.com/google/uuid"
@@ -12,6 +13,7 @@ type Table struct {
 	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"`
 	TableName      string     `gorm:"not null;size:100" json:"table_name" validate:"required"`
+	Token          string     `gorm:"uniqueIndex;not null;size:255" json:"token"`
 	StartTime      *time.Time `gorm:"" json:"start_time"`
 	Status         string     `gorm:"default:'available';size:50" json:"status"`
 	OrderID        *uuid.UUID `gorm:"type:uuid;index" json:"order_id"`
@@ -33,6 +35,9 @@ func (t *Table) BeforeCreate(tx *gorm.DB) error {
 	if t.ID == uuid.Nil {
 		t.ID = uuid.New()
 	}
+	if t.Token == "" {
+		t.Token = tabletoken.Encode(t.ID, t.OrganizationID, t.OutletID)
+	}
 	return nil
 }
 

internal/handler/analytics_handler.go

@@ -8,6 +8,7 @@ import (
 	"apskel-pos-be/internal/util"
 
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
 type AnalyticsHandler struct {
@@ -25,6 +26,17 @@ func NewAnalyticsHandler(
 	}
 }
 
+func (h *AnalyticsHandler) resolveOutletID(c *gin.Context, contextOutletID uuid.UUID) *string {
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		return &outletIDStr
+	}
+	if contextOutletID != uuid.Nil {
+		s := contextOutletID.String()
+		return &s
+	}
+	return nil
+}
+
 func (h *AnalyticsHandler) GetPaymentMethodAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)
@@ -36,7 +48,7 @@ func (h *AnalyticsHandler) GetPaymentMethodAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.PaymentMethodAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetPaymentMethodAnalytics(ctx, modelReq)
@@ -60,7 +72,7 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.SalesAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetSalesAnalytics(ctx, modelReq)
@@ -73,6 +85,30 @@ func (h *AnalyticsHandler) GetSalesAnalytics(c *gin.Context) {
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetSalesAnalytics")
 }
 
+func (h *AnalyticsHandler) GetPurchasingAnalytics(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.PurchasingAnalyticsRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetPurchasingAnalytics", err.Error())}), "AnalyticsHandler::GetPurchasingAnalytics")
+		return
+	}
+
+	req.OrganizationID = contextInfo.OrganizationID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
+	modelReq := transformer.PurchasingAnalyticsContractToModel(&req)
+
+	response, err := h.analyticsService.GetPurchasingAnalytics(ctx, modelReq)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "AnalyticsHandler::GetPurchasingAnalytics", err.Error())}), "AnalyticsHandler::GetPurchasingAnalytics")
+		return
+	}
+
+	contractResp := transformer.PurchasingAnalyticsModelToContract(response)
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "AnalyticsHandler::GetPurchasingAnalytics")
+}
+
 func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
 	ctx := c.Request.Context()
 	contextInfo := appcontext.FromGinContext(ctx)
@@ -84,7 +120,7 @@ func (h *AnalyticsHandler) GetProductAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.ProductAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetProductAnalytics(ctx, modelReq)
@@ -108,7 +144,7 @@ func (h *AnalyticsHandler) GetProductAnalyticsPerCategory(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.ProductAnalyticsPerCategoryContractToModel(&req)
 
 	response, err := h.analyticsService.GetProductAnalyticsPerCategory(ctx, modelReq)
@@ -132,7 +168,7 @@ func (h *AnalyticsHandler) GetDashboardAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
-	req.OutletID = &contextInfo.OutletID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq := transformer.DashboardAnalyticsContractToModel(&req)
 
 	response, err := h.analyticsService.GetDashboardAnalytics(ctx, modelReq)
@@ -156,6 +192,7 @@ func (h *AnalyticsHandler) GetProfitLossAnalytics(c *gin.Context) {
 	}
 
 	req.OrganizationID = contextInfo.OrganizationID
+	req.OutletID = h.resolveOutletID(c, contextInfo.OutletID)
 	modelReq, err := transformer.ProfitLossAnalyticsContractToModel(&req)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("invalid_request", "AnalyticsHandler::GetProfitLossAnalytics", err.Error())}), "AnalyticsHandler::GetProfitLossAnalytics")

internal/handler/category_handler.go

@@ -44,6 +44,11 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
 		return
 	}
 
+	// Inject outlet_id from context if user has one and request doesn't provide it
+	if req.OutletID == nil && contextInfo.OutletID != uuid.Nil {
+		req.OutletID = &contextInfo.OutletID
+	}
+
 	validationError, validationErrorCode := h.categoryValidator.ValidateCreateCategoryRequest(&req)
 	if validationError != nil {
 		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
@@ -149,6 +154,11 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		OrganizationID: &contextInfo.OrganizationID,
 	}
 
+	// Inject outlet_id from context if user has one
+	if contextInfo.OutletID != uuid.Nil {
+		req.OutletID = &contextInfo.OutletID
+	}
+
 	// Parse query parameters
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil {
@@ -176,6 +186,11 @@ func (h *CategoryHandler) ListCategories(c *gin.Context) {
 		}
 	}
 
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		if outletID, err := uuid.Parse(outletIDStr); err == nil {
+			req.OutletID = &outletID
+		}
+	}
 	validationError, validationErrorCode := h.categoryValidator.ValidateListCategoriesRequest(req)
 	if validationError != nil {
 		logger.FromContext(ctx).WithError(validationError).Error("CategoryHandler::ListCategories -> request validation failed")

internal/handler/common.go

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

internal/handler/expense_handler.go

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

@@ -137,6 +137,10 @@ func (h *OrderHandler) ListOrders(c *gin.Context) {
 	}
 
 	modelReq.OrganizationID = &contextInfo.OrganizationID
+	if modelReq.OutletID == nil && contextInfo.OutletID != uuid.Nil {
+		modelReq.OutletID = &contextInfo.OutletID
+	}
+
 	response, err := h.orderService.ListOrders(c.Request.Context(), modelReq)
 	if err != nil {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{contract.NewResponseError("internal_error", "OrderHandler::ListOrders", err.Error())}), "OrderHandler::ListOrders")

internal/handler/product_handler.go

@@ -60,6 +60,7 @@ func (h *ProductHandler) CreateProduct(c *gin.Context) {
 
 func (h *ProductHandler) UpdateProduct(c *gin.Context) {
 	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
 
 	productIDStr := c.Param("id")
 	productID, err := uuid.Parse(productIDStr)
@@ -85,7 +86,7 @@ func (h *ProductHandler) UpdateProduct(c *gin.Context) {
 		return
 	}
 
-	productResponse := h.productService.UpdateProduct(ctx, productID, &req)
+	productResponse := h.productService.UpdateProduct(ctx, contextInfo, productID, &req)
 	if productResponse.HasErrors() {
 		errorResp := productResponse.GetErrors()[0]
 		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::UpdateProduct -> Failed to update product from service")
@@ -117,6 +118,7 @@ func (h *ProductHandler) DeleteProduct(c *gin.Context) {
 
 func (h *ProductHandler) GetProduct(c *gin.Context) {
 	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
 
 	productIDStr := c.Param("id")
 	productID, err := uuid.Parse(productIDStr)
@@ -127,7 +129,7 @@ func (h *ProductHandler) GetProduct(c *gin.Context) {
 		return
 	}
 
-	productResponse := h.productService.GetProductByID(ctx, productID)
+	productResponse := h.productService.GetProductByID(ctx, productID, contextInfo.OutletID)
 	if productResponse.HasErrors() {
 		errorResp := productResponse.GetErrors()[0]
 		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::GetProduct -> Failed to get product from service")
@@ -184,6 +186,97 @@ func (h *ProductHandler) ListProducts(c *gin.Context) {
 		}
 	}
 
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		if outletID, err := uuid.Parse(outletIDStr); err == nil {
+			req.OutletID = &outletID
+		}
+	} else if contextInfo.OutletID != uuid.Nil {
+		req.OutletID = &contextInfo.OutletID
+	}
+
+	if minPriceStr := c.Query("min_price"); minPriceStr != "" {
+		if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
+			req.MinPrice = &minPrice
+		}
+	}
+
+	if maxPriceStr := c.Query("max_price"); maxPriceStr != "" {
+		if maxPrice, err := strconv.ParseFloat(maxPriceStr, 64); err == nil {
+			req.MaxPrice = &maxPrice
+		}
+	}
+
+	validationError, validationErrorCode := h.productValidator.ValidateListProductsRequest(req)
+	if validationError != nil {
+		logger.FromContext(ctx).WithError(validationError).Error("ProductHandler::ListProducts -> request validation failed")
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductHandler::ListProducts")
+		return
+	}
+
+	productsResponse := h.productService.ListProducts(ctx, req)
+	if productsResponse.HasErrors() {
+		errorResp := productsResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("ProductHandler::ListProducts -> Failed to list products from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, productsResponse, "ProductHandler::ListProducts")
+}
+
+func (h *ProductHandler) ListProductAll(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	req := &contract.ListProductsRequest{
+		Page:           1,
+		Limit:          10,
+		OrganizationID: &contextInfo.OrganizationID,
+	}
+
+	if pageStr := c.Query("page"); pageStr != "" {
+		if page, err := strconv.Atoi(pageStr); err == nil {
+			req.Page = page
+		}
+	}
+
+	if limitStr := c.Query("limit"); limitStr != "" {
+		if limit, err := strconv.Atoi(limitStr); err == nil {
+			req.Limit = limit
+		}
+	}
+
+	if search := c.Query("search"); search != "" {
+		req.Search = search
+	}
+
+	if businessType := c.Query("business_type"); businessType != "" {
+		req.BusinessType = businessType
+	}
+
+	if organizationIDStr := c.Query("organization_id"); organizationIDStr != "" {
+		if organizationID, err := uuid.Parse(organizationIDStr); err == nil {
+			req.OrganizationID = &organizationID
+		}
+	}
+
+	if categoryIDStr := c.Query("category_id"); categoryIDStr != "" {
+		if categoryID, err := uuid.Parse(categoryIDStr); err == nil {
+			req.CategoryID = &categoryID
+		}
+	}
+
+	if isActiveStr := c.Query("is_active"); isActiveStr != "" {
+		if isActive, err := strconv.ParseBool(isActiveStr); err == nil {
+			req.IsActive = &isActive
+		}
+	}
+
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		if outletID, err := uuid.Parse(outletIDStr); err == nil {
+			req.OutletID = &outletID
+		}
+	}
+
 	if minPriceStr := c.Query("min_price"); minPriceStr != "" {
 		if minPrice, err := strconv.ParseFloat(minPriceStr, 64); err == nil {
 			req.MinPrice = &minPrice

internal/handler/product_outlet_price_handler.go

@@ -0,0 +1,135 @@
+package handler
+
+import (
+	"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 ProductOutletPriceHandler struct {
+	service   service.ProductOutletPriceService
+	validator validator.ProductOutletPriceValidator
+}
+
+func NewProductOutletPriceHandler(svc service.ProductOutletPriceService, v validator.ProductOutletPriceValidator) *ProductOutletPriceHandler {
+	return &ProductOutletPriceHandler{
+		service:   svc,
+		validator: v,
+	}
+}
+
+func (h *ProductOutletPriceHandler) Upsert(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.CreateProductOutletPriceRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ProductOutletPriceHandler::Upsert -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Upsert")
+		return
+	}
+
+	if validationErr, code := h.validator.ValidateCreateRequest(&req); validationErr != nil {
+		validationResponseError := contract.NewResponseError(code, constants.RequestEntity, validationErr.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Upsert")
+		return
+	}
+
+	resp := h.service.Upsert(ctx, &req)
+	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::Upsert")
+}
+
+func (h *ProductOutletPriceHandler) GetByProductAndOutlet(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	productIDStr := c.Param("product_id")
+	productID, err := uuid.Parse(productIDStr)
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid product ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProductAndOutlet")
+		return
+	}
+
+	outletIDStr := c.Param("outlet_id")
+	outletID, err := uuid.Parse(outletIDStr)
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid outlet ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProductAndOutlet")
+		return
+	}
+
+	resp := h.service.GetByProductAndOutlet(ctx, productID, outletID)
+	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByProductAndOutlet")
+}
+
+func (h *ProductOutletPriceHandler) GetByProduct(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	productIDStr := c.Param("product_id")
+	productID, err := uuid.Parse(productIDStr)
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid product ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByProduct")
+		return
+	}
+
+	resp := h.service.GetByProduct(ctx, productID)
+	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByProduct")
+}
+
+func (h *ProductOutletPriceHandler) GetByOutlet(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	outletIDStr := c.Param("outlet_id")
+	outletID, err := uuid.Parse(outletIDStr)
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid outlet ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::GetByOutlet")
+		return
+	}
+
+	resp := h.service.GetByOutlet(ctx, outletID)
+	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::GetByOutlet")
+}
+
+func (h *ProductOutletPriceHandler) Delete(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	idStr := c.Param("id")
+	id, err := uuid.Parse(idStr)
+	if err != nil {
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::Delete")
+		return
+	}
+
+	resp := h.service.Delete(ctx, id)
+	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::Delete")
+}
+
+func (h *ProductOutletPriceHandler) BulkUpsert(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.BulkCreateProductOutletPriceRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("ProductOutletPriceHandler::BulkUpsert -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::BulkUpsert")
+		return
+	}
+
+	if validationErr, code := h.validator.ValidateBulkCreateRequest(&req); validationErr != nil {
+		validationResponseError := contract.NewResponseError(code, constants.RequestEntity, validationErr.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "ProductOutletPriceHandler::BulkUpsert")
+		return
+	}
+
+	resp := h.service.BulkUpsert(ctx, &req)
+	util.HandleResponse(c.Writer, c.Request, resp, "ProductOutletPriceHandler::BulkUpsert")
+}

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/report_handler.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
 type ReportHandler struct {
@@ -19,11 +20,26 @@ func NewReportHandler(reportService service.ReportService, userService UserServi
 	return &ReportHandler{reportService: reportService, userService: userService}
 }
 
+func (h *ReportHandler) resolveOutletID(c *gin.Context, contextOutletID uuid.UUID) string {
+	if outletIDStr := c.Query("outlet_id"); outletIDStr != "" {
+		if _, err := uuid.Parse(outletIDStr); err == nil {
+			return outletIDStr
+		}
+	}
+	if pathOutletID := c.Param("outlet_id"); pathOutletID != "" {
+		return pathOutletID
+	}
+	if contextOutletID != uuid.Nil {
+		return contextOutletID.String()
+	}
+	return ""
+}
+
 func (h *ReportHandler) GetDailyTransactionReportPDF(c *gin.Context) {
 	ctx := c.Request.Context()
 	ci := appcontext.FromGinContext(ctx)
 
-	outletID := c.Param("outlet_id")
+	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 {

internal/handler/self_order_handler.go

@@ -0,0 +1,571 @@
+package handler
+
+import (
+	"apskel-pos-be/internal/constants"
+	"apskel-pos-be/internal/contract"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+	"apskel-pos-be/internal/pkg/tabletoken"
+	"apskel-pos-be/internal/processor"
+	"apskel-pos-be/internal/repository"
+	"apskel-pos-be/internal/service"
+	"apskel-pos-be/internal/transformer"
+	"apskel-pos-be/internal/util"
+	"context"
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type SelfOrderHandler struct {
+	orderService              service.OrderService
+	categoryService           service.CategoryService
+	productService            service.ProductService
+	tableRepo                 repository.TableRepositoryInterface
+	outletRepo                processor.OutletRepository
+	userRepo                  processor.UserRepository
+	sessionRepo               repository.SessionRepository
+	orderRepo                 repository.OrderRepository
+	productOutletPriceService service.ProductOutletPriceService
+}
+
+func NewSelfOrderHandler(
+	orderService service.OrderService,
+	categoryService service.CategoryService,
+	productService service.ProductService,
+	tableRepo repository.TableRepositoryInterface,
+	outletRepo processor.OutletRepository,
+	userRepo processor.UserRepository,
+	sessionRepo repository.SessionRepository,
+	orderRepo repository.OrderRepository,
+	productOutletPriceService service.ProductOutletPriceService,
+) *SelfOrderHandler {
+	return &SelfOrderHandler{
+		orderService:              orderService,
+		categoryService:           categoryService,
+		productService:            productService,
+		tableRepo:                 tableRepo,
+		outletRepo:                outletRepo,
+		userRepo:                  userRepo,
+		sessionRepo:               sessionRepo,
+		orderRepo:                 orderRepo,
+		productOutletPriceService: productOutletPriceService,
+	}
+}
+
+func (h *SelfOrderHandler) ValidateToken(c *gin.Context) {
+	ctx := c.Request.Context()
+	token := c.Param("token")
+
+	if token == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "token is required"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	tableID, orgID, outletID, err := tabletoken.Decode(token)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> invalid token")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid table token"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	table, err := h.tableRepo.GetByID(ctx, tableID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> table not found")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "table not found"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	if !table.IsActive {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "table is not active"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	if table.OrganizationID != orgID || table.OutletID != outletID {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "token does not match table"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	outlet, err := h.outletRepo.GetByID(ctx, table.OutletID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> outlet not found")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.OrderServiceEntity, "outlet not found"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	existingSession, err := h.sessionRepo.GetActiveByTableID(ctx, table.ID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> failed to check session")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to check session"),
+		}), "SelfOrderHandler::ValidateToken")
+		return
+	}
+
+	var sessionStatus string
+	var sessionID string
+
+	if existingSession != nil {
+		sessionStatus = "joined_session"
+		sessionID = existingSession.ID
+	} else {
+		session := &models.SelfOrderSession{
+			TableID:        table.ID,
+			OrganizationID: table.OrganizationID,
+			OutletID:       table.OutletID,
+		}
+		if err := h.sessionRepo.Create(ctx, session); err != nil {
+			logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ValidateToken -> failed to create session")
+			util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+				contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to create session"),
+			}), "SelfOrderHandler::ValidateToken")
+			return
+		}
+		sessionStatus = "new_session"
+		sessionID = session.ID
+	}
+
+	resp := &contract.SelfOrderTableTokenResponse{
+		SessionID:      sessionID,
+		TableID:        table.ID.String(),
+		OrganizationID: table.OrganizationID.String(),
+		OutletID:       table.OutletID.String(),
+		TableName:      table.TableName,
+		OutletName:     outlet.Name,
+		Status:         sessionStatus,
+	}
+
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(resp), "SelfOrderHandler::ValidateToken")
+}
+
+func (h *SelfOrderHandler) GetMenu(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.SelfOrderMenuRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetMenu -> query binding failed")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	session, table, outlet, err := h.resolveSession(ctx, req.SessionID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+	if session == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	isActive := true
+	catResp := h.categoryService.ListCategories(ctx, &contract.ListCategoriesRequest{
+		OrganizationID: &table.OrganizationID,
+		Page:           1,
+		Limit:          100,
+	})
+	if catResp.HasErrors() {
+		logger.FromContext(ctx).WithError(catResp.GetErrors()[0]).Error("SelfOrderHandler::GetMenu -> failed to list categories")
+		util.HandleResponse(c.Writer, c.Request, catResp, "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	prodResp := h.productService.ListProducts(ctx, &contract.ListProductsRequest{
+		OrganizationID: &table.OrganizationID,
+		IsActive:       &isActive,
+		Page:           1,
+		Limit:          1000,
+	})
+	if prodResp.HasErrors() {
+		logger.FromContext(ctx).WithError(prodResp.GetErrors()[0]).Error("SelfOrderHandler::GetMenu -> failed to list products")
+		util.HandleResponse(c.Writer, c.Request, prodResp, "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	catList, ok := catResp.Data.(*contract.ListCategoriesResponse)
+	if !ok {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.CategoryServiceEntity, "unexpected categories response type"),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	prodList, ok := prodResp.Data.(*contract.ListProductsResponse)
+	if !ok {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.ProductServiceEntity, "unexpected products response type"),
+		}), "SelfOrderHandler::GetMenu")
+		return
+	}
+
+	menu := h.buildMenuResponse(ctx, outlet, table, catList.Categories, prodList.Products)
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(menu), "SelfOrderHandler::GetMenu")
+}
+
+func (h *SelfOrderHandler) buildMenuResponse(
+	ctx context.Context,
+	outlet *entities.Outlet,
+	table *entities.Table,
+	categories []contract.CategoryResponse,
+	products []contract.ProductResponse,
+) *contract.SelfOrderMenuResponse {
+	outletPriceMap := make(map[uuid.UUID]float64)
+	if h.productOutletPriceService != nil {
+		priceResp := h.productOutletPriceService.GetByOutlet(ctx, outlet.ID)
+		if priceResp != nil && !priceResp.HasErrors() {
+			if priceList, ok := priceResp.Data.(*contract.ListProductOutletPricesResponse); ok {
+				for _, p := range priceList.Prices {
+					outletPriceMap[p.ProductID] = p.Price
+				}
+			}
+		}
+	}
+
+	productMap := make(map[uuid.UUID][]contract.ProductResponse)
+	for _, p := range products {
+		productMap[p.CategoryID] = append(productMap[p.CategoryID], p)
+	}
+
+	menuCategories := make([]contract.SelfOrderMenuCategory, 0, len(categories))
+	for _, cat := range categories {
+		menuItems := make([]contract.SelfOrderMenuItem, 0)
+		if prods, ok := productMap[cat.ID]; ok {
+			for _, p := range prods {
+				price := p.Price
+				if outletPrice, exists := outletPriceMap[p.ID]; exists {
+					price = outletPrice
+				}
+				item := contract.SelfOrderMenuItem{
+					ID:          p.ID,
+					Name:        p.Name,
+					Description: p.Description,
+					Price:       price,
+					ImageURL:    p.ImageURL,
+				}
+				for _, v := range p.Variants {
+					item.Variants = append(item.Variants, contract.SelfOrderMenuVariant{
+						ID:            v.ID,
+						Name:          v.Name,
+						PriceModifier: v.PriceModifier,
+					})
+				}
+				menuItems = append(menuItems, item)
+			}
+		}
+		menuCategories = append(menuCategories, contract.SelfOrderMenuCategory{
+			ID:          cat.ID,
+			Name:        cat.Name,
+			Description: cat.Description,
+			Order:       cat.Order,
+			Products:    menuItems,
+		})
+	}
+
+	return &contract.SelfOrderMenuResponse{
+		OutletName: outlet.Name,
+		TableName:  table.TableName,
+		Categories: menuCategories,
+	}
+}
+
+func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.SelfOrderCreateOrderRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> request binding failed")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	if err := h.validateCreateOrderRequest(&req); err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	session, table, _, err := h.resolveSession(ctx, req.SessionID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+	if session == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found or expired"),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	if !table.IsActive || !table.IsAvailable() {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.TableEntity, "table is not available for ordering"),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	userID, err := h.resolveOrgUser(ctx, table.OrganizationID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> failed to resolve org user")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to create self-order"),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	orderItems := make([]models.CreateOrderItemRequest, 0, len(req.OrderItems))
+	for _, item := range req.OrderItems {
+		orderItems = append(orderItems, models.CreateOrderItemRequest{
+			ProductID:        item.ProductID,
+			ProductVariantID: item.ProductVariantID,
+			Quantity:         item.Quantity,
+			Notes:            item.Notes,
+		})
+	}
+
+	metadata := make(map[string]interface{})
+	metadata["self_order"] = true
+	metadata["session_id"] = session.ID
+	metadata["customer_name"] = req.CustomerName
+
+	tableID := table.ID
+	modelReq := &models.CreateOrderRequest{
+		OutletID:    table.OutletID,
+		UserID:      userID,
+		TableID:     &tableID,
+		TableNumber: &table.TableName,
+		OrderType:   constants.OrderType(req.OrderType),
+		OrderItems:  orderItems,
+		Metadata:    metadata,
+	}
+
+	response, err := h.orderService.CreateOrder(ctx, modelReq, table.OrganizationID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::CreateOrder -> failed to create order")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, err.Error()),
+		}), "SelfOrderHandler::CreateOrder")
+		return
+	}
+
+	contractResp := transformer.OrderModelToContract(response)
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "SelfOrderHandler::CreateOrder")
+}
+
+func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
+	ctx := c.Request.Context()
+	sessionID := c.Param("session_id")
+
+	if sessionID == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "session_id is required"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+
+	session, err := h.sessionRepo.GetByID(ctx, sessionID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetOrdersBySession -> failed to get session")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+	if session == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "session not found"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+
+	orders, err := h.orderRepo.ListBySessionID(ctx, sessionID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::GetOrdersBySession -> failed to list orders")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.OrderServiceEntity, "failed to list orders"),
+		}), "SelfOrderHandler::GetOrdersBySession")
+		return
+	}
+
+	modelOrders := mappers.OrderEntitiesToResponses(orders)
+	contractOrders := make([]contract.OrderResponse, len(modelOrders))
+	for i := range modelOrders {
+		contractOrders[i] = *transformer.OrderModelToContract(&modelOrders[i])
+	}
+
+	resp := &contract.SelfOrderListOrdersResponse{
+		Orders: contractOrders,
+	}
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(resp), "SelfOrderHandler::GetOrdersBySession")
+}
+
+func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCreateOrderRequest) error {
+	if req.SessionID == "" {
+		return fmt.Errorf("session_id is required")
+	}
+	if len(req.OrderItems) == 0 {
+
+		return fmt.Errorf("at least one order item is required")
+	}
+	for i, item := range req.OrderItems {
+		if item.ProductID == uuid.Nil {
+			return fmt.Errorf("product_id is required for item %d", i+1)
+		}
+		if item.Quantity <= 0 {
+			return fmt.Errorf("quantity must be greater than zero for item %d", i+1)
+		}
+	}
+	return nil
+}
+
+func (h *SelfOrderHandler) ListCategories(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req contract.SelfOrderListCategoriesRequest
+	if err := c.ShouldBindQuery(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("SelfOrderHandler::ListCategories -> query binding failed")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error()),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	if req.OrganizationID == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organization_id is required"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	if req.OutletID == "" {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "outlet_id is required"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	orgID, err := uuid.Parse(req.OrganizationID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid organization_id format"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	outletID, err := uuid.Parse(req.OutletID)
+	if err != nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid outlet_id format"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	outlet, err := h.outletRepo.GetByID(ctx, outletID)
+	if err != nil || outlet == nil {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.NotFoundErrorCode, constants.RequestEntity, "outlet not found"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	if outlet.OrganizationID != orgID {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "outlet does not belong to the specified organization"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	catResp := h.categoryService.ListCategories(ctx, &contract.ListCategoriesRequest{
+		OrganizationID: &orgID,
+		Page:           1,
+		Limit:          100,
+	})
+	if catResp.HasErrors() {
+		logger.FromContext(ctx).WithError(catResp.GetErrors()[0]).Error("SelfOrderHandler::ListCategories -> failed to list categories")
+		util.HandleResponse(c.Writer, c.Request, catResp, "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	catList, ok := catResp.Data.(*contract.ListCategoriesResponse)
+	if !ok {
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
+			contract.NewResponseError(constants.InternalServerErrorCode, constants.CategoryServiceEntity, "unexpected categories response type"),
+		}), "SelfOrderHandler::ListCategories")
+		return
+	}
+
+	items := make([]contract.SelfOrderCategoryItem, 0, len(catList.Categories))
+	for _, cat := range catList.Categories {
+		items = append(items, contract.SelfOrderCategoryItem{
+			ID:          cat.ID,
+			Name:        cat.Name,
+			Description: cat.Description,
+			Order:       cat.Order,
+		})
+	}
+
+	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(&contract.SelfOrderListCategoriesResponse{
+		Categories: items,
+	}), "SelfOrderHandler::ListCategories")
+}
+
+func (h *SelfOrderHandler) resolveSession(ctx context.Context, sessionID string) (*models.SelfOrderSession, *entities.Table, *entities.Outlet, error) {
+	session, err := h.sessionRepo.GetByID(ctx, sessionID)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("failed to get session: %w", err)
+	}
+	if session == nil {
+		return nil, nil, nil, nil
+	}
+	if session.Status != "active" {
+		return nil, nil, nil, fmt.Errorf("session is no longer active")
+	}
+
+	table, err := h.tableRepo.GetByID(ctx, session.TableID)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("table not found for session")
+	}
+
+	outlet, err := h.outletRepo.GetByID(ctx, table.OutletID)
+	if err != nil {
+		return nil, nil, nil, fmt.Errorf("outlet not found for session")
+	}
+
+	return session, table, outlet, nil
+}
+
+func (h *SelfOrderHandler) resolveOrgUser(ctx context.Context, organizationID uuid.UUID) (uuid.UUID, error) {
+	users, err := h.userRepo.GetByOrganizationID(ctx, organizationID)
+	if err != nil {
+		return uuid.Nil, fmt.Errorf("failed to get users for organization: %w", err)
+	}
+	if len(users) == 0 {
+		return uuid.Nil, fmt.Errorf("no users found for organization")
+	}
+	return users[0].ID, nil
+}

internal/handler/table_handler.go

@@ -5,8 +5,11 @@ import (
 	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/contract"
 	"apskel-pos-be/internal/logger"
+	"apskel-pos-be/internal/pkg/qrcode"
 	"apskel-pos-be/internal/util"
 	"apskel-pos-be/internal/validator"
+	"fmt"
+	"net/http"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
@@ -16,12 +19,14 @@ import (
 type TableHandler struct {
 	tableService   TableService
 	tableValidator *validator.TableValidator
+	selfOrderURL   string
 }
 
-func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator) *TableHandler {
+func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, selfOrderURL string) *TableHandler {
 	return &TableHandler{
 		tableService:   tableService,
 		tableValidator: tableValidator,
+		selfOrderURL:   selfOrderURL,
 	}
 }
 
@@ -145,6 +150,11 @@ func (h *TableHandler) List(c *gin.Context) {
 		Limit:          100,
 	}
 
+	// Fallback to context outlet ID if not provided in query
+	if query.OutletID == "" && contextInfo.OutletID != uuid.Nil {
+		query.OutletID = contextInfo.OutletID.String()
+	}
+
 	if pageStr := c.Query("page"); pageStr != "" {
 		if page, err := strconv.Atoi(pageStr); err == nil && page > 0 {
 			query.Page = page
@@ -286,3 +296,45 @@ func (h *TableHandler) GetOccupiedTables(c *gin.Context) {
 
 	util.HandleResponse(c.Writer, c.Request, response, "TableHandler::GetOccupiedTables")
 }
+
+func (h *TableHandler) GenerateQRCode(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	id := c.Param("id")
+	tableID, err := uuid.Parse(id)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> Invalid table ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid table ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode")
+		return
+	}
+
+	token, err := h.tableService.GetTableToken(ctx, tableID)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> table not found")
+		validationResponseError := contract.NewResponseError(constants.NotFoundErrorCode, constants.TableEntity, "Table not found")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode")
+		return
+	}
+
+	selfOrderURLResult := fmt.Sprintf("%s/menu?token=%s", h.selfOrderURL, token)
+
+	size := 256
+	if sizeStr := c.Query("size"); sizeStr != "" {
+		if s, err := strconv.Atoi(sizeStr); err == nil && s > 0 && s <= 1024 {
+			size = s
+		}
+	}
+
+	pngBytes, err := qrcode.GeneratePNG(selfOrderURLResult, size)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("TableHandler::GenerateQRCode -> QR generation failed")
+		validationResponseError := contract.NewResponseError(constants.InternalServerErrorCode, constants.TableEntity, "Failed to generate QR code")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "TableHandler::GenerateQRCode")
+		return
+	}
+
+	c.Header("Content-Type", "image/png")
+	c.Header("Content-Disposition", fmt.Sprintf("inline; filename=\"table-%s-qr.png\"", tableID))
+	c.Data(http.StatusOK, "image/png", pngBytes)
+}

internal/handler/table_service.go

@@ -17,4 +17,5 @@ type TableService interface {
 	ReleaseTable(ctx context.Context, tableID uuid.UUID, req *contract.ReleaseTableRequest) *contract.Response
 	GetAvailableTables(ctx context.Context, outletID uuid.UUID) *contract.Response
 	GetOccupiedTables(ctx context.Context, outletID uuid.UUID) *contract.Response
+	GetTableToken(ctx context.Context, tableID uuid.UUID) (string, error)
 }

internal/mappers/category_mapper.go

@@ -13,11 +13,12 @@ func CategoryEntityToModel(entity *entities.Category) *models.Category {
 	return &models.Category{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
+		OutletID:       entity.OutletID,
 		Name:           entity.Name,
 		Description:    entity.Description,
-		ImageURL:       nil,  // Entity doesn't have ImageURL, model does
-		Order:      	entity.Order,    // Entity doesn't have SortOrder, model does
-		IsActive:       true, // Entity doesn't have IsActive, default to true
+		ImageURL:       nil,
+		Order:          entity.Order,
+		IsActive:       true,
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
 	}
@@ -32,14 +33,14 @@ func CategoryModelToEntity(model *models.Category) *entities.Category {
 	if model.ImageURL != nil {
 		metadata["image_url"] = *model.ImageURL
 	}
-	// metadata["sort_order"] = model.SortOrder
 
 	return &entities.Category{
 		ID:             model.ID,
 		OrganizationID: model.OrganizationID,
+		OutletID:       model.OutletID,
 		Name:           model.Name,
 		Description:    model.Description,
-		BusinessType:   "restaurant", // Default business type
+		BusinessType:   "restaurant",
 		Order:          model.Order,
 		Metadata:       metadata,
 		CreatedAt:      model.CreatedAt,
@@ -56,14 +57,14 @@ func CreateCategoryRequestToEntity(req *models.CreateCategoryRequest) *entities.
 	if req.ImageURL != nil {
 		metadata["image_url"] = *req.ImageURL
 	}
-	// metadata["sort_order"] = req.SortOrder
 
 	return &entities.Category{
 		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
 		Name:           req.Name,
 		Description:    req.Description,
 		Order:          req.Order,
-		BusinessType:   "restaurant", // Default business type
+		BusinessType:   "restaurant",
 		Metadata:       metadata,
 	}
 }
@@ -87,11 +88,12 @@ func CategoryEntityToResponse(entity *entities.Category) *models.CategoryRespons
 	return &models.CategoryResponse{
 		ID:             entity.ID,
 		OrganizationID: entity.OrganizationID,
+		OutletID:       entity.OutletID,
 		Name:           entity.Name,
 		Description:    entity.Description,
 		ImageURL:       imageURL,
 		Order:          entity.Order,
-		IsActive:       true, // Default to true since entity doesn't have this field
+		IsActive:       true,
 		CreatedAt:      entity.CreatedAt,
 		UpdatedAt:      entity.UpdatedAt,
 	}
@@ -121,6 +123,10 @@ func UpdateCategoryEntityFromRequest(entity *entities.Category, req *models.Upda
 	if req.Order != nil {
 		entity.Order = *req.Order
 	}
+
+	if req.OutletID != nil {
+		entity.OutletID = req.OutletID
+	}
 }
 
 func CategoryEntitiesToModels(entities []*entities.Category) []*models.Category {

internal/mappers/expense_mapper.go

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

internal/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_mapper.go

@@ -135,6 +135,7 @@ func ProductEntityToResponse(entity *entities.Product) *models.ProductResponse {
 		Name:           entity.Name,
 		Description:    entity.Description,
 		Price:          entity.Price,
+		OutletPrice:    nil, // populated by processor when outletID is available
 		Cost:           entity.Cost,
 		BusinessType:   constants.BusinessType(entity.BusinessType),
 		ImageURL:       entity.ImageURL,

internal/mappers/product_outlet_price_mapper.go

@@ -0,0 +1,50 @@
+package mappers
+
+import (
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+)
+
+func ProductOutletPriceEntityToModel(entity *entities.ProductOutletPrice) *models.ProductOutletPrice {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.ProductOutletPrice{
+		ID:             entity.ID,
+		ProductID:      entity.ProductID,
+		OutletID:       entity.OutletID,
+		Price:          entity.Price,
+		PrintToChecker: entity.PrintToChecker,
+		CreatedAt:      entity.CreatedAt,
+		UpdatedAt:      entity.UpdatedAt,
+	}
+}
+
+func ProductOutletPriceModelToEntity(model *models.ProductOutletPrice) *entities.ProductOutletPrice {
+	if model == nil {
+		return nil
+	}
+
+	return &entities.ProductOutletPrice{
+		ID:             model.ID,
+		ProductID:      model.ProductID,
+		OutletID:       model.OutletID,
+		Price:          model.Price,
+		PrintToChecker: model.PrintToChecker,
+		CreatedAt:      model.CreatedAt,
+		UpdatedAt:      model.UpdatedAt,
+	}
+}
+
+func ProductOutletPriceEntitiesToModels(entities []*entities.ProductOutletPrice) []*models.ProductOutletPrice {
+	if entities == nil {
+		return nil
+	}
+
+	models := make([]*models.ProductOutletPrice, len(entities))
+	for i, entity := range entities {
+		models[i] = ProductOutletPriceEntityToModel(entity)
+	}
+	return models
+}

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/middleware/auth_middleware.go

@@ -11,6 +11,7 @@ import (
 	"apskel-pos-be/internal/service"
 
 	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
 )
 
 type AuthMiddleware struct {
@@ -45,9 +46,13 @@ func (m *AuthMiddleware) RequireAuth() gin.HandlerFunc {
 		setKeyInContext(c, appcontext.OrganizationIDKey, userResponse.OrganizationID.String())
 		setKeyInContext(c, appcontext.UserIDKey, userResponse.ID.String())
 
-		if userResponse.Role != "superadmin" {
-			setKeyInContext(c, appcontext.OutletIDKey, userResponse.OutletID.String())
+		// Always override OutletID from token to prevent header injection.
+		// Set empty string if user has no outlet, so PopulateContext header value is ignored.
+		outletIDStr := ""
+		if userResponse.OutletID != nil && *userResponse.OutletID != uuid.Nil {
+			outletIDStr = userResponse.OutletID.String()
 		}
+		setKeyInContext(c, appcontext.OutletIDKey, outletIDStr)
 
 		logger.FromContext(c.Request.Context()).Infof("AuthMiddleware::RequireAuth -> User authenticated: %s", userResponse.Email)
 		c.Next()

internal/middleware/idempotency.go

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

internal/models/analytics.go

@@ -87,6 +87,69 @@ type SalesAnalyticsData struct {
 	NetSales float64   `json:"net_sales"`
 }
 
+// PurchasingAnalyticsRequest represents the request for purchasing analytics
+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"`
+}
+
+// PurchasingAnalyticsResponse represents the response for purchasing analytics
+type PurchasingAnalyticsResponse 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"`
+	Summary        PurchasingSummary          `json:"summary"`
+	Data           []PurchasingAnalyticsData  `json:"data"`
+	IngredientData []PurchasingIngredientData `json:"ingredient_data"`
+	VendorData     []PurchasingVendorData     `json:"vendor_data"`
+}
+
+// PurchasingSummary represents the summary of purchasing analytics
+type PurchasingSummary struct {
+	TotalPurchases            float64 `json:"total_purchases"`
+	TotalPurchaseOrders       int64   `json:"total_purchase_orders"`
+	TotalQuantity             float64 `json:"total_quantity"`
+	AveragePurchaseOrderValue float64 `json:"average_purchase_order_value"`
+	TotalIngredients          int64   `json:"total_ingredients"`
+	TotalVendors              int64   `json:"total_vendors"`
+}
+
+// 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"`
+}
+
+// PurchasingIngredientData represents purchasing analytics for an ingredient
+type PurchasingIngredientData struct {
+	IngredientID       uuid.UUID `json:"ingredient_id"`
+	IngredientName     string    `json:"ingredient_name"`
+	Quantity           float64   `json:"quantity"`
+	TotalCost          float64   `json:"total_cost"`
+	AverageUnitCost    float64   `json:"average_unit_cost"`
+	PurchaseOrderCount int64     `json:"purchase_order_count"`
+}
+
+// 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"`
+}
+
 // ProductAnalyticsRequest represents the request for product analytics
 type ProductAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
@@ -109,6 +172,7 @@ type ProductAnalyticsData struct {
 	ProductID               uuid.UUID `json:"product_id"`
 	ProductName             string    `json:"product_name"`
 	ProductSku              string    `json:"product_sku"`
+	ProductPrice            float64   `json:"product_price"`
 	CategoryID              uuid.UUID `json:"category_id"`
 	CategoryName            string    `json:"category_name"`
 	CategoryOrder           int       `json:"category_order"`
@@ -183,7 +247,6 @@ type DashboardOverview struct {
 	RefundedOrders    int64   `json:"refunded_orders"`
 }
 
-// ProfitLossAnalyticsRequest represents the request for profit and loss analytics
 type ProfitLossAnalyticsRequest struct {
 	OrganizationID uuid.UUID  `validate:"required"`
 	OutletID       *uuid.UUID `validate:"omitempty"`
@@ -192,7 +255,6 @@ type ProfitLossAnalyticsRequest struct {
 	GroupBy        string     `validate:"omitempty,oneof=day hour week month"`
 }
 
-// ProfitLossAnalyticsResponse represents the response for profit and loss analytics
 type ProfitLossAnalyticsResponse struct {
 	OrganizationID           uuid.UUID                `json:"organization_id"`
 	OutletID                 *uuid.UUID               `json:"outlet_id,omitempty"`
@@ -202,9 +264,11 @@ type ProfitLossAnalyticsResponse struct {
 	Summary                  ProfitLossSummary        `json:"summary"`
 	Data                     []ProfitLossData         `json:"data"`
 	ProductData              []ProductProfitData      `json:"product_data"`
+	MainSummary              []ProfitLossSummaryRow   `json:"main_summary"`
+	OperationalExpenses      []OperationalExpenseItem `json:"operational_expenses"`
+	OperationalExpensesTotal float64                  `json:"operational_expenses_total"`
 }
 
-// ProfitLossSummary represents the summary of profit and loss analytics
 type ProfitLossSummary struct {
 	TotalRevenue       float64 `json:"total_revenue"`
 	TotalCost          float64 `json:"total_cost"`
@@ -219,7 +283,6 @@ type ProfitLossSummary struct {
 	ProfitabilityRatio float64 `json:"profitability_ratio"`
 }
 
-// ProfitLossData represents individual profit and loss data point by time period
 type ProfitLossData struct {
 	Date              time.Time `json:"date"`
 	Revenue           float64   `json:"revenue"`
@@ -233,7 +296,6 @@ type ProfitLossData struct {
 	Orders            int64     `json:"orders"`
 }
 
-// ProductProfitData represents profit data for individual products
 type ProductProfitData struct {
 	ProductID         uuid.UUID `json:"product_id"`
 	ProductName       string    `json:"product_name"`
@@ -248,3 +310,19 @@ type ProductProfitData struct {
 	AverageCost       float64   `json:"average_cost"`
 	ProfitPerUnit     float64   `json:"profit_per_unit"`
 }
+
+type ProfitLossSummaryRow struct {
+	ID           string                 `json:"id"`
+	Label        string                 `json:"label"`
+	IsBold       bool                   `json:"is_bold"`
+	TodayNominal float64                `json:"today_nominal"`
+	TodayPct     float64                `json:"today_pct"`
+	MtdNominal   float64                `json:"mtd_nominal"`
+	MtdPct       float64                `json:"mtd_pct"`
+	SubItems     []ProfitLossSummaryRow `json:"sub_items,omitempty"`
+}
+
+type OperationalExpenseItem struct {
+	Item    string  `json:"item"`
+	Nominal float64 `json:"nominal"`
+}

internal/models/category.go

@@ -9,6 +9,7 @@ import (
 type Category struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	Name           string
 	Description    *string
 	ImageURL       *string
@@ -20,6 +21,7 @@ type Category struct {
 
 type CreateCategoryRequest struct {
 	OrganizationID uuid.UUID `validate:"required"`
+	OutletID       *uuid.UUID
 	Name           string  `validate:"required,min=1,max=255"`
 	Description    *string `validate:"omitempty,max=1000"`
 	ImageURL       *string `validate:"omitempty,url"`
@@ -30,6 +32,7 @@ type UpdateCategoryRequest struct {
 	Name        *string `validate:"omitempty,min=1,max=255"`
 	Description *string `validate:"omitempty,max=1000"`
 	ImageURL    *string `validate:"omitempty,url"`
+	OutletID    *uuid.UUID
 	Order       *int `validate:"omitempty,min=0"`
 	IsActive    *bool
 }
@@ -37,6 +40,7 @@ type UpdateCategoryRequest struct {
 type CategoryResponse struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	Name           string
 	Description    *string
 	ImageURL       *string

internal/models/expense.go

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

@@ -101,4 +101,3 @@ type IngredientUnitsResponse struct {
 	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/product.go

@@ -40,6 +40,7 @@ type ProductVariant struct {
 
 type CreateProductRequest struct {
 	OrganizationID uuid.UUID              `validate:"required"`
+	OutletID       uuid.UUID              `validate:"omitempty"` // If set, upsert product_outlet_prices on create
 	CategoryID     uuid.UUID              `validate:"required"`
 	SKU            *string                `validate:"omitempty,max=100"`
 	Name           string                 `validate:"required,min=1,max=255"`
@@ -49,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{}
@@ -60,6 +62,7 @@ type CreateProductRequest struct {
 }
 
 type UpdateProductRequest struct {
+	OutletID       uuid.UUID  `validate:"omitempty"` // If set, upsert product_outlet_prices on update
 	CategoryID     *uuid.UUID `validate:"omitempty"`
 	SKU            *string    `validate:"omitempty,max=100"`
 	Name           *string    `validate:"omitempty,min=1,max=255"`
@@ -68,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{}
@@ -100,10 +104,13 @@ type ProductResponse struct {
 	Name           string
 	Description    *string
 	Price          float64
+	OutletPrice    *float64      // outlet-specific price, nil if not set
+	OutletPrices   []OutletPrice // all outlet prices, populated when no outletID in context
 	Cost           float64
 	BusinessType   constants.BusinessType
 	ImageURL       *string
 	PrinterType    string
+	PrintToChecker bool
 	UnitID         *uuid.UUID
 	HasIngredients bool
 	Metadata       map[string]interface{}
@@ -113,6 +120,13 @@ type ProductResponse struct {
 	Variants       []ProductVariantResponse
 }
 
+type OutletPrice struct {
+	OutletID       uuid.UUID
+	OutletName     string
+	Price          float64
+	PrintToChecker bool
+}
+
 type ProductVariantResponse struct {
 	ID            uuid.UUID
 	ProductID     uuid.UUID

internal/models/product_outlet_price.go

@@ -0,0 +1,38 @@
+package models
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type ProductOutletPrice struct {
+	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"`
+	PrintToChecker bool
+}
+
+type UpdateProductOutletPriceRequest struct {
+	Price          *float64 `validate:"required,min=0"`
+	PrintToChecker *bool
+}
+
+type ProductOutletPriceResponse struct {
+	ID        uuid.UUID `json:"id"`
+	ProductID uuid.UUID `json:"product_id"`
+	OutletID  uuid.UUID `json:"outlet_id"`
+	Price     float64   `json:"price"`
+	CreatedAt time.Time `json:"created_at"`
+	UpdatedAt time.Time `json:"updated_at"`
+}

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

@@ -12,7 +12,7 @@ type PurchaseOrder struct {
 	VendorID        uuid.UUID  `json:"vendor_id"`
 	PONumber        string     `json:"po_number"`
 	TransactionDate time.Time  `json:"transaction_date"`
-	DueDate         time.Time `json:"due_date"`
+	DueDate         *time.Time `json:"due_date"`
 	Reference       *string    `json:"reference"`
 	Status          string     `json:"status"`
 	Message         *string    `json:"message"`
@@ -46,7 +46,7 @@ type PurchaseOrderResponse struct {
 	VendorID        uuid.UUID                         `json:"vendor_id"`
 	PONumber        string                            `json:"po_number"`
 	TransactionDate time.Time                         `json:"transaction_date"`
-	DueDate         time.Time                         `json:"due_date"`
+	DueDate         *time.Time                        `json:"due_date"`
 	Reference       *string                           `json:"reference"`
 	Status          string                            `json:"status"`
 	Message         *string                           `json:"message"`
@@ -84,7 +84,7 @@ type CreatePurchaseOrderRequest struct {
 	VendorID          uuid.UUID                        `json:"vendor_id"`
 	PONumber          string                           `json:"po_number"`
 	TransactionDate   time.Time                        `json:"transaction_date"`
-	DueDate           time.Time                        `json:"due_date"`
+	DueDate           *time.Time                       `json:"due_date,omitempty"`
 	Reference         *string                          `json:"reference,omitempty"`
 	Status            *string                          `json:"status,omitempty"`
 	Message           *string                          `json:"message,omitempty"`

internal/models/session.go

@@ -0,0 +1,18 @@
+package models
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type SelfOrderSession struct {
+	ID             string     `json:"id"`
+	TableID        uuid.UUID  `json:"table_id"`
+	OrganizationID uuid.UUID  `json:"organization_id"`
+	OutletID       uuid.UUID  `json:"outlet_id"`
+	Status         string     `json:"status"`
+	CustomerName   string     `json:"customer_name"`
+	CreatedAt      time.Time  `json:"created_at"`
+	ClosedAt       *time.Time `json:"closed_at,omitempty"`
+}

internal/pkg/qrcode/generator.go

@@ -0,0 +1,32 @@
+package qrcode
+
+import (
+	"bytes"
+	"image/png"
+
+	"github.com/boombuler/barcode"
+	"github.com/boombuler/barcode/qr"
+)
+
+func GeneratePNG(content string, size int) ([]byte, error) {
+	if size <= 0 {
+		size = 256
+	}
+
+	qrCode, err := qr.Encode(content, qr.M, qr.Auto)
+	if err != nil {
+		return nil, err
+	}
+
+	qrCode, err = barcode.Scale(qrCode, size, size)
+	if err != nil {
+		return nil, err
+	}
+
+	var buf bytes.Buffer
+	if err := png.Encode(&buf, qrCode); err != nil {
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}

internal/pkg/tabletoken/token.go

@@ -0,0 +1,43 @@
+package tabletoken
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+
+	"github.com/google/uuid"
+)
+
+type TableTokenPayload struct {
+	TableID        uuid.UUID `json:"table_id"`
+	OrganizationID uuid.UUID `json:"organization_id"`
+	OutletID       uuid.UUID `json:"outlet_id"`
+}
+
+func Encode(tableID, organizationID, outletID uuid.UUID) string {
+	payload := TableTokenPayload{
+		TableID:        tableID,
+		OrganizationID: organizationID,
+		OutletID:       outletID,
+	}
+	jsonBytes, _ := json.Marshal(payload)
+	return base64.URLEncoding.EncodeToString(jsonBytes)
+}
+
+func Decode(token string) (tableID, organizationID, outletID uuid.UUID, err error) {
+	jsonBytes, err := base64.URLEncoding.DecodeString(token)
+	if err != nil {
+		return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("invalid token encoding: %w", err)
+	}
+
+	var payload TableTokenPayload
+	if err := json.Unmarshal(jsonBytes, &payload); err != nil {
+		return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("invalid token format: %w", err)
+	}
+
+	if payload.TableID == uuid.Nil || payload.OrganizationID == uuid.Nil || payload.OutletID == uuid.Nil {
+		return uuid.Nil, uuid.Nil, uuid.Nil, fmt.Errorf("token missing required fields")
+	}
+
+	return payload.TableID, payload.OrganizationID, payload.OutletID, nil
+}

internal/processor/analytics_processor.go

@@ -3,6 +3,7 @@ package processor
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"apskel-pos-be/internal/models"
@@ -12,6 +13,7 @@ import (
 type AnalyticsProcessor interface {
 	GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
 	GetSalesAnalytics(ctx context.Context, req *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, error)
+	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)
 	GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
@@ -20,11 +22,13 @@ type AnalyticsProcessor interface {
 
 type AnalyticsProcessorImpl struct {
 	analyticsRepo repository.AnalyticsRepository
+	expenseRepo   ExpenseRepository
 }
 
-func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository) *AnalyticsProcessorImpl {
+func NewAnalyticsProcessorImpl(analyticsRepo repository.AnalyticsRepository, expenseRepo ExpenseRepository) *AnalyticsProcessorImpl {
 	return &AnalyticsProcessorImpl{
 		analyticsRepo: analyticsRepo,
+		expenseRepo:   expenseRepo,
 	}
 }
 
@@ -164,6 +168,77 @@ func (p *AnalyticsProcessorImpl) GetSalesAnalytics(ctx context.Context, req *mod
 	}, nil
 }
 
+func (p *AnalyticsProcessorImpl) GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, 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.analyticsRepo.GetPurchasingAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get purchasing analytics: %w", err)
+	}
+
+	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,
+		}
+	}
+
+	ingredientData := make([]models.PurchasingIngredientData, len(result.IngredientData))
+	for i, item := range result.IngredientData {
+		ingredientData[i] = models.PurchasingIngredientData{
+			IngredientID:       item.IngredientID,
+			IngredientName:     item.IngredientName,
+			Quantity:           item.Quantity,
+			TotalCost:          item.TotalCost,
+			AverageUnitCost:    item.AverageUnitCost,
+			PurchaseOrderCount: item.PurchaseOrderCount,
+		}
+	}
+
+	vendorData := make([]models.PurchasingVendorData, len(result.VendorData))
+	for i, item := range result.VendorData {
+		vendorData[i] = models.PurchasingVendorData{
+			VendorID:           item.VendorID,
+			VendorName:         item.VendorName,
+			TotalCost:          item.TotalCost,
+			PurchaseOrderCount: item.PurchaseOrderCount,
+			IngredientCount:    item.IngredientCount,
+			Quantity:           item.Quantity,
+		}
+	}
+
+	return &models.PurchasingAnalyticsResponse{
+		OrganizationID: req.OrganizationID,
+		OutletID:       req.OutletID,
+		OutletName:     result.OutletName,
+		DateFrom:       req.DateFrom,
+		DateTo:         req.DateTo,
+		GroupBy:        req.GroupBy,
+		Summary: models.PurchasingSummary{
+			TotalPurchases:            result.Summary.TotalPurchases,
+			TotalPurchaseOrders:       result.Summary.TotalPurchaseOrders,
+			TotalQuantity:             result.Summary.TotalQuantity,
+			AveragePurchaseOrderValue: result.Summary.AveragePurchaseOrderValue,
+			TotalIngredients:          result.Summary.TotalIngredients,
+			TotalVendors:              result.Summary.TotalVendors,
+		},
+		Data:           data,
+		IngredientData: ingredientData,
+		VendorData:     vendorData,
+	}, nil
+}
+
 func (p *AnalyticsProcessorImpl) GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
 	// Validate date range
 	if req.DateFrom.After(req.DateTo) {
@@ -188,6 +263,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,
@@ -322,17 +398,27 @@ func (p *AnalyticsProcessorImpl) GetDashboardAnalytics(ctx context.Context, req
 }
 
 func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
+	if req.DateFrom.IsZero() {
+		return nil, fmt.Errorf("date_from is required")
+	}
+
+	if req.DateTo.IsZero() {
+		return nil, fmt.Errorf("date_to is required")
+	}
+
 	if req.DateFrom.After(req.DateTo) {
 		return nil, fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	// Get analytics data from repository
+	if req.GroupBy == "" {
+		req.GroupBy = "day"
+	}
+
 	result, err := p.analyticsRepo.GetProfitLossAnalytics(ctx, req.OrganizationID, req.OutletID, req.DateFrom, req.DateTo, req.GroupBy)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get profit/loss analytics: %w", err)
 	}
 
-	// Transform entities to models
 	data := make([]models.ProfitLossData, len(result.Data))
 	for i, item := range result.Data {
 		data[i] = models.ProfitLossData{
@@ -367,6 +453,145 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		}
 	}
 
+	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
+
+	todayProfitBeforeGaji := todayGrossProfit - todayTotalOps
+	mtdProfitBeforeGaji := mtdGrossProfit - mtdTotalOps
+
+	todayNetProfit := todayProfitBeforeGaji - todayGaji
+	mtdNetProfit := mtdProfitBeforeGaji - mtdGaji
+
+	todayPct := func(nominal float64) float64 {
+		if result.TodayRevenue == 0 {
+			return 0
+		}
+		return (nominal / result.TodayRevenue) * 100
+	}
+	mtdPct := func(nominal float64) float64 {
+		if result.MtdRevenue == 0 {
+			return 0
+		}
+		return (nominal / result.MtdRevenue) * 100
+	}
+
+	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",
+			TodayNominal: result.TodayRevenue, TodayPct: todayPct(result.TodayRevenue),
+			MtdNominal: result.MtdRevenue, MtdPct: mtdPct(result.MtdRevenue),
+		},
+		{
+			ID: "hpp", Label: "HPP",
+			TodayNominal: result.TodayCost, TodayPct: todayPct(result.TodayCost),
+			MtdNominal: result.MtdCost, MtdPct: mtdPct(result.MtdCost),
+		},
+		{
+			ID: "laba_kotor", Label: "Laba Kotor (1-2)",
+			TodayNominal: todayGrossProfit, TodayPct: todayPct(todayGrossProfit),
+			MtdNominal: mtdGrossProfit, MtdPct: mtdPct(mtdGrossProfit),
+		},
+		{
+			ID: "biaya_ops", Label: "BIAYA OPS",
+			TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
+			MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
+			SubItems: opsSubItems,
+		},
+		{
+			ID: "laba_rugi_sblm_gaji", Label: "Laba/Rugi sblm Gaji (3-4)",
+			TodayNominal: todayProfitBeforeGaji, TodayPct: todayPct(todayProfitBeforeGaji),
+			MtdNominal: mtdProfitBeforeGaji, MtdPct: mtdPct(mtdProfitBeforeGaji),
+		},
+		{
+			ID: "biaya_gaji", Label: "BIAYA GAJI",
+			TodayNominal: todayGaji, TodayPct: todayPct(todayGaji),
+			MtdNominal: mtdGaji, MtdPct: mtdPct(mtdGaji),
+		},
+		{
+			ID: "laba_rugi", Label: "Laba/Rugi (5-6)", IsBold: true,
+			TodayNominal: todayNetProfit, TodayPct: todayPct(todayNetProfit),
+			MtdNominal: mtdNetProfit, MtdPct: mtdPct(mtdNetProfit),
+		},
+	}
+
+	opsItems := make([]models.OperationalExpenseItem, len(result.OperationalExpenseItems))
+	var opsTotal float64
+	for i, item := range result.OperationalExpenseItems {
+		opsItems[i] = models.OperationalExpenseItem{
+			Item:    item.Item,
+			Nominal: item.Amount,
+		}
+		opsTotal += item.Amount
+	}
+
 	return &models.ProfitLossAnalyticsResponse{
 		OrganizationID: req.OrganizationID,
 		OutletID:       req.OutletID,
@@ -388,5 +613,33 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		},
 		Data:                     data,
 		ProductData:              productData,
+		MainSummary:              mainSummary,
+		OperationalExpenses:      opsItems,
+		OperationalExpensesTotal: opsTotal,
 	}, nil
 }
+
+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 string(result)
+}

internal/processor/analytics_processor_test.go

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

internal/processor/expense_processor.go

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

internal/processor/expense_processor_test.go

@@ -0,0 +1,206 @@
+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
+}
+
+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
+}
+
+func TestExpenseProcessorCreatePersistsItemName(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+	chartOfAccountID := uuid.New()
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: chartOfAccountID.String(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Len(t, repo.createdItems, 1)
+	require.Equal(t, "Cleaning supplies", repo.createdItems[0].Item)
+	require.Len(t, resp.Items, 1)
+	require.Equal(t, "Cleaning supplies", resp.Items[0].Item)
+}
+
+func TestExpenseProcessorCreateDefaultsStatusToDraft(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "draft", repo.createdExpense.Status)
+	require.Equal(t, "draft", resp.Status)
+}
+
+func TestExpenseProcessorCreatePersistsProvidedStatus(t *testing.T) {
+	repo := &expenseRepositoryCaptureStub{}
+	p := NewExpenseProcessorImpl(repo)
+	status := "approved"
+
+	resp, err := p.CreateExpense(context.Background(), uuid.New(), &models.CreateExpenseRequest{
+		Receiver:        "Cashier",
+		TransactionDate: "2026-05-29",
+		CodeNumber:      "EXP-001",
+		OutletID:        uuid.NewString(),
+		Status:          &status,
+		Total:           10000,
+		Items: []models.CreateExpenseItemRequest{
+			{
+				ChartOfAccountID: uuid.NewString(),
+				Item:             "Cleaning supplies",
+				Amount:           10000,
+			},
+		},
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+	require.Equal(t, "approved", repo.createdExpense.Status)
+	require.Equal(t, "approved", resp.Status)
+}
+
+func TestExpenseProcessorGetExpenseAnalyticsDefaultsGroupByAndMapsResponse(t *testing.T) {
+	coaID := 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{
+				{
+					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)
+
+	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, coaID, resp.CategoryData[0].ChartOfAccountID)
+	require.Len(t, resp.ItemData, 1)
+	require.Equal(t, "Cleaning supplies", resp.ItemData[0].Item)
+}

internal/processor/expense_repository.go

@@ -0,0 +1,21 @@
+package processor
+
+import (
+	"apskel-pos-be/internal/entities"
+	"context"
+	"time"
+
+	"github.com/google/uuid"
+)
+
+type ExpenseRepository interface {
+	Create(ctx context.Context, expense *entities.Expense) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.Expense, error)
+	GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.Expense, error)
+	Update(ctx context.Context, expense *entities.Expense) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error)
+	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/order_processor.go

@@ -1,7 +1,6 @@
 package processor
 
 import (
-	"apskel-pos-be/internal/constants"
 	"context"
 	"errors"
 	"fmt"
@@ -108,6 +107,7 @@ type OrderProcessorImpl struct {
 	productRecipeRepo        *repository.ProductRecipeRepository
 	ingredientRepo           IngredientRepository
 	inventoryMovementService InventoryMovementService
+	productOutletPriceRepo   repository.ProductOutletPriceRepository
 }
 
 func NewOrderProcessorImpl(
@@ -126,6 +126,7 @@ func NewOrderProcessorImpl(
 	productRecipeRepo *repository.ProductRecipeRepository,
 	ingredientRepo IngredientRepository,
 	inventoryMovementService InventoryMovementService,
+	productOutletPriceRepo repository.ProductOutletPriceRepository,
 ) *OrderProcessorImpl {
 	return &OrderProcessorImpl{
 		orderRepo:                orderRepo,
@@ -144,6 +145,7 @@ func NewOrderProcessorImpl(
 		productRecipeRepo:        productRecipeRepo,
 		ingredientRepo:           ingredientRepo,
 		inventoryMovementService: inventoryMovementService,
+		productOutletPriceRepo:   productOutletPriceRepo,
 	}
 }
 
@@ -170,6 +172,12 @@ func (p *OrderProcessorImpl) CreateOrder(ctx context.Context, req *models.Create
 		unitPrice := product.Price
 		unitCost := product.Cost
 
+		if p.productOutletPriceRepo != nil {
+			if outletPrice, err := p.productOutletPriceRepo.GetByProductAndOutlet(ctx, itemReq.ProductID, req.OutletID); err == nil {
+				unitPrice = outletPrice.Price
+			}
+		}
+
 		if itemReq.ProductVariantID != nil {
 			variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
 			if err != nil {
@@ -293,6 +301,12 @@ func (p *OrderProcessorImpl) AddToOrder(ctx context.Context, orderID uuid.UUID,
 		unitPrice := product.Price
 		unitCost := product.Cost
 
+		if p.productOutletPriceRepo != nil {
+			if outletPrice, err := p.productOutletPriceRepo.GetByProductAndOutlet(ctx, itemReq.ProductID, order.OutletID); err == nil {
+				unitPrice = outletPrice.Price
+			}
+		}
+
 		// Handle product variant if specified
 		if itemReq.ProductVariantID != nil {
 			variant, err := p.productVariantRepo.GetByID(ctx, *itemReq.ProductVariantID)
@@ -324,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,
@@ -373,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)
@@ -601,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)
 			}
@@ -621,9 +618,15 @@ func (p *OrderProcessorImpl) VoidOrder(ctx context.Context, req *models.VoidOrde
 			return fmt.Errorf("outlet not found: %w", err)
 		}
 
+		// Reload order to get latest state
+		order, err = p.orderRepo.GetByID(ctx, req.OrderID)
+		if err != nil {
+			return fmt.Errorf("failed to reload order: %w", err)
+		}
+
 		order.Subtotal -= totalVoidedAmount
 		order.TotalCost -= totalVoidedCost
-		order.TaxAmount = order.Subtotal * outlet.TaxRate // Recalculate tax using outlet's tax rate
+		order.TaxAmount = order.Subtotal * outlet.TaxRate
 		order.TotalAmount = order.Subtotal + order.TaxAmount - order.DiscountAmount
 
 		if err := p.orderRepo.Update(ctx, order); err != nil {

internal/processor/product_outlet_price_processor.go

@@ -0,0 +1,122 @@
+package processor
+
+import (
+	"context"
+	"fmt"
+
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+	"apskel-pos-be/internal/repository"
+
+	"github.com/google/uuid"
+)
+
+type ProductOutletPriceProcessor interface {
+	Upsert(ctx context.Context, req *models.CreateProductOutletPriceRequest) (*models.ProductOutletPrice, error)
+	GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*models.ProductOutletPrice, error)
+	GetByProduct(ctx context.Context, productID uuid.UUID) ([]*models.ProductOutletPrice, error)
+	GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*models.ProductOutletPrice, error)
+	Delete(ctx context.Context, id uuid.UUID) error
+	ResolvePrice(ctx context.Context, productID, outletID uuid.UUID, fallbackPrice float64) float64
+	BulkUpsert(ctx context.Context, productID uuid.UUID, prices []models.CreateProductOutletPriceRequest) ([]*models.ProductOutletPrice, error)
+}
+
+type ProductOutletPriceProcessorImpl struct {
+	repo        repository.ProductOutletPriceRepository
+	productRepo ProductRepository
+	outletRepo  OutletRepository
+}
+
+func NewProductOutletPriceProcessorImpl(repo repository.ProductOutletPriceRepository, productRepo ProductRepository, outletRepo OutletRepository) *ProductOutletPriceProcessorImpl {
+	return &ProductOutletPriceProcessorImpl{
+		repo:        repo,
+		productRepo: productRepo,
+		outletRepo:  outletRepo,
+	}
+}
+
+func (p *ProductOutletPriceProcessorImpl) Upsert(ctx context.Context, req *models.CreateProductOutletPriceRequest) (*models.ProductOutletPrice, error) {
+	if _, err := p.productRepo.GetByID(ctx, req.ProductID); err != nil {
+		return nil, fmt.Errorf("product not found: %w", err)
+	}
+
+	if _, err := p.outletRepo.GetByID(ctx, req.OutletID); err != nil {
+		return nil, fmt.Errorf("outlet not found: %w", err)
+	}
+
+	entity := &entities.ProductOutletPrice{
+		ProductID:      req.ProductID,
+		OutletID:       req.OutletID,
+		Price:          req.Price,
+		PrintToChecker: req.PrintToChecker,
+	}
+
+	if err := p.repo.Upsert(ctx, entity); err != nil {
+		return nil, fmt.Errorf("failed to upsert product outlet price: %w", err)
+	}
+
+	actual, err := p.repo.GetByProductAndOutlet(ctx, req.ProductID, req.OutletID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to retrieve upserted product outlet price: %w", err)
+	}
+
+	return mappers.ProductOutletPriceEntityToModel(actual), nil
+}
+
+func (p *ProductOutletPriceProcessorImpl) GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*models.ProductOutletPrice, error) {
+	entity, err := p.repo.GetByProductAndOutlet(ctx, productID, outletID)
+	if err != nil {
+		return nil, fmt.Errorf("product outlet price not found: %w", err)
+	}
+
+	return mappers.ProductOutletPriceEntityToModel(entity), nil
+}
+
+func (p *ProductOutletPriceProcessorImpl) GetByProduct(ctx context.Context, productID uuid.UUID) ([]*models.ProductOutletPrice, error) {
+	entities, err := p.repo.GetByProduct(ctx, productID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get product outlet prices: %w", err)
+	}
+
+	return mappers.ProductOutletPriceEntitiesToModels(entities), nil
+}
+
+func (p *ProductOutletPriceProcessorImpl) GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*models.ProductOutletPrice, error) {
+	entities, err := p.repo.GetByOutlet(ctx, outletID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get outlet prices: %w", err)
+	}
+
+	return mappers.ProductOutletPriceEntitiesToModels(entities), nil
+}
+
+func (p *ProductOutletPriceProcessorImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	if err := p.repo.Delete(ctx, id); err != nil {
+		return fmt.Errorf("failed to delete product outlet price: %w", err)
+	}
+	return nil
+}
+
+func (p *ProductOutletPriceProcessorImpl) ResolvePrice(ctx context.Context, productID, outletID uuid.UUID, fallbackPrice float64) float64 {
+	outletPrice, err := p.repo.GetByProductAndOutlet(ctx, productID, outletID)
+	if err != nil {
+		return fallbackPrice
+	}
+	return outletPrice.Price
+}
+
+func (p *ProductOutletPriceProcessorImpl) BulkUpsert(ctx context.Context, productID uuid.UUID, prices []models.CreateProductOutletPriceRequest) ([]*models.ProductOutletPrice, error) {
+	var results []*models.ProductOutletPrice
+
+	for _, req := range prices {
+		req.ProductID = productID
+		result, err := p.Upsert(ctx, &req)
+		if err != nil {
+			return nil, fmt.Errorf("failed to upsert price for outlet %s: %w", req.OutletID, err)
+		}
+		results = append(results, result)
+	}
+
+	return results, nil
+}

internal/processor/product_processor.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/logger"
 	"apskel-pos-be/internal/mappers"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
@@ -16,8 +17,9 @@ type ProductProcessor interface {
 	CreateProduct(ctx context.Context, req *models.CreateProductRequest) (*models.ProductResponse, error)
 	UpdateProduct(ctx context.Context, id uuid.UUID, req *models.UpdateProductRequest) (*models.ProductResponse, error)
 	DeleteProduct(ctx context.Context, id uuid.UUID) error
-	GetProductByID(ctx context.Context, id uuid.UUID) (*models.ProductResponse, error)
+	GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) (*models.ProductResponse, error)
 	ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error)
+	ListProductsAll(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error)
 }
 
 type ProductRepository interface {
@@ -32,11 +34,13 @@ type ProductRepository interface {
 	Update(ctx context.Context, product *entities.Product) error
 	Delete(ctx context.Context, id uuid.UUID) error
 	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Product, int64, error)
+	ListWithOutletPrice(ctx context.Context, filters map[string]interface{}, outletID uuid.UUID, limit, offset int) ([]*entities.Product, int64, error)
 	Count(ctx context.Context, filters map[string]interface{}) (int64, error)
 	GetBySKU(ctx context.Context, organizationID uuid.UUID, sku string) (*entities.Product, error)
 	ExistsBySKU(ctx context.Context, organizationID uuid.UUID, sku string, excludeID *uuid.UUID) (bool, error)
 	GetByName(ctx context.Context, organizationID uuid.UUID, name string) (*entities.Product, error)
 	ExistsByName(ctx context.Context, organizationID uuid.UUID, name string, excludeID *uuid.UUID) (bool, error)
+	ExistsByNameInOutlet(ctx context.Context, organizationID uuid.UUID, outletID uuid.UUID, name string, excludeID *uuid.UUID) (bool, error)
 	UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error
 	GetLowCostProducts(ctx context.Context, organizationID uuid.UUID, maxCost float64) ([]*entities.Product, error)
 }
@@ -47,15 +51,17 @@ type ProductProcessorImpl struct {
 	productVariantRepo repository.ProductVariantRepository
 	inventoryRepo      repository.InventoryRepository
 	outletRepo         OutletRepository
+	outletPriceRepo    repository.ProductOutletPriceRepository
 }
 
-func NewProductProcessorImpl(productRepo ProductRepository, categoryRepo CategoryRepository, productVariantRepo repository.ProductVariantRepository, inventoryRepo repository.InventoryRepository, outletRepo OutletRepository) *ProductProcessorImpl {
+func NewProductProcessorImpl(productRepo ProductRepository, categoryRepo CategoryRepository, productVariantRepo repository.ProductVariantRepository, inventoryRepo repository.InventoryRepository, outletRepo OutletRepository, outletPriceRepo repository.ProductOutletPriceRepository) *ProductProcessorImpl {
 	return &ProductProcessorImpl{
 		productRepo:        productRepo,
 		categoryRepo:       categoryRepo,
 		productVariantRepo: productVariantRepo,
 		inventoryRepo:      inventoryRepo,
 		outletRepo:         outletRepo,
+		outletPriceRepo:    outletPriceRepo,
 	}
 }
 
@@ -75,12 +81,12 @@ func (p *ProductProcessorImpl) CreateProduct(ctx context.Context, req *models.Cr
 		}
 	}
 
-	exists, err := p.productRepo.ExistsByName(ctx, req.OrganizationID, req.Name, nil)
+	exists, err := p.productRepo.ExistsByNameInOutlet(ctx, req.OrganizationID, req.OutletID, req.Name, nil)
 	if err != nil {
 		return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
 	}
 	if exists {
-		return nil, fmt.Errorf("product with name '%s' already exists for this organization", req.Name)
+		return nil, fmt.Errorf("product with name '%s' already exists for this outlet", req.Name)
 	}
 
 	productEntity := mappers.CreateProductRequestToEntity(req)
@@ -118,6 +124,23 @@ func (p *ProductProcessorImpl) CreateProduct(ctx context.Context, req *models.Cr
 		}
 	}
 
+	// Upsert outlet-specific price if outlet context is present
+	if req.OutletID != uuid.Nil {
+		printToChecker := true // default
+		if req.PrintToChecker != nil {
+			printToChecker = *req.PrintToChecker
+		}
+		outletPriceEntity := &entities.ProductOutletPrice{
+			ProductID:      productEntity.ID,
+			OutletID:       req.OutletID,
+			Price:          req.Price,
+			PrintToChecker: printToChecker,
+		}
+		if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
+			return nil, fmt.Errorf("failed to assign outlet price: %w", err)
+		}
+	}
+
 	productWithCategory, err := p.productRepo.GetWithCategory(ctx, productEntity.ID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to retrieve created product: %w", err)
@@ -157,12 +180,12 @@ func (p *ProductProcessorImpl) UpdateProduct(ctx context.Context, id uuid.UUID,
 	}
 
 	if req.Name != nil && *req.Name != existingProduct.Name {
-		exists, err := p.productRepo.ExistsByName(ctx, existingProduct.OrganizationID, *req.Name, &id)
+		exists, err := p.productRepo.ExistsByNameInOutlet(ctx, existingProduct.OrganizationID, req.OutletID, *req.Name, &id)
 		if err != nil {
 			return nil, fmt.Errorf("failed to check product name uniqueness: %w", err)
 		}
 		if exists {
-			return nil, fmt.Errorf("product with name '%s' already exists for this organization", *req.Name)
+			return nil, fmt.Errorf("product with name '%s' already exists for this outlet", *req.Name)
 		}
 	}
 
@@ -179,6 +202,41 @@ func (p *ProductProcessorImpl) UpdateProduct(ctx context.Context, id uuid.UUID,
 		}
 	}
 
+	// Upsert outlet-specific price if outlet context is present and price or print_to_checker is provided
+	if req.OutletID != uuid.Nil && (req.Price != nil || req.PrintToChecker != nil) {
+		// Fetch existing outlet price to use as fallback for fields not provided
+		existing, _ := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, req.OutletID)
+
+		price := float64(0)
+		if existing != nil {
+			price = existing.Price
+		}
+		if req.Price != nil {
+			price = *req.Price
+		}
+
+		printToChecker := true // default
+		if existing != nil {
+			printToChecker = existing.PrintToChecker
+		}
+		if req.PrintToChecker != nil {
+			printToChecker = *req.PrintToChecker
+		}
+
+		outletPriceEntity := &entities.ProductOutletPrice{
+			ProductID:      id,
+			OutletID:       req.OutletID,
+			Price:          price,
+			PrintToChecker: printToChecker,
+		}
+		logger.FromContext(ctx).Infof("ProductProcessor::UpdateProduct -> upserting outlet price: productID=%s outletID=%s price=%f printToChecker=%v", id, req.OutletID, price, printToChecker)
+		if err := p.outletPriceRepo.Upsert(ctx, outletPriceEntity); err != nil {
+			return nil, fmt.Errorf("failed to assign outlet price: %w", err)
+		}
+	} else {
+		logger.FromContext(ctx).Infof("ProductProcessor::UpdateProduct -> skipping outlet price upsert: outletID=%s price=%v printToChecker=%v", req.OutletID, req.Price, req.PrintToChecker)
+	}
+
 	productWithCategory, err := p.productRepo.GetWithCategory(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("failed to retrieve updated product: %w", err)
@@ -214,19 +272,106 @@ func (p *ProductProcessorImpl) DeleteProduct(ctx context.Context, id uuid.UUID)
 	return nil
 }
 
-func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID) (*models.ProductResponse, error) {
+func (p *ProductProcessorImpl) GetProductByID(ctx context.Context, id uuid.UUID, outletID uuid.UUID) (*models.ProductResponse, error) {
 	productEntity, err := p.productRepo.GetWithCategory(ctx, id)
 	if err != nil {
 		return nil, fmt.Errorf("product not found: %w", err)
 	}
 
 	response := mappers.ProductEntityToResponse(productEntity)
+
+	if outletID != uuid.Nil {
+		// Attach outlet-specific price
+		outletPrice, err := p.outletPriceRepo.GetByProductAndOutlet(ctx, id, outletID)
+		if err == nil {
+			response.OutletPrice = &outletPrice.Price
+			response.PrintToChecker = outletPrice.PrintToChecker
+		}
+	} else {
+		// No outlet context — return all outlet prices for this product
+		outletPrices, err := p.outletPriceRepo.GetByProductWithOutlet(ctx, id)
+		if err == nil && len(outletPrices) > 0 {
+			prices := make([]models.OutletPrice, len(outletPrices))
+			for i, op := range outletPrices {
+				prices[i] = models.OutletPrice{
+					OutletID:       op.OutletID,
+					OutletName:     op.Outlet.Name,
+					Price:          op.Price,
+					PrintToChecker: op.PrintToChecker,
+				}
+			}
+			response.OutletPrices = prices
+		}
+	}
+
 	return response, nil
 }
 
 func (p *ProductProcessorImpl) ListProducts(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error) {
 	offset := (page - 1) * limit
 
+	// Extract outletID from filters — it's not a products column so remove it before querying
+	var outletID uuid.UUID
+	if oid, ok := filters["outlet_id"]; ok {
+		outletID = oid.(uuid.UUID)
+		delete(filters, "outlet_id")
+	}
+
+	// Use the JOIN-based query when an outlet is specified so we get outlet-specific
+	// prices in a single round-trip; fall back to the plain List otherwise.
+	var (
+		productEntities []*entities.Product
+		total           int64
+		err             error
+	)
+	if outletID != uuid.Nil {
+		productEntities, total, err = p.productRepo.ListWithOutletPrice(ctx, filters, outletID, limit, offset)
+	} else {
+		productEntities, total, err = p.productRepo.List(ctx, filters, limit, offset)
+	}
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to list products: %w", err)
+	}
+
+	responses := make([]models.ProductResponse, len(productEntities))
+	if outletID != uuid.Nil && len(productEntities) > 0 {
+		// Bulk-fetch outlet prices to populate OutletPrice and PrintToChecker per product
+		productIDs := make([]uuid.UUID, len(productEntities))
+		for i, e := range productEntities {
+			productIDs[i] = e.ID
+		}
+		outletPrices, opErr := p.outletPriceRepo.GetByProductsAndOutlet(ctx, productIDs, outletID)
+		priceMap := make(map[uuid.UUID]*entities.ProductOutletPrice)
+		if opErr == nil {
+			for _, op := range outletPrices {
+				priceMap[op.ProductID] = op
+			}
+		}
+		for i, entity := range productEntities {
+			response := mappers.ProductEntityToResponse(entity)
+			if response != nil {
+				if op, ok := priceMap[entity.ID]; ok {
+					response.OutletPrice = &op.Price
+					response.PrintToChecker = op.PrintToChecker
+				}
+				responses[i] = *response
+			}
+		}
+	} else {
+		for i, entity := range productEntities {
+			response := mappers.ProductEntityToResponse(entity)
+			if response != nil {
+				responses[i] = *response
+			}
+		}
+	}
+
+	return responses, int(total), nil
+}
+
+func (p *ProductProcessorImpl) ListProductsAll(ctx context.Context, filters map[string]interface{}, page, limit int) ([]models.ProductResponse, int, error) {
+	offset := (page - 1) * limit
+
 	productEntities, total, err := p.productRepo.List(ctx, filters, limit, offset)
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to list products: %w", err)

internal/processor/purchase_category_processor.go

@@ -0,0 +1,210 @@
+package processor
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"unicode"
+
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+)
+
+type PurchaseCategoryProcessor interface {
+	CreatePurchaseCategory(ctx context.Context, req *models.CreatePurchaseCategoryRequest) (*models.PurchaseCategoryResponse, error)
+	UpdatePurchaseCategory(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdatePurchaseCategoryRequest) (*models.PurchaseCategoryResponse, error)
+	DeletePurchaseCategory(ctx context.Context, id, organizationID uuid.UUID) error
+	GetPurchaseCategoryByID(ctx context.Context, id, organizationID uuid.UUID) (*models.PurchaseCategoryResponse, error)
+	ListPurchaseCategories(ctx context.Context, req *models.ListPurchaseCategoriesRequest) ([]models.PurchaseCategoryResponse, int, error)
+}
+
+type PurchaseCategoryRepository interface {
+	Create(ctx context.Context, category *entities.PurchaseCategory) error
+	GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.PurchaseCategory, error)
+	Update(ctx context.Context, category *entities.PurchaseCategory) error
+	SoftDelete(ctx context.Context, id, organizationID uuid.UUID) error
+	List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.PurchaseCategory, int64, error)
+	ExistsByCode(ctx context.Context, organizationID uuid.UUID, code string, excludeID *uuid.UUID) (bool, error)
+}
+
+type PurchaseCategoryProcessorImpl struct {
+	purchaseCategoryRepo PurchaseCategoryRepository
+}
+
+func NewPurchaseCategoryProcessorImpl(purchaseCategoryRepo PurchaseCategoryRepository) *PurchaseCategoryProcessorImpl {
+	return &PurchaseCategoryProcessorImpl{purchaseCategoryRepo: purchaseCategoryRepo}
+}
+
+func (p *PurchaseCategoryProcessorImpl) CreatePurchaseCategory(ctx context.Context, req *models.CreatePurchaseCategoryRequest) (*models.PurchaseCategoryResponse, error) {
+	code := ""
+	if req.Code != nil && strings.TrimSpace(*req.Code) != "" {
+		code = normalizePurchaseCategoryCode(*req.Code)
+	} else {
+		code = normalizePurchaseCategoryCode(req.Name)
+	}
+
+	if code == "" {
+		return nil, fmt.Errorf("purchase category code cannot be empty")
+	}
+
+	exists, err := p.purchaseCategoryRepo.ExistsByCode(ctx, req.OrganizationID, code, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to check purchase category code uniqueness: %w", err)
+	}
+	if exists {
+		return nil, fmt.Errorf("purchase category with code '%s' already exists", code)
+	}
+
+	if req.ParentID != nil {
+		parent, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, *req.ParentID, req.OrganizationID)
+		if err != nil {
+			return nil, fmt.Errorf("parent purchase category not found: %w", err)
+		}
+		if string(parent.Type) != req.Type {
+			return nil, fmt.Errorf("parent purchase category type must match child type")
+		}
+	}
+
+	category := mappers.CreatePurchaseCategoryRequestToEntity(req)
+	category.Code = code
+
+	if err := p.purchaseCategoryRepo.Create(ctx, category); err != nil {
+		return nil, fmt.Errorf("failed to create purchase category: %w", err)
+	}
+
+	return mappers.PurchaseCategoryEntityToResponse(category), nil
+}
+
+func (p *PurchaseCategoryProcessorImpl) UpdatePurchaseCategory(ctx context.Context, id, organizationID uuid.UUID, req *models.UpdatePurchaseCategoryRequest) (*models.PurchaseCategoryResponse, error) {
+	category, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("purchase category not found: %w", err)
+	}
+
+	newType := string(category.Type)
+	if req.Type != nil {
+		newType = *req.Type
+	}
+
+	if req.ParentID != nil {
+		if *req.ParentID == id {
+			return nil, fmt.Errorf("purchase category cannot be its own parent")
+		}
+
+		parent, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, *req.ParentID, organizationID)
+		if err != nil {
+			return nil, fmt.Errorf("parent purchase category not found: %w", err)
+		}
+		if string(parent.Type) != newType {
+			return nil, fmt.Errorf("parent purchase category type must match child type")
+		}
+		category.ParentID = req.ParentID
+	}
+
+	if req.Code != nil {
+		code := normalizePurchaseCategoryCode(*req.Code)
+		if code == "" {
+			return nil, fmt.Errorf("purchase category code cannot be empty")
+		}
+
+		if code != category.Code {
+			exists, err := p.purchaseCategoryRepo.ExistsByCode(ctx, organizationID, code, &id)
+			if err != nil {
+				return nil, fmt.Errorf("failed to check purchase category code uniqueness: %w", err)
+			}
+			if exists {
+				return nil, fmt.Errorf("purchase category with code '%s' already exists", code)
+			}
+			category.Code = code
+		}
+	}
+
+	if req.Name != nil {
+		category.Name = strings.TrimSpace(*req.Name)
+	}
+	if req.Type != nil {
+		category.Type = entities.PurchaseCategoryType(*req.Type)
+	}
+	if req.SortOrder != nil {
+		category.SortOrder = *req.SortOrder
+	}
+	if req.IsActive != nil {
+		category.IsActive = *req.IsActive
+	}
+
+	if err := p.purchaseCategoryRepo.Update(ctx, category); err != nil {
+		return nil, fmt.Errorf("failed to update purchase category: %w", err)
+	}
+
+	return mappers.PurchaseCategoryEntityToResponse(category), nil
+}
+
+func (p *PurchaseCategoryProcessorImpl) DeletePurchaseCategory(ctx context.Context, id, organizationID uuid.UUID) error {
+	_, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return fmt.Errorf("purchase category not found: %w", err)
+	}
+
+	if err := p.purchaseCategoryRepo.SoftDelete(ctx, id, organizationID); err != nil {
+		return fmt.Errorf("failed to delete purchase category: %w", err)
+	}
+
+	return nil
+}
+
+func (p *PurchaseCategoryProcessorImpl) GetPurchaseCategoryByID(ctx context.Context, id, organizationID uuid.UUID) (*models.PurchaseCategoryResponse, error) {
+	category, err := p.purchaseCategoryRepo.GetByIDAndOrganizationID(ctx, id, organizationID)
+	if err != nil {
+		return nil, fmt.Errorf("purchase category not found: %w", err)
+	}
+
+	return mappers.PurchaseCategoryEntityToResponse(category), nil
+}
+
+func (p *PurchaseCategoryProcessorImpl) ListPurchaseCategories(ctx context.Context, req *models.ListPurchaseCategoriesRequest) ([]models.PurchaseCategoryResponse, int, error) {
+	filters := make(map[string]interface{})
+	if req.ParentID != nil {
+		filters["parent_id"] = *req.ParentID
+	}
+	if req.Type != "" {
+		filters["type"] = req.Type
+	}
+	if req.Search != "" {
+		filters["search"] = req.Search
+	}
+	if req.IsActive != nil {
+		filters["is_active"] = *req.IsActive
+	}
+
+	offset := (req.Page - 1) * req.Limit
+	categories, total, err := p.purchaseCategoryRepo.List(ctx, req.OrganizationID, filters, req.Limit, offset)
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to list purchase categories: %w", err)
+	}
+
+	return mappers.PurchaseCategoryEntitiesToResponses(categories), int(total), nil
+}
+
+func normalizePurchaseCategoryCode(value string) string {
+	value = strings.TrimSpace(strings.ToLower(value))
+	var builder strings.Builder
+	lastUnderscore := false
+
+	for _, r := range value {
+		if unicode.IsLetter(r) || unicode.IsDigit(r) {
+			builder.WriteRune(r)
+			lastUnderscore = false
+			continue
+		}
+
+		if !lastUnderscore {
+			builder.WriteRune('_')
+			lastUnderscore = true
+		}
+	}
+
+	return strings.Trim(builder.String(), "_")
+}

internal/processor/purchase_order_processor.go

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

internal/processor/split_bill_processor.go

@@ -22,8 +22,6 @@ const (
 	MetadataKeyLastSplitQuantities   = "last_split_quantities"
 )
 
-
-
 type SplitBillValidation struct {
 	OrderItems       map[uuid.UUID]*entities.OrderItem
 	PaidQuantities   map[uuid.UUID]int

internal/processor/table_processor.go

@@ -4,6 +4,7 @@ import (
 	"apskel-pos-be/internal/constants"
 	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
+	"apskel-pos-be/internal/pkg/tabletoken"
 	"apskel-pos-be/internal/repository"
 	"context"
 	"errors"
@@ -207,6 +208,23 @@ func (p *TableProcessor) GetOccupiedTables(ctx context.Context, outletID uuid.UU
 	return responses, nil
 }
 
+func (p *TableProcessor) GetTokenByID(ctx context.Context, id uuid.UUID) (string, error) {
+	table, err := p.tableRepo.GetByID(ctx, id)
+	if err != nil {
+		return "", err
+	}
+
+	if _, _, _, err := tabletoken.Decode(table.Token); err != nil {
+		newToken := tabletoken.Encode(table.ID, table.OrganizationID, table.OutletID)
+		if updateErr := p.tableRepo.UpdateToken(ctx, table.ID, newToken); updateErr != nil {
+			return "", updateErr
+		}
+		return newToken, nil
+	}
+
+	return table.Token, nil
+}
+
 func (p *TableProcessor) mapTableToResponse(table *entities.Table) *models.TableResponse {
 	response := &models.TableResponse{
 		ID:             table.ID,

internal/repository/analytics_repository.go

@@ -13,6 +13,7 @@ import (
 type AnalyticsRepository interface {
 	GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error)
 	GetSalesAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) ([]*entities.SalesAnalytics, error)
+	GetPurchasingAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.PurchasingAnalytics, error)
 	GetProductAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, limit int) ([]*entities.ProductAnalytics, error)
 	GetProductAnalyticsPerCategory(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.ProductAnalyticsPerCategory, error)
 	GetDashboardOverview(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) (*entities.DashboardOverview, error)
@@ -29,6 +30,13 @@ func NewAnalyticsRepositoryImpl(db *gorm.DB) *AnalyticsRepositoryImpl {
 	}
 }
 
+func (r *AnalyticsRepositoryImpl) resolveOutletID(query *gorm.DB, outletID *uuid.UUID, column string) *gorm.DB {
+	if outletID != nil {
+		return query.Where(column+" = ?", *outletID)
+	}
+	return query
+}
+
 func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]*entities.PaymentMethodAnalytics, error) {
 	var results []*entities.PaymentMethodAnalytics
 
@@ -50,9 +58,7 @@ func (r *AnalyticsRepositoryImpl) GetPaymentMethodAnalytics(ctx context.Context,
 		Where("p.status = ?", entities.PaymentTransactionStatusCompleted).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
 
 	err := query.
 		Group("pm.id, pm.name, pm.type").
@@ -117,6 +123,159 @@ func (r *AnalyticsRepositoryImpl) GetSalesAnalytics(ctx context.Context, organiz
 	return results, err
 }
 
+func (r *AnalyticsRepositoryImpl) GetPurchasingAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.PurchasingAnalytics, error) {
+	var summary entities.PurchasingSummary
+	var outletName *string
+
+	if outletID != nil {
+		var outlet struct {
+			Name string
+		}
+		result := r.db.WithContext(ctx).
+			Table("outlets").
+			Select("name").
+			Where("id = ? AND organization_id = ?", *outletID, organizationID).
+			Limit(1).
+			Scan(&outlet)
+		if result.Error != nil {
+			return nil, result.Error
+		}
+		if result.RowsAffected > 0 {
+			outletName = &outlet.Name
+		}
+	}
+
+	summaryQuery := r.db.WithContext(ctx).
+		Table("inventory_movements im").
+		Select(`
+			COALESCE(SUM(im.total_cost), 0) as total_purchases,
+			COUNT(DISTINCT im.reference_id) as total_purchase_orders,
+			COALESCE(SUM(im.quantity), 0) as total_quantity,
+			CASE
+				WHEN COUNT(DISTINCT im.reference_id) > 0
+				THEN COALESCE(SUM(im.total_cost), 0) / COUNT(DISTINCT im.reference_id)
+				ELSE 0
+			END as average_purchase_order_value,
+			COUNT(DISTINCT im.item_id) as total_ingredients,
+			COUNT(DISTINCT po.vendor_id) as total_vendors
+		`).
+		Joins("LEFT JOIN purchase_orders po ON im.reference_id = po.id").
+		Where("im.organization_id = ?", organizationID).
+		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Where("im.item_type = ?", "INGREDIENT").
+		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo)
+
+	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "im.outlet_id")
+
+	if err := summaryQuery.Scan(&summary).Error; err != nil {
+		return nil, err
+	}
+
+	var dateFormat string
+	switch groupBy {
+	case "hour":
+		dateFormat = "DATE_TRUNC('hour', im.created_at)"
+	case "week":
+		dateFormat = "DATE_TRUNC('week', im.created_at)"
+	case "month":
+		dateFormat = "DATE_TRUNC('month', im.created_at)"
+	default:
+		dateFormat = "DATE_TRUNC('day', im.created_at)"
+	}
+
+	var data []entities.PurchasingAnalyticsData
+	dataQuery := r.db.WithContext(ctx).
+		Table("inventory_movements im").
+		Select(`
+			`+dateFormat+` as date,
+			COALESCE(SUM(im.total_cost), 0) as purchases,
+			COUNT(DISTINCT im.reference_id) as purchase_orders,
+			COALESCE(SUM(im.quantity), 0) as quantity,
+			COUNT(DISTINCT im.item_id) as ingredients,
+			COUNT(DISTINCT po.vendor_id) as vendors
+		`).
+		Joins("LEFT JOIN purchase_orders po ON im.reference_id = po.id").
+		Where("im.organization_id = ?", organizationID).
+		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Where("im.item_type = ?", "INGREDIENT").
+		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
+		Group(dateFormat).
+		Order(dateFormat)
+
+	dataQuery = r.resolveOutletID(dataQuery, outletID, "im.outlet_id")
+
+	if err := dataQuery.Scan(&data).Error; err != nil {
+		return nil, err
+	}
+
+	var ingredientData []entities.PurchasingIngredientData
+	ingredientQuery := r.db.WithContext(ctx).
+		Table("inventory_movements im").
+		Select(`
+			i.id as ingredient_id,
+			i.name as ingredient_name,
+			COALESCE(SUM(im.quantity), 0) as quantity,
+			COALESCE(SUM(im.total_cost), 0) as total_cost,
+			CASE
+				WHEN SUM(im.quantity) > 0
+				THEN COALESCE(SUM(im.total_cost), 0) / SUM(im.quantity)
+				ELSE 0
+			END as average_unit_cost,
+			COUNT(DISTINCT im.reference_id) as purchase_order_count
+		`).
+		Joins("JOIN ingredients i ON im.item_id = i.id").
+		Where("im.organization_id = ?", organizationID).
+		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Where("im.item_type = ?", "INGREDIENT").
+		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
+		Group("i.id, i.name").
+		Order("total_cost DESC")
+
+	ingredientQuery = r.resolveOutletID(ingredientQuery, outletID, "im.outlet_id")
+
+	if err := ingredientQuery.Scan(&ingredientData).Error; err != nil {
+		return nil, err
+	}
+
+	var vendorData []entities.PurchasingVendorData
+	vendorQuery := r.db.WithContext(ctx).
+		Table("inventory_movements im").
+		Select(`
+			v.id as vendor_id,
+			v.name as vendor_name,
+			COALESCE(SUM(im.total_cost), 0) as total_cost,
+			COUNT(DISTINCT im.reference_id) as purchase_order_count,
+			COUNT(DISTINCT im.item_id) as ingredient_count,
+			COALESCE(SUM(im.quantity), 0) as quantity
+		`).
+		Joins("JOIN purchase_orders po ON im.reference_id = po.id").
+		Joins("JOIN vendors v ON po.vendor_id = v.id").
+		Where("im.organization_id = ?", organizationID).
+		Where("im.movement_type = ?", entities.InventoryMovementTypePurchase).
+		Where("im.item_type = ?", "INGREDIENT").
+		Where("im.reference_type = ?", entities.InventoryMovementReferenceTypePurchaseOrder).
+		Where("im.created_at >= ? AND im.created_at <= ?", dateFrom, dateTo).
+		Group("v.id, v.name").
+		Order("total_cost DESC")
+
+	vendorQuery = r.resolveOutletID(vendorQuery, outletID, "im.outlet_id")
+
+	if err := vendorQuery.Scan(&vendorData).Error; err != nil {
+		return nil, err
+	}
+
+	return &entities.PurchasingAnalytics{
+		OutletName:     outletName,
+		Summary:        summary,
+		Data:           data,
+		IngredientData: ingredientData,
+		VendorData:     vendorData,
+	}, nil
+}
+
 func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, limit int) ([]*entities.ProductAnalytics, error) {
 	var results []*entities.ProductAnalytics
 
@@ -125,6 +284,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Select(`
 			p.id as product_id,
 			p.name as product_name,
+			p.price as product_price,
 			c.id as category_id,
 			c.name as category_name,
 			c.order as category_order,
@@ -180,12 +340,10 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalytics(ctx context.Context, organ
 		Where("oi.status != ?", entities.OrderItemStatusCancelled).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
 
 	err := query.
-		Group("p.id, p.name, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
+		Group("p.id, p.name, p.price, p.cost, c.id, c.name, c.order, mahpp.hpp_per_unit").
 		Order("revenue DESC").
 		Limit(limit).
 		Scan(&results).Error
@@ -235,9 +393,7 @@ func (r *AnalyticsRepositoryImpl) GetProductAnalyticsPerCategory(ctx context.Con
 		Where("oi.status != ?", entities.OrderItemStatusCancelled).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
 
 	err := query.
 		Group("c.id, c.name").
@@ -267,9 +423,7 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
 		Where("o.organization_id = ?", organizationID).
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
 
-	if outletID != nil {
-		query = query.Where("o.outlet_id = ?", *outletID)
-	}
+	query = r.resolveOutletID(query, outletID, "o.outlet_id")
 
 	err := query.Scan(&result).Error
 	if err != nil {
@@ -280,9 +434,11 @@ func (r *AnalyticsRepositoryImpl) GetDashboardOverview(ctx context.Context, orga
 }
 
 func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ProfitLossAnalytics, error) {
-	// Summary query
-	var summary entities.ProfitLossSummary
+	mtdStart := time.Date(dateTo.Year(), dateTo.Month(), 1, 0, 0, 0, 0, dateTo.Location())
+	todayStart := time.Date(dateTo.Year(), dateTo.Month(), dateTo.Day(), 0, 0, 0, 0, dateTo.Location())
+	todayEnd := todayStart.Add(24 * time.Hour).Add(-time.Nanosecond)
 
+	var summary entities.ProfitLossSummary
 	summaryQuery := r.db.WithContext(ctx).
 		Table("orders o").
 		Select(`
@@ -319,17 +475,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
 		Where("o.is_void = false AND o.is_refund = false").
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo)
-
-	if outletID != nil {
-		summaryQuery = summaryQuery.Where("o.outlet_id = ?", *outletID)
-	}
-
-	err := summaryQuery.Scan(&summary).Error
-	if err != nil {
+	summaryQuery = r.resolveOutletID(summaryQuery, outletID, "o.outlet_id")
+	if err := summaryQuery.Scan(&summary).Error; err != nil {
 		return nil, err
 	}
 
-	// Time series data query
 	var timeFormat string
 	switch groupBy {
 	case "hour":
@@ -338,12 +488,11 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		timeFormat = "DATE_TRUNC('week', o.created_at)"
 	case "month":
 		timeFormat = "DATE_TRUNC('month', o.created_at)"
-	default: // day
+	default:
 		timeFormat = "DATE_TRUNC('day', o.created_at)"
 	}
 
 	var data []entities.ProfitLossData
-
 	dataQuery := r.db.WithContext(ctx).
 		Table("orders o").
 		Select(`
@@ -373,19 +522,12 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Where("o.created_at >= ? AND o.created_at <= ?", dateFrom, dateTo).
 		Group(timeFormat).
 		Order(timeFormat)
-
-	if outletID != nil {
-		dataQuery = dataQuery.Where("o.outlet_id = ?", *outletID)
-	}
-
-	err = dataQuery.Scan(&data).Error
-	if err != nil {
+	dataQuery = r.resolveOutletID(dataQuery, outletID, "o.outlet_id")
+	if err := dataQuery.Scan(&data).Error; err != nil {
 		return nil, err
 	}
 
-	// Product profit data query
 	var productData []entities.ProductProfitData
-
 	productQuery := r.db.WithContext(ctx).
 		Table("order_items oi").
 		Select(`
@@ -418,12 +560,61 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Group("p.id, p.name, c.id, c.name").
 		Order("p.name ASC").
 		Limit(1000)
-
-	if outletID != nil {
-		productQuery = productQuery.Where("o.outlet_id = ?", *outletID)
+	productQuery = r.resolveOutletID(productQuery, outletID, "o.outlet_id")
+	if err := productQuery.Scan(&productData).Error; err != nil {
+		return nil, err
 	}
 
-	err = productQuery.Scan(&productData).Error
+	type revenueCostResult struct {
+		Revenue float64
+		Cost    float64
+	}
+
+	var todayRC revenueCostResult
+	todayQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			COALESCE(SUM(o.total_amount), 0) as revenue,
+			COALESCE(SUM(o.total_cost), 0) as cost
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", todayStart, todayEnd)
+	todayQuery = r.resolveOutletID(todayQuery, outletID, "o.outlet_id")
+	if err := todayQuery.Scan(&todayRC).Error; err != nil {
+		return nil, err
+	}
+
+	var mtdRC revenueCostResult
+	mtdQuery := r.db.WithContext(ctx).
+		Table("orders o").
+		Select(`
+			COALESCE(SUM(o.total_amount), 0) as revenue,
+			COALESCE(SUM(o.total_cost), 0) as cost
+		`).
+		Where("o.organization_id = ?", organizationID).
+		Where("o.status = ?", entities.OrderStatusCompleted).
+		Where("o.payment_status = ?", entities.PaymentStatusCompleted).
+		Where("o.is_void = false AND o.is_refund = false").
+		Where("o.created_at >= ? AND o.created_at <= ?", mtdStart, todayEnd)
+	mtdQuery = r.resolveOutletID(mtdQuery, outletID, "o.outlet_id")
+	if err := mtdQuery.Scan(&mtdRC).Error; err != nil {
+		return nil, err
+	}
+
+	todayExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, todayStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+
+	mtdExpenseByCategory, err := r.getExpenseByCategory(ctx, organizationID, outletID, mtdStart, todayEnd)
+	if err != nil {
+		return nil, err
+	}
+
+	opsItems, err := r.getOperationalExpenseItems(ctx, organizationID, outletID, mtdStart, todayEnd)
 	if err != nil {
 		return nil, err
 	}
@@ -432,5 +623,61 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 		Summary:                 summary,
 		Data:                    data,
 		ProductData:             productData,
+		TodayRevenue:            todayRC.Revenue,
+		TodayCost:               todayRC.Cost,
+		MtdRevenue:              mtdRC.Revenue,
+		MtdCost:                 mtdRC.Cost,
+		TodayExpenseByCategory:  todayExpenseByCategory,
+		MtdExpenseByCategory:    mtdExpenseByCategory,
+		OperationalExpenseItems: opsItems,
 	}, nil
 }
+
+func (r *AnalyticsRepositoryImpl) getExpenseByCategory(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.ExpenseCategoryTotal, error) {
+	var results []entities.ExpenseCategoryTotal
+
+	query := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`COALESCE(parent_coa.name, coa.name, 'Lain-lain') as category_name, COALESCE(SUM(ei.amount), 0) as amount`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
+		Joins("LEFT JOIN chart_of_accounts parent_coa ON coa.parent_id = parent_coa.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+
+	if outletID != nil {
+		query = query.Where("e.outlet_id = ?", *outletID)
+	}
+
+	err := query.
+		Group("COALESCE(parent_coa.name, coa.name, 'Lain-lain')").
+		Order("COALESCE(parent_coa.name, coa.name, 'Lain-lain')").
+		Scan(&results).Error
+
+	return results, err
+}
+
+func (r *AnalyticsRepositoryImpl) getOperationalExpenseItems(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time) ([]entities.OperationalExpenseItem, error) {
+	var results []entities.OperationalExpenseItem
+
+	query := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`COALESCE(NULLIF(ei.item, ''), ei.description, coa.name) as item, COALESCE(SUM(ei.amount), 0) as amount`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+
+	if outletID != nil {
+		query = query.Where("e.outlet_id = ?", *outletID)
+	}
+
+	err := query.
+		Group("COALESCE(NULLIF(ei.item, ''), ei.description, coa.name)").
+		Order("amount DESC").
+		Scan(&results).Error
+
+	return results, err
+}

internal/repository/category_repository.go

@@ -72,6 +72,9 @@ func (r *CategoryRepositoryImpl) List(ctx context.Context, filters map[string]in
 		case "search":
 			searchValue := "%" + value.(string) + "%"
 			query = query.Where("name ILIKE ? OR description ILIKE ?", searchValue, searchValue)
+		case "outlet_id":
+			// Include outlet-specific categories AND global categories (outlet_id IS NULL)
+			query = query.Where("outlet_id = ? OR outlet_id IS NULL", value)
 		default:
 			query = query.Where(key+" = ?", value)
 		}

internal/repository/expense_repository.go

@@ -0,0 +1,255 @@
+package repository
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"github.com/google/uuid"
+
+	"apskel-pos-be/internal/entities"
+
+	"gorm.io/gorm"
+)
+
+type ExpenseRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewExpenseRepositoryImpl(db *gorm.DB) *ExpenseRepositoryImpl {
+	return &ExpenseRepositoryImpl{
+		db: db,
+	}
+}
+
+func (r *ExpenseRepositoryImpl) Create(ctx context.Context, expense *entities.Expense) error {
+	return r.db.WithContext(ctx).Create(expense).Error
+}
+
+func (r *ExpenseRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Expense, error) {
+	var expense entities.Expense
+	err := r.db.WithContext(ctx).
+		Preload("Items.ChartOfAccount").
+		First(&expense, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &expense, nil
+}
+
+func (r *ExpenseRepositoryImpl) GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.Expense, error) {
+	var expense entities.Expense
+	err := r.db.WithContext(ctx).
+		Preload("Items.ChartOfAccount").
+		Where("id = ? AND organization_id = ?", id, organizationID).
+		First(&expense).Error
+	if err != nil {
+		return nil, err
+	}
+	return &expense, nil
+}
+
+func (r *ExpenseRepositoryImpl) Update(ctx context.Context, expense *entities.Expense) error {
+	return r.db.WithContext(ctx).Save(expense).Error
+}
+
+func (r *ExpenseRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.Expense{}, "id = ?", id).Error
+}
+
+func (r *ExpenseRepositoryImpl) List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.Expense, int64, error) {
+	var expenses []*entities.Expense
+	var total int64
+
+	query := r.db.WithContext(ctx).Model(&entities.Expense{}).Where("organization_id = ?", organizationID)
+
+	for key, value := range filters {
+		switch key {
+		case "search":
+			if searchStr, ok := value.(string); ok && searchStr != "" {
+				searchPattern := "%" + strings.ToLower(searchStr) + "%"
+				query = query.Where(`
+					LOWER(receiver) LIKE ?
+					OR LOWER(code_number) LIKE ?
+					OR LOWER(description) LIKE ?
+					OR EXISTS (
+						SELECT 1
+						FROM expense_items ei
+						WHERE ei.expense_id = expenses.id
+						  AND LOWER(ei.item) LIKE ?
+					)
+				`, searchPattern, searchPattern, searchPattern, searchPattern)
+			}
+		case "outlet_id":
+			if outletID, ok := value.(uuid.UUID); ok {
+				query = query.Where("outlet_id = ?", outletID)
+			}
+		case "status":
+			if status, ok := value.(string); ok && status != "" {
+				query = query.Where("status = ?", status)
+			}
+		case "start_date":
+			if startDate, ok := value.(time.Time); ok {
+				query = query.Where("transaction_date >= ?", startDate)
+			}
+		case "end_date":
+			if endDate, ok := value.(time.Time); ok {
+				query = query.Where("transaction_date <= ?", endDate)
+			}
+		default:
+			query = query.Where(key+" = ?", value)
+		}
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.
+		Preload("Items.ChartOfAccount").
+		Order("created_at DESC").
+		Limit(limit).
+		Offset(offset).
+		Find(&expenses).Error
+	return expenses, total, err
+}
+
+func (r *ExpenseRepositoryImpl) GetAnalytics(ctx context.Context, organizationID uuid.UUID, outletID *uuid.UUID, dateFrom, dateTo time.Time, groupBy string) (*entities.ExpenseAnalytics, error) {
+	var summary entities.ExpenseAnalyticsSummary
+
+	summaryQuery := r.db.WithContext(ctx).
+		Table("expenses e").
+		Select(`
+			COALESCE(SUM(e.total), 0) as total_expenses,
+			COUNT(e.id) as total_expense_count,
+			COALESCE(SUM(e.tax), 0) as total_tax,
+			COALESCE(AVG(e.total), 0) as average_expense_value
+		`).
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+	if outletID != nil {
+		summaryQuery = summaryQuery.Where("e.outlet_id = ?", *outletID)
+	}
+	if err := summaryQuery.Scan(&summary).Error; err != nil {
+		return nil, err
+	}
+
+	countsQuery := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`
+			COUNT(ei.id) as total_items,
+			COUNT(DISTINCT ei.chart_of_account_id) as total_categories
+		`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo)
+	if outletID != nil {
+		countsQuery = countsQuery.Where("e.outlet_id = ?", *outletID)
+	}
+	if err := countsQuery.Scan(&summary).Error; err != nil {
+		return nil, err
+	}
+
+	dateFormat := "DATE_TRUNC('day', e.transaction_date)"
+	switch groupBy {
+	case "hour":
+		dateFormat = "DATE_TRUNC('hour', e.transaction_date)"
+	case "week":
+		dateFormat = "DATE_TRUNC('week', e.transaction_date)"
+	case "month":
+		dateFormat = "DATE_TRUNC('month', e.transaction_date)"
+	}
+
+	var data []entities.ExpenseAnalyticsData
+	dataQuery := r.db.WithContext(ctx).
+		Table("expenses e").
+		Select(`
+			`+dateFormat+` as date,
+			COALESCE(SUM(e.total), 0) as expenses,
+			COUNT(e.id) as expense_count,
+			COALESCE(SUM(e.tax), 0) as tax,
+			COALESCE(SUM(item_counts.items), 0) as items,
+			COALESCE(SUM(item_counts.categories), 0) as categories
+		`).
+		Joins(`LEFT JOIN (
+			SELECT expense_id, COUNT(id) as items, COUNT(DISTINCT chart_of_account_id) as categories
+			FROM expense_items
+			GROUP BY expense_id
+		) item_counts ON item_counts.expense_id = e.id`).
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo).
+		Group(dateFormat).
+		Order(dateFormat)
+	if outletID != nil {
+		dataQuery = dataQuery.Where("e.outlet_id = ?", *outletID)
+	}
+	if err := dataQuery.Scan(&data).Error; err != nil {
+		return nil, err
+	}
+
+	var categoryData []entities.ExpenseAnalyticsCategoryData
+	categoryQuery := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`
+			COALESCE(parent_coa.id, coa.id) as chart_of_account_id,
+			COALESCE(parent_coa.name, coa.name, 'Lain-lain') as chart_of_account_name,
+			COALESCE(SUM(ei.amount), 0) as total_amount,
+			COUNT(DISTINCT e.id) as expense_count,
+			COUNT(ei.id) as item_count
+		`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
+		Joins("LEFT JOIN chart_of_accounts parent_coa ON coa.parent_id = parent_coa.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo).
+		Group("COALESCE(parent_coa.id, coa.id), COALESCE(parent_coa.name, coa.name, 'Lain-lain')").
+		Order("total_amount DESC")
+	if outletID != nil {
+		categoryQuery = categoryQuery.Where("e.outlet_id = ?", *outletID)
+	}
+	if err := categoryQuery.Scan(&categoryData).Error; err != nil {
+		return nil, err
+	}
+
+	var itemData []entities.ExpenseAnalyticsItemData
+	itemQuery := r.db.WithContext(ctx).
+		Table("expense_items ei").
+		Select(`
+			COALESCE(NULLIF(ei.item, ''), ei.description, coa.name) as item,
+			COALESCE(SUM(ei.amount), 0) as total_amount,
+			COUNT(DISTINCT e.id) as expense_count,
+			COUNT(ei.id) as item_count
+		`).
+		Joins("JOIN expenses e ON ei.expense_id = e.id").
+		Joins("JOIN chart_of_accounts coa ON ei.chart_of_account_id = coa.id").
+		Where("e.organization_id = ?", organizationID).
+		Where("e.status = ?", "approved").
+		Where("e.transaction_date >= ? AND e.transaction_date <= ?", dateFrom, dateTo).
+		Group("COALESCE(NULLIF(ei.item, ''), ei.description, coa.name)").
+		Order("total_amount DESC")
+	if outletID != nil {
+		itemQuery = itemQuery.Where("e.outlet_id = ?", *outletID)
+	}
+	if err := itemQuery.Scan(&itemData).Error; err != nil {
+		return nil, err
+	}
+
+	return &entities.ExpenseAnalytics{
+		Summary:      summary,
+		Data:         data,
+		CategoryData: categoryData,
+		ItemData:     itemData,
+	}, nil
+}
+
+func (r *ExpenseRepositoryImpl) CreateItem(ctx context.Context, item *entities.ExpenseItem) error {
+	return r.db.WithContext(ctx).Create(item).Error
+}
+
+func (r *ExpenseRepositoryImpl) DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.ExpenseItem{}, "expense_id = ?", expenseID).Error
+}

internal/repository/ingredient_unit_converter_repository.go

@@ -173,4 +173,3 @@ func (r *IngredientUnitConverterRepositoryImpl) ConvertQuantity(ctx context.Cont
 	// If no converter found, return error
 	return 0, fmt.Errorf("no conversion found between units %s and %s for ingredient %s", fromUnitID, toUnitID, ingredientID)
 }
-

internal/repository/inventory_repository.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/uuid"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 type InventoryRepository interface {
@@ -278,7 +279,12 @@ func (r *InventoryRepositoryImpl) UpdateReorderLevel(ctx context.Context, id uui
 }
 
 func (r *InventoryRepositoryImpl) BulkCreate(ctx context.Context, inventoryItems []*entities.Inventory) error {
-	return r.db.WithContext(ctx).CreateInBatches(inventoryItems, 100).Error
+	return r.db.WithContext(ctx).
+		Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "outlet_id"}, {Name: "product_id"}},
+			DoNothing: true,
+		}).
+		CreateInBatches(inventoryItems, 100).Error
 }
 
 func (r *InventoryRepositoryImpl) BulkUpdate(ctx context.Context, inventoryItems []*entities.Inventory) error {
@@ -301,21 +307,25 @@ func (r *InventoryRepositoryImpl) BulkAdjustQuantity(ctx context.Context, adjust
 	return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		for productID, delta := range adjustments {
 			var inventory entities.Inventory
-			if err := tx.Where("product_id = ? AND outlet_id = ?", productID, outletID).First(&inventory).Error; err != nil {
-				if errors.Is(err, gorm.ErrRecordNotFound) {
-					// Inventory doesn't exist, create it with initial quantity
+			err := tx.Set("gorm:query_option", "FOR UPDATE").
+				Where("product_id = ? AND outlet_id = ?", productID, outletID).
+				First(&inventory).Error
+			if err != nil {
+				if !errors.Is(err, gorm.ErrRecordNotFound) {
+					return err
+				}
+				// Use FirstOrCreate to handle race conditions — avoids duplicate key
+				// if another transaction already inserted this row concurrently.
 				inventory = entities.Inventory{
 					ProductID:    productID,
 					OutletID:     outletID,
 					Quantity:     0,
 					ReorderLevel: 0,
 				}
-					if err := tx.Create(&inventory).Error; err != nil {
+				if err := tx.Where(entities.Inventory{ProductID: productID, OutletID: outletID}).
+					FirstOrCreate(&inventory).Error; err != nil {
 					return fmt.Errorf("failed to create inventory record for product %s: %w", productID, err)
 				}
-				} else {
-					return err
-				}
 			}
 
 			inventory.UpdateQuantity(delta)

internal/repository/order_repository.go

@@ -18,6 +18,7 @@ type OrderRepository interface {
 	Update(ctx context.Context, order *entities.Order) error
 	Delete(ctx context.Context, id uuid.UUID) error
 	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Order, int64, error)
+	ListBySessionID(ctx context.Context, sessionID string) ([]*entities.Order, error)
 	GetByOrderNumber(ctx context.Context, orderNumber string) (*entities.Order, error)
 	ExistsByOrderNumber(ctx context.Context, orderNumber string) (bool, error)
 	VoidOrder(ctx context.Context, id uuid.UUID, reason string, voidedBy uuid.UUID) error
@@ -59,6 +60,8 @@ func (r *OrderRepositoryImpl) GetWithRelations(ctx context.Context, id uuid.UUID
 		Preload("User").
 		Preload("OrderItems").
 		Preload("OrderItems.Product").
+		Preload("OrderItems.Product.Category").
+		Preload("OrderItems.Product.ProductOutletPrices").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
 		Preload("Payments.PaymentMethod").
@@ -97,39 +100,77 @@ func (r *OrderRepositoryImpl) List(ctx context.Context, filters map[string]inter
 	var orders []*entities.Order
 	var total int64
 
-	query := r.db.WithContext(ctx).Model(&entities.Order{}).
+	// organization_id is mandatory to prevent cross-org data leaks
+	organizationID, ok := filters["organization_id"]
+	if !ok {
+		return nil, 0, fmt.Errorf("organization_id is required for listing orders")
+	}
+
+	baseQuery := r.db.WithContext(ctx).Model(&entities.Order{}).
+		Where("organization_id = ?", organizationID)
+
+	// outlet_id is optional — if present, scope to that outlet; otherwise return all outlets in the org
+	if outletID, exists := filters["outlet_id"]; exists {
+		baseQuery = baseQuery.Where("outlet_id = ?", outletID)
+	}
+
+	for key, value := range filters {
+		switch key {
+		case "organization_id", "outlet_id":
+			// already handled above
+		case "search":
+			searchValue := "%" + value.(string) + "%"
+			baseQuery = baseQuery.Where("order_number ILIKE ?", searchValue)
+		case "date_from":
+			baseQuery = baseQuery.Where("created_at >= ?", value)
+		case "date_to":
+			baseQuery = baseQuery.Where("created_at <= ?", value)
+		default:
+			baseQuery = baseQuery.Where(key+" = ?", value)
+		}
+	}
+
+	// Use separate queries for count and find to avoid GORM state mutation issues
+	if err := baseQuery.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := baseQuery.
 		Preload("Organization").
 		Preload("Outlet").
 		Preload("User").
 		Preload("OrderItems").
 		Preload("OrderItems.Product").
+		Preload("OrderItems.Product.Category").
+		Preload("OrderItems.Product.ProductOutletPrices").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
 		Preload("Payments.PaymentMethod").
-		Preload("Payments.PaymentOrderItems")
-
-	for key, value := range filters {
-		switch key {
-		case "search":
-			searchValue := "%" + value.(string) + "%"
-			query = query.Where("order_number ILIKE ?", searchValue)
-		case "date_from":
-			query = query.Where("created_at >= ?", value)
-		case "date_to":
-			query = query.Where("created_at <= ?", value)
-		default:
-			query = query.Where(key+" = ?", value)
-		}
-	}
-
-	if err := query.Count(&total).Error; err != nil {
-		return nil, 0, err
-	}
-
-	err := query.Limit(limit).Offset(offset).Order("created_at DESC").Find(&orders).Error
+		Preload("Payments.PaymentOrderItems").
+		Limit(limit).Offset(offset).Order("created_at DESC").Find(&orders).Error
 	return orders, total, err
 }
 
+func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID string) ([]*entities.Order, error) {
+	var orders []*entities.Order
+	err := r.db.WithContext(ctx).Model(&entities.Order{}).
+		Preload("Organization").
+		Preload("Outlet").
+		Preload("User").
+		Preload("OrderItems").
+		Preload("OrderItems.Product").
+		Preload("OrderItems.Product.Category").
+		Preload("OrderItems.Product.ProductOutletPrices").
+		Preload("OrderItems.ProductVariant").
+		Preload("Payments").
+		Preload("Payments.PaymentMethod").
+		Preload("Payments.PaymentOrderItems").
+		Where("metadata->>'session_id' = ?", sessionID).
+		Order("created_at ASC").
+		Find(&orders).Error
+	return orders, err
+}
+
 func (r *OrderRepositoryImpl) GetByOrderNumber(ctx context.Context, orderNumber string) (*entities.Order, error) {
 	var order entities.Order
 	err := r.db.WithContext(ctx).First(&order, "order_number = ?", orderNumber).Error

internal/repository/organization_repository.go

@@ -2,6 +2,8 @@ package repository
 
 import (
 	"context"
+	"time"
+
 	"github.com/google/uuid"
 
 	"apskel-pos-be/internal/entities"
@@ -99,3 +101,40 @@ func (r *OrganizationRepositoryImpl) GetByEmail(ctx context.Context, email strin
 	}
 	return &org, nil
 }
+
+// GetTotalOmset returns the total revenue from completed orders for an organization.
+func (r *OrganizationRepositoryImpl) GetTotalOmset(ctx context.Context, organizationID uuid.UUID) (float64, error) {
+	var total float64
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where("organization_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ?", organizationID, "completed", false, false).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}
+
+// GetTodayOmset returns the total revenue from completed orders for an organization on the current calendar day.
+func (r *OrganizationRepositoryImpl) GetTodayOmset(ctx context.Context, organizationID uuid.UUID) (float64, error) {
+	var total float64
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where(
+			"organization_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ? AND created_at >= ? AND created_at < ?",
+			organizationID, "completed", false, false,
+			todayStart(), tomorrowStart(),
+		).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}
+
+// todayStart returns midnight of the current local day.
+func todayStart() time.Time {
+	now := time.Now()
+	return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+}
+
+// tomorrowStart returns midnight of the next local day.
+func tomorrowStart() time.Time {
+	return todayStart().AddDate(0, 0, 1)
+}

internal/repository/outlet_repository.go

@@ -3,6 +3,7 @@ package repository
 import (
 	"apskel-pos-be/internal/entities"
 	"context"
+	"time"
 
 	"github.com/google/uuid"
 	"gorm.io/gorm"
@@ -103,3 +104,22 @@ func (r *OutletRepositoryImpl) Count(ctx context.Context, filters map[string]int
 	err := query.Count(&count).Error
 	return count, err
 }
+
+// GetTodayOmset returns the total revenue from completed orders for an outlet on the current calendar day.
+func (r *OutletRepositoryImpl) GetTodayOmset(ctx context.Context, outletID uuid.UUID) (float64, error) {
+	var total float64
+	now := time.Now()
+	todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
+	tomorrowStart := todayStart.AddDate(0, 0, 1)
+
+	err := r.db.WithContext(ctx).
+		Table("orders").
+		Where(
+			"outlet_id = ? AND payment_status = ? AND is_void = ? AND is_refund = ? AND created_at >= ? AND created_at < ?",
+			outletID, "completed", false, false,
+			todayStart, tomorrowStart,
+		).
+		Select("COALESCE(SUM(total_amount), 0)").
+		Scan(&total).Error
+	return total, err
+}

internal/repository/product_outlet_price_repository.go

@@ -0,0 +1,92 @@
+package repository
+
+import (
+	"context"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type ProductOutletPriceRepository interface {
+	GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*entities.ProductOutletPrice, error)
+	GetByProduct(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error)
+	GetByProductWithOutlet(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error)
+	GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error)
+	GetByProductsAndOutlet(ctx context.Context, productIDs []uuid.UUID, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error)
+	Upsert(ctx context.Context, price *entities.ProductOutletPrice) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.ProductOutletPrice, error)
+}
+
+type ProductOutletPriceRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewProductOutletPriceRepositoryImpl(db *gorm.DB) *ProductOutletPriceRepositoryImpl {
+	return &ProductOutletPriceRepositoryImpl{
+		db: db,
+	}
+}
+
+func (r *ProductOutletPriceRepositoryImpl) GetByProductAndOutlet(ctx context.Context, productID, outletID uuid.UUID) (*entities.ProductOutletPrice, error) {
+	var price entities.ProductOutletPrice
+	err := r.db.WithContext(ctx).Where("product_id = ? AND outlet_id = ?", productID, outletID).First(&price).Error
+	if err != nil {
+		return nil, err
+	}
+	return &price, nil
+}
+
+func (r *ProductOutletPriceRepositoryImpl) GetByProduct(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
+	var prices []*entities.ProductOutletPrice
+	err := r.db.WithContext(ctx).Where("product_id = ?", productID).Find(&prices).Error
+	return prices, err
+}
+
+func (r *ProductOutletPriceRepositoryImpl) GetByOutlet(ctx context.Context, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
+	var prices []*entities.ProductOutletPrice
+	err := r.db.WithContext(ctx).Where("outlet_id = ?", outletID).Find(&prices).Error
+	return prices, err
+}
+
+func (r *ProductOutletPriceRepositoryImpl) Upsert(ctx context.Context, price *entities.ProductOutletPrice) error {
+	if price.ID == uuid.Nil {
+		price.ID = uuid.New()
+	}
+	return r.db.WithContext(ctx).Exec(`
+		INSERT INTO product_outlet_prices (id, product_id, outlet_id, price, print_to_checker, created_at, updated_at)
+		VALUES (?, ?, ?, ?, ?, NOW(), NOW())
+		ON CONFLICT (product_id, outlet_id)
+		DO UPDATE SET
+			price = EXCLUDED.price,
+			print_to_checker = EXCLUDED.print_to_checker,
+			updated_at = NOW()
+	`, price.ID, price.ProductID, price.OutletID, price.Price, price.PrintToChecker).Error
+}
+
+func (r *ProductOutletPriceRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.ProductOutletPrice{}, "id = ?", id).Error
+}
+
+func (r *ProductOutletPriceRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.ProductOutletPrice, error) {
+	var price entities.ProductOutletPrice
+	err := r.db.WithContext(ctx).First(&price, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &price, nil
+}
+
+func (r *ProductOutletPriceRepositoryImpl) GetByProductsAndOutlet(ctx context.Context, productIDs []uuid.UUID, outletID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
+	var prices []*entities.ProductOutletPrice
+	err := r.db.WithContext(ctx).Where("product_id IN ? AND outlet_id = ?", productIDs, outletID).Find(&prices).Error
+	return prices, err
+}
+
+func (r *ProductOutletPriceRepositoryImpl) GetByProductWithOutlet(ctx context.Context, productID uuid.UUID) ([]*entities.ProductOutletPrice, error) {
+	var prices []*entities.ProductOutletPrice
+	err := r.db.WithContext(ctx).Preload("Outlet").Where("product_id = ?", productID).Find(&prices).Error
+	return prices, err
+}

internal/repository/product_repository.go

@@ -178,6 +178,26 @@ func (r *ProductRepositoryImpl) ExistsByName(ctx context.Context, organizationID
 	return count > 0, err
 }
 
+// ExistsByNameInOutlet checks name uniqueness scoped to a specific outlet via product_outlet_prices.
+// Falls back to organization-scoped check when outletID is zero.
+func (r *ProductRepositoryImpl) ExistsByNameInOutlet(ctx context.Context, organizationID uuid.UUID, outletID uuid.UUID, name string, excludeID *uuid.UUID) (bool, error) {
+	if outletID == uuid.Nil {
+		return r.ExistsByName(ctx, organizationID, name, excludeID)
+	}
+
+	query := r.db.WithContext(ctx).Model(&entities.Product{}).
+		Joins("INNER JOIN product_outlet_prices pop ON pop.product_id = products.id AND pop.outlet_id = ?", outletID).
+		Where("products.organization_id = ? AND products.name = ?", organizationID, name)
+
+	if excludeID != nil {
+		query = query.Where("products.id != ?", *excludeID)
+	}
+
+	var count int64
+	err := query.Count(&count).Error
+	return count > 0, err
+}
+
 func (r *ProductRepositoryImpl) UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error {
 	return r.db.WithContext(ctx).Model(&entities.Product{}).
 		Where("id = ?", id).
@@ -189,3 +209,47 @@ func (r *ProductRepositoryImpl) GetLowCostProducts(ctx context.Context, organiza
 	err := r.db.WithContext(ctx).Where("organization_id = ? AND cost <= ? AND is_active = ?", organizationID, maxCost, true).Find(&products).Error
 	return products, err
 }
+
+// ListWithOutletPrice fetches products with the same filters as List, but overrides
+// each product's Price with the outlet-specific price from product_outlet_prices when
+// outletID is provided. A single LEFT JOIN is used so no second round-trip is needed.
+func (r *ProductRepositoryImpl) ListWithOutletPrice(ctx context.Context, filters map[string]interface{}, outletID uuid.UUID, limit, offset int) ([]*entities.Product, int64, error) {
+	var products []*entities.Product
+	var total int64
+
+	// Base query with category and variant preloads
+	query := r.db.WithContext(ctx).Model(&entities.Product{}).
+		Preload("Category").
+		Preload("ProductVariants")
+
+	// Apply filters
+	for key, value := range filters {
+		switch key {
+		case "search":
+			searchValue := "%" + value.(string) + "%"
+			query = query.Where("products.name ILIKE ? OR products.description ILIKE ? OR products.sku ILIKE ?", searchValue, searchValue, searchValue)
+		case "price_min":
+			query = query.Where("products.price >= ?", value)
+		case "price_max":
+			query = query.Where("products.price <= ?", value)
+		default:
+			query = query.Where("products."+key+" = ?", value)
+		}
+	}
+
+	// When outletID is provided, INNER JOIN product_outlet_prices so only products
+	// that have been explicitly assigned to this outlet are returned, with their
+	// outlet-specific price.
+	if outletID != uuid.Nil {
+		query = query.
+			Joins("INNER JOIN product_outlet_prices pop ON pop.product_id = products.id AND pop.outlet_id = ?", outletID).
+			Select("products.*, pop.price AS price")
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.Limit(limit).Offset(offset).Find(&products).Error
+	return products, total, err
+}

internal/repository/purchase_category_repository.go

@@ -0,0 +1,91 @@
+package repository
+
+import (
+	"context"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type PurchaseCategoryRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewPurchaseCategoryRepositoryImpl(db *gorm.DB) *PurchaseCategoryRepositoryImpl {
+	return &PurchaseCategoryRepositoryImpl{db: db}
+}
+
+func (r *PurchaseCategoryRepositoryImpl) Create(ctx context.Context, category *entities.PurchaseCategory) error {
+	return r.db.WithContext(ctx).Create(category).Error
+}
+
+func (r *PurchaseCategoryRepositoryImpl) GetByIDAndOrganizationID(ctx context.Context, id, organizationID uuid.UUID) (*entities.PurchaseCategory, error) {
+	var category entities.PurchaseCategory
+	err := r.db.WithContext(ctx).
+		First(&category, "id = ? AND organization_id = ?", id, organizationID).Error
+	if err != nil {
+		return nil, err
+	}
+	return &category, nil
+}
+
+func (r *PurchaseCategoryRepositoryImpl) Update(ctx context.Context, category *entities.PurchaseCategory) error {
+	return r.db.WithContext(ctx).Save(category).Error
+}
+
+func (r *PurchaseCategoryRepositoryImpl) SoftDelete(ctx context.Context, id, organizationID uuid.UUID) error {
+	return r.db.WithContext(ctx).
+		Model(&entities.PurchaseCategory{}).
+		Where("id = ? AND organization_id = ?", id, organizationID).
+		Update("is_active", false).Error
+}
+
+func (r *PurchaseCategoryRepositoryImpl) List(ctx context.Context, organizationID uuid.UUID, filters map[string]interface{}, limit, offset int) ([]*entities.PurchaseCategory, int64, error) {
+	var categories []*entities.PurchaseCategory
+	var total int64
+
+	query := r.db.WithContext(ctx).
+		Model(&entities.PurchaseCategory{}).
+		Where("organization_id = ?", organizationID)
+
+	for key, value := range filters {
+		switch key {
+		case "search":
+			searchValue := "%" + value.(string) + "%"
+			query = query.Where("name ILIKE ? OR code ILIKE ?", searchValue, searchValue)
+		case "parent_id":
+			query = query.Where("parent_id = ?", value)
+		case "type":
+			query = query.Where("type = ?", value)
+		case "is_active":
+			query = query.Where("is_active = ?", value)
+		}
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.
+		Order("parent_id NULLS FIRST, sort_order ASC, name ASC").
+		Limit(limit).
+		Offset(offset).
+		Find(&categories).Error
+	return categories, total, err
+}
+
+func (r *PurchaseCategoryRepositoryImpl) ExistsByCode(ctx context.Context, organizationID uuid.UUID, code string, excludeID *uuid.UUID) (bool, error) {
+	query := r.db.WithContext(ctx).
+		Model(&entities.PurchaseCategory{}).
+		Where("organization_id = ? AND code = ?", organizationID, code)
+
+	if excludeID != nil {
+		query = query.Where("id != ?", *excludeID)
+	}
+
+	var count int64
+	err := query.Count(&count).Error
+	return count > 0, err
+}

internal/repository/session_repository.go

@@ -0,0 +1,141 @@
+package repository
+
+import (
+	"apskel-pos-be/internal/models"
+	"context"
+	"encoding/json"
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/redis/go-redis/v9"
+)
+
+const (
+	sessionKeyPrefix      = "self_order:session:"
+	tableSessionKeyPrefix = "self_order:table_session:"
+	sessionTTL            = 24 * time.Hour
+	sessionStatusActive   = "active"
+	sessionStatusClosed   = "closed"
+)
+
+type SessionRepository interface {
+	Create(ctx context.Context, session *models.SelfOrderSession) error
+	GetByID(ctx context.Context, sessionID string) (*models.SelfOrderSession, error)
+	GetActiveByTableID(ctx context.Context, tableID uuid.UUID) (*models.SelfOrderSession, error)
+	Close(ctx context.Context, sessionID string) error
+	CloseByTableID(ctx context.Context, tableID uuid.UUID) error
+}
+
+type sessionRepository struct {
+	client *redis.Client
+}
+
+func NewSessionRepository(client *redis.Client) SessionRepository {
+	return &sessionRepository{client: client}
+}
+
+func (r *sessionRepository) Create(ctx context.Context, session *models.SelfOrderSession) error {
+	if session.ID == "" {
+		session.ID = uuid.New().String()
+	}
+	session.Status = sessionStatusActive
+	session.CreatedAt = time.Now()
+
+	data, err := json.Marshal(session)
+	if err != nil {
+		return fmt.Errorf("failed to marshal session: %w", err)
+	}
+
+	sessionKey := sessionKeyPrefix + session.ID
+	tableSessionKey := tableSessionKeyPrefix + session.TableID.String()
+
+	pipe := r.client.Pipeline()
+	pipe.Set(ctx, sessionKey, data, sessionTTL)
+	pipe.Set(ctx, tableSessionKey, session.ID, sessionTTL)
+
+	if _, err := pipe.Exec(ctx); err != nil {
+		return fmt.Errorf("failed to store session in redis: %w", err)
+	}
+
+	return nil
+}
+
+func (r *sessionRepository) GetByID(ctx context.Context, sessionID string) (*models.SelfOrderSession, error) {
+	data, err := r.client.Get(ctx, sessionKeyPrefix+sessionID).Bytes()
+	if err != nil {
+		if err == redis.Nil {
+			return nil, nil
+		}
+		return nil, fmt.Errorf("failed to get session: %w", err)
+	}
+
+	var session models.SelfOrderSession
+	if err := json.Unmarshal(data, &session); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal session: %w", err)
+	}
+
+	return &session, nil
+}
+
+func (r *sessionRepository) GetActiveByTableID(ctx context.Context, tableID uuid.UUID) (*models.SelfOrderSession, error) {
+	sessionID, err := r.client.Get(ctx, tableSessionKeyPrefix+tableID.String()).Result()
+	if err != nil {
+		if err == redis.Nil {
+			return nil, nil
+		}
+		return nil, fmt.Errorf("failed to get session for table: %w", err)
+	}
+
+	session, err := r.GetByID(ctx, sessionID)
+	if err != nil {
+		return nil, err
+	}
+
+	if session != nil && session.Status != sessionStatusActive {
+		return nil, nil
+	}
+
+	return session, nil
+}
+
+func (r *sessionRepository) Close(ctx context.Context, sessionID string) error {
+	session, err := r.GetByID(ctx, sessionID)
+	if err != nil {
+		return err
+	}
+	if session == nil {
+		return fmt.Errorf("session not found")
+	}
+
+	now := time.Now()
+	session.Status = sessionStatusClosed
+	session.ClosedAt = &now
+
+	data, err := json.Marshal(session)
+	if err != nil {
+		return fmt.Errorf("failed to marshal session: %w", err)
+	}
+
+	pipe := r.client.Pipeline()
+	pipe.Set(ctx, sessionKeyPrefix+session.ID, data, sessionTTL)
+	pipe.Del(ctx, tableSessionKeyPrefix+session.TableID.String())
+
+	if _, err := pipe.Exec(ctx); err != nil {
+		return fmt.Errorf("failed to close session: %w", err)
+	}
+
+	return nil
+}
+
+func (r *sessionRepository) CloseByTableID(ctx context.Context, tableID uuid.UUID) error {
+	session, err := r.GetActiveByTableID(ctx, tableID)
+	if err != nil {
+		return err
+	}
+	if session == nil {
+		return nil
+	}
+
+	return r.Close(ctx, session.ID)
+}

internal/repository/table_repository.go

@@ -36,6 +36,20 @@ func (r *TableRepository) GetByID(ctx context.Context, id uuid.UUID) (*entities.
 	return &table, nil
 }
 
+func (r *TableRepository) GetByToken(ctx context.Context, token string) (*entities.Table, error) {
+	var table entities.Table
+	err := r.db.WithContext(ctx).
+		Preload("Organization").
+		Preload("Outlet").
+		Preload("Order").
+		Where("token = ?", token).
+		First(&table).Error
+	if err != nil {
+		return nil, err
+	}
+	return &table, nil
+}
+
 func (r *TableRepository) GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error) {
 	var tables []entities.Table
 	err := r.db.WithContext(ctx).
@@ -157,6 +171,13 @@ func (r *TableRepository) ReleaseTable(ctx context.Context, tableID uuid.UUID, p
 		}).Error
 }
 
+func (r *TableRepository) UpdateToken(ctx context.Context, tableID uuid.UUID, token string) error {
+	return r.db.WithContext(ctx).
+		Model(&entities.Table{}).
+		Where("id = ?", tableID).
+		Update("token", token).Error
+}
+
 func (r *TableRepository) GetByOrderID(ctx context.Context, orderID uuid.UUID) (*entities.Table, error) {
 	var table entities.Table
 	err := r.db.WithContext(ctx).

internal/repository/table_repository_interface.go

@@ -13,6 +13,7 @@ import (
 type TableRepositoryInterface interface {
 	Create(ctx context.Context, table *entities.Table) error
 	GetByID(ctx context.Context, id uuid.UUID) (*entities.Table, error)
+	GetByToken(ctx context.Context, token string) (*entities.Table, error)
 	GetByOutletID(ctx context.Context, outletID uuid.UUID) ([]entities.Table, error)
 	GetByOrganizationID(ctx context.Context, organizationID uuid.UUID) ([]entities.Table, error)
 	Update(ctx context.Context, table *entities.Table) error
@@ -23,4 +24,5 @@ type TableRepositoryInterface interface {
 	OccupyTable(ctx context.Context, tableID, orderID uuid.UUID, startTime *time.Time) error
 	ReleaseTable(ctx context.Context, tableID uuid.UUID, paymentAmount float64) error
 	GetByOrderID(ctx context.Context, orderID uuid.UUID) (*entities.Table, error)
+	UpdateToken(ctx context.Context, tableID uuid.UUID, token string) error
 }

internal/repository/tx_manager.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"context"
+	"database/sql"
 
 	"gorm.io/gorm"
 )
@@ -28,8 +29,24 @@ func NewTxManager(db *gorm.DB) *TxManager { return &TxManager{db: db} }
 
 // WithTransaction runs fn inside a DB transaction, injecting the *gorm.DB tx into ctx.
 func (m *TxManager) WithTransaction(ctx context.Context, fn func(ctx context.Context) error) error {
+	if m == nil || m.db == nil {
+		return fn(ctx)
+	}
+
 	return m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		ctxTx := context.WithValue(ctx, txKey, tx)
 		return fn(ctxTx)
 	})
 }
+
+// WithTransactionOptions runs fn inside a DB transaction with custom TxOptions (e.g. isolation level).
+func (m *TxManager) WithTransactionOptions(ctx context.Context, opts *sql.TxOptions, fn func(ctx context.Context) error) error {
+	if m == nil || m.db == nil {
+		return fn(ctx)
+	}
+
+	return m.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		ctxTx := context.WithValue(ctx, txKey, tx)
+		return fn(ctxTx)
+	}, opts)
+}

internal/repository/user_repository.go

@@ -61,6 +61,17 @@ func (r *UserRepositoryImpl) GetActiveUsers(ctx context.Context, organizationID
 	return users, err
 }
 
+func (r *UserRepositoryImpl) GetActiveByOutletID(ctx context.Context, organizationID, outletID uuid.UUID) ([]*entities.User, error) {
+	var users []*entities.User
+	err := r.db.WithContext(ctx).
+		Where(
+			"organization_id = ? AND is_active = ? AND (outlet_id = ? OR role IN ?)",
+			organizationID, true, outletID, []string{"admin", "manager"},
+		).
+		Find(&users).Error
+	return users, err
+}
+
 func (r *UserRepositoryImpl) Update(ctx context.Context, user *entities.User) error {
 	return r.db.WithContext(ctx).Save(user).Error
 }

internal/router/router.go

@@ -9,6 +9,7 @@ import (
 	"apskel-pos-be/internal/validator"
 
 	"github.com/gin-gonic/gin"
+	"github.com/redis/go-redis/v9"
 )
 
 type Router struct {
@@ -35,6 +36,7 @@ type Router struct {
 	productRecipeHandler              *handler.ProductRecipeHandler
 	vendorHandler                     *handler.VendorHandler
 	purchaseOrderHandler              *handler.PurchaseOrderHandler
+	purchaseCategoryHandler           *handler.PurchaseCategoryHandler
 	unitConverterHandler              *handler.IngredientUnitConverterHandler
 	chartOfAccountTypeHandler         *handler.ChartOfAccountTypeHandler
 	chartOfAccountHandler             *handler.ChartOfAccountHandler
@@ -48,11 +50,15 @@ type Router struct {
 	spinGameHandler                   *handler.SpinGameHandler
 	userDeviceHandler                 *handler.UserDeviceHandler
 	notificationHandler               *handler.NotificationHandler
+	selfOrderHandler                  *handler.SelfOrderHandler
+	productOutletPriceHandler         *handler.ProductOutletPriceHandler
+	expenseHandler                    *handler.ExpenseHandler
 	authMiddleware                    *middleware.AuthMiddleware
 	customerAuthMiddleware            *middleware.CustomerAuthMiddleware
+	redisClient                       *redis.Client
 }
 
-func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator) *Router {
+func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authService service.AuthService, authMiddleware *middleware.AuthMiddleware, userService *service.UserServiceImpl, userValidator *validator.UserValidatorImpl, organizationService service.OrganizationService, organizationValidator validator.OrganizationValidator, outletService service.OutletService, outletValidator validator.OutletValidator, outletSettingService service.OutletSettingService, categoryService service.CategoryService, categoryValidator validator.CategoryValidator, productService service.ProductService, productValidator validator.ProductValidator, productVariantService service.ProductVariantService, productVariantValidator validator.ProductVariantValidator, inventoryService service.InventoryService, inventoryValidator validator.InventoryValidator, orderService service.OrderService, orderValidator validator.OrderValidator, fileService service.FileService, fileValidator validator.FileValidator, customerService service.CustomerService, customerValidator validator.CustomerValidator, paymentMethodService service.PaymentMethodService, paymentMethodValidator validator.PaymentMethodValidator, analyticsService *service.AnalyticsServiceImpl, reportService service.ReportService, tableService *service.TableServiceImpl, tableValidator *validator.TableValidator, unitService handler.UnitService, ingredientService handler.IngredientService, productRecipeService service.ProductRecipeService, vendorService service.VendorService, vendorValidator validator.VendorValidator, purchaseOrderService service.PurchaseOrderService, purchaseOrderValidator validator.PurchaseOrderValidator, purchaseCategoryService service.PurchaseCategoryService, purchaseCategoryValidator validator.PurchaseCategoryValidator, unitConverterService service.IngredientUnitConverterService, unitConverterValidator validator.IngredientUnitConverterValidator, chartOfAccountTypeService service.ChartOfAccountTypeService, chartOfAccountTypeValidator validator.ChartOfAccountTypeValidator, chartOfAccountService service.ChartOfAccountService, chartOfAccountValidator validator.ChartOfAccountValidator, accountService service.AccountService, accountValidator validator.AccountValidator, orderIngredientTransactionService service.OrderIngredientTransactionService, orderIngredientTransactionValidator validator.OrderIngredientTransactionValidator, gamificationService service.GamificationService, gamificationValidator validator.GamificationValidator, rewardService service.RewardService, rewardValidator validator.RewardValidator, campaignService service.CampaignService, campaignValidator validator.CampaignValidator, customerAuthService service.CustomerAuthService, customerAuthValidator validator.CustomerAuthValidator, customerPointsService service.CustomerPointsService, spinGameService service.SpinGameService, customerAuthMiddleware *middleware.CustomerAuthMiddleware, userDeviceService service.UserDeviceService, userDeviceValidator validator.UserDeviceValidator, notificationService service.NotificationService, notificationValidator validator.NotificationValidator, productOutletPriceService service.ProductOutletPriceService, productOutletPriceValidator validator.ProductOutletPriceValidator, selfOrderHandler *handler.SelfOrderHandler, expenseService *service.ExpenseServiceImpl, expenseValidator *validator.ExpenseValidatorImpl, redisClient *redis.Client) *Router {
 
 	return &Router{
 		config:                            cfg,
@@ -71,12 +77,13 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		paymentMethodHandler:              handler.NewPaymentMethodHandler(paymentMethodService, paymentMethodValidator),
 		analyticsHandler:                  handler.NewAnalyticsHandler(analyticsService, transformer.NewTransformer()),
 		reportHandler:                     handler.NewReportHandler(reportService, userService),
-		tableHandler:                      handler.NewTableHandler(tableService, tableValidator),
+		tableHandler:                      handler.NewTableHandler(tableService, tableValidator, cfg.Server.SelfOrderUrl),
 		unitHandler:                       handler.NewUnitHandler(unitService),
 		ingredientHandler:                 handler.NewIngredientHandler(ingredientService),
 		productRecipeHandler:              handler.NewProductRecipeHandler(productRecipeService),
 		vendorHandler:                     handler.NewVendorHandler(vendorService, vendorValidator),
 		purchaseOrderHandler:              handler.NewPurchaseOrderHandler(purchaseOrderService, purchaseOrderValidator),
+		purchaseCategoryHandler:           handler.NewPurchaseCategoryHandler(purchaseCategoryService, purchaseCategoryValidator),
 		unitConverterHandler:              handler.NewIngredientUnitConverterHandler(unitConverterService, unitConverterValidator),
 		chartOfAccountTypeHandler:         handler.NewChartOfAccountTypeHandler(chartOfAccountTypeService, chartOfAccountTypeValidator),
 		chartOfAccountHandler:             handler.NewChartOfAccountHandler(chartOfAccountService, chartOfAccountValidator),
@@ -93,6 +100,10 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		productVariantHandler:             handler.NewProductVariantHandler(productVariantService, productVariantValidator),
 		userDeviceHandler:                 handler.NewUserDeviceHandler(userDeviceService, userDeviceValidator),
 		notificationHandler:               handler.NewNotificationHandler(notificationService, notificationValidator),
+		selfOrderHandler:                  selfOrderHandler,
+		productOutletPriceHandler:         handler.NewProductOutletPriceHandler(productOutletPriceService, productOutletPriceValidator),
+		expenseHandler:                    handler.NewExpenseHandler(expenseService, expenseValidator),
+		redisClient:                       redisClient,
 	}
 }
 
@@ -149,6 +160,15 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			customer.POST("/spin", r.spinGameHandler.PlaySpinGame)
 		}
 
+		selfOrder := v1.Group("/self-order")
+		{
+			selfOrder.GET("/table/:token", r.selfOrderHandler.ValidateToken)
+			selfOrder.GET("/categories", r.selfOrderHandler.ListCategories)
+			selfOrder.GET("/menu", r.selfOrderHandler.GetMenu)
+			selfOrder.POST("/orders", r.selfOrderHandler.CreateOrder)
+			selfOrder.GET("/orders/:session_id", r.selfOrderHandler.GetOrdersBySession)
+		}
+
 		organizations := v1.Group("/organizations")
 		{
 			organizations.POST("", r.organizationHandler.CreateOrganization)
@@ -212,11 +232,23 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			{
 				products.POST("", r.productHandler.CreateProduct)
 				products.GET("", r.productHandler.ListProducts)
+				products.GET("/all", r.productHandler.ListProductAll)
 				products.GET("/:id", r.productHandler.GetProduct)
 				products.PUT("/:id", r.productHandler.UpdateProduct)
 				products.DELETE("/:id", r.productHandler.DeleteProduct)
 			}
 
+			productOutletPrices := protected.Group("/product-outlet-prices")
+			productOutletPrices.Use(r.authMiddleware.RequireAdminOrManager())
+			{
+				productOutletPrices.POST("", r.productOutletPriceHandler.Upsert)
+				productOutletPrices.POST("/bulk", r.productOutletPriceHandler.BulkUpsert)
+				productOutletPrices.GET("/product/:product_id", r.productOutletPriceHandler.GetByProduct)
+				productOutletPrices.GET("/outlet/:outlet_id", r.productOutletPriceHandler.GetByOutlet)
+				productOutletPrices.GET("/product/:product_id/outlet/:outlet_id", r.productOutletPriceHandler.GetByProductAndOutlet)
+				productOutletPrices.DELETE("/:id", r.productOutletPriceHandler.Delete)
+			}
+
 			productVariants := protected.Group("/product-variants")
 			{
 				productVariants.POST("", r.productVariantHandler.CreateProductVariant)
@@ -247,19 +279,19 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				orders.GET("", r.orderHandler.ListOrders)
 				orders.GET("/:id", r.orderHandler.GetOrderByID)
 				orders.POST("", r.orderHandler.CreateOrder)
-				orders.POST("/:id/add-items", r.orderHandler.AddToOrder)
+				orders.POST("/:id/add-items", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.AddToOrder)
 				orders.PUT("/:id", r.orderHandler.UpdateOrder)
 				orders.PUT("/:id/customer", r.orderHandler.SetOrderCustomer)
-				orders.POST("/void", r.orderHandler.VoidOrder)
-				orders.POST("/:id/refund", r.orderHandler.RefundOrder)
+				orders.POST("/void", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.VoidOrder)
+				orders.POST("/:id/refund", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.RefundOrder)
 				orders.POST("/split-bill", r.orderHandler.SplitBill)
 			}
 
 			payments := protected.Group("/payments")
 			payments.Use(r.authMiddleware.RequireAdminOrManager())
 			{
-				payments.POST("", r.orderHandler.CreatePayment)
-				payments.POST("/:id/refund", r.orderHandler.RefundPayment)
+				payments.POST("", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.CreatePayment)
+				payments.POST("/:id/refund", middleware.IdempotencyMiddleware(r.redisClient), r.orderHandler.RefundPayment)
 			}
 
 			paymentMethods := protected.Group("/payment-methods")
@@ -300,6 +332,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			{
 				analytics.GET("/payment-methods", r.analyticsHandler.GetPaymentMethodAnalytics)
 				analytics.GET("/sales", r.analyticsHandler.GetSalesAnalytics)
+				analytics.GET("/purchasing", r.analyticsHandler.GetPurchasingAnalytics)
 				analytics.GET("/products", r.analyticsHandler.GetProductAnalytics)
 				analytics.GET("/categories", r.analyticsHandler.GetProductAnalyticsPerCategory)
 				analytics.GET("/dashboard", r.analyticsHandler.GetDashboardAnalytics)
@@ -316,6 +349,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				tables.DELETE("/:id", r.tableHandler.Delete)
 				tables.POST("/:id/occupy", r.tableHandler.OccupyTable)
 				tables.POST("/:id/release", r.tableHandler.ReleaseTable)
+				tables.GET("/:id/qr", r.tableHandler.GenerateQRCode)
 			}
 
 			ingredients := protected.Group("/ingredients")
@@ -355,6 +389,16 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				purchaseOrders.DELETE("/:id", r.purchaseOrderHandler.DeletePurchaseOrder)
 			}
 
+			purchaseCategories := protected.Group("/purchase-categories")
+			purchaseCategories.Use(r.authMiddleware.RequireAdminOrManager())
+			{
+				purchaseCategories.POST("", r.purchaseCategoryHandler.CreatePurchaseCategory)
+				purchaseCategories.GET("", r.purchaseCategoryHandler.ListPurchaseCategories)
+				purchaseCategories.GET("/:id", r.purchaseCategoryHandler.GetPurchaseCategory)
+				purchaseCategories.PUT("/:id", r.purchaseCategoryHandler.UpdatePurchaseCategory)
+				purchaseCategories.DELETE("/:id", r.purchaseCategoryHandler.DeletePurchaseCategory)
+			}
+
 			unitConverters := protected.Group("/unit-converters")
 			unitConverters.Use(r.authMiddleware.RequireAdminOrManager())
 			{
@@ -417,6 +461,17 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				accounts.GET("/:id/balance", r.accountHandler.GetAccountBalance)
 			}
 
+			expenses := protected.Group("/expenses")
+			expenses.Use(r.authMiddleware.RequireAdminOrManager())
+			{
+				expenses.POST("", r.expenseHandler.CreateExpense)
+				expenses.GET("", r.expenseHandler.ListExpenses)
+				expenses.GET("/analytics", r.expenseHandler.GetExpenseAnalytics)
+				expenses.GET("/:id", r.expenseHandler.GetExpense)
+				expenses.PUT("/:id", r.expenseHandler.UpdateExpense)
+				expenses.DELETE("/:id", r.expenseHandler.DeleteExpense)
+			}
+
 			orderIngredientTransactions := protected.Group("/order-ingredient-transactions")
 			orderIngredientTransactions.Use(r.authMiddleware.RequireAdminOrManager())
 			{

internal/service/analytics_service.go

@@ -13,6 +13,7 @@ import (
 type AnalyticsService interface {
 	GetPaymentMethodAnalytics(ctx context.Context, req *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error)
 	GetSalesAnalytics(ctx context.Context, req *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, error)
+	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)
 	GetDashboardAnalytics(ctx context.Context, req *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error)
@@ -57,6 +58,19 @@ func (s *AnalyticsServiceImpl) GetSalesAnalytics(ctx context.Context, req *model
 	return response, nil
 }
 
+func (s *AnalyticsServiceImpl) GetPurchasingAnalytics(ctx context.Context, req *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error) {
+	if err := s.validatePurchasingAnalyticsRequest(req); err != nil {
+		return nil, fmt.Errorf("validation error: %w", err)
+	}
+
+	response, err := s.analyticsProcessor.GetPurchasingAnalytics(ctx, req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get purchasing analytics: %w", err)
+	}
+
+	return response, nil
+}
+
 func (s *AnalyticsServiceImpl) GetProductAnalytics(ctx context.Context, req *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
 	// Validate request
 	if err := s.validateProductAnalyticsRequest(req); err != nil {
@@ -120,18 +134,6 @@ func (s *AnalyticsServiceImpl) validatePaymentMethodAnalyticsRequest(req *models
 		return fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	if req.GroupBy != "" {
-		validGroupBy := map[string]bool{
-			"day":   true,
-			"hour":  true,
-			"week":  true,
-			"month": true,
-		}
-		if !validGroupBy[req.GroupBy] {
-			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
-		}
-	}
-
 	return nil
 }
 
@@ -168,6 +170,42 @@ func (s *AnalyticsServiceImpl) validateSalesAnalyticsRequest(req *models.SalesAn
 	return nil
 }
 
+func (s *AnalyticsServiceImpl) validatePurchasingAnalyticsRequest(req *models.PurchasingAnalyticsRequest) error {
+	if req == nil {
+		return fmt.Errorf("request cannot be nil")
+	}
+
+	if req.OrganizationID == uuid.Nil {
+		return fmt.Errorf("organization ID is required")
+	}
+
+	if req.DateFrom.IsZero() {
+		return fmt.Errorf("date_from is required")
+	}
+
+	if req.DateTo.IsZero() {
+		return fmt.Errorf("date_to is required")
+	}
+
+	if req.DateFrom.After(req.DateTo) {
+		return fmt.Errorf("date_from cannot be after date_to")
+	}
+
+	if req.GroupBy != "" {
+		validGroupBy := map[string]bool{
+			"day":   true,
+			"hour":  true,
+			"week":  true,
+			"month": true,
+		}
+		if !validGroupBy[req.GroupBy] {
+			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
+		}
+	}
+
+	return nil
+}
+
 func (s *AnalyticsServiceImpl) validateProductAnalyticsRequest(req *models.ProductAnalyticsRequest) error {
 	if req.OrganizationID == uuid.Nil {
 		return fmt.Errorf("organization ID is required")
@@ -268,8 +306,16 @@ func (s *AnalyticsServiceImpl) validateProfitLossAnalyticsRequest(req *models.Pr
 		return fmt.Errorf("date_from cannot be after date_to")
 	}
 
-	if req.GroupBy != "" && req.GroupBy != "hour" && req.GroupBy != "day" && req.GroupBy != "week" && req.GroupBy != "month" {
-		return fmt.Errorf("invalid group_by value, must be one of: hour, day, week, month")
+	if req.GroupBy != "" {
+		validGroupBy := map[string]bool{
+			"day":   true,
+			"hour":  true,
+			"week":  true,
+			"month": true,
+		}
+		if !validGroupBy[req.GroupBy] {
+			return fmt.Errorf("invalid group_by value: %s", req.GroupBy)
+		}
 	}
 
 	return nil

internal/service/analytics_service_test.go

@@ -0,0 +1,192 @@
+package service
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/require"
+)
+
+type analyticsProcessorStub struct{}
+
+func (analyticsProcessorStub) GetPaymentMethodAnalytics(context.Context, *models.PaymentMethodAnalyticsRequest) (*models.PaymentMethodAnalyticsResponse, error) {
+	return nil, nil
+}
+
+func (analyticsProcessorStub) GetSalesAnalytics(context.Context, *models.SalesAnalyticsRequest) (*models.SalesAnalyticsResponse, error) {
+	return nil, nil
+}
+
+func (analyticsProcessorStub) GetPurchasingAnalytics(context.Context, *models.PurchasingAnalyticsRequest) (*models.PurchasingAnalyticsResponse, error) {
+	return &models.PurchasingAnalyticsResponse{}, nil
+}
+
+func (analyticsProcessorStub) GetProductAnalytics(context.Context, *models.ProductAnalyticsRequest) (*models.ProductAnalyticsResponse, error) {
+	return nil, nil
+}
+
+func (analyticsProcessorStub) GetProductAnalyticsPerCategory(context.Context, *models.ProductAnalyticsPerCategoryRequest) (*models.ProductAnalyticsPerCategoryResponse, error) {
+	return nil, nil
+}
+
+func (analyticsProcessorStub) GetDashboardAnalytics(context.Context, *models.DashboardAnalyticsRequest) (*models.DashboardAnalyticsResponse, error) {
+	return nil, nil
+}
+
+func (analyticsProcessorStub) GetProfitLossAnalytics(context.Context, *models.ProfitLossAnalyticsRequest) (*models.ProfitLossAnalyticsResponse, error) {
+	return nil, nil
+}
+
+func TestAnalyticsServiceGetPurchasingAnalyticsValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name    string
+		req     *models.PurchasingAnalyticsRequest
+		wantErr string
+	}{
+		{
+			name: "missing organization",
+			req: &models.PurchasingAnalyticsRequest{
+				DateFrom: now,
+				DateTo:   now,
+			},
+			wantErr: "organization ID is required",
+		},
+		{
+			name: "missing date_from",
+			req: &models.PurchasingAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateTo:         now,
+			},
+			wantErr: "date_from is required",
+		},
+		{
+			name: "missing date_to",
+			req: &models.PurchasingAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+			},
+			wantErr: "date_to is required",
+		},
+		{
+			name: "reversed dates",
+			req: &models.PurchasingAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now.AddDate(0, 0, 1),
+				DateTo:         now,
+			},
+			wantErr: "date_from cannot be after date_to",
+		},
+		{
+			name: "invalid group_by",
+			req: &models.PurchasingAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+				DateTo:         now,
+				GroupBy:        "quarter",
+			},
+			wantErr: "invalid group_by value: quarter",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp, err := service.GetPurchasingAnalytics(context.Background(), tt.req)
+
+			require.Nil(t, resp)
+			require.Error(t, err)
+			require.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
+}
+
+func TestAnalyticsServiceGetPurchasingAnalyticsAllowsEmptyGroupBy(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	resp, err := service.GetPurchasingAnalytics(context.Background(), &models.PurchasingAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.NotNil(t, resp)
+}
+
+func TestAnalyticsServiceGetProfitLossAnalyticsValidation(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name    string
+		req     *models.ProfitLossAnalyticsRequest
+		wantErr string
+	}{
+		{
+			name: "missing date_from",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateTo:         now,
+			},
+			wantErr: "date_from is required",
+		},
+		{
+			name: "missing date_to",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+			},
+			wantErr: "date_to is required",
+		},
+		{
+			name: "reversed dates",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now.AddDate(0, 0, 1),
+				DateTo:         now,
+			},
+			wantErr: "date_from cannot be after date_to",
+		},
+		{
+			name: "invalid group_by",
+			req: &models.ProfitLossAnalyticsRequest{
+				OrganizationID: uuid.New(),
+				DateFrom:       now,
+				DateTo:         now,
+				GroupBy:        "quarter",
+			},
+			wantErr: "invalid group_by value: quarter",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			resp, err := service.GetProfitLossAnalytics(context.Background(), tt.req)
+
+			require.Nil(t, resp)
+			require.Error(t, err)
+			require.Contains(t, err.Error(), tt.wantErr)
+		})
+	}
+}
+
+func TestAnalyticsServiceGetProfitLossAnalyticsAllowsEmptyGroupBy(t *testing.T) {
+	service := NewAnalyticsServiceImpl(analyticsProcessorStub{})
+	now := time.Date(2026, 5, 1, 0, 0, 0, 0, time.UTC)
+
+	resp, err := service.GetProfitLossAnalytics(context.Background(), &models.ProfitLossAnalyticsRequest{
+		OrganizationID: uuid.New(),
+		DateFrom:       now,
+		DateTo:         now,
+	})
+
+	require.NoError(t, err)
+	require.Nil(t, resp)
+}