feat: implement idempotency key for critical API endpoints

Reviewed-on: #13

.gitignore

@@ -7,4 +7,5 @@ config/env/*
 
 vendor
 
-*firebase-adminsdk*.json
+# Firebase service account credentials
+infra/firebase-service-account.json

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)

config/configs.go

@@ -31,7 +31,7 @@ type Config struct {
 	Log      Log      `mapstructure:"log"`
 	S3Config S3Config `mapstructure:"s3"`
 	Fonnte   Fonnte   `mapstructure:"fonnte"`
-	Firebase Firebase `mapstructure:"firebase"`
+	FCM      FCM      `mapstructure:"fcm"`
 }
 
 var (
@@ -97,6 +97,6 @@ func (c *Config) GetFonnte() *Fonnte {
 	return &c.Fonnte
 }
 
-func (c *Config) GetFirebase() *Firebase {
-	return &c.Firebase
+func (c *Config) GetFCM() *FCM {
+	return &c.FCM
 }

config/fcm.go

@@ -0,0 +1,14 @@
+package config
+
+type FCM struct {
+	CredentialsFile string `mapstructure:"credentials_file"`
+	ProjectID       string `mapstructure:"project_id"`
+}
+
+func (f *FCM) GetCredentialsFile() string {
+	return f.CredentialsFile
+}
+
+func (f *FCM) GetProjectID() string {
+	return f.ProjectID
+}

config/firebase.go

@@ -1,9 +0,0 @@
-package config
-
-type Firebase struct {
-	CredentialsFile string `mapstructure:"credentials_file"`
-}
-
-func (f *Firebase) GetCredentialsFile() string {
-	return f.CredentialsFile
-}

config/server.go

@@ -1,7 +1,8 @@
 package config
 
 type Server struct {
-	Port     string `mapstructure:"port"`
-	BaseUrl  string `mapstructure:"common-url"`
-	LocalUrl string `mapstructure:"local-url"`
+	Port         string `mapstructure:"port"`
+	BaseUrl      string `mapstructure:"common-url"`
+	LocalUrl     string `mapstructure:"local-url"`
+	SelfOrderUrl string `mapstructure:"self-order-url"`
 }

go.sum

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

infra/development.yaml

@@ -1,6 +1,7 @@
 server:
   base-url:
   local-url:
+  self-order-url: http://localhost:5173
   port: 4000
 
 jwt:
@@ -28,7 +29,7 @@ postgresql:
   debug: false
 
 redis:
-  host: 127.0.0.1
+  host: 194.233.78.1
   port: 6379
   password: "CmICdmnX1EZPhVBYzQPEGw==U"
   db: 0
@@ -55,5 +56,6 @@ fonnte:
   token: "bADQrf9NTXfLZQCK2wGg"
   timeout: 30
 
-firebase:
-  credentials_file: "apskel-pos-v2-firebase-adminsdk-fbsvc-ae00499526.json"
+fcm:
+  credentials_file: "infra/firebase-service-account.json"
+  project_id: "apskel-pos-v2"

internal/app/app.go

@@ -25,11 +25,12 @@ import (
 )
 
 type App struct {
-	server      *http.Server
-	db          *gorm.DB
-	redisClient *redis.Client
-	router      *router.Router
-	shutdown    chan os.Signal
+	server         *http.Server
+	db             *gorm.DB
+	redisClient    *redis.Client
+	router         *router.Router
+	shutdown       chan os.Signal
+	omsetScheduler *service.OmsetMilestoneScheduler
 }
 
 func NewApp(db *gorm.DB, redisClient *redis.Client) *App {
@@ -43,6 +44,15 @@ func NewApp(db *gorm.DB, redisClient *redis.Client) *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)
@@ -56,7 +66,7 @@ func (a *App) Initialize(cfg *config.Config) error {
 		repos.userRepo,
 		repos.sessionRepo,
 		repos.orderRepo,
-		processors.fcmClient,
+		services.productOutletPriceService,
 	)
 
 	a.router = router.NewRouter(
@@ -119,13 +129,27 @@ func (a *App) Initialize(cfg *config.Config) error {
 		services.customerPointsService,
 		services.spinGameService,
 		middleware.customerAuthMiddleware,
+		services.userDeviceService,
+		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{
@@ -161,6 +185,9 @@ func (a *App) Start(port string) error {
 }
 
 func (a *App) Shutdown() {
+	if a.omsetScheduler != nil {
+		a.omsetScheduler.Stop()
+	}
 	close(a.shutdown)
 }
 
@@ -208,6 +235,12 @@ type repositories struct {
 	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 {
@@ -255,6 +288,12 @@ func (a *App) initRepositories() *repositories {
 		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),
 	}
 }
 
@@ -296,14 +335,16 @@ type processors struct {
 	customerPointsProcessor             *processor.CustomerPointsProcessor
 	otpProcessor                        processor.OtpProcessor
 	fileClient                          processor.FileClient
-	fcmClient                           client.FcmClient
 	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 {
 	fileClient := client.NewFileClient(cfg.S3Config)
 	fonnteClient := client.NewFonnteClient(cfg.GetFonnte())
-	fcmClient := client.NewFcmClient(cfg.GetFirebase())
 	otpProcessor := processor.NewOtpProcessor(fonnteClient, repos.otpRepo)
 	inventoryMovementService := service.NewInventoryMovementService(repos.inventoryMovementRepo, repos.ingredientRepo)
 
@@ -313,14 +354,14 @@ 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),
@@ -345,8 +386,11 @@ func (a *App) initProcessors(cfg *config.Config, repos *repositories) *processor
 		customerPointsProcessor:             processor.NewCustomerPointsProcessor(repos.customerPointsRepo, repos.gameRepo),
 		otpProcessor:                        otpProcessor,
 		fileClient:                          fileClient,
-		fcmClient:                           fcmClient,
 		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),
 	}
 }
 
@@ -383,11 +427,15 @@ type services struct {
 	customerAuthService               service.CustomerAuthService
 	customerPointsService             service.CustomerPointsService
 	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 {
 	authConfig := cfg.Auth()
-	authService := service.NewAuthService(processors.userProcessor, authConfig)
+	authService := service.NewAuthService(processors.userProcessor, processors.userDeviceProcessor, authConfig)
 	organizationService := service.NewOrganizationService(processors.organizationProcessor)
 	outletService := service.NewOutletService(processors.outletProcessor)
 	outletSettingService := service.NewOutletSettingService(processors.outletSettingProcessor)
@@ -395,7 +443,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, repos.sessionRepo) // 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)
@@ -418,9 +466,11 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 	customerAuthService := service.NewCustomerAuthService(processors.customerAuthProcessor)
 	customerPointsService := service.NewCustomerPointsService(processors.customerPointsProcessor)
 	spinGameService := service.NewSpinGameService(processors.gamePlayProcessor, repos.txManager)
+	userDeviceService := service.NewUserDeviceService(processors.userDeviceProcessor)
+	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, repos.sessionRepo)
+	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),
@@ -455,6 +505,10 @@ func (a *App) initServices(processors *processors, repos *repositories, cfg *con
 		customerAuthService:               customerAuthService,
 		customerPointsService:             customerPointsService,
 		spinGameService:                   spinGameService,
+		userDeviceService:                 userDeviceService,
+		notificationService:               notificationService,
+		productOutletPriceService:         service.NewProductOutletPriceService(processors.productOutletPriceProcessor),
+		expenseService:                    service.NewExpenseService(processors.expenseProcessor),
 	}
 }
 
@@ -494,6 +548,10 @@ type validators struct {
 	rewardValidator                     validator.RewardValidator
 	campaignValidator                   validator.CampaignValidator
 	customerAuthValidator               validator.CustomerAuthValidator
+	userDeviceValidator                 *validator.UserDeviceValidatorImpl
+	notificationValidator               *validator.NotificationValidatorImpl
+	productOutletPriceValidator         *validator.ProductOutletPriceValidatorImpl
+	expenseValidator                    *validator.ExpenseValidatorImpl
 }
 
 func (a *App) initValidators() *validators {
@@ -521,5 +579,32 @@ func (a *App) initValidators() *validators {
 		rewardValidator:                     validator.NewRewardValidator(),
 		campaignValidator:                   validator.NewCampaignValidator(),
 		customerAuthValidator:               validator.NewCustomerAuthValidator(),
+		userDeviceValidator:                 validator.NewUserDeviceValidator(),
+		notificationValidator:               validator.NewNotificationValidator(),
+		productOutletPriceValidator:         validator.NewProductOutletPriceValidator(),
+		expenseValidator:                    validator.NewExpenseValidator(),
 	}
 }
+
+// buildNotificationProcessor creates the notification processor with FCM integration.
+// If FCM is not configured, it returns a processor with a nil FCM client (FCM dispatch will be skipped).
+func buildNotificationProcessor(cfg *config.Config, repos *repositories) *processor.NotificationProcessorImpl {
+	var fcmClient client.FCMClient
+	if cfg.FCM.CredentialsFile != "" {
+		var err error
+		fcmClient, err = client.NewFCMClient(&cfg.FCM)
+		if err != nil {
+			// FCM init failure is non-fatal; notifications will still be persisted.
+			fcmClient = nil
+		}
+	}
+
+	return processor.NewNotificationProcessor(
+		repos.notificationRepo,
+		repos.notificationReceiverRepo,
+		repos.notificationDeliveryRepo,
+		repos.userDeviceRepo,
+		repos.userRepo,
+		fcmClient,
+	)
+}

internal/client/fcm_client.go

@@ -3,81 +3,140 @@ package client
 import (
 	"context"
 	"fmt"
-	"log"
-
-	"apskel-pos-be/config"
 
 	firebase "firebase.google.com/go/v4"
 	"firebase.google.com/go/v4/messaging"
 	"google.golang.org/api/option"
 )
 
-type FcmClient interface {
-	SendMulticastNotification(ctx context.Context, tokens []string, title string, body string) error
+type FCMConfig interface {
+	GetCredentialsFile() string
+	GetProjectID() string
+}
+
+type FCMClient interface {
+	SendNotification(ctx context.Context, token string, title string, body string, data map[string]string) error
+	SendMulticastNotification(ctx context.Context, tokens []string, title string, body string, data map[string]string) error
+	SendToTopic(ctx context.Context, topic string, title string, body string, data map[string]string) error
 }
 
 type fcmClient struct {
-	messagingClient *messaging.Client
+	messaging *messaging.Client
 }
 
-func NewFcmClient(cfg *config.Firebase) FcmClient {
-	if cfg == nil || cfg.GetCredentialsFile() == "" {
-		log.Println("FCM: credentials file not configured, FCM client is disabled")
-		return &fcmClient{messagingClient: nil}
-	}
+func NewFCMClient(cfg FCMConfig) (FCMClient, error) {
+	ctx := context.Background()
 
 	opt := option.WithCredentialsFile(cfg.GetCredentialsFile())
-	app, err := firebase.NewApp(context.Background(), nil, opt)
+
+	app, err := firebase.NewApp(ctx, &firebase.Config{
+		ProjectID: cfg.GetProjectID(),
+	}, opt)
 	if err != nil {
-		log.Printf("FCM: failed to initialize Firebase app: %v", err)
-		return &fcmClient{messagingClient: nil}
+		return nil, fmt.Errorf("failed to initialize firebase app: %w", err)
 	}
 
-	client, err := app.Messaging(context.Background())
+	msgClient, err := app.Messaging(ctx)
 	if err != nil {
-		log.Printf("FCM: failed to create messaging client: %v", err)
-		return &fcmClient{messagingClient: nil}
+		return nil, fmt.Errorf("failed to initialize firebase messaging client: %w", err)
 	}
 
-	log.Println("FCM: client initialized successfully")
-	return &fcmClient{messagingClient: client}
+	return &fcmClient{
+		messaging: msgClient,
+	}, nil
 }
 
-func (c *fcmClient) SendMulticastNotification(ctx context.Context, tokens []string, title string, body string) error {
-	if c.messagingClient == nil {
-		log.Println("FCM: client not initialized, skipping notification")
-		return nil
+// SendNotification sends a push notification to a single device token.
+func (f *fcmClient) SendNotification(ctx context.Context, token string, title string, body string, data map[string]string) error {
+	message := &messaging.Message{
+		Token: token,
+		Notification: &messaging.Notification{
+			Title: title,
+			Body:  body,
+		},
+		Data: data,
+		Android: &messaging.AndroidConfig{
+			Priority: "high",
+		},
+		APNS: &messaging.APNSConfig{
+			Payload: &messaging.APNSPayload{
+				Aps: &messaging.Aps{
+					Sound: "default",
+				},
+			},
+		},
 	}
 
+	_, err := f.messaging.Send(ctx, message)
+	if err != nil {
+		return fmt.Errorf("failed to send FCM notification: %w", err)
+	}
+
+	return nil
+}
+
+// SendMulticastNotification sends a push notification to multiple device tokens.
+func (f *fcmClient) SendMulticastNotification(ctx context.Context, tokens []string, title string, body string, data map[string]string) error {
 	if len(tokens) == 0 {
 		return nil
 	}
 
 	message := &messaging.MulticastMessage{
+		Tokens: tokens,
 		Notification: &messaging.Notification{
 			Title: title,
 			Body:  body,
 		},
-		Tokens: tokens,
+		Data: data,
 		Android: &messaging.AndroidConfig{
 			Priority: "high",
 		},
+		APNS: &messaging.APNSConfig{
+			Payload: &messaging.APNSPayload{
+				Aps: &messaging.Aps{
+					Sound: "default",
+				},
+			},
+		},
 	}
 
-	response, err := c.messagingClient.SendMulticast(ctx, message)
+	batchResp, err := f.messaging.SendEachForMulticast(ctx, message)
 	if err != nil {
-		return fmt.Errorf("FCM: failed to send multicast notification: %w", err)
+		return fmt.Errorf("failed to send FCM multicast notification: %w", err)
 	}
 
-	if response.FailureCount > 0 {
-		log.Printf("FCM: %d tokens failed out of %d", response.FailureCount, len(tokens))
-		for i, resp := range response.Responses {
-			if !resp.Success {
-				log.Printf("FCM: token[%d] failed: %v", i, resp.Error)
-			}
-		}
+	if batchResp.FailureCount > 0 {
+		return fmt.Errorf("FCM multicast: %d/%d messages failed to send", batchResp.FailureCount, len(tokens))
+	}
+
+	return nil
+}
+
+// SendToTopic sends a push notification to all devices subscribed to a topic.
+func (f *fcmClient) SendToTopic(ctx context.Context, topic string, title string, body string, data map[string]string) error {
+	message := &messaging.Message{
+		Topic: topic,
+		Notification: &messaging.Notification{
+			Title: title,
+			Body:  body,
+		},
+		Data: data,
+		Android: &messaging.AndroidConfig{
+			Priority: "high",
+		},
+		APNS: &messaging.APNSConfig{
+			Payload: &messaging.APNSPayload{
+				Aps: &messaging.Aps{
+					Sound: "default",
+				},
+			},
+		},
+	}
+
+	_, err := f.messaging.Send(ctx, message)
+	if err != nil {
+		return fmt.Errorf("failed to send FCM topic notification: %w", err)
 	}
 
-	log.Printf("FCM: sent %d/%d notifications successfully", response.SuccessCount, len(tokens))
 	return nil
 }

internal/constants/error.go

@@ -44,18 +44,23 @@ const (
 	IngredientCompositionServiceEntity   = "ingredient_composition_service"
 	TableEntity                          = "table"
 	// Gamification entities
-	CustomerPointsEntity  = "customer_points"
-	CustomerTokensEntity  = "customer_tokens"
-	TierEntity            = "tier"
-	GameEntity            = "game"
-	GamePrizeEntity       = "game_prize"
-	GamePlayEntity        = "game_play"
-	OmsetTrackerEntity    = "omset_tracker"
-	RewardEntity          = "reward"
-	CampaignEntity        = "campaign"
-	CampaignRuleEntity    = "campaign_rule"
-	CustomerEntity        = "customer"
-	SpinGameHandlerEntity = "spin_game_handler"
+	CustomerPointsEntity            = "customer_points"
+	CustomerTokensEntity            = "customer_tokens"
+	TierEntity                      = "tier"
+	GameEntity                      = "game"
+	GamePrizeEntity                 = "game_prize"
+	GamePlayEntity                  = "game_play"
+	OmsetTrackerEntity              = "omset_tracker"
+	RewardEntity                    = "reward"
+	CampaignEntity                  = "campaign"
+	CampaignRuleEntity              = "campaign_rule"
+	CustomerEntity                  = "customer"
+	SpinGameHandlerEntity           = "spin_game_handler"
+	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

@@ -7,11 +7,11 @@ import (
 )
 
 type PaymentMethodAnalyticsRequest struct {
-	OrganizationID uuid.UUID  `form:"organization_id"`
-	OutletID       *uuid.UUID `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"`
+	OrganizationID uuid.UUID `form:"organization_id"`
+	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"`
 }
 
 // PaymentMethodAnalyticsResponse represents the response for payment method analytics
@@ -45,10 +45,10 @@ type PaymentMethodAnalyticsData struct {
 
 type SalesAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `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"`
+	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 SalesAnalyticsResponse struct {
@@ -83,13 +83,70 @@ 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"`
-	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"`
+	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"`
 }
 
 // ProductAnalyticsResponse represents the response for product analytics
@@ -123,9 +180,9 @@ 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"`
-	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	OutletID       *string `form:"outlet_id,omitempty"`
+	DateFrom       string  `form:"date_from" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
 }
 
 // ProductAnalyticsPerCategoryResponse represents the response for product analytics per category
@@ -152,9 +209,9 @@ type ProductAnalyticsPerCategoryData struct {
 // DashboardAnalyticsRequest represents the request for dashboard analytics
 type DashboardAnalyticsRequest struct {
 	OrganizationID uuid.UUID
-	OutletID       *uuid.UUID `form:"outlet_id,omitempty"`
-	DateFrom       string     `form:"date_from" validate:"required"`
-	DateTo         string     `form:"date_to" validate:"required"`
+	OutletID       *string `form:"outlet_id,omitempty"`
+	DateFrom       string  `form:"date_from" validate:"required"`
+	DateTo         string  `form:"date_to" validate:"required"`
 }
 
 // DashboardAnalyticsResponse represents the response for dashboard analytics
@@ -179,28 +236,28 @@ 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"`
-	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"`
+	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"`
-	DateFrom       time.Time           `json:"date_from"`
-	DateTo         time.Time           `json:"date_to"`
-	GroupBy        string              `json:"group_by"`
-	Summary        ProfitLossSummary   `json:"summary"`
-	Data           []ProfitLossData    `json:"data"`
-	ProductData    []ProductProfitData `json:"product_data"`
+	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                  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 +272,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 +285,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 +299,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,7 +10,8 @@ type CreateCategoryRequest struct {
 	Name         string                 `json:"name" validate:"required,min=1,max=255"`
 	Description  *string                `json:"description,omitempty"`
 	BusinessType *string                `json:"business_type,omitempty"`
-	Order 		 *int                	`json:"order,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"`
-	Order 		 *int                	`json:"order,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,10 +37,11 @@ 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"`
-	Order 		   int                	  `json:"order"`
+	Order          int                    `json:"order"`
 	Metadata       map[string]interface{} `json:"metadata"`
 	CreatedAt      time.Time              `json:"created_at"`
 	UpdatedAt      time.Time              `json:"updated_at"`

internal/contract/expense_contract.go

@@ -0,0 +1,93 @@
+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"`
+}

internal/contract/notification_contract.go

@@ -0,0 +1,92 @@
+package contract
+
+import (
+	"time"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+)
+
+// ---- Request contracts ----
+
+type SendNotificationRequest struct {
+	Title          string                        `json:"title" validate:"required,min=1,max=255"`
+	Body           string                        `json:"body" validate:"required"`
+	Type           string                        `json:"type,omitempty" validate:"omitempty,max=100"`
+	Category       string                        `json:"category,omitempty" validate:"omitempty,max=100"`
+	Priority       entities.NotificationPriority `json:"priority,omitempty" validate:"omitempty,oneof=low normal high"`
+	ImageURL       string                        `json:"image_url,omitempty" validate:"omitempty,max=512"`
+	ActionURL      string                        `json:"action_url,omitempty" validate:"omitempty,max=512"`
+	NotifiableType string                        `json:"notifiable_type,omitempty" validate:"omitempty,max=100"`
+	NotifiableID   *uuid.UUID                    `json:"notifiable_id,omitempty"`
+	Data           map[string]interface{}        `json:"data,omitempty"`
+	ReceiverIDs    []uuid.UUID                   `json:"receiver_ids" validate:"required,min=1"`
+	ScheduledAt    *time.Time                    `json:"scheduled_at,omitempty"`
+	ExpiredAt      *time.Time                    `json:"expired_at,omitempty"`
+}
+
+type BroadcastNotificationRequest struct {
+	Title          string                        `json:"title" validate:"required,min=1,max=255"`
+	Body           string                        `json:"body" validate:"required"`
+	Type           string                        `json:"type,omitempty" validate:"omitempty,max=100"`
+	Category       string                        `json:"category,omitempty" validate:"omitempty,max=100"`
+	Priority       entities.NotificationPriority `json:"priority,omitempty" validate:"omitempty,oneof=low normal high"`
+	ImageURL       string                        `json:"image_url,omitempty" validate:"omitempty,max=512"`
+	ActionURL      string                        `json:"action_url,omitempty" validate:"omitempty,max=512"`
+	NotifiableType string                        `json:"notifiable_type,omitempty" validate:"omitempty,max=100"`
+	NotifiableID   *uuid.UUID                    `json:"notifiable_id,omitempty"`
+	Data           map[string]interface{}        `json:"data,omitempty"`
+	ScheduledAt    *time.Time                    `json:"scheduled_at,omitempty"`
+	ExpiredAt      *time.Time                    `json:"expired_at,omitempty"`
+}
+
+type ListNotificationsRequest struct {
+	Page   int   `form:"page" validate:"min=1"`
+	Limit  int   `form:"limit" validate:"min=1,max=100"`
+	IsRead *bool `form:"is_read"`
+}
+
+// ---- Response contracts ----
+
+type NotificationResponse struct {
+	ID             uuid.UUID                     `json:"id"`
+	Title          string                        `json:"title"`
+	Body           string                        `json:"body"`
+	Type           string                        `json:"type"`
+	Category       string                        `json:"category"`
+	Priority       entities.NotificationPriority `json:"priority"`
+	ImageURL       string                        `json:"image_url"`
+	ActionURL      string                        `json:"action_url"`
+	NotifiableType string                        `json:"notifiable_type"`
+	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
+	Data           map[string]interface{}        `json:"data"`
+	ScheduledAt    *time.Time                    `json:"scheduled_at"`
+	SentAt         *time.Time                    `json:"sent_at"`
+	ExpiredAt      *time.Time                    `json:"expired_at"`
+	CreatedBy      *uuid.UUID                    `json:"created_by"`
+	CreatedAt      time.Time                     `json:"created_at"`
+	UpdatedAt      time.Time                     `json:"updated_at"`
+}
+
+type NotificationReceiverResponse struct {
+	ID             uuid.UUID             `json:"id"`
+	NotificationID uuid.UUID             `json:"notification_id"`
+	UserID         uuid.UUID             `json:"user_id"`
+	IsRead         bool                  `json:"is_read"`
+	ReadAt         *time.Time            `json:"read_at"`
+	IsDeleted      bool                  `json:"is_deleted"`
+	DeletedAt      *time.Time            `json:"deleted_at"`
+	CreatedAt      time.Time             `json:"created_at"`
+	UpdatedAt      time.Time             `json:"updated_at"`
+	Notification   *NotificationResponse `json:"notification,omitempty"`
+}
+
+type ListNotificationsResponse struct {
+	Notifications []*NotificationReceiverResponse `json:"notifications"`
+	TotalCount    int64                           `json:"total_count"`
+	UnreadCount   int64                           `json:"unread_count"`
+	Page          int                             `json:"page"`
+	Limit         int                             `json:"limit"`
+	TotalPages    int                             `json:"total_pages"`
+}

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,28 +17,30 @@ 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 {
-	CategoryID   *uuid.UUID             `json:"category_id,omitempty"`
-	SKU          *string                `json:"sku,omitempty"`
-	Name         *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
-	Description  *string                `json:"description,omitempty"`
-	Price        *float64               `json:"price,omitempty" validate:"omitempty,min=0"`
-	Cost         *float64               `json:"cost,omitempty" validate:"omitempty,min=0"`
-	BusinessType *string                `json:"business_type,omitempty"`
-	ImageURL     *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
-	PrinterType  *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
-	Metadata     map[string]interface{} `json:"metadata,omitempty"`
-	IsActive     *bool                  `json:"is_active,omitempty"`
-	// Stock management fields
-	ReorderLevel *int `json:"reorder_level,omitempty" validate:"omitempty,min=0"` // Update reorder level for all existing inventory records
+	OutletID       *uuid.UUID             `json:"outlet_id,omitempty"`
+	CategoryID     *uuid.UUID             `json:"category_id,omitempty"`
+	SKU            *string                `json:"sku,omitempty"`
+	Name           *string                `json:"name,omitempty" validate:"omitempty,min=1,max=255"`
+	Description    *string                `json:"description,omitempty"`
+	Price          *float64               `json:"price,omitempty" validate:"omitempty,min=0"`
+	Cost           *float64               `json:"cost,omitempty" validate:"omitempty,min=0"`
+	BusinessType   *string                `json:"business_type,omitempty"`
+	ImageURL       *string                `json:"image_url,omitempty" validate:"omitempty,max=500"`
+	PrinterType    *string                `json:"printer_type,omitempty" validate:"omitempty,max=50"`
+	PrintToChecker *bool                  `json:"print_to_checker,omitempty"`
+	Metadata       map[string]interface{} `json:"metadata,omitempty"`
+	IsActive       *bool                  `json:"is_active,omitempty"`
+	ReorderLevel   *int                   `json:"reorder_level,omitempty" validate:"omitempty,min=0"`
 }
 
 type CreateProductVariantRequest struct {
@@ -56,24 +59,27 @@ type UpdateProductVariantRequest struct {
 }
 
 type ProductResponse struct {
-	ID             uuid.UUID                `json:"id"`
-	OrganizationID uuid.UUID                `json:"organization_id"`
-	CategoryID     uuid.UUID                `json:"category_id"`
-	CategoryName   string                   `json:"category_name"`
-	SKU            *string                  `json:"sku"`
-	Name           string                   `json:"name"`
-	Description    *string                  `json:"description"`
-	Price          float64                  `json:"price"`
-	Cost           float64                  `json:"cost"`
-	BusinessType   string                   `json:"business_type"`
-	ImageURL       *string                  `json:"image_url"`
-	PrinterType    string                   `json:"printer_type"`
-	Metadata       map[string]interface{}   `json:"metadata"`
-	IsActive       bool                     `json:"is_active"`
-	CreatedAt      time.Time                `json:"created_at"`
-	UpdatedAt      time.Time                `json:"updated_at"`
-	Category       *CategoryResponse        `json:"category,omitempty"`
-	Variants       []ProductVariantResponse `json:"variants,omitempty"`
+	ID             uuid.UUID                    `json:"id"`
+	OrganizationID uuid.UUID                    `json:"organization_id"`
+	CategoryID     uuid.UUID                    `json:"category_id"`
+	CategoryName   string                       `json:"category_name"`
+	SKU            *string                      `json:"sku"`
+	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"`
+	UpdatedAt      time.Time                    `json:"updated_at"`
+	Category       *CategoryResponse            `json:"category,omitempty"`
+	Variants       []ProductVariantResponse     `json:"variants,omitempty"`
 }
 
 type ProductVariantResponse struct {
@@ -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_order_contract.go

@@ -9,8 +9,8 @@ import (
 type CreatePurchaseOrderRequest struct {
 	VendorID          uuid.UUID                        `json:"vendor_id" validate:"required"`
 	PONumber          string                           `json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate   string                           `json:"transaction_date" validate:"required"` // Format: YYYY-MM-DD
-	DueDate           string                           `json:"due_date" validate:"required"`          // Format: YYYY-MM-DD
+	TransactionDate   string                           `json:"transaction_date" validate:"required"`    // Format: YYYY-MM-DD
+	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
 	Reference         *string                          `json:"reference,omitempty" validate:"omitempty,max=100"`
 	Status            *string                          `json:"status,omitempty" validate:"omitempty,oneof=draft sent approved received cancelled"`
 	Message           *string                          `json:"message,omitempty" validate:"omitempty"`
@@ -30,7 +30,7 @@ type UpdatePurchaseOrderRequest struct {
 	VendorID          *uuid.UUID                       `json:"vendor_id,omitempty" validate:"omitempty"`
 	PONumber          *string                          `json:"po_number,omitempty" validate:"omitempty,min=1,max=50"`
 	TransactionDate   *string                          `json:"transaction_date,omitempty" validate:"omitempty"` // Format: YYYY-MM-DD
-	DueDate           *string                          `json:"due_date,omitempty" validate:"omitempty"`          // Format: YYYY-MM-DD
+	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

@@ -1,8 +1,6 @@
 package contract
 
 import (
-	"time"
-
 	"github.com/google/uuid"
 )
 
@@ -50,8 +48,10 @@ type SelfOrderMenuVariant struct {
 }
 
 type SelfOrderCreateOrderRequest struct {
-	SessionID  string                     `json:"session_id" validate:"required"`
-	OrderItems []SelfOrderCreateOrderItem `json:"order_items" validate:"required,min=1,dive"`
+	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 {
@@ -62,7 +62,7 @@ type SelfOrderCreateOrderItem struct {
 }
 
 type SelfOrderListCategoriesRequest struct {
-	OrganizationID string `form:"organisasi_id" validate:"required"`
+	OrganizationID string `form:"organization_id" validate:"required"`
 	OutletID       string `form:"outlet_id" validate:"required"`
 }
 
@@ -78,35 +78,5 @@ type SelfOrderListCategoriesResponse struct {
 }
 
 type SelfOrderListOrdersResponse struct {
-	Orders []SelfOrderOrderItem `json:"orders"`
-}
-
-type SelfOrderOrderItem struct {
-	ID              uuid.UUID                `json:"id"`
-	OrderNumber     string                   `json:"order_number"`
-	TableNumber     *string                  `json:"table_number,omitempty"`
-	OrderType       string                   `json:"order_type"`
-	Status          string                   `json:"status"`
-	Subtotal        float64                  `json:"subtotal"`
-	TaxAmount       float64                  `json:"tax_amount"`
-	DiscountAmount  float64                  `json:"discount_amount"`
-	TotalAmount     float64                  `json:"total_amount"`
-	RemainingAmount float64                  `json:"remaining_amount"`
-	PaymentStatus   string                   `json:"payment_status"`
-	IsVoid          bool                     `json:"is_void"`
-	IsRefund        bool                     `json:"is_refund"`
-	Items           []SelfOrderOrderLineItem `json:"items,omitempty"`
-	CreatedAt       time.Time                `json:"created_at"`
-}
-
-type SelfOrderOrderLineItem struct {
-	ProductID         uuid.UUID  `json:"product_id"`
-	ProductName       string     `json:"product_name"`
-	ProductVariantID  *uuid.UUID `json:"product_variant_id,omitempty"`
-	ProductVariantNam *string    `json:"product_variant_name,omitempty"`
-	Quantity          int        `json:"quantity"`
-	UnitPrice         float64    `json:"unit_price"`
-	TotalPrice        float64    `json:"total_price"`
-	Notes             *string    `json:"notes,omitempty"`
-	Status            string     `json:"status"`
+	Orders []OrderResponse `json:"orders"`
 }

internal/contract/user_contract.go

@@ -35,9 +35,15 @@ type UpdateUserOutletRequest struct {
 }
 
 type LoginRequest struct {
-	Email    string  `json:"email" validate:"required,email"`
-	Password string  `json:"password" validate:"required"`
-	FcmToken *string `json:"fcm_token,omitempty"`
+	Email      string `json:"email" validate:"required,email"`
+	Password   string `json:"password" validate:"required"`
+	DeviceID   string `json:"device_id,omitempty"`
+	DeviceName string `json:"device_name,omitempty"`
+	DeviceType string `json:"device_type,omitempty"`
+	Platform   string `json:"platform,omitempty"`
+	FCMToken   string `json:"fcm_token,omitempty"`
+	AppVersion string `json:"app_version,omitempty"`
+	OsVersion  string `json:"os_version,omitempty"`
 }
 
 type LoginResponse struct {

internal/contract/user_device_contract.go

@@ -0,0 +1,59 @@
+package contract
+
+import (
+	"time"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+)
+
+type RegisterUserDeviceRequest struct {
+	DeviceID   string                  `json:"device_id" validate:"required,min=1,max=255"`
+	DeviceName string                  `json:"device_name,omitempty" validate:"omitempty,max=255"`
+	DeviceType entities.DeviceType     `json:"device_type,omitempty" validate:"omitempty,oneof=mobile tablet desktop"`
+	Platform   entities.DevicePlatform `json:"platform,omitempty" validate:"omitempty,oneof=android ios web"`
+	FCMToken   string                  `json:"fcm_token,omitempty" validate:"omitempty,max=512"`
+	AppVersion string                  `json:"app_version,omitempty" validate:"omitempty,max=50"`
+	OsVersion  string                  `json:"os_version,omitempty" validate:"omitempty,max=50"`
+}
+
+type UpdateUserDeviceRequest struct {
+	DeviceName string                  `json:"device_name,omitempty" validate:"omitempty,max=255"`
+	DeviceType entities.DeviceType     `json:"device_type,omitempty" validate:"omitempty,oneof=mobile tablet desktop"`
+	Platform   entities.DevicePlatform `json:"platform,omitempty" validate:"omitempty,oneof=android ios web"`
+	FCMToken   string                  `json:"fcm_token,omitempty" validate:"omitempty,max=512"`
+	AppVersion string                  `json:"app_version,omitempty" validate:"omitempty,max=50"`
+	OsVersion  string                  `json:"os_version,omitempty" validate:"omitempty,max=50"`
+}
+
+type UserDeviceResponse struct {
+	ID           uuid.UUID               `json:"id"`
+	UserID       uuid.UUID               `json:"user_id"`
+	DeviceID     string                  `json:"device_id"`
+	DeviceName   string                  `json:"device_name"`
+	DeviceType   entities.DeviceType     `json:"device_type"`
+	Platform     entities.DevicePlatform `json:"platform"`
+	FCMToken     string                  `json:"fcm_token"`
+	AppVersion   string                  `json:"app_version"`
+	OsVersion    string                  `json:"os_version"`
+	IPAddress    string                  `json:"ip_address"`
+	LastActiveAt *time.Time              `json:"last_active_at"`
+	CreatedAt    time.Time               `json:"created_at"`
+	UpdatedAt    time.Time               `json:"updated_at"`
+}
+
+type ListUserDevicesRequest struct {
+	Page     int    `json:"page" validate:"min=1"`
+	Limit    int    `json:"limit" validate:"min=1,max=100"`
+	UserID   string `json:"user_id,omitempty"`
+	Platform string `json:"platform,omitempty"`
+}
+
+type ListUserDevicesResponse struct {
+	Devices    []UserDeviceResponse `json:"devices"`
+	TotalCount int                  `json:"total_count"`
+	Page       int                  `json:"page"`
+	Limit      int                  `json:"limit"`
+	TotalPages int                  `json:"total_pages"`
+}

internal/entities/analytics.go

@@ -27,6 +27,51 @@ 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"`
@@ -68,54 +113,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

@@ -31,15 +31,16 @@ 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"`
-	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"`
-	BusinessType   string    `gorm:"size:50;default:'restaurant'" json:"business_type"`
-	Metadata       Metadata  `gorm:"type:jsonb;default:'{}'" json:"metadata"`
-	CreatedAt      time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt      time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	ID             uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID uuid.UUID  `gorm:"type:uuid;not null;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"`
+	BusinessType   string     `gorm:"size:50;default:'restaurant'" json:"business_type"`
+	Metadata       Metadata   `gorm:"type:jsonb;default:'{}'" json:"metadata"`
+	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
 	Products     []Product    `gorm:"foreignKey:CategoryID" json:"products,omitempty"`

internal/entities/entities.go

@@ -36,6 +36,13 @@ func GetAllEntities() []interface{} {
 		&CampaignRule{},
 		&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,40 @@
+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"`
+}
+
+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/notification.go

@@ -0,0 +1,150 @@
+package entities
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+	"time"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type NotificationPriority string
+type NotificationDeliveryStatus string
+type NotificationChannel string
+type NotificationProvider string
+
+const (
+	NotificationPriorityLow    NotificationPriority = "low"
+	NotificationPriorityNormal NotificationPriority = "normal"
+	NotificationPriorityHigh   NotificationPriority = "high"
+
+	NotificationDeliveryStatusPending   NotificationDeliveryStatus = "pending"
+	NotificationDeliveryStatusSent      NotificationDeliveryStatus = "sent"
+	NotificationDeliveryStatusDelivered NotificationDeliveryStatus = "delivered"
+	NotificationDeliveryStatusFailed    NotificationDeliveryStatus = "failed"
+
+	NotificationChannelPush      NotificationChannel = "push"
+	NotificationChannelWebsocket NotificationChannel = "websocket"
+	NotificationChannelEmail     NotificationChannel = "email"
+
+	NotificationProviderFirebase NotificationProvider = "firebase"
+)
+
+// NotificationData is a JSON-serializable map for extra notification payload.
+type NotificationData map[string]interface{}
+
+func (d NotificationData) Value() (driver.Value, error) {
+	if d == nil {
+		return nil, nil
+	}
+	return json.Marshal(d)
+}
+
+func (d *NotificationData) Scan(value interface{}) error {
+	if value == nil {
+		*d = nil
+		return nil
+	}
+	bytes, ok := value.([]byte)
+	if !ok {
+		return errors.New("type assertion to []byte failed")
+	}
+	return json.Unmarshal(bytes, d)
+}
+
+// Notification is the master notification record.
+type Notification struct {
+	ID             uuid.UUID            `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	Title          string               `gorm:"not null;size:255" json:"title"`
+	Body           string               `gorm:"type:text" json:"body"`
+	Type           string               `gorm:"size:100" json:"type"`
+	Category       string               `gorm:"size:100" json:"category"`
+	Priority       NotificationPriority `gorm:"size:50;default:'normal'" json:"priority"`
+	ImageURL       string               `gorm:"size:512" json:"image_url"`
+	ActionURL      string               `gorm:"size:512" json:"action_url"`
+	NotifiableType string               `gorm:"size:100" json:"notifiable_type"`
+	NotifiableID   *uuid.UUID           `gorm:"type:uuid" json:"notifiable_id"`
+	Data           NotificationData     `gorm:"type:jsonb" json:"data"`
+	ScheduledAt    *time.Time           `gorm:"type:timestamptz" json:"scheduled_at"`
+	SentAt         *time.Time           `gorm:"type:timestamptz" json:"sent_at"`
+	ExpiredAt      *time.Time           `gorm:"type:timestamptz" json:"expired_at"`
+	CreatedBy      *uuid.UUID           `gorm:"type:uuid" json:"created_by"`
+	CreatedAt      time.Time            `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time            `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Creator   *User                   `gorm:"foreignKey:CreatedBy" json:"creator,omitempty"`
+	Receivers []*NotificationReceiver `gorm:"foreignKey:NotificationID" json:"receivers,omitempty"`
+}
+
+func (n *Notification) BeforeCreate(tx *gorm.DB) error {
+	if n.ID == uuid.Nil {
+		n.ID = uuid.New()
+	}
+	return nil
+}
+
+func (Notification) TableName() string {
+	return "notifications"
+}
+
+// NotificationReceiver links a notification to a specific user.
+type NotificationReceiver struct {
+	ID             uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	NotificationID uuid.UUID  `gorm:"type:uuid;not null;index" json:"notification_id"`
+	UserID         uuid.UUID  `gorm:"type:uuid;not null;index" json:"user_id"`
+	IsRead         bool       `gorm:"default:false" json:"is_read"`
+	ReadAt         *time.Time `gorm:"type:timestamptz" json:"read_at"`
+	IsDeleted      bool       `gorm:"default:false" json:"is_deleted"`
+	DeletedAt      *time.Time `gorm:"type:timestamptz" json:"deleted_at"`
+	CreatedAt      time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt      time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
+
+	Notification *Notification           `gorm:"foreignKey:NotificationID" json:"notification,omitempty"`
+	User         *User                   `gorm:"foreignKey:UserID" json:"user,omitempty"`
+	Deliveries   []*NotificationDelivery `gorm:"foreignKey:NotificationReceiverID" json:"deliveries,omitempty"`
+}
+
+func (n *NotificationReceiver) BeforeCreate(tx *gorm.DB) error {
+	if n.ID == uuid.Nil {
+		n.ID = uuid.New()
+	}
+	return nil
+}
+
+func (NotificationReceiver) TableName() string {
+	return "notification_receivers"
+}
+
+// NotificationDelivery tracks per-device delivery attempts.
+type NotificationDelivery struct {
+	ID                     uuid.UUID                  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	NotificationReceiverID uuid.UUID                  `gorm:"type:uuid;not null;index" json:"notification_receiver_id"`
+	UserDeviceID           uuid.UUID                  `gorm:"type:uuid;not null;index" json:"user_device_id"`
+	Channel                NotificationChannel        `gorm:"size:50;default:'push'" json:"channel"`
+	DeliveryStatus         NotificationDeliveryStatus `gorm:"size:50;default:'pending'" json:"delivery_status"`
+	Provider               NotificationProvider       `gorm:"size:50" json:"provider"`
+	ProviderMessageID      string                     `gorm:"size:255" json:"provider_message_id"`
+	SentAt                 *time.Time                 `gorm:"type:timestamptz" json:"sent_at"`
+	DeliveredAt            *time.Time                 `gorm:"type:timestamptz" json:"delivered_at"`
+	FailedAt               *time.Time                 `gorm:"type:timestamptz" json:"failed_at"`
+	FailureReason          string                     `gorm:"type:text" json:"failure_reason"`
+	RetryCount             int                        `gorm:"default:0" json:"retry_count"`
+	CreatedAt              time.Time                  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt              time.Time                  `gorm:"autoUpdateTime" json:"updated_at"`
+
+	NotificationReceiver *NotificationReceiver `gorm:"foreignKey:NotificationReceiverID" json:"notification_receiver,omitempty"`
+	UserDevice           *UserDevice           `gorm:"foreignKey:UserDeviceID" json:"user_device,omitempty"`
+}
+
+func (n *NotificationDelivery) BeforeCreate(tx *gorm.DB) error {
+	if n.ID == uuid.Nil {
+		n.ID = uuid.New()
+	}
+	return nil
+}
+
+func (NotificationDelivery) TableName() string {
+	return "notification_deliveries"
+}

internal/entities/product.go

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

internal/entities/product_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_order.go

@@ -9,18 +9,18 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
-	OrganizationID  uuid.UUID `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
-	VendorID        uuid.UUID `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
-	PONumber        string    `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
-	TransactionDate time.Time `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
-	DueDate         time.Time `gorm:"type:date;not null" json:"due_date" validate:"required"`
-	Reference       *string   `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
-	Status          string    `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
-	Message         *string   `gorm:"type:text" json:"message" validate:"omitempty"`
-	TotalAmount     float64   `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
-	CreatedAt       time.Time `gorm:"autoCreateTime" json:"created_at"`
-	UpdatedAt       time.Time `gorm:"autoUpdateTime" json:"updated_at"`
+	ID              uuid.UUID  `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	OrganizationID  uuid.UUID  `gorm:"type:uuid;not null" json:"organization_id" validate:"required"`
+	VendorID        uuid.UUID  `gorm:"type:uuid;not null" json:"vendor_id" validate:"required"`
+	PONumber        string     `gorm:"not null;size:50" json:"po_number" validate:"required,min=1,max=50"`
+	TransactionDate time.Time  `gorm:"type:date;not null" json:"transaction_date" validate:"required"`
+	DueDate         *time.Time `gorm:"type:date" json:"due_date" validate:"omitempty"`
+	Reference       *string    `gorm:"size:100" json:"reference" validate:"omitempty,max=100"`
+	Status          string     `gorm:"not null;size:20;default:'draft'" json:"status" validate:"required,oneof=draft sent approved received cancelled"`
+	Message         *string    `gorm:"type:text" json:"message" validate:"omitempty"`
+	TotalAmount     float64    `gorm:"type:decimal(15,2);not null;default:0" json:"total_amount"`
+	CreatedAt       time.Time  `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt       time.Time  `gorm:"autoUpdateTime" json:"updated_at"`
 
 	Organization *Organization             `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`
 	Vendor       *Vendor                   `gorm:"foreignKey:VendorID" json:"vendor,omitempty"`

internal/entities/user.go

@@ -49,7 +49,6 @@ type User struct {
 	Role           UserRole     `gorm:"not null;size:50" json:"role" validate:"required,oneof=admin manager cashier waiter"`
 	Permissions    Permissions  `gorm:"type:jsonb;default:'{}'" json:"permissions"`
 	IsActive       bool         `gorm:"default:true" json:"is_active"`
-	FcmToken       *string      `gorm:"size:512" json:"fcm_token,omitempty"`
 	CreatedAt      time.Time    `gorm:"autoCreateTime" json:"created_at"`
 	UpdatedAt      time.Time    `gorm:"autoUpdateTime" json:"updated_at"`
 	Organization   Organization `gorm:"foreignKey:OrganizationID" json:"organization,omitempty"`

internal/entities/user_device.go

@@ -0,0 +1,50 @@
+package entities
+
+import (
+	"time"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type DeviceType string
+type DevicePlatform string
+
+const (
+	DeviceTypeMobile  DeviceType = "mobile"
+	DeviceTypeTablet  DeviceType = "tablet"
+	DeviceTypeDesktop DeviceType = "desktop"
+
+	DevicePlatformAndroid DevicePlatform = "android"
+	DevicePlatformIOS     DevicePlatform = "ios"
+	DevicePlatformWeb     DevicePlatform = "web"
+)
+
+type UserDevice struct {
+	ID           uuid.UUID      `gorm:"type:uuid;primary_key;default:gen_random_uuid()" json:"id"`
+	UserID       uuid.UUID      `gorm:"type:uuid;not null;index" json:"user_id"`
+	DeviceID     string         `gorm:"not null;size:255;index" json:"device_id"`
+	DeviceName   string         `gorm:"size:255" json:"device_name"`
+	DeviceType   DeviceType     `gorm:"size:50" json:"device_type"`
+	Platform     DevicePlatform `gorm:"size:50" json:"platform"`
+	FCMToken     string         `gorm:"size:512" json:"fcm_token"`
+	AppVersion   string         `gorm:"size:50" json:"app_version"`
+	OsVersion    string         `gorm:"size:50" json:"os_version"`
+	IPAddress    string         `gorm:"size:45" json:"ip_address"`
+	LastActiveAt *time.Time     `gorm:"type:timestamptz" json:"last_active_at"`
+	CreatedAt    time.Time      `gorm:"autoCreateTime" json:"created_at"`
+	UpdatedAt    time.Time      `gorm:"autoUpdateTime" json:"updated_at"`
+
+	User User `gorm:"foreignKey:UserID" json:"user,omitempty"`
+}
+
+func (u *UserDevice) BeforeCreate(tx *gorm.DB) error {
+	if u.ID == uuid.Nil {
+		u.ID = uuid.New()
+	}
+	return nil
+}
+
+func (UserDevice) TableName() string {
+	return "user_devices"
+}

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

@@ -36,7 +36,7 @@ func (h *CategoryHandler) CreateCategory(c *gin.Context) {
 	contextInfo := appcontext.FromGinContext(ctx)
 
 	var req contract.CreateCategoryRequest
-		fmt.Printf("CategoryHandler::CreateCategory -> Request: %+v\n", req)
+	fmt.Printf("CategoryHandler::CreateCategory -> Request: %+v\n", req)
 	if err := c.ShouldBindJSON(&req); err != nil {
 		logger.FromContext(c.Request.Context()).WithError(err).Error("CategoryHandler::CreateCategory -> request binding failed")
 		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
@@ -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,201 @@
+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")
+}

internal/handler/notification_handler.go

@@ -0,0 +1,190 @@
+package handler
+
+import (
+	"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 NotificationHandler struct {
+	notificationService   service.NotificationService
+	notificationValidator validator.NotificationValidator
+}
+
+func NewNotificationHandler(
+	notificationService service.NotificationService,
+	notificationValidator validator.NotificationValidator,
+) *NotificationHandler {
+	return &NotificationHandler{
+		notificationService:   notificationService,
+		notificationValidator: notificationValidator,
+	}
+}
+
+// Send godoc
+// POST /api/v1/notifications/send
+// Sends a notification to specific users.
+func (h *NotificationHandler) Send(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.SendNotificationRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::Send -> request binding failed")
+		validationErr := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::Send")
+		return
+	}
+
+	if validationErr, errCode := h.notificationValidator.ValidateSendRequest(&req); validationErr != nil {
+		respErr := contract.NewResponseError(errCode, constants.RequestEntity, validationErr.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{respErr}), "NotificationHandler::Send")
+		return
+	}
+
+	resp := h.notificationService.Send(ctx, &req, contextInfo.UserID)
+	if resp.HasErrors() {
+		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::Send -> service error")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::Send")
+}
+
+// Broadcast godoc
+// POST /api/v1/notifications/broadcast
+// Sends a notification to all active users in the caller's organization.
+func (h *NotificationHandler) Broadcast(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.BroadcastNotificationRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::Broadcast -> request binding failed")
+		validationErr := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::Broadcast")
+		return
+	}
+
+	if validationErr, errCode := h.notificationValidator.ValidateBroadcastRequest(&req); validationErr != nil {
+		respErr := contract.NewResponseError(errCode, constants.RequestEntity, validationErr.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{respErr}), "NotificationHandler::Broadcast")
+		return
+	}
+
+	resp := h.notificationService.Broadcast(ctx, &req, contextInfo.OrganizationID, contextInfo.UserID)
+	if resp.HasErrors() {
+		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::Broadcast -> service error")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::Broadcast")
+}
+
+// List godoc
+// GET /api/v1/notifications
+// Returns paginated notifications for the authenticated user.
+func (h *NotificationHandler) List(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	req := contract.ListNotificationsRequest{
+		Page:  1,
+		Limit: 20,
+	}
+
+	if err := c.ShouldBindQuery(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::List -> query binding failed")
+		validationErr := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::List")
+		return
+	}
+
+	if validationErr, errCode := h.notificationValidator.ValidateListRequest(&req); validationErr != nil {
+		respErr := contract.NewResponseError(errCode, constants.RequestEntity, validationErr.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{respErr}), "NotificationHandler::List")
+		return
+	}
+
+	resp := h.notificationService.ListForUser(ctx, &req, contextInfo.UserID)
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::List")
+}
+
+// GetByID godoc
+// GET /api/v1/notifications/:id
+func (h *NotificationHandler) GetByID(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	idStr := c.Param("id")
+	id, err := uuid.Parse(idStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::GetByID -> invalid notification ID")
+		validationErr := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid notification ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::GetByID")
+		return
+	}
+
+	resp := h.notificationService.GetByID(ctx, id)
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::GetByID")
+}
+
+// MarkAsRead godoc
+// PUT /api/v1/notifications/:id/read
+func (h *NotificationHandler) MarkAsRead(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	idStr := c.Param("id")
+	receiverID, err := uuid.Parse(idStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::MarkAsRead -> invalid receiver ID")
+		validationErr := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid notification receiver ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::MarkAsRead")
+		return
+	}
+
+	resp := h.notificationService.MarkAsRead(ctx, receiverID, contextInfo.UserID)
+	if resp.HasErrors() {
+		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::MarkAsRead -> service error")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::MarkAsRead")
+}
+
+// MarkAllAsRead godoc
+// PUT /api/v1/notifications/read-all
+func (h *NotificationHandler) MarkAllAsRead(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	resp := h.notificationService.MarkAllAsRead(ctx, contextInfo.UserID)
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::MarkAllAsRead")
+}
+
+// Delete godoc
+// DELETE /api/v1/notifications/:id
+func (h *NotificationHandler) Delete(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	idStr := c.Param("id")
+	receiverID, err := uuid.Parse(idStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("NotificationHandler::Delete -> invalid receiver ID")
+		validationErr := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid notification receiver ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationErr}), "NotificationHandler::Delete")
+		return
+	}
+
+	resp := h.notificationService.DeleteForUser(ctx, receiverID, contextInfo.UserID)
+	if resp.HasErrors() {
+		logger.FromContext(ctx).WithError(resp.GetErrors()[0]).Error("NotificationHandler::Delete -> service error")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, resp, "NotificationHandler::Delete")
+}

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/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

@@ -1,11 +1,11 @@
 package handler
 
 import (
-	"apskel-pos-be/internal/client"
 	"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"
@@ -15,22 +15,21 @@ import (
 	"apskel-pos-be/internal/util"
 	"context"
 	"fmt"
-	"log"
 
 	"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
-	fcmClient       client.FcmClient
+	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(
@@ -42,18 +41,18 @@ func NewSelfOrderHandler(
 	userRepo processor.UserRepository,
 	sessionRepo repository.SessionRepository,
 	orderRepo repository.OrderRepository,
-	fcmClient client.FcmClient,
+	productOutletPriceService service.ProductOutletPriceService,
 ) *SelfOrderHandler {
 	return &SelfOrderHandler{
-		orderService:    orderService,
-		categoryService: categoryService,
-		productService:  productService,
-		tableRepo:       tableRepo,
-		outletRepo:      outletRepo,
-		userRepo:        userRepo,
-		sessionRepo:     sessionRepo,
-		orderRepo:       orderRepo,
-		fcmClient:       fcmClient,
+		orderService:              orderService,
+		categoryService:           categoryService,
+		productService:            productService,
+		tableRepo:                 tableRepo,
+		outletRepo:                outletRepo,
+		userRepo:                  userRepo,
+		sessionRepo:               sessionRepo,
+		orderRepo:                 orderRepo,
+		productOutletPriceService: productOutletPriceService,
 	}
 }
 
@@ -220,16 +219,29 @@ func (h *SelfOrderHandler) GetMenu(c *gin.Context) {
 		return
 	}
 
-	menu := h.buildMenuResponse(outlet, table, catList.Categories, prodList.Products)
+	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)
@@ -240,11 +252,15 @@ func (h *SelfOrderHandler) buildMenuResponse(
 		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:       p.Price,
+					Price:       price,
 					ImageURL:    p.ImageURL,
 				}
 				for _, v := range p.Variants {
@@ -335,6 +351,7 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
 	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{
@@ -342,7 +359,7 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
 		UserID:      userID,
 		TableID:     &tableID,
 		TableNumber: &table.TableName,
-		OrderType:   constants.OrderTypeDineIn,
+		OrderType:   constants.OrderType(req.OrderType),
 		OrderItems:  orderItems,
 		Metadata:    metadata,
 	}
@@ -356,41 +373,13 @@ func (h *SelfOrderHandler) CreateOrder(c *gin.Context) {
 		return
 	}
 
-	go h.sendNewOrderNotification(context.Background(), table.OrganizationID, table.TableName, len(req.OrderItems))
-
 	contractResp := transformer.OrderModelToContract(response)
 	util.HandleResponse(c.Writer, c.Request, contract.BuildSuccessResponse(contractResp), "SelfOrderHandler::CreateOrder")
 }
 
-func (h *SelfOrderHandler) sendNewOrderNotification(ctx context.Context, organizationID uuid.UUID, tableName string, itemCount int) {
-	users, err := h.userRepo.GetUsersWithFcmTokenByOrganization(ctx, organizationID)
-	if err != nil {
-		log.Printf("SelfOrderHandler::sendNewOrderNotification -> failed to get users with FCM token: %v", err)
-		return
-	}
-
-	tokens := make([]string, 0, len(users))
-	for _, u := range users {
-		if u.FcmToken != nil && *u.FcmToken != "" {
-			tokens = append(tokens, *u.FcmToken)
-		}
-	}
-
-	if len(tokens) == 0 {
-		return
-	}
-
-	title := "Order Baru"
-	body := fmt.Sprintf("Order baru dari Meja %s — %d item", tableName, itemCount)
-
-	if err := h.fcmClient.SendMulticastNotification(ctx, tokens, title, body); err != nil {
-		log.Printf("SelfOrderHandler::sendNewOrderNotification -> failed to send FCM notification: %v", err)
-	}
-}
-
 func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
 	ctx := c.Request.Context()
-	sessionID := c.Param("sessionId")
+	sessionID := c.Param("session_id")
 
 	if sessionID == "" {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
@@ -423,47 +412,15 @@ func (h *SelfOrderHandler) GetOrdersBySession(c *gin.Context) {
 		return
 	}
 
-	resp := &contract.SelfOrderListOrdersResponse{
-		Orders: make([]contract.SelfOrderOrderItem, 0, len(orders)),
-	}
-	for _, o := range orders {
-		item := contract.SelfOrderOrderItem{
-			ID:              o.ID,
-			OrderNumber:     o.OrderNumber,
-			TableNumber:     o.TableNumber,
-			OrderType:       string(o.OrderType),
-			Status:          string(o.Status),
-			Subtotal:        o.Subtotal,
-			TaxAmount:       o.TaxAmount,
-			DiscountAmount:  o.DiscountAmount,
-			TotalAmount:     o.TotalAmount,
-			RemainingAmount: o.RemainingAmount,
-			PaymentStatus:   string(o.PaymentStatus),
-			IsVoid:          o.IsVoid,
-			IsRefund:        o.IsRefund,
-			CreatedAt:       o.CreatedAt,
-		}
-		for _, oi := range o.OrderItems {
-			lineItem := contract.SelfOrderOrderLineItem{
-				ProductID:        oi.ProductID,
-				Quantity:         oi.Quantity,
-				UnitPrice:        oi.UnitPrice,
-				TotalPrice:       oi.TotalPrice,
-				Notes:            oi.Notes,
-				Status:           string(oi.Status),
-				ProductVariantID: oi.ProductVariantID,
-			}
-			if oi.Product.ID != uuid.Nil {
-				lineItem.ProductName = oi.Product.Name
-			}
-			if oi.ProductVariant != nil {
-				lineItem.ProductVariantNam = &oi.ProductVariant.Name
-			}
-			item.Items = append(item.Items, lineItem)
-		}
-		resp.Orders = append(resp.Orders, item)
+	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")
 }
 
@@ -472,6 +429,7 @@ func (h *SelfOrderHandler) validateCreateOrderRequest(req *contract.SelfOrderCre
 		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 {
@@ -499,7 +457,7 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) {
 
 	if req.OrganizationID == "" {
 		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{
-			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organisasi_id is required"),
+			contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "organization_id is required"),
 		}), "SelfOrderHandler::ListCategories")
 		return
 	}
@@ -514,7 +472,7 @@ func (h *SelfOrderHandler) ListCategories(c *gin.Context) {
 	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 organisasi_id format"),
+			contract.NewResponseError(constants.ValidationErrorCode, constants.RequestEntity, "invalid organization_id format"),
 		}), "SelfOrderHandler::ListCategories")
 		return
 	}

internal/handler/table_handler.go

@@ -19,14 +19,14 @@ import (
 type TableHandler struct {
 	tableService   TableService
 	tableValidator *validator.TableValidator
-	baseURL        string
+	selfOrderURL   string
 }
 
-func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, baseURL string) *TableHandler {
+func NewTableHandler(tableService TableService, tableValidator *validator.TableValidator, selfOrderURL string) *TableHandler {
 	return &TableHandler{
 		tableService:   tableService,
 		tableValidator: tableValidator,
-		baseURL:        baseURL,
+		selfOrderURL:   selfOrderURL,
 	}
 }
 
@@ -150,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
@@ -312,7 +317,7 @@ func (h *TableHandler) GenerateQRCode(c *gin.Context) {
 		return
 	}
 
-	selfOrderURL := fmt.Sprintf("%s/api/v1/self-order/table/%s", h.baseURL, token)
+	selfOrderURLResult := fmt.Sprintf("%s/menu?token=%s", h.selfOrderURL, token)
 
 	size := 256
 	if sizeStr := c.Query("size"); sizeStr != "" {
@@ -321,7 +326,7 @@ func (h *TableHandler) GenerateQRCode(c *gin.Context) {
 		}
 	}
 
-	pngBytes, err := qrcode.GeneratePNG(selfOrderURL, size)
+	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")

internal/handler/user_device_handler.go

@@ -0,0 +1,215 @@
+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 UserDeviceHandler struct {
+	userDeviceService   service.UserDeviceService
+	userDeviceValidator validator.UserDeviceValidator
+}
+
+func NewUserDeviceHandler(
+	userDeviceService service.UserDeviceService,
+	userDeviceValidator validator.UserDeviceValidator,
+) *UserDeviceHandler {
+	return &UserDeviceHandler{
+		userDeviceService:   userDeviceService,
+		userDeviceValidator: userDeviceValidator,
+	}
+}
+
+func (h *UserDeviceHandler) RegisterDevice(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	var req contract.RegisterUserDeviceRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::RegisterDevice -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, err.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::RegisterDevice")
+		return
+	}
+
+	validationError, validationErrorCode := h.userDeviceValidator.ValidateRegisterDeviceRequest(&req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::RegisterDevice")
+		return
+	}
+
+	deviceResponse := h.userDeviceService.RegisterDevice(ctx, contextInfo.UserID, &req)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::RegisterDevice -> Failed to register device from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::RegisterDevice")
+}
+
+func (h *UserDeviceHandler) UpdateDevice(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	deviceIDStr := c.Param("id")
+	deviceID, err := uuid.Parse(deviceIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::UpdateDevice -> Invalid device ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid device ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::UpdateDevice")
+		return
+	}
+
+	var req contract.UpdateUserDeviceRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::UpdateDevice -> request binding failed")
+		validationResponseError := contract.NewResponseError(constants.MissingFieldErrorCode, constants.RequestEntity, "Invalid request body")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::UpdateDevice")
+		return
+	}
+
+	validationError, validationErrorCode := h.userDeviceValidator.ValidateUpdateDeviceRequest(&req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::UpdateDevice")
+		return
+	}
+
+	deviceResponse := h.userDeviceService.UpdateDevice(ctx, deviceID, &req)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::UpdateDevice -> Failed to update device from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::UpdateDevice")
+}
+
+func (h *UserDeviceHandler) DeleteDevice(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	deviceIDStr := c.Param("id")
+	deviceID, err := uuid.Parse(deviceIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::DeleteDevice -> Invalid device ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid device ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::DeleteDevice")
+		return
+	}
+
+	deviceResponse := h.userDeviceService.DeleteDevice(ctx, deviceID)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::DeleteDevice -> Failed to delete device from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::DeleteDevice")
+}
+
+func (h *UserDeviceHandler) GetDevice(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	deviceIDStr := c.Param("id")
+	deviceID, err := uuid.Parse(deviceIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::GetDevice -> Invalid device ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid device ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::GetDevice")
+		return
+	}
+
+	deviceResponse := h.userDeviceService.GetDeviceByID(ctx, deviceID)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::GetDevice -> Failed to get device from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::GetDevice")
+}
+
+func (h *UserDeviceHandler) GetMyDevices(c *gin.Context) {
+	ctx := c.Request.Context()
+	contextInfo := appcontext.FromGinContext(ctx)
+
+	deviceResponse := h.userDeviceService.GetDevicesByUserID(ctx, contextInfo.UserID)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::GetMyDevices -> Failed to get devices from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::GetMyDevices")
+}
+
+func (h *UserDeviceHandler) GetDevicesByUser(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	userIDStr := c.Param("user_id")
+	userID, err := uuid.Parse(userIDStr)
+	if err != nil {
+		logger.FromContext(ctx).WithError(err).Error("UserDeviceHandler::GetDevicesByUser -> Invalid user ID")
+		validationResponseError := contract.NewResponseError(constants.MalformedFieldErrorCode, constants.RequestEntity, "Invalid user ID")
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::GetDevicesByUser")
+		return
+	}
+
+	deviceResponse := h.userDeviceService.GetDevicesByUserID(ctx, userID)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::GetDevicesByUser -> Failed to get devices from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::GetDevicesByUser")
+}
+
+func (h *UserDeviceHandler) ListDevices(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	req := &contract.ListUserDevicesRequest{
+		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 userID := c.Query("user_id"); userID != "" {
+		req.UserID = userID
+	}
+
+	if platform := c.Query("platform"); platform != "" {
+		req.Platform = platform
+	}
+
+	validationError, validationErrorCode := h.userDeviceValidator.ValidateListDevicesRequest(req)
+	if validationError != nil {
+		validationResponseError := contract.NewResponseError(validationErrorCode, constants.RequestEntity, validationError.Error())
+		util.HandleResponse(c.Writer, c.Request, contract.BuildErrorResponse([]*contract.ResponseError{validationResponseError}), "UserDeviceHandler::ListDevices")
+		return
+	}
+
+	deviceResponse := h.userDeviceService.ListDevices(ctx, req)
+	if deviceResponse.HasErrors() {
+		errorResp := deviceResponse.GetErrors()[0]
+		logger.FromContext(ctx).WithError(errorResp).Error("UserDeviceHandler::ListDevices -> Failed to list devices from service")
+	}
+
+	util.HandleResponse(c.Writer, c.Request, deviceResponse, "UserDeviceHandler::ListDevices")
+}

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
+		Order:          entity.Order,
+		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/notification_mapper.go

@@ -0,0 +1,85 @@
+package mappers
+
+import (
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+)
+
+func NotificationEntityToResponse(e *entities.Notification) *models.NotificationResponse {
+	if e == nil {
+		return nil
+	}
+	return &models.NotificationResponse{
+		ID:             e.ID,
+		Title:          e.Title,
+		Body:           e.Body,
+		Type:           e.Type,
+		Category:       e.Category,
+		Priority:       e.Priority,
+		ImageURL:       e.ImageURL,
+		ActionURL:      e.ActionURL,
+		NotifiableType: e.NotifiableType,
+		NotifiableID:   e.NotifiableID,
+		Data:           e.Data,
+		ScheduledAt:    e.ScheduledAt,
+		SentAt:         e.SentAt,
+		ExpiredAt:      e.ExpiredAt,
+		CreatedBy:      e.CreatedBy,
+		CreatedAt:      e.CreatedAt,
+		UpdatedAt:      e.UpdatedAt,
+	}
+}
+
+func NotificationReceiverEntityToResponse(e *entities.NotificationReceiver) *models.NotificationReceiverResponse {
+	if e == nil {
+		return nil
+	}
+	resp := &models.NotificationReceiverResponse{
+		ID:             e.ID,
+		NotificationID: e.NotificationID,
+		UserID:         e.UserID,
+		IsRead:         e.IsRead,
+		ReadAt:         e.ReadAt,
+		IsDeleted:      e.IsDeleted,
+		DeletedAt:      e.DeletedAt,
+		CreatedAt:      e.CreatedAt,
+		UpdatedAt:      e.UpdatedAt,
+	}
+	if e.Notification != nil {
+		resp.Notification = NotificationEntityToResponse(e.Notification)
+	}
+	return resp
+}
+
+func NotificationReceiverEntitiesToResponses(entities []*entities.NotificationReceiver) []*models.NotificationReceiverResponse {
+	if entities == nil {
+		return nil
+	}
+	responses := make([]*models.NotificationReceiverResponse, len(entities))
+	for i, e := range entities {
+		responses[i] = NotificationReceiverEntityToResponse(e)
+	}
+	return responses
+}
+
+func NotificationDeliveryEntityToResponse(e *entities.NotificationDelivery) *models.NotificationDeliveryResponse {
+	if e == nil {
+		return nil
+	}
+	return &models.NotificationDeliveryResponse{
+		ID:                     e.ID,
+		NotificationReceiverID: e.NotificationReceiverID,
+		UserDeviceID:           e.UserDeviceID,
+		Channel:                e.Channel,
+		DeliveryStatus:         e.DeliveryStatus,
+		Provider:               e.Provider,
+		ProviderMessageID:      e.ProviderMessageID,
+		SentAt:                 e.SentAt,
+		DeliveredAt:            e.DeliveredAt,
+		FailedAt:               e.FailedAt,
+		FailureReason:          e.FailureReason,
+		RetryCount:             e.RetryCount,
+		CreatedAt:              e.CreatedAt,
+		UpdatedAt:              e.UpdatedAt,
+	}
+}

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

@@ -0,0 +1,62 @@
+package mappers
+
+import (
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/models"
+)
+
+func UserDeviceEntityToModel(entity *entities.UserDevice) *models.UserDevice {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.UserDevice{
+		ID:           entity.ID,
+		UserID:       entity.UserID,
+		DeviceID:     entity.DeviceID,
+		DeviceName:   entity.DeviceName,
+		DeviceType:   entity.DeviceType,
+		Platform:     entity.Platform,
+		FCMToken:     entity.FCMToken,
+		AppVersion:   entity.AppVersion,
+		OsVersion:    entity.OsVersion,
+		IPAddress:    entity.IPAddress,
+		LastActiveAt: entity.LastActiveAt,
+		CreatedAt:    entity.CreatedAt,
+		UpdatedAt:    entity.UpdatedAt,
+	}
+}
+
+func UserDeviceEntityToResponse(entity *entities.UserDevice) *models.UserDeviceResponse {
+	if entity == nil {
+		return nil
+	}
+
+	return &models.UserDeviceResponse{
+		ID:           entity.ID,
+		UserID:       entity.UserID,
+		DeviceID:     entity.DeviceID,
+		DeviceName:   entity.DeviceName,
+		DeviceType:   entity.DeviceType,
+		Platform:     entity.Platform,
+		FCMToken:     entity.FCMToken,
+		AppVersion:   entity.AppVersion,
+		OsVersion:    entity.OsVersion,
+		IPAddress:    entity.IPAddress,
+		LastActiveAt: entity.LastActiveAt,
+		CreatedAt:    entity.CreatedAt,
+		UpdatedAt:    entity.UpdatedAt,
+	}
+}
+
+func UserDeviceEntitiesToResponses(entities []*entities.UserDevice) []*models.UserDeviceResponse {
+	if entities == nil {
+		return nil
+	}
+
+	responses := make([]*models.UserDeviceResponse, len(entities))
+	for i, entity := range entities {
+		responses[i] = UserDeviceEntityToResponse(entity)
+	}
+	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"`
@@ -183,7 +246,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,19 +254,20 @@ 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"`
-	DateFrom       time.Time           `json:"date_from"`
-	DateTo         time.Time           `json:"date_to"`
-	GroupBy        string              `json:"group_by"`
-	Summary        ProfitLossSummary   `json:"summary"`
-	Data           []ProfitLossData    `json:"data"`
-	ProductData    []ProductProfitData `json:"product_data"`
+	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                  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 +282,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 +295,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 +309,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,10 +9,11 @@ import (
 type Category struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	Name           string
 	Description    *string
 	ImageURL       *string
-	Order      	   int
+	Order          int
 	IsActive       bool
 	CreatedAt      time.Time
 	UpdatedAt      time.Time
@@ -20,27 +21,30 @@ type Category struct {
 
 type CreateCategoryRequest struct {
 	OrganizationID uuid.UUID `validate:"required"`
-	Name           string    `validate:"required,min=1,max=255"`
-	Description    *string   `validate:"omitempty,max=1000"`
-	ImageURL       *string   `validate:"omitempty,url"`
-	Order      	   int       `validate:"min=0"`
+	OutletID       *uuid.UUID
+	Name           string  `validate:"required,min=1,max=255"`
+	Description    *string `validate:"omitempty,max=1000"`
+	ImageURL       *string `validate:"omitempty,url"`
+	Order          int     `validate:"min=0"`
 }
 
 type UpdateCategoryRequest struct {
 	Name        *string `validate:"omitempty,min=1,max=255"`
 	Description *string `validate:"omitempty,max=1000"`
 	ImageURL    *string `validate:"omitempty,url"`
-	Order       *int    `validate:"omitempty,min=0"`
+	OutletID    *uuid.UUID
+	Order       *int `validate:"omitempty,min=0"`
 	IsActive    *bool
 }
 
 type CategoryResponse struct {
 	ID             uuid.UUID
 	OrganizationID uuid.UUID
+	OutletID       *uuid.UUID
 	Name           string
 	Description    *string
 	ImageURL       *string
-	Order      int
+	Order          int
 	IsActive       bool
 	CreatedAt      time.Time
 	UpdatedAt      time.Time

internal/models/expense.go

@@ -0,0 +1,120 @@
+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"`
+}

internal/models/notification.go

@@ -0,0 +1,118 @@
+package models
+
+import (
+	"time"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+)
+
+// ---- Request models ----
+
+type SendNotificationRequest struct {
+	Title          string                        `json:"title"`
+	Body           string                        `json:"body"`
+	Type           string                        `json:"type"`
+	Category       string                        `json:"category"`
+	Priority       entities.NotificationPriority `json:"priority"`
+	ImageURL       string                        `json:"image_url"`
+	ActionURL      string                        `json:"action_url"`
+	NotifiableType string                        `json:"notifiable_type"`
+	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
+	Data           map[string]interface{}        `json:"data"`
+	ReceiverIDs    []uuid.UUID                   `json:"receiver_ids"`
+	ScheduledAt    *time.Time                    `json:"scheduled_at"`
+	ExpiredAt      *time.Time                    `json:"expired_at"`
+	CreatedBy      *uuid.UUID                    `json:"created_by"`
+}
+
+type BroadcastNotificationRequest struct {
+	Title          string                        `json:"title"`
+	Body           string                        `json:"body"`
+	Type           string                        `json:"type"`
+	Category       string                        `json:"category"`
+	Priority       entities.NotificationPriority `json:"priority"`
+	ImageURL       string                        `json:"image_url"`
+	ActionURL      string                        `json:"action_url"`
+	NotifiableType string                        `json:"notifiable_type"`
+	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
+	Data           map[string]interface{}        `json:"data"`
+	OrganizationID uuid.UUID                     `json:"organization_id"`
+	ScheduledAt    *time.Time                    `json:"scheduled_at"`
+	ExpiredAt      *time.Time                    `json:"expired_at"`
+	CreatedBy      *uuid.UUID                    `json:"created_by"`
+}
+
+type MarkNotificationReadRequest struct {
+	NotificationReceiverID uuid.UUID `json:"notification_receiver_id"`
+	UserID                 uuid.UUID `json:"user_id"`
+}
+
+type ListNotificationsRequest struct {
+	Page   int       `json:"page"`
+	Limit  int       `json:"limit"`
+	UserID uuid.UUID `json:"user_id"`
+	IsRead *bool     `json:"is_read"`
+}
+
+// ---- Response models ----
+
+type NotificationResponse struct {
+	ID             uuid.UUID                     `json:"id"`
+	Title          string                        `json:"title"`
+	Body           string                        `json:"body"`
+	Type           string                        `json:"type"`
+	Category       string                        `json:"category"`
+	Priority       entities.NotificationPriority `json:"priority"`
+	ImageURL       string                        `json:"image_url"`
+	ActionURL      string                        `json:"action_url"`
+	NotifiableType string                        `json:"notifiable_type"`
+	NotifiableID   *uuid.UUID                    `json:"notifiable_id"`
+	Data           map[string]interface{}        `json:"data"`
+	ScheduledAt    *time.Time                    `json:"scheduled_at"`
+	SentAt         *time.Time                    `json:"sent_at"`
+	ExpiredAt      *time.Time                    `json:"expired_at"`
+	CreatedBy      *uuid.UUID                    `json:"created_by"`
+	CreatedAt      time.Time                     `json:"created_at"`
+	UpdatedAt      time.Time                     `json:"updated_at"`
+}
+
+type NotificationReceiverResponse struct {
+	ID             uuid.UUID             `json:"id"`
+	NotificationID uuid.UUID             `json:"notification_id"`
+	UserID         uuid.UUID             `json:"user_id"`
+	IsRead         bool                  `json:"is_read"`
+	ReadAt         *time.Time            `json:"read_at"`
+	IsDeleted      bool                  `json:"is_deleted"`
+	DeletedAt      *time.Time            `json:"deleted_at"`
+	CreatedAt      time.Time             `json:"created_at"`
+	UpdatedAt      time.Time             `json:"updated_at"`
+	Notification   *NotificationResponse `json:"notification,omitempty"`
+}
+
+type NotificationDeliveryResponse struct {
+	ID                     uuid.UUID                           `json:"id"`
+	NotificationReceiverID uuid.UUID                           `json:"notification_receiver_id"`
+	UserDeviceID           uuid.UUID                           `json:"user_device_id"`
+	Channel                entities.NotificationChannel        `json:"channel"`
+	DeliveryStatus         entities.NotificationDeliveryStatus `json:"delivery_status"`
+	Provider               entities.NotificationProvider       `json:"provider"`
+	ProviderMessageID      string                              `json:"provider_message_id"`
+	SentAt                 *time.Time                          `json:"sent_at"`
+	DeliveredAt            *time.Time                          `json:"delivered_at"`
+	FailedAt               *time.Time                          `json:"failed_at"`
+	FailureReason          string                              `json:"failure_reason"`
+	RetryCount             int                                 `json:"retry_count"`
+	CreatedAt              time.Time                           `json:"created_at"`
+	UpdatedAt              time.Time                           `json:"updated_at"`
+}
+
+type ListNotificationsResponse struct {
+	Notifications []*NotificationReceiverResponse `json:"notifications"`
+	TotalCount    int                             `json:"total_count"`
+	UnreadCount   int                             `json:"unread_count"`
+	Page          int                             `json:"page"`
+	Limit         int                             `json:"limit"`
+	TotalPages    int                             `json:"total_pages"`
+}

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_order.go

@@ -7,18 +7,18 @@ import (
 )
 
 type PurchaseOrder struct {
-	ID              uuid.UUID `json:"id"`
-	OrganizationID  uuid.UUID `json:"organization_id"`
-	VendorID        uuid.UUID `json:"vendor_id"`
-	PONumber        string    `json:"po_number"`
-	TransactionDate time.Time `json:"transaction_date"`
-	DueDate         time.Time `json:"due_date"`
-	Reference       *string   `json:"reference"`
-	Status          string    `json:"status"`
-	Message         *string   `json:"message"`
-	TotalAmount     float64   `json:"total_amount"`
-	CreatedAt       time.Time `json:"created_at"`
-	UpdatedAt       time.Time `json:"updated_at"`
+	ID              uuid.UUID  `json:"id"`
+	OrganizationID  uuid.UUID  `json:"organization_id"`
+	VendorID        uuid.UUID  `json:"vendor_id"`
+	PONumber        string     `json:"po_number"`
+	TransactionDate time.Time  `json:"transaction_date"`
+	DueDate         *time.Time `json:"due_date"`
+	Reference       *string    `json:"reference"`
+	Status          string     `json:"status"`
+	Message         *string    `json:"message"`
+	TotalAmount     float64    `json:"total_amount"`
+	CreatedAt       time.Time  `json:"created_at"`
+	UpdatedAt       time.Time  `json:"updated_at"`
 }
 
 type PurchaseOrderItem struct {
@@ -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/user_device.go

@@ -0,0 +1,77 @@
+package models
+
+import (
+	"time"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+)
+
+type UserDevice struct {
+	ID           uuid.UUID               `json:"id"`
+	UserID       uuid.UUID               `json:"user_id"`
+	DeviceID     string                  `json:"device_id"`
+	DeviceName   string                  `json:"device_name"`
+	DeviceType   entities.DeviceType     `json:"device_type"`
+	Platform     entities.DevicePlatform `json:"platform"`
+	FCMToken     string                  `json:"fcm_token"`
+	AppVersion   string                  `json:"app_version"`
+	OsVersion    string                  `json:"os_version"`
+	IPAddress    string                  `json:"ip_address"`
+	LastActiveAt *time.Time              `json:"last_active_at"`
+	CreatedAt    time.Time               `json:"created_at"`
+	UpdatedAt    time.Time               `json:"updated_at"`
+}
+
+type UserDeviceResponse struct {
+	ID           uuid.UUID               `json:"id"`
+	UserID       uuid.UUID               `json:"user_id"`
+	DeviceID     string                  `json:"device_id"`
+	DeviceName   string                  `json:"device_name"`
+	DeviceType   entities.DeviceType     `json:"device_type"`
+	Platform     entities.DevicePlatform `json:"platform"`
+	FCMToken     string                  `json:"fcm_token"`
+	AppVersion   string                  `json:"app_version"`
+	OsVersion    string                  `json:"os_version"`
+	IPAddress    string                  `json:"ip_address"`
+	LastActiveAt *time.Time              `json:"last_active_at"`
+	CreatedAt    time.Time               `json:"created_at"`
+	UpdatedAt    time.Time               `json:"updated_at"`
+}
+
+type RegisterUserDeviceRequest struct {
+	UserID     uuid.UUID               `json:"user_id"`
+	DeviceID   string                  `json:"device_id"`
+	DeviceName string                  `json:"device_name"`
+	DeviceType entities.DeviceType     `json:"device_type"`
+	Platform   entities.DevicePlatform `json:"platform"`
+	FCMToken   string                  `json:"fcm_token"`
+	AppVersion string                  `json:"app_version"`
+	OsVersion  string                  `json:"os_version"`
+	IPAddress  string                  `json:"ip_address"`
+}
+
+type UpdateUserDeviceRequest struct {
+	DeviceName string                  `json:"device_name"`
+	DeviceType entities.DeviceType     `json:"device_type"`
+	Platform   entities.DevicePlatform `json:"platform"`
+	FCMToken   string                  `json:"fcm_token"`
+	AppVersion string                  `json:"app_version"`
+	OsVersion  string                  `json:"os_version"`
+}
+
+type ListUserDevicesRequest struct {
+	Page     int    `json:"page"`
+	Limit    int    `json:"limit"`
+	UserID   string `json:"user_id,omitempty"`
+	Platform string `json:"platform,omitempty"`
+}
+
+type ListUserDevicesResponse struct {
+	Devices    []*UserDeviceResponse `json:"devices"`
+	TotalCount int                   `json:"total_count"`
+	Page       int                   `json:"page"`
+	Limit      int                   `json:"limit"`
+	TotalPages int                   `json:"total_pages"`
+}

internal/processor/analytics_processor.go

@@ -3,8 +3,10 @@ package processor
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
+	"apskel-pos-be/internal/entities"
 	"apskel-pos-be/internal/models"
 	"apskel-pos-be/internal/repository"
 )
@@ -12,6 +14,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 +23,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 +169,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) {
@@ -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,103 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 		}
 	}
 
+	todayPromosi := getExpenseAmountByCategory(result.TodayExpenseByCategory, "promosi")
+	todayLainLain := getExpenseAmountByCategory(result.TodayExpenseByCategory, "lain")
+	todayTotalOps := todayPromosi + todayLainLain
+	todayGaji := getExpenseAmountByCategory(result.TodayExpenseByCategory, "gaji")
+
+	mtdPromosi := getExpenseAmountByCategory(result.MtdExpenseByCategory, "promosi")
+	mtdLainLain := getExpenseAmountByCategory(result.MtdExpenseByCategory, "lain")
+	mtdTotalOps := mtdPromosi + mtdLainLain
+	mtdGaji := getExpenseAmountByCategory(result.MtdExpenseByCategory, "gaji")
+
+	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
+	}
+
+	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: []models.ProfitLossSummaryRow{
+				{
+					ID: "by_promosi", Label: "1. By Promosi",
+					TodayNominal: todayPromosi, TodayPct: todayPct(todayPromosi),
+					MtdNominal: mtdPromosi, MtdPct: mtdPct(mtdPromosi),
+				},
+				{
+					ID: "by_lain_lain", Label: "2. By Lain lain",
+					TodayNominal: todayLainLain, TodayPct: todayPct(todayLainLain),
+					MtdNominal: mtdLainLain, MtdPct: mtdPct(mtdLainLain),
+				},
+				{
+					ID: "total_biaya_ops", Label: "Total Biaya OPS (4.1+4.2)", IsBold: true,
+					TodayNominal: todayTotalOps, TodayPct: todayPct(todayTotalOps),
+					MtdNominal: mtdTotalOps, MtdPct: mtdPct(mtdTotalOps),
+				},
+			},
+		},
+		{
+			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,
@@ -386,7 +569,19 @@ func (p *AnalyticsProcessorImpl) GetProfitLossAnalytics(ctx context.Context, req
 			AverageProfit:      result.Summary.AverageProfit,
 			ProfitabilityRatio: result.Summary.ProfitabilityRatio,
 		},
-		Data:        data,
-		ProductData: productData,
+		Data:                     data,
+		ProductData:              productData,
+		MainSummary:              mainSummary,
+		OperationalExpenses:      opsItems,
+		OperationalExpensesTotal: opsTotal,
 	}, nil
 }
+
+func getExpenseAmountByCategory(categories []entities.ExpenseCategoryTotal, keyword string) float64 {
+	for _, cat := range categories {
+		if strings.Contains(strings.ToLower(cat.CategoryName), keyword) {
+			return cat.Amount
+		}
+	}
+	return 0
+}

internal/processor/analytics_processor_test.go

@@ -0,0 +1,167 @@
+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) 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)
+}

internal/processor/expense_processor.go

@@ -0,0 +1,223 @@
+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)
+}
+
+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
+}

internal/processor/expense_processor_test.go

@@ -0,0 +1,136 @@
+package processor
+
+import (
+	"context"
+	"testing"
+
+	"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
+}
+
+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) 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)
+}

internal/processor/expense_repository.go

@@ -0,0 +1,19 @@
+package processor
+
+import (
+	"apskel-pos-be/internal/entities"
+	"context"
+
+	"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)
+	CreateItem(ctx context.Context, item *entities.ExpenseItem) error
+	DeleteItemsByExpenseID(ctx context.Context, expenseID uuid.UUID) error
+}

internal/processor/notification_processor.go

@@ -0,0 +1,338 @@
+package processor
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"apskel-pos-be/internal/client"
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+)
+
+// NotificationRepository is the interface the processor depends on.
+type NotificationRepository interface {
+	Create(ctx context.Context, notification *entities.Notification) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.Notification, error)
+	Update(ctx context.Context, notification *entities.Notification) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Notification, int64, error)
+}
+
+// NotificationReceiverRepository is the interface the processor depends on.
+type NotificationReceiverRepository interface {
+	Create(ctx context.Context, receiver *entities.NotificationReceiver) error
+	BulkCreate(ctx context.Context, receivers []*entities.NotificationReceiver) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationReceiver, error)
+	GetByNotificationAndUser(ctx context.Context, notificationID, userID uuid.UUID) (*entities.NotificationReceiver, error)
+	Update(ctx context.Context, receiver *entities.NotificationReceiver) error
+	ListByUserID(ctx context.Context, userID uuid.UUID, isRead *bool, limit, offset int) ([]*entities.NotificationReceiver, int64, error)
+	CountUnreadByUserID(ctx context.Context, userID uuid.UUID) (int64, error)
+	SoftDeleteByID(ctx context.Context, id uuid.UUID) error
+}
+
+// NotificationDeliveryRepository is the interface the processor depends on.
+type NotificationDeliveryRepository interface {
+	Create(ctx context.Context, delivery *entities.NotificationDelivery) error
+	BulkCreate(ctx context.Context, deliveries []*entities.NotificationDelivery) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationDelivery, error)
+	Update(ctx context.Context, delivery *entities.NotificationDelivery) error
+	ListByReceiverID(ctx context.Context, receiverID uuid.UUID) ([]*entities.NotificationDelivery, error)
+}
+
+// NotificationUserRepository is a minimal interface to fetch user devices.
+type NotificationUserDeviceRepository interface {
+	GetByUserID(ctx context.Context, userID uuid.UUID) ([]*entities.UserDevice, error)
+}
+
+// NotificationUserRepository is a minimal interface to fetch users by org.
+type NotificationUserRepository interface {
+	GetActiveUsers(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error)
+}
+
+// NotificationProcessor defines the business logic interface.
+type NotificationProcessor interface {
+	Send(ctx context.Context, req *models.SendNotificationRequest) (*models.NotificationResponse, error)
+	Broadcast(ctx context.Context, req *models.BroadcastNotificationRequest) (*models.NotificationResponse, error)
+	MarkAsRead(ctx context.Context, receiverID, userID uuid.UUID) (*models.NotificationReceiverResponse, error)
+	MarkAllAsRead(ctx context.Context, userID uuid.UUID) error
+	DeleteForUser(ctx context.Context, receiverID, userID uuid.UUID) error
+	ListForUser(ctx context.Context, req *models.ListNotificationsRequest) ([]*models.NotificationReceiverResponse, int64, int64, error)
+	GetByID(ctx context.Context, id uuid.UUID) (*models.NotificationResponse, error)
+}
+
+type NotificationProcessorImpl struct {
+	notificationRepo NotificationRepository
+	receiverRepo     NotificationReceiverRepository
+	deliveryRepo     NotificationDeliveryRepository
+	userDeviceRepo   NotificationUserDeviceRepository
+	userRepo         NotificationUserRepository
+	fcmClient        client.FCMClient
+}
+
+func NewNotificationProcessor(
+	notificationRepo NotificationRepository,
+	receiverRepo NotificationReceiverRepository,
+	deliveryRepo NotificationDeliveryRepository,
+	userDeviceRepo NotificationUserDeviceRepository,
+	userRepo NotificationUserRepository,
+	fcmClient client.FCMClient,
+) *NotificationProcessorImpl {
+	return &NotificationProcessorImpl{
+		notificationRepo: notificationRepo,
+		receiverRepo:     receiverRepo,
+		deliveryRepo:     deliveryRepo,
+		userDeviceRepo:   userDeviceRepo,
+		userRepo:         userRepo,
+		fcmClient:        fcmClient,
+	}
+}
+
+// Send creates a notification and dispatches it to the given receiver user IDs via FCM.
+func (p *NotificationProcessorImpl) Send(ctx context.Context, req *models.SendNotificationRequest) (*models.NotificationResponse, error) {
+	if len(req.ReceiverIDs) == 0 {
+		return nil, fmt.Errorf("at least one receiver_id is required")
+	}
+
+	notification := &entities.Notification{
+		Title:          req.Title,
+		Body:           req.Body,
+		Type:           req.Type,
+		Category:       req.Category,
+		Priority:       req.Priority,
+		ImageURL:       req.ImageURL,
+		ActionURL:      req.ActionURL,
+		NotifiableType: req.NotifiableType,
+		NotifiableID:   req.NotifiableID,
+		Data:           req.Data,
+		ScheduledAt:    req.ScheduledAt,
+		ExpiredAt:      req.ExpiredAt,
+		CreatedBy:      req.CreatedBy,
+	}
+
+	if err := p.notificationRepo.Create(ctx, notification); err != nil {
+		return nil, fmt.Errorf("failed to create notification: %w", err)
+	}
+
+	// Create receiver records and dispatch FCM per user.
+	for _, userID := range req.ReceiverIDs {
+		receiver := &entities.NotificationReceiver{
+			NotificationID: notification.ID,
+			UserID:         userID,
+		}
+		if err := p.receiverRepo.Create(ctx, receiver); err != nil {
+			// Log but continue for other receivers.
+			continue
+		}
+
+		p.dispatchFCMToUser(ctx, receiver, notification)
+	}
+
+	// Mark notification as sent.
+	now := time.Now()
+	notification.SentAt = &now
+	_ = p.notificationRepo.Update(ctx, notification)
+
+	return mappers.NotificationEntityToResponse(notification), nil
+}
+
+// Broadcast sends a notification to all active users in an organization.
+func (p *NotificationProcessorImpl) Broadcast(ctx context.Context, req *models.BroadcastNotificationRequest) (*models.NotificationResponse, error) {
+	users, err := p.userRepo.GetActiveUsers(ctx, req.OrganizationID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch organization users: %w", err)
+	}
+
+	notification := &entities.Notification{
+		Title:          req.Title,
+		Body:           req.Body,
+		Type:           req.Type,
+		Category:       req.Category,
+		Priority:       req.Priority,
+		ImageURL:       req.ImageURL,
+		ActionURL:      req.ActionURL,
+		NotifiableType: req.NotifiableType,
+		NotifiableID:   req.NotifiableID,
+		Data:           req.Data,
+		ScheduledAt:    req.ScheduledAt,
+		ExpiredAt:      req.ExpiredAt,
+		CreatedBy:      req.CreatedBy,
+	}
+
+	if err := p.notificationRepo.Create(ctx, notification); err != nil {
+		return nil, fmt.Errorf("failed to create notification: %w", err)
+	}
+
+	// Build receiver records in bulk.
+	receivers := make([]*entities.NotificationReceiver, 0, len(users))
+	for _, u := range users {
+		receivers = append(receivers, &entities.NotificationReceiver{
+			NotificationID: notification.ID,
+			UserID:         u.ID,
+		})
+	}
+
+	if err := p.receiverRepo.BulkCreate(ctx, receivers); err != nil {
+		return nil, fmt.Errorf("failed to create notification receivers: %w", err)
+	}
+
+	// Dispatch FCM for each receiver.
+	for _, receiver := range receivers {
+		p.dispatchFCMToUser(ctx, receiver, notification)
+	}
+
+	now := time.Now()
+	notification.SentAt = &now
+	_ = p.notificationRepo.Update(ctx, notification)
+
+	return mappers.NotificationEntityToResponse(notification), nil
+}
+
+// MarkAsRead marks a single notification receiver record as read.
+func (p *NotificationProcessorImpl) MarkAsRead(ctx context.Context, receiverID, userID uuid.UUID) (*models.NotificationReceiverResponse, error) {
+	receiver, err := p.receiverRepo.GetByID(ctx, receiverID)
+	if err != nil {
+		return nil, fmt.Errorf("notification not found: %w", err)
+	}
+
+	if receiver.UserID != userID {
+		return nil, fmt.Errorf("unauthorized: notification does not belong to user")
+	}
+
+	if !receiver.IsRead {
+		now := time.Now()
+		receiver.IsRead = true
+		receiver.ReadAt = &now
+		if err := p.receiverRepo.Update(ctx, receiver); err != nil {
+			return nil, fmt.Errorf("failed to mark notification as read: %w", err)
+		}
+	}
+
+	return mappers.NotificationReceiverEntityToResponse(receiver), nil
+}
+
+// MarkAllAsRead marks all unread notifications for a user as read.
+func (p *NotificationProcessorImpl) MarkAllAsRead(ctx context.Context, userID uuid.UUID) error {
+	isRead := false
+	receivers, _, err := p.receiverRepo.ListByUserID(ctx, userID, &isRead, 1000, 0)
+	if err != nil {
+		return fmt.Errorf("failed to fetch unread notifications: %w", err)
+	}
+
+	now := time.Now()
+	for _, r := range receivers {
+		r.IsRead = true
+		r.ReadAt = &now
+		_ = p.receiverRepo.Update(ctx, r)
+	}
+
+	return nil
+}
+
+// DeleteForUser soft-deletes a notification receiver record for a user.
+func (p *NotificationProcessorImpl) DeleteForUser(ctx context.Context, receiverID, userID uuid.UUID) error {
+	receiver, err := p.receiverRepo.GetByID(ctx, receiverID)
+	if err != nil {
+		return fmt.Errorf("notification not found: %w", err)
+	}
+
+	if receiver.UserID != userID {
+		return fmt.Errorf("unauthorized: notification does not belong to user")
+	}
+
+	return p.receiverRepo.SoftDeleteByID(ctx, receiverID)
+}
+
+// ListForUser returns paginated notifications for a user.
+// Returns: receivers, total, unreadCount, error
+func (p *NotificationProcessorImpl) ListForUser(ctx context.Context, req *models.ListNotificationsRequest) ([]*models.NotificationReceiverResponse, int64, int64, error) {
+	offset := (req.Page - 1) * req.Limit
+
+	receivers, total, err := p.receiverRepo.ListByUserID(ctx, req.UserID, req.IsRead, req.Limit, offset)
+	if err != nil {
+		return nil, 0, 0, fmt.Errorf("failed to list notifications: %w", err)
+	}
+
+	unreadCount, err := p.receiverRepo.CountUnreadByUserID(ctx, req.UserID)
+	if err != nil {
+		unreadCount = 0
+	}
+
+	responses := mappers.NotificationReceiverEntitiesToResponses(receivers)
+	return responses, total, unreadCount, nil
+}
+
+// GetByID returns a single notification by its ID.
+func (p *NotificationProcessorImpl) GetByID(ctx context.Context, id uuid.UUID) (*models.NotificationResponse, error) {
+	notification, err := p.notificationRepo.GetByID(ctx, id)
+	if err != nil {
+		return nil, fmt.Errorf("notification not found: %w", err)
+	}
+	return mappers.NotificationEntityToResponse(notification), nil
+}
+
+// dispatchFCMToUser fetches all FCM tokens for a user and sends the push notification.
+func (p *NotificationProcessorImpl) dispatchFCMToUser(ctx context.Context, receiver *entities.NotificationReceiver, notification *entities.Notification) {
+	if p.fcmClient == nil {
+		return
+	}
+
+	devices, err := p.userDeviceRepo.GetByUserID(ctx, receiver.UserID)
+	if err != nil || len(devices) == 0 {
+		return
+	}
+
+	// Build FCM data payload.
+	data := map[string]string{
+		"notification_id":          notification.ID.String(),
+		"notification_receiver_id": receiver.ID.String(),
+		"type":                     notification.Type,
+		"category":                 notification.Category,
+		"action_url":               notification.ActionURL,
+	}
+
+	// Collect valid FCM tokens and create delivery records.
+	tokens := make([]string, 0, len(devices))
+	deliveries := make([]*entities.NotificationDelivery, 0, len(devices))
+
+	for _, device := range devices {
+		if device.FCMToken == "" {
+			continue
+		}
+		tokens = append(tokens, device.FCMToken)
+		deliveries = append(deliveries, &entities.NotificationDelivery{
+			NotificationReceiverID: receiver.ID,
+			UserDeviceID:           device.ID,
+			Channel:                entities.NotificationChannelPush,
+			DeliveryStatus:         entities.NotificationDeliveryStatusPending,
+			Provider:               entities.NotificationProviderFirebase,
+		})
+	}
+
+	if len(tokens) == 0 {
+		return
+	}
+
+	// Persist delivery records before sending.
+	_ = p.deliveryRepo.BulkCreate(ctx, deliveries)
+
+	// Send via FCM multicast.
+	now := time.Now()
+	sendErr := p.fcmClient.SendMulticastNotification(ctx, tokens, notification.Title, notification.Body, data)
+
+	// Update delivery status.
+	for _, delivery := range deliveries {
+		if sendErr != nil {
+			delivery.DeliveryStatus = entities.NotificationDeliveryStatusFailed
+			delivery.FailedAt = &now
+			delivery.FailureReason = sendErr.Error()
+		} else {
+			delivery.DeliveryStatus = entities.NotificationDeliveryStatusSent
+			delivery.SentAt = &now
+		}
+		_ = p.deliveryRepo.Update(ctx, delivery)
+	}
+}

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_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/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"
@@ -212,6 +213,15 @@ func (p *TableProcessor) GetTokenByID(ctx context.Context, id uuid.UUID) (string
 	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
 }
 

internal/processor/user_device_processor.go

@@ -0,0 +1,165 @@
+package processor
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"apskel-pos-be/internal/entities"
+	"apskel-pos-be/internal/mappers"
+	"apskel-pos-be/internal/models"
+
+	"github.com/google/uuid"
+)
+
+type UserDeviceRepository interface {
+	Create(ctx context.Context, device *entities.UserDevice) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.UserDevice, error)
+	GetByDeviceID(ctx context.Context, deviceID string, userID uuid.UUID) (*entities.UserDevice, error)
+	GetByUserID(ctx context.Context, userID uuid.UUID) ([]*entities.UserDevice, error)
+	Update(ctx context.Context, device *entities.UserDevice) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	DeleteByUserID(ctx context.Context, userID uuid.UUID) error
+	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.UserDevice, int64, error)
+}
+
+type UserDeviceProcessor interface {
+	RegisterDevice(ctx context.Context, req *models.RegisterUserDeviceRequest) (*models.UserDeviceResponse, error)
+	UpdateDevice(ctx context.Context, id uuid.UUID, req *models.UpdateUserDeviceRequest) (*models.UserDeviceResponse, error)
+	DeleteDevice(ctx context.Context, id uuid.UUID) error
+	GetDeviceByID(ctx context.Context, id uuid.UUID) (*models.UserDeviceResponse, error)
+	GetDevicesByUserID(ctx context.Context, userID uuid.UUID) ([]*models.UserDeviceResponse, error)
+	ListDevices(ctx context.Context, filters map[string]interface{}, page, limit int) ([]*models.UserDeviceResponse, int, error)
+}
+
+type UserDeviceProcessorImpl struct {
+	userDeviceRepo UserDeviceRepository
+}
+
+func NewUserDeviceProcessorImpl(userDeviceRepo UserDeviceRepository) *UserDeviceProcessorImpl {
+	return &UserDeviceProcessorImpl{
+		userDeviceRepo: userDeviceRepo,
+	}
+}
+
+func (p *UserDeviceProcessorImpl) RegisterDevice(ctx context.Context, req *models.RegisterUserDeviceRequest) (*models.UserDeviceResponse, error) {
+	// Upsert: if device already registered for this user, update it
+	existing, err := p.userDeviceRepo.GetByDeviceID(ctx, req.DeviceID, req.UserID)
+	if err == nil && existing != nil {
+		existing.DeviceName = req.DeviceName
+		existing.DeviceType = req.DeviceType
+		existing.Platform = req.Platform
+		existing.FCMToken = req.FCMToken
+		existing.AppVersion = req.AppVersion
+		existing.OsVersion = req.OsVersion
+		existing.IPAddress = req.IPAddress
+		now := time.Now()
+		existing.LastActiveAt = &now
+
+		if err := p.userDeviceRepo.Update(ctx, existing); err != nil {
+			return nil, fmt.Errorf("failed to update device: %w", err)
+		}
+
+		return mappers.UserDeviceEntityToResponse(existing), nil
+	}
+
+	deviceEntity := &entities.UserDevice{
+		UserID:     req.UserID,
+		DeviceID:   req.DeviceID,
+		DeviceName: req.DeviceName,
+		DeviceType: req.DeviceType,
+		Platform:   req.Platform,
+		FCMToken:   req.FCMToken,
+		AppVersion: req.AppVersion,
+		OsVersion:  req.OsVersion,
+		IPAddress:  req.IPAddress,
+	}
+
+	now := time.Now()
+	deviceEntity.LastActiveAt = &now
+
+	if err := p.userDeviceRepo.Create(ctx, deviceEntity); err != nil {
+		return nil, fmt.Errorf("failed to register device: %w", err)
+	}
+
+	return mappers.UserDeviceEntityToResponse(deviceEntity), nil
+}
+
+func (p *UserDeviceProcessorImpl) UpdateDevice(ctx context.Context, id uuid.UUID, req *models.UpdateUserDeviceRequest) (*models.UserDeviceResponse, error) {
+	deviceEntity, err := p.userDeviceRepo.GetByID(ctx, id)
+	if err != nil {
+		return nil, fmt.Errorf("device not found: %w", err)
+	}
+
+	if req.DeviceName != "" {
+		deviceEntity.DeviceName = req.DeviceName
+	}
+	if req.DeviceType != "" {
+		deviceEntity.DeviceType = req.DeviceType
+	}
+	if req.Platform != "" {
+		deviceEntity.Platform = req.Platform
+	}
+	if req.FCMToken != "" {
+		deviceEntity.FCMToken = req.FCMToken
+	}
+	if req.AppVersion != "" {
+		deviceEntity.AppVersion = req.AppVersion
+	}
+	if req.OsVersion != "" {
+		deviceEntity.OsVersion = req.OsVersion
+	}
+
+	now := time.Now()
+	deviceEntity.LastActiveAt = &now
+
+	if err := p.userDeviceRepo.Update(ctx, deviceEntity); err != nil {
+		return nil, fmt.Errorf("failed to update device: %w", err)
+	}
+
+	return mappers.UserDeviceEntityToResponse(deviceEntity), nil
+}
+
+func (p *UserDeviceProcessorImpl) DeleteDevice(ctx context.Context, id uuid.UUID) error {
+	_, err := p.userDeviceRepo.GetByID(ctx, id)
+	if err != nil {
+		return fmt.Errorf("device not found: %w", err)
+	}
+
+	if err := p.userDeviceRepo.Delete(ctx, id); err != nil {
+		return fmt.Errorf("failed to delete device: %w", err)
+	}
+
+	return nil
+}
+
+func (p *UserDeviceProcessorImpl) GetDeviceByID(ctx context.Context, id uuid.UUID) (*models.UserDeviceResponse, error) {
+	deviceEntity, err := p.userDeviceRepo.GetByID(ctx, id)
+	if err != nil {
+		return nil, fmt.Errorf("device not found: %w", err)
+	}
+
+	return mappers.UserDeviceEntityToResponse(deviceEntity), nil
+}
+
+func (p *UserDeviceProcessorImpl) GetDevicesByUserID(ctx context.Context, userID uuid.UUID) ([]*models.UserDeviceResponse, error) {
+	deviceEntities, err := p.userDeviceRepo.GetByUserID(ctx, userID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get devices: %w", err)
+	}
+
+	return mappers.UserDeviceEntitiesToResponses(deviceEntities), nil
+}
+
+func (p *UserDeviceProcessorImpl) ListDevices(ctx context.Context, filters map[string]interface{}, page, limit int) ([]*models.UserDeviceResponse, int, error) {
+	offset := (page - 1) * limit
+	deviceEntities, total, err := p.userDeviceRepo.List(ctx, filters, limit, offset)
+	if err != nil {
+		return nil, 0, fmt.Errorf("failed to list devices: %w", err)
+	}
+
+	deviceResponses := mappers.UserDeviceEntitiesToResponses(deviceEntities)
+	totalPages := int((total + int64(limit) - 1) / int64(limit))
+
+	return deviceResponses, totalPages, nil
+}

internal/processor/user_processor.go

@@ -253,17 +253,3 @@ func (p *UserProcessorImpl) UpdateUserOutlet(ctx context.Context, userID uuid.UU
 
 	return mappers.UserEntityToResponse(existingUser), nil
 }
-
-func (p *UserProcessorImpl) UpdateFcmToken(ctx context.Context, userID uuid.UUID, fcmToken string) error {
-	_, err := p.userRepo.GetByID(ctx, userID)
-	if err != nil {
-		return fmt.Errorf("user not found: %w", err)
-	}
-
-	err = p.userRepo.UpdateFcmToken(ctx, userID, fcmToken)
-	if err != nil {
-		return fmt.Errorf("failed to update FCM token: %w", err)
-	}
-
-	return nil
-}

internal/processor/user_repository.go

@@ -19,6 +19,4 @@ type UserRepository interface {
 	UpdateActiveStatus(ctx context.Context, id uuid.UUID, isActive bool) error
 	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.User, int64, error)
 	Count(ctx context.Context, filters map[string]interface{}) (int64, error)
-	UpdateFcmToken(ctx context.Context, id uuid.UUID, fcmToken string) error
-	GetUsersWithFcmTokenByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error)
 }

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
 
@@ -180,9 +339,7 @@ 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").
@@ -235,9 +392,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 +422,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,38 +433,40 @@ 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(`
 			COALESCE(SUM(o.total_amount), 0) as total_revenue,
 			COALESCE(SUM(o.total_cost), 0) as total_cost,
 			COALESCE(SUM(o.total_amount - o.total_cost), 0) as gross_profit,
-			CASE 
-				WHEN SUM(o.total_amount) > 0 
-				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100 
-				ELSE 0 
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100
+				ELSE 0
 			END as gross_profit_margin,
 			COALESCE(SUM(o.tax_amount), 0) as total_tax,
 			COALESCE(SUM(o.discount_amount), 0) as total_discount,
 			COALESCE(SUM(o.total_amount - o.total_cost - o.discount_amount), 0) as net_profit,
-			CASE 
-				WHEN SUM(o.total_amount) > 0 
-				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100 
-				ELSE 0 
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100
+				ELSE 0
 			END as net_profit_margin,
 			COUNT(o.id) as total_orders,
-			CASE 
-				WHEN COUNT(o.id) > 0 
-				THEN SUM(o.total_amount - o.total_cost - o.discount_amount) / COUNT(o.id) 
-				ELSE 0 
+			CASE
+				WHEN COUNT(o.id) > 0
+				THEN SUM(o.total_amount - o.total_cost - o.discount_amount) / COUNT(o.id)
+				ELSE 0
 			END as average_profit,
-			CASE 
-				WHEN SUM(o.total_cost) > 0 
-				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_cost)) * 100 
-				ELSE 0 
+			CASE
+				WHEN SUM(o.total_cost) > 0
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_cost)) * 100
+				ELSE 0
 			END as profitability_ratio
 		`).
 		Where("o.organization_id = ?", organizationID).
@@ -319,17 +474,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 +487,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(`
@@ -351,18 +499,18 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 			COALESCE(SUM(o.total_amount), 0) as revenue,
 			COALESCE(SUM(o.total_cost), 0) as cost,
 			COALESCE(SUM(o.total_amount - o.total_cost), 0) as gross_profit,
-			CASE 
-				WHEN SUM(o.total_amount) > 0 
-				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100 
-				ELSE 0 
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost) / SUM(o.total_amount)) * 100
+				ELSE 0
 			END as gross_profit_margin,
 			COALESCE(SUM(o.tax_amount), 0) as tax,
 			COALESCE(SUM(o.discount_amount), 0) as discount,
 			COALESCE(SUM(o.total_amount - o.total_cost - o.discount_amount), 0) as net_profit,
-			CASE 
-				WHEN SUM(o.total_amount) > 0 
-				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100 
-				ELSE 0 
+			CASE
+				WHEN SUM(o.total_amount) > 0
+				THEN (SUM(o.total_amount - o.total_cost - o.discount_amount) / SUM(o.total_amount)) * 100
+				ELSE 0
 			END as net_profit_margin,
 			COUNT(o.id) as orders
 		`).
@@ -373,19 +521,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(`
@@ -397,10 +538,10 @@ func (r *AnalyticsRepositoryImpl) GetProfitLossAnalytics(ctx context.Context, or
 			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) as revenue,
 			SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0)) ELSE 0 END) as cost,
 			SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) as gross_profit,
-			CASE 
-				WHEN SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) > 0 
-				THEN (SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) / SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END)) * 100 
-				ELSE 0 
+			CASE
+				WHEN SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END) > 0
+				THEN (SUM(CASE WHEN oi.is_fully_refunded = false THEN (oi.total_price - COALESCE(oi.refund_amount, 0)) - (oi.total_cost * ((oi.quantity - COALESCE(oi.refund_quantity, 0))::float / NULLIF(oi.quantity, 0))) ELSE 0 END) / SUM(CASE WHEN oi.is_fully_refunded = false THEN oi.total_price - COALESCE(oi.refund_amount, 0) ELSE 0 END)) * 100
+				ELSE 0
 			END as gross_profit_margin,
 			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_price ELSE NULL END) as average_price,
 			AVG(CASE WHEN oi.is_fully_refunded = false THEN oi.unit_cost ELSE NULL END) as average_cost,
@@ -418,19 +559,124 @@ 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
 	}
 
 	return &entities.ProfitLossAnalytics{
-		Summary:     summary,
-		Data:        data,
-		ProductData: productData,
+		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, '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("parent_coa.name").
+		Order("parent_coa.name").
+		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,123 @@
+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) 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/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
-					inventory = entities.Inventory{
-						ProductID:    productID,
-						OutletID:     outletID,
-						Quantity:     0,
-						ReorderLevel: 0,
-					}
-					if err := tx.Create(&inventory).Error; err != nil {
-						return fmt.Errorf("failed to create inventory record for product %s: %w", productID, err)
-					}
-				} else {
+			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.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)
+				}
 			}
 
 			inventory.UpdateQuantity(delta)

internal/repository/notification_delivery_repository.go

@@ -0,0 +1,59 @@
+package repository
+
+import (
+	"context"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type NotificationDeliveryRepository interface {
+	Create(ctx context.Context, delivery *entities.NotificationDelivery) error
+	BulkCreate(ctx context.Context, deliveries []*entities.NotificationDelivery) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationDelivery, error)
+	Update(ctx context.Context, delivery *entities.NotificationDelivery) error
+	ListByReceiverID(ctx context.Context, receiverID uuid.UUID) ([]*entities.NotificationDelivery, error)
+}
+
+type NotificationDeliveryRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewNotificationDeliveryRepository(db *gorm.DB) *NotificationDeliveryRepositoryImpl {
+	return &NotificationDeliveryRepositoryImpl{db: db}
+}
+
+func (r *NotificationDeliveryRepositoryImpl) Create(ctx context.Context, delivery *entities.NotificationDelivery) error {
+	return r.db.WithContext(ctx).Create(delivery).Error
+}
+
+func (r *NotificationDeliveryRepositoryImpl) BulkCreate(ctx context.Context, deliveries []*entities.NotificationDelivery) error {
+	if len(deliveries) == 0 {
+		return nil
+	}
+	return r.db.WithContext(ctx).Create(&deliveries).Error
+}
+
+func (r *NotificationDeliveryRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationDelivery, error) {
+	var delivery entities.NotificationDelivery
+	err := r.db.WithContext(ctx).First(&delivery, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &delivery, nil
+}
+
+func (r *NotificationDeliveryRepositoryImpl) Update(ctx context.Context, delivery *entities.NotificationDelivery) error {
+	return r.db.WithContext(ctx).Save(delivery).Error
+}
+
+func (r *NotificationDeliveryRepositoryImpl) ListByReceiverID(ctx context.Context, receiverID uuid.UUID) ([]*entities.NotificationDelivery, error) {
+	var deliveries []*entities.NotificationDelivery
+	err := r.db.WithContext(ctx).
+		Where("notification_receiver_id = ?", receiverID).
+		Order("created_at DESC").
+		Find(&deliveries).Error
+	return deliveries, err
+}

internal/repository/notification_receiver_repository.go

@@ -0,0 +1,108 @@
+package repository
+
+import (
+	"context"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type NotificationReceiverRepository interface {
+	Create(ctx context.Context, receiver *entities.NotificationReceiver) error
+	BulkCreate(ctx context.Context, receivers []*entities.NotificationReceiver) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationReceiver, error)
+	GetByNotificationAndUser(ctx context.Context, notificationID, userID uuid.UUID) (*entities.NotificationReceiver, error)
+	Update(ctx context.Context, receiver *entities.NotificationReceiver) error
+	ListByUserID(ctx context.Context, userID uuid.UUID, isRead *bool, limit, offset int) ([]*entities.NotificationReceiver, int64, error)
+	CountUnreadByUserID(ctx context.Context, userID uuid.UUID) (int64, error)
+	SoftDeleteByID(ctx context.Context, id uuid.UUID) error
+}
+
+type NotificationReceiverRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewNotificationReceiverRepository(db *gorm.DB) *NotificationReceiverRepositoryImpl {
+	return &NotificationReceiverRepositoryImpl{db: db}
+}
+
+func (r *NotificationReceiverRepositoryImpl) Create(ctx context.Context, receiver *entities.NotificationReceiver) error {
+	return r.db.WithContext(ctx).Create(receiver).Error
+}
+
+func (r *NotificationReceiverRepositoryImpl) BulkCreate(ctx context.Context, receivers []*entities.NotificationReceiver) error {
+	if len(receivers) == 0 {
+		return nil
+	}
+	return r.db.WithContext(ctx).Create(&receivers).Error
+}
+
+func (r *NotificationReceiverRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.NotificationReceiver, error) {
+	var receiver entities.NotificationReceiver
+	err := r.db.WithContext(ctx).
+		Preload("Notification").
+		First(&receiver, "id = ? AND is_deleted = false", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &receiver, nil
+}
+
+func (r *NotificationReceiverRepositoryImpl) GetByNotificationAndUser(ctx context.Context, notificationID, userID uuid.UUID) (*entities.NotificationReceiver, error) {
+	var receiver entities.NotificationReceiver
+	err := r.db.WithContext(ctx).
+		Where("notification_id = ? AND user_id = ? AND is_deleted = false", notificationID, userID).
+		First(&receiver).Error
+	if err != nil {
+		return nil, err
+	}
+	return &receiver, nil
+}
+
+func (r *NotificationReceiverRepositoryImpl) Update(ctx context.Context, receiver *entities.NotificationReceiver) error {
+	return r.db.WithContext(ctx).Save(receiver).Error
+}
+
+func (r *NotificationReceiverRepositoryImpl) ListByUserID(ctx context.Context, userID uuid.UUID, isRead *bool, limit, offset int) ([]*entities.NotificationReceiver, int64, error) {
+	var receivers []*entities.NotificationReceiver
+	var total int64
+
+	query := r.db.WithContext(ctx).
+		Model(&entities.NotificationReceiver{}).
+		Where("user_id = ? AND is_deleted = false", userID)
+
+	if isRead != nil {
+		query = query.Where("is_read = ?", *isRead)
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.
+		Preload("Notification").
+		Order("created_at DESC").
+		Limit(limit).
+		Offset(offset).
+		Find(&receivers).Error
+
+	return receivers, total, err
+}
+
+func (r *NotificationReceiverRepositoryImpl) CountUnreadByUserID(ctx context.Context, userID uuid.UUID) (int64, error) {
+	var count int64
+	err := r.db.WithContext(ctx).
+		Model(&entities.NotificationReceiver{}).
+		Where("user_id = ? AND is_read = false AND is_deleted = false", userID).
+		Count(&count).Error
+	return count, err
+}
+
+func (r *NotificationReceiverRepositoryImpl) SoftDeleteByID(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).
+		Model(&entities.NotificationReceiver{}).
+		Where("id = ?", id).
+		Updates(map[string]interface{}{"is_deleted": true}).Error
+}

internal/repository/notification_repository.go

@@ -0,0 +1,64 @@
+package repository
+
+import (
+	"context"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type NotificationRepository interface {
+	Create(ctx context.Context, notification *entities.Notification) error
+	GetByID(ctx context.Context, id uuid.UUID) (*entities.Notification, error)
+	Update(ctx context.Context, notification *entities.Notification) error
+	Delete(ctx context.Context, id uuid.UUID) error
+	List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Notification, int64, error)
+}
+
+type NotificationRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewNotificationRepository(db *gorm.DB) *NotificationRepositoryImpl {
+	return &NotificationRepositoryImpl{db: db}
+}
+
+func (r *NotificationRepositoryImpl) Create(ctx context.Context, notification *entities.Notification) error {
+	return r.db.WithContext(ctx).Create(notification).Error
+}
+
+func (r *NotificationRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.Notification, error) {
+	var notification entities.Notification
+	err := r.db.WithContext(ctx).First(&notification, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &notification, nil
+}
+
+func (r *NotificationRepositoryImpl) Update(ctx context.Context, notification *entities.Notification) error {
+	return r.db.WithContext(ctx).Save(notification).Error
+}
+
+func (r *NotificationRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.Notification{}, "id = ?", id).Error
+}
+
+func (r *NotificationRepositoryImpl) List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.Notification, int64, error) {
+	var notifications []*entities.Notification
+	var total int64
+
+	query := r.db.WithContext(ctx).Model(&entities.Notification{})
+	for key, value := range filters {
+		query = query.Where(key+" = ?", value)
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.Order("created_at DESC").Limit(limit).Offset(offset).Find(&notifications).Error
+	return notifications, total, err
+}

internal/repository/order_repository.go

@@ -60,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").
@@ -98,36 +100,54 @@ 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
 }
 
@@ -139,6 +159,8 @@ func (r *OrderRepositoryImpl) ListBySessionID(ctx context.Context, sessionID str
 		Preload("User").
 		Preload("OrderItems").
 		Preload("OrderItems.Product").
+		Preload("OrderItems.Product.Category").
+		Preload("OrderItems.Product.ProductOutletPrices").
 		Preload("OrderItems.ProductVariant").
 		Preload("Payments").
 		Preload("Payments.PaymentMethod").

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

@@ -171,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

@@ -24,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_device_repository.go

@@ -0,0 +1,94 @@
+package repository
+
+import (
+	"context"
+	"strings"
+
+	"apskel-pos-be/internal/entities"
+
+	"github.com/google/uuid"
+	"gorm.io/gorm"
+)
+
+type UserDeviceRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewUserDeviceRepositoryImpl(db *gorm.DB) *UserDeviceRepositoryImpl {
+	return &UserDeviceRepositoryImpl{
+		db: db,
+	}
+}
+
+func (r *UserDeviceRepositoryImpl) Create(ctx context.Context, device *entities.UserDevice) error {
+	return r.db.WithContext(ctx).Create(device).Error
+}
+
+func (r *UserDeviceRepositoryImpl) GetByID(ctx context.Context, id uuid.UUID) (*entities.UserDevice, error) {
+	var device entities.UserDevice
+	err := r.db.WithContext(ctx).First(&device, "id = ?", id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &device, nil
+}
+
+func (r *UserDeviceRepositoryImpl) GetByDeviceID(ctx context.Context, deviceID string, userID uuid.UUID) (*entities.UserDevice, error) {
+	var device entities.UserDevice
+	err := r.db.WithContext(ctx).Where("device_id = ? AND user_id = ?", deviceID, userID).First(&device).Error
+	if err != nil {
+		return nil, err
+	}
+	return &device, nil
+}
+
+func (r *UserDeviceRepositoryImpl) GetByUserID(ctx context.Context, userID uuid.UUID) ([]*entities.UserDevice, error) {
+	var devices []*entities.UserDevice
+	err := r.db.WithContext(ctx).Where("user_id = ?", userID).Order("created_at DESC").Find(&devices).Error
+	return devices, err
+}
+
+func (r *UserDeviceRepositoryImpl) Update(ctx context.Context, device *entities.UserDevice) error {
+	return r.db.WithContext(ctx).Save(device).Error
+}
+
+func (r *UserDeviceRepositoryImpl) Delete(ctx context.Context, id uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.UserDevice{}, "id = ?", id).Error
+}
+
+func (r *UserDeviceRepositoryImpl) DeleteByUserID(ctx context.Context, userID uuid.UUID) error {
+	return r.db.WithContext(ctx).Delete(&entities.UserDevice{}, "user_id = ?", userID).Error
+}
+
+func (r *UserDeviceRepositoryImpl) List(ctx context.Context, filters map[string]interface{}, limit, offset int) ([]*entities.UserDevice, int64, error) {
+	var devices []*entities.UserDevice
+	var total int64
+
+	query := r.db.WithContext(ctx).Model(&entities.UserDevice{})
+
+	for key, value := range filters {
+		switch key {
+		case "user_id":
+			query = query.Where("user_id = ?", value)
+		case "platform":
+			if platform, ok := value.(string); ok && platform != "" {
+				query = query.Where("platform = ?", platform)
+			}
+		case "search":
+			if searchStr, ok := value.(string); ok && searchStr != "" {
+				searchPattern := "%" + strings.ToLower(searchStr) + "%"
+				query = query.Where("LOWER(device_name) LIKE ? OR LOWER(device_id) LIKE ?",
+					searchPattern, searchPattern)
+			}
+		default:
+			query = query.Where(key+" = ?", value)
+		}
+	}
+
+	if err := query.Count(&total).Error; err != nil {
+		return nil, 0, err
+	}
+
+	err := query.Order("created_at DESC").Limit(limit).Offset(offset).Find(&devices).Error
+	return devices, total, err
+}

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
 }
@@ -110,17 +121,3 @@ func (r *UserRepositoryImpl) Count(ctx context.Context, filters map[string]inter
 	err := query.Count(&count).Error
 	return count, err
 }
-
-func (r *UserRepositoryImpl) UpdateFcmToken(ctx context.Context, id uuid.UUID, fcmToken string) error {
-	return r.db.WithContext(ctx).Model(&entities.User{}).
-		Where("id = ?", id).
-		Update("fcm_token", fcmToken).Error
-}
-
-func (r *UserRepositoryImpl) GetUsersWithFcmTokenByOrganization(ctx context.Context, organizationID uuid.UUID) ([]*entities.User, error) {
-	var users []*entities.User
-	err := r.db.WithContext(ctx).
-		Where("organization_id = ? AND is_active = ? AND fcm_token IS NOT NULL AND fcm_token != ''", organizationID, true).
-		Find(&users).Error
-	return users, err
-}

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 {
@@ -46,12 +47,17 @@ type Router struct {
 	customerAuthHandler               *handler.CustomerAuthHandler
 	customerPointsHandler             *handler.CustomerPointsHandler
 	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, selfOrderHandler *handler.SelfOrderHandler) *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, 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,
@@ -70,7 +76,7 @@ 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, cfg.Server.BaseUrl),
+		tableHandler:                      handler.NewTableHandler(tableService, tableValidator, cfg.Server.SelfOrderUrl),
 		unitHandler:                       handler.NewUnitHandler(unitService),
 		ingredientHandler:                 handler.NewIngredientHandler(ingredientService),
 		productRecipeHandler:              handler.NewProductRecipeHandler(productRecipeService),
@@ -90,7 +96,12 @@ func NewRouter(cfg *config.Config, healthHandler *handler.HealthHandler, authSer
 		authMiddleware:                    authMiddleware,
 		customerAuthMiddleware:            customerAuthMiddleware,
 		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,
 	}
 }
 
@@ -153,7 +164,7 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 			selfOrder.GET("/categories", r.selfOrderHandler.ListCategories)
 			selfOrder.GET("/menu", r.selfOrderHandler.GetMenu)
 			selfOrder.POST("/orders", r.selfOrderHandler.CreateOrder)
-			selfOrder.GET("/orders/:sessionId", r.selfOrderHandler.GetOrdersBySession)
+			selfOrder.GET("/orders/:session_id", r.selfOrderHandler.GetOrdersBySession)
 		}
 
 		organizations := v1.Group("/organizations")
@@ -219,11 +230,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)
@@ -254,19 +277,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")
@@ -307,6 +330,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)
@@ -425,6 +449,16 @@ 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("/: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())
 			{
@@ -571,6 +605,42 @@ func (r *Router) addAppRoutes(rg *gin.Engine) {
 				// Reports
 				outlets.GET("/:outlet_id/reports/daily-transaction.pdf", r.reportHandler.GetDailyTransactionReportPDF)
 			}
+
+			// User device routes - accessible by authenticated users for their own devices
+			userDevices := protected.Group("/user-devices")
+			{
+				userDevices.POST("/register", r.userDeviceHandler.RegisterDevice)
+				userDevices.GET("/me", r.userDeviceHandler.GetMyDevices)
+				userDevices.GET("/:id", r.userDeviceHandler.GetDevice)
+				userDevices.PUT("/:id", r.userDeviceHandler.UpdateDevice)
+				userDevices.DELETE("/:id", r.userDeviceHandler.DeleteDevice)
+			}
+
+			// Admin-only user device routes
+			adminUserDevices := protected.Group("/user-devices")
+			adminUserDevices.Use(r.authMiddleware.RequireAdminOrManager())
+			{
+				adminUserDevices.GET("", r.userDeviceHandler.ListDevices)
+				adminUserDevices.GET("/user/:user_id", r.userDeviceHandler.GetDevicesByUser)
+			}
+
+			// Notification routes - authenticated users manage their own notifications
+			notifications := protected.Group("/notifications")
+			{
+				notifications.GET("", r.notificationHandler.List)
+				notifications.GET("/:id", r.notificationHandler.GetByID)
+				notifications.PUT("/:id/read", r.notificationHandler.MarkAsRead)
+				notifications.PUT("/read-all", r.notificationHandler.MarkAllAsRead)
+				notifications.DELETE("/:id", r.notificationHandler.Delete)
+			}
+
+			// Admin notification routes - send and broadcast
+			adminNotifications := protected.Group("/notifications")
+			adminNotifications.Use(r.authMiddleware.RequireAdminOrManager())
+			{
+				adminNotifications.POST("/send", r.notificationHandler.Send)
+				adminNotifications.POST("/broadcast", r.notificationHandler.Broadcast)
+			}
 		}
 	}
 }

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