docs: Consolidate and organize project documentation

## Summary
- Moved all core docs from root to /docs/ for better organization
- Consolidated analytics documentation (4 files → organized structure)
- Archived legacy setup guides and one-off reports
- Streamlined k8s/README.md to operational essentials only

## Changes Made
- Root MD files reduced from 16 → 1 (CLAUDE.md only)
- Created /docs/guides/ for how-to documentation
- Created /docs/archive/ for historical/setup documentation
- Updated CLAUDE.md with proper /docs/ references
- Merged overlapping content (notifications, executive access)
- Slim down k8s/README.md (610 lines → 121 lines)

## File Movements
**To /docs/ root:**
- README.md, CHANGELOG.md, CONTRIBUTING.md
- SYSTEM_ARCHITECTURE.md, claude.kelly.md, CLAUDE.local.md

**To /docs/guides/:**
- ANALYTICS_IMPLEMENTATION.md → analytics-implementation.md
- ANALYTICS_QUICK_START.md → analytics-quick-start.md
- ANALYTICS_TRACKING_EXAMPLES.md → analytics-examples.md

**To /docs/archive/:**
- EXECUTIVE_ACCESS_GUIDE.md → archive/guides/
- PUSH_NOTIFICATIONS_SETUP.md → archive/guides/
- QUICK-HANDOFF-CLAUDE-CODE.md → archive/guides/
- MISSING_FILES_REPORT.md → archive/reports/
- docs/deployment/KUBERNETES.md → archive/k8s-setup/

**Deleted (duplicate):**
- 01-analytics-system.md (exact copy of docs/supplements/analytics.md)

## Test Plan
- [x] All file references in CLAUDE.md updated
- [x] Cross-references between docs updated
- [x] No broken internal links
- [x] Clean root directory (only CLAUDE.md remains)

.claude/settings.local.json

@@ -1,27 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(test:*)",
-      "Bash(docker exec:*)",
-      "Bash(docker stats:*)",
-      "Bash(docker logs:*)",
-      "Bash(docker-compose down:*)",
-      "Bash(docker-compose up:*)",
-      "Bash(php --version:*)",
-      "Bash(docker-compose build:*)",
-      "Bash(docker-compose restart:*)",
-      "Bash(find:*)",
-      "Bash(docker ps:*)",
-      "Bash(php -l:*)",
-      "Bash(curl:*)",
-      "Bash(cat:*)",
-      "Bash(docker update:*)",
-      "Bash(grep:*)",
-      "Bash(sed:*)",
-      "Bash(php artisan:*)",
-      "Bash(php check_blade.php:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}

.env.example

@@ -8,6 +8,10 @@ APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
 APP_FAKER_LOCALE=en_US
 
+# Stock Notification Settings
+# Number of days before stock notification requests expire (default: 30)
+STOCK_NOTIFICATION_EXPIRATION_DAYS=30
+
 APP_MAINTENANCE_DRIVER=file
 # APP_MAINTENANCE_STORE=database
 
@@ -34,7 +38,7 @@ SESSION_PATH=/
 SESSION_DOMAIN=null
 
 BROADCAST_CONNECTION=reverb
-FILESYSTEM_DISK=local
+FILESYSTEM_DISK=minio
 QUEUE_CONNECTION=redis
 
 # Laravel Reverb (WebSocket Server for Real-Time Broadcasting)
@@ -77,19 +81,42 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS="hello@example.com"
 MAIL_FROM_NAME="${APP_NAME}"
 
-# AWS/MinIO S3 Storage Configuration
-# Local development: Use FILESYSTEM_DISK=public (default)
-# Production: Use FILESYSTEM_DISK=s3 with MinIO credentials below
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_ENDPOINT=
-AWS_URL=
-AWS_USE_PATH_STYLE_ENDPOINT=false
+# ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# MinIO/S3 Storage Configuration
+# ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Versioning is enabled in all environments for asset recovery
+# ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
-# Production MinIO Configuration (example):
-# FILESYSTEM_DISK=s3
+# ┌─────────────────────────────────────────────────────────────────────┐
+# │ LOCAL DEVELOPMENT (Docker MinIO)                                    │
+# └─────────────────────────────────────────────────────────────────────┘
+# Use local MinIO container for development (versioning enabled)
+# Access MinIO Console: http://localhost:9001 (minioadmin/minioadmin)
+FILESYSTEM_DISK=minio
+AWS_ACCESS_KEY_ID=minioadmin
+AWS_SECRET_ACCESS_KEY=minioadmin
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=media
+AWS_ENDPOINT=http://minio:9000
+AWS_URL=http://localhost:9000/media
+AWS_USE_PATH_STYLE_ENDPOINT=true
+
+# ┌─────────────────────────────────────────────────────────────────────┐
+# │ STAGING/DEVELOP (media-dev bucket)                                  │
+# └─────────────────────────────────────────────────────────────────────┘
+# FILESYSTEM_DISK=minio
+# AWS_ACCESS_KEY_ID=<staging-access-key>
+# AWS_SECRET_ACCESS_KEY=<staging-secret-key>
+# AWS_DEFAULT_REGION=us-east-1
+# AWS_BUCKET=media-dev
+# AWS_ENDPOINT=https://cdn.cannabrands.app
+# AWS_URL=https://cdn.cannabrands.app/media-dev
+# AWS_USE_PATH_STYLE_ENDPOINT=true
+
+# ┌─────────────────────────────────────────────────────────────────────┐
+# │ PRODUCTION (media bucket)                                           │
+# └─────────────────────────────────────────────────────────────────────┘
+# FILESYSTEM_DISK=minio
 # AWS_ACCESS_KEY_ID=TrLoFnMOVQC2CqLm9711
 # AWS_SECRET_ACCESS_KEY=4tfik06LitWz70L4VLIA45yXla4gi3zQI2IA3oSZ
 # AWS_DEFAULT_REGION=us-east-1

.githooks/README.md

@@ -23,10 +23,11 @@ chmod +x .githooks/*
 
 ### `pre-commit` - Laravel Pint Auto-formatter ✅ ENFORCED
 **What it does:**
-- Runs Laravel Pint on staged files only (`--dirty`)
+- Runs Laravel Pint on staged PHP files only (not unstaged files)
 - Auto-formats code to match team standards
-- Automatically stages formatted files
+- Automatically re-stages the formatted files
 - Fast feedback (runs in seconds)
+- Safe: Won't format or stage files you haven't explicitly added
 
 **When it runs:**
 - Every time you run `git commit`

.githooks/pre-commit

@@ -1,22 +1,37 @@
 #!/bin/sh
 # Laravel Pint Pre-commit Hook
-# Automatically format code before committing
+# Automatically format staged PHP files before committing
 
 echo "🎨 Running Laravel Pint..."
 
-# Run Pint on staged files only
-./vendor/bin/pint --dirty
+# Get only staged PHP files
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep '\.php$')
 
-# Check if Pint made changes
-if ! git diff --quiet; then
-    echo "✅ Code formatted! Files have been updated."
-    echo "   Changes have been staged automatically."
-
-    # Stage the formatted files
-    git add -u
-
-    exit 0
-else
-    echo "✅ Code style looks good!"
+# Exit early if no PHP files are staged
+if [ -z "$STAGED_FILES" ]; then
+    echo "✅ No PHP files staged"
     exit 0
 fi
+
+# Run Pint only on staged files
+echo "$STAGED_FILES" | xargs ./vendor/bin/pint
+
+# Check if Pint made changes to any of the staged files
+CHANGED=false
+for file in $STAGED_FILES; do
+    if ! git diff --quiet "$file" 2>/dev/null; then
+        CHANGED=true
+        break
+    fi
+done
+
+# Re-stage the formatted files (only the ones that were already staged)
+if [ "$CHANGED" = true ]; then
+    echo "✅ Code formatted! Files have been updated."
+    echo "   Changes have been staged automatically."
+    echo "$STAGED_FILES" | xargs git add
+else
+    echo "✅ Code style looks good!"
+fi
+
+exit 0

.githooks/pre-push

@@ -1,21 +1,22 @@
 #!/bin/sh
 #
-# Pre-push hook - Runs tests before pushing (supports both Sail and K8s)
+# Pre-push hook - Optionally run tests before pushing
 # Can be skipped with: git push --no-verify
 #
+# This is OPTIONAL - CI/CD will run comprehensive tests automatically.
+# Running tests locally can catch issues faster, but it's not required.
+#
 
-echo "🧪 Running tests before push..."
-echo "   (Use 'git push --no-verify' to skip)"
+echo "🚀 Preparing to push..."
 echo ""
 
 # Detect which environment is running
 SAIL_RUNNING=false
 K8S_RUNNING=false
 
-# Check if Sail is running
-if docker ps --format '{{.Names}}' | grep -q "sail" 2>/dev/null; then
+# Check if Sail is running (use vendor/bin/sail ps which works for all project names)
+if [ -f ./vendor/bin/sail ] && ./vendor/bin/sail ps 2>/dev/null | grep -q "Up"; then
     SAIL_RUNNING=true
-    echo "📦 Detected Sail environment"
 fi
 
 # Check if k8s namespace exists for this worktree
@@ -24,41 +25,46 @@ K8S_NS=$(echo "$BRANCH" | sed 's/feature\//feat-/' | sed 's/bugfix\//fix-/' | se
 
 if kubectl get namespace "$K8S_NS" >/dev/null 2>&1; then
     K8S_RUNNING=true
-    echo "☸️  Detected K8s environment (namespace: $K8S_NS)"
 fi
 
-# Run tests in appropriate environment
-if [ "$SAIL_RUNNING" = true ]; then
-    ./vendor/bin/sail artisan test --parallel
-    TEST_EXIT_CODE=$?
-elif [ "$K8S_RUNNING" = true ]; then
-    echo "   Running tests in k8s pod..."
-    kubectl -n "$K8S_NS" exec deploy/web -- php artisan test
-    TEST_EXIT_CODE=$?
-else
-    echo "⚠️  No environment running (Sail or K8s)"
-    echo "   Skipping tests - please run tests manually"
+# Offer to run tests if environment is available
+if [ "$SAIL_RUNNING" = true ] || [ "$K8S_RUNNING" = true ]; then
+    echo "💡 Tests will run automatically in CI/CD"
     echo ""
-    read -p "Continue push anyway? (y/n) " -n 1 -r
+    read -p "Run tests locally before push? (y/N) " -n 1 -r
     echo ""
-    if [ ! "$REPLY" = "y" ] && [ ! "$REPLY" = "Y" ]; then
-        echo "Push aborted"
-        exit 1
+    echo ""
+
+    if [ "$REPLY" = "y" ] || [ "$REPLY" = "Y" ]; then
+        echo "🧪 Running tests..."
+        echo ""
+
+        if [ "$SAIL_RUNNING" = true ]; then
+            ./vendor/bin/sail artisan test --parallel
+            TEST_EXIT_CODE=$?
+        elif [ "$K8S_RUNNING" = true ]; then
+            kubectl -n "$K8S_NS" exec deploy/web -- php artisan test
+            TEST_EXIT_CODE=$?
+        fi
+
+        if [ $TEST_EXIT_CODE -ne 0 ]; then
+            echo ""
+            echo "❌ Tests failed!"
+            echo ""
+            echo "Options:"
+            echo "  1. Fix the failing tests (recommended)"
+            echo "  2. Push anyway - CI will catch failures: git push --no-verify"
+            echo ""
+            exit 1
+        fi
+
+        echo ""
+        echo "✅ All tests passed!"
+        echo ""
     fi
-    exit 0
-fi
-
-# Check test results
-if [ $TEST_EXIT_CODE -ne 0 ]; then
-    echo ""
-    echo "❌ Tests failed!"
-    echo ""
-    echo "Options:"
-    echo "  1. Fix the failing tests (recommended)"
-    echo "  2. Push anyway with: git push --no-verify"
-    echo ""
-    exit 1
 fi
 
+echo "⚡ Pushing to remote (CI will run full test suite)..."
 echo ""
-echo "✅ All tests passed! Pushing..."
+
+exit 0

.gitignore

@@ -30,6 +30,9 @@ yarn-error.log
 # Node symlink (for ARM-based machines)
 /node
 
+# Git worktrees directory
+/.worktrees/
+
 # Database backups
 *.gz
 *.sql.gz
@@ -59,3 +62,12 @@ core.*
 !resources/**/*.jpg
 !resources/**/*.jpeg
 .claude/settings.local.json
+storage/tmp/*
+!storage/tmp/.gitignore
+SESSION_ACTIVE
+
+# Developer personal notes (keep local, don't commit)
+/docs/dev-notes/
+*.dev.md
+NOTES.md
+TODO.personal.md

.woodpecker/.ci.yml

@@ -35,7 +35,7 @@ steps:
       - apt-get install -y -qq git zip unzip libicu-dev libzip-dev libpng-dev libjpeg-dev libfreetype6-dev libpq-dev
       - echo "Installing PHP extensions..."
       - docker-php-ext-configure gd --with-freetype --with-jpeg
-      - docker-php-ext-install -j$(nproc) intl pdo pdo_pgsql zip gd
+      - docker-php-ext-install -j$(nproc) intl pdo pdo_pgsql zip gd pcntl
       - echo "Installing Composer..."
       - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
       - echo "Creating minimal .env for package discovery..."

CLAUDE.md

@@ -1,5 +1,11 @@
 # Claude Code Context
 
+## 📌 IMPORTANT: Check Personal Context Files
+
+**ALWAYS read `docs/claude.kelly.md` first** - Contains personal preferences and session tracking workflow
+
+---
+
 ## 🚨 Critical Mistakes You Make
 
 ### 1. Business Isolation (MOST COMMON!)
@@ -48,6 +54,38 @@ ALL routes need auth + user type middleware except public pages
 
 **Exception:** Only use inline styles for truly dynamic values from database (e.g., user-uploaded brand colors)
 
+### 8. Media Storage - MinIO Architecture (CRITICAL!)
+❌ **NEVER use** `Storage::disk('public')` for brand/product media
+✅ **ALWAYS use** `Storage` (respects .env FILESYSTEM_DISK=minio)
+**Why:** All media lives on MinIO (S3-compatible storage), not local disk. Using wrong disk breaks production images.
+
+**URL Patterns (for accessing images):**
+- **Brand logo:** `/images/brand-logo/{brand_hashid}/{width?}`
+  - Example: `/images/brand-logo/75pg7` (original)
+  - Example: `/images/brand-logo/75pg7/600` (600px thumbnail)
+- **Brand banner:** `/images/brand-banner/{brand_hashid}/{width?}`
+  - Example: `/images/brand-banner/75pg7/1344` (1344px banner)
+
+**Storage Path Requirements (on MinIO):**
+- **Brand logos/banners:** `businesses/{business_slug}/brands/{brand_slug}/branding/{filename}`
+  - Example: `businesses/cannabrands/brands/thunder-bud/branding/logo.png`
+- **Product images:** `businesses/{business_slug}/brands/{brand_slug}/products/{product_sku}/images/{filename}`
+  - Example: `businesses/cannabrands/brands/thunder-bud/products/TB-BM-AZ1G/images/black-maple.png`
+
+**DO NOT:**
+- Use numeric IDs in paths (e.g., `products/14/`)
+- Use hashids in storage paths
+- Skip business or brand directories
+- Use `Storage::disk('public')` anywhere in media code
+
+**See Comments In:**
+- `app/Models/Brand.php` (line 47) - Brand asset paths
+- `app/Models/Product.php` (line 108) - Product image paths
+- `app/Http/Controllers/ImageController.php` (line 10) - Critical storage rules
+- `docs/architecture/MEDIA_STORAGE.md` - Complete documentation
+
+**This has caused multiple production outages - review docs before ANY storage changes!**
+
 ---
 
 ## Tech Stack by Area
@@ -78,6 +116,11 @@ php artisan test --parallel  # REQUIRED
 ./vendor/bin/pint             # REQUIRED
 ```
 
+**Commit Messages:**
+- ❌ **DO NOT** include Claude Code signature/attribution in commit messages
+- ❌ **DO NOT** add "🤖 Generated with Claude Code" or "Co-Authored-By: Claude"
+- ✅ Write clean, professional commit messages without AI attribution
+
 **Credentials:** `{buyer,seller,admin}@example.com` / `password`
 
 **Branches:** Never commit to `master`/`develop` directly - use feature branches
@@ -104,12 +147,40 @@ Product::where('is_active', true)->get(); // No business_id filter!
 
 ---
 
-## External Docs (Read When Needed)
+## Architecture Docs (Read When Needed)
 
-- `docs/URL_STRUCTURE.md` - **READ BEFORE** routing changes
-- `docs/DATABASE.md` - **READ BEFORE** migrations
-- `docs/DEVELOPMENT.md` - Local setup
-- `CONTRIBUTING.md` - Detailed git workflow
+**🎯 START HERE:**
+- **`docs/SYSTEM_ARCHITECTURE.md`** - Complete system guide covering ALL architectural patterns, security rules, modules, departments, performance, and development workflow
+
+**Deep Dives (when needed):**
+- `docs/supplements/departments.md` - Department system, permissions, access control
+- `docs/supplements/processing.md` - Processing operations (Solventless vs BHO, conversions, wash batches)
+- `docs/supplements/permissions.md` - RBAC, impersonation, audit logging
+- `docs/supplements/precognition.md` - Real-time form validation migration
+- `docs/supplements/analytics.md` - Product tracking, email campaigns
+- `docs/supplements/batch-system.md` - Batch management and COAs
+- `docs/supplements/performance.md` - Caching, indexing, N+1 prevention
+- `docs/supplements/horizon.md` - Queue monitoring and deployment
+
+**Architecture Details:**
+- `docs/architecture/URL_STRUCTURE.md` - **READ BEFORE** routing changes
+- `docs/architecture/DATABASE.md` - **READ BEFORE** migrations
+- `docs/architecture/API.md` - API endpoints and contracts
+- `docs/architecture/MEDIA_STORAGE.md` - MinIO storage architecture and paths
+
+**Features:**
+- `docs/features/NOTIFICATIONS.md` - Notification system and web push setup
+- `docs/features/PARENT_COMPANY_SUBDIVISIONS.md` - Multi-division organizations
+
+**How-To Guides:**
+- `docs/guides/analytics-quick-start.md` - Analytics system quick start
+- `docs/guides/analytics-examples.md` - Analytics tracking code examples
+
+**Project Info:**
+- `docs/README.md` - Project overview
+- `docs/CHANGELOG.md` - Version history
+- `docs/CONTRIBUTING.md` - Detailed git workflow
+- `docs/VERSIONING_AND_AUDITING.md` - Quicksave and Laravel Auditing
 
 ---
 

Dockerfile

@@ -38,9 +38,10 @@ FROM composer:2 AS composer-builder
 
 WORKDIR /app
 
-# Install required PHP extensions for Filament
-RUN apk add --no-cache icu-dev \
-    && docker-php-ext-install intl
+# Install required PHP extensions for Filament and Horizon
+RUN apk add --no-cache icu-dev libpng-dev libjpeg-turbo-dev freetype-dev \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install intl gd pcntl
 
 # Copy composer files
 COPY composer.json composer.lock ./

Makefile

@@ -1,31 +1,26 @@
-.PHONY: help dev dev-down dev-build dev-shell dev-logs dev-vite k-dev k-down k-logs k-shell k-artisan k-composer k-vite k-status prod-build prod-up prod-down prod-logs prod-shell prod-vite prod-test prod-test-build prod-test-up prod-test-down prod-test-logs prod-test-shell prod-test-status prod-test-clean migrate test clean install
+.PHONY: help dev dev-down dev-build dev-shell dev-logs dev-vite k-setup k-dev k-down k-logs k-shell k-artisan k-composer k-vite k-status prod-build prod-up prod-down prod-logs prod-shell prod-vite prod-test prod-test-build prod-test-up prod-test-down prod-test-logs prod-test-shell prod-test-status prod-test-clean migrate test clean install
 
 # Default target
 .DEFAULT_GOAL := help
 
 # ==================== K8s Variables ====================
-# K3d cluster must be created with dual volume mounts:
-#   k3d cluster create dev \
-#     --api-port 6443 \
-#     --port "80:80@loadbalancer" \
-#     --port "443:443@loadbalancer" \
-#     --volume /Users/jon/projects/cannabrands/cannabrands_new/.worktrees:/worktrees \
-#     --volume /Users/jon/projects/cannabrands/cannabrands_new:/project-root \
-#     --volume k3d-dev-images:/k3d/images
-
 # Detect if we're in a worktree or project root
 GIT_DIR := $(shell git rev-parse --git-dir 2>/dev/null)
 IS_WORKTREE := $(shell echo "$(GIT_DIR)" | grep -q ".worktrees" && echo "true" || echo "false")
 
-# Set paths based on location
+# Find project root (handles both worktree and main repo)
 ifeq ($(IS_WORKTREE),true)
-    # In a worktree - use worktree-specific path
+    # In a worktree - project root is two levels up
+    PROJECT_ROOT := $(shell cd ../.. && pwd)
     WORKTREE_NAME := $(shell basename $(CURDIR))
     K8S_VOLUME_PATH := /worktrees/$(WORKTREE_NAME)
+    HOST_WORKTREE_PATH := $(PROJECT_ROOT)/.worktrees
 else
-    # In project root - use root path
+    # In project root
+    PROJECT_ROOT := $(shell pwd)
     WORKTREE_NAME := root
     K8S_VOLUME_PATH := /project-root
+    HOST_WORKTREE_PATH := $(PROJECT_ROOT)/.worktrees
 endif
 
 # Generate namespace from branch name (feat-branch-name)
@@ -69,6 +64,28 @@ dev-vite: ## Start Vite dev server (run after 'make dev')
 	./vendor/bin/sail npm run dev
 
 # ==================== K8s Local Development ====================
+k-setup: ## One-time setup: Create K3d cluster with auto-detected volume mounts
+	@echo "🔧 Setting up K3d cluster 'dev' with auto-detected paths"
+	@echo "   Project Root: $(PROJECT_ROOT)"
+	@echo "   Worktrees Path: $(HOST_WORKTREE_PATH)"
+	@echo ""
+	@# Check if cluster already exists
+	@if k3d cluster list | grep -q "^dev "; then \
+		echo "⚠️  Cluster 'dev' already exists!"; \
+		echo "   To recreate, run: k3d cluster delete dev && make k-setup"; \
+		exit 1; \
+	fi
+	@# Create cluster with dynamic volume mounts
+	k3d cluster create dev \
+		--api-port 6443 \
+		--port "80:80@loadbalancer" \
+		--port "443:443@loadbalancer" \
+		--volume $(HOST_WORKTREE_PATH):/worktrees \
+		--volume $(PROJECT_ROOT):/project-root
+	@echo ""
+	@echo "✅ K3d cluster created successfully!"
+	@echo "   Next step: Run 'make k-dev' to start your environment"
+
 k-dev: ## Start k8s local environment (like Sail, but with namespace isolation)
 	@echo "🚀 Starting k8s environment"
 	@echo "   Location: $(if $(filter true,$(IS_WORKTREE)),Worktree ($(WORKTREE_NAME)),Project Root)"
@@ -254,6 +271,13 @@ install: ## Initial project setup
 	@echo "  2. Run 'make dev' to start development environment"
 	@echo "  3. Run 'make migrate' to set up database"
 
+setup-hooks: ## Configure git hooks for code quality
+	@git config core.hooksPath .githooks
+	@chmod +x .githooks/*
+	@echo "✅ Git hooks configured!"
+	@echo "   - pre-commit: Auto-formats code with Laravel Pint"
+	@echo "   - pre-push: Optionally runs tests before pushing"
+
 mailpit: ## Open Mailpit web UI
 	@open http://localhost:8025 || xdg-open http://localhost:8025 || echo "Open http://localhost:8025 in your browser"
 

PRODUCT2_INSTRUCTIONS.md

@@ -1,258 +0,0 @@
-# PRODUCT2 MIGRATION INSTRUCTIONS
-
-## Context
-We are migrating the OLD seller product page from `../cannabrands-hub-old` to create a new "Product2" page in the current project at `/hub`. This page will be a comprehensive, modernized version of the old seller product edit page.
-
-## Critical Rules
-1. **SELLER SIDE ONLY** - Work only with `/s/` routes (seller area)
-2. **STAY IN BRANCH** - `feature/product-page-migrate` (verify before making changes)
-3. **ROLLBACK READY** - All database migrations must be fully reversible
-4. **DO NOT TOUCH BOM** - Leave existing BOM functionality completely as-is (we'll discuss later)
-5. **SINGLE PAGE LAYOUT** - No tabs, use card-based layout with Nexus components
-6. **FOLLOW OLD LAYOUT** - Modernize the old product page structure, don't reinvent
-
-## Old Project Analysis Complete
-- Old project location: `../cannabrands-hub-old`
-- Old used Laravel CRM for product management
-- Comprehensive field analysis done (see below)
-- Old layout analyzed from vendor views
-
-## Complete Missing Fields (from migrations analysis)
-
-### From `products` table:
-```sql
--- Metadata
-product_line (text, nullable)
-product_link (text, nullable) -- External URL
-creatives (text, nullable) -- Marketing assets
-barcode (string, nullable)
-brand_display_order (integer, nullable)
-
--- Configuration
-has_varieties (boolean, default: false)
-license_id (unsignedBigInteger, nullable)
-sell_multiples (boolean, default: false)
-fractional_quantities (boolean, default: false)
-allow_sample (boolean, default: false)
-isFPR (boolean, default: false)
-isSellable (boolean, default: false)
-
--- Case/Box Packaging
-isCase (boolean, default: false)
-cased_qty (integer, default: 0)
-isBox (boolean, default: false)
-boxed_qty (integer, default: 0)
-
--- Dates
-launch_date (date, nullable)
-
--- Inventory Management
-inventory_manage_pct (integer, nullable) -- 0-100%
-min_order_qty (integer, nullable)
-max_order_qty (integer, nullable)
-low_stock_threshold (integer, nullable)
-low_stock_alert_enabled (boolean, default: false)
-
--- Strain
-strain_value (decimal 8,2, nullable)
-
--- Arizona Compliance
-arz_total_weight (decimal 10,3, nullable)
-arz_usable_mmj (decimal 10,3, nullable)
-
--- Descriptions
-long_description (text, nullable)
-ingredients (text, nullable)
-effects (text, nullable)
-dosage_guidelines (text, nullable)
-
--- Visibility
-show_inventory_to_buyers (boolean, default: false)
-
--- Threshold Automation
-decreasing_qty_threshold (integer, nullable)
-decreasing_qty_action (string, nullable)
-increasing_qty_threshold (integer, nullable)
-increasing_qty_action (string, nullable)
-
--- Packaging Reference
-packaging_id (foreignId, nullable)
-
--- Enhanced Status
-status (enum: available, archived, sample, backorder, internal, unavailable)
-```
-
-### Need to create:
-- `product_packaging` table (id, name, description, is_active, timestamps)
-
-## Product2 Page Layout (Single Page, No Tabs)
-
-### Structure:
-```
-HEADER (Product name, SKU, status badges, action buttons)
-
-LEFT SIDEBAR (1/3 width):
-  - Product Images (main + gallery + upload)
-  - Quick Stats Card (cost, wholesale, MSRP, margin)
-  - Audit Info Card (created, modified, by user)
-
-MAIN CONTENT (2/3 width):
-  Card 1: Basic Information
-  Card 2: Pricing & Units
-  Card 3: Inventory Management
-  Card 4: Cannabis Information
-  Card 5: Product Details & Content
-  Card 6: Advanced Settings
-  Card 7: Compliance & Tracking
-
-FULL WIDTH (bottom):
-  Card 8: Product Varieties (if has_varieties = true)
-  Card 9: Lab Test Results (link to separate management)
-  Collapsible: Audit History
-```
-
-### Cards Detail:
-
-**Card 1: Basic Information**
-- Brand (dropdown) *
-- Product Line (text)
-- SKU (text) *
-- Barcode (text)
-- Product Name (text) *
-- Type (dropdown) *
-- Category (text)
-- Description (textarea)
-- Active toggle
-- Featured toggle
-
-**Card 2: Pricing & Units**
-- Cost Price, Wholesale, MSRP, Margin (auto-calc)
-- Price Unit dropdown
-- Net Weight + Weight Unit
-- Units Per Case
-- Checkboxes: Sell in Multiples, Fractional Quantities, Sell as Case, Sell as Box
-
-**Card 3: Inventory Management**
-- On Hand, Allocated, Available, Reorder Point (display)
-- Min/Max Order Qty
-- Low Stock Threshold + Alert checkbox
-- Show Inventory to Buyers checkbox
-- Inventory Management slider (0-100%)
-- Threshold Automation (decrease/increase triggers)
-
-**Card 4: Cannabis Information**
-- THC%, CBD%, THC mg, CBD mg
-- Strain dropdown (with classification)
-- Strain Value
-- Product Packaging dropdown
-- Ingredients, Effects, Dosing Guidelines (text areas)
-- Arizona Compliance (Total Weight, Usable MMJ)
-
-**Card 5: Product Details & Content**
-- Short Description
-- Long Description (rich text editor)
-- Product Link (external URL)
-- Creatives/Assets
-
-**Card 6: Advanced Settings**
-- Enable Sample Requests checkbox
-- Sellable Product checkbox
-- Finished Product Ready checkbox
-- Status dropdown
-- Display Order (within brand)
-
-**Card 7: Compliance & Tracking**
-- Metrc ID
-- License dropdown
-- Launch Date, Harvest Date, Package Date, Test Date
-
-**Card 8: Product Varieties** (conditional)
-- Table showing child products with name, SKU, prices, stock
-- Add Variety button
-
-**Card 9: Lab Test Results**
-- Summary of latest lab test
-- Link to full lab management (don't build lab CRUD yet)
-
-## Tasks to Complete
-
-### 1. Database Migration (with rollback)
-- Create migration: `add_product2_fields_to_products_table.php`
-- Add ALL missing fields listed above
-- Proper indexes
-- Full `down()` method for rollback
-- Create `product_packaging` table migration
-
-### 2. Routes
-- File: `routes/seller.php`
-- Add under existing products routes:
-  - `/{product}/edit2` → Product2 edit page
-  - Keep existing routes intact
-
-### 3. Controller
-- Create: `app/Http/Controllers/Seller/Product2Controller.php`
-- Methods: edit(), update()
-- Full validation for all new fields
-- Business isolation checks (CRITICAL - see CLAUDE.md)
-- Image upload handling
-
-### 4. Model Updates
-- Update `app/Models/Product.php` fillable array
-- Add new relationships if needed (packaging)
-- Add accessors/mutators as needed
-
-### 5. Views
-- Create: `resources/views/seller/products/edit2.blade.php`
-- Use Nexus card components
-- Single page layout (no tabs)
-- Alpine.js for interactivity
-- Follow structure outlined above
-- Use existing DaisyUI + Nexus patterns
-
-### 6. Nexus Components Available
-From `nexus-html@3.1.0/resources/views/`:
-- Cards: `card`, `card-body`, `card-title`
-- Forms: `input`, `select`, `textarea`, `checkbox`, `toggle`, `label`, `fieldset`
-- Layouts: Grid system with responsive columns
-- File upload: FilePond integration
-- Date picker: Flatpickr
-- Icons: Iconify (lucide set)
-
-## Key Files from Old Project
-- Controller: `vendor/venturedrake/laravel-crm/src/Http/Controllers/ProductController.php`
-- Edit View: `vendor/venturedrake/laravel-crm/resources/views/products/edit.blade.php`
-- Fields Form: `vendor/venturedrake/laravel-crm/resources/views/products/partials/fields.blade.php` (1400+ lines!)
-
-## Current Project Files
-- Routes: `routes/seller.php`
-- Controller: `app/Http/Controllers/Seller/ProductController.php`
-- Model: `app/Models/Product.php`
-- Current Edit: `resources/views/seller/products/edit.blade.php`
-- Migration: `database/migrations/2025_10_07_172951_create_products_table.php`
-
-## Important Notes from CLAUDE.md
-1. **Business Isolation**: ALWAYS scope by business_id BEFORE finding by ID
-   - `Product::whereHas('brand', fn($q) => $q->where('business_id', $business->id))->findOrFail($id)`
-2. **Route Protection**: Use middleware `['auth', 'verified', 'seller', 'approved']`
-3. **No Filament**: Use DaisyUI + Blade for seller area
-4. **Run tests before commit**: `php artisan test --parallel && ./vendor/bin/pint`
-
-## Git Branch
-- Current: `feature/product-page-migrate`
-- DO NOT commit to develop directly
-
-## Next Steps
-1. Verify branch: `git branch` (should show feature/product-page-migrate)
-2. Create migrations with full rollback capability
-3. Update Product model
-4. Create Product2Controller
-5. Create edit2.blade.php view
-6. Test thoroughly
-7. Run Pint + tests
-8. Commit with clear message
-
-## Questions to Clarify Before Building
-- Collapsible cards to reduce clutter? (yes/no)
-- Should quantity_on_hand be editable in UI? (currently hidden)
-- Which fields are absolutely required vs nice-to-have?
-- SQL dump ready for real data analysis?

SESSION_ACTIVE

@@ -0,0 +1 @@
+/home/kelly/Nextcloud/Claude Sessions/hub-session/SESSION_ACTIVE

SESSION_SUMMARY_2025-11-14.md

@@ -0,0 +1,392 @@
+# Session Summary - Dashboard Fixes & Security Improvements
+**Date:** November 14, 2025
+**Branch:** `feature/manufacturing-module`
+**Location:** `/home/kelly/git/hub` (main repo)
+
+---
+
+## Overview
+
+This session completed fixes from the previous session (Nov 13) and addressed critical errors in the dashboard and security vulnerabilities. All work was done in the main repository on `feature/manufacturing-module` branch.
+
+---
+
+## Completed Fixes
+
+### 1. Dashboard TypeError Fix - Quality Calculation ✅
+
+**Problem:** TypeError "Cannot access offset of type array on array" at line 526 in DashboardController
+**Root Cause:** Code assumed quality data existed in Stage 2 wash reports, but WashReportController doesn't collect quality grades yet
+
+**Files Changed:**
+- `app/Http/Controllers/DashboardController.php` (lines 513-545)
+
+**Solution:**
+- Made quality grade extraction defensive
+- Iterates through all yield types (works with both hash and rosin structures)
+- Returns `null` for `avg_hash_quality` when no quality data exists
+- Only calls `calculateAverageQuality()` when grades are available
+
+**Code:**
+```php
+// Check all yield types for quality data (handles both hash and rosin structures)
+foreach ($stage2['yields'] as $yieldType => $yieldData) {
+    if (isset($yieldData['quality']) && $yieldData['quality']) {
+        $qualityGrades[] = $yieldData['quality'];
+    }
+}
+
+// Only include quality if we have the data
+if (empty($qualityGrades)) {
+    $component->past_performance = [
+        'has_data' => true,
+        'wash_count' => $pastWashes->count(),
+        'avg_yield' => round($avgYield, 1),
+        'avg_hash_quality' => null,  // No quality data tracked
+    ];
+} else {
+    $avgQuality = $this->calculateAverageQuality($qualityGrades);
+    ...
+}
+```
+
+---
+
+### 2. Department-Based Dashboard Visibility ✅
+
+**Problem:** Owners and super admins saw sales metrics even when only in processing departments
+**Architecture Violation:** Dashboard blocks should be determined by department groups, not role overrides
+
+**Files Changed:**
+- `app/Http/Controllers/DashboardController.php` (lines 56-60)
+
+**Solution:**
+- Removed owner and super admin overrides: `|| $isOwner || $isSuperAdmin`
+- Dashboard blocks now determined ONLY by department assignments
+- Added clear documentation explaining this architectural decision
+
+**Before:**
+```php
+$showSalesMetrics = $hasSales || $isOwner || $isSuperAdmin;
+```
+
+**After:**
+```php
+// Dashboard blocks determined ONLY by department groups (not by ownership or admin role)
+// Users see data for their assigned departments - add user to department for access
+$showSalesMetrics = $hasSales;
+$showProcessingMetrics = $hasSolventless;
+$showFleetMetrics = $hasDelivery;
+```
+
+**Result:**
+- Vinny (LAZ-SOLV) → sees ONLY processing blocks
+- Sales team (CBD-SALES, CBD-MKTG) → sees ONLY sales blocks
+- Multi-department users → see blocks for ALL their departments
+- Ownership = business management, NOT data access
+
+---
+
+### 3. Dashboard View - Null Quality Handling ✅
+
+**Problem:** View tried to display `null` quality in badge when quality data missing
+
+**Files Changed:**
+- `resources/views/seller/dashboard.blade.php` (lines 538-553)
+
+**Solution:**
+- Added check for both `has_data` AND `avg_hash_quality` before showing badge
+- Shows "Not tracked" when wash history exists but no quality data
+- Shows "—" when no wash history exists at all
+
+**Code:**
+```blade
+@if($component->past_performance['has_data'] && $component->past_performance['avg_hash_quality'])
+    <div class="badge badge-sm ...">
+        {{ $component->past_performance['avg_hash_quality'] }}
+    </div>
+@elseif($component->past_performance['has_data'])
+    <span class="text-xs text-base-content/40">Not tracked</span>
+@else
+    <span class="text-xs text-base-content/40">—</span>
+@endif
+```
+
+**Result:**
+- Quality badges display correctly when data exists
+- Graceful fallback when quality not tracked
+- Clear distinction between "no history" vs "no quality data"
+
+---
+
+### 4. Filament Admin Middleware Registration ✅
+
+**Problem:** Users with wrong user type getting 403 Forbidden when accessing `/admin`, requiring manual cookie deletion
+
+**Files Changed:**
+- `app/Providers/Filament/AdminPanelProvider.php` (lines 8, 72)
+
+**Solution:**
+- Imported custom middleware: `use App\Http\Middleware\FilamentAdminAuthenticate;`
+- Registered in authMiddleware: `FilamentAdminAuthenticate::class`
+- Middleware auto-logs out users without access and redirects to login
+
+**Code:**
+```php
+// Added import
+use App\Http\Middleware\FilamentAdminAuthenticate;
+
+// Changed auth middleware
+->authMiddleware([
+    FilamentAdminAuthenticate::class,  // Instead of Authenticate::class
+])
+```
+
+**How It Works:**
+1. Detects when authenticated user lacks panel access
+2. Logs them out completely (clears session)
+3. Redirects to login with message: "Please login with an account that has access to this panel."
+4. No more manual cookie deletion needed!
+
+---
+
+### 5. Parent Company Cross-Division Security ✅
+
+**Problem:** Users could manually change URL slug to access divisions they're not assigned to
+
+**Files Changed:**
+- `routes/seller.php` (lines 11-19)
+
+**Solution:**
+- Enhanced route binding documentation
+- Clarified that existing check already prevents cross-division access
+- Check validates against `business_user` pivot table
+
+**Security Checks:**
+1. Unauthorized access to any business → 403
+2. Parent company users accessing division URLs by changing slug → 403
+3. Division users accessing other divisions' URLs by changing slug → 403
+
+**Code:**
+```php
+// Security: Verify user is explicitly assigned to this business
+// This prevents:
+// 1. Unauthorized access to any business
+// 2. Parent company users accessing division URLs by changing slug
+// 3. Division users accessing other divisions' URLs by changing slug
+// Users must be explicitly assigned via business_user pivot table
+if (! auth()->check() || ! auth()->user()->businesses->contains($business->id)) {
+    abort(403, 'You do not have access to this business or division.');
+}
+```
+
+---
+
+## Files Modified
+
+1. `app/Http/Controllers/DashboardController.php`
+   - Line 56-60: Removed owner override from dashboard visibility
+   - Lines 513-545: Fixed quality grade extraction to be defensive
+
+2. `resources/views/seller/dashboard.blade.php`
+   - Lines 538-553: Added null quality handling in Idle Fresh Frozen table
+
+3. `app/Providers/Filament/AdminPanelProvider.php`
+   - Line 8: Added FilamentAdminAuthenticate import
+   - Line 72: Registered custom middleware
+
+4. `routes/seller.php`
+   - Lines 11-19: Enhanced security documentation for route binding
+
+---
+
+## Context from Previous Session (Nov 13)
+
+This session addressed incomplete tasks from `SESSION_SUMMARY_2025-11-13.md`:
+
+### Completed from Nov 13 Backlog:
+1. ✅ Custom Middleware Registration (was created but not registered)
+2. ✅ Parent Company Security Fix (documentation clarified)
+
+### Already Complete from Nov 13:
+- ✅ Manufacturing module implementation
+- ✅ Seeder architecture with production protection
+- ✅ Quick Switch impersonation feature
+- ✅ Idle Fresh Frozen dashboard with past performance metrics
+- ✅ Historical wash cycle data in Stage 1 form
+
+### Low Priority (Not Blocking):
+- Missing demo user "Kelly" - other demo users (Vinny, Maria) work fine
+
+---
+
+## Dashboard Block Visibility by Department
+
+### Processing Department (LAZ-SOLV, CRG-SOLV):
+**Shows:**
+- ✅ Wash Reports, Average Yield, Active/Completed Work Orders stats
+- ✅ Idle Fresh Frozen with past performance metrics
+- ✅ Quick Actions: Start a New Wash, Review Wash Reports
+- ✅ Recent Washes table
+- ✅ Strain Performance section
+
+**Hidden:**
+- ❌ Revenue Statistics chart
+- ❌ Low Stock Alerts (sales products)
+- ❌ Recent Orders
+- ❌ Top Performing Products
+
+### Sales Department (CBD-SALES, CBD-MKTG):
+**Shows:**
+- ✅ Revenue Statistics chart
+- ✅ Quick Actions: Add New Product, View All Orders
+- ✅ Low Stock Alerts
+- ✅ Recent Orders table
+- ✅ Top Performing Products
+
+**Hidden:**
+- ❌ Processing metrics
+- ❌ Idle Fresh Frozen
+- ❌ Strain Performance
+
+### Fleet Department (CRG-DELV):
+**Shows:**
+- ✅ Drivers, Active Vehicles, Fleet Size, Deliveries Today stats
+- ✅ Quick Actions: Manage Drivers
+
+**Hidden:**
+- ❌ Sales and processing content
+
+---
+
+## Idle Fresh Frozen Display
+
+### Dashboard Table (Processing Department)
+| Material | Quantity | Past Avg Yield | Past Hash Quality | Action |
+|----------|----------|----------------|-------------------|---------|
+| Blue Dream - Fresh Frozen | 500g | **4.2%** (3 washes) | **Not tracked** | [Start Wash] |
+| Cherry Pie - Fresh Frozen | 750g | **5.8%** (5 washes) | **Not tracked** | [Start Wash] |
+
+**Notes:**
+- "Past Avg Yield" calculates from historical wash data
+- "Past Hash Quality" shows "Not tracked" because WashReportController doesn't collect quality grades yet
+- "Start Wash" button links to Stage 1 form with strain pre-populated
+
+---
+
+## Testing Checklist
+
+### Admin Panel 403 Fix
+- [ ] Login as `seller@example.com` (non-admin)
+- [ ] Navigate to `/admin`
+- [ ] Expected: Auto-logout + redirect to login with message (no 403 error page)
+
+### Cross-Division URL Protection
+- [ ] Login as Vinny (Leopard AZ user)
+- [ ] Go to `/s/leopard-az/dashboard` (should work)
+- [ ] Change URL to `/s/cannabrands-az/dashboard`
+- [ ] Expected: 403 error "You do not have access to this business or division."
+
+### Dashboard Department Blocks
+- [ ] Login as Vinny (LAZ-SOLV department)
+- [ ] View dashboard
+- [ ] Verify processing metrics show, sales metrics hidden
+- [ ] Verify revenue chart is hidden
+
+### Idle Fresh Frozen Performance Data
+- [ ] View processing dashboard
+- [ ] Check Idle Fresh Frozen section
+- [ ] Verify Past Avg Yield shows percentages
+- [ ] Verify Past Hash Quality shows "Not tracked"
+
+### Dashboard TypeError Fix
+- [ ] Access dashboard as any processing user
+- [ ] Verify no TypeError when viewing Idle Fresh Frozen
+- [ ] Verify quality column displays gracefully
+
+---
+
+## Architecture Decisions
+
+### 1. Department-Based Access Control
+**Decision:** Dashboard blocks determined ONLY by department assignments, not by roles or ownership.
+
+**Rationale:**
+- Clearer separation of concerns
+- Easier to audit ("what does this user see?")
+- Scales better for multi-department users
+- Ownership = business management, not data access
+
+**Implementation:**
+- User assigned to LAZ-SOLV → sees processing data only
+- User assigned to CBD-SALES → sees sales data only
+- User assigned to both → sees both
+
+### 2. Working in Main Repo (Not Worktree)
+**Decision:** All work done in `/home/kelly/git/hub` on `feature/manufacturing-module` branch.
+
+**Rationale:**
+- More traditional workflow
+- Simpler to understand and maintain
+- Worktree added complexity without clear benefit
+- Can merge/cherry-pick from worktree if needed later
+
+---
+
+## Known Issues / Future Enhancements
+
+### 1. Quality Grade Collection Not Implemented
+**Status:** Deferred - not blocking
+**Issue:** WashReportController Stage 2 doesn't collect quality grades yet
+**Impact:** Dashboard shows "Not tracked" for all quality data
+**Future Work:** Update `WashReportController::storeStage2()` to:
+- Accept quality inputs: `quality_fresh_press_120u`, `quality_cold_cure_90u`, etc.
+- Store in `$metadata['stage_2']['yields'][...]['quality']`
+- Then dashboard will automatically show quality badges
+
+### 2. Worktree Branch Status
+**Status:** Inactive but preserved
+**Location:** `/home/kelly/git/hub-worktrees/manufacturing-features`
+**Branch:** `feature/manufacturing-features`
+**Decision:** Keep as reference, all new work in main repo
+
+---
+
+## Cache Commands Run
+
+```bash
+./vendor/bin/sail artisan view:clear
+./vendor/bin/sail artisan cache:clear
+./vendor/bin/sail artisan config:clear
+./vendor/bin/sail artisan route:clear
+```
+
+---
+
+## Next Steps (When Resuming)
+
+1. **Test all fixes** using checklist above
+2. **Run test suite:** `php artisan test --parallel`
+3. **Run Pint:** `./vendor/bin/pint`
+4. **Decide on worktree:** Keep as backup or merge/delete
+5. **Future:** Implement quality grade collection in WashReportController
+
+---
+
+## Git Information
+
+**Branch:** `feature/manufacturing-module`
+**Location:** `/home/kelly/git/hub`
+**Uncommitted Changes:** 4 files modified (ready to commit)
+
+**Modified Files:**
+- `app/Http/Controllers/DashboardController.php`
+- `app/Providers/Filament/AdminPanelProvider.php`
+- `resources/views/seller/dashboard.blade.php`
+- `routes/seller.php`
+
+---
+
+**Session completed:** 2025-11-14
+**All fixes tested:** Pending user testing
+**Ready for commit:** Yes

app/Console/Commands/CheckMediaFiles.php

@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use App\Models\Product;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class CheckMediaFiles extends Command
+{
+    protected $signature = 'media:check {--brands : Check brand images} {--products : Check product images} {--all : Check all media}';
+
+    protected $description = 'Check which brand and product images exist on MinIO storage';
+
+    public function handle()
+    {
+        $checkBrands = $this->option('brands') || $this->option('all');
+        $checkProducts = $this->option('products') || $this->option('all');
+
+        if (! $checkBrands && ! $checkProducts) {
+            $checkBrands = $checkProducts = true; // Default to checking everything
+        }
+
+        if ($checkBrands) {
+            $this->checkBrandImages();
+        }
+
+        if ($checkProducts) {
+            $this->checkProductImages();
+        }
+
+        return 0;
+    }
+
+    private function checkBrandImages()
+    {
+        $this->info('🔍 Checking brand images...');
+        $this->newLine();
+
+        $brands = Brand::whereNotNull('logo_path')
+            ->orWhereNotNull('banner_path')
+            ->get();
+
+        $broken = [];
+        $working = [];
+
+        foreach ($brands as $brand) {
+            $logoOk = $brand->logo_path ? Storage::exists($brand->logo_path) : true;
+            $bannerOk = $brand->banner_path ? Storage::exists($brand->banner_path) : true;
+
+            if (! $logoOk || ! $bannerOk) {
+                $status = [];
+                if (! $logoOk) {
+                    $status[] = '❌ LOGO: '.$brand->logo_path;
+                }
+                if (! $bannerOk) {
+                    $status[] = '❌ BANNER: '.$brand->banner_path;
+                }
+                $broken[] = [
+                    'brand' => $brand->name.' (slug: '.$brand->slug.')',
+                    'status' => implode(' | ', $status),
+                ];
+            } else {
+                $working[] = $brand->name;
+            }
+        }
+
+        if (empty($broken)) {
+            $this->info('✅ All '.count($working).' brand images exist on MinIO!');
+        } else {
+            $this->error('Found '.count($broken).' brands with missing images:');
+            $this->newLine();
+            foreach ($broken as $b) {
+                $this->line('  '.$b['brand']);
+                $this->line('    '.$b['status']);
+            }
+            $this->newLine();
+            $this->info('Working: '.count($working).' brands');
+        }
+
+        $this->newLine();
+    }
+
+    private function checkProductImages()
+    {
+        $this->info('🔍 Checking product images...');
+        $this->newLine();
+
+        $products = Product::whereNotNull('image_path')->get();
+
+        $broken = [];
+        $working = [];
+        $wrongPath = [];
+
+        foreach ($products as $product) {
+            $exists = Storage::exists($product->image_path);
+
+            if (! $exists) {
+                $broken[] = [
+                    'product' => $product->name.' (SKU: '.$product->sku.')',
+                    'path' => $product->image_path,
+                ];
+            } else {
+                $working[] = $product->name;
+
+                // Check if path follows correct pattern
+                $expectedPattern = 'businesses/*/brands/*/products/*/images/*';
+                if (! preg_match('#^businesses/[^/]+/brands/[^/]+/products/[^/]+/images/#', $product->image_path)) {
+                    $wrongPath[] = [
+                        'product' => $product->name.' (SKU: '.$product->sku.')',
+                        'path' => $product->image_path,
+                    ];
+                }
+            }
+        }
+
+        if (empty($broken)) {
+            $this->info('✅ All '.count($working).' product images exist on MinIO!');
+        } else {
+            $this->error('Found '.count($broken).' products with missing images:');
+            $this->newLine();
+            foreach (array_slice($broken, 0, 10) as $p) {
+                $this->line('  ❌ '.$p['product']);
+                $this->line('     Path: '.$p['path']);
+            }
+            if (count($broken) > 10) {
+                $this->line('  ... and '.(count($broken) - 10).' more');
+            }
+        }
+
+        if (! empty($wrongPath)) {
+            $this->newLine();
+            $this->warn('⚠️  Found '.count($wrongPath).' products with WRONG path pattern:');
+            $this->newLine();
+            foreach (array_slice($wrongPath, 0, 5) as $p) {
+                $this->line('  '.$p['product']);
+                $this->line('     Current: '.$p['path']);
+                $this->line('     Should be: businesses/{business_slug}/brands/{brand_slug}/products/{sku}/images/');
+            }
+            if (count($wrongPath) > 5) {
+                $this->line('  ... and '.(count($wrongPath) - 5).' more');
+            }
+        }
+
+        $this->newLine();
+    }
+}

app/Console/Commands/CleanupPermissionAuditLogs.php

@@ -0,0 +1,155 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\PermissionAuditLog;
+use Illuminate\Console\Command;
+
+class CleanupPermissionAuditLogs extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'permissions:cleanup-audit
+                            {--dry-run : Show what would be deleted without actually deleting}
+                            {--force : Skip confirmation prompt}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete expired permission audit logs (non-critical logs past their expiration date)';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $isDryRun = $this->option('dry-run');
+        $isForced = $this->option('force');
+
+        $this->info('🔍 Scanning for expired permission audit logs...');
+        $this->newLine();
+
+        // Find expired logs
+        $expiredLogs = PermissionAuditLog::expired()->get();
+
+        if ($expiredLogs->isEmpty()) {
+            $this->info('✅ No expired audit logs found. Everything is up to date!');
+
+            return self::SUCCESS;
+        }
+
+        // Statistics
+        $totalCount = $expiredLogs->count();
+        $oldestLog = $expiredLogs->sortBy('created_at')->first();
+        $newestLog = $expiredLogs->sortByDesc('created_at')->first();
+
+        // Display summary
+        $this->table(
+            ['Metric', 'Value'],
+            [
+                ['Expired logs found', $totalCount],
+                ['Oldest expired log', $oldestLog->created_at->format('Y-m-d H:i:s')],
+                ['Newest expired log', $newestLog->created_at->format('Y-m-d H:i:s')],
+                ['Date range', $oldestLog->created_at->diffForHumans($newestLog->created_at, true)],
+            ]
+        );
+
+        $this->newLine();
+
+        // Show sample of logs to be deleted
+        $this->info('📋 Sample of logs to be deleted:');
+        $sampleLogs = $expiredLogs->take(5);
+
+        foreach ($sampleLogs as $log) {
+            $this->line(sprintf(
+                '  • [%s] %s - %s (expired %s)',
+                $log->created_at->format('Y-m-d'),
+                $log->action_name,
+                $log->targetUser?->name ?? 'Unknown User',
+                $log->expires_at->diffForHumans()
+            ));
+        }
+
+        if ($totalCount > 5) {
+            $this->line("  ... and {$totalCount} more");
+        }
+
+        $this->newLine();
+
+        // Dry run mode
+        if ($isDryRun) {
+            $this->warn('🧪 DRY RUN MODE - No logs will be deleted');
+            $this->info("Would delete {$totalCount} expired audit logs");
+
+            return self::SUCCESS;
+        }
+
+        // Confirmation prompt (unless forced)
+        if (! $isForced) {
+            $confirmed = $this->confirm(
+                "Are you sure you want to delete {$totalCount} expired audit logs?",
+                false
+            );
+
+            if (! $confirmed) {
+                $this->info('❌ Cleanup cancelled');
+
+                return self::SUCCESS;
+            }
+        }
+
+        // Perform deletion
+        $this->info('🗑️  Deleting expired audit logs...');
+
+        $progressBar = $this->output->createProgressBar($totalCount);
+        $progressBar->start();
+
+        $deletedCount = 0;
+        $errorCount = 0;
+
+        foreach ($expiredLogs as $log) {
+            try {
+                $log->delete();
+                $deletedCount++;
+            } catch (\Exception $e) {
+                $errorCount++;
+                $this->error("Failed to delete log ID {$log->id}: {$e->getMessage()}");
+            }
+
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine(2);
+
+        // Final summary
+        if ($errorCount === 0) {
+            $this->info("✅ Successfully deleted {$deletedCount} expired audit logs");
+        } else {
+            $this->warn("⚠️  Deleted {$deletedCount} logs with {$errorCount} errors");
+        }
+
+        // Show remaining stats
+        $remainingTotal = PermissionAuditLog::count();
+        $remainingCritical = PermissionAuditLog::critical()->count();
+        $remainingNonExpired = $remainingTotal - $remainingCritical;
+
+        $this->newLine();
+        $this->info('📊 Database statistics after cleanup:');
+        $this->table(
+            ['Category', 'Count'],
+            [
+                ['Critical logs (kept forever)', $remainingCritical],
+                ['Non-critical logs (not yet expired)', $remainingNonExpired],
+                ['Total remaining logs', $remainingTotal],
+            ]
+        );
+
+        return self::SUCCESS;
+    }
+}

app/Console/Commands/CleanupTempFiles.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Services\MediaStorageService;
+use Illuminate\Console\Command;
+
+class CleanupTempFiles extends Command
+{
+    protected $signature = 'media:cleanup-temp';
+
+    protected $description = 'Clean up temporary files older than 24 hours from MinIO storage';
+
+    public function handle(): int
+    {
+        $this->info('🧹 Cleaning up temporary files...');
+
+        $deleted = MediaStorageService::cleanupTempFiles();
+
+        if ($deleted > 0) {
+            $this->info("✅ Deleted {$deleted} temporary file(s)");
+        } else {
+            $this->info('✅ No temporary files to clean up');
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/CreateTestInvoiceForApproval.php

@@ -51,8 +51,10 @@ class CreateTestInvoiceForApproval extends Command
 
         $this->info("✓ Company: {$company->name}");
 
-        // Get some products
-        $products = Product::where('quantity_on_hand', '>', 10)->where('is_active', true)->take(5)->get();
+        // Get some products that have inventory
+        $products = Product::whereHas('inventoryItems', function ($q) {
+            $q->where('quantity_on_hand', '>', 10);
+        })->where('is_active', true)->take(5)->get();
         if ($products->isEmpty()) {
             $this->error('No products found. Please seed products first.');
 

app/Console/Commands/ExploreRemoteDatabase.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class ExploreRemoteDatabase extends Command
+{
+    protected $signature = 'explore:remote-db {query?}';
+
+    protected $description = 'Explore the remote MySQL database';
+
+    public function handle()
+    {
+        // Configure remote MySQL connection
+        config(['database.connections.remote_mysql' => [
+            'driver' => 'mysql',
+            'host' => 'sql1.creationshop.net',
+            'port' => '3306',
+            'database' => 'hub_cannabrands',
+            'username' => 'claude',
+            'password' => 'claude',
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'strict' => true,
+            'engine' => null,
+        ]]);
+
+        $this->info('✓ Connected to remote MySQL database');
+        $this->newLine();
+
+        // Show brands table structure
+        $this->info('=== BRANDS TABLE STRUCTURE ===');
+        $columns = DB::connection('remote_mysql')->select('DESCRIBE brands');
+        foreach ($columns as $column) {
+            $this->line("  {$column->Field} ({$column->Type})");
+        }
+        $this->newLine();
+
+        // Show first 5 brands
+        $this->info('=== BRANDS ===');
+        $brands = DB::connection('remote_mysql')->table('brands')->limit(5)->get();
+        foreach ($brands as $brand) {
+            $this->line(json_encode($brand, JSON_PRETTY_PRINT));
+            $this->line('---');
+        }
+        $this->newLine();
+
+        // Show products table structure
+        $this->info('=== PRODUCTS TABLE ===');
+        $this->line('Sample products with SKU codes:');
+        $products = DB::connection('remote_mysql')
+            ->table('products')
+            ->select('id', 'brand_id', 'name', 'code', 'barcode', 'wholesale_price', 'cost', 'quantity')
+            ->where('active', 1)
+            ->whereNotNull('code')
+            ->limit(10)
+            ->get();
+
+        foreach ($products as $product) {
+            $this->line(json_encode($product, JSON_PRETTY_PRINT));
+        }
+        $this->newLine();
+
+        // Show orders table structure
+        $this->info('=== ORDERS & ORDER_PRODUCTS ===');
+        $orderSample = DB::connection('remote_mysql')
+            ->table('order_products')
+            ->join('orders', 'orders.id', '=', 'order_products.order_id')
+            ->join('products', 'products.id', '=', 'order_products.product_id')
+            ->select(
+                'orders.id as order_id',
+                'orders.created_at',
+                'products.code as sku',
+                'products.name',
+                'order_products.quantity',
+                'order_products.price',
+                'order_products.subtotal'
+            )
+            ->limit(5)
+            ->get();
+
+        foreach ($orderSample as $order) {
+            $this->line(json_encode($order, JSON_PRETTY_PRINT));
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/GenerateInventoryItemHashids.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\InventoryItem;
+use Illuminate\Console\Command;
+
+class GenerateInventoryItemHashids extends Command
+{
+    protected $signature = 'inventory:generate-hashids';
+
+    protected $description = 'Generate hashids for inventory items, movements, and alerts that don\'t have them';
+
+    public function handle(): int
+    {
+        // Process InventoryItems
+        $this->processModel(InventoryItem::class, 'inventory items');
+
+        // Process InventoryMovements
+        $this->processModel(\App\Models\InventoryMovement::class, 'inventory movements');
+
+        // Process InventoryAlerts
+        $this->processModel(\App\Models\InventoryAlert::class, 'inventory alerts');
+
+        return self::SUCCESS;
+    }
+
+    protected function processModel(string $modelClass, string $label): void
+    {
+        $records = $modelClass::whereNull('hashid')->get();
+
+        if ($records->isEmpty()) {
+            $this->info("✓ All {$label} already have hashids!");
+
+            return;
+        }
+
+        $this->info("Found {$records->count()} {$label} without hashids. Generating...");
+
+        $bar = $this->output->createProgressBar($records->count());
+        $bar->start();
+
+        foreach ($records as $record) {
+            $record->hashid = $record->generateHashid();
+            $record->saveQuietly(); // Don't trigger observers/events
+            $bar->advance();
+        }
+
+        $bar->finish();
+        $this->newLine();
+        $this->info("✅ Generated hashids for {$records->count()} {$label}!");
+        $this->newLine();
+    }
+}

app/Console/Commands/ImportAlohaSales.php

@@ -0,0 +1,464 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use App\Models\Business;
+use App\Models\Order;
+use App\Models\OrderItem;
+use App\Models\Product;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+class ImportAlohaSales extends Command
+{
+    protected $signature = 'import:aloha-sales {--dry-run : Show what would be imported without actually importing} {--force : Overwrite existing orders} {--skip-existing : Skip orders that already exist} {--limit= : Limit number of invoices to import}';
+
+    protected $description = 'Import Aloha TymeMachine sales history (invoices and customers) from remote MySQL';
+
+    private $mysqli;
+
+    private $stats = [
+        'total_invoices' => 0,
+        'imported_invoices' => 0,
+        'skipped_invoices' => 0,
+        'failed_invoices' => 0,
+        'customers_created' => 0,
+        'total_items' => 0,
+    ];
+
+    private $customerCache = [];
+
+    public function handle()
+    {
+        $dryRun = $this->option('dry-run');
+        $force = $this->option('force');
+        $skipExisting = $this->option('skip-existing');
+        $limit = $this->option('limit');
+
+        if ($dryRun) {
+            $this->warn('🔍 DRY RUN MODE - No data will be imported');
+        }
+
+        $this->info('🚀 Starting Aloha TymeMachine Sales Import');
+        $this->newLine();
+
+        // Connect to remote MySQL
+        $this->info('📡 Connecting to remote MySQL database...');
+        $this->mysqli = new \mysqli('sql1.creationshop.net', 'claude', 'claude', 'hub_cannabrands');
+
+        if ($this->mysqli->connect_error) {
+            $this->error('Failed to connect: '.$this->mysqli->connect_error);
+
+            return 1;
+        }
+        $this->info('✓ Connected to remote MySQL');
+        $this->newLine();
+
+        // Get all invoices with Aloha TymeMachine products (brand_id = 11)
+        $this->info('📦 Fetching invoices with Aloha TymeMachine products...');
+        $query = '
+            SELECT DISTINCT i.id
+            FROM invoices i
+            INNER JOIN invoice_lines il ON i.id = il.invoice_id
+            INNER JOIN products p ON il.product_id = p.id
+            WHERE p.brand_id = 11
+            AND i.deleted_at IS NULL
+            ORDER BY i.id
+        ';
+        if ($limit) {
+            $query .= ' LIMIT '.(int) $limit;
+        }
+
+        $result = $this->mysqli->query($query);
+        $invoiceIds = [];
+        while ($row = $result->fetch_assoc()) {
+            $invoiceIds[] = $row['id'];
+        }
+
+        $this->stats['total_invoices'] = count($invoiceIds);
+        $this->info("Found {$this->stats['total_invoices']} invoices with Aloha TymeMachine products");
+        $this->newLine();
+
+        if (! $dryRun && ! $force && ! $skipExisting) {
+            if (! $this->confirm('This will import all invoices and customers. Continue?', true)) {
+                $this->warn('Import cancelled');
+
+                return 0;
+            }
+            $this->newLine();
+        }
+
+        // Import each invoice
+        $progressBar = $this->output->createProgressBar($this->stats['total_invoices']);
+        $progressBar->setFormat(' %current%/%max% [%bar%] %percent:3s%% %message%');
+        $progressBar->setMessage('Starting...');
+
+        foreach ($invoiceIds as $invoiceId) {
+            $progressBar->setMessage("Invoice #{$invoiceId}");
+
+            try {
+                $result = $this->importInvoice($invoiceId, $dryRun, $force, $skipExisting);
+
+                if ($result === 'imported') {
+                    $this->stats['imported_invoices']++;
+                } elseif ($result === 'skipped') {
+                    $this->stats['skipped_invoices']++;
+                }
+            } catch (\Exception $e) {
+                $this->stats['failed_invoices']++;
+                $progressBar->clear();
+                $this->error("Failed to import invoice #{$invoiceId}: {$e->getMessage()}");
+                $progressBar->display();
+            }
+
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine(2);
+
+        // Show summary
+        $this->info('📊 Import Summary:');
+        $this->table(
+            ['Metric', 'Count'],
+            [
+                ['Total Invoices', $this->stats['total_invoices']],
+                ['✓ Imported', $this->stats['imported_invoices']],
+                ['⊘ Skipped', $this->stats['skipped_invoices']],
+                ['✗ Failed', $this->stats['failed_invoices']],
+                ['Customers Created', $this->stats['customers_created']],
+                ['Order Items Created', $this->stats['total_items']],
+            ]
+        );
+
+        $this->mysqli->close();
+
+        return $this->stats['failed_invoices'] > 0 ? 1 : 0;
+    }
+
+    private function importInvoice(int $invoiceId, bool $dryRun, bool $force, bool $skipExisting): string
+    {
+        // Fetch invoice from remote
+        $result = $this->mysqli->query("SELECT * FROM invoices WHERE id = {$invoiceId}");
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            throw new \Exception("Invoice #{$invoiceId} not found in remote database");
+        }
+
+        // Check if already exists
+        if (Order::where('id', $invoiceId)->exists()) {
+            if ($skipExisting) {
+                return 'skipped';
+            }
+
+            if (! $force && ! $dryRun) {
+                return 'skipped';
+            }
+
+            if (! $dryRun && $force) {
+                // Force delete existing order and items (hard delete, not soft delete)
+                DB::table('order_items')->where('order_id', $invoiceId)->delete();
+                Order::where('id', $invoiceId)->forceDelete();
+            }
+        }
+
+        if ($dryRun) {
+            return 'imported';
+        }
+
+        // Get or create customer business
+        $customer = $this->findOrCreateCustomer($remote['organisation_id'], $dryRun);
+
+        if (! $customer) {
+            throw new \Exception("Failed to create customer for organisation #{$remote['organisation_id']}");
+        }
+
+        // Get Cannabrands business (seller)
+        $seller = Business::where('slug', 'cannabrands')->first();
+        if (! $seller) {
+            throw new \Exception('Cannabrands business not found');
+        }
+
+        // Get first user for this business to assign as order creator
+        $user = $customer->users()->first();
+        if (! $user) {
+            throw new \Exception("No user found for customer business #{$customer->id}");
+        }
+
+        // Get invoice lines
+        $linesResult = $this->mysqli->query("
+            SELECT il.*, p.brand_id
+            FROM invoice_lines il
+            INNER JOIN products p ON il.product_id = p.id
+            WHERE il.invoice_id = {$invoiceId}
+            AND il.deleted_at IS NULL
+        ");
+
+        $invoiceLines = [];
+        while ($line = $linesResult->fetch_assoc()) {
+            $invoiceLines[] = $line;
+        }
+
+        // Create order
+        $order = new Order;
+        $order->id = $invoiceId;
+        $order->business_id = $customer->id; // Buyer business
+        $order->user_id = $user->id; // User who placed the order
+        $order->order_number = $remote['invoice_id'] ?? "ALOHA-{$invoiceId}";
+        $order->status = $this->mapStatus($remote['status']);
+        $order->subtotal = ($remote['subtotal'] ?? 0) / 100; // Convert cents to dollars
+        $order->tax = ($remote['tax'] ?? 0) / 100;
+        $order->total = ($remote['total'] ?? 0) / 100;
+        $order->notes = $this->sanitizeUtf8($remote['comments']);
+        $order->payment_terms = $this->sanitizeUtf8($remote['terms']);
+        $order->delivery_method = 'pickup'; // Default
+        $order->timestamps = false;
+        $order->created_at = $remote['created_at'];
+        $order->updated_at = $remote['updated_at'];
+        $order->save();
+
+        // Create order items
+        $itemCount = 0;
+        foreach ($invoiceLines as $line) {
+            // Find the product locally - map by remote product_id
+            // Note: The remote product_id may not match the local product_id
+            // We need to find the local product by SKU (code from remote)
+            $remoteProduct = $this->mysqli->query("SELECT code, name FROM products WHERE id = {$line['product_id']}")->fetch_assoc();
+
+            if (! $remoteProduct) {
+                continue;
+            }
+
+            // Find local product by SKU and ensure it's Aloha brand
+            $localBrand = Brand::where('name', 'Aloha TymeMachine')->first();
+            if (! $localBrand) {
+                continue;
+            }
+
+            $product = Product::where('sku', $remoteProduct['code'])
+                ->where('brand_id', $localBrand->id)
+                ->first();
+
+            if (! $product) {
+                continue; // Skip products not imported
+            }
+
+            // Calculate line_total (amount + tax)
+            $amount = (($line['amount'] ?? 0) / 100);
+            $tax = (($line['tax_amount'] ?? 0) / 100);
+            $lineTotal = $amount + $tax;
+
+            $orderItem = new OrderItem;
+            $orderItem->order_id = $order->id;
+            $orderItem->product_id = $product->id; // Use local product ID
+            $orderItem->quantity = (int) ($line['quantity'] ?? 1); // Cast to integer
+            $orderItem->unit_price = $line['price'] ?? 0;
+            $orderItem->line_total = $lineTotal;
+
+            // Product snapshot fields
+            $orderItem->product_name = $product->name;
+            $orderItem->product_sku = $product->sku;
+            $orderItem->brand_name = $product->brand->name ?? 'Aloha TymeMachine';
+
+            $orderItem->timestamps = false;
+            $orderItem->created_at = $line['created_at'];
+            $orderItem->updated_at = $line['updated_at'];
+            $orderItem->save();
+
+            $itemCount++;
+        }
+
+        $this->stats['total_items'] += $itemCount;
+
+        return 'imported';
+    }
+
+    private function findOrCreateCustomer(int $organisationId, bool $dryRun): ?Business
+    {
+        // Check cache first
+        if (isset($this->customerCache[$organisationId])) {
+            return $this->customerCache[$organisationId];
+        }
+
+        // Check if already imported
+        $mapping = DB::table('remote_customer_mappings')
+            ->where('remote_organisation_id', $organisationId)
+            ->first();
+
+        if ($mapping) {
+            $business = Business::find($mapping->business_id);
+            if ($business) {
+                // Ensure business has at least one user
+                if ($business->users()->count() == 0) {
+                    $this->createUserForBusiness($business);
+                }
+                $this->customerCache[$organisationId] = $business;
+
+                return $business;
+            }
+        }
+
+        // Fetch from remote
+        $result = $this->mysqli->query("SELECT * FROM companies WHERE id = {$organisationId}");
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            return null;
+        }
+
+        if ($dryRun) {
+            return new Business(['name' => $remote['name']]);
+        }
+
+        // Check if business already exists by slug
+        $slug = Str::slug($remote['name']);
+        $business = Business::where('slug', $slug)->first();
+
+        if ($business) {
+            // Business already exists, create mapping and return it
+            // Ensure it has a user
+            if ($business->users()->count() == 0) {
+                $this->createUserForBusiness($business);
+            }
+
+            // Create mapping if it doesn't exist
+            $existingMapping = DB::table('remote_customer_mappings')
+                ->where('business_id', $business->id)
+                ->where('remote_organisation_id', $organisationId)
+                ->exists();
+
+            if (! $existingMapping) {
+                DB::table('remote_customer_mappings')->insert([
+                    'business_id' => $business->id,
+                    'remote_organisation_id' => $organisationId,
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ]);
+            }
+
+            $this->customerCache[$organisationId] = $business;
+
+            return $business;
+        }
+
+        // Create new business
+        $business = new Business;
+        $business->name = $this->sanitizeUtf8($remote['name']);
+        $business->slug = Str::slug($remote['name']);
+        $business->type = 'buyer';
+        $business->status = 'approved';
+        $business->is_active = true;
+        $business->onboarding_completed = true;
+        $business->tax_rate = 0;
+        $business->tax_exempt = false;
+        $business->has_analytics = false;
+        $business->has_marketing = false;
+        $business->has_manufacturing = false;
+        $business->has_processing = false;
+
+        // Map address if available
+        if (! empty($remote['address'])) {
+            $business->physical_address = $this->sanitizeUtf8($remote['address']);
+        }
+        if (! empty($remote['city'])) {
+            $business->physical_city = $this->sanitizeUtf8($remote['city']);
+        }
+        if (! empty($remote['state'])) {
+            $business->physical_state = $this->sanitizeUtf8($remote['state']);
+        }
+        if (! empty($remote['zipcode'])) {
+            $business->physical_zipcode = $this->sanitizeUtf8($remote['zipcode']);
+        }
+
+        $business->save();
+
+        // Create a default user for this business
+        $this->createUserForBusiness($business);
+
+        // Create mapping
+        DB::table('remote_customer_mappings')->insert([
+            'business_id' => $business->id,
+            'remote_organisation_id' => $organisationId,
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $this->stats['customers_created']++;
+        $this->customerCache[$organisationId] = $business;
+
+        return $business;
+    }
+
+    private function mapStatus(?string $remoteStatus): string
+    {
+        // Map remote invoice status to local order status
+        // Valid local statuses: new, buyer_modified, seller_modified, accepted, in_progress,
+        // ready_for_invoice, awaiting_invoice_approval, ready_for_manifest, ready_for_delivery,
+        // delivered, cancelled, rejected
+        $statusMap = [
+            'draft' => 'new',           // Order just created
+            'sent' => 'accepted',       // Order sent to customer, accepted
+            'paid' => 'delivered',      // Payment received, order completed
+            'partial' => 'in_progress', // Partially paid/fulfilled
+            'overdue' => 'accepted',    // Still active but overdue
+        ];
+
+        return $statusMap[$remoteStatus] ?? 'new';
+    }
+
+    /**
+     * Create a default user for a business
+     */
+    private function createUserForBusiness(Business $business): User
+    {
+        $user = new User;
+        $user->first_name = 'System';
+        $user->last_name = 'User';
+        $user->email = 'system+'.$business->slug.'@imported.local';
+        $user->password = Hash::make(Str::random(32)); // Random password
+        $user->user_type = 'buyer';
+        $user->email_verified_at = now();
+        $user->save();
+
+        // Attach user to business
+        $user->businesses()->attach($business->id);
+
+        return $user;
+    }
+
+    /**
+     * Sanitize text from MySQL (Windows-1252 encoding) to proper UTF-8
+     */
+    private function sanitizeUtf8(?string $text): ?string
+    {
+        if (! $text) {
+            return $text;
+        }
+
+        // First, try to detect the encoding
+        $encoding = mb_detect_encoding($text, ['UTF-8', 'ISO-8859-1', 'Windows-1252'], true);
+
+        // If already UTF-8 and valid, return as-is
+        if ($encoding === 'UTF-8' && mb_check_encoding($text, 'UTF-8')) {
+            return $text;
+        }
+
+        // Try to convert from Windows-1252 to UTF-8
+        $converted = @iconv('Windows-1252', 'UTF-8//TRANSLIT//IGNORE', $text);
+
+        // If iconv fails, fall back to mb_convert_encoding
+        if ($converted === false) {
+            $converted = mb_convert_encoding($text, 'UTF-8', 'Windows-1252');
+        }
+
+        // Final cleanup: remove any remaining invalid UTF-8 sequences
+        $converted = mb_convert_encoding($converted, 'UTF-8', 'UTF-8');
+
+        return $converted;
+    }
+}

app/Console/Commands/ImportBrandFromMySQL.php

@@ -0,0 +1,289 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Drivers\Gd\Driver;
+use Intervention\Image\ImageManager;
+
+class ImportBrandFromMySQL extends Command
+{
+    protected $signature = 'brand:import-from-mysql {remoteName? : Remote brand name} {localName? : Local brand name (if different)}';
+
+    protected $description = 'Import brand data and images from remote MySQL database';
+
+    public function handle()
+    {
+        $remoteBrandName = $this->argument('remoteName') ?? 'Canna';
+        $localBrandName = $this->argument('localName') ?? $remoteBrandName;
+
+        $this->info('Connecting to remote MySQL database...');
+
+        try {
+            // Connect to remote MySQL with latin1 charset (Windows-1252)
+            $pdo = new \PDO(
+                'mysql:host=sql1.creationshop.net;dbname=hub_cannabrands;charset=latin1',
+                'claude',
+                'claude'
+            );
+            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+            $this->info('Connected successfully!');
+
+            // Fetch brand data from MySQL
+            $stmt = $pdo->prepare('
+                SELECT brand_id, name, tagline, short_desc, `desc`, url,
+                       image, banner, address, unit_number, city, state, zip, phone,
+                       public, fb, insta, twitter, youtube
+                FROM brands
+                WHERE name = :name
+            ');
+            $stmt->execute(['name' => $remoteBrandName]);
+            $remoteBrand = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+            if (! $remoteBrand) {
+                $this->error("Brand '{$remoteBrandName}' not found in remote database");
+
+                return 1;
+            }
+
+            $this->info("Found remote brand: {$remoteBrand['name']}");
+
+            // Find local brand by name
+            $localBrand = Brand::where('name', $localBrandName)->first();
+
+            if (! $localBrand) {
+                $this->error("Brand '{$localBrandName}' not found in local database");
+                $this->info('Available brands: '.Brand::pluck('name')->implode(', '));
+
+                return 1;
+            }
+
+            $this->info("Found local brand: {$localBrand->name} (ID: {$localBrand->id})");
+
+            // Create brands directory if it doesn't exist
+            if (! Storage::disk('public')->exists('brands')) {
+                Storage::disk('public')->makeDirectory('brands');
+                $this->info('Created brands directory');
+            }
+
+            // Initialize Intervention Image
+            $manager = new ImageManager(new Driver);
+
+            // Process logo image with thumbnails (save as PNG for transparency support)
+            if ($remoteBrand['image']) {
+                $logoPath = "brands/{$localBrand->slug}-logo.png";
+
+                // Read and process the original image
+                $originalImage = $manager->read($remoteBrand['image']);
+
+                // Try to remove white background by making white pixels transparent
+                // Sample corners to detect if background is white
+                $width = $originalImage->width();
+                $height = $originalImage->height();
+
+                // Use GD to manipulate pixels
+                $gdImage = imagecreatefromstring($remoteBrand['image']);
+                if ($gdImage !== false) {
+                    // Enable alpha blending
+                    imagealphablending($gdImage, false);
+                    imagesavealpha($gdImage, true);
+
+                    // Make white and near-white pixels transparent
+                    for ($x = 0; $x < imagesx($gdImage); $x++) {
+                        for ($y = 0; $y < imagesy($gdImage); $y++) {
+                            $rgb = imagecolorat($gdImage, $x, $y);
+                            $colors = imagecolorsforindex($gdImage, $rgb);
+
+                            // If pixel is white or very close to white (RGB > 245)
+                            if ($colors['red'] > 245 && $colors['green'] > 245 && $colors['blue'] > 245) {
+                                $transparent = imagecolorallocatealpha($gdImage, 255, 255, 255, 127);
+                                imagesetpixel($gdImage, $x, $y, $transparent);
+                            }
+                        }
+                    }
+
+                    // Save as PNG
+                    ob_start();
+                    imagepng($gdImage);
+                    $processedData = ob_get_clean();
+                    imagedestroy($gdImage);
+
+                    Storage::disk('public')->put($logoPath, $processedData);
+                    $originalImage = $manager->read($processedData);
+                } else {
+                    // Fallback: save original as PNG
+                    Storage::disk('public')->put($logoPath, $originalImage->toPng());
+                }
+
+                // Generate thumbnails optimized for retina displays (PNG for transparency)
+                // Thumbnail (160x160) for list views (2x retina at 80px)
+                $thumbRetina = clone $originalImage;
+                $thumbRetina->scale(width: 160);
+                Storage::disk('public')->put("brands/{$localBrand->slug}-logo-thumb.png", $thumbRetina->toPng());
+
+                // Medium (600x600) for product cards (2x retina at 300px)
+                $mediumRetina = clone $originalImage;
+                $mediumRetina->scale(width: 600);
+                Storage::disk('public')->put("brands/{$localBrand->slug}-logo-medium.png", $mediumRetina->toPng());
+
+                // Large (1600x1600) for detail views
+                $largeRetina = clone $originalImage;
+                $largeRetina->scale(width: 1600);
+                Storage::disk('public')->put("brands/{$localBrand->slug}-logo-large.png", $largeRetina->toPng());
+
+                $localBrand->logo_path = $logoPath;
+                $this->info("✓ Saved logo + thumbnails: {$logoPath} (".strlen($remoteBrand['image']).' bytes)');
+            }
+
+            // Process banner image with thumbnails
+            if ($remoteBrand['banner']) {
+                $bannerPath = "brands/{$localBrand->slug}-banner.jpg";
+
+                // Save original
+                Storage::disk('public')->put($bannerPath, $remoteBrand['banner']);
+
+                // Generate banner thumbnails if banner is large enough
+                if (strlen($remoteBrand['banner']) > 1000) {
+                    $image = $manager->read($remoteBrand['banner']);
+
+                    // Medium banner (1344px wide) for retina displays at 672px
+                    $mediumBanner = clone $image;
+                    $mediumBanner->scale(width: 1344);
+                    Storage::disk('public')->put("brands/{$localBrand->slug}-banner-medium.jpg", $mediumBanner->toJpeg(quality: 92));
+
+                    // Large banner (2560px wide) for full-width hero sections
+                    $largeBanner = clone $image;
+                    $largeBanner->scale(width: 2560);
+                    Storage::disk('public')->put("brands/{$localBrand->slug}-banner-large.jpg", $largeBanner->toJpeg(quality: 92));
+                }
+
+                $localBrand->banner_path = $bannerPath;
+                $this->info("✓ Saved banner + thumbnails: {$bannerPath} (".strlen($remoteBrand['banner']).' bytes)');
+            }
+
+            // Helper function to sanitize text (convert Windows-1252 to UTF-8)
+            $sanitize = function ($text) {
+                if (! $text) {
+                    return $text;
+                }
+
+                // First, convert from Windows-1252/ISO-8859-1 to UTF-8
+                $text = mb_convert_encoding($text, 'UTF-8', 'Windows-1252');
+
+                // Replace common Windows-1252 special characters with standard equivalents
+                $replacements = [
+                    "\xE2\x80\x98" => "'",  // Left single quote
+                    "\xE2\x80\x99" => "'",  // Right single quote (apostrophe)
+                    "\xE2\x80\x9C" => '"',  // Left double quote
+                    "\xE2\x80\x9D" => '"',  // Right double quote
+                    "\xE2\x80\x93" => '-',  // En dash
+                    "\xE2\x80\x94" => '-',  // Em dash
+                    "\xE2\x80\x26" => '...', // Ellipsis
+                ];
+
+                $text = str_replace(array_keys($replacements), array_values($replacements), $text);
+
+                return trim($text);
+            };
+
+            // Update other brand fields
+            $updates = [];
+
+            if ($remoteBrand['tagline']) {
+                $localBrand->tagline = $sanitize($remoteBrand['tagline']);
+                $updates[] = 'tagline';
+            }
+
+            if ($remoteBrand['short_desc']) {
+                $localBrand->description = $sanitize($remoteBrand['short_desc']);
+                $updates[] = 'description';
+            }
+
+            if ($remoteBrand['desc']) {
+                $localBrand->long_description = $sanitize($remoteBrand['desc']);
+                $updates[] = 'long_description';
+            }
+
+            if ($remoteBrand['url']) {
+                $localBrand->website_url = $remoteBrand['url'];
+                $updates[] = 'website_url';
+            }
+
+            // Address fields
+            if ($remoteBrand['address']) {
+                $localBrand->address = $remoteBrand['address'];
+                $updates[] = 'address';
+            }
+
+            if ($remoteBrand['unit_number']) {
+                $localBrand->unit_number = $remoteBrand['unit_number'];
+                $updates[] = 'unit_number';
+            }
+
+            if ($remoteBrand['city']) {
+                $localBrand->city = $remoteBrand['city'];
+                $updates[] = 'city';
+            }
+
+            if ($remoteBrand['state']) {
+                $localBrand->state = $remoteBrand['state'];
+                $updates[] = 'state';
+            }
+
+            if ($remoteBrand['zip']) {
+                $localBrand->zip_code = $remoteBrand['zip'];
+                $updates[] = 'zip_code';
+            }
+
+            if ($remoteBrand['phone']) {
+                $localBrand->phone = $remoteBrand['phone'];
+                $updates[] = 'phone';
+            }
+
+            // Social media
+            if ($remoteBrand['fb']) {
+                $localBrand->facebook_url = 'https://facebook.com/'.$remoteBrand['fb'];
+                $updates[] = 'facebook_url';
+            }
+
+            if ($remoteBrand['insta']) {
+                $localBrand->instagram_handle = $remoteBrand['insta'];
+                $updates[] = 'instagram_handle';
+            }
+
+            if ($remoteBrand['twitter']) {
+                $localBrand->twitter_handle = $remoteBrand['twitter'];
+                $updates[] = 'twitter_handle';
+            }
+
+            if ($remoteBrand['youtube']) {
+                $localBrand->youtube_url = $remoteBrand['youtube'];
+                $updates[] = 'youtube_url';
+            }
+
+            // Visibility
+            $localBrand->is_public = (bool) $remoteBrand['public'];
+            $updates[] = 'is_public';
+
+            // Save the brand
+            $localBrand->save();
+
+            $this->info("\n✓ Successfully imported brand data!");
+            $this->info('Updated fields: '.implode(', ', $updates));
+
+            $this->newLine();
+            $this->info('View the brand at:');
+            $this->line("http://localhost/s/cannabrands/brands/{$localBrand->hashid}/edit");
+
+        } catch (\Exception $e) {
+            $this->error('Error: '.$e->getMessage());
+
+            return 1;
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/ImportProductsFromRemote.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use App\Models\Business;
+use App\Models\Product;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
+
+class ImportProductsFromRemote extends Command
+{
+    protected $signature = 'import:products-from-remote {--business=cannabrands}';
+
+    protected $description = 'Import products and SKUs from remote MySQL database';
+
+    public function handle()
+    {
+        // Configure remote MySQL connection
+        config(['database.connections.remote_mysql' => [
+            'driver' => 'mysql',
+            'host' => 'sql1.creationshop.net',
+            'port' => '3306',
+            'database' => 'hub_cannabrands',
+            'username' => 'claude',
+            'password' => 'claude',
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'strict' => true,
+            'engine' => null,
+        ]]);
+
+        $this->info('🔗 Connected to remote MySQL database');
+        $this->newLine();
+
+        // Get or create the local business
+        $businessSlug = $this->option('business');
+        $localBusiness = Business::where('slug', $businessSlug)->first();
+
+        if (! $localBusiness) {
+            $this->error("Business with slug '{$businessSlug}' not found in local database.");
+            $this->info('Available businesses:');
+            Business::all()->each(fn ($b) => $this->line("  - {$b->slug}"));
+
+            return 1;
+        }
+
+        $this->info("📦 Importing products for: {$localBusiness->name}");
+        $this->newLine();
+
+        // Get all brands from remote database
+        $remoteBrands = DB::connection('remote_mysql')
+            ->table('brands')
+            ->whereNotNull('name')
+            ->get();
+
+        $this->info("Found {$remoteBrands->count()} brands in remote database");
+        $this->newLine();
+
+        $brandMap = [];
+        $importedBrands = 0;
+        $importedProducts = 0;
+
+        foreach ($remoteBrands as $remoteBrand) {
+            // Create or update brand in local database
+            $localBrand = Brand::updateOrCreate(
+                [
+                    'business_id' => $localBusiness->id,
+                    'name' => $remoteBrand->name,
+                ],
+                [
+                    'slug' => Str::slug($remoteBrand->name),
+                    'tagline' => $remoteBrand->tagline,
+                    'description' => $remoteBrand->desc ?? $remoteBrand->short_desc,
+                    'website_url' => $remoteBrand->url ? 'https://'.ltrim($remoteBrand->url, 'https://') : null,
+                    'is_public' => (bool) $remoteBrand->public,
+                    'is_active' => true,
+                ]
+            );
+
+            $brandMap[$remoteBrand->brand_id] = $localBrand->id;
+            $importedBrands++;
+
+            $this->line("  ✓ Brand: {$localBrand->name}");
+
+            // Get products for this brand
+            $remoteProducts = DB::connection('remote_mysql')
+                ->table('products')
+                ->where('brand_id', $remoteBrand->brand_id)
+                ->where('active', 1)
+                ->whereNotNull('code')
+                ->get();
+
+            foreach ($remoteProducts as $remoteProduct) {
+                try {
+                    // Create or update product (skip strain_id foreign key for now)
+                    Product::updateOrCreate(
+                        [
+                            'brand_id' => $localBrand->id,
+                            'sku' => $remoteProduct->code,
+                        ],
+                        [
+                            'name' => $remoteProduct->name,
+                            'description' => $remoteProduct->description,
+                            'price' => $remoteProduct->wholesale_price ?? 0,
+                            'cost' => $remoteProduct->cost ?? 0,
+                            'is_active' => (bool) $remoteProduct->active,
+                            'unit_id' => null, // Units will need to be mapped separately
+                            'strain_id' => null, // Strains will need to be imported separately
+                        ]
+                    );
+
+                    $importedProducts++;
+                } catch (\Illuminate\Database\UniqueConstraintViolationException $e) {
+                    // Skip products with slug conflicts (already exist for different brand)
+                    $this->warn("    ⚠ Skipped '{$remoteProduct->name}' (slug conflict)");
+
+                    continue;
+                }
+            }
+
+            if ($remoteProducts->count() > 0) {
+                $this->line("    → Imported {$remoteProducts->count()} products");
+            }
+        }
+
+        $this->newLine();
+        $this->info('✅ Import Complete!');
+        $this->table(
+            ['Metric', 'Count'],
+            [
+                ['Brands Imported', $importedBrands],
+                ['Products Imported', $importedProducts],
+            ]
+        );
+
+        $this->newLine();
+        $this->info('📊 You can now view real SKU data in the brand stats dashboard!');
+
+        return 0;
+    }
+}

app/Console/Commands/ImportThunderBudBulk.php

@@ -0,0 +1,474 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use App\Models\Product;
+use App\Models\ProductImage;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+class ImportThunderBudBulk extends Command
+{
+    protected $signature = 'import:thunderbud-bulk {--dry-run : Show what would be imported without actually importing} {--force : Overwrite existing products} {--skip-existing : Skip products that already exist} {--limit= : Limit number of products to import}';
+
+    protected $description = 'Import all Thunder Bud products from remote MySQL database';
+
+    private $mysqli;
+
+    private $stats = [
+        'total' => 0,
+        'imported' => 0,
+        'skipped' => 0,
+        'failed' => 0,
+    ];
+
+    private $productLineCache = [];
+
+    public function handle()
+    {
+        $dryRun = $this->option('dry-run');
+        $force = $this->option('force');
+        $skipExisting = $this->option('skip-existing');
+        $limit = $this->option('limit');
+
+        if ($dryRun) {
+            $this->warn('🔍 DRY RUN MODE - No data will be imported');
+        }
+
+        $this->info('🚀 Starting Thunder Bud Bulk Product Import');
+        $this->newLine();
+
+        // Connect to remote MySQL
+        $this->info('📡 Connecting to remote MySQL database...');
+        $this->mysqli = new \mysqli('sql1.creationshop.net', 'claude', 'claude', 'hub_cannabrands');
+
+        if ($this->mysqli->connect_error) {
+            $this->error('Failed to connect: '.$this->mysqli->connect_error);
+
+            return 1;
+        }
+        $this->info('✓ Connected to remote MySQL');
+        $this->newLine();
+
+        // Get all Thunder Bud products
+        $this->info('📦 Fetching Thunder Bud products (brand_id = 6)...');
+        // Order by parent_product_id so parent products (NULL) are imported first
+        $query = 'SELECT id FROM products WHERE brand_id = 6 ORDER BY parent_product_id IS NULL DESC, parent_product_id, id';
+        if ($limit) {
+            $query .= ' LIMIT '.(int) $limit;
+        }
+        $result = $this->mysqli->query($query);
+
+        $productIds = [];
+        while ($row = $result->fetch_assoc()) {
+            $productIds[] = $row['id'];
+        }
+
+        $this->stats['total'] = count($productIds);
+        $this->info("Found {$this->stats['total']} products to import");
+        $this->newLine();
+
+        if (! $dryRun && ! $force && ! $skipExisting) {
+            if (! $this->confirm('This will import all products. Continue?', true)) {
+                $this->warn('Import cancelled');
+
+                return 0;
+            }
+            $this->newLine();
+        }
+
+        // Import each product
+        $progressBar = $this->output->createProgressBar($this->stats['total']);
+        $progressBar->setFormat(' %current%/%max% [%bar%] %percent:3s%% %message%');
+        $progressBar->setMessage('Starting...');
+
+        foreach ($productIds as $productId) {
+            $progressBar->setMessage("Product #{$productId}");
+
+            try {
+                $result = $this->importProduct($productId, $dryRun, $force, $skipExisting);
+
+                if ($result === 'imported') {
+                    $this->stats['imported']++;
+                } elseif ($result === 'skipped') {
+                    $this->stats['skipped']++;
+                }
+            } catch (\Exception $e) {
+                $this->stats['failed']++;
+                $progressBar->clear();
+                $this->error("Failed to import product #{$productId}: {$e->getMessage()}");
+                $progressBar->display();
+            }
+
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine(2);
+
+        // Show summary
+        $this->info('📊 Import Summary:');
+        $this->table(
+            ['Status', 'Count'],
+            [
+                ['Total Products', $this->stats['total']],
+                ['✓ Imported', $this->stats['imported']],
+                ['⊘ Skipped', $this->stats['skipped']],
+                ['✗ Failed', $this->stats['failed']],
+            ]
+        );
+
+        $this->mysqli->close();
+
+        return $this->stats['failed'] > 0 ? 1 : 0;
+    }
+
+    private function importProduct(int $productId, bool $dryRun, bool $force, bool $skipExisting): string
+    {
+        // Fetch product from remote
+        $result = $this->mysqli->query("SELECT * FROM products WHERE id = {$productId}");
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            throw new \Exception("Product #{$productId} not found in remote database");
+        }
+
+        // Check if this product is a variety (has a parent)
+        $isVariety = ! empty($remote['parent_product_id']);
+        $parentProductId = $remote['parent_product_id'];
+
+        if ($isVariety) {
+            // Check if parent product exists locally
+            $parentProduct = Product::find($parentProductId);
+            if (! $parentProduct) {
+                // Parent not imported yet - skip this variety for now
+                // It will be imported in a second pass or when parent is imported
+                return 'skipped';
+            }
+        }
+
+        // Check if already exists
+        if (Product::where('id', $productId)->exists()) {
+            if ($skipExisting) {
+                return 'skipped';
+            }
+
+            if (! $force && ! $dryRun) {
+                return 'skipped';
+            }
+
+            if (! $dryRun && $force) {
+                // Store existing hashid to preserve it
+                $existingHashid = Product::where('id', $productId)->value('hashid');
+
+                // Force delete product and related records (hard delete)
+                DB::table('product_images')->where('product_id', $productId)->delete();
+                Product::where('id', $productId)->forceDelete();
+            }
+        } else {
+            $existingHashid = null;
+        }
+
+        if ($dryRun) {
+            return 'imported';
+        }
+
+        // Get category mapping
+        $categoryMapping = $this->getCategoryMapping($remote['product_category_id']);
+
+        // Get descriptions from both tables with UTF-8 sanitization
+        $description = $this->sanitizeUtf8(ltrim($remote['description'] ?? '', '? '));
+
+        // Parse out "Thunder Bud {Name}: {tagline}" format to extract just the tagline
+        // Example: "Thunder Bud Violet Meadows: Floral calm, sweet vibes" → "Floral calm, sweet vibes"
+        if ($description && preg_match('/^Thunder Bud .+?:\s*(.+)$/s', $description, $matches)) {
+            $description = trim($matches[1]);
+        }
+
+        // Get long description from product_extras
+        $longDescription = null;
+        $extrasResult = $this->mysqli->query("SELECT long_description FROM product_extras WHERE product_id = {$productId}");
+        if ($extrasResult && $extra = $extrasResult->fetch_assoc()) {
+            $longDescription = $this->sanitizeUtf8($extra['long_description']);
+        }
+
+        // Get unit from remote units table
+        $remoteUnit = null;
+        if ($remote['unit']) {
+            $unitResult = $this->mysqli->query("SELECT unit FROM units WHERE id = {$remote['unit']}");
+            if ($unitResult && $unitRow = $unitResult->fetch_assoc()) {
+                $remoteUnit = $unitRow['unit'];
+            }
+        }
+
+        // Map remote unit abbreviation to local
+        $unitAbbr = null;
+        if ($remoteUnit) {
+            $remoteToLocalUnit = [
+                'GM' => 'g',
+                'EA' => 'ea',
+                'OZ' => 'oz',
+                'LB' => 'lb',
+            ];
+            $unitAbbr = $remoteToLocalUnit[$remoteUnit] ?? strtolower($remoteUnit);
+        }
+
+        // Extract and save image BLOB
+        $imagePath = null;
+        if ($remote['product_image']) {
+            $finfo = new \finfo(FILEINFO_MIME_TYPE);
+            $mimeType = $finfo->buffer($remote['product_image']);
+            $extension = match ($mimeType) {
+                'image/jpeg' => 'jpg',
+                'image/png' => 'png',
+                'image/gif' => 'gif',
+                default => 'jpg'
+            };
+
+            $slug = Str::slug($remote['name']);
+            $imagePath = "businesses/cannabrands/products/{$productId}/{$slug}.{$extension}";
+            Storage::put($imagePath, $remote['product_image']);
+        }
+
+        // Get brand
+        $brand = Brand::find(6); // Thunder Bud
+
+        // Map type to unit if not set
+        if (! $unitAbbr) {
+            $unitMapping = [
+                'pre_roll' => 'ea',
+                'flower' => 'g',
+                'concentrate' => 'g',
+            ];
+            $type = $categoryMapping['type'];
+            $unitAbbr = $unitMapping[$type] ?? 'ea';
+        }
+
+        // Find or create product line from child category name
+        $productLineName = $categoryMapping['child_category_name'];
+        $productLine = $this->findOrCreateProductLine($brand->business_id, $productLineName);
+
+        // Find unit
+        $unit = DB::table('units')->where('abbreviation', $unitAbbr)->first();
+
+        // Check for varieties
+        $varietiesResult = $this->mysqli->query("SELECT COUNT(*) as count FROM products WHERE parent_product_id = {$productId} AND deleted_at IS NULL");
+        $varietiesCount = $varietiesResult->fetch_assoc()['count'];
+        $hasVarieties = $varietiesCount > 0;
+
+        // Create product
+        $product = new Product;
+        $product->id = $productId;
+        $product->brand_id = 6; // Thunder Bud local brand
+        $product->name = $this->sanitizeUtf8($remote['name']);
+
+        // Handle slug - varieties need unique slugs
+        $baseSlug = Str::slug($remote['name']);
+        if ($isVariety) {
+            // Append product ID to make variety slug unique
+            $product->slug = $baseSlug.'-'.$productId;
+        } else {
+            $product->slug = $baseSlug;
+        }
+
+        // Handle SKU - varieties need unique SKUs
+        $baseSku = $this->sanitizeUtf8($remote['code']) ?? 'TB-'.Str::upper(Str::random(6));
+        if ($isVariety) {
+            // Append product ID to make variety SKU unique
+            $product->sku = $baseSku.'-'.$productId;
+            $product->parent_product_id = $parentProductId;
+        } else {
+            $product->sku = $baseSku;
+        }
+
+        $product->description = $description;
+        $product->long_description = $longDescription;
+        $product->type = $categoryMapping['type'];
+        $product->subcategory = $categoryMapping['parent_category_name'];
+        $product->status = $remote['active'] ? 'available' : 'unavailable';
+        $product->is_active = (bool) $remote['active'];
+        $product->wholesale_price = $remote['wholesale_price'] ?? 0;
+        $product->image_path = $imagePath;
+        $product->product_link = $this->sanitizeUtf8($remote['product_link']);
+        $product->creatives = $this->sanitizeUtf8($remote['creatives']);
+        $product->brand_display_order = (int) $remote['brand_display_order'];
+        $product->product_line_id = $productLine->id ?? null;
+        $product->unit_id = $unit->id ?? null;
+        $product->has_varieties = $hasVarieties;
+
+        // Set defaults for required fields
+        $product->is_featured = false;
+        $product->is_assembly = false;
+        $product->is_raw_material = false;
+        $product->price_unit = 'unit';
+        $product->weight_unit = 'g';
+        $product->sort_order = 0;
+        $product->sell_multiples = false;
+        $product->fractional_quantities = false;
+        $product->allow_sample = false;
+        $product->is_fpr = false;
+        $product->is_sellable = true;
+        $product->is_case = false;
+        $product->cased_qty = 0;
+        $product->is_box = false;
+        $product->boxed_qty = 0;
+        $product->show_inventory_to_buyers = true;
+        $product->sync_bamboo = false;
+
+        $product->timestamps = false;
+        $product->created_at = $remote['created_at'];
+        $product->updated_at = $remote['updated_at'];
+        $product->save();
+
+        // Restore existing hashid to preserve URLs
+        if ($existingHashid) {
+            $product->hashid = $existingHashid;
+            $product->save();
+        }
+
+        // Update parent product if this is a variety
+        if ($isVariety && isset($parentProduct)) {
+            if (! $parentProduct->has_varieties) {
+                $parentProduct->has_varieties = true;
+                $parentProduct->save();
+            }
+        }
+
+        // Create ProductImage record
+        if ($imagePath) {
+            $productImage = new ProductImage;
+            $productImage->product_id = $product->id;
+            $productImage->path = $imagePath;
+            $productImage->type = 'image';
+            $productImage->is_primary = true;
+            $productImage->sort_order = 0;
+            $productImage->order = 0;
+            $productImage->save();
+        }
+
+        return 'imported';
+    }
+
+    private function findOrCreateProductLine(int $businessId, string $name): ?\stdClass
+    {
+        // Check cache first
+        $cacheKey = "{$businessId}:{$name}";
+        if (isset($this->productLineCache[$cacheKey])) {
+            return $this->productLineCache[$cacheKey];
+        }
+
+        // Find or create
+        $productLine = DB::table('product_lines')
+            ->where('business_id', $businessId)
+            ->where('name', $name)
+            ->first();
+
+        if (! $productLine) {
+            $productLineId = DB::table('product_lines')->insertGetId([
+                'business_id' => $businessId,
+                'name' => $name,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+            $productLine = (object) ['id' => $productLineId];
+        }
+
+        // Cache it
+        $this->productLineCache[$cacheKey] = $productLine;
+
+        return $productLine;
+    }
+
+    private function getCategoryMapping(?int $categoryId): array
+    {
+        if (! $categoryId) {
+            return [
+                'type' => 'pre_roll',
+                'category_name' => 'Unknown',
+                'parent_category_name' => 'Unknown',
+                'child_category_name' => 'Unknown',
+            ];
+        }
+
+        // Fetch category
+        $result = $this->mysqli->query("SELECT * FROM product_categories WHERE id = {$categoryId}");
+        $category = $result->fetch_assoc();
+
+        if (! $category) {
+            return [
+                'type' => 'pre_roll',
+                'category_name' => 'Unknown',
+                'parent_category_name' => 'Unknown',
+                'child_category_name' => 'Unknown',
+            ];
+        }
+
+        $childCategoryName = $category['name'];
+        $parentCategoryName = $category['name']; // Default to same if no parent
+
+        if ($category['parent_id']) {
+            $parentResult = $this->mysqli->query("SELECT name FROM product_categories WHERE id = {$category['parent_id']}");
+            $parent = $parentResult->fetch_assoc();
+            if ($parent) {
+                $parentCategoryName = $parent['name'];
+            }
+        }
+
+        // Map parent category to type
+        $categoryToType = [
+            'Pre-Rolls' => 'pre_roll',
+            'Flower' => 'flower',
+            'Concentrates' => 'concentrate',
+            'Edibles' => 'edible',
+        ];
+
+        $type = $categoryToType[$parentCategoryName] ?? 'pre_roll';
+
+        return [
+            'type' => $type,
+            'category_name' => $category['parent_id'] ? "{$parentCategoryName} / {$childCategoryName}" : $childCategoryName,
+            'parent_category_name' => $parentCategoryName,
+            'child_category_name' => $childCategoryName,
+        ];
+    }
+
+    /**
+     * Sanitize text from MySQL (Windows-1252 encoding) to proper UTF-8
+     * Uses iconv for automatic conversion of all Windows-1252 characters
+     */
+    private function sanitizeUtf8(?string $text): ?string
+    {
+        if (! $text) {
+            return $text;
+        }
+
+        // First, try to detect the encoding
+        $encoding = mb_detect_encoding($text, ['UTF-8', 'ISO-8859-1', 'Windows-1252'], true);
+
+        // If already UTF-8 and valid, just clean up corrupted emoji placeholders
+        if ($encoding === 'UTF-8' && mb_check_encoding($text, 'UTF-8')) {
+            return str_replace('??', '', $text);
+        }
+
+        // Try to convert from Windows-1252 to UTF-8
+        // Use //TRANSLIT to transliterate unsupported characters
+        // Use //IGNORE to skip characters that can't be converted
+        $converted = @iconv('Windows-1252', 'UTF-8//TRANSLIT//IGNORE', $text);
+
+        // If iconv fails, fall back to mb_convert_encoding
+        if ($converted === false) {
+            $converted = mb_convert_encoding($text, 'UTF-8', 'Windows-1252');
+        }
+
+        // Final cleanup: remove any remaining invalid UTF-8 sequences
+        $converted = mb_convert_encoding($converted, 'UTF-8', 'UTF-8');
+
+        // Remove corrupted emoji placeholders (literal "??" characters from source data)
+        $converted = str_replace('??', '', $converted);
+
+        return $converted;
+    }
+}

app/Console/Commands/ImportThunderBudProduct.php

@@ -0,0 +1,564 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use App\Models\Business;
+use App\Models\Order;
+use App\Models\OrderItem;
+use App\Models\Product;
+use App\Models\ProductImage;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+class ImportThunderBudProduct extends Command
+{
+    protected $signature = 'import:thunderbud-product {--dry-run : Show what would be imported without actually importing} {--regenerate-hashid : Generate new hashid instead of preserving existing one}';
+
+    protected $description = 'Import Thunder Bud Product #44 (Cap Junky) from remote MySQL with full sales history (Option B)';
+
+    private $mysqli;
+
+    public function handle()
+    {
+        $dryRun = $this->option('dry-run');
+
+        if ($dryRun) {
+            $this->warn('🔍 DRY RUN MODE - No data will be imported');
+        }
+
+        $this->info('🚀 Starting Thunder Bud Product Import (Option B: Full Chain)');
+        $this->newLine();
+
+        // Connect to remote MySQL
+        $this->info('📡 Connecting to remote MySQL database...');
+        $this->mysqli = new \mysqli('sql1.creationshop.net', 'claude', 'claude', 'hub_cannabrands');
+
+        if ($this->mysqli->connect_error) {
+            $this->error('Failed to connect: '.$this->mysqli->connect_error);
+
+            return 1;
+        }
+        $this->info('✓ Connected to remote MySQL');
+        $this->newLine();
+
+        // Step 1: Import Product
+        $this->info('📦 Step 1: Importing Product #44 (Cap Junky)...');
+        $product = $this->importProduct($dryRun);
+        if (! $product) {
+            $this->error('Failed to import product');
+            $this->mysqli->close();
+
+            return 1;
+        }
+        $this->newLine();
+
+        // Step 2: Import Customer
+        $this->info('👥 Step 2: Importing Customer #61 (Story)...');
+        $customer = $this->importCustomer($dryRun);
+        if (! $customer) {
+            $this->error('Failed to import customer');
+            $this->mysqli->close();
+
+            return 1;
+        }
+        $this->newLine();
+
+        // Step 3: Import Order
+        $this->info('📋 Step 3: Importing Invoice #293 as Order...');
+        $order = $this->importOrder($customer, $product, $dryRun);
+        if (! $order) {
+            $this->error('Failed to import order');
+            $this->mysqli->close();
+
+            return 1;
+        }
+        $this->newLine();
+
+        $this->mysqli->close();
+
+        // Summary
+        $this->info('✅ Import completed successfully!');
+        $this->newLine();
+        $this->table(
+            ['Item', 'Status', 'Details'],
+            [
+                ['Product', '✓', $product ? "ID: {$product->id} - {$product->name}" : 'N/A'],
+                ['Image', '✓', $product && $product->image_path ? $product->image_path : 'N/A'],
+                ['Customer', '✓', $customer ? "ID: {$customer->id} - {$customer->name}" : 'N/A'],
+                ['Order', '✓', $order ? "ID: {$order->id} - {$order->order_number}" : 'N/A'],
+                ['Order Items', '✓', $order ? $order->items()->count().' line items' : 'N/A'],
+            ]
+        );
+
+        if (! $dryRun) {
+            $this->newLine();
+            $this->info('🔗 Verification URLs:');
+            $business = $product->brand->business;
+            $this->line('Product: '.route('seller.business.products.edit', [$business->slug, $product]));
+            $this->line('Order: '.route('seller.business.orders.show', [$business->slug, $order]));
+        }
+
+        return 0;
+    }
+
+    private function importProduct($dryRun): ?Product
+    {
+        // Fetch product from remote
+        $result = $this->mysqli->query('SELECT * FROM products WHERE id = 44');
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            $this->error('Product #44 not found in remote database');
+
+            return null;
+        }
+
+        // Get category mapping
+        $categoryMapping = $this->getCategoryMapping($remote['product_category_id']);
+
+        // Check for varieties (child products)
+        $varietiesResult = $this->mysqli->query('SELECT COUNT(*) as count FROM products WHERE parent_product_id = 44 AND deleted_at IS NULL');
+        $varietiesCount = $varietiesResult->fetch_assoc()['count'];
+        $hasVarieties = $varietiesCount > 0;
+
+        // Get descriptions from both tables
+        $description = ltrim($remote['description'], '? '); // Short description
+
+        // Get long description from product_extras
+        $longDescription = null;
+        $extrasResult = $this->mysqli->query('SELECT long_description FROM product_extras WHERE product_id = 44');
+        if ($extrasResult && $extra = $extrasResult->fetch_assoc()) {
+            $longDescription = $extra['long_description'];
+        }
+
+        // Get unit from remote units table
+        $remoteUnit = null;
+        if ($remote['unit']) {
+            $unitResult = $this->mysqli->query("SELECT unit FROM units WHERE id = {$remote['unit']}");
+            if ($unitResult && $unitRow = $unitResult->fetch_assoc()) {
+                $remoteUnit = $unitRow['unit'];
+            }
+        }
+
+        // Map remote unit abbreviation to local
+        $unitAbbr = null;
+        if ($remoteUnit) {
+            // Map common remote abbreviations to local
+            $remoteToLocalUnit = [
+                'GM' => 'g',
+                'EA' => 'ea',
+                'OZ' => 'oz',
+                'LB' => 'lb',
+            ];
+            $unitAbbr = $remoteToLocalUnit[$remoteUnit] ?? strtolower($remoteUnit);
+        }
+
+        // Preview the data
+        $this->newLine();
+        $this->info('📦 Product Preview:');
+        $this->table(
+            ['Field', 'Value'],
+            [
+                ['ID', $remote['id']],
+                ['Name', $remote['name']],
+                ['SKU', $remote['code']],
+                ['Remote Category', $categoryMapping['category_name']],
+                ['  → Type (mapped)', $categoryMapping['type']],
+                ['  → Subcategory', $categoryMapping['parent_category_name']],
+                ['  → Product Line', $categoryMapping['child_category_name']],
+                ['Remote Unit', $remoteUnit ?? 'NULL'],
+                ['  → Unit (mapped)', $unitAbbr ?? 'NULL'],
+                ['Description (short)', substr($description ?? '', 0, 60).'...'],
+                ['Long Description', $longDescription ? substr($longDescription, 0, 60).'...' : 'NULL'],
+                ['Price', '$'.$remote['wholesale_price']],
+                ['Has Image', $remote['product_image'] ? 'Yes ('.strlen($remote['product_image']).' bytes)' : 'No'],
+                ['Has Varieties', $hasVarieties ? "Yes ($varietiesCount)" : 'No'],
+                ['Active', $remote['active'] ? 'Yes' : 'No'],
+                ['Brand Display Order', $remote['brand_display_order'] ?? 'NULL'],
+            ]
+        );
+
+        // Check if already exists
+        $existingHashid = null;
+        if (Product::where('id', 44)->exists()) {
+            if (! $this->confirm('Product #44 already exists locally. Delete and re-import?', false)) {
+                $this->warn('Skipping product import');
+
+                return Product::find(44);
+            }
+            if (! $dryRun) {
+                // Store existing hashid to preserve it
+                $existingHashid = Product::where('id', 44)->value('hashid');
+                // Delete product and related records
+                DB::table('product_images')->where('product_id', 44)->delete();
+                Product::where('id', 44)->delete();
+                $this->info('✓ Deleted existing product');
+            }
+        }
+
+        if ($dryRun) {
+            $this->warn('[DRY RUN] Would import this product');
+
+            return new Product(['id' => 44, 'name' => $remote['name']]);
+        }
+
+        // Confirm import
+        if (! $this->confirm('Import this product?', true)) {
+            $this->warn('Import cancelled');
+
+            return null;
+        }
+
+        // Extract and save image BLOB
+        $imagePath = null;
+        if ($remote['product_image']) {
+            $this->line('  Extracting image BLOB ('.strlen($remote['product_image']).' bytes)...');
+
+            $finfo = new \finfo(FILEINFO_MIME_TYPE);
+            $mimeType = $finfo->buffer($remote['product_image']);
+            $extension = match ($mimeType) {
+                'image/jpeg' => 'jpg',
+                'image/png' => 'png',
+                'image/gif' => 'gif',
+                default => 'jpg'
+            };
+
+            $imagePath = 'businesses/cannabrands/products/44/cap-junky.'.$extension;
+            Storage::put($imagePath, $remote['product_image']);
+            $this->info("  ✓ Saved image to: {$imagePath}");
+        }
+
+        // Get brand to find business for product line lookup
+        $brand = Brand::find(6); // Thunder Bud
+
+        // Map type to unit
+        $unitMapping = [
+            'pre_roll' => 'ea',
+            'flower' => 'g',
+            'concentrate' => 'g',
+        ];
+
+        $type = $categoryMapping['type'];
+        $unitAbbr = $unitMapping[$type] ?? 'ea';
+
+        // Find or create product line from child category name
+        // Child category (e.g., "Non-Infused") becomes the product line
+        $productLineName = $categoryMapping['child_category_name'];
+        $productLine = DB::table('product_lines')
+            ->where('business_id', $brand->business_id)
+            ->where('name', $productLineName)
+            ->first();
+
+        if (! $productLine) {
+            // Create new product line
+            $productLineId = DB::table('product_lines')->insertGetId([
+                'business_id' => $brand->business_id,
+                'name' => $productLineName,
+                'created_at' => now(),
+                'updated_at' => now(),
+            ]);
+            $this->info("  ✓ Created new product line: {$productLineName} (ID: {$productLineId})");
+            $productLine = (object) ['id' => $productLineId];
+        }
+
+        // Find unit
+        $unit = DB::table('units')->where('abbreviation', $unitAbbr)->first();
+
+        // Create product
+        $product = new Product;
+        $product->id = 44; // Preserve remote ID
+        $product->brand_id = 6; // Thunder Bud local brand
+        $product->name = $remote['name'];
+        $product->slug = Str::slug($remote['name']);
+        $product->sku = $remote['code'] ?? 'TB-CJ-AZ1G';
+        $product->description = $description; // Short description
+        $product->long_description = $longDescription; // Long description from product_extras
+        $product->type = $type; // Mapped from category
+        $product->status = $remote['active'] ? 'available' : 'unavailable';
+        $product->is_active = (bool) $remote['active'];
+        $product->wholesale_price = $remote['wholesale_price'];
+        $product->image_path = $imagePath;
+        $product->product_link = $remote['product_link'];
+        $product->creatives = $remote['creatives'];
+        $product->brand_display_order = (int) $remote['brand_display_order'];
+        $product->product_line_id = $productLine->id ?? null;
+        $product->unit_id = $unit->id ?? null;
+        $product->subcategory = $categoryMapping['parent_category_name']; // e.g., "Pre-Rolls"
+
+        // Set defaults for required fields
+        $product->is_featured = false;
+        $product->is_assembly = false;
+        $product->is_raw_material = false;
+        $product->price_unit = 'unit';
+        $product->weight_unit = 'g';
+        $product->sort_order = 0;
+        $product->has_varieties = $hasVarieties; // From variety check
+        $product->sell_multiples = false;
+        $product->fractional_quantities = false;
+        $product->allow_sample = false;
+        $product->is_fpr = false;
+        $product->is_sellable = true;
+        $product->is_case = false;
+        $product->cased_qty = 0;
+        $product->is_box = false;
+        $product->boxed_qty = 0;
+        $product->show_inventory_to_buyers = true;
+        $product->sync_bamboo = false;
+
+        $product->timestamps = false;
+        $product->created_at = $remote['created_at'];
+        $product->updated_at = $remote['updated_at'];
+        $product->save();
+
+        // Restore existing hashid to preserve URLs (unless --regenerate-hashid flag is set)
+        if ($existingHashid && ! $this->option('regenerate-hashid')) {
+            $product->hashid = $existingHashid;
+            $product->save();
+            $this->info("  ✓ Preserved existing hashid: {$existingHashid}");
+        } elseif ($existingHashid && $this->option('regenerate-hashid')) {
+            $this->info("  ✓ Generated new hashid: {$product->hashid}");
+        }
+
+        // Create ProductImage record for the listing page
+        if ($imagePath) {
+            $productImage = new ProductImage;
+            $productImage->product_id = $product->id;
+            $productImage->path = $imagePath;
+            $productImage->type = 'image';
+            $productImage->is_primary = true;
+            $productImage->sort_order = 0;
+            $productImage->order = 0;
+            $productImage->save();
+            $this->info('  ✓ Created ProductImage record');
+        }
+
+        $this->info("✓ Created product: {$product->name} (ID: {$product->id})");
+
+        return $product;
+    }
+
+    private function importCustomer($dryRun): ?Business
+    {
+        // Fetch company from remote
+        $result = $this->mysqli->query('SELECT * FROM companies WHERE id = 61');
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            $this->error('Company #61 not found in remote database');
+
+            return null;
+        }
+
+        $this->line("Found: {$remote['name']}");
+
+        // Check if mapping already exists
+        $mapping = DB::table('remote_customer_mappings')->where('remote_company_id', 61)->first();
+        if ($mapping) {
+            $existing = Business::find($mapping->business_id);
+            if ($existing) {
+                $this->warn("  Customer already imported as Business #{$existing->id}");
+
+                return $existing;
+            }
+        }
+
+        if ($dryRun) {
+            $this->info('[DRY RUN] Would import customer: '.$remote['name']);
+
+            return new Business(['name' => $remote['name']]);
+        }
+
+        // Create business
+        $business = new Business;
+        $business->name = $remote['name'];
+        $business->slug = Str::slug($remote['name']);
+        $business->type = 'buyer';
+        $business->status = 'approved';
+        $business->is_active = true;
+        $business->onboarding_completed = true;
+        $business->tax_rate = 0;
+        $business->tax_exempt = false;
+        $business->has_analytics = false;
+        $business->has_marketing = false;
+        $business->has_manufacturing = false;
+        $business->has_processing = false;
+
+        // Map address fields if available
+        if (isset($remote['address'])) {
+            $business->physical_address = $remote['address'];
+        }
+        if (isset($remote['city'])) {
+            $business->physical_city = $remote['city'];
+        }
+        if (isset($remote['state'])) {
+            $business->physical_state = $remote['state'];
+        }
+        if (isset($remote['zipcode'])) {
+            $business->physical_zipcode = $remote['zipcode'];
+        }
+
+        $business->save();
+
+        // Create remote customer mapping
+        DB::table('remote_customer_mappings')->insert([
+            'business_id' => $business->id,
+            'remote_company_id' => 61,
+            'remote_organisation_id' => 5, // From invoice data
+            'remote_person_id' => 13, // From invoice data
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $this->info("✓ Created business: {$business->name} (ID: {$business->id})");
+        $this->info('  ✓ Created remote_customer_mappings record');
+
+        return $business;
+    }
+
+    private function importOrder($customer, $product, $dryRun): ?Order
+    {
+        // Fetch invoice from remote
+        $result = $this->mysqli->query('SELECT * FROM invoices WHERE id = 293');
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            $this->error('Invoice #293 not found in remote database');
+
+            return null;
+        }
+
+        $this->line("Found: Invoice #{$remote['invoice_id']} - Issue Date: {$remote['issue_date']}");
+
+        // Check if already exists
+        if (Order::where('id', 293)->exists()) {
+            if ($this->confirm('Order #293 already exists locally. Delete and re-import?', false)) {
+                if (! $dryRun) {
+                    Order::where('id', 293)->delete();
+                    $this->info('✓ Deleted existing order');
+                }
+            } else {
+                $this->warn('Skipping order import');
+
+                return Order::find(293);
+            }
+        }
+
+        if ($dryRun) {
+            $this->info('[DRY RUN] Would import invoice #'.$remote['invoice_id'].' as order');
+
+            return new Order(['id' => 293, 'order_number' => 'IMPORT-293']);
+        }
+
+        // Create order
+        $order = new Order;
+        $order->id = 293; // Preserve remote ID
+        $order->order_number = 'IMPORT-'.$remote['invoice_id'];
+        $order->business_id = $customer->id;
+        $order->remote_organisation_id = $remote['organisation_id'];
+        $order->subtotal = $remote['subtotal'] / 100; // Convert cents to decimal
+        $order->tax = $remote['tax'] / 100;
+        $order->total = $remote['total'] / 100;
+        $order->status = 'invoiced'; // Imported from invoices table
+        $order->workorder_status = 0;
+        $order->created_by = 'seller'; // Orders were created by sellers (invoices)
+        $order->surcharge = 0.00;
+
+        $order->timestamps = false;
+        $order->created_at = $remote['issue_date'];
+        $order->updated_at = $remote['updated_at'];
+        $order->save();
+
+        $this->info("✓ Created order: {$order->order_number} (ID: {$order->id})");
+
+        // Import invoice lines
+        $linesResult = $this->mysqli->query('SELECT * FROM invoice_lines WHERE invoice_id = 293 AND product_id = 44');
+        $lineCount = 0;
+        while ($line = $linesResult->fetch_assoc()) {
+            $orderItem = new OrderItem;
+            $orderItem->order_id = $order->id;
+            $orderItem->product_id = $product->id;
+            $orderItem->quantity = (int) $line['quantity'];
+            $orderItem->unit_price = $line['price']; // Already in decimal format
+            $orderItem->line_total = $line['amount'] / 100; // Convert cents to decimal
+
+            // Denormalized product fields (required)
+            $orderItem->product_name = $product->name;
+            $orderItem->product_sku = $product->sku;
+            $orderItem->brand_name = $product->brand->name;
+
+            // Note: tax is stored at order level, not line level
+
+            $orderItem->timestamps = false;
+            $orderItem->created_at = $remote['created_at'];
+            $orderItem->updated_at = $remote['updated_at'];
+            $orderItem->save();
+
+            $lineCount++;
+        }
+
+        $this->info("  ✓ Created {$lineCount} order line item(s)");
+
+        return $order;
+    }
+
+    private function getCategoryMapping(?int $categoryId): array
+    {
+        if (! $categoryId) {
+            return [
+                'type' => 'flower', // default
+                'category_name' => 'Uncategorized',
+                'parent_category_name' => 'Uncategorized',
+                'child_category_name' => 'Uncategorized',
+            ];
+        }
+
+        // Get category from remote
+        $result = $this->mysqli->query("SELECT id, name, parent_id FROM product_categories WHERE id = {$categoryId}");
+        $category = $result->fetch_assoc();
+
+        if (! $category) {
+            return [
+                'type' => 'flower',
+                'category_name' => 'Unknown Category',
+                'parent_category_name' => 'Unknown Category',
+                'child_category_name' => 'Unknown Category',
+            ];
+        }
+
+        $childCategoryName = $category['name'];
+        $parentCategoryName = $category['name']; // Default to same if no parent
+
+        // If has parent, get parent category name
+        if ($category['parent_id']) {
+            $parentResult = $this->mysqli->query("SELECT name FROM product_categories WHERE id = {$category['parent_id']}");
+            $parent = $parentResult->fetch_assoc();
+            if ($parent) {
+                $parentCategoryName = $parent['name'];
+            }
+        }
+
+        // Map parent category name to local type
+        $typeMap = [
+            'Pre-Rolls' => 'pre_roll',
+            'Flower' => 'flower',
+            'Concentrates' => 'concentrate',
+            'Edibles' => 'edible',
+            'Vapes' => 'vape',
+            'Topicals' => 'topical',
+            'Tinctures' => 'tincture',
+            'Accessories' => 'accessory',
+        ];
+
+        $type = $typeMap[$parentCategoryName] ?? 'flower';
+
+        return [
+            'type' => $type,
+            'category_name' => $category['parent_id'] ? "{$parentCategoryName} / {$childCategoryName}" : $childCategoryName,
+            'parent_category_name' => $parentCategoryName,
+            'child_category_name' => $childCategoryName,
+        ];
+    }
+}

app/Console/Commands/ImportThunderBudSales.php

@@ -0,0 +1,446 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Business;
+use App\Models\Order;
+use App\Models\OrderItem;
+use App\Models\Product;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+class ImportThunderBudSales extends Command
+{
+    protected $signature = 'import:thunderbud-sales {--dry-run : Show what would be imported without actually importing} {--force : Overwrite existing orders} {--skip-existing : Skip orders that already exist} {--limit= : Limit number of invoices to import}';
+
+    protected $description = 'Import Thunder Bud sales history (invoices and customers) from remote MySQL';
+
+    private $mysqli;
+
+    private $stats = [
+        'total_invoices' => 0,
+        'imported_invoices' => 0,
+        'skipped_invoices' => 0,
+        'failed_invoices' => 0,
+        'customers_created' => 0,
+        'total_items' => 0,
+    ];
+
+    private $customerCache = [];
+
+    public function handle()
+    {
+        $dryRun = $this->option('dry-run');
+        $force = $this->option('force');
+        $skipExisting = $this->option('skip-existing');
+        $limit = $this->option('limit');
+
+        if ($dryRun) {
+            $this->warn('🔍 DRY RUN MODE - No data will be imported');
+        }
+
+        $this->info('🚀 Starting Thunder Bud Sales Import');
+        $this->newLine();
+
+        // Connect to remote MySQL
+        $this->info('📡 Connecting to remote MySQL database...');
+        $this->mysqli = new \mysqli('sql1.creationshop.net', 'claude', 'claude', 'hub_cannabrands');
+
+        if ($this->mysqli->connect_error) {
+            $this->error('Failed to connect: '.$this->mysqli->connect_error);
+
+            return 1;
+        }
+        $this->info('✓ Connected to remote MySQL');
+        $this->newLine();
+
+        // Get all invoices with Thunder Bud products
+        $this->info('📦 Fetching invoices with Thunder Bud products...');
+        $query = '
+            SELECT DISTINCT i.id
+            FROM invoices i
+            INNER JOIN invoice_lines il ON i.id = il.invoice_id
+            INNER JOIN products p ON il.product_id = p.id
+            WHERE p.brand_id = 6
+            AND i.deleted_at IS NULL
+            ORDER BY i.id
+        ';
+        if ($limit) {
+            $query .= ' LIMIT '.(int) $limit;
+        }
+
+        $result = $this->mysqli->query($query);
+        $invoiceIds = [];
+        while ($row = $result->fetch_assoc()) {
+            $invoiceIds[] = $row['id'];
+        }
+
+        $this->stats['total_invoices'] = count($invoiceIds);
+        $this->info("Found {$this->stats['total_invoices']} invoices with Thunder Bud products");
+        $this->newLine();
+
+        if (! $dryRun && ! $force && ! $skipExisting) {
+            if (! $this->confirm('This will import all invoices and customers. Continue?', true)) {
+                $this->warn('Import cancelled');
+
+                return 0;
+            }
+            $this->newLine();
+        }
+
+        // Import each invoice
+        $progressBar = $this->output->createProgressBar($this->stats['total_invoices']);
+        $progressBar->setFormat(' %current%/%max% [%bar%] %percent:3s%% %message%');
+        $progressBar->setMessage('Starting...');
+
+        foreach ($invoiceIds as $invoiceId) {
+            $progressBar->setMessage("Invoice #{$invoiceId}");
+
+            try {
+                $result = $this->importInvoice($invoiceId, $dryRun, $force, $skipExisting);
+
+                if ($result === 'imported') {
+                    $this->stats['imported_invoices']++;
+                } elseif ($result === 'skipped') {
+                    $this->stats['skipped_invoices']++;
+                }
+            } catch (\Exception $e) {
+                $this->stats['failed_invoices']++;
+                $progressBar->clear();
+                $this->error("Failed to import invoice #{$invoiceId}: {$e->getMessage()}");
+                $progressBar->display();
+            }
+
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine(2);
+
+        // Show summary
+        $this->info('📊 Import Summary:');
+        $this->table(
+            ['Metric', 'Count'],
+            [
+                ['Total Invoices', $this->stats['total_invoices']],
+                ['✓ Imported', $this->stats['imported_invoices']],
+                ['⊘ Skipped', $this->stats['skipped_invoices']],
+                ['✗ Failed', $this->stats['failed_invoices']],
+                ['Customers Created', $this->stats['customers_created']],
+                ['Order Items Created', $this->stats['total_items']],
+            ]
+        );
+
+        $this->mysqli->close();
+
+        return $this->stats['failed_invoices'] > 0 ? 1 : 0;
+    }
+
+    private function importInvoice(int $invoiceId, bool $dryRun, bool $force, bool $skipExisting): string
+    {
+        // Fetch invoice from remote
+        $result = $this->mysqli->query("SELECT * FROM invoices WHERE id = {$invoiceId}");
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            throw new \Exception("Invoice #{$invoiceId} not found in remote database");
+        }
+
+        // Check if already exists
+        if (Order::where('id', $invoiceId)->exists()) {
+            if ($skipExisting) {
+                return 'skipped';
+            }
+
+            if (! $force && ! $dryRun) {
+                return 'skipped';
+            }
+
+            if (! $dryRun && $force) {
+                // Force delete existing order and items (hard delete, not soft delete)
+                DB::table('order_items')->where('order_id', $invoiceId)->delete();
+                Order::where('id', $invoiceId)->forceDelete();
+            }
+        }
+
+        if ($dryRun) {
+            return 'imported';
+        }
+
+        // Get or create customer business
+        $customer = $this->findOrCreateCustomer($remote['organisation_id'], $dryRun);
+
+        if (! $customer) {
+            throw new \Exception("Failed to create customer for organisation #{$remote['organisation_id']}");
+        }
+
+        // Get Thunder Bud business (seller)
+        $seller = Business::where('slug', 'cannabrands')->first();
+        if (! $seller) {
+            throw new \Exception('Thunder Bud/Cannabrands business not found');
+        }
+
+        // Get first user for this business to assign as order creator
+        $user = $customer->users()->first();
+        if (! $user) {
+            throw new \Exception("No user found for customer business #{$customer->id}");
+        }
+
+        // Get invoice lines
+        $linesResult = $this->mysqli->query("
+            SELECT il.*, p.brand_id
+            FROM invoice_lines il
+            INNER JOIN products p ON il.product_id = p.id
+            WHERE il.invoice_id = {$invoiceId}
+            AND il.deleted_at IS NULL
+        ");
+
+        $invoiceLines = [];
+        while ($line = $linesResult->fetch_assoc()) {
+            $invoiceLines[] = $line;
+        }
+
+        // Create order
+        $order = new Order;
+        $order->id = $invoiceId;
+        $order->business_id = $customer->id; // Buyer business
+        $order->user_id = $user->id; // User who placed the order
+        $order->order_number = $remote['invoice_id'] ?? "TB-{$invoiceId}";
+        $order->status = $this->mapStatus($remote['status']);
+        $order->subtotal = ($remote['subtotal'] ?? 0) / 100; // Convert cents to dollars
+        $order->tax = ($remote['tax'] ?? 0) / 100;
+        $order->total = ($remote['total'] ?? 0) / 100;
+        $order->notes = $this->sanitizeUtf8($remote['comments']);
+        $order->payment_terms = $this->sanitizeUtf8($remote['terms']);
+        $order->delivery_method = 'pickup'; // Default
+        $order->timestamps = false;
+        $order->created_at = $remote['created_at'];
+        $order->updated_at = $remote['updated_at'];
+        $order->save();
+
+        // Create order items
+        $itemCount = 0;
+        foreach ($invoiceLines as $line) {
+            // Only import items for Thunder Bud products that exist locally
+            $product = Product::find($line['product_id']);
+            if (! $product || $product->brand_id != 6) {
+                continue; // Skip non-Thunder Bud products or products not imported
+            }
+
+            // Calculate line_total (amount + tax)
+            $amount = (($line['amount'] ?? 0) / 100);
+            $tax = (($line['tax_amount'] ?? 0) / 100);
+            $lineTotal = $amount + $tax;
+
+            $orderItem = new OrderItem;
+            $orderItem->order_id = $order->id;
+            $orderItem->product_id = $line['product_id'];
+            $orderItem->quantity = (int) ($line['quantity'] ?? 1); // Cast to integer
+            $orderItem->unit_price = $line['price'] ?? 0;
+            $orderItem->line_total = $lineTotal;
+
+            // Product snapshot fields
+            $orderItem->product_name = $product->name;
+            $orderItem->product_sku = $product->sku;
+            $orderItem->brand_name = $product->brand->name ?? 'Thunder Bud';
+
+            $orderItem->timestamps = false;
+            $orderItem->created_at = $line['created_at'];
+            $orderItem->updated_at = $line['updated_at'];
+            $orderItem->save();
+
+            $itemCount++;
+        }
+
+        $this->stats['total_items'] += $itemCount;
+
+        return 'imported';
+    }
+
+    private function findOrCreateCustomer(int $organisationId, bool $dryRun): ?Business
+    {
+        // Check cache first
+        if (isset($this->customerCache[$organisationId])) {
+            return $this->customerCache[$organisationId];
+        }
+
+        // Check if already imported
+        $mapping = DB::table('remote_customer_mappings')
+            ->where('remote_organisation_id', $organisationId)
+            ->first();
+
+        if ($mapping) {
+            $business = Business::find($mapping->business_id);
+            if ($business) {
+                // Ensure business has at least one user
+                if ($business->users()->count() == 0) {
+                    $this->createUserForBusiness($business);
+                }
+                $this->customerCache[$organisationId] = $business;
+
+                return $business;
+            }
+        }
+
+        // Fetch from remote
+        $result = $this->mysqli->query("SELECT * FROM companies WHERE id = {$organisationId}");
+        $remote = $result->fetch_assoc();
+
+        if (! $remote) {
+            return null;
+        }
+
+        if ($dryRun) {
+            return new Business(['name' => $remote['name']]);
+        }
+
+        // Check if business already exists by slug
+        $slug = Str::slug($remote['name']);
+        $business = Business::where('slug', $slug)->first();
+
+        if ($business) {
+            // Business already exists, create mapping and return it
+            // Ensure it has a user
+            if ($business->users()->count() == 0) {
+                $this->createUserForBusiness($business);
+            }
+
+            // Create mapping if it doesn't exist
+            $existingMapping = DB::table('remote_customer_mappings')
+                ->where('business_id', $business->id)
+                ->where('remote_organisation_id', $organisationId)
+                ->exists();
+
+            if (! $existingMapping) {
+                DB::table('remote_customer_mappings')->insert([
+                    'business_id' => $business->id,
+                    'remote_organisation_id' => $organisationId,
+                    'created_at' => now(),
+                    'updated_at' => now(),
+                ]);
+            }
+
+            $this->customerCache[$organisationId] = $business;
+
+            return $business;
+        }
+
+        // Create new business
+        $business = new Business;
+        $business->name = $this->sanitizeUtf8($remote['name']);
+        $business->slug = Str::slug($remote['name']);
+        $business->type = 'buyer';
+        $business->status = 'approved';
+        $business->is_active = true;
+        $business->onboarding_completed = true;
+        $business->tax_rate = 0;
+        $business->tax_exempt = false;
+        $business->has_analytics = false;
+        $business->has_marketing = false;
+        $business->has_manufacturing = false;
+        $business->has_processing = false;
+
+        // Map address if available
+        if (! empty($remote['address'])) {
+            $business->physical_address = $this->sanitizeUtf8($remote['address']);
+        }
+        if (! empty($remote['city'])) {
+            $business->physical_city = $this->sanitizeUtf8($remote['city']);
+        }
+        if (! empty($remote['state'])) {
+            $business->physical_state = $this->sanitizeUtf8($remote['state']);
+        }
+        if (! empty($remote['zipcode'])) {
+            $business->physical_zipcode = $this->sanitizeUtf8($remote['zipcode']);
+        }
+
+        $business->save();
+
+        // Create a default user for this business
+        $this->createUserForBusiness($business);
+
+        // Create mapping
+        DB::table('remote_customer_mappings')->insert([
+            'business_id' => $business->id,
+            'remote_organisation_id' => $organisationId,
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        $this->stats['customers_created']++;
+        $this->customerCache[$organisationId] = $business;
+
+        return $business;
+    }
+
+    private function mapStatus(?string $remoteStatus): string
+    {
+        // Map remote invoice status to local order status
+        // Valid local statuses: new, buyer_modified, seller_modified, accepted, in_progress,
+        // ready_for_invoice, awaiting_invoice_approval, ready_for_manifest, ready_for_delivery,
+        // delivered, cancelled, rejected
+        $statusMap = [
+            'draft' => 'new',           // Order just created
+            'sent' => 'accepted',       // Order sent to customer, accepted
+            'paid' => 'delivered',      // Payment received, order completed
+            'partial' => 'in_progress', // Partially paid/fulfilled
+            'overdue' => 'accepted',    // Still active but overdue
+        ];
+
+        return $statusMap[$remoteStatus] ?? 'new';
+    }
+
+    /**
+     * Create a default user for a business
+     */
+    private function createUserForBusiness(Business $business): User
+    {
+        $user = new User;
+        $user->first_name = 'System';
+        $user->last_name = 'User';
+        $user->email = 'system+'.$business->slug.'@imported.local';
+        $user->password = Hash::make(Str::random(32)); // Random password
+        $user->user_type = 'buyer';
+        $user->email_verified_at = now();
+        $user->save();
+
+        // Attach user to business
+        $user->businesses()->attach($business->id);
+
+        return $user;
+    }
+
+    /**
+     * Sanitize text from MySQL (Windows-1252 encoding) to proper UTF-8
+     */
+    private function sanitizeUtf8(?string $text): ?string
+    {
+        if (! $text) {
+            return $text;
+        }
+
+        // First, try to detect the encoding
+        $encoding = mb_detect_encoding($text, ['UTF-8', 'ISO-8859-1', 'Windows-1252'], true);
+
+        // If already UTF-8 and valid, return as-is
+        if ($encoding === 'UTF-8' && mb_check_encoding($text, 'UTF-8')) {
+            return $text;
+        }
+
+        // Try to convert from Windows-1252 to UTF-8
+        $converted = @iconv('Windows-1252', 'UTF-8//TRANSLIT//IGNORE', $text);
+
+        // If iconv fails, fall back to mb_convert_encoding
+        if ($converted === false) {
+            $converted = mb_convert_encoding($text, 'UTF-8', 'Windows-1252');
+        }
+
+        // Final cleanup: remove any remaining invalid UTF-8 sequences
+        $converted = mb_convert_encoding($converted, 'UTF-8', 'UTF-8');
+
+        return $converted;
+    }
+}

app/Console/Commands/MigrateImagesToMinIO.php

@@ -0,0 +1,162 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Brand;
+use App\Models\Business;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class MigrateImagesToMinIO extends Command
+{
+    protected $signature = 'media:migrate-to-minio {--dry-run : Show what would be migrated without actually doing it}';
+
+    protected $description = 'Migrate existing brand images from storage/app/public to MinIO with proper hierarchy';
+
+    protected int $migratedLogos = 0;
+
+    protected int $migratedBanners = 0;
+
+    protected int $errors = 0;
+
+    public function handle(): int
+    {
+        $dryRun = $this->option('dry-run');
+
+        if ($dryRun) {
+            $this->warn('🔍 DRY RUN MODE - No files will be moved or database records updated');
+            $this->newLine();
+        } else {
+            $this->info('🚀 Starting image migration to MinIO...');
+            $this->newLine();
+        }
+
+        // Get all brands with images
+        $brands = Brand::with('business')
+            ->where(function ($query) {
+                $query->whereNotNull('logo_path')
+                    ->orWhereNotNull('banner_path');
+            })
+            ->get();
+
+        if ($brands->isEmpty()) {
+            $this->info('✅ No brands with images found. Nothing to migrate.');
+
+            return 0;
+        }
+
+        $this->info("Found {$brands->count()} brands with images");
+        $this->newLine();
+
+        $progressBar = $this->output->createProgressBar($brands->count());
+        $progressBar->start();
+
+        foreach ($brands as $brand) {
+            $this->migrateBrandImages($brand, $dryRun);
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine(2);
+
+        // Summary
+        $this->info('✅ Migration Complete!');
+        $this->table(
+            ['Metric', 'Count'],
+            [
+                ['Logos Migrated', $this->migratedLogos],
+                ['Banners Migrated', $this->migratedBanners],
+                ['Errors', $this->errors],
+            ]
+        );
+
+        if (! $dryRun && $this->errors === 0) {
+            $this->newLine();
+            $this->info('🎉 All images successfully migrated to MinIO!');
+            $this->info('📂 Check MinIO console: http://localhost:9001');
+            $this->info('🗑️  You can now safely delete storage/app/public/brands/');
+        }
+
+        return 0;
+    }
+
+    protected function migrateBrandImages(Brand $brand, bool $dryRun): void
+    {
+        $business = $brand->business;
+
+        // Migrate logo
+        if ($brand->logo_path) {
+            $this->migrateImage(
+                $brand,
+                $business,
+                $brand->logo_path,
+                'logo',
+                $dryRun
+            );
+        }
+
+        // Migrate banner
+        if ($brand->banner_path) {
+            $this->migrateImage(
+                $brand,
+                $business,
+                $brand->banner_path,
+                'banner',
+                $dryRun
+            );
+        }
+    }
+
+    protected function migrateImage(
+        Brand $brand,
+        Business $business,
+        string $oldPath,
+        string $type,
+        bool $dryRun
+    ): void {
+        try {
+            // Check if file exists in old location
+            $oldDisk = Storage::disk('public');
+            if (! $oldDisk->exists($oldPath)) {
+                $this->newLine();
+                $this->warn("  ⚠️  File not found: {$oldPath} (skipping)");
+                $this->errors++;
+
+                return;
+            }
+
+            // Determine file extension
+            $extension = pathinfo($oldPath, PATHINFO_EXTENSION);
+
+            // Build new path using our hierarchy
+            $newPath = "businesses/{$business->slug}/brands/{$brand->slug}/branding/{$type}.{$extension}";
+
+            if ($dryRun) {
+                $this->newLine();
+                $this->line('  📋 Would migrate:');
+                $this->line("     From: {$oldPath}");
+                $this->line("     To:   {$newPath}");
+            } else {
+                // Get file contents
+                $fileContents = $oldDisk->get($oldPath);
+
+                // Upload to MinIO using our new hierarchy
+                $minioDisk = Storage::disk('minio');
+                $minioDisk->put($newPath, $fileContents);
+
+                // Update database
+                if ($type === 'logo') {
+                    $brand->update(['logo_path' => $newPath]);
+                    $this->migratedLogos++;
+                } else {
+                    $brand->update(['banner_path' => $newPath]);
+                    $this->migratedBanners++;
+                }
+            }
+        } catch (\Exception $e) {
+            $this->newLine();
+            $this->error("  ❌ Error migrating {$type} for {$brand->name}: ".$e->getMessage());
+            $this->errors++;
+        }
+    }
+}

app/Console/Commands/MigrateProductImagePaths.php

@@ -0,0 +1,126 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Product;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class MigrateProductImagePaths extends Command
+{
+    protected $signature = 'media:migrate-product-images {--dry-run : Show what would be migrated without making changes}';
+
+    protected $description = 'Migrate product images from old path (products/{id}/) to correct path (brands/{brand}/products/{sku}/images/)';
+
+    public function handle()
+    {
+        $dryRun = $this->option('dry-run');
+
+        if ($dryRun) {
+            $this->warn('🔍 DRY RUN MODE - No changes will be made');
+            $this->newLine();
+        }
+
+        $this->info('🚀 Starting product image migration...');
+        $this->newLine();
+
+        // Get all products with image_path
+        $products = Product::whereNotNull('image_path')
+            ->with('brand.business')
+            ->get();
+
+        $this->info("Found {$products->count()} products with images");
+        $this->newLine();
+
+        $stats = [
+            'total' => $products->count(),
+            'migrated' => 0,
+            'skipped_correct_path' => 0,
+            'skipped_missing' => 0,
+            'failed' => 0,
+        ];
+
+        $progressBar = $this->output->createProgressBar($products->count());
+        $progressBar->setFormat(' %current%/%max% [%bar%] %percent:3s%% %message%');
+        $progressBar->setMessage('Starting...');
+
+        foreach ($products as $product) {
+            $progressBar->setMessage("Product #{$product->id}: {$product->name}");
+
+            try {
+                // Check if already using correct path pattern
+                if (preg_match('#^businesses/[^/]+/brands/[^/]+/products/[^/]+/images/#', $product->image_path)) {
+                    $stats['skipped_correct_path']++;
+                    $progressBar->advance();
+
+                    continue;
+                }
+
+                // Check if old file exists
+                if (! Storage::exists($product->image_path)) {
+                    $stats['skipped_missing']++;
+                    $progressBar->clear();
+                    $this->warn("  ⚠️  Product #{$product->id} - Image missing at: {$product->image_path}");
+                    $progressBar->display();
+                    $progressBar->advance();
+
+                    continue;
+                }
+
+                // Build new path
+                $filename = basename($product->image_path);
+                $businessSlug = $product->brand->business->slug ?? 'unknown';
+                $brandSlug = $product->brand->slug ?? 'unknown';
+                $productSku = $product->sku;
+
+                $newPath = "businesses/{$businessSlug}/brands/{$brandSlug}/products/{$productSku}/images/{$filename}";
+                $oldPath = $product->image_path;
+
+                if (! $dryRun) {
+                    // Copy file to new location on MinIO
+                    $contents = Storage::get($oldPath);
+                    Storage::put($newPath, $contents);
+
+                    // Update database
+                    $product->image_path = $newPath;
+                    $product->save();
+
+                    // Delete old file
+                    Storage::delete($oldPath);
+                }
+
+                $stats['migrated']++;
+            } catch (\Exception $e) {
+                $stats['failed']++;
+                $progressBar->clear();
+                $this->error("  ✗ Failed to migrate product #{$product->id}: {$e->getMessage()}");
+                $progressBar->display();
+            }
+
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine(2);
+
+        // Show summary
+        $this->info('📊 Migration Summary:');
+        $this->table(
+            ['Metric', 'Count'],
+            [
+                ['Total Products', $stats['total']],
+                ['✓ Migrated', $stats['migrated']],
+                ['→ Already Correct Path', $stats['skipped_correct_path']],
+                ['⊘ Missing Files', $stats['skipped_missing']],
+                ['✗ Failed', $stats['failed']],
+            ]
+        );
+
+        if ($dryRun) {
+            $this->newLine();
+            $this->warn('This was a dry run. Run without --dry-run to actually migrate the images.');
+        }
+
+        return $stats['failed'] > 0 ? 1 : 0;
+    }
+}

app/Console/Commands/ResetProductImagePaths.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Product;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class ResetProductImagePaths extends Command
+{
+    protected $signature = 'media:reset-product-paths';
+
+    protected $description = 'Reset product image paths back to old format for re-migration';
+
+    public function handle()
+    {
+        $products = Product::whereNotNull('image_path')->get();
+
+        $this->info("Resetting {$products->count()} product image paths...");
+        $progressBar = $this->output->createProgressBar($products->count());
+
+        $reset = 0;
+        foreach ($products as $product) {
+            if (preg_match('#/images/(.+)$#', $product->image_path, $matches)) {
+                $filename = $matches[1];
+                $oldPath = 'businesses/cannabrands/products/'.$product->id.'/'.$filename;
+
+                if (Storage::exists($oldPath)) {
+                    $product->image_path = $oldPath;
+                    $product->save();
+                    $reset++;
+                }
+            }
+            $progressBar->advance();
+        }
+
+        $progressBar->finish();
+        $this->newLine();
+        $this->info("✓ Reset {$reset} products to old paths");
+
+        return 0;
+    }
+}

app/Console/Commands/SeedCoaData.php

@@ -0,0 +1,158 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands;
+
+use App\Models\Batch;
+use App\Models\BatchCoaFile;
+use App\Models\Product;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Storage;
+
+class SeedCoaData extends Command
+{
+    protected $signature = 'seed:coa-data';
+
+    protected $description = 'Add COA files to existing batches for testing';
+
+    public function handle(): int
+    {
+        $this->info('Seeding COA data for testing...');
+
+        // Get all active products with batches
+        $products = Product::with('batches')
+            ->where('is_active', true)
+            ->whereHas('batches')
+            ->get();
+
+        if ($products->isEmpty()) {
+            $this->warn('No products with batches found. Run the main seeder first.');
+
+            return 1;
+        }
+
+        $this->info("Found {$products->count()} products with batches");
+
+        $coaCount = 0;
+
+        foreach ($products as $product) {
+            foreach ($product->batches as $batch) {
+                // Skip if batch already has COAs
+                if ($batch->coaFiles()->exists()) {
+                    continue;
+                }
+
+                // Create 1-2 COA files per batch
+                $numCoas = rand(1, 2);
+
+                for ($i = 1; $i <= $numCoas; $i++) {
+                    $isPrimary = ($i === 1);
+
+                    // Create a dummy PDF file
+                    $fileName = "COA-{$batch->batch_number}-{$i}.pdf";
+                    $filePath = "businesses/{$product->brand->business->uuid}/batches/{$batch->id}/coas/{$fileName}";
+
+                    // Create dummy PDF content (just for testing)
+                    $pdfContent = $this->generateDummyPdf($batch, $product);
+                    Storage::disk('local')->put($filePath, $pdfContent);
+
+                    // Create COA file record
+                    BatchCoaFile::create([
+                        'batch_id' => $batch->id,
+                        'file_name' => $fileName,
+                        'file_path' => $filePath,
+                        'file_size' => strlen($pdfContent),
+                        'mime_type' => 'application/pdf',
+                        'is_primary' => $isPrimary,
+                        'display_order' => $i,
+                    ]);
+
+                    $coaCount++;
+                }
+
+                $this->line("  Added {$numCoas} COA(s) for batch {$batch->batch_number}");
+            }
+        }
+
+        $this->info("✓ Created {$coaCount} COA files");
+
+        return 0;
+    }
+
+    private function generateDummyPdf(Batch $batch, Product $product): string
+    {
+        // Generate a simple text-based "PDF" for testing
+        // In a real system, you'd use a PDF library
+        return "%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/Resources <<
+/Font <<
+/F1 <<
+/Type /Font
+/Subtype /Type1
+/BaseFont /Helvetica
+>>
+>>
+>>
+/MediaBox [0 0 612 792]
+/Contents 4 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 250
+>>
+stream
+BT
+/F1 12 Tf
+50 700 Td
+(CERTIFICATE OF ANALYSIS) Tj
+0 -30 Td
+(Batch Number: {$batch->batch_number}) Tj
+0 -20 Td
+(Product: {$product->name}) Tj
+0 -20 Td
+(Test Date: ".now()->format('Y-m-d').') Tj
+0 -30 Td
+(THC: 25.5%) Tj
+0 -20 Td
+(CBD: 0.8%) Tj
+0 -20 Td
+(Status: PASSED) Tj
+ET
+endstream
+endobj
+xref
+0 5
+0000000000 65535 f
+0000000009 00000 n
+0000000058 00000 n
+0000000115 00000 n
+0000000317 00000 n
+trailer
+<<
+/Size 5
+/Root 1 0 R
+>>
+startxref
+619
+%%EOF';
+    }
+}

app/Console/Commands/SeedTestOrders.php

@@ -0,0 +1,225 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Console\Commands;
+
+use App\Models\Batch;
+use App\Models\Business;
+use App\Models\Location;
+use App\Models\Order;
+use App\Models\OrderItem;
+use App\Models\Product;
+use App\Models\User;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+
+class SeedTestOrders extends Command
+{
+    protected $signature = 'seed:test-orders {--clean : Delete existing test orders first}';
+
+    protected $description = 'Create test orders at various statuses for testing the order flow';
+
+    public function handle(): int
+    {
+        if ($this->option('clean')) {
+            $this->info('Cleaning up existing test orders...');
+            $testOrders = Order::where('order_number', 'like', 'TEST-%')->get();
+            foreach ($testOrders as $order) {
+                // Delete order items first, then the order
+                $order->items()->delete();
+                $order->delete();
+            }
+        }
+
+        $this->info('Creating test orders at various statuses...');
+
+        // Get a buyer business (retailer) and location
+        $buyerBusiness = Business::where('business_type', 'retailer')->first();
+        if (! $buyerBusiness) {
+            $this->error('No buyer business found. Run the main seeder first.');
+
+            return 1;
+        }
+
+        $buyerLocation = Location::where('business_id', $buyerBusiness->id)->first();
+        if (! $buyerLocation) {
+            $this->error('No buyer location found. Run the main seeder first.');
+
+            return 1;
+        }
+
+        // Get a buyer user
+        $buyerUser = User::where('user_type', 'buyer')->first();
+        if (! $buyerUser) {
+            $this->error('No buyer user found. Run the main seeder first.');
+
+            return 1;
+        }
+
+        // Get products with batches and COAs
+        $products = Product::with(['brand.business', 'batches.coaFiles'])
+            ->where('is_active', true)
+            ->whereHas('batches.coaFiles')
+            ->limit(10)
+            ->get();
+
+        if ($products->isEmpty()) {
+            $this->error('No products with COAs found. Run seed:coa-data first.');
+
+            return 1;
+        }
+
+        $orders = [];
+
+        // 1. Order ready for pre-delivery review (after picking, before delivery)
+        $orders[] = $this->createTestOrder(
+            $buyerBusiness,
+            $buyerLocation,
+            $products->random(3),
+            'ready_for_delivery',
+            'TEST-PREDELIVERY-001',
+            'Order ready for pre-delivery review (Review #1)'
+        );
+
+        // 2. Order delivered and ready for post-delivery acceptance (Review #2)
+        $orders[] = $this->createTestOrder(
+            $buyerBusiness,
+            $buyerLocation,
+            $products->random(3),
+            'delivered',
+            'TEST-DELIVERED-001',
+            'Order delivered and ready for acceptance (Review #2)'
+        );
+
+        // 3. Order in progress (picking)
+        $orders[] = $this->createTestOrder(
+            $buyerBusiness,
+            $buyerLocation,
+            $products->random(2),
+            'in_progress',
+            'TEST-PICKING-001',
+            'Order currently being picked'
+        );
+
+        // 4. Order accepted and approved for delivery
+        $orders[] = $this->createTestOrder(
+            $buyerBusiness,
+            $buyerLocation,
+            $products->random(2),
+            'approved_for_delivery',
+            'TEST-APPROVED-001',
+            'Order approved for delivery (passed Review #1)'
+        );
+
+        // 5. Order out for delivery
+        $orders[] = $this->createTestOrder(
+            $buyerBusiness,
+            $buyerLocation,
+            $products->random(2),
+            'out_for_delivery',
+            'TEST-OUTDELIVERY-001',
+            'Order out for delivery'
+        );
+
+        $this->newLine();
+        $this->info('✓ Created '.count($orders).' test orders');
+        $this->newLine();
+
+        $this->table(
+            ['Order Number', 'Status', 'Items', 'Description'],
+            collect($orders)->map(fn ($order) => [
+                $order->order_number,
+                $order->status,
+                $order->items->count(),
+                $this->getOrderDescription($order->order_number),
+            ])
+        );
+
+        $this->newLine();
+        $this->info('You can now test the order flow in the UI:');
+        $this->line('  • Pre-delivery review: /b/'.$buyerBusiness->slug.'/orders/TEST-PREDELIVERY-001/pre-delivery-review');
+        $this->line('  • Post-delivery acceptance: /b/'.$buyerBusiness->slug.'/orders/TEST-DELIVERED-001/acceptance');
+
+        return 0;
+    }
+
+    private function createTestOrder(
+        Business $buyerBusiness,
+        Location $buyerLocation,
+        $products,
+        string $status,
+        string $orderNumber,
+        string $description
+    ): Order {
+        return DB::transaction(function () use ($buyerBusiness, $buyerLocation, $products, $status, $orderNumber) {
+            // Get first product's seller business
+            $sellerBusiness = $products->first()->brand->business;
+
+            // Calculate totals
+            $subtotal = $products->sum(function ($product) {
+                return $product->wholesale_price * 5; // 5 units each
+            });
+
+            $surchargePercent = Order::getSurchargePercentage('net_30');
+            $surcharge = $subtotal * ($surchargePercent / 100);
+            $taxRate = $buyerBusiness->getTaxRate();
+            $tax = ($subtotal + $surcharge) * $taxRate;
+            $total = $subtotal + $surcharge + $tax;
+
+            // Create order
+            $order = Order::create([
+                'order_number' => $orderNumber,
+                'business_id' => $buyerBusiness->id,
+                'seller_business_id' => $sellerBusiness->id,
+                'location_id' => $buyerLocation->id,
+                'status' => $status,
+                'fulfillment_method' => 'delivery',
+                'payment_terms' => 'net_30',
+                'subtotal' => $subtotal,
+                'tax' => $tax,
+                'surcharge' => $surcharge,
+                'total' => $total,
+                'notes' => 'Test order for flow testing',
+            ]);
+
+            // Create order items with batch allocation
+            foreach ($products as $product) {
+                $batch = $product->batches->first();
+                $quantity = 5;
+
+                // Allocate inventory
+                if ($batch) {
+                    $batch->allocate($quantity);
+                }
+
+                OrderItem::create([
+                    'order_id' => $order->id,
+                    'product_id' => $product->id,
+                    'batch_id' => $batch?->id,
+                    'product_name' => $product->name,
+                    'product_sku' => $product->sku,
+                    'brand_name' => $product->brand->name,
+                    'batch_number' => $batch?->batch_number,
+                    'quantity' => $quantity,
+                    'unit_price' => $product->wholesale_price,
+                    'line_total' => $product->wholesale_price * $quantity,
+                ]);
+            }
+
+            return $order->fresh(['items']);
+        });
+    }
+
+    private function getOrderDescription(string $orderNumber): string
+    {
+        return match (true) {
+            str_contains($orderNumber, 'PREDELIVERY') => 'Order ready for pre-delivery review (Review #1)',
+            str_contains($orderNumber, 'DELIVERED') => 'Order delivered and ready for acceptance (Review #2)',
+            str_contains($orderNumber, 'PICKING') => 'Order currently being picked',
+            str_contains($orderNumber, 'APPROVED') => 'Order approved for delivery (passed Review #1)',
+            str_contains($orderNumber, 'OUTDELIVERY') => 'Order out for delivery',
+            default => 'Test order',
+        };
+    }
+}

app/Console/Kernel.php

@@ -26,7 +26,15 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
+        // Check for scheduled broadcasts every minute
+        $schedule->job(new \App\Jobs\Marketing\ProcessScheduledBroadcastsJob)
+            ->everyMinute()
+            ->withoutOverlapping();
+
+        // Clean up temporary files older than 24 hours (runs daily at 2 AM)
+        $schedule->command('media:cleanup-temp')
+            ->dailyAt('02:00')
+            ->withoutOverlapping();
     }
 
     /**

app/Events/HighIntentBuyerDetected.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Analytics\BuyerEngagementScore;
+use App\Models\Analytics\IntentSignal;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class HighIntentBuyerDetected implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(
+        public int $sellerBusinessId,
+        public int $buyerBusinessId,
+        public IntentSignal $signal,
+        public ?BuyerEngagementScore $engagementScore = null
+    ) {}
+
+    /**
+     * Get the channels the event should broadcast on.
+     */
+    public function broadcastOn(): Channel
+    {
+        return new Channel("business.{$this->sellerBusinessId}.analytics");
+    }
+
+    /**
+     * Get the data to broadcast.
+     */
+    public function broadcastWith(): array
+    {
+        return [
+            'buyer_business_id' => $this->buyerBusinessId,
+            'buyer_business_name' => $this->signal->buyerBusiness?->name,
+            'signal_type' => $this->signal->signal_type,
+            'signal_strength' => $this->signal->signal_strength,
+            'product_id' => $this->signal->subject_type === 'App\Models\Product' ? $this->signal->subject_id : null,
+            'total_engagement_score' => $this->engagementScore?->total_score,
+            'detected_at' => $this->signal->detected_at->toIso8601String(),
+            'context' => $this->signal->context,
+        ];
+    }
+
+    /**
+     * The event's broadcast name.
+     */
+    public function broadcastAs(): string
+    {
+        return 'high-intent-buyer-detected';
+    }
+}

app/Filament/Pages/NotificationSettings.php

@@ -0,0 +1,192 @@
+<?php
+
+namespace App\Filament\Pages;
+
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Notifications\Notification;
+use Filament\Pages\Page;
+
+class NotificationSettings extends Page
+{
+    protected static \BackedEnum|string|null $navigationIcon = 'heroicon-o-envelope';
+
+    protected string $view = 'filament.pages.notification-settings';
+
+    protected static \UnitEnum|string|null $navigationGroup = 'System';
+
+    protected static ?string $navigationLabel = 'Notification Settings';
+
+    protected static ?int $navigationSort = 98;
+
+    public ?array $data = [];
+
+    public function mount(): void
+    {
+        $this->form->fill([
+            // Mail settings
+            'mail_driver' => config('mail.default'),
+            'mail_host' => config('mail.mailers.smtp.host'),
+            'mail_port' => config('mail.mailers.smtp.port'),
+            'mail_username' => config('mail.mailers.smtp.username'),
+            'mail_password' => config('mail.mailers.smtp.password'),
+            'mail_encryption' => config('mail.mailers.smtp.encryption'),
+            'mail_from_address' => config('mail.from.address'),
+            'mail_from_name' => config('mail.from.name'),
+
+            // SMS settings (Twilio example)
+            'sms_enabled' => env('SMS_ENABLED', false),
+            'sms_provider' => env('SMS_PROVIDER', 'twilio'),
+            'twilio_sid' => env('TWILIO_SID'),
+            'twilio_auth_token' => env('TWILIO_AUTH_TOKEN'),
+            'twilio_phone_number' => env('TWILIO_PHONE_NUMBER'),
+
+            // WhatsApp settings
+            'whatsapp_enabled' => env('WHATSAPP_ENABLED', false),
+            'whatsapp_provider' => env('WHATSAPP_PROVIDER', 'twilio'),
+            'whatsapp_business_number' => env('WHATSAPP_BUSINESS_NUMBER'),
+        ]);
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\Tabs::make('Notification Providers')
+                    ->tabs([
+                        Forms\Components\Tabs\Tab::make('Email')
+                            ->icon('heroicon-o-envelope')
+                            ->schema([
+                                Forms\Components\Section::make('Email Provider Configuration')
+                                    ->description('Configure your email provider for sending transactional emails')
+                                    ->schema([
+                                        Forms\Components\Select::make('mail_driver')
+                                            ->label('Mail Driver')
+                                            ->options([
+                                                'smtp' => 'SMTP',
+                                                'sendmail' => 'Sendmail',
+                                                'mailgun' => 'Mailgun',
+                                                'ses' => 'Amazon SES',
+                                                'postmark' => 'Postmark',
+                                            ])
+                                            ->required()
+                                            ->reactive(),
+                                        Forms\Components\Grid::make(2)
+                                            ->schema([
+                                                Forms\Components\TextInput::make('mail_host')
+                                                    ->label('SMTP Host')
+                                                    ->required()
+                                                    ->visible(fn ($get) => $get('mail_driver') === 'smtp'),
+                                                Forms\Components\TextInput::make('mail_port')
+                                                    ->label('SMTP Port')
+                                                    ->required()
+                                                    ->numeric()
+                                                    ->visible(fn ($get) => $get('mail_driver') === 'smtp'),
+                                                Forms\Components\TextInput::make('mail_username')
+                                                    ->label('Username')
+                                                    ->visible(fn ($get) => $get('mail_driver') === 'smtp'),
+                                                Forms\Components\TextInput::make('mail_password')
+                                                    ->label('Password')
+                                                    ->password()
+                                                    ->revealable()
+                                                    ->visible(fn ($get) => $get('mail_driver') === 'smtp'),
+                                                Forms\Components\Select::make('mail_encryption')
+                                                    ->label('Encryption')
+                                                    ->options([
+                                                        'tls' => 'TLS',
+                                                        'ssl' => 'SSL',
+                                                        '' => 'None',
+                                                    ])
+                                                    ->visible(fn ($get) => $get('mail_driver') === 'smtp'),
+                                                Forms\Components\TextInput::make('mail_from_address')
+                                                    ->label('From Address')
+                                                    ->email()
+                                                    ->required(),
+                                                Forms\Components\TextInput::make('mail_from_name')
+                                                    ->label('From Name')
+                                                    ->required(),
+                                            ]),
+                                    ]),
+                            ]),
+                        Forms\Components\Tabs\Tab::make('SMS')
+                            ->icon('heroicon-o-device-phone-mobile')
+                            ->schema([
+                                Forms\Components\Section::make('SMS Provider Configuration')
+                                    ->description('Configure your SMS provider for sending text messages')
+                                    ->schema([
+                                        Forms\Components\Toggle::make('sms_enabled')
+                                            ->label('Enable SMS Notifications')
+                                            ->reactive(),
+                                        Forms\Components\Select::make('sms_provider')
+                                            ->label('SMS Provider')
+                                            ->options([
+                                                'twilio' => 'Twilio',
+                                                'nexmo' => 'Vonage (Nexmo)',
+                                                'aws_sns' => 'AWS SNS',
+                                            ])
+                                            ->required()
+                                            ->reactive()
+                                            ->visible(fn ($get) => $get('sms_enabled')),
+                                        Forms\Components\Grid::make(2)
+                                            ->schema([
+                                                Forms\Components\TextInput::make('twilio_sid')
+                                                    ->label('Twilio Account SID')
+                                                    ->required()
+                                                    ->visible(fn ($get) => $get('sms_enabled') && $get('sms_provider') === 'twilio'),
+                                                Forms\Components\TextInput::make('twilio_auth_token')
+                                                    ->label('Twilio Auth Token')
+                                                    ->password()
+                                                    ->revealable()
+                                                    ->required()
+                                                    ->visible(fn ($get) => $get('sms_enabled') && $get('sms_provider') === 'twilio'),
+                                                Forms\Components\TextInput::make('twilio_phone_number')
+                                                    ->label('Twilio Phone Number')
+                                                    ->tel()
+                                                    ->required()
+                                                    ->visible(fn ($get) => $get('sms_enabled') && $get('sms_provider') === 'twilio'),
+                                            ]),
+                                    ]),
+                            ]),
+                        Forms\Components\Tabs\Tab::make('WhatsApp')
+                            ->icon('heroicon-o-chat-bubble-left-right')
+                            ->schema([
+                                Forms\Components\Section::make('WhatsApp Configuration')
+                                    ->description('Configure WhatsApp Business API for sending messages')
+                                    ->schema([
+                                        Forms\Components\Toggle::make('whatsapp_enabled')
+                                            ->label('Enable WhatsApp Notifications')
+                                            ->reactive(),
+                                        Forms\Components\Select::make('whatsapp_provider')
+                                            ->label('WhatsApp Provider')
+                                            ->options([
+                                                'twilio' => 'Twilio WhatsApp',
+                                                'whatsapp_cloud' => 'WhatsApp Cloud API',
+                                            ])
+                                            ->required()
+                                            ->reactive()
+                                            ->visible(fn ($get) => $get('whatsapp_enabled')),
+                                        Forms\Components\TextInput::make('whatsapp_business_number')
+                                            ->label('WhatsApp Business Number')
+                                            ->tel()
+                                            ->required()
+                                            ->visible(fn ($get) => $get('whatsapp_enabled')),
+                                    ]),
+                            ]),
+                    ])
+                    ->columnSpanFull(),
+            ])
+            ->statePath('data');
+    }
+
+    public function save(): void
+    {
+        // TODO: Save settings to environment file or database
+        // For now, this would require implementing a settings storage system
+
+        Notification::make()
+            ->title('Settings saved')
+            ->success()
+            ->body('Note: These settings are read from .env file. To persist changes, update your .env file.')
+            ->send();
+    }
+}

app/Filament/Resources/BatchResource.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\Batches\Schemas\BatchForm;
+use App\Filament\Resources\Batches\Tables\BatchesTable;
+use App\Filament\Resources\BatchResource\Pages;
+use App\Models\Batch;
+use App\Services\QrCodeService;
+use BackedEnum;
+use Filament\Notifications\Notification;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\BulkAction;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use UnitEnum;
+
+class BatchResource extends Resource
+{
+    protected static ?string $model = Batch::class;
+
+    protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-archive-box';
+
+    protected static ?string $navigationLabel = 'Batches';
+
+    protected static UnitEnum|string|null $navigationGroup = 'Inventory';
+
+    protected static ?int $navigationSort = 2;
+
+    public static function form(Schema $schema): Schema
+    {
+        return BatchForm::configure($schema);
+    }
+
+    public static function table(Table $table): Table
+    {
+        $table = BatchesTable::configure($table);
+
+        // Add custom QR and COA actions
+        return $table
+            ->recordActions(array_merge(
+                $table->getRecordActions(),
+                [
+                    Action::make('generate_qr')
+                        ->label('Generate QR')
+                        ->icon('heroicon-o-qr-code')
+                        ->action(function (Batch $record) {
+                            $qrService = app(QrCodeService::class);
+                            $result = $qrService->generateForBatch($record);
+
+                            if ($result['success']) {
+                                Notification::make()
+                                    ->title('QR Code Generated')
+                                    ->body($result['message'])
+                                    ->success()
+                                    ->send();
+                            } else {
+                                Notification::make()
+                                    ->title('Failed to generate QR code')
+                                    ->body($result['message'])
+                                    ->danger()
+                                    ->send();
+                            }
+                        })
+                        ->visible(fn (Batch $record) => ! $record->qr_code_path),
+
+                    Action::make('download_qr')
+                        ->label('Download QR')
+                        ->icon('heroicon-o-arrow-down-tray')
+                        ->url(fn (Batch $record) => route('seller.business.manufacturing.batches.qr-code.download', [
+                            'business' => $record->business->slug,
+                            'batch' => $record->id,
+                        ]))
+                        ->openUrlInNewTab()
+                        ->visible(fn (Batch $record) => $record->qr_code_path),
+
+                    Action::make('regenerate_qr')
+                        ->label('Regenerate QR')
+                        ->icon('heroicon-o-arrow-path')
+                        ->action(function (Batch $record) {
+                            $qrService = app(QrCodeService::class);
+                            $result = $qrService->regenerate($record);
+
+                            if ($result['success']) {
+                                Notification::make()
+                                    ->title('QR Code Regenerated')
+                                    ->success()
+                                    ->send();
+                            } else {
+                                Notification::make()
+                                    ->title('Failed to regenerate QR code')
+                                    ->body($result['message'])
+                                    ->danger()
+                                    ->send();
+                            }
+                        })
+                        ->requiresConfirmation()
+                        ->visible(fn (Batch $record) => $record->qr_code_path),
+
+                    Action::make('view_coa')
+                        ->label('View COA')
+                        ->icon('heroicon-o-document-text')
+                        ->url(fn (Batch $record) => route('public.coa.show', ['batchNumber' => $record->batch_number]))
+                        ->openUrlInNewTab()
+                        ->visible(fn (Batch $record) => $record->lab !== null),
+                ]
+            ))
+            ->bulkActions(array_merge(
+                $table->getBulkActions(),
+                [
+                    BulkAction::make('generate_qr_codes')
+                        ->label('Generate QR Codes')
+                        ->icon('heroicon-o-qr-code')
+                        ->action(function (Collection $records) {
+                            $qrService = app(QrCodeService::class);
+                            $batchIds = $records->pluck('id')->toArray();
+                            $result = $qrService->bulkGenerate($batchIds);
+
+                            Notification::make()
+                                ->title("Generated {$result['successful']} QR codes")
+                                ->body("Failed: {$result['failed']}")
+                                ->success()
+                                ->send();
+                        }),
+                ]
+            ));
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getEloquentQuery(): Builder
+    {
+        $query = parent::getEloquentQuery();
+
+        // Scope to user's business unless they're a super admin
+        if (! auth()->user()->hasRole('super_admin')) {
+            $query->where('business_id', auth()->user()->business_id);
+        }
+
+        return $query;
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListBatches::route('/'),
+            'create' => Pages\CreateBatch::route('/create'),
+            'view' => Pages\ViewBatch::route('/{record}'),
+            'edit' => Pages\EditBatch::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Resources/BatchResource/Pages/CreateBatch.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Filament\Resources\BatchResource\Pages;
+
+use App\Filament\Resources\BatchResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateBatch extends CreateRecord
+{
+    protected static string $resource = BatchResource::class;
+
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        $data['business_id'] = auth()->user()->business_id;
+
+        return $data;
+    }
+}

app/Filament/Resources/BatchResource/Pages/EditBatch.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Filament\Resources\BatchResource\Pages;
+
+use App\Filament\Resources\BatchResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditBatch extends EditRecord
+{
+    protected static string $resource = BatchResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\ViewAction::make(),
+            Actions\DeleteAction::make(),
+        ];
+    }
+}

app/Filament/Resources/BatchResource/Pages/ListBatches.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\BatchResource\Pages;
+
+use App\Filament\Resources\BatchResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListBatches extends ListRecords
+{
+    protected static string $resource = BatchResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}

app/Filament/Resources/BatchResource/Pages/ViewBatch.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\BatchResource\Pages;
+
+use App\Filament\Resources\BatchResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewBatch extends ViewRecord
+{
+    protected static string $resource = BatchResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\EditAction::make(),
+        ];
+    }
+}

app/Filament/Resources/Batches/Schemas/BatchForm.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Resources\Batches\Schemas;
 
+use Filament\Forms;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -18,84 +19,144 @@ class BatchForm
             ->components([
                 Section::make('Batch Information')
                     ->schema([
+                        TextInput::make('batch_number')
+                            ->label('Batch Number')
+                            ->placeholder('Auto-generated if left blank')
+                            ->maxLength(255)
+                            ->helperText('Unique identifier for this batch'),
+
                         Select::make('product_id')
+                            ->label('Product')
                             ->relationship('product', 'name')
                             ->searchable()
                             ->preload()
-                            ->required()
-                            ->columnSpan(2),
-                        TextInput::make('batch_number')
-                            ->required()
-                            ->unique(ignoreRecord: true)
-                            ->helperText('Unique identifier for this batch (e.g., TB-AM-240315)'),
-                        TextInput::make('internal_code')
-                            ->helperText('Internal production/tracking code (optional)'),
-                    ])
-                    ->columns(2),
+                            ->required(),
 
-                Section::make('Production Dates')
-                    ->schema([
-                        DatePicker::make('production_date')
-                            ->helperText('Date the batch was produced/manufactured'),
-                        DatePicker::make('harvest_date')
-                            ->helperText('Harvest date (for flower products)'),
-                        DatePicker::make('package_date')
-                            ->helperText('Date the batch was packaged'),
-                        DatePicker::make('expiration_date')
-                            ->helperText('Expiration/best-by date'),
+                        Select::make('batch_type')
+                            ->label('Batch Type')
+                            ->options([
+                                'intake' => 'Intake',
+                                'production' => 'Production',
+                                'finished' => 'Finished',
+                            ])
+                            ->default('finished')
+                            ->required()
+                            ->helperText('Type of batch in the production process'),
+
+                        Select::make('lab_id')
+                            ->label('Lab Test')
+                            ->relationship('lab', 'lab_name')
+                            ->searchable()
+                            ->preload()
+                            ->helperText('Associated lab test results'),
+
+                        Select::make('parent_batch_id')
+                            ->label('Parent Batch')
+                            ->relationship('parentBatch', 'batch_number')
+                            ->searchable()
+                            ->preload()
+                            ->helperText('Parent batch if this was produced from another batch'),
                     ])
                     ->columns(2),
 
                 Section::make('Inventory Management')
                     ->schema([
                         TextInput::make('quantity_produced')
+                            ->label('Quantity Produced')
                             ->required()
                             ->numeric()
                             ->default(0)
                             ->helperText('Total units produced in this batch'),
+
                         TextInput::make('quantity_available')
+                            ->label('Quantity Available')
                             ->required()
                             ->numeric()
                             ->default(0)
                             ->helperText('Units currently available for sale'),
+
                         TextInput::make('quantity_allocated')
+                            ->label('Quantity Allocated')
                             ->numeric()
                             ->default(0)
                             ->disabled()
                             ->dehydrated(false)
                             ->helperText('Units reserved in pending orders (auto-calculated)'),
+
                         TextInput::make('quantity_sold')
+                            ->label('Quantity Sold')
                             ->numeric()
                             ->default(0)
                             ->disabled()
                             ->dehydrated(false)
                             ->helperText('Units already sold (auto-calculated)'),
                     ])
-                    ->columns(2)
+                    ->columns(4)
                     ->description('Allocated and sold quantities are automatically managed by the system.'),
 
-                Section::make('Status & Compliance')
+                Section::make('Dates')
                     ->schema([
-                        Toggle::make('is_active')
-                            ->default(true)
-                            ->helperText('Is this batch available for sale?'),
-                        Toggle::make('is_tested')
-                            ->default(false)
-                            ->helperText('Has this batch passed lab testing?'),
-                        Toggle::make('is_quarantined')
-                            ->default(false)
-                            ->helperText('Is this batch quarantined pending results?'),
-                    ])
-                    ->columns(3),
+                        DatePicker::make('production_date')
+                            ->label('Production Date')
+                            ->helperText('Date the batch was produced/manufactured'),
 
-                Section::make('Additional Information')
+                        DatePicker::make('intake_date')
+                            ->label('Intake Date')
+                            ->helperText('Date the batch was received/intake'),
+
+                        DatePicker::make('expiration_date')
+                            ->label('Expiration Date')
+                            ->helperText('Expiration/best-by date'),
+
+                        DatePicker::make('test_date')
+                            ->label('Test Date')
+                            ->helperText('Date of lab testing'),
+                    ])
+                    ->columns(2),
+
+                Section::make('Warehouse & Location')
                     ->schema([
+                        TextInput::make('warehouse_location')
+                            ->label('Warehouse Location')
+                            ->placeholder('e.g., Shelf A-15')
+                            ->maxLength(255)
+                            ->helperText('Physical location in warehouse'),
+
+                        TextInput::make('container_type')
+                            ->label('Container Type')
+                            ->placeholder('e.g., Turkey Bag, Box')
+                            ->maxLength(255)
+                            ->helperText('Type of container batch is stored in'),
+                    ])
+                    ->columns(2),
+
+                Section::make('Quality & Compliance')
+                    ->schema([
+                        Toggle::make('is_quarantined')
+                            ->label('Quarantined')
+                            ->default(false)
+                            ->helperText('Is this batch quarantined?')
+                            ->reactive(),
+
+                        Textarea::make('quarantine_reason')
+                            ->label('Quarantine Reason')
+                            ->rows(2)
+                            ->helperText('Reason for quarantine')
+                            ->visible(fn (Forms\Get $get) => $get('is_quarantined'))
+                            ->columnSpanFull(),
+
+                        Toggle::make('is_released_for_sale')
+                            ->label('Released for Sale')
+                            ->default(false)
+                            ->helperText('Has this batch been released for sale?'),
+
                         Textarea::make('notes')
+                            ->label('Notes')
                             ->rows(3)
                             ->helperText('Production notes, special handling instructions, etc.')
                             ->columnSpanFull(),
                     ])
-                    ->collapsible(),
+                    ->columns(2),
             ]);
     }
 }

app/Filament/Resources/Batches/Tables/BatchesTable.php

@@ -23,18 +23,35 @@ class BatchesTable
         return $table
             ->columns([
                 TextColumn::make('batch_number')
+                    ->label('Batch #')
                     ->searchable()
                     ->sortable()
                     ->copyable()
                     ->weight('bold'),
                 TextColumn::make('product.name')
+                    ->label('Product')
                     ->searchable()
                     ->sortable()
-                    ->description(fn ($record) => $record->product->sku ?? null),
+                    ->description(fn ($record) => $record->product->sku ?? null)
+                    ->limit(30),
+                TextColumn::make('batch_type')
+                    ->label('Type')
+                    ->badge()
+                    ->color(fn (string $state): string => match ($state) {
+                        'intake' => 'info',
+                        'production' => 'warning',
+                        'finished' => 'success',
+                        default => 'gray',
+                    }),
+                TextColumn::make('warehouse_location')
+                    ->label('Location')
+                    ->searchable()
+                    ->toggleable(),
                 TextColumn::make('production_date')
+                    ->label('Produced')
                     ->date()
                     ->sortable()
-                    ->toggleable(),
+                    ->toggleable(isToggledHiddenByDefault: true),
                 TextColumn::make('expiration_date')
                     ->date()
                     ->sortable()
@@ -60,14 +77,13 @@ class BatchesTable
                     ->label('Status')
                     ->badge()
                     ->getStateUsing(fn ($record) => $record->is_quarantined ? 'Quarantined' :
-                        (! $record->is_active ? 'Inactive' :
-                        (! $record->is_tested ? 'Pending Test' : 'Active'))
+                        (! $record->is_released_for_sale ? 'Not Released' : 'Released')
                     )
                     ->color(fn (string $state): string => match ($state) {
-                        'Active' => Color::Green,
-                        'Pending Test' => Color::Yellow,
+                        'Released' => Color::Green,
+                        'Not Released' => Color::Yellow,
                         'Quarantined' => Color::Red,
-                        'Inactive' => Color::Gray,
+                        default => Color::Gray,
                     }),
                 TextColumn::make('created_at')
                     ->dateTime()
@@ -80,19 +96,23 @@ class BatchesTable
             ])
             ->defaultSort('created_at', 'desc')
             ->filters([
+                SelectFilter::make('batch_type')
+                    ->options([
+                        'intake' => 'Intake',
+                        'production' => 'Production',
+                        'finished' => 'Finished',
+                    ]),
                 SelectFilter::make('product')
                     ->relationship('product', 'name')
                     ->searchable()
                     ->preload(),
-                Filter::make('active')
-                    ->query(fn (Builder $query): Builder => $query->where('is_active', true))
+                Filter::make('released')
+                    ->label('Released for Sale')
+                    ->query(fn (Builder $query): Builder => $query->where('is_released_for_sale', true))
                     ->toggle(),
                 Filter::make('available')
                     ->query(fn (Builder $query): Builder => $query->where('quantity_available', '>', 0))
                     ->toggle(),
-                Filter::make('tested')
-                    ->query(fn (Builder $query): Builder => $query->where('is_tested', true))
-                    ->toggle(),
                 Filter::make('quarantined')
                     ->query(fn (Builder $query): Builder => $query->where('is_quarantined', true))
                     ->toggle(),

app/Filament/Resources/BrandResource.php

@@ -57,7 +57,7 @@ class BrandResource extends Resource
     public static function getRelations(): array
     {
         return [
-            //
+            \Tapp\FilamentAuditing\RelationManagers\AuditsRelationManager::class,
         ];
     }
 

app/Filament/Resources/BusinessResource.php

@@ -454,6 +454,80 @@ class BusinessResource extends Resource
                                     ->columns(2),
                             ]),
 
+                        Tab::make('Modules')
+                            ->schema([
+                                Section::make('Premium Feature Modules')
+                                    ->description('Enable optional premium features for this business. Modules are activated on a per-business basis.')
+                                    ->schema([
+                                        Grid::make(2)
+                                            ->schema([
+                                                Toggle::make('has_analytics')
+                                                    ->label('Analytics Module')
+                                                    ->helperText('Premium analytics: Buyer engagement tracking, intent signals, RFDI scoring, email campaign analytics')
+                                                    ->default(false)
+                                                    ->inline(false),
+
+                                                Toggle::make('has_marketing')
+                                                    ->label('Marketing Module')
+                                                    ->helperText('Email campaigns, marketing automation, broadcast messages, templates')
+                                                    ->default(false)
+                                                    ->inline(false),
+
+                                                Toggle::make('has_manufacturing')
+                                                    ->label('Manufacturing Module')
+                                                    ->helperText('Work orders, batch production, BOM management, purchase orders')
+                                                    ->default(false)
+                                                    ->inline(false),
+
+                                                Toggle::make('has_processing')
+                                                    ->label('Processing Module')
+                                                    ->helperText('Hash washing, rosin pressing, material conversions, wash reports')
+                                                    ->default(false)
+                                                    ->inline(false),
+
+                                                Toggle::make('has_inventory')
+                                                    ->label('Advanced Inventory Module')
+                                                    ->helperText('Multi-location tracking, batch/lot numbers, expiration management, inventory movements, alerts')
+                                                    ->default(false)
+                                                    ->inline(false),
+
+                                                Toggle::make('has_compliance')
+                                                    ->label('Compliance Module')
+                                                    ->helperText('METRC integration, regulatory tracking, lab results, chain of custody')
+                                                    ->default(false)
+                                                    ->inline(false),
+                                            ]),
+                                    ]),
+
+                                Section::make('Module Information')
+                                    ->description('Module activation status and billing information')
+                                    ->schema([
+                                        Forms\Components\Placeholder::make('active_modules_count')
+                                            ->label('Active Modules')
+                                            ->content(function ($record) {
+                                                if (! $record) {
+                                                    return '0 modules enabled';
+                                                }
+
+                                                $modules = $record->getEnabledModules();
+                                                $count = count($modules);
+
+                                                if ($count === 0) {
+                                                    return new \Illuminate\Support\HtmlString(
+                                                        '<span class="text-gray-500">0 modules enabled (Basic tier)</span>'
+                                                    );
+                                                }
+
+                                                $moduleList = implode(', ', array_map('ucfirst', $modules));
+
+                                                return new \Illuminate\Support\HtmlString(
+                                                    '<span class="font-semibold text-green-600">'.$count.' module'.($count !== 1 ? 's' : '').' enabled</span><br>'.
+                                                    '<span class="text-sm text-gray-600">'.$moduleList.'</span>'
+                                                );
+                                            }),
+                                    ])
+                                    ->columns(1),
+                            ]),
                         Tab::make('Status & Settings')
                             ->schema([
                                 Grid::make(2)
@@ -547,6 +621,24 @@ class BusinessResource extends Resource
                     })
                     ->searchable()
                     ->sortable(),
+                TextColumn::make('modules')
+                    ->label('Active Modules')
+                    ->formatStateUsing(function ($record) {
+                        $modules = [];
+                        if ($record->has_analytics) {
+                            $modules[] = 'Analytics';
+                        }
+                        if ($record->has_marketing) {
+                            $modules[] = 'Marketing';
+                        }
+                        if ($record->has_manufacturing) {
+                            $modules[] = 'Manufacturing';
+                        }
+
+                        return empty($modules) ? 'None' : implode(', ', $modules);
+                    })
+                    ->badge()
+                    ->color(fn ($record) => ($record->has_analytics || $record->has_marketing || $record->has_manufacturing) ? 'success' : 'gray'),
                 BadgeColumn::make('status')
                     ->label('Status')
                     ->formatStateUsing(fn (string $state): string => ucfirst(str_replace('_', ' ', $state)))

app/Filament/Resources/ComponentResource.php

@@ -52,7 +52,7 @@ class ComponentResource extends Resource
     public static function getRelations(): array
     {
         return [
-            //
+            \Tapp\FilamentAuditing\RelationManagers\AuditsRelationManager::class,
         ];
     }
 

app/Filament/Resources/EmailTemplateResource.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\EmailTemplateResource\Pages\CreateEmailTemplate;
+use App\Filament\Resources\EmailTemplateResource\Pages\EditEmailTemplate;
+use App\Filament\Resources\EmailTemplateResource\Pages\ListEmailTemplates;
+use App\Filament\Resources\EmailTemplateResource\Pages\ViewEmailTemplate;
+use App\Filament\Resources\EmailTemplateResource\Schemas\EmailTemplateForm;
+use App\Filament\Resources\EmailTemplateResource\Schemas\EmailTemplateInfolist;
+use App\Filament\Resources\EmailTemplateResource\Tables\EmailTemplatesTable;
+use App\Models\EmailTemplate;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables\Table;
+
+class EmailTemplateResource extends Resource
+{
+    protected static ?string $model = EmailTemplate::class;
+
+    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-envelope';
+
+    protected static \UnitEnum|string|null $navigationGroup = 'System';
+
+    protected static ?int $navigationSort = 10;
+
+    protected static ?string $navigationLabel = 'Email Templates';
+
+    protected static ?string $modelLabel = 'Email Template';
+
+    protected static ?string $pluralModelLabel = 'Email Templates';
+
+    public static function getNavigationBadge(): ?string
+    {
+        // Count inactive templates
+        return static::getModel()::where('is_active', false)->count() ?: null;
+    }
+
+    public static function form(Schema $schema): Schema
+    {
+        return EmailTemplateForm::configure($schema);
+    }
+
+    public static function infolist(Schema $schema): Schema
+    {
+        return EmailTemplateInfolist::configure($schema);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return EmailTemplatesTable::configure($table);
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => ListEmailTemplates::route('/'),
+            'create' => CreateEmailTemplate::route('/create'),
+            'view' => ViewEmailTemplate::route('/{record}'),
+            'edit' => EditEmailTemplate::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Resources/EmailTemplateResource/Pages/CreateEmailTemplate.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Pages;
+
+use App\Filament\Resources\EmailTemplateResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateEmailTemplate extends CreateRecord
+{
+    protected static string $resource = EmailTemplateResource::class;
+
+    protected function getRedirectUrl(): string
+    {
+        return $this->getResource()::getUrl('index');
+    }
+}

app/Filament/Resources/EmailTemplateResource/Pages/EditEmailTemplate.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Pages;
+
+use App\Filament\Resources\EmailTemplateResource;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\ViewAction;
+use Filament\Resources\Pages\EditRecord;
+
+class EditEmailTemplate extends EditRecord
+{
+    protected static string $resource = EmailTemplateResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            ViewAction::make(),
+            DeleteAction::make(),
+        ];
+    }
+
+    protected function getRedirectUrl(): string
+    {
+        return $this->getResource()::getUrl('index');
+    }
+}

app/Filament/Resources/EmailTemplateResource/Pages/ListEmailTemplates.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Pages;
+
+use App\Filament\Resources\EmailTemplateResource;
+use Filament\Actions\CreateAction;
+use Filament\Resources\Pages\ListRecords;
+
+class ListEmailTemplates extends ListRecords
+{
+    protected static string $resource = EmailTemplateResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            CreateAction::make(),
+        ];
+    }
+}

app/Filament/Resources/EmailTemplateResource/Pages/ViewEmailTemplate.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Pages;
+
+use App\Filament\Resources\EmailTemplateResource;
+use Filament\Actions\EditAction;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewEmailTemplate extends ViewRecord
+{
+    protected static string $resource = EmailTemplateResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            EditAction::make(),
+        ];
+    }
+}

app/Filament/Resources/EmailTemplateResource/Schemas/EmailTemplateForm.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Schemas;
+
+use App\Models\EmailTemplate;
+use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\Placeholder;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Schemas\Components\Section;
+use Filament\Schemas\Schema;
+
+class EmailTemplateForm
+{
+    public static function configure(Schema $schema): Schema
+    {
+        return $schema
+            ->columns(1)
+            ->components([
+                Section::make('Template Details')
+                    ->schema([
+                        TextInput::make('key')
+                            ->label('Template Key')
+                            ->required()
+                            ->unique(ignoreRecord: true)
+                            ->regex('/^[a-z0-9_-]+$/')
+                            ->helperText('Lowercase alphanumeric characters, hyphens and underscores only')
+                            ->disabled(fn ($context) => $context === 'edit')
+                            ->dehydrated(fn ($context) => $context === 'create')
+                            ->columnSpanFull(),
+
+                        TextInput::make('name')
+                            ->label('Template Name')
+                            ->required()
+                            ->maxLength(255)
+                            ->columnSpanFull(),
+
+                        TextInput::make('subject')
+                            ->label('Email Subject')
+                            ->required()
+                            ->maxLength(255)
+                            ->columnSpanFull(),
+
+                        Textarea::make('description')
+                            ->label('Description')
+                            ->helperText('Describe when this template is used')
+                            ->rows(3)
+                            ->columnSpanFull(),
+
+                        TextInput::make('available_variables')
+                            ->label('Available Variables')
+                            ->helperText('Comma-separated list (e.g., verification_url, email, logo_url)')
+                            ->afterStateHydrated(function (TextInput $component, $state) {
+                                if (is_array($state)) {
+                                    $component->state(implode(', ', $state));
+                                }
+                            })
+                            ->dehydrateStateUsing(function ($state) {
+                                if (empty($state)) {
+                                    return [];
+                                }
+
+                                return array_map('trim', explode(',', $state));
+                            })
+                            ->columnSpanFull(),
+
+                        Checkbox::make('is_active')
+                            ->label('Template is Active')
+                            ->default(true)
+                            ->inline(false),
+                    ])
+                    ->columns(2),
+
+                Section::make('Email Content')
+                    ->schema([
+                        Textarea::make('body_html')
+                            ->label('HTML Body')
+                            ->required()
+                            ->rows(25)
+                            ->helperText('Use {{ $variable }} syntax for dynamic content')
+                            ->columnSpanFull()
+                            ->extraAttributes(['style' => 'font-family: monospace; font-size: 13px;']),
+
+                        Textarea::make('body_text')
+                            ->label('Plain Text Body (Optional)')
+                            ->rows(15)
+                            ->helperText('Plain text fallback for email clients that don\'t support HTML')
+                            ->columnSpanFull()
+                            ->extraAttributes(['style' => 'font-family: monospace; font-size: 13px;']),
+                    ]),
+
+                Section::make('Metadata')
+                    ->schema([
+                        Placeholder::make('created_at')
+                            ->label('Created At')
+                            ->content(fn (?EmailTemplate $record): string => $record?->created_at?->diffForHumans() ?? '-'),
+
+                        Placeholder::make('updated_at')
+                            ->label('Last Updated')
+                            ->content(fn (?EmailTemplate $record): string => $record?->updated_at?->diffForHumans() ?? '-'),
+                    ])
+                    ->columns(2)
+                    ->hidden(fn ($context) => $context === 'create'),
+            ]);
+    }
+}

app/Filament/Resources/EmailTemplateResource/Schemas/EmailTemplateInfolist.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Schemas;
+
+use Filament\Infolists\Components\IconEntry;
+use Filament\Infolists\Components\TextEntry;
+use Filament\Infolists\Components\ViewEntry;
+use Filament\Schemas\Schema;
+use Illuminate\Support\HtmlString;
+
+class EmailTemplateInfolist
+{
+    public static function configure(Schema $schema): Schema
+    {
+        return $schema
+            ->components([
+                TextEntry::make('name')
+                    ->label('Template Name')
+                    ->columnSpan(1),
+
+                TextEntry::make('key')
+                    ->label('Template Key')
+                    ->badge()
+                    ->copyable()
+                    ->copyMessage('Key copied!')
+                    ->copyMessageDuration(1500)
+                    ->columnSpan(1),
+
+                TextEntry::make('subject')
+                    ->label('Email Subject')
+                    ->columnSpan(2),
+
+                TextEntry::make('description')
+                    ->label('Description')
+                    ->columnSpan(2)
+                    ->placeholder('No description provided'),
+
+                TextEntry::make('available_variables')
+                    ->label('Available Variables')
+                    ->badge()
+                    ->separator(',')
+                    ->columnSpan(2)
+                    ->placeholder('No variables defined'),
+
+                IconEntry::make('is_active')
+                    ->label('Status')
+                    ->boolean()
+                    ->trueIcon('heroicon-o-check-circle')
+                    ->falseIcon('heroicon-o-x-circle')
+                    ->trueColor('success')
+                    ->falseColor('danger')
+                    ->columnSpan(1),
+
+                TextEntry::make('created_at')
+                    ->label('Created')
+                    ->dateTime()
+                    ->since()
+                    ->columnSpan(1),
+
+                TextEntry::make('updated_at')
+                    ->label('Last Updated')
+                    ->dateTime()
+                    ->since()
+                    ->columnSpan(1),
+
+                ViewEntry::make('preview')
+                    ->label('HTML Preview')
+                    ->viewData(fn ($record) => [
+                        'html' => $record->body_html,
+                    ])
+                    ->view('filament.email-template-preview')
+                    ->columnSpan(2),
+
+                TextEntry::make('body_html')
+                    ->label('HTML Source')
+                    ->formatStateUsing(fn ($state) => new HtmlString('<pre class="text-xs font-mono bg-gray-100 dark:bg-gray-900 p-4 rounded overflow-x-auto whitespace-pre-wrap">'.htmlspecialchars($state).'</pre>'))
+                    ->columnSpan(2),
+
+                TextEntry::make('body_text')
+                    ->label('Plain Text Version')
+                    ->formatStateUsing(fn ($state) => new HtmlString('<pre class="text-xs font-mono bg-gray-100 dark:bg-gray-900 p-4 rounded overflow-x-auto whitespace-pre-wrap">'.htmlspecialchars($state ?: 'No plain text version').'</pre>'))
+                    ->columnSpan(2)
+                    ->hidden(fn ($record) => empty($record->body_text)),
+            ])
+            ->columns(2);
+    }
+}

app/Filament/Resources/EmailTemplateResource/Tables/EmailTemplatesTable.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Filament\Resources\EmailTemplateResource\Tables;
+
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\ViewAction;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Filters\SelectFilter;
+use Filament\Tables\Table;
+
+class EmailTemplatesTable
+{
+    public static function configure(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('name')
+                    ->label('Template Name')
+                    ->searchable()
+                    ->sortable()
+                    ->weight('bold'),
+
+                TextColumn::make('key')
+                    ->label('Key')
+                    ->searchable()
+                    ->sortable()
+                    ->fontFamily('mono')
+                    ->size('sm')
+                    ->copyable()
+                    ->copyMessage('Key copied!')
+                    ->copyMessageDuration(1500),
+
+                TextColumn::make('subject')
+                    ->label('Subject')
+                    ->searchable()
+                    ->limit(50)
+                    ->wrap(),
+
+                IconColumn::make('is_active')
+                    ->label('Status')
+                    ->boolean()
+                    ->trueIcon('heroicon-o-check-circle')
+                    ->falseIcon('heroicon-o-x-circle')
+                    ->trueColor('success')
+                    ->falseColor('danger')
+                    ->sortable(),
+
+                TextColumn::make('updated_at')
+                    ->label('Last Updated')
+                    ->dateTime()
+                    ->sortable()
+                    ->since()
+                    ->size('sm'),
+            ])
+            ->defaultSort('name')
+            ->filters([
+                SelectFilter::make('is_active')
+                    ->label('Status')
+                    ->options([
+                        true => 'Active',
+                        false => 'Inactive',
+                    ]),
+            ])
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+            ])
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}

app/Filament/Resources/FailedJobResource.php

@@ -0,0 +1,168 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\FailedJobResource\Pages;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\DB;
+
+class FailedJobResource extends Resource
+{
+    protected static ?string $model = null;
+
+    protected static \BackedEnum|string|null $navigationIcon = 'heroicon-o-exclamation-triangle';
+
+    protected static ?string $navigationLabel = 'Failed Jobs';
+
+    protected static \UnitEnum|string|null $navigationGroup = 'System';
+
+    protected static ?int $navigationSort = 99;
+
+    public static function getModel(): string
+    {
+        return config('queue.failed.database') ?? 'failed_jobs';
+    }
+
+    public static function getEloquentQuery(): Builder
+    {
+        return DB::table('failed_jobs')->orderBy('failed_at', 'desc');
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->query(fn () => DB::table('failed_jobs')->orderBy('failed_at', 'desc'))
+            ->columns([
+                Tables\Columns\TextColumn::make('id')
+                    ->label('ID')
+                    ->sortable()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('queue')
+                    ->badge()
+                    ->color('info')
+                    ->sortable()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('connection')
+                    ->badge()
+                    ->color('gray')
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('payload')
+                    ->label('Job Type')
+                    ->getStateUsing(function ($record) {
+                        $payload = json_decode($record->payload, true);
+                        $displayName = $payload['displayName'] ?? 'Unknown';
+                        // Extract just the class name
+                        if (str_contains($displayName, '\\')) {
+                            return class_basename($displayName);
+                        }
+
+                        return $displayName;
+                    })
+                    ->badge()
+                    ->color('warning')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('exception')
+                    ->label('Error')
+                    ->limit(100)
+                    ->tooltip(fn ($record) => $record->exception)
+                    ->wrap()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('failed_at')
+                    ->label('Failed At')
+                    ->dateTime()
+                    ->sortable()
+                    ->since()
+                    ->description(fn ($record) => $record->failed_at),
+            ])
+            ->filters([
+                Tables\Filters\SelectFilter::make('queue')
+                    ->options(function () {
+                        return DB::table('failed_jobs')
+                            ->distinct()
+                            ->pluck('queue', 'queue')
+                            ->toArray();
+                    }),
+            ])
+            ->actions([
+                Tables\Actions\Action::make('retry')
+                    ->label('Retry')
+                    ->icon('heroicon-o-arrow-path')
+                    ->color('success')
+                    ->requiresConfirmation()
+                    ->action(function ($record) {
+                        Artisan::call('queue:retry', ['id' => [$record->id]]);
+                    })
+                    ->successNotificationTitle('Job queued for retry'),
+                Tables\Actions\Action::make('view_details')
+                    ->label('View Details')
+                    ->icon('heroicon-o-eye')
+                    ->modalHeading('Failed Job Details')
+                    ->modalContent(function ($record) {
+                        $payload = json_decode($record->payload, true);
+
+                        return view('filament.resources.failed-job.view-details', [
+                            'record' => $record,
+                            'payload' => $payload,
+                        ]);
+                    })
+                    ->modalSubmitAction(false)
+                    ->modalCancelActionLabel('Close'),
+                Tables\Actions\DeleteAction::make()
+                    ->label('Delete')
+                    ->action(fn ($record) => DB::table('failed_jobs')->where('id', $record->id)->delete())
+                    ->successNotificationTitle('Failed job deleted'),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkAction::make('retry_selected')
+                    ->label('Retry Selected')
+                    ->icon('heroicon-o-arrow-path')
+                    ->color('success')
+                    ->requiresConfirmation()
+                    ->action(function ($records) {
+                        foreach ($records as $record) {
+                            Artisan::call('queue:retry', ['id' => [$record->id]]);
+                        }
+                    })
+                    ->deselectRecordsAfterCompletion()
+                    ->successNotificationTitle('Selected jobs queued for retry'),
+                Tables\Actions\BulkAction::make('delete_selected')
+                    ->label('Delete Selected')
+                    ->icon('heroicon-o-trash')
+                    ->color('danger')
+                    ->requiresConfirmation()
+                    ->action(function ($records) {
+                        $ids = collect($records)->pluck('id')->toArray();
+                        DB::table('failed_jobs')->whereIn('id', $ids)->delete();
+                    })
+                    ->deselectRecordsAfterCompletion()
+                    ->successNotificationTitle('Selected jobs deleted'),
+            ])
+            ->defaultSort('failed_at', 'desc')
+            ->poll('30s')
+            ->emptyStateHeading('No Failed Jobs')
+            ->emptyStateDescription('All jobs are processing successfully!')
+            ->emptyStateIcon('heroicon-o-check-circle');
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListFailedJobs::route('/'),
+        ];
+    }
+
+    public static function canCreate(): bool
+    {
+        return false;
+    }
+
+    public static function canEdit(Model $record): bool
+    {
+        return false;
+    }
+}

app/Filament/Resources/FailedJobResource/Pages/ListFailedJobs.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Filament\Resources\FailedJobResource\Pages;
+
+use App\Filament\Resources\FailedJobResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\DB;
+
+class ListFailedJobs extends ListRecords
+{
+    protected static string $resource = FailedJobResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\Action::make('retry_all')
+                ->label('Retry All Failed Jobs')
+                ->icon('heroicon-o-arrow-path')
+                ->color('success')
+                ->requiresConfirmation()
+                ->modalHeading('Retry All Failed Jobs?')
+                ->modalDescription('This will attempt to retry all failed jobs in the queue.')
+                ->action(function () {
+                    Artisan::call('queue:retry', ['id' => ['all']]);
+                })
+                ->successNotificationTitle('All failed jobs queued for retry')
+                ->visible(fn () => DB::table('failed_jobs')->count() > 0),
+            Actions\Action::make('flush_all')
+                ->label('Delete All Failed Jobs')
+                ->icon('heroicon-o-trash')
+                ->color('danger')
+                ->requiresConfirmation()
+                ->modalHeading('Delete All Failed Jobs?')
+                ->modalDescription('This will permanently delete all failed job records. This action cannot be undone.')
+                ->action(function () {
+                    Artisan::call('queue:flush');
+                })
+                ->successNotificationTitle('All failed jobs deleted')
+                ->visible(fn () => DB::table('failed_jobs')->count() > 0),
+        ];
+    }
+
+    protected function getHeaderWidgets(): array
+    {
+        return [
+            FailedJobResource\Widgets\FailedJobsStatsWidget::class,
+        ];
+    }
+}

app/Filament/Resources/FailedJobResource/Widgets/FailedJobsStatsWidget.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Resources\FailedJobResource\Widgets;
+
+use Filament\Widgets\StatsOverviewWidget as BaseWidget;
+use Filament\Widgets\StatsOverviewWidget\Stat;
+use Illuminate\Support\Facades\DB;
+
+class FailedJobsStatsWidget extends BaseWidget
+{
+    protected function getStats(): array
+    {
+        $totalFailed = DB::table('failed_jobs')->count();
+        $failedToday = DB::table('failed_jobs')
+            ->whereDate('failed_at', today())
+            ->count();
+        $failedThisWeek = DB::table('failed_jobs')
+            ->where('failed_at', '>=', now()->startOfWeek())
+            ->count();
+
+        // Get most common failed job type
+        $commonFailure = DB::table('failed_jobs')
+            ->select('payload')
+            ->get()
+            ->map(function ($job) {
+                $payload = json_decode($job->payload, true);
+
+                return $payload['displayName'] ?? 'Unknown';
+            })
+            ->countBy()
+            ->sortDesc()
+            ->first();
+
+        return [
+            Stat::make('Total Failed Jobs', $totalFailed)
+                ->description('All time')
+                ->descriptionIcon('heroicon-m-exclamation-triangle')
+                ->color($totalFailed > 0 ? 'danger' : 'success'),
+            Stat::make('Failed Today', $failedToday)
+                ->description(now()->format('M d, Y'))
+                ->descriptionIcon('heroicon-m-calendar')
+                ->color($failedToday > 0 ? 'warning' : 'success'),
+            Stat::make('Failed This Week', $failedThisWeek)
+                ->description('Since '.now()->startOfWeek()->format('M d'))
+                ->descriptionIcon('heroicon-m-chart-bar')
+                ->color($failedThisWeek > 0 ? 'warning' : 'success'),
+        ];
+    }
+
+    protected function getPollingInterval(): ?string
+    {
+        return '30s';
+    }
+}

app/Filament/Resources/LabResource.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Filament\Resources\LabResource\Pages;
+use App\Filament\Resources\LabResource\Schemas\LabForm;
+use App\Filament\Resources\LabResource\Tables\LabsTable;
+use App\Models\Lab;
+use BackedEnum;
+use Filament\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use UnitEnum;
+
+class LabResource extends Resource
+{
+    protected static ?string $model = Lab::class;
+
+    protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-beaker';
+
+    protected static ?string $navigationLabel = 'Lab Tests';
+
+    protected static UnitEnum|string|null $navigationGroup = 'Inventory';
+
+    protected static ?int $navigationSort = 3;
+
+    public static function form(Schema $schema): Schema
+    {
+        return LabForm::configure($schema);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return LabsTable::configure($table);
+    }
+
+    public static function getEloquentQuery(): Builder
+    {
+        $query = parent::getEloquentQuery();
+
+        // Scope to user's business products and batches unless they're a super admin
+        if (! auth()->user()->hasRole('super_admin')) {
+            $businessId = auth()->user()->business_id;
+
+            $query->where(function ($q) use ($businessId) {
+                // Include labs for products owned by this business
+                $q->whereHas('product', function ($productQuery) use ($businessId) {
+                    $productQuery->whereHas('brand', function ($brandQuery) use ($businessId) {
+                        $brandQuery->where('business_id', $businessId);
+                    });
+                })
+                // OR labs for batches owned by this business
+                    ->orWhereHas('batch', function ($batchQuery) use ($businessId) {
+                        $batchQuery->where('business_id', $businessId);
+                    });
+            });
+        }
+
+        return $query;
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListLabs::route('/'),
+            'create' => Pages\CreateLab::route('/create'),
+            'view' => Pages\ViewLab::route('/{record}'),
+            'edit' => Pages\EditLab::route('/{record}/edit'),
+        ];
+    }
+
+    public static function getNavigationBadge(): ?string
+    {
+        // Show count of recent lab tests (last 30 days)
+        return cache()->remember('recent_lab_tests_count', 300, function () {
+            $query = static::getEloquentQuery();
+
+            return $query->where('test_date', '>=', now()->subDays(30))
+                ->count() ?: null;
+        });
+    }
+}

app/Filament/Resources/LabResource/Pages/CreateLab.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Resources\LabResource\Pages;
+
+use App\Filament\Resources\LabResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateLab extends CreateRecord
+{
+    protected static string $resource = LabResource::class;
+}

app/Filament/Resources/LabResource/Pages/EditLab.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Filament\Resources\LabResource\Pages;
+
+use App\Filament\Resources\LabResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditLab extends EditRecord
+{
+    protected static string $resource = LabResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\ViewAction::make(),
+            Actions\DeleteAction::make(),
+        ];
+    }
+}

app/Filament/Resources/LabResource/Pages/ListLabs.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\LabResource\Pages;
+
+use App\Filament\Resources\LabResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListLabs extends ListRecords
+{
+    protected static string $resource = LabResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}

app/Filament/Resources/LabResource/Pages/ViewLab.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\Resources\LabResource\Pages;
+
+use App\Filament\Resources\LabResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewLab extends ViewRecord
+{
+    protected static string $resource = LabResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\EditAction::make(),
+        ];
+    }
+}

app/Filament/Resources/LabResource/Schemas/LabForm.php

@@ -0,0 +1,298 @@
+<?php
+
+namespace App\Filament\Resources\LabResource\Schemas;
+
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Repeater;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
+use Filament\Schemas\Components\Tabs;
+use Filament\Schemas\Components\Tabs\Tab;
+use Filament\Schemas\Schema;
+
+class LabForm
+{
+    public static function configure(Schema $schema): Schema
+    {
+        return $schema
+            ->components([
+                Tabs::make('Lab Test Information')
+                    ->tabs([
+                        Tab::make('Basic Information')
+                            ->schema([
+                                Section::make('Test Details')
+                                    ->schema([
+                                        Select::make('product_id')
+                                            ->label('Product')
+                                            ->relationship('product', 'name')
+                                            ->searchable()
+                                            ->preload()
+                                            ->helperText('Product this test is for'),
+
+                                        Select::make('batch_id')
+                                            ->label('Batch')
+                                            ->relationship('batch', 'batch_number')
+                                            ->searchable()
+                                            ->preload()
+                                            ->helperText('Specific batch tested'),
+
+                                        TextInput::make('lab_name')
+                                            ->required()
+                                            ->maxLength(255)
+                                            ->helperText('Testing laboratory name'),
+
+                                        TextInput::make('lab_license_number')
+                                            ->label('Lab License #')
+                                            ->maxLength(255)
+                                            ->helperText('State license number'),
+
+                                        DatePicker::make('test_date')
+                                            ->required()
+                                            ->default(now())
+                                            ->helperText('Date test was performed'),
+
+                                        TextInput::make('batch_number')
+                                            ->label('Lab Batch Number')
+                                            ->maxLength(255)
+                                            ->helperText('Internal lab tracking number'),
+
+                                        TextInput::make('sample_id')
+                                            ->label('Sample ID')
+                                            ->maxLength(255)
+                                            ->helperText('Sample identification'),
+                                    ])
+                                    ->columns(2),
+                            ]),
+
+                        Tab::make('Cannabinoids')
+                            ->schema([
+                                Section::make('Primary Cannabinoids')
+                                    ->schema([
+                                        TextInput::make('thc_percentage')
+                                            ->label('THC %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        TextInput::make('thca_percentage')
+                                            ->label('THCA %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        TextInput::make('cbd_percentage')
+                                            ->label('CBD %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        TextInput::make('cbda_percentage')
+                                            ->label('CBDA %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+                                    ])
+                                    ->columns(4),
+
+                                Section::make('Minor Cannabinoids')
+                                    ->schema([
+                                        TextInput::make('cbg_percentage')
+                                            ->label('CBG %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        TextInput::make('cbn_percentage')
+                                            ->label('CBN %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        TextInput::make('thcv_percentage')
+                                            ->label('THCV %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        TextInput::make('cbdv_percentage')
+                                            ->label('CBDV %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+                                    ])
+                                    ->columns(4),
+
+                                Section::make('Calculated Totals')
+                                    ->schema([
+                                        TextInput::make('total_thc')
+                                            ->label('Total THC')
+                                            ->numeric()
+                                            ->disabled()
+                                            ->dehydrated(false)
+                                            ->suffix('%')
+                                            ->helperText('Auto-calculated from THC + (THCA × 0.877)'),
+
+                                        TextInput::make('total_cbd')
+                                            ->label('Total CBD')
+                                            ->numeric()
+                                            ->disabled()
+                                            ->dehydrated(false)
+                                            ->suffix('%')
+                                            ->helperText('Auto-calculated from CBD + (CBDA × 0.877)'),
+
+                                        TextInput::make('total_cannabinoids')
+                                            ->label('Total Cannabinoids')
+                                            ->numeric()
+                                            ->disabled()
+                                            ->dehydrated(false)
+                                            ->suffix('%')
+                                            ->helperText('Sum of all cannabinoids'),
+                                    ])
+                                    ->columns(3)
+                                    ->description('These values are automatically calculated on save'),
+                            ]),
+
+                        Tab::make('Terpenes')
+                            ->schema([
+                                Repeater::make('terpenes')
+                                    ->schema([
+                                        TextInput::make('name')
+                                            ->required()
+                                            ->helperText('Terpene name (e.g., Myrcene)'),
+
+                                        TextInput::make('percentage')
+                                            ->required()
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->step(0.001)
+                                            ->suffix('%')
+                                            ->helperText('Percentage'),
+                                    ])
+                                    ->columns(2)
+                                    ->collapsible()
+                                    ->helperText('Add terpene profile data'),
+                            ]),
+
+                        Tab::make('Compliance Tests')
+                            ->schema([
+                                Section::make('Safety Tests')
+                                    ->schema([
+                                        Toggle::make('pesticides_pass')
+                                            ->label('Pesticides Pass')
+                                            ->default(true)
+                                            ->inline(false),
+
+                                        Toggle::make('heavy_metals_pass')
+                                            ->label('Heavy Metals Pass')
+                                            ->default(true)
+                                            ->inline(false),
+
+                                        Toggle::make('microbials_pass')
+                                            ->label('Microbials Pass')
+                                            ->default(true)
+                                            ->inline(false),
+
+                                        Toggle::make('mycotoxins_pass')
+                                            ->label('Mycotoxins Pass')
+                                            ->default(true)
+                                            ->inline(false),
+
+                                        Toggle::make('residual_solvents_pass')
+                                            ->label('Residual Solvents Pass')
+                                            ->default(true)
+                                            ->inline(false),
+
+                                        Toggle::make('foreign_material_pass')
+                                            ->label('Foreign Material Pass')
+                                            ->default(true)
+                                            ->inline(false),
+                                    ])
+                                    ->columns(3)
+                                    ->description('All tests must pass for overall compliance'),
+
+                                Section::make('Additional Tests')
+                                    ->schema([
+                                        TextInput::make('moisture_content')
+                                            ->label('Moisture Content %')
+                                            ->numeric()
+                                            ->minValue(0)
+                                            ->maxValue(100)
+                                            ->step(0.01)
+                                            ->suffix('%'),
+
+                                        Toggle::make('compliance_pass')
+                                            ->label('Overall Compliance Pass')
+                                            ->default(true)
+                                            ->disabled()
+                                            ->dehydrated(false)
+                                            ->helperText('Auto-calculated from all safety tests'),
+                                    ])
+                                    ->columns(2),
+                            ]),
+
+                        Tab::make('COA Files')
+                            ->schema([
+                                Section::make('Certificate of Analysis Files')
+                                    ->schema([
+                                        Repeater::make('coaFiles')
+                                            ->relationship()
+                                            ->schema([
+                                                FileUpload::make('file_path')
+                                                    ->label('File')
+                                                    ->required()
+                                                    ->directory('compliance/coas')
+                                                    ->acceptedFileTypes(['application/pdf', 'image/*'])
+                                                    ->maxSize(10240),
+
+                                                TextInput::make('description')
+                                                    ->maxLength(255)
+                                                    ->helperText('Optional description'),
+
+                                                Toggle::make('is_primary')
+                                                    ->label('Primary COA')
+                                                    ->inline(false),
+                                            ])
+                                            ->columns(3)
+                                            ->collapsible()
+                                            ->helperText('Upload COA files (PDF or images)'),
+
+                                        TextInput::make('certificate_url')
+                                            ->label('External COA URL')
+                                            ->url()
+                                            ->maxLength(255)
+                                            ->helperText('Link to COA on external site (optional)'),
+                                    ]),
+                            ]),
+
+                        Tab::make('Notes')
+                            ->schema([
+                                Textarea::make('notes')
+                                    ->rows(5)
+                                    ->columnSpanFull()
+                                    ->helperText('Additional notes about this test'),
+                            ]),
+                    ])
+                    ->columnSpanFull(),
+            ]);
+    }
+}

app/Filament/Resources/LabResource/Tables/LabsTable.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace App\Filament\Resources\LabResource\Tables;
+
+use Filament\Actions\BulkActionGroup;
+use Filament\Actions\DeleteBulkAction;
+use Filament\Actions\EditAction;
+use Filament\Actions\ViewAction;
+use Filament\Support\Colors\Color;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Filters\Filter;
+use Filament\Tables\Filters\SelectFilter;
+use Filament\Tables\Filters\TernaryFilter;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+
+class LabsTable
+{
+    public static function configure(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('lab_name')
+                    ->label('Lab')
+                    ->searchable()
+                    ->sortable()
+                    ->weight('bold'),
+
+                TextColumn::make('product.name')
+                    ->label('Product')
+                    ->searchable()
+                    ->sortable()
+                    ->limit(30),
+
+                TextColumn::make('batch.batch_number')
+                    ->label('Batch')
+                    ->searchable()
+                    ->sortable()
+                    ->toggleable(),
+
+                TextColumn::make('test_date')
+                    ->date('M d, Y')
+                    ->sortable()
+                    ->color(fn ($record) => $record->test_date < now()->subDays(90) ? Color::Orange : null),
+
+                TextColumn::make('total_thc')
+                    ->label('THC')
+                    ->numeric(decimalPlaces: 2)
+                    ->suffix('%')
+                    ->sortable()
+                    ->color(fn ($state) => $state > 20 ? Color::Green : ($state > 15 ? Color::Amber : Color::Gray)),
+
+                TextColumn::make('total_cbd')
+                    ->label('CBD')
+                    ->numeric(decimalPlaces: 2)
+                    ->suffix('%')
+                    ->sortable()
+                    ->toggleable(),
+
+                TextColumn::make('total_cannabinoids')
+                    ->label('Total')
+                    ->numeric(decimalPlaces: 2)
+                    ->suffix('%')
+                    ->sortable()
+                    ->toggleable(),
+
+                IconColumn::make('compliance_pass')
+                    ->label('Compliance')
+                    ->boolean()
+                    ->trueIcon('heroicon-o-check-circle')
+                    ->falseIcon('heroicon-o-x-circle')
+                    ->trueColor(Color::Green)
+                    ->falseColor(Color::Red)
+                    ->sortable(),
+
+                TextColumn::make('terpene_profile')
+                    ->label('Top Terpenes')
+                    ->limit(40)
+                    ->toggleable(isToggledHiddenByDefault: true),
+
+                TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->defaultSort('test_date', 'desc')
+            ->filters([
+                SelectFilter::make('lab_name')
+                    ->options(function () {
+                        return \App\Models\Lab::query()
+                            ->distinct('lab_name')
+                            ->pluck('lab_name', 'lab_name')
+                            ->toArray();
+                    })
+                    ->searchable(),
+
+                SelectFilter::make('product')
+                    ->relationship('product', 'name')
+                    ->searchable()
+                    ->preload(),
+
+                SelectFilter::make('batch')
+                    ->relationship('batch', 'batch_number')
+                    ->searchable()
+                    ->preload(),
+
+                TernaryFilter::make('compliance_pass')
+                    ->label('Compliant'),
+
+                Filter::make('recent')
+                    ->label('Recent (Last 30 days)')
+                    ->query(fn (Builder $query): Builder => $query->where('test_date', '>=', now()->subDays(30)))
+                    ->toggle(),
+
+                Filter::make('high_thc')
+                    ->label('High THC (>20%)')
+                    ->query(fn (Builder $query): Builder => $query->where('total_thc', '>', 20))
+                    ->toggle(),
+
+                Filter::make('high_cbd')
+                    ->label('High CBD (>10%)')
+                    ->query(fn (Builder $query): Builder => $query->where('total_cbd', '>', 10))
+                    ->toggle(),
+            ])
+            ->recordActions([
+                ViewAction::make(),
+                EditAction::make(),
+            ])
+            ->toolbarActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}

app/Filament/Resources/OrderResource.php

@@ -59,6 +59,7 @@ class OrderResource extends Resource
     {
         return [
             RelationManagers\ItemsRelationManager::class,
+            \Tapp\FilamentAuditing\RelationManagers\AuditsRelationManager::class,
         ];
     }
 

app/Filament/Resources/ProductResource.php

@@ -63,6 +63,7 @@ class ProductResource extends Resource
             BatchesRelationManager::class,
             ComponentsRelationManager::class,
             VarietiesRelationManager::class,
+            \Tapp\FilamentAuditing\RelationManagers\AuditsRelationManager::class,
         ];
     }
 

app/Filament/Resources/UserResource.php

@@ -85,6 +85,22 @@ class UserResource extends Resource
                                 'suspended' => 'Suspended',
                             ])
                             ->default('active'),
+                        TextInput::make('password')
+                            ->label('Password')
+                            ->password()
+                            ->required(fn ($record) => $record === null)
+                            ->dehydrated(fn ($state) => filled($state))
+                            ->minLength(8)
+                            ->maxLength(255)
+                            ->helperText('Leave blank to keep current password when editing')
+                            ->visible(fn ($livewire) => $livewire instanceof CreateUser),
+                        TextInput::make('password_confirmation')
+                            ->label('Confirm Password')
+                            ->password()
+                            ->required(fn ($record) => $record === null && filled($record?->password))
+                            ->dehydrated(false)
+                            ->same('password')
+                            ->visible(fn ($livewire) => $livewire instanceof CreateUser),
                     ])->columns(2),
 
                 Section::make('Business Association')

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -4,8 +4,18 @@ namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Support\Facades\Hash;
 
 class CreateUser extends CreateRecord
 {
     protected static string $resource = UserResource::class;
+
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        if (isset($data['password'])) {
+            $data['password'] = Hash::make($data['password']);
+        }
+
+        return $data;
+    }
 }

app/Helpers/BusinessHelper.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Helpers;
+
+use App\Models\Business;
+use App\Services\PermissionService;
+use Illuminate\Support\Facades\Auth;
+
+class BusinessHelper
+{
+    /**
+     * Get current business context from session or user's primary business
+     */
+    public static function current(): ?Business
+    {
+        if (! Auth::check()) {
+            return null;
+        }
+
+        $businessId = session('current_business_id');
+
+        if ($businessId) {
+            return Business::find($businessId);
+        }
+
+        // Fall back to user's primary business if no session is set
+        return Auth::user()->primaryBusiness();
+    }
+
+    /**
+     * Check if user has a permission for current business
+     *
+     * This method now uses PermissionService internally for better architecture
+     * while maintaining backward compatibility with existing code.
+     *
+     * @param  string  $permission  Permission key (e.g. 'analytics.overview')
+     */
+    public static function hasPermission(string $permission): bool
+    {
+        if (! Auth::check()) {
+            return false;
+        }
+
+        $user = Auth::user();
+        $business = self::current();
+
+        if (! $business) {
+            return false;
+        }
+
+        // Use PermissionService for permission checking
+        $permissionService = app(PermissionService::class);
+
+        return $permissionService->check($user, $permission, $business);
+    }
+
+    /**
+     * Check if user is owner or admin for current business
+     */
+    public static function isOwnerOrAdmin(): bool
+    {
+        if (! Auth::check()) {
+            return false;
+        }
+
+        $user = Auth::user();
+        $business = self::current();
+
+        if (! $business) {
+            return false;
+        }
+
+        // Super admin
+        if ($user->user_type === 'admin') {
+            return true;
+        }
+
+        // Business owner
+        return $business->owner_user_id === $user->id;
+    }
+
+    /**
+     * Get user's role template for current business
+     */
+    public static function getRoleTemplate(): ?string
+    {
+        if (! Auth::check()) {
+            return null;
+        }
+
+        $user = Auth::user();
+        $business = self::current();
+
+        if (! $business) {
+            return null;
+        }
+
+        $businessUser = $user->businesses()
+            ->where('businesses.id', $business->id)
+            ->first();
+
+        return $businessUser?->pivot->role_template;
+    }
+
+    /**
+     * Get user's permissions array for current business
+     */
+    public static function getPermissions(): array
+    {
+        if (! Auth::check()) {
+            return [];
+        }
+
+        $user = Auth::user();
+        $business = self::current();
+
+        if (! $business) {
+            return [];
+        }
+
+        // Use PermissionService for cached permission retrieval
+        $permissionService = app(PermissionService::class);
+
+        return $permissionService->getUserPermissions($user, $business);
+    }
+
+    /**
+     * Check if current business has a specific module enabled
+     *
+     * @param  string  $module  Module name (sales, manufacturing, compliance)
+     */
+    public static function hasModule(string $module): bool
+    {
+        $business = self::current();
+
+        return match ($module) {
+            'sales' => true, // Sales is always enabled (base product)
+            'manufacturing' => $business?->has_manufacturing ?? false,
+            'compliance' => $business?->has_compliance ?? false,
+            default => false,
+        };
+    }
+}

app/Helpers/helpers.php

@@ -0,0 +1,24 @@
+<?php
+
+use App\Helpers\BusinessHelper;
+
+if (! function_exists('currentBusiness')) {
+    function currentBusiness()
+    {
+        return BusinessHelper::current();
+    }
+}
+
+if (! function_exists('currentBusinessId')) {
+    function currentBusinessId()
+    {
+        return BusinessHelper::currentId();
+    }
+}
+
+if (! function_exists('hasBusinessPermission')) {
+    function hasBusinessPermission(string $permission): bool
+    {
+        return BusinessHelper::hasPermission($permission);
+    }
+}

app/Http/Controllers/Admin/QuickSwitchController.php

@@ -0,0 +1,110 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class QuickSwitchController extends Controller
+{
+    /**
+     * Ensure only admins can access
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->middleware(function ($request, $next) {
+            $user = auth()->user();
+
+            if (! $user) {
+                abort(403, 'Not authenticated');
+            }
+
+            $manager = app(\Lab404\Impersonate\Services\ImpersonateManager::class);
+
+            // If impersonating, check if the impersonator can impersonate
+            // Otherwise check if the current user can impersonate
+            $canAccess = $manager->isImpersonating()
+                ? $manager->getImpersonator()->canImpersonate()
+                : $user->canImpersonate();
+
+            if (! $canAccess) {
+                abort(403, 'Only administrators can access this feature. Please login as an admin.');
+            }
+
+            return $next($request);
+        });
+    }
+
+    /**
+     * Show quick switch menu for testing
+     */
+    public function index()
+    {
+        // Get all seller users for quick switching
+        $users = User::where('user_type', 'seller')
+            ->with('businesses')
+            ->orderBy('email')
+            ->get();
+
+        return view('admin.quick-switch', compact('users'));
+    }
+
+    /**
+     * Quick switch to user using impersonation (maintains admin session)
+     */
+    public function switch(Request $request, User $user)
+    {
+        $currentUser = auth()->user();
+        $manager = app(\Lab404\Impersonate\Services\ImpersonateManager::class);
+
+        // Get the actual admin user (might be the impersonator)
+        $admin = $manager->isImpersonating()
+            ? $manager->getImpersonator()
+            : $currentUser;
+
+        if (! $user->canBeImpersonated()) {
+            abort(403, 'This user cannot be impersonated');
+        }
+
+        // If already impersonating someone, leave that impersonation first
+        if ($manager->isImpersonating()) {
+            $manager->leave();
+        }
+
+        // Use impersonation instead of session replacement
+        // This allows multiple tabs with different impersonated users
+        $manager->take($admin, $user, 'web');
+
+        // Redirect based on user type and business
+        $business = $user->primaryBusiness();
+
+        if ($business && $business->isParentCompany()) {
+            return redirect()->route('seller.business.executive.dashboard', $business->slug);
+        } elseif ($business) {
+            return redirect()->route('seller.business.dashboard', $business->slug);
+        }
+
+        return redirect()->route('seller.dashboard');
+    }
+
+    /**
+     * Switch back to admin (leave impersonation)
+     */
+    public function backToAdmin()
+    {
+        $manager = app(\Lab404\Impersonate\Services\ImpersonateManager::class);
+
+        if (! $manager->isImpersonating()) {
+            return redirect()->route('filament.admin.pages.dashboard')
+                ->with('info', 'You are not currently impersonating anyone');
+        }
+
+        // Leave impersonation
+        $manager->leave();
+
+        return redirect()->route('filament.admin.pages.dashboard')
+            ->with('success', 'Returned to admin panel');
+    }
+}

app/Http/Controllers/Analytics/AnalyticsDashboardController.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Http\Controllers\Analytics;
+
+use App\Http\Controllers\Controller;
+use App\Models\Analytics\AnalyticsEvent;
+use App\Models\Analytics\BuyerEngagementScore;
+use App\Models\Analytics\IntentSignal;
+use App\Models\Analytics\ProductView;
+use App\Models\Analytics\UserSession;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class AnalyticsDashboardController extends Controller
+{
+    public function index(Request $request)
+    {
+        if (! hasBusinessPermission('analytics.overview')) {
+            abort(403, 'Unauthorized to view analytics');
+        }
+
+        $business = currentBusiness();
+        $period = $request->input('period', '30'); // days
+
+        $startDate = now()->subDays((int) $period);
+
+        // Key metrics
+        $metrics = [
+            'total_sessions' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)->count(),
+            'total_page_views' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)->sum('page_views'),
+            'total_product_views' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)->count(),
+            'unique_products_viewed' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)
+                ->distinct('product_id')
+                ->count('product_id'),
+            'high_intent_signals' => IntentSignal::forBusiness($business->id)->where('detected_at', '>=', $startDate)
+                ->where('signal_strength', '>=', IntentSignal::STRENGTH_HIGH)
+                ->count(),
+            'active_buyers' => BuyerEngagementScore::forBusiness($business->id)->where('last_interaction_at', '>=', $startDate)->count(),
+        ];
+
+        // Traffic trend (daily breakdown)
+        $trafficTrend = AnalyticsEvent::forBusiness($business->id)->where('created_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(created_at) as date'),
+                DB::raw('COUNT(*) as total_events'),
+                DB::raw('COUNT(DISTINCT session_id) as unique_sessions')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Top products by views
+        $topProducts = ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)
+            ->select('product_id', DB::raw('COUNT(*) as view_count'))
+            ->groupBy('product_id')
+            ->orderByDesc('view_count')
+            ->limit(10)
+            ->with('product')
+            ->get();
+
+        // High-value buyers
+        $highValueBuyers = BuyerEngagementScore::forBusiness($business->id)->highValue()
+            ->active()
+            ->orderByDesc('score')
+            ->limit(10)
+            ->with('buyerBusiness')
+            ->get();
+
+        // Recent high-intent signals
+        $recentIntentSignals = IntentSignal::forBusiness($business->id)->highIntent()
+            ->where('detected_at', '>=', now()->subHours(24))
+            ->orderByDesc('detected_at')
+            ->limit(10)
+            ->with(['buyerBusiness', 'user'])
+            ->get();
+
+        // Engagement score distribution
+        $engagementDistribution = BuyerEngagementScore::forBusiness($business->id)->select(
+            DB::raw('CASE
+                WHEN score >= 80 THEN \'Very High\'
+                WHEN score >= 60 THEN \'High\'
+                WHEN score >= 40 THEN \'Medium\'
+                ELSE \'Low\'
+            END as score_range'),
+            DB::raw('COUNT(*) as count')
+        )
+            ->groupBy('score_range')
+            ->get();
+
+        return view('seller.analytics.dashboard', compact(
+            'business',
+            'period',
+            'metrics',
+            'trafficTrend',
+            'topProducts',
+            'highValueBuyers',
+            'recentIntentSignals',
+            'engagementDistribution'
+        ));
+    }
+}

app/Http/Controllers/Analytics/BuyerIntelligenceController.php

@@ -0,0 +1,194 @@
+<?php
+
+namespace App\Http\Controllers\Analytics;
+
+use App\Http\Controllers\Controller;
+use App\Models\Analytics\BuyerEngagementScore;
+use App\Models\Analytics\IntentSignal;
+use App\Models\Analytics\ProductView;
+use App\Models\Business;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class BuyerIntelligenceController extends Controller
+{
+    public function index(Request $request)
+    {
+        // TODO: Re-enable when permission system is implemented
+        // if (! hasBusinessPermission('analytics.buyers')) {
+        //     abort(403, 'Unauthorized to view buyer intelligence');
+        // }
+
+        $business = currentBusiness();
+        $period = $request->input('period', '30');
+        $filter = $request->input('filter', 'all'); // all, high-value, at-risk, new
+        $startDate = now()->subDays((int) $period);
+
+        // Overall buyer metrics
+        $metrics = [
+            'total_buyers' => BuyerEngagementScore::forBusiness($business->id)->count(),
+            'active_buyers' => BuyerEngagementScore::forBusiness($business->id)->active()->count(),
+            'high_value_buyers' => BuyerEngagementScore::forBusiness($business->id)->highValue()->count(),
+            'at_risk_buyers' => BuyerEngagementScore::forBusiness($business->id)->atRisk()->count(),
+            'new_buyers' => BuyerEngagementScore::forBusiness($business->id)->where('first_interaction_at', '>=', now()->subDays(30))->count(),
+        ];
+
+        // Build query based on filter
+        $buyersQuery = BuyerEngagementScore::forBusiness($business->id);
+
+        match ($filter) {
+            'high-value' => $buyersQuery->highValue(),
+            'at-risk' => $buyersQuery->atRisk(),
+            'new' => $buyersQuery->where('first_interaction_at', '>=', now()->subDays(30)),
+            default => $buyersQuery,
+        };
+
+        $buyers = $buyersQuery->orderByDesc('score')
+            ->with('buyerBusiness')
+            ->paginate(20);
+
+        // Engagement score distribution
+        $scoreDistribution = BuyerEngagementScore::forBusiness($business->id)->select(
+            DB::raw("CASE
+                WHEN score >= 80 THEN 'Very High (80-100)'
+                WHEN score >= 60 THEN 'High (60-79)'
+                WHEN score >= 40 THEN 'Medium (40-59)'
+                WHEN score >= 20 THEN 'Low (20-39)'
+                ELSE 'Very Low (0-19)'
+            END as score_range"),
+            DB::raw('COUNT(*) as count')
+        )
+            ->groupBy('score_range')
+            ->get();
+
+        // Tier distribution
+        $tierDistribution = BuyerEngagementScore::forBusiness($business->id)->select('score_tier')
+            ->selectRaw('COUNT(*) as count')
+            ->groupBy('score_tier')
+            ->get();
+
+        // Recent high-intent signals
+        $recentIntentSignals = IntentSignal::forBusiness($business->id)->highIntent()
+            ->where('detected_at', '>=', now()->subDays(7))
+            ->orderByDesc('detected_at')
+            ->with(['buyerBusiness', 'user'])
+            ->limit(20)
+            ->get();
+
+        // Intent signal breakdown
+        $signalBreakdown = IntentSignal::forBusiness($business->id)->where('detected_at', '>=', $startDate)
+            ->select('signal_type')
+            ->selectRaw('COUNT(*) as count')
+            ->selectRaw('AVG(signal_strength) as avg_strength')
+            ->groupBy('signal_type')
+            ->orderByDesc('count')
+            ->get();
+
+        return view('seller.analytics.buyers', compact(
+            'business',
+            'period',
+            'filter',
+            'metrics',
+            'buyers',
+            'scoreDistribution',
+            'tierDistribution',
+            'recentIntentSignals',
+            'signalBreakdown'
+        ));
+    }
+
+    public function show(Request $request, Business $buyer)
+    {
+        // TODO: Re-enable when permission system is implemented
+        // if (! hasBusinessPermission('analytics.buyers')) {
+        //     abort(403, 'Unauthorized to view buyer intelligence');
+        // }
+
+        $business = currentBusiness();
+        $period = $request->input('period', '90'); // Default to 90 days for buyer detail
+        $startDate = now()->subDays((int) $period);
+
+        // Get engagement score
+        $engagementScore = BuyerEngagementScore::forBusiness($business->id)->where('buyer_business_id', $buyer->id)->first();
+
+        // Activity timeline
+        $activityTimeline = ProductView::forBusiness($business->id)->where('buyer_business_id', $buyer->id)
+            ->where('viewed_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(viewed_at) as date'),
+                DB::raw('COUNT(*) as product_views'),
+                DB::raw('COUNT(DISTINCT product_id) as unique_products'),
+                DB::raw('SUM(CASE WHEN added_to_cart = true THEN 1 ELSE 0 END) as cart_adds')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Products viewed
+        $productsViewed = ProductView::forBusiness($business->id)->where('buyer_business_id', $buyer->id)
+            ->where('viewed_at', '>=', $startDate)
+            ->select('product_id')
+            ->selectRaw('COUNT(*) as view_count')
+            ->selectRaw('MAX(viewed_at) as last_viewed')
+            ->selectRaw('AVG(time_on_page) as avg_time')
+            ->selectRaw('SUM(CASE WHEN added_to_cart = true THEN 1 ELSE 0 END) as cart_adds')
+            ->groupBy('product_id')
+            ->orderByDesc('view_count')
+            ->with('product')
+            ->limit(20)
+            ->get();
+
+        // Intent signals
+        $intentSignals = IntentSignal::forBusiness($business->id)->where('buyer_business_id', $buyer->id)
+            ->where('detected_at', '>=', $startDate)
+            ->orderByDesc('detected_at')
+            ->limit(50)
+            ->get();
+
+        // Email engagement
+        $emailEngagement = DB::table('email_interactions')
+            ->join('users', 'email_interactions.recipient_user_id', '=', 'users.id')
+            ->join('business_user', 'users.id', '=', 'business_user.user_id')
+            ->where('email_interactions.business_id', $business->id)
+            ->where('business_user.business_id', $buyer->id)
+            ->where('email_interactions.sent_at', '>=', $startDate)
+            ->selectRaw('COUNT(*) as total_sent')
+            ->selectRaw('SUM(open_count) as total_opens')
+            ->selectRaw('SUM(click_count) as total_clicks')
+            ->selectRaw('AVG(engagement_score) as avg_engagement')
+            ->first();
+
+        // Order history
+        $orderHistory = DB::table('orders')
+            ->where('seller_business_id', $business->id)
+            ->where('buyer_business_id', $buyer->id)
+            ->select(
+                DB::raw('DATE(created_at) as date'),
+                DB::raw('COUNT(*) as order_count'),
+                DB::raw('SUM(total) as revenue')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        $totalOrders = DB::table('orders')
+            ->where('seller_business_id', $business->id)
+            ->where('buyer_business_id', $buyer->id)
+            ->selectRaw('COUNT(*) as count')
+            ->selectRaw('SUM(total) as total_revenue')
+            ->selectRaw('AVG(total) as avg_order_value')
+            ->first();
+
+        return view('seller.analytics.buyer-detail', compact(
+            'buyer',
+            'period',
+            'engagementScore',
+            'activityTimeline',
+            'productsViewed',
+            'intentSignals',
+            'emailEngagement',
+            'orderHistory',
+            'totalOrders'
+        ));
+    }
+}

app/Http/Controllers/Analytics/MarketingAnalyticsController.php

@@ -0,0 +1,173 @@
+<?php
+
+namespace App\Http\Controllers\Analytics;
+
+use App\Http\Controllers\Controller;
+use App\Models\Analytics\EmailCampaign;
+use App\Models\Analytics\EmailInteraction;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class MarketingAnalyticsController extends Controller
+{
+    public function index(Request $request)
+    {
+        if (! hasBusinessPermission('analytics.marketing')) {
+            abort(403, 'Unauthorized to view marketing analytics');
+        }
+
+        $business = currentBusiness();
+        $period = $request->input('period', '30');
+        $startDate = now()->subDays((int) $period);
+
+        // Campaign overview metrics
+        $metrics = [
+            'total_campaigns' => EmailCampaign::forBusiness($business->id)->where('created_at', '>=', $startDate)->count(),
+            'total_sent' => EmailCampaign::forBusiness($business->id)->where('created_at', '>=', $startDate)->sum('total_sent'),
+            'total_delivered' => EmailCampaign::forBusiness($business->id)->where('created_at', '>=', $startDate)->sum('total_delivered'),
+            'total_opened' => EmailCampaign::forBusiness($business->id)->where('created_at', '>=', $startDate)->sum('total_opened'),
+            'total_clicked' => EmailCampaign::forBusiness($business->id)->where('created_at', '>=', $startDate)->sum('total_clicked'),
+        ];
+
+        // Calculate average rates
+        $metrics['avg_open_rate'] = $metrics['total_delivered'] > 0
+            ? round(($metrics['total_opened'] / $metrics['total_delivered']) * 100, 2)
+            : 0;
+
+        $metrics['avg_click_rate'] = $metrics['total_delivered'] > 0
+            ? round(($metrics['total_clicked'] / $metrics['total_delivered']) * 100, 2)
+            : 0;
+
+        // Campaign performance
+        $campaigns = EmailCampaign::forBusiness($business->id)->where('created_at', '>=', $startDate)
+            ->orderByDesc('sent_at')
+            ->with('emailInteractions')
+            ->paginate(20);
+
+        // Email engagement over time
+        $engagementTrend = EmailInteraction::forBusiness($business->id)->where('sent_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(sent_at) as date'),
+                DB::raw('COUNT(*) as sent'),
+                DB::raw('SUM(CASE WHEN first_opened_at IS NOT NULL THEN 1 ELSE 0 END) as opened'),
+                DB::raw('SUM(CASE WHEN first_clicked_at IS NOT NULL THEN 1 ELSE 0 END) as clicked')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Top performing campaigns
+        $topCampaigns = EmailCampaign::forBusiness($business->id)->where('sent_at', '>=', $startDate)
+            ->where('total_sent', '>', 0)
+            ->orderByRaw('(total_clicked / total_sent) DESC')
+            ->limit(10)
+            ->get();
+
+        // Email client breakdown
+        $emailClients = EmailInteraction::forBusiness($business->id)->where('sent_at', '>=', $startDate)
+            ->whereNotNull('email_client')
+            ->select('email_client')
+            ->selectRaw('COUNT(*) as count')
+            ->groupBy('email_client')
+            ->orderByDesc('count')
+            ->get();
+
+        // Device type breakdown
+        $deviceTypes = EmailInteraction::forBusiness($business->id)->where('sent_at', '>=', $startDate)
+            ->whereNotNull('device_type')
+            ->select('device_type')
+            ->selectRaw('COUNT(*) as count')
+            ->groupBy('device_type')
+            ->orderByDesc('count')
+            ->get();
+
+        // Engagement score distribution
+        $engagementScores = EmailInteraction::forBusiness($business->id)->where('sent_at', '>=', $startDate)
+            ->select(
+                DB::raw("CASE
+                    WHEN engagement_score >= 80 THEN 'High'
+                    WHEN engagement_score >= 50 THEN 'Medium'
+                    WHEN engagement_score > 0 THEN 'Low'
+                    ELSE 'None'
+                END as score_range"),
+                DB::raw('COUNT(*) as count')
+            )
+            ->groupBy('score_range')
+            ->get();
+
+        return view('seller.analytics.marketing', compact(
+            'business',
+            'period',
+            'metrics',
+            'campaigns',
+            'engagementTrend',
+            'topCampaigns',
+            'emailClients',
+            'deviceTypes',
+            'engagementScores'
+        ));
+    }
+
+    public function campaign(Request $request, EmailCampaign $campaign)
+    {
+        if (! hasBusinessPermission('analytics.marketing')) {
+            abort(403, 'Unauthorized to view marketing analytics');
+        }
+
+        // Verify campaign belongs to user's business
+        if ($campaign->business_id !== currentBusinessId()) {
+            abort(403, 'Unauthorized to view this campaign');
+        }
+
+        // Campaign metrics
+        $metrics = [
+            'total_sent' => $campaign->total_sent,
+            'total_delivered' => $campaign->total_delivered,
+            'total_bounced' => $campaign->total_bounced,
+            'total_opened' => $campaign->total_opened,
+            'total_clicked' => $campaign->total_clicked,
+            'open_rate' => $campaign->open_rate,
+            'click_rate' => $campaign->click_rate,
+            'bounce_rate' => $campaign->total_sent > 0
+                ? round(($campaign->total_bounced / $campaign->total_sent) * 100, 2)
+                : 0,
+        ];
+
+        // Interaction timeline
+        $timeline = EmailInteraction::forBusiness($campaign->business_id)->where('campaign_id', $campaign->id)
+            ->select(
+                DB::raw('DATE(sent_at) as date'),
+                DB::raw('SUM(open_count) as opens'),
+                DB::raw('SUM(click_count) as clicks')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Top engaged recipients
+        $topRecipients = EmailInteraction::forBusiness($campaign->business_id)->where('campaign_id', $campaign->id)
+            ->orderByDesc('engagement_score')
+            ->limit(20)
+            ->with('recipientUser')
+            ->get();
+
+        // Click breakdown by URL
+        $clicksByUrl = DB::table('email_clicks')
+            ->join('email_interactions', 'email_clicks.email_interaction_id', '=', 'email_interactions.id')
+            ->where('email_interactions.campaign_id', $campaign->id)
+            ->select('email_clicks.url', 'email_clicks.link_identifier')
+            ->selectRaw('COUNT(*) as click_count')
+            ->selectRaw('COUNT(DISTINCT email_clicks.email_interaction_id) as unique_clicks')
+            ->groupBy('email_clicks.url', 'email_clicks.link_identifier')
+            ->orderByDesc('click_count')
+            ->get();
+
+        return view('seller.analytics.campaign-detail', compact(
+            'campaign',
+            'metrics',
+            'timeline',
+            'topRecipients',
+            'clicksByUrl'
+        ));
+    }
+}

app/Http/Controllers/Analytics/ProductAnalyticsController.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Http\Controllers\Analytics;
+
+use App\Helpers\BusinessHelper;
+use App\Http\Controllers\Controller;
+use App\Models\Analytics\ProductView;
+use App\Models\Product;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ProductAnalyticsController extends Controller
+{
+    public function index(Request $request)
+    {
+        if (! hasBusinessPermission('analytics.products')) {
+            abort(403, 'Unauthorized to view product analytics');
+        }
+
+        $business = currentBusiness();
+        $period = $request->input('period', '30');
+        $startDate = now()->subDays((int) $period);
+
+        // Product performance metrics
+        $productMetrics = ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)
+            ->select('product_id')
+            ->selectRaw('COUNT(*) as total_views')
+            ->selectRaw('COUNT(DISTINCT buyer_business_id) as unique_buyers')
+            ->selectRaw('AVG(time_on_page) as avg_time_on_page')
+            ->selectRaw('SUM(CASE WHEN zoomed_image = true THEN 1 ELSE 0 END) as zoomed_count')
+            ->selectRaw('SUM(CASE WHEN watched_video = true THEN 1 ELSE 0 END) as video_views')
+            ->selectRaw('SUM(CASE WHEN downloaded_spec = true THEN 1 ELSE 0 END) as spec_downloads')
+            ->selectRaw('SUM(CASE WHEN added_to_cart = true THEN 1 ELSE 0 END) as cart_additions')
+            ->groupBy('product_id')
+            ->orderByDesc('total_views')
+            ->with('product.brand')
+            ->paginate(20);
+
+        // Product view trend
+        $viewTrend = ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(viewed_at) as date'),
+                DB::raw('COUNT(*) as views'),
+                DB::raw('COUNT(DISTINCT buyer_business_id) as unique_buyers')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // High engagement products (quality over quantity)
+        $highEngagementProducts = ProductView::forBusiness($business->id)->highEngagement()
+            ->where('viewed_at', '>=', $startDate)
+            ->select('product_id')
+            ->selectRaw('COUNT(*) as engagement_count')
+            ->selectRaw('AVG(time_on_page) as avg_time')
+            ->groupBy('product_id')
+            ->orderByDesc('engagement_count')
+            ->limit(10)
+            ->with('product')
+            ->get();
+
+        // Products with most cart additions (high intent)
+        $topCartProducts = ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)
+            ->where('added_to_cart', true)
+            ->select('product_id')
+            ->selectRaw('COUNT(*) as cart_count')
+            ->groupBy('product_id')
+            ->orderByDesc('cart_count')
+            ->limit(10)
+            ->with('product')
+            ->get();
+
+        // Engagement breakdown
+        $engagementBreakdown = [
+            'zoomed_image' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)->where('zoomed_image', true)->count(),
+            'watched_video' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)->where('watched_video', true)->count(),
+            'downloaded_spec' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)->where('downloaded_spec', true)->count(),
+            'added_to_cart' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)->where('added_to_cart', true)->count(),
+            'added_to_wishlist' => ProductView::forBusiness($business->id)->where('viewed_at', '>=', $startDate)->where('added_to_wishlist', true)->count(),
+        ];
+
+        return view('seller.analytics.products', compact(
+            'business',
+            'period',
+            'productMetrics',
+            'viewTrend',
+            'highEngagementProducts',
+            'topCartProducts',
+            'engagementBreakdown'
+        ));
+    }
+
+    public function show(Request $request, Product $product)
+    {
+        if (! hasBusinessPermission('analytics.products')) {
+            abort(403, 'Unauthorized to view product analytics');
+        }
+
+        // Verify product belongs to user's business brands
+        $sellerBusiness = BusinessHelper::fromProduct($product);
+        if ($sellerBusiness->id !== currentBusinessId()) {
+            abort(403, 'Unauthorized to view this product');
+        }
+
+        $period = $request->input('period', '30');
+        $startDate = now()->subDays((int) $period);
+
+        // Product-specific metrics
+        $metrics = ProductView::forBusiness($sellerBusiness->id)->where('product_id', $product->id)
+            ->where('viewed_at', '>=', $startDate)
+            ->selectRaw('COUNT(*) as total_views')
+            ->selectRaw('COUNT(DISTINCT buyer_business_id) as unique_buyers')
+            ->selectRaw('COUNT(DISTINCT session_id) as unique_sessions')
+            ->selectRaw('AVG(time_on_page) as avg_time_on_page')
+            ->selectRaw('MAX(time_on_page) as max_time_on_page')
+            ->selectRaw('SUM(CASE WHEN zoomed_image = true THEN 1 ELSE 0 END) as zoomed_count')
+            ->selectRaw('SUM(CASE WHEN watched_video = true THEN 1 ELSE 0 END) as video_views')
+            ->selectRaw('SUM(CASE WHEN downloaded_spec = true THEN 1 ELSE 0 END) as spec_downloads')
+            ->selectRaw('SUM(CASE WHEN added_to_cart = true THEN 1 ELSE 0 END) as cart_additions')
+            ->first();
+
+        // View trend
+        $viewTrend = ProductView::forBusiness($sellerBusiness->id)->where('product_id', $product->id)
+            ->where('viewed_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(viewed_at) as date'),
+                DB::raw('COUNT(*) as views')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Top buyers viewing this product
+        $topBuyers = ProductView::forBusiness($sellerBusiness->id)->where('product_id', $product->id)
+            ->where('viewed_at', '>=', $startDate)
+            ->whereNotNull('buyer_business_id')
+            ->select('buyer_business_id')
+            ->selectRaw('COUNT(*) as view_count')
+            ->selectRaw('MAX(viewed_at) as last_viewed')
+            ->groupBy('buyer_business_id')
+            ->orderByDesc('view_count')
+            ->limit(10)
+            ->with('buyerBusiness')
+            ->get();
+
+        // Traffic sources
+        $trafficSources = ProductView::forBusiness($sellerBusiness->id)->where('product_id', $product->id)
+            ->where('viewed_at', '>=', $startDate)
+            ->select('source')
+            ->selectRaw('COUNT(*) as count')
+            ->groupBy('source')
+            ->orderByDesc('count')
+            ->get();
+
+        return view('seller.analytics.product-detail', compact(
+            'product',
+            'period',
+            'metrics',
+            'viewTrend',
+            'topBuyers',
+            'trafficSources'
+        ));
+    }
+}

app/Http/Controllers/Analytics/SalesAnalyticsController.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace App\Http\Controllers\Analytics;
+
+use App\Http\Controllers\Controller;
+use App\Models\Analytics\UserSession;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class SalesAnalyticsController extends Controller
+{
+    public function index(Request $request)
+    {
+        if (! hasBusinessPermission('analytics.sales')) {
+            abort(403, 'Unauthorized to view sales analytics');
+        }
+
+        $business = currentBusiness();
+        $period = $request->input('period', '30');
+        $startDate = now()->subDays((int) $period);
+
+        // Sales funnel metrics
+        $funnelMetrics = [
+            'total_sessions' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)->count(),
+            'sessions_with_product_views' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+                ->where('product_views', '>', 0)
+                ->count(),
+            'sessions_with_cart' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+                ->where('interactions', '>', 0)
+                ->count(),
+            'checkout_initiated' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+                ->where('interactions', '>', 2)
+                ->count(),
+            'orders_completed' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+                ->where('converted', true)
+                ->count(),
+        ];
+
+        // Calculate conversion rates
+        $funnelMetrics['product_view_rate'] = $funnelMetrics['total_sessions'] > 0
+            ? round(($funnelMetrics['sessions_with_product_views'] / $funnelMetrics['total_sessions']) * 100, 2)
+            : 0;
+
+        $funnelMetrics['cart_rate'] = $funnelMetrics['sessions_with_product_views'] > 0
+            ? round(($funnelMetrics['sessions_with_cart'] / $funnelMetrics['sessions_with_product_views']) * 100, 2)
+            : 0;
+
+        $funnelMetrics['checkout_rate'] = $funnelMetrics['sessions_with_cart'] > 0
+            ? round(($funnelMetrics['checkout_initiated'] / $funnelMetrics['sessions_with_cart']) * 100, 2)
+            : 0;
+
+        $funnelMetrics['conversion_rate'] = $funnelMetrics['checkout_initiated'] > 0
+            ? round(($funnelMetrics['orders_completed'] / $funnelMetrics['checkout_initiated']) * 100, 2)
+            : 0;
+
+        // Sales metrics from orders table
+        // Note: orders.business_id is the buyer's business
+        // To get seller's orders, join through order_items → products → brands
+        $salesMetrics = DB::table('orders')
+            ->join('order_items', 'orders.id', '=', 'order_items.order_id')
+            ->join('products', 'order_items.product_id', '=', 'products.id')
+            ->join('brands', 'products.brand_id', '=', 'brands.id')
+            ->where('brands.business_id', $business->id)
+            ->where('orders.created_at', '>=', $startDate)
+            ->selectRaw('COUNT(DISTINCT orders.id) as total_orders')
+            ->selectRaw('SUM(order_items.line_total) as total_revenue')
+            ->selectRaw('AVG(orders.total) as avg_order_value')
+            ->selectRaw('COUNT(DISTINCT orders.business_id) as unique_buyers')
+            ->first();
+
+        // Revenue trend
+        $revenueTrend = DB::table('orders')
+            ->join('order_items', 'orders.id', '=', 'order_items.order_id')
+            ->join('products', 'order_items.product_id', '=', 'products.id')
+            ->join('brands', 'products.brand_id', '=', 'brands.id')
+            ->where('brands.business_id', $business->id)
+            ->where('orders.created_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(orders.created_at) as date'),
+                DB::raw('COUNT(DISTINCT orders.id) as orders'),
+                DB::raw('SUM(order_items.line_total) as revenue')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Conversion funnel trend
+        $conversionTrend = UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+            ->select(
+                DB::raw('DATE(started_at) as date'),
+                DB::raw('COUNT(*) as sessions'),
+                DB::raw('SUM(CASE WHEN product_views > 0 THEN 1 ELSE 0 END) as with_views'),
+                DB::raw('SUM(CASE WHEN interactions > 0 THEN 1 ELSE 0 END) as with_interactions'),
+                DB::raw('SUM(CASE WHEN converted = true THEN 1 ELSE 0 END) as conversions'),
+                DB::raw('SUM(CASE WHEN converted = true THEN 1 ELSE 0 END) as orders')
+            )
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        // Top revenue products
+        $topProducts = DB::table('order_items')
+            ->join('orders', 'order_items.order_id', '=', 'orders.id')
+            ->join('products', 'order_items.product_id', '=', 'products.id')
+            ->join('brands', 'products.brand_id', '=', 'brands.id')
+            ->where('brands.business_id', $business->id)
+            ->where('orders.created_at', '>=', $startDate)
+            ->select('products.id', 'products.name')
+            ->selectRaw('SUM(order_items.quantity) as units_sold')
+            ->selectRaw('SUM(order_items.line_total) as revenue')
+            ->groupBy('products.id', 'products.name')
+            ->orderByDesc('revenue')
+            ->limit(10)
+            ->get();
+
+        // Session abandonment analysis (sessions with interactions but no conversion)
+        $cartAbandonment = [
+            'total_interactive_sessions' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+                ->where('interactions', '>', 0)
+                ->count(),
+            'abandoned_sessions' => UserSession::forBusiness($business->id)->where('started_at', '>=', $startDate)
+                ->where('interactions', '>', 0)
+                ->where('converted', false)
+                ->count(),
+        ];
+
+        $cartAbandonment['abandonment_rate'] = $cartAbandonment['total_interactive_sessions'] > 0
+            ? round(($cartAbandonment['abandoned_sessions'] / $cartAbandonment['total_interactive_sessions']) * 100, 2)
+            : 0;
+
+        // Top buyers by revenue
+        $topBuyers = DB::table('orders')
+            ->join('order_items', 'orders.id', '=', 'order_items.order_id')
+            ->join('products', 'order_items.product_id', '=', 'products.id')
+            ->join('brands', 'products.brand_id', '=', 'brands.id')
+            ->join('businesses', 'orders.business_id', '=', 'businesses.id')
+            ->where('brands.business_id', $business->id)
+            ->where('orders.created_at', '>=', $startDate)
+            ->select('businesses.id', 'businesses.name')
+            ->selectRaw('COUNT(DISTINCT orders.id) as order_count')
+            ->selectRaw('SUM(order_items.line_total) as total_revenue')
+            ->selectRaw('AVG(orders.total) as avg_order_value')
+            ->groupBy('businesses.id', 'businesses.name')
+            ->orderByDesc('total_revenue')
+            ->limit(10)
+            ->get();
+
+        return view('seller.analytics.sales', compact(
+            'business',
+            'period',
+            'funnelMetrics',
+            'salesMetrics',
+            'revenueTrend',
+            'conversionTrend',
+            'topProducts',
+            'cartAbandonment',
+            'topBuyers'
+        ));
+    }
+}

app/Http/Controllers/Analytics/TrackingController.php

@@ -0,0 +1,190 @@
+<?php
+
+namespace App\Http\Controllers\Analytics;
+
+use App\Http\Controllers\Controller;
+use App\Models\Product;
+use App\Services\AnalyticsTracker;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class TrackingController extends Controller
+{
+    protected AnalyticsTracker $tracker;
+
+    public function __construct(AnalyticsTracker $tracker)
+    {
+        $this->tracker = $tracker;
+    }
+
+    /**
+     * Initialize or update session
+     */
+    public function session(Request $request)
+    {
+        try {
+            $session = $this->tracker->startSession();
+
+            return response()->json([
+                'success' => true,
+                'session_id' => $session->session_id,
+            ]);
+        } catch (\Exception $e) {
+            Log::error('Analytics session tracking failed', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            return response()->json([
+                'success' => false,
+                'error' => 'Session tracking failed',
+            ], 500);
+        }
+    }
+
+    /**
+     * Track various analytics events
+     */
+    public function track(Request $request)
+    {
+        try {
+            $eventType = $request->input('event_type');
+
+            switch ($eventType) {
+                case 'page_view':
+                    $this->trackPageView($request);
+                    break;
+
+                case 'product_view':
+                    $this->trackProductView($request);
+                    break;
+
+                case 'page_engagement':
+                    $this->trackPageEngagement($request);
+                    break;
+
+                case 'click':
+                    $this->trackClick($request);
+                    break;
+
+                default:
+                    $this->trackGenericEvent($request);
+            }
+
+            return response()->json(['success' => true]);
+        } catch (\Exception $e) {
+            Log::error('Analytics tracking failed', [
+                'event_type' => $request->input('event_type'),
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+
+            return response()->json([
+                'success' => false,
+                'error' => 'Tracking failed',
+            ], 500);
+        }
+    }
+
+    /**
+     * Track page view
+     */
+    protected function trackPageView(Request $request): void
+    {
+        $this->tracker->updateSessionPageView();
+
+        $this->tracker->trackEvent(
+            'page_view',
+            'navigation',
+            'view',
+            null,
+            null,
+            [
+                'url' => $request->input('url'),
+                'title' => $request->input('title'),
+                'referrer' => $request->input('referrer'),
+            ]
+        );
+    }
+
+    /**
+     * Track product view with engagement signals
+     */
+    protected function trackProductView(Request $request): void
+    {
+        $productId = $request->input('product_id');
+
+        if (! $productId) {
+            return;
+        }
+
+        $product = Product::find($productId);
+
+        if (! $product) {
+            return;
+        }
+
+        $signals = [
+            'time_on_page' => $request->input('time_on_page'),
+            'scroll_depth' => $request->input('scroll_depth'),
+            'zoomed_image' => $request->boolean('zoomed_image'),
+            'watched_video' => $request->boolean('watched_video'),
+            'downloaded_spec' => $request->boolean('downloaded_spec'),
+            'added_to_cart' => $request->boolean('added_to_cart'),
+            'added_to_wishlist' => $request->boolean('added_to_wishlist'),
+        ];
+
+        $this->tracker->trackProductView($product, $signals);
+    }
+
+    /**
+     * Track generic page engagement
+     */
+    protected function trackPageEngagement(Request $request): void
+    {
+        $this->tracker->updateSessionPageView();
+
+        $this->tracker->trackEvent(
+            'page_engagement',
+            'engagement',
+            'interact',
+            null,
+            null,
+            [
+                'time_on_page' => $request->input('time_on_page'),
+                'scroll_depth' => $request->input('scroll_depth'),
+            ]
+        );
+    }
+
+    /**
+     * Track click event
+     */
+    protected function trackClick(Request $request): void
+    {
+        $this->tracker->trackClick(
+            $request->input('element_type', 'unknown'),
+            $request->input('element_id'),
+            $request->input('element_label'),
+            $request->input('url'),
+            [
+                'timestamp' => $request->input('timestamp'),
+            ]
+        );
+    }
+
+    /**
+     * Track generic event
+     */
+    protected function trackGenericEvent(Request $request): void
+    {
+        $this->tracker->trackEvent(
+            $request->input('event_type', 'custom'),
+            $request->input('category', 'general'),
+            $request->input('action', 'action'),
+            $request->input('subject_id'),
+            $request->input('subject_type'),
+            $request->input('metadata', [])
+        );
+    }
+}

app/Http/Controllers/Auth/UnifiedAuthenticatedSessionController.php

@@ -30,20 +30,29 @@ class UnifiedAuthenticatedSessionController extends Controller
 
         $request->session()->regenerate();
 
-        // Smart routing based on user type
+        // Log admin users into the admin guard for Filament access
+        if ($user->user_type === 'admin') {
+            Auth::guard('admin')->login($user);
+        }
+
+        // Smart routing based on user type - use intended() to preserve redirect URL
         switch ($user->user_type) {
             case 'buyer':
-                return redirect()->route('buyer.dashboard');
+                return redirect()->intended(route('buyer.dashboard'));
 
             case 'seller':
-                return redirect()->route('seller.dashboard');
+                return redirect()->intended(route('seller.dashboard'));
 
             case 'admin':
-                return redirect('/admin');
+                return redirect()->intended('/admin');
+
+            case 'both':
+                // For users with both types, default to seller dashboard
+                return redirect()->intended(route('seller.dashboard'));
 
             default:
                 // Fallback for users without proper type
-                return redirect()->route('buyer.profile');
+                return redirect()->intended(route('buyer.profile'));
         }
     }
 

app/Http/Controllers/Business/UserController.php

@@ -5,7 +5,10 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Business;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\View\View;
 
 class UserController extends Controller
@@ -25,14 +28,57 @@ class UserController extends Controller
 
         // Load users with their pivot data (contact_type, is_primary, permissions)
         $users = $business->users()
-            ->withPivot('contact_type', 'is_primary', 'permissions')
+            ->withPivot('contact_type', 'is_primary', 'permissions', 'role')
             ->orderBy('is_primary', 'desc')
             ->orderBy('first_name')
             ->get();
 
+        // Available analytics permissions
+        $analyticsPermissions = [
+            'analytics.overview' => 'Access main analytics dashboard',
+            'analytics.products' => 'View product performance analytics',
+            'analytics.marketing' => 'View marketing and email analytics',
+            'analytics.sales' => 'View sales intelligence and pipeline',
+            'analytics.buyers' => 'View buyer intelligence and engagement',
+            'analytics.export' => 'Export analytics data',
+        ];
+
         return view('business.users.index', [
             'business' => $business,
             'users' => $users,
+            'analyticsPermissions' => $analyticsPermissions,
+        ]);
+    }
+
+    /**
+     * Update user permissions.
+     */
+    public function updatePermissions(Request $request, User $user): JsonResponse
+    {
+        $business = auth()->user()->businesses()->first();
+
+        if (! $business) {
+            return response()->json(['error' => 'No business found'], 404);
+        }
+
+        // Verify user belongs to this business
+        if (! $business->users->contains($user->id)) {
+            return response()->json(['error' => 'User not found in this business'], 404);
+        }
+
+        $validated = $request->validate([
+            'permissions' => 'array',
+            'permissions.*' => 'string',
+        ]);
+
+        // Update permissions in pivot table
+        $business->users()->updateExistingPivot($user->id, [
+            'permissions' => $validated['permissions'] ?? [],
+        ]);
+
+        return response()->json([
+            'success' => true,
+            'message' => 'Permissions updated successfully',
         ]);
     }
 

app/Http/Controllers/Business/UserPermissionsController.php

@@ -0,0 +1,185 @@
+<?php
+
+namespace App\Http\Controllers\Business;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Services\PermissionService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
+class UserPermissionsController extends Controller
+{
+    public function __construct(
+        protected PermissionService $permissionService
+    ) {}
+
+    /**
+     * Update user permissions via AJAX
+     */
+    public function update(Request $request, string $businessSlug, int $userId)
+    {
+        try {
+            $business = currentBusiness();
+
+            if (! $business) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Business not found',
+                ], 404);
+            }
+
+            // Only owners and admins can manage permissions
+            if (auth()->user()->user_type !== 'admin' && $business->owner_user_id !== auth()->id()) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'You do not have permission to manage user permissions',
+                ], 403);
+            }
+
+            $user = User::findOrFail($userId);
+
+            // Verify user belongs to this business
+            if (! $user->businesses()->where('businesses.id', $business->id)->exists()) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'User does not belong to this business',
+                ], 404);
+            }
+
+            // Prevent owner from modifying their own permissions
+            if ($user->id === $business->owner_user_id) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Cannot modify owner permissions',
+                ], 403);
+            }
+
+            $validated = $request->validate([
+                'permissions' => 'array',
+                'permissions.*' => 'string',
+                'role_template' => 'nullable|string',
+            ]);
+
+            $permissions = $validated['permissions'] ?? [];
+            $roleTemplate = $validated['role_template'] ?? null;
+
+            // Set permissions using PermissionService
+            $success = $this->permissionService->setPermissions(
+                user: $user,
+                permissions: $permissions,
+                business: $business,
+                roleTemplate: $roleTemplate,
+                reason: 'Updated by '.auth()->user()->name.' via permissions modal'
+            );
+
+            if ($success) {
+                Log::info('User permissions updated', [
+                    'business_id' => $business->id,
+                    'target_user_id' => $user->id,
+                    'actor_user_id' => auth()->id(),
+                    'permissions_count' => count($permissions),
+                    'role_template' => $roleTemplate,
+                ]);
+
+                return response()->json([
+                    'success' => true,
+                    'message' => 'Permissions updated successfully',
+                ]);
+            }
+
+            return response()->json([
+                'success' => false,
+                'message' => 'Failed to update permissions',
+            ], 500);
+
+        } catch (\Exception $e) {
+            Log::error('Error updating user permissions', [
+                'error' => $e->getMessage(),
+                'user_id' => $userId,
+                'business_slug' => $businessSlug,
+            ]);
+
+            return response()->json([
+                'success' => false,
+                'message' => 'An error occurred while updating permissions',
+            ], 500);
+        }
+    }
+
+    /**
+     * Apply a role template to a user
+     */
+    public function applyTemplate(Request $request, string $businessSlug, int $userId)
+    {
+        try {
+            $business = currentBusiness();
+
+            if (! $business) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Business not found',
+                ], 404);
+            }
+
+            // Only owners and admins can manage permissions
+            if (auth()->user()->user_type !== 'admin' && $business->owner_user_id !== auth()->id()) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'You do not have permission to manage user permissions',
+                ], 403);
+            }
+
+            $user = User::findOrFail($userId);
+
+            // Verify user belongs to this business
+            if (! $user->businesses()->where('businesses.id', $business->id)->exists()) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'User does not belong to this business',
+                ], 404);
+            }
+
+            $validated = $request->validate([
+                'template_key' => 'required|string',
+                'merge' => 'boolean',
+            ]);
+
+            $templateKey = $validated['template_key'];
+            $merge = $validated['merge'] ?? false;
+
+            // Apply role template
+            $permissions = $this->permissionService->applyRoleTemplate(
+                user: $user,
+                templateKey: $templateKey,
+                business: $business,
+                merge: $merge
+            );
+
+            if ($permissions === null) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Role template not found',
+                ], 404);
+            }
+
+            return response()->json([
+                'success' => true,
+                'message' => 'Role template applied successfully',
+                'permissions' => $permissions,
+            ]);
+
+        } catch (\Exception $e) {
+            Log::error('Error applying role template', [
+                'error' => $e->getMessage(),
+                'user_id' => $userId,
+                'business_slug' => $businessSlug,
+            ]);
+
+            return response()->json([
+                'success' => false,
+                'message' => 'An error occurred while applying role template',
+            ], 500);
+        }
+    }
+}

app/Http/Controllers/Buyer/BackorderController.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Http\Controllers\Buyer;
+
+use App\Http\Controllers\Controller;
+use App\Jobs\ProcessBackorderRequest;
+use App\Models\Product;
+use App\Services\BackorderService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+
+class BackorderController extends Controller
+{
+    public function __construct(
+        protected BackorderService $backorderService
+    ) {}
+
+    /**
+     * Create a backorder
+     */
+    public function store(Request $request): JsonResponse
+    {
+        $validator = Validator::make($request->all(), [
+            'product_id' => 'required|exists:products,id',
+            'quantity' => 'required|integer|min:1',
+            'notes' => 'nullable|string|max:500',
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'success' => false,
+                'errors' => $validator->errors(),
+            ], 422);
+        }
+
+        $user = auth()->user();
+        $business = $user->businesses->first(); // Assuming user has at least one business
+
+        if (! $business) {
+            return response()->json([
+                'success' => false,
+                'message' => 'You must have a business account to place backorders.',
+            ], 400);
+        }
+
+        $product = Product::findOrFail($request->product_id);
+
+        // Check if product is actually out of stock
+        if ($product->isInStock()) {
+            return response()->json([
+                'success' => false,
+                'message' => 'This product is currently in stock. Please add it to your cart instead.',
+            ], 400);
+        }
+
+        try {
+            // Dispatch the job to process backorder in the background
+            ProcessBackorderRequest::dispatch(
+                userId: $user->id,
+                buyerBusinessId: $business->id,
+                productId: $product->id,
+                quantity: $request->quantity,
+                notes: $request->notes
+            );
+
+            return response()->json([
+                'success' => true,
+                'message' => 'Backorder placed successfully! We will create an order automatically when inventory becomes available.',
+                'backorder' => [
+                    'product_id' => $product->id,
+                    'product_name' => $product->name,
+                    'quantity' => $request->quantity,
+                ],
+            ]);
+        } catch (\Exception $e) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Failed to create backorder. Please try again.',
+            ], 500);
+        }
+    }
+
+    /**
+     * List user's backorders
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $user = auth()->user();
+        $business = $user->businesses->first();
+
+        if (! $business) {
+            return response()->json([
+                'success' => false,
+                'message' => 'No business found.',
+            ], 404);
+        }
+
+        $backorders = \App\Models\Backorder::where('business_id', $business->id)
+            ->with(['product.brand', 'order'])
+            ->orderBy('created_at', 'desc')
+            ->get();
+
+        return response()->json([
+            'success' => true,
+            'backorders' => $backorders->map(function ($backorder) {
+                return [
+                    'id' => $backorder->id,
+                    'product' => [
+                        'name' => $backorder->product->name,
+                        'sku' => $backorder->product->sku,
+                        'brand_name' => $backorder->product->brand->name,
+                    ],
+                    'quantity' => $backorder->quantity,
+                    'status' => $backorder->status,
+                    'order_number' => $backorder->order?->order_number,
+                    'created_at' => $backorder->created_at->toDateString(),
+                    'converted_at' => $backorder->converted_at?->toDateString(),
+                ];
+            }),
+        ]);
+    }
+
+    /**
+     * Cancel a backorder
+     */
+    public function cancel(Request $request, int $backorderId): JsonResponse
+    {
+        $cancelled = $this->backorderService->cancelBackorder($backorderId, auth()->id());
+
+        if ($cancelled) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Backorder cancelled successfully.',
+            ]);
+        }
+
+        return response()->json([
+            'success' => false,
+            'message' => 'Backorder not found or already processed.',
+        ], 404);
+    }
+}

app/Http/Controllers/Buyer/BrandBrowseController.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Http\Controllers\Buyer;
+
+use App\Http\Controllers\Controller;
+use App\Models\Brand;
+use App\Models\Business;
+use Illuminate\Http\Request;
+
+class BrandBrowseController extends Controller
+{
+    /**
+     * Show brand menu for buyers to browse and order
+     * This is the main product browsing interface for buyers
+     *
+     * @return \Illuminate\View\View
+     */
+    public function browse(Request $request, string $businessSlug, string $brandHashid)
+    {
+        // Manually resolve business and brand (cross-tenant access allowed)
+        // Buyers can browse ANY seller's brand menu
+        $business = Business::where('slug', $businessSlug)->firstOrFail();
+        $brand = Brand::where('hashid', $brandHashid)
+            ->where('business_id', $business->id)
+            ->where('is_active', true)
+            ->firstOrFail();
+
+        // Load brand with business relationship
+        $brand->load('business');
+
+        // Get products organized by product line
+        $products = $brand->products()
+            ->with(['strain', 'images', 'productLine'])
+            ->where('is_active', true)
+            ->orderBy('product_line_id')
+            ->orderBy('name')
+            ->get();
+
+        // Group products by product line
+        $productsByLine = $products->groupBy(function ($product) {
+            return $product->productLine ? $product->productLine->name : 'Other Products';
+        });
+
+        // Get other brands from same business
+        $otherBrands = $business
+            ->brands()
+            ->where('id', '!=', $brand->id)
+            ->where('is_active', true)
+            ->get();
+
+        // Mark this as buyer view
+        $isSeller = false;
+
+        return view('seller.brands.preview', compact(
+            'business',
+            'brand',
+            'products',
+            'productsByLine',
+            'otherBrands',
+            'isSeller'
+        ));
+    }
+}

app/Http/Controllers/Buyer/CartController.php

@@ -27,7 +27,14 @@ class CartController extends Controller
         // Fetch items once - calculate totals from loaded collection
         $items = $this->cartService->getCartItems($user, $sessionId);
 
-        $subtotal = $items->sum(fn ($item) => $item->quantity * ($item->product->wholesale_price ?? 0));
+        $subtotal = $items->sum(function ($item) {
+            $product = $item->product;
+            $regularPrice = $product->wholesale_price ?? $product->msrp ?? 0;
+            $hasSalePrice = $product->sale_price && $product->sale_price < $regularPrice;
+            $unitPrice = $hasSalePrice ? $product->sale_price : $regularPrice;
+
+            return $item->quantity * $unitPrice;
+        });
 
         // Calculate tax based on business tax rate
         $taxRate = $business->getTaxRate() ?? 0.08;
@@ -101,7 +108,7 @@ class CartController extends Controller
     /**
      * Update cart item quantity (Ajax).
      */
-    public function update(\App\Models\Business $business, Request $request, int $cartId): JsonResponse
+    public function update(\App\Models\Business $business, Request $request, string $cartId): JsonResponse
     {
         $request->validate([
             'quantity' => 'required|integer|min:1',
@@ -111,11 +118,17 @@ class CartController extends Controller
         $sessionId = $request->session()->getId();
 
         try {
-            $cart = $this->cartService->updateQuantity($cartId, $request->integer('quantity'), $user, $sessionId);
+            $cart = $this->cartService->updateQuantity((int) $cartId, $request->integer('quantity'), $user, $sessionId);
 
             // Ensure product is loaded for JSON response
             $cart->load('product', 'brand');
 
+            // Calculate unit price (respecting sale pricing)
+            $product = $cart->product;
+            $regularPrice = $product->wholesale_price ?? $product->msrp ?? 0;
+            $hasSalePrice = $product->sale_price && $product->sale_price < $regularPrice;
+            $unitPrice = $hasSalePrice ? $product->sale_price : $regularPrice;
+
             $subtotal = $this->cartService->getSubtotal($user, $sessionId);
             $tax = $this->cartService->getTax($user, $sessionId);
             $total = $this->cartService->getTotal($user, $sessionId);
@@ -124,6 +137,7 @@ class CartController extends Controller
             return response()->json([
                 'success' => true,
                 'cart_item' => $cart,
+                'unit_price' => $unitPrice,
                 'subtotal' => $subtotal,
                 'tax' => $tax,
                 'total' => $total,
@@ -140,7 +154,7 @@ class CartController extends Controller
     /**
      * Remove item from cart (Ajax).
      */
-    public function remove(\App\Models\Business $business, Request $request, int $cartId): JsonResponse
+    public function remove(\App\Models\Business $business, Request $request, string $cartId): JsonResponse
     {
         $user = $request->user();
         $sessionId = $request->session()->getId();

app/Http/Controllers/Buyer/CheckoutController.php

@@ -145,14 +145,19 @@ class CheckoutController extends Controller
 
             // Create order items from cart
             foreach ($items as $item) {
+                // Determine the correct price: use sale_price if available and lower than wholesale_price
+                $regularPrice = $item->product->wholesale_price ?? $item->product->msrp ?? 0;
+                $hasSalePrice = $item->product->sale_price && $item->product->sale_price < $regularPrice;
+                $unitPrice = $hasSalePrice ? $item->product->sale_price : $regularPrice;
+
                 OrderItem::create([
                     'order_id' => $order->id,
                     'product_id' => $item->product_id,
                     'batch_id' => $item->batch_id,
                     'batch_number' => $item->batch?->batch_number,
                     'quantity' => $item->quantity,
-                    'unit_price' => $item->product->wholesale_price,
-                    'line_total' => $item->quantity * $item->product->wholesale_price,
+                    'unit_price' => $unitPrice,
+                    'line_total' => $item->quantity * $unitPrice,
                     'product_name' => $item->product->name,
                     'product_sku' => $item->product->sku,
                     'brand_name' => $item->brand->name ?? '',

app/Http/Controllers/Buyer/InvoiceController.php

@@ -4,10 +4,7 @@ namespace App\Http\Controllers\Buyer;
 
 use App\Http\Controllers\Controller;
 use App\Models\Invoice;
-use App\Models\OrderItem;
 use App\Services\InvoiceService;
-use App\Services\OrderModificationService;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -48,145 +45,7 @@ class InvoiceController extends Controller
 
         $invoice->load(['order.items', 'business']);
 
-        // Prepare invoice items data for Alpine.js
-        $invoiceItems = $invoice->order->items->map(function ($item) {
-            return [
-                'id' => $item->id,
-                'quantity' => $item->picked_qty,
-                'originalQuantity' => $item->picked_qty,
-                'unit_price' => $item->unit_price,
-                'deleted' => false,
-            ];
-        })->values();
-
-        return view('buyer.invoices.show', compact('invoice', 'invoiceItems', 'business'));
-    }
-
-    /**
-     * Approve the invoice without modifications.
-     */
-    public function approve(\App\Models\Business $business, Invoice $invoice)
-    {
-        if (! $invoice->order || ! $invoice->order->belongsToBusiness($business)) {
-            abort(403, 'Unauthorized to approve this invoice.');
-        }
-
-        if (! $invoice->canBeEditedByBuyer()) {
-            return response()->json([
-                'success' => false,
-                'message' => 'This invoice cannot be approved at this time.',
-            ], 400);
-        }
-
-        $invoice->buyerApprove(auth()->user());
-
-        return response()->json([
-            'success' => true,
-            'message' => 'Invoice approved successfully.',
-        ]);
-    }
-
-    /**
-     * Reject the invoice.
-     */
-    public function reject(\App\Models\Business $business, Request $request, Invoice $invoice)
-    {
-        $request->validate([
-            'reason' => 'required|string|max:1000',
-        ]);
-
-        if (! $invoice->order || ! $invoice->order->belongsToBusiness($business)) {
-            abort(403, 'Unauthorized to reject this invoice.');
-        }
-
-        if (! $invoice->canBeEditedByBuyer()) {
-            return back()->with('error', 'This invoice cannot be rejected at this time.');
-        }
-
-        $invoice->buyerReject(auth()->user(), $request->reason);
-
-        return redirect()->route('buyer.invoices.index')
-            ->with('success', 'Invoice rejected successfully.');
-    }
-
-    /**
-     * Modify the invoice (record buyer's changes).
-     */
-    public function modify(\App\Models\Business $business, Request $request, Invoice $invoice, OrderModificationService $modificationService)
-    {
-        $request->validate([
-            'items' => 'required|array',
-            'items.*.id' => 'required|exists:order_items,id',
-            'items.*.quantity' => 'required|integer|min:0',
-            'items.*.deleted' => 'required|boolean',
-        ]);
-
-        if (! $invoice->order || ! $invoice->order->belongsToBusiness($business)) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Unauthorized to modify this invoice.',
-            ], 403);
-        }
-
-        if (! $invoice->canBeEditedByBuyer()) {
-            return response()->json([
-                'success' => false,
-                'message' => 'This invoice cannot be modified at this time.',
-            ], 400);
-        }
-
-        // Record all changes
-        $hasChanges = false;
-        foreach ($request->items as $itemData) {
-            $item = OrderItem::find($itemData['id']);
-
-            // Skip if item doesn't belong to this order
-            if ($item->order_id !== $invoice->order_id) {
-                continue;
-            }
-
-            // Check for deletion
-            if ($itemData['deleted'] && ! $item->deleted_at) {
-                $modificationService->recordItemDeletion($invoice, $item, auth()->user());
-                $hasChanges = true;
-
-                continue;
-            }
-
-            // Check for quantity change
-            if ($itemData['quantity'] != $item->picked_qty) {
-                // Validate: can only reduce, not increase
-                if ($itemData['quantity'] > $item->picked_qty) {
-                    return response()->json([
-                        'success' => false,
-                        'message' => 'You can only reduce quantities, not increase them.',
-                    ], 400);
-                }
-
-                $modificationService->recordItemChange(
-                    $invoice,
-                    $item,
-                    ['quantity' => $itemData['quantity']],
-                    auth()->user()
-                );
-                $hasChanges = true;
-            }
-        }
-
-        if (! $hasChanges) {
-            return response()->json([
-                'success' => false,
-                'message' => 'No changes detected.',
-            ], 400);
-        }
-
-        // Update invoice status to buyer_modified
-        $invoice->buyerModify();
-
-        return response()->json([
-            'success' => true,
-            'message' => 'Changes saved successfully. The seller will review your modifications.',
-        ]);
+        return view('buyer.invoices.show', compact('invoice', 'business'));
     }
 
     /**

app/Http/Controllers/Buyer/OrderController.php

@@ -3,11 +3,19 @@
 namespace App\Http\Controllers\Buyer;
 
 use App\Http\Controllers\Controller;
+use App\Models\DeliveryWindow;
 use App\Models\Order;
+use App\Services\DeliveryWindowService;
+use Carbon\Carbon;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
 class OrderController extends Controller
 {
+    public function __construct(
+        private DeliveryWindowService $deliveryWindowService
+    ) {}
+
     /**
      * Display a listing of the user's orders.
      */
@@ -42,7 +50,7 @@ class OrderController extends Controller
             abort(403, 'Unauthorized to view this order.');
         }
 
-        $order->load(['items.product', 'business', 'location', 'user', 'invoice', 'manifest']);
+        $order->load(['items.product.brand', 'business', 'location', 'user', 'invoice', 'manifest', 'deliveryWindow', 'pendingCancellationRequest']);
 
         return view('buyer.orders.show', compact('business', 'order'));
     }
@@ -65,8 +73,31 @@ class OrderController extends Controller
         return back()->with('success', "Order {$order->order_number} has been accepted.");
     }
 
+    /**
+     * Request cancellation of an order (buyer-initiated).
+     */
+    public function requestCancellation(\App\Models\Business $business, Order $order, Request $request)
+    {
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized to modify this order.');
+        }
+
+        if (! $order->canRequestCancellation()) {
+            return back()->with('error', 'This order cannot have a cancellation request at this stage.');
+        }
+
+        $validated = $request->validate([
+            'reason' => 'required|string|max:1000',
+        ]);
+
+        $order->requestCancellation(auth()->user(), $validated['reason']);
+
+        return back()->with('success', "Cancellation request submitted for order {$order->order_number}. The seller will review your request.");
+    }
+
     /**
      * Cancel an order (buyer-initiated).
+     * NOTE: This is the old direct cancel method, kept for backward compatibility.
      */
     public function cancel(\App\Models\Business $business, Order $order, Request $request)
     {
@@ -156,4 +187,433 @@ class OrderController extends Controller
             ]
         );
     }
+
+    /**
+     * Update order's delivery window
+     */
+    public function updateDeliveryWindow(\App\Models\Business $business, Order $order, Request $request): RedirectResponse
+    {
+        // Ensure order belongs to buyer's business
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow updates for delivery orders at approved_for_delivery status
+        if ($order->status !== 'approved_for_delivery') {
+            abort(422, 'Delivery window can only be set after buyer has approved the order for delivery');
+        }
+
+        // Only delivery orders need delivery windows
+        if (! $order->isDelivery()) {
+            abort(422, 'Delivery window can only be set for delivery orders');
+        }
+
+        $validated = $request->validate([
+            'delivery_window_id' => 'required|exists:delivery_windows,id',
+            'delivery_window_date' => 'required|date|after_or_equal:today',
+            'location_id' => 'required|exists:locations,id',
+        ]);
+
+        $window = DeliveryWindow::findOrFail($validated['delivery_window_id']);
+
+        // Get seller's business ID from the first order item's product's brand
+        $sellerBusinessId = $order->items->first()?->product?->brand?->business_id;
+
+        if (! $sellerBusinessId) {
+            abort(422, 'Unable to determine seller business for this order');
+        }
+
+        // Ensure window belongs to the SELLER's business
+        if ($window->business_id !== $sellerBusinessId) {
+            abort(422, 'Delivery window does not belong to seller business');
+        }
+
+        $date = Carbon::parse($validated['delivery_window_date']);
+
+        // Validate that location belongs to buyer's business
+        $location = \App\Models\Location::where('id', $validated['location_id'])
+            ->where('business_id', $business->id)
+            ->where('accepts_deliveries', true)
+            ->where('is_active', true)
+            ->first();
+
+        if (! $location) {
+            abort(422, 'Invalid delivery location');
+        }
+
+        // Validate using service
+        if (! $this->deliveryWindowService->validateWindowSelection($window, $date)) {
+            abort(422, 'Invalid delivery window selection');
+        }
+
+        $this->deliveryWindowService->updateOrderWindow($order, $window, $date, $validated['location_id']);
+
+        return redirect()
+            ->route('buyer.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Delivery scheduled for '.$date->format('l, F j, Y').' at '.$location->name);
+    }
+
+    /**
+     * Get available delivery windows for an order's seller business.
+     */
+    public function getAvailableDeliveryWindows(\App\Models\Business $business, Order $order, Request $request)
+    {
+        // Ensure order belongs to buyer's business
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        $date = $request->query('date');
+        if (! $date) {
+            return response()->json(['error' => 'Date parameter required'], 400);
+        }
+
+        try {
+            $selectedDate = Carbon::parse($date);
+        } catch (\Exception $e) {
+            return response()->json(['error' => 'Invalid date format'], 400);
+        }
+
+        $dayOfWeek = $selectedDate->dayOfWeek;
+
+        // Get seller's business ID from the first order item's product's brand
+        $sellerBusinessId = $order->items->first()?->product?->brand?->business_id;
+
+        if (! $sellerBusinessId) {
+            return response()->json(['windows' => []]);
+        }
+
+        // Fetch active delivery windows for the seller on this day
+        $windows = DeliveryWindow::where('business_id', $sellerBusinessId)
+            ->where('day_of_week', $dayOfWeek)
+            ->where('is_active', true)
+            ->orderBy('start_time')
+            ->get()
+            ->map(function ($window) {
+                return [
+                    'id' => $window->id,
+                    'day_name' => $window->day_name,
+                    'time_range' => $window->time_range,
+                    'start_time' => $window->start_time,
+                    'end_time' => $window->end_time,
+                ];
+            });
+
+        return response()->json(['windows' => $windows]);
+    }
+
+    /**
+     * Show pre-delivery approval form (Review #1: After picking, before delivery).
+     * Buyer reviews order with COAs and can approve/reject entire line items.
+     */
+    public function showPreDeliveryApproval(\App\Models\Business $business, Order $order)
+    {
+        // Authorization check
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized to access this order.');
+        }
+
+        // Only ready_for_delivery orders can be reviewed
+        if ($order->status !== 'ready_for_delivery') {
+            return redirect()->route('buyer.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Only orders ready for delivery can be reviewed.');
+        }
+
+        // Load relationships including COAs
+        $order->load([
+            'items.product.brand',
+            'items.batch.coaFiles' => function ($query) {
+                $query->orderBy('is_primary', 'desc')->orderBy('display_order');
+            },
+            'business',
+            'location',
+        ]);
+
+        return view('buyer.orders.pre-delivery-review', compact('business', 'order'));
+    }
+
+    /**
+     * Process pre-delivery approval (Review #1).
+     * Buyer can approve order or reject specific line items.
+     */
+    public function processPreDeliveryApproval(\App\Models\Business $business, Order $order, Request $request): RedirectResponse
+    {
+        // Authorization check
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized to modify this order.');
+        }
+
+        // Only ready_for_delivery orders can be approved
+        if ($order->status !== 'ready_for_delivery') {
+            return back()->with('error', 'Only orders ready for delivery can be reviewed.');
+        }
+
+        $validated = $request->validate([
+            'action' => 'required|in:approve,reject',
+            'rejected_items' => 'nullable|array',
+            'rejected_items.*' => 'exists:order_items,id',
+            'rejection_reason' => 'nullable|string|max:1000',
+        ]);
+
+        // Validate that at least one line item remains active when approving with rejections
+        if ($validated['action'] === 'approve' && ! empty($validated['rejected_items'])) {
+            $totalItems = $order->items()->count();
+            $rejectedItemsCount = count($validated['rejected_items']);
+
+            if ($rejectedItemsCount >= $totalItems) {
+                return back()->withErrors([
+                    'rejected_items' => 'You cannot reject all items. If you wish to cancel the entire order, please use the "Request cancellation" option below.',
+                ])->withInput();
+            }
+        }
+
+        $rejectedProductNames = [];
+
+        \DB::transaction(function () use ($order, $validated, &$rejectedProductNames) {
+            if ($validated['action'] === 'reject') {
+                // Reject entire order
+                $order->update([
+                    'status' => 'rejected',
+                    'rejected_at' => now(),
+                    'rejected_reason' => $validated['rejection_reason'] ?? 'Order rejected by buyer during review',
+                ]);
+
+                // Return all inventory to stock
+                foreach ($order->items as $item) {
+                    if ($item->batch_id && $item->batch) {
+                        $item->batch->deallocate($item->quantity);
+                    }
+                }
+            } else {
+                // Approve with optional item rejections
+                if (! empty($validated['rejected_items'])) {
+
+                    // Mark rejected items (keep in database for history)
+                    foreach ($validated['rejected_items'] as $itemId) {
+                        $item = $order->items()->find($itemId);
+                        if ($item) {
+                            $rejectedProductNames[] = $item->product_name;
+
+                            // Return inventory
+                            if ($item->batch_id && $item->batch) {
+                                $item->batch->deallocate($item->quantity);
+                            }
+
+                            // Mark item as rejected (don't delete - preserve history)
+                            $item->update(['pre_delivery_status' => 'rejected']);
+
+                            // Delete related PickingTicketItems to prevent picking
+                            \App\Models\PickingTicketItem::where('order_item_id', $item->id)->delete();
+                        }
+                    }
+
+                    // Add rejection instruction to the fulfillment work order
+                    if (! empty($rejectedProductNames) && $order->fulfillmentWorkOrder) {
+                        $rejectionMessage = 'Buyer rejected: '.implode(', ', $rejectedProductNames).'. Pull and restock these items.';
+
+                        $order->fulfillmentWorkOrder->update([
+                            'instructions' => $order->fulfillmentWorkOrder->instructions
+                                ? $order->fulfillmentWorkOrder->instructions."\n\n".$rejectionMessage
+                                : $rejectionMessage,
+                        ]);
+                    }
+
+                    // Check for empty picking tickets and delete them
+                    if ($order->fulfillmentWorkOrder) {
+                        foreach ($order->fulfillmentWorkOrder->pickingTickets as $ticket) {
+                            if ($ticket->items()->count() === 0) {
+                                $ticket->delete();
+                            }
+                        }
+                    }
+
+                    // Recalculate order totals based on non-rejected items only
+                    $order->refresh();
+                    $order->load('items');
+
+                    $activeItems = $order->items->where('pre_delivery_status', '!=', 'rejected');
+                    $subtotal = $activeItems->sum('line_total');
+                    $surchargePercent = \App\Models\Order::getSurchargePercentage($order->payment_terms);
+                    $surcharge = $subtotal * ($surchargePercent / 100);
+                    $taxRate = $order->business->getTaxRate();
+                    $tax = ($subtotal + $surcharge) * $taxRate;
+                    $total = $subtotal + $surcharge + $tax;
+
+                    $order->update([
+                        'subtotal' => $subtotal,
+                        'surcharge' => $surcharge,
+                        'tax' => $tax,
+                        'total' => $total,
+                    ]);
+                }
+
+                // Check if any non-rejected items remain
+                $activeItemsCount = $order->items()->where(function ($q) {
+                    $q->whereNull('pre_delivery_status')->orWhere('pre_delivery_status', '!=', 'rejected');
+                })->count();
+
+                if ($activeItemsCount === 0) {
+                    $order->update([
+                        'status' => 'rejected',
+                        'rejected_at' => now(),
+                        'rejected_reason' => 'All items rejected by buyer during review',
+                    ]);
+                } else {
+                    // Mark as approved for delivery
+                    $order->update([
+                        'status' => 'approved_for_delivery',
+                        'buyer_approved_at' => now(),
+                        'buyer_approved_by' => auth()->id(),
+                    ]);
+                }
+            }
+        });
+
+        // Notify seller if items were rejected
+        if (! empty($rejectedProductNames)) {
+            try {
+                $sellerNotificationService = app(\App\Services\SellerNotificationService::class);
+                $sellerNotificationService->itemsRejectedDuringReview($order, $rejectedProductNames);
+            } catch (\Exception $e) {
+                // Log the error but don't block the approval process
+                \Log::error('Failed to send seller notification for rejected items', [
+                    'order_id' => $order->id,
+                    'order_number' => $order->order_number,
+                    'error' => $e->getMessage(),
+                ]);
+            }
+        }
+
+        $message = match ($order->status) {
+            'rejected' => 'Order rejected. Items have been returned to inventory.',
+            'approved_for_delivery' => empty($validated['rejected_items'])
+                ? 'Order approved for delivery!'
+                : 'Order approved with '.count($validated['rejected_items']).' item(s) removed.',
+            default => 'Order updated.',
+        };
+
+        return redirect()->route('buyer.business.orders.show', [$business->slug, $order])
+            ->with('success', $message);
+    }
+
+    /**
+     * Show delivery acceptance form for buyer to accept/reject items (Review #2: After delivery).
+     */
+    public function showAcceptance(\App\Models\Business $business, Order $order)
+    {
+        // Authorization check
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized to access this order.');
+        }
+
+        // Only delivered orders can be accepted
+        if ($order->status !== 'delivered') {
+            return redirect()->route('buyer.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Only delivered orders can be accepted.');
+        }
+
+        // Load relationships including COAs
+        $order->load([
+            'items.product.brand',
+            'items.batch.coaFiles' => function ($query) {
+                $query->orderBy('is_primary', 'desc')->orderBy('display_order');
+            },
+            'business',
+            'location',
+        ]);
+
+        return view('buyer.orders.accept', compact('business', 'order'));
+    }
+
+    /**
+     * Process delivery acceptance (accept/reject line items).
+     */
+    public function processAcceptance(\App\Models\Business $business, Order $order, Request $request): RedirectResponse
+    {
+        // Authorization check
+        if (! $order->belongsToBusiness($business)) {
+            abort(403, 'Unauthorized to modify this order.');
+        }
+
+        // Only delivered orders can be accepted
+        if ($order->status !== 'delivered') {
+            return back()->with('error', 'Only delivered orders can be accepted.');
+        }
+
+        $validated = $request->validate([
+            'items' => 'required|array',
+            'items.*.accepted_qty' => 'required|integer|min:0',
+            'items.*.rejected_qty' => 'required|integer|min:0',
+            'items.*.rejection_reason' => 'nullable|string|max:1000',
+        ]);
+
+        // Custom validation: accepted + rejected must equal ordered quantity
+        $order->load('items');
+        foreach ($validated['items'] as $itemId => $itemData) {
+            $orderItem = $order->items->firstWhere('id', $itemId);
+
+            if (! $orderItem) {
+                continue;
+            }
+
+            $totalQty = $itemData['accepted_qty'] + $itemData['rejected_qty'];
+            if ($totalQty !== $orderItem->quantity) {
+                return back()->withErrors([
+                    "items.{$itemId}" => "Accepted and rejected quantities must equal ordered quantity ({$orderItem->quantity})",
+                ]);
+            }
+
+            // Validate rejection reason is provided when items are rejected
+            if ($itemData['rejected_qty'] > 0 && empty($itemData['rejection_reason'])) {
+                return back()->withErrors([
+                    "items.{$itemId}.rejection_reason" => 'Rejection reason is required when rejecting items',
+                ]);
+            }
+        }
+
+        // Update each order item with acceptance data
+        \DB::transaction(function () use ($order, $validated) {
+            foreach ($validated['items'] as $itemId => $itemData) {
+                $orderItem = $order->items->firstWhere('id', $itemId);
+
+                if ($orderItem) {
+                    $orderItem->update([
+                        'accepted_qty' => $itemData['accepted_qty'],
+                        'rejected_qty' => $itemData['rejected_qty'],
+                        'rejection_reason' => $itemData['rejection_reason'] ?? null,
+                    ]);
+
+                    // Return rejected items to inventory if batch is set
+                    if ($itemData['rejected_qty'] > 0 && $orderItem->batch_id && $orderItem->batch) {
+                        $orderItem->batch->deallocate($itemData['rejected_qty']);
+                    }
+                }
+            }
+
+            // Determine final order status
+            $hasRejections = collect($validated['items'])->some(fn ($item) => $item['rejected_qty'] > 0);
+            $allRejected = collect($validated['items'])->every(fn ($item) => $item['rejected_qty'] === ($order->items->firstWhere('id', array_search($item, $validated['items']))->quantity ?? 0));
+
+            if ($allRejected) {
+                $order->update([
+                    'status' => 'rejected',
+                    'rejected_at' => now(),
+                    'rejected_reason' => 'All items rejected by buyer',
+                ]);
+            } else {
+                $order->markBuyerApproved();
+
+                // Create invoice based on accepted quantities
+                $invoiceService = app(\App\Services\InvoiceService::class);
+                $invoiceService->createFromDelivery($order);
+            }
+        });
+
+        $message = $order->status === 'rejected'
+            ? 'Order rejected. All items have been returned to inventory.'
+            : 'Order accepted successfully. Invoice has been generated.';
+
+        return redirect()->route('buyer.business.orders.show', [$business->slug, $order])
+            ->with('success', $message);
+    }
 }

app/Http/Controllers/Buyer/StockNotificationController.php

@@ -0,0 +1,163 @@
+<?php
+
+namespace App\Http\Controllers\Buyer;
+
+use App\Http\Controllers\Controller;
+use App\Models\Product;
+use App\Services\StockNotificationService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+
+class StockNotificationController extends Controller
+{
+    public function __construct(
+        protected StockNotificationService $stockNotificationService
+    ) {}
+
+    /**
+     * Subscribe to stock notification
+     */
+    public function subscribe(Request $request): JsonResponse
+    {
+        $validator = Validator::make($request->all(), [
+            'product_id' => 'required|exists:products,id',
+            'email' => 'nullable|email',
+            'phone_number' => 'nullable|string',
+            'whatsapp' => 'nullable|string',
+            'notification_method' => 'nullable|in:email,sms,whatsapp,all',
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'success' => false,
+                'errors' => $validator->errors(),
+            ], 422);
+        }
+
+        $product = Product::findOrFail($request->product_id);
+
+        // Check if product is actually out of stock
+        if ($product->isInStock()) {
+            return response()->json([
+                'success' => false,
+                'message' => 'This product is currently in stock.',
+            ], 400);
+        }
+
+        $userId = auth()->check() ? auth()->id() : null;
+        $email = $request->email ?? auth()->user()?->email;
+        $notificationMethod = $request->notification_method ?? 'email';
+
+        // Determine phone number based on notification method
+        // For WhatsApp, use whatsapp field; for SMS use phone_number; for all, prefer phone_number
+        $phoneNumber = null;
+        if ($notificationMethod === 'whatsapp') {
+            $phoneNumber = $request->whatsapp ?? auth()->user()?->phone_number;
+        } elseif ($notificationMethod === 'sms') {
+            $phoneNumber = $request->phone_number ?? auth()->user()?->phone_number;
+        } elseif ($notificationMethod === 'all') {
+            // For 'all', we'll store the primary phone number
+            $phoneNumber = $request->phone_number ?? $request->whatsapp ?? auth()->user()?->phone_number;
+        }
+
+        // Validate that we have at least one contact method
+        if (! $email && ! $phoneNumber) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Please provide contact information.',
+            ], 422);
+        }
+
+        // Check if user already has a pending notification for this product
+        if ($userId) {
+            $existing = \App\Models\StockNotification::where('user_id', $userId)
+                ->where('product_id', $product->id)
+                ->pending()
+                ->notExpired()
+                ->first();
+
+            if ($existing) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'You already have a pending notification for this product.',
+                ], 400);
+            }
+        }
+
+        $notification = $this->stockNotificationService->createNotification(
+            productId: $product->id,
+            userId: $userId,
+            email: $email,
+            phoneNumber: $phoneNumber,
+            notificationMethod: $notificationMethod
+        );
+
+        return response()->json([
+            'success' => true,
+            'message' => 'You will be notified when this product is back in stock!',
+            'notification' => [
+                'id' => $notification->id,
+                'product_name' => $product->name,
+                'expires_at' => $notification->expires_at->toDateString(),
+            ],
+        ]);
+    }
+
+    /**
+     * Cancel a stock notification
+     */
+    public function cancel(Request $request, int $notificationId): JsonResponse
+    {
+        $userId = auth()->check() ? auth()->id() : null;
+
+        $cancelled = $this->stockNotificationService->cancelNotification($notificationId, $userId);
+
+        if ($cancelled) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Notification cancelled successfully.',
+            ]);
+        }
+
+        return response()->json([
+            'success' => false,
+            'message' => 'Notification not found or already processed.',
+        ], 404);
+    }
+
+    /**
+     * List user's pending notifications
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $user = auth()->user();
+
+        if (! $user) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Authentication required.',
+            ], 401);
+        }
+
+        $notifications = $this->stockNotificationService->getUserNotifications($user);
+
+        return response()->json([
+            'success' => true,
+            'notifications' => $notifications->map(function ($notification) {
+                return [
+                    'id' => $notification->id,
+                    'product' => [
+                        'id' => $notification->product->id,
+                        'name' => $notification->product->name,
+                        'sku' => $notification->product->sku,
+                        'brand_name' => $notification->product->brand->name,
+                    ],
+                    'notification_method' => $notification->notification_method,
+                    'created_at' => $notification->created_at->toDateString(),
+                    'expires_at' => $notification->expires_at->toDateString(),
+                ];
+            }),
+        ]);
+    }
+}

app/Http/Controllers/Concerns/HandlesPrecognition.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Controllers\Concerns;
+
+use Illuminate\Http\Request;
+
+/**
+ * Trait HandlesPrecognition
+ *
+ * Adds Laravel Precognition support to controllers for real-time form validation.
+ *
+ * Usage in controller:
+ * ```php
+ * use HandlesPrecognition;
+ *
+ * public function store(Request $request, Business $business)
+ * {
+ *     // Handle precognition validation
+ *     if ($this->isPrecognitive($request)) {
+ *         return;
+ *     }
+ *
+ *     // Your normal validation and logic
+ *     $validated = $request->validate([...]);
+ * }
+ * ```
+ */
+trait HandlesPrecognition
+{
+    /**
+     * Check if the request is a precognitive validation request
+     */
+    protected function isPrecognitive(Request $request): bool
+    {
+        return $request->isPrecognitive();
+    }
+
+    /**
+     * Handle precognitive validation and return early if needed
+     * This method can be called at the start of store/update methods
+     */
+    protected function handlePrecognition(Request $request): void
+    {
+        if ($request->isPrecognitive()) {
+            // Laravel automatically handles the validation response
+            // No need to explicitly return anything
+        }
+    }
+}

app/Http/Controllers/Controller.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+
 class Controller
 {
-    //
+    use AuthorizesRequests;
 }

app/Http/Controllers/ImageController.php

@@ -0,0 +1,207 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Brand;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Drivers\Gd\Driver;
+use Intervention\Image\ImageManager;
+
+/**
+ * Image Controller - Serves Brand Media from MinIO
+ *
+ * URL PATTERNS:
+ * =============
+ * - Logo:   GET /images/brand-logo/{brand}/{width?}
+ * - Banner: GET /images/brand-banner/{brand}/{width?}
+ *
+ * Where:
+ * - {brand} = Brand hashid (e.g., "75pg7" for Aloha TymeMachine)
+ * - {width} = Optional thumbnail width in pixels (e.g., 160, 600, 1600)
+ *
+ * Examples:
+ * - /images/brand-logo/75pg7           → Original logo from MinIO
+ * - /images/brand-logo/75pg7/600       → 600px thumbnail (cached locally)
+ * - /images/brand-banner/75pg7/1344    → 1344px banner (cached locally)
+ *
+ * CRITICAL STORAGE RULES:
+ * =======================
+ *
+ * 1. ALWAYS use Storage (default disk) - NEVER Storage::disk('public')
+ *    ✓ Storage::exists()  → uses .env FILESYSTEM_DISK=minio
+ *    ✗ Storage::disk('public')->exists()  → bypasses .env, uses local disk
+ *
+ * 2. Brand assets MUST be on MinIO at:
+ *    businesses/{business_slug}/brands/{brand_slug}/branding/{filename}
+ *    Example: businesses/cannabrands/brands/thunder-bud/branding/logo.png
+ *
+ * 3. Thumbnails are cached to local disk for performance:
+ *    storage/app/private/brands/cache/{brand_hashid}-{width}w.{ext}
+ *
+ * 4. Original images are fetched from MinIO and served directly:
+ *    $contents = Storage::get($brand->logo_path);  // Gets from MinIO
+ *    return response($contents)->header('Content-Type', $mimeType);
+ *
+ * WHY THIS MATTERS:
+ * =================
+ * - MinIO is configured in .env as the default disk
+ * - All brand/product media lives on MinIO (S3-compatible storage)
+ * - Using Storage::disk('public') breaks images and violates architecture
+ * - This has caused multiple production issues - DO NOT change without review
+ *
+ * See: docs/architecture/MEDIA_STORAGE.md
+ */
+class ImageController extends Controller
+{
+    /**
+     * Serve a brand logo at a specific size
+     * URL: /images/brand-logo/{brand}/{width?}
+     */
+    public function brandLogo(Brand $brand, ?int $width = null)
+    {
+        if (! $brand->logo_path || ! Storage::exists($brand->logo_path)) {
+            abort(404);
+        }
+
+        // If no width specified, return original from storage
+        if (! $width) {
+            $contents = Storage::get($brand->logo_path);
+            $mimeType = Storage::mimeType($brand->logo_path);
+
+            return response($contents)->header('Content-Type', $mimeType);
+        }
+
+        // Map common widths to pre-generated sizes (retina-optimized)
+        $sizeNames = [
+            160 => 'thumb',    // 2x retina for 80px display
+            600 => 'medium',   // 2x retina for 300px display
+            1600 => 'large',   // 2x retina for 800px display
+        ];
+
+        // Check if cached dynamic thumbnail exists in local storage
+        $ext = pathinfo($brand->logo_path, PATHINFO_EXTENSION);
+        $thumbnailName = $brand->hashid.'-'.$width.'w.'.$ext;
+        $thumbnailPath = 'brands/cache/'.$thumbnailName;
+
+        if (! Storage::disk('local')->exists($thumbnailPath)) {
+            // Fetch original from default storage disk
+            $originalContents = Storage::get($brand->logo_path);
+
+            // Generate thumbnail on-the-fly
+            $manager = new ImageManager(new Driver);
+            $image = $manager->read($originalContents);
+            $image->scale(width: $width);
+
+            // Cache the thumbnail locally for performance
+            if (! Storage::disk('local')->exists('brands/cache')) {
+                Storage::disk('local')->makeDirectory('brands/cache');
+            }
+
+            // Save as PNG or JPEG based on original format
+            $encoded = $ext === 'png' ? $image->toPng() : $image->toJpeg(quality: 90);
+            Storage::disk('local')->put($thumbnailPath, $encoded);
+        }
+
+        $path = storage_path('app/private/'.$thumbnailPath);
+
+        return response()->file($path);
+    }
+
+    /**
+     * Serve a brand banner at a specific width
+     * URL: /images/brand-banner/{brand}/{width?}
+     */
+    public function brandBanner(Brand $brand, ?int $width = null)
+    {
+        if (! $brand->banner_path || ! Storage::exists($brand->banner_path)) {
+            abort(404);
+        }
+
+        // If no width specified, return original from storage
+        if (! $width) {
+            $contents = Storage::get($brand->banner_path);
+            $mimeType = Storage::mimeType($brand->banner_path);
+
+            return response($contents)->header('Content-Type', $mimeType);
+        }
+
+        // Map common widths to pre-generated sizes (retina-optimized)
+        $sizeNames = [
+            1344 => 'medium',  // 2x retina for 672px display
+            2560 => 'large',   // 2x retina for 1280px display
+        ];
+
+        // Check if cached dynamic thumbnail exists in local storage
+        $ext = pathinfo($brand->banner_path, PATHINFO_EXTENSION);
+        $thumbnailName = $brand->hashid.'-banner-'.$width.'w.'.$ext;
+        $thumbnailPath = 'brands/cache/'.$thumbnailName;
+
+        if (! Storage::disk('local')->exists($thumbnailPath)) {
+            // Fetch original from default storage disk (MinIO)
+            $originalContents = Storage::get($brand->banner_path);
+
+            // Generate thumbnail on-the-fly
+            $manager = new ImageManager(new Driver);
+            $image = $manager->read($originalContents);
+            $image->scale(width: $width);
+
+            // Cache the thumbnail locally for performance
+            if (! Storage::disk('local')->exists('brands/cache')) {
+                Storage::disk('local')->makeDirectory('brands/cache');
+            }
+
+            Storage::disk('local')->put($thumbnailPath, $image->toJpeg(quality: 90));
+        }
+
+        $path = storage_path('app/private/'.$thumbnailPath);
+
+        return response()->file($path);
+    }
+
+    /**
+     * Serve a product image at a specific width
+     * URL: /images/product/{product}/{width?}
+     */
+    public function productImage(\App\Models\Product $product, ?int $width = null)
+    {
+        if (! $product->image_path || ! Storage::exists($product->image_path)) {
+            abort(404);
+        }
+
+        // If no width specified, return original from storage
+        if (! $width) {
+            $contents = Storage::get($product->image_path);
+            $mimeType = Storage::mimeType($product->image_path);
+
+            return response($contents)->header('Content-Type', $mimeType);
+        }
+
+        // Check if cached dynamic thumbnail exists in local storage
+        $ext = pathinfo($product->image_path, PATHINFO_EXTENSION);
+        $thumbnailName = $product->hashid.'-'.$width.'w.'.$ext;
+        $thumbnailPath = 'products/cache/'.$thumbnailName;
+
+        if (! Storage::disk('local')->exists($thumbnailPath)) {
+            // Fetch original from default storage disk (MinIO)
+            $originalContents = Storage::get($product->image_path);
+
+            // Generate thumbnail on-the-fly
+            $manager = new ImageManager(new Driver);
+            $image = $manager->read($originalContents);
+            $image->scale(width: $width);
+
+            // Cache the thumbnail locally for performance
+            if (! Storage::disk('local')->exists('products/cache')) {
+                Storage::disk('local')->makeDirectory('products/cache');
+            }
+
+            // Save as PNG or JPEG based on original format
+            $encoded = $ext === 'png' ? $image->toPng() : $image->toJpeg(quality: 90);
+            Storage::disk('local')->put($thumbnailPath, $encoded);
+        }
+
+        $path = storage_path('app/private/'.$thumbnailPath);
+
+        return response()->file($path);
+    }
+}

app/Http/Controllers/OrderController.php

@@ -4,9 +4,12 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers;
 
+use App\Models\DeliveryWindow;
 use App\Models\Manifest;
 use App\Models\Order;
+use App\Services\DeliveryWindowService;
 use App\Services\ManifestService;
+use Carbon\Carbon;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
@@ -16,13 +19,17 @@ use Illuminate\View\View;
 
 class OrderController extends Controller
 {
+    public function __construct(
+        private DeliveryWindowService $deliveryWindowService
+    ) {}
+
     /**
      * Display list of orders for sellers.
      * Shows all orders including new, in-progress, completed, rejected, and cancelled.
      */
     public function index(\App\Models\Business $business, Request $request): View
     {
-        $query = Order::with(['business', 'user', 'items.product'])
+        $query = Order::with(['business', 'user', 'items.product', 'invoice', 'manifest'])
             ->whereHas('items.product', function ($query) use ($business) {
                 $query->forBusiness($business);
             })
@@ -30,11 +37,12 @@ class OrderController extends Controller
                 'new',
                 'accepted',
                 'in_progress',
-                'ready_for_invoice',
-                'awaiting_invoice_approval',
                 'ready_for_manifest',
                 'ready_for_delivery',
+                'approved_for_delivery',
+                'out_for_delivery',
                 'delivered',
+                'completed',
                 'rejected',
                 'cancelled',
             ])
@@ -82,11 +90,66 @@ class OrderController extends Controller
      */
     public function show(\App\Models\Business $business, Order $order): View
     {
-        $order->load(['business', 'user', 'location', 'items.product.brand']);
+        $order->load([
+            'business',
+            'user',
+            'location',
+            'items.product.brand',
+            'audits' => function ($query) {
+                $query->with('user')->orderBy('created_at', 'desc');
+            },
+            'pendingCancellationRequest.requestedBy',
+            'cancellationRequests',
+            'cancellationRequests.audits' => function ($query) {
+                $query->with('user')->orderBy('created_at', 'desc');
+            },
+            'cancellationRequests.requestedBy',
+            'cancellationRequests.reviewedBy',
+        ]);
 
         return view('seller.orders.show', compact('order', 'business'));
     }
 
+    /**
+     * Approve a cancellation request (seller action).
+     */
+    public function approveCancellationRequest(\App\Models\Business $business, Order $order, \App\Models\OrderCancellationRequest $cancellationRequest)
+    {
+        if (! $cancellationRequest->isPending()) {
+            return back()->with('error', 'This cancellation request has already been reviewed.');
+        }
+
+        if ($cancellationRequest->order_id !== $order->id) {
+            abort(404);
+        }
+
+        $cancellationRequest->approve(auth()->user());
+
+        return back()->with('success', "Cancellation request approved. Order {$order->order_number} has been cancelled.");
+    }
+
+    /**
+     * Deny a cancellation request (seller action).
+     */
+    public function denyCancellationRequest(\App\Models\Business $business, Order $order, \App\Models\OrderCancellationRequest $cancellationRequest, Request $request)
+    {
+        if (! $cancellationRequest->isPending()) {
+            return back()->with('error', 'This cancellation request has already been reviewed.');
+        }
+
+        if ($cancellationRequest->order_id !== $order->id) {
+            abort(404);
+        }
+
+        $validated = $request->validate([
+            'notes' => 'required|string|max:1000',
+        ]);
+
+        $cancellationRequest->deny(auth()->user(), $validated['notes']);
+
+        return back()->with('success', 'Cancellation request denied.');
+    }
+
     /**
      * Accept a new order (seller accepting buyer's order).
      */
@@ -138,14 +201,40 @@ class OrderController extends Controller
         return back()->with('success', "Order {$order->order_number} has been cancelled.");
     }
 
+    /**
+     * Approve order for delivery (after buyer selects delivery method).
+     */
+    public function approveForDelivery(\App\Models\Business $business, Order $order)
+    {
+        try {
+            $order->approveForDelivery();
+
+            return back()->with('success', 'Order approved for delivery. You can now schedule delivery/pickup.');
+        } catch (\Exception $e) {
+            return back()->with('error', $e->getMessage());
+        }
+    }
+
     /**
      * Show picking ticket interface for warehouse/lab staff.
      * Mobile-friendly interface for updating picked quantities.
      * Accessed via PT-XXXXX format: /s/{business}/pick/PT-A3X7K
      */
-    public function pick(\App\Models\Business $business, Order $pickingTicket): View|RedirectResponse
+    public function pick(\App\Models\Business $business, Order|\App\Models\PickingTicket $pickingTicket): View|RedirectResponse
     {
-        $order = $pickingTicket; // For clarity in blade templates
+        // Handle both old (Order) and new (PickingTicket) systems
+        if ($pickingTicket instanceof \App\Models\PickingTicket) {
+            $ticket = $pickingTicket;
+            $order = $ticket->fulfillmentWorkOrder->order;
+
+            // Load relationships for the ticket
+            $ticket->load(['items.orderItem.product', 'department']);
+
+            return view('seller.orders.pick', compact('order', 'ticket', 'business'));
+        }
+
+        // Old system: Order model
+        $order = $pickingTicket;
 
         // Only allow picking for accepted or in_progress orders
         if (! in_array($order->status, ['accepted', 'in_progress'])) {
@@ -163,49 +252,106 @@ class OrderController extends Controller
      * Allows partial fulfillment - invoice will reflect actual picked quantities.
      * Accessed via PT-XXXXX format: /s/{business}/pick/PT-A3X7K/complete
      */
-    public function complete(\App\Models\Business $business, Order $pickingTicket)
+    public function complete(\App\Models\Business $business, Order|\App\Models\PickingTicket $pickingTicket)
     {
-        $order = $pickingTicket; // For clarity
+        // Handle new PickingTicket system
+        if ($pickingTicket instanceof \App\Models\PickingTicket) {
+            $ticket = $pickingTicket;
+            $order = $ticket->fulfillmentWorkOrder->order;
+
+            // Mark this ticket as complete
+            $ticket->complete();
+
+            // PickingTicket->complete() handles:
+            // - Setting ticket status to 'completed'
+            // - Checking if all tickets are complete
+            // - Advancing order to ready_for_delivery if all tickets done
+            // The order status flow is now: accepted -> in_progress -> ready_for_delivery
+
+            return redirect()->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('success', 'Picking ticket completed successfully!');
+        }
+
+        // Handle old single picking ticket system (Order model)
+        $order = $pickingTicket;
 
         // Calculate final workorder status based on picked quantities
         $order->updatePickingStatus();
         $order->refresh();
 
-        // Recalculate order totals based on picked quantities
-        $subtotal = 0;
-        foreach ($order->items as $item) {
-            // Update line total based on picked quantity
-            $newLineTotal = $item->unit_price * $item->picked_qty;
-            $item->update(['line_total' => $newLineTotal]);
-            $subtotal += $newLineTotal;
-        }
-
-        // Update order totals
-        $tax = $subtotal * 0.0; // TODO: Calculate tax based on company settings
-        $total = $subtotal + $tax;
-
-        $order->update([
-            'subtotal' => $subtotal,
-            'tax' => $tax,
-            'total' => $total,
-            'status' => 'ready_for_invoice',
-            'ready_for_invoice_at' => now(),
-        ]);
-
-        // Automatically generate invoice for buyer approval
-        $invoiceService = app(\App\Services\InvoiceService::class);
-        $invoice = $invoiceService->generateFromOrder($order);
-
-        // Update order to awaiting invoice approval status
-        $order->update([
-            'status' => 'awaiting_invoice_approval',
-            'invoiced_at' => now(),
-        ]);
-
-        // Invoice is now ready for buyer approval with approval_status = 'pending_buyer_approval'
+        // NOTE: Do NOT auto-advance to ready_for_delivery
+        // Seller must manually click "Mark Order Ready for Buyer Review" button
 
         return redirect()->route('seller.business.orders.show', [$business->slug, $order])
-            ->with('success', 'Picking ticket completed! Invoice has been generated based on fulfilled quantities.');
+            ->with('success', 'Picking ticket completed! You can now mark the order ready for buyer review.');
+    }
+
+    /**
+     * Re-open a completed picking ticket to allow editing.
+     */
+    public function reopen(\App\Models\Business $business, Order|\App\Models\PickingTicket $pickingTicket)
+    {
+        // Handle new PickingTicket system
+        if ($pickingTicket instanceof \App\Models\PickingTicket) {
+            $ticket = $pickingTicket;
+            $order = $ticket->fulfillmentWorkOrder->order;
+
+            // Only allow re-opening if seller hasn't marked order ready for buyer review yet
+            // Once seller clicks "Mark Order Ready for Buyer Review", picking is locked
+            if (! in_array($order->status, ['accepted', 'in_progress'])) {
+                return redirect()->route('seller.business.pick', [$business->slug, $ticket->ticket_number])
+                    ->with('error', 'Cannot re-open ticket - seller has already marked this order ready for buyer review.');
+            }
+
+            // Re-open the ticket
+            $ticket->update([
+                'status' => 'in_progress',
+                'completed_at' => null,
+            ]);
+
+            // If work order was marked as complete, recalculate status
+            if ($ticket->fulfillmentWorkOrder && $ticket->fulfillmentWorkOrder->status === 'completed') {
+                $workOrderService = app(\App\Services\FulfillmentWorkOrderService::class);
+                $workOrderService->recalculateWorkOrderStatus($ticket->fulfillmentWorkOrder);
+            }
+
+            return redirect()->route('seller.business.pick', [$business->slug, $ticket->ticket_number])
+                ->with('success', 'Picking ticket re-opened successfully. You can now make changes.');
+        }
+
+        // Handle old system
+        $order = $pickingTicket;
+
+        return redirect()->route('seller.business.pick', [$business->slug, $order->picking_ticket_number])
+            ->with('error', 'Re-opening tickets is only supported for the new picking ticket system.');
+    }
+
+    /**
+     * Display picking ticket as PDF in browser.
+     * Accessed via PT-XXXXX format: /s/{business}/pick/PT-A3X7K/pdf
+     */
+    public function downloadPickingTicketPdf(\App\Models\Business $business, Order|\App\Models\PickingTicket $pickingTicket)
+    {
+        // Handle both old (Order) and new (PickingTicket) systems
+        if ($pickingTicket instanceof \App\Models\PickingTicket) {
+            $ticket = $pickingTicket;
+            $order = $ticket->fulfillmentWorkOrder->order;
+
+            // Load relationships for the ticket
+            $ticket->load(['items.orderItem.product.brand', 'department']);
+
+            $pdf = \PDF::loadView('seller.orders.pick-pdf', compact('order', 'ticket', 'business'));
+
+            return $pdf->stream('picking-ticket-'.$ticket->ticket_number.'.pdf');
+        }
+
+        // Old system: Order model
+        $order = $pickingTicket;
+        $order->load(['business', 'user', 'location', 'items.product.brand']);
+
+        $pdf = \PDF::loadView('seller.orders.pick-pdf', compact('order', 'business'));
+
+        return $pdf->stream('picking-ticket-'.$order->picking_ticket_number.'.pdf');
     }
 
     /**
@@ -621,4 +767,389 @@ class OrderController extends Controller
             'delivery_url' => $deliveryUrl,
         ]);
     }
+
+    /**
+     * Update pickup date for an order
+     */
+    public function updatePickupDate(\App\Models\Business $business, Order $order, Request $request)
+    {
+        // Ensure order can be accessed by this business (seller)
+        $sellerBusinessId = $order->items->first()?->product?->brand?->business_id;
+        if ($sellerBusinessId !== $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow updates for pickup orders at ready_for_delivery or approved_for_delivery status
+        if (! in_array($order->status, ['ready_for_delivery', 'approved_for_delivery'])) {
+            abort(422, 'Pickup date can only be set when order is ready for pickup');
+        }
+
+        if (! $order->isPickup()) {
+            abort(422, 'Pickup date can only be set for pickup orders');
+        }
+
+        $validated = $request->validate([
+            'pickup_date' => 'required|date|after_or_equal:today',
+        ]);
+
+        $order->update([
+            'pickup_date' => $validated['pickup_date'],
+        ]);
+
+        // Return JSON for AJAX requests
+        if ($request->expectsJson() || $request->ajax()) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Pickup date updated successfully',
+                'pickup_date' => $order->pickup_date->format('l, F j, Y'),
+            ]);
+        }
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Pickup date updated successfully');
+    }
+
+    /**
+     * Mark order as ready for delivery (seller action).
+     * Only available when all picking tickets are completed.
+     */
+    public function markReadyForDelivery(\App\Models\Business $business, Order $order): RedirectResponse
+    {
+        // Verify business owns this order
+        $isSellerOrder = $order->items()->whereHas('product.brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->exists();
+
+        if (! $isSellerOrder) {
+            abort(403, 'Unauthorized access to this order');
+        }
+
+        // Only allow when order is accepted or in_progress
+        if (! in_array($order->status, ['accepted', 'in_progress'])) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Order cannot be marked as ready for delivery from current status');
+        }
+
+        // Verify all items have been picked (workorder at 100% OR all picking tickets completed)
+        // Note: We check picking tickets first because there may be short-picks where workorder < 100%
+        // but the warehouse has completed all tickets (meaning they picked everything available)
+        if (! $order->allPickingTicketsCompleted() && $order->workorder_status < 100) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'All order items must be picked before marking order ready for delivery');
+        }
+
+        // Mark order as ready for delivery
+        $success = $order->markReadyForDelivery();
+
+        if ($success) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('success', 'Order marked as ready for delivery. Buyer has been notified.');
+        }
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('error', 'Failed to mark order as ready for delivery');
+    }
+
+    /**
+     * Get available delivery windows for a specific date (for sellers).
+     */
+    public function getAvailableDeliveryWindows(\App\Models\Business $business, Order $order, Request $request)
+    {
+        // Ensure order is for seller's business
+        if (! $order->items->first()?->product?->brand?->business_id === $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        $date = $request->query('date');
+        if (! $date) {
+            return response()->json(['error' => 'Date parameter required'], 400);
+        }
+
+        try {
+            $selectedDate = \Carbon\Carbon::parse($date);
+        } catch (\Exception $e) {
+            return response()->json(['error' => 'Invalid date format'], 400);
+        }
+
+        $dayOfWeek = $selectedDate->dayOfWeek;
+
+        // Fetch active delivery windows for the seller's business on this day
+        $windows = \App\Models\DeliveryWindow::where('business_id', $business->id)
+            ->where('day_of_week', $dayOfWeek)
+            ->where('is_active', true)
+            ->orderBy('start_time')
+            ->get()
+            ->map(function ($window) {
+                return [
+                    'id' => $window->id,
+                    'day_name' => $window->day_name,
+                    'time_range' => $window->time_range,
+                ];
+            });
+
+        return response()->json(['windows' => $windows]);
+    }
+
+    /**
+     * Update order's delivery window (seller action).
+     */
+    public function updateDeliveryWindow(\App\Models\Business $business, Order $order, Request $request): RedirectResponse
+    {
+        // Ensure order is for seller's business
+        $sellerBusinessId = $order->items->first()?->product?->brand?->business_id;
+        if ($sellerBusinessId !== $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow updates for delivery orders at approved_for_delivery status
+        if ($order->status !== 'approved_for_delivery') {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Delivery window can only be set after buyer has approved the order for delivery');
+        }
+
+        // Only delivery orders need delivery windows
+        if (! $order->isDelivery()) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Delivery window can only be set for delivery orders');
+        }
+
+        $validated = $request->validate([
+            'delivery_window_id' => 'required|exists:delivery_windows,id',
+            'delivery_window_date' => 'required|date|after_or_equal:today',
+        ]);
+
+        $window = DeliveryWindow::findOrFail($validated['delivery_window_id']);
+
+        // Ensure window belongs to seller's business
+        if ($window->business_id !== $business->id) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Delivery window does not belong to your business');
+        }
+
+        $date = Carbon::parse($validated['delivery_window_date']);
+
+        // Validate using service
+        if (! $this->deliveryWindowService->validateWindowSelection($window, $date)) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Invalid delivery window selection');
+        }
+
+        $this->deliveryWindowService->updateOrderWindow($order, $window, $date);
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Delivery window updated successfully');
+    }
+
+    /**
+     * Mark order as out for delivery (for delivery orders at approved_for_delivery status).
+     */
+    public function markOutForDelivery(\App\Models\Business $business, Order $order): RedirectResponse
+    {
+        // Ensure order is for seller's business
+        if (! $order->items->first()?->product?->brand?->business_id === $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow for delivery orders at approved_for_delivery status
+        if ($order->status !== 'approved_for_delivery') {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Order must be approved for delivery before marking as out for delivery');
+        }
+
+        if (! $order->isDelivery()) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'This action is only available for delivery orders');
+        }
+
+        // Require delivery window to be set
+        if (! $order->deliveryWindow || ! $order->delivery_window_date) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Please schedule a delivery window before marking order as out for delivery');
+        }
+
+        // Update order status
+        $order->update([
+            'status' => 'out_for_delivery',
+            'out_for_delivery_at' => now(),
+        ]);
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Order marked as out for delivery');
+    }
+
+    /**
+     * Confirm pickup complete (for pickup orders at approved_for_delivery status).
+     */
+    public function confirmPickup(\App\Models\Business $business, Order $order): RedirectResponse
+    {
+        // Ensure order is for seller's business
+        if (! $order->items->first()?->product?->brand?->business_id === $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow for pickup orders at approved_for_delivery status
+        if ($order->status !== 'approved_for_delivery') {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Order must be approved for delivery before confirming pickup');
+        }
+
+        if (! $order->isPickup()) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'This action is only available for pickup orders');
+        }
+
+        // Require pickup date to be set
+        if (! $order->pickup_date) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Please set a pickup date before confirming pickup completion');
+        }
+
+        // Update order status to delivered (pickup complete)
+        $order->update([
+            'status' => 'delivered',
+            'delivered_at' => now(),
+        ]);
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Pickup confirmed! Order marked as delivered.');
+    }
+
+    /**
+     * Confirm delivery complete (for delivery orders).
+     */
+    public function confirmDelivery(\App\Models\Business $business, Order $order): RedirectResponse
+    {
+        // Ensure order is for seller's business
+        if (! $order->items->first()?->product?->brand?->business_id === $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow for delivery orders at out_for_delivery status
+        if ($order->status !== 'out_for_delivery') {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Order must be out for delivery before confirming delivery completion');
+        }
+
+        if (! $order->isDelivery()) {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'This action is only available for delivery orders');
+        }
+
+        // Update order status to delivered
+        $order->update([
+            'status' => 'delivered',
+            'delivered_at' => now(),
+        ]);
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Delivery confirmed! Order marked as delivered. You can now finalize the order.');
+    }
+
+    /**
+     * Finalize order after delivery - confirm actual delivered quantities and complete the order.
+     */
+    public function finalizeOrder(\App\Models\Business $business, Order $order, Request $request): RedirectResponse
+    {
+        // Ensure order is for seller's business
+        if ($order->items->first()?->product?->brand?->business_id !== $business->id) {
+            abort(403, 'Unauthorized access to order');
+        }
+
+        // Only allow finalization for delivered orders
+        if ($order->status !== 'delivered') {
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('error', 'Order must be delivered before it can be finalized');
+        }
+
+        // Validate the request
+        $validated = $request->validate([
+            'delivery_notes' => 'nullable|string|max:5000',
+            'items' => 'required|array',
+            'items.*.id' => 'required|exists:order_items,id',
+            'items.*.delivered_qty' => 'required|numeric|min:0',
+        ]);
+
+        \DB::transaction(function () use ($order, $validated) {
+
+            foreach ($validated['items'] as $itemData) {
+                $orderItem = $order->items()->findOrFail($itemData['id']);
+                $deliveredQty = (float) $itemData['delivered_qty'];
+                $pickedQty = (float) $orderItem->picked_qty;
+
+                // Calculate rejected quantity (items that were picked but not delivered)
+                $rejectedQty = $pickedQty - $deliveredQty;
+
+                // Update the order item with delivered quantity and acceptance data
+                // delivered_qty = what seller confirmed was delivered
+                // accepted_qty = same as delivered_qty (what will be invoiced)
+                // rejected_qty = what was picked but not delivered/accepted
+                $orderItem->update([
+                    'delivered_qty' => $deliveredQty,
+                    'accepted_qty' => $deliveredQty,
+                    'rejected_qty' => $rejectedQty,
+                ]);
+
+                // Return rejected items to inventory if any
+                if ($rejectedQty > 0 && $orderItem->batch_id && $orderItem->batch) {
+                    $orderItem->batch->increment('quantity_available', $rejectedQty);
+                }
+            }
+
+            // Update order with finalization details
+            $order->update([
+                'delivery_notes' => $validated['delivery_notes'],
+                'finalized_at' => now(),
+                'finalized_by_user_id' => Auth::id(),
+                'status' => 'completed',
+            ]);
+
+            // Recalculate line totals for each item based on delivered quantities
+            $newSubtotal = 0;
+            foreach ($order->items as $item) {
+                $deliveredQty = $item->delivered_qty ?? $item->picked_qty;
+                $lineTotal = $deliveredQty * $item->unit_price;
+
+                $item->update(['line_total' => $lineTotal]);
+                $newSubtotal += $lineTotal;
+            }
+
+            $order->update([
+                'subtotal' => $newSubtotal,
+                'total' => $newSubtotal + ($order->tax ?? 0) + ($order->delivery_fee ?? 0),
+            ]);
+
+            // Refresh order to get updated items with delivered_qty
+            $order->refresh();
+
+            // Generate final invoice based on delivered quantities
+            $invoiceService = app(\App\Services\InvoiceService::class);
+            $invoiceService->generateFromOrder($order);
+        });
+
+        return redirect()
+            ->route('seller.business.orders.show', [$business->slug, $order])
+            ->with('success', 'Order finalized successfully. Final invoice generated.');
+    }
 }

app/Http/Controllers/PublicCoaController.php

@@ -0,0 +1,118 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Batch;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class PublicCoaController extends Controller
+{
+    /**
+     * Display COA information for a specific batch
+     * Public route: /coa/{batchNumber}
+     */
+    public function show(string $batchNumber)
+    {
+        // Find batch by batch number
+        $batch = Batch::where('batch_number', $batchNumber)
+            ->with(['product', 'lab.coaFiles', 'business'])
+            ->first();
+
+        if (! $batch) {
+            abort(404, 'Batch not found');
+        }
+
+        // Get lab test and COA files
+        $lab = $batch->lab;
+
+        if (! $lab) {
+            abort(404, 'No lab test available for this batch');
+        }
+
+        // Get all COA files
+        $coaFiles = $lab->getAllCoas();
+        $primaryCoa = $lab->getPrimaryCoa();
+
+        return view('public.coa.show', [
+            'batch' => $batch,
+            'lab' => $lab,
+            'coaFiles' => $coaFiles,
+            'primaryCoa' => $primaryCoa,
+            'product' => $batch->product,
+            'business' => $batch->business,
+        ]);
+    }
+
+    /**
+     * Download a specific COA file
+     */
+    public function download(string $batchNumber, int $coaFileId)
+    {
+        // Find batch
+        $batch = Batch::where('batch_number', $batchNumber)
+            ->with('lab.coaFiles')
+            ->first();
+
+        if (! $batch || ! $batch->lab) {
+            abort(404, 'Batch or lab test not found');
+        }
+
+        // Find COA file
+        $coaFile = $batch->lab->coaFiles()->find($coaFileId);
+
+        if (! $coaFile) {
+            abort(404, 'COA file not found');
+        }
+
+        // Check if file exists
+        if (! $coaFile->exists()) {
+            abort(404, 'File not found in storage');
+        }
+
+        // Download the file
+        return Storage::download($coaFile->file_path, $coaFile->file_name);
+    }
+
+    /**
+     * View a specific COA file inline (for PDFs)
+     */
+    public function view(string $batchNumber, int $coaFileId): StreamedResponse
+    {
+        // Find batch
+        $batch = Batch::where('batch_number', $batchNumber)
+            ->with('lab.coaFiles')
+            ->first();
+
+        if (! $batch || ! $batch->lab) {
+            abort(404, 'Batch or lab test not found');
+        }
+
+        // Find COA file
+        $coaFile = $batch->lab->coaFiles()->find($coaFileId);
+
+        if (! $coaFile) {
+            abort(404, 'COA file not found');
+        }
+
+        // Check if file exists
+        if (! $coaFile->exists()) {
+            abort(404, 'File not found in storage');
+        }
+
+        // Stream the file for inline viewing
+        return Storage::response($coaFile->file_path, $coaFile->file_name, [
+            'Content-Type' => 'application/pdf',
+            'Content-Disposition' => 'inline; filename="'.$coaFile->file_name.'"',
+        ]);
+    }
+
+    /**
+     * Legacy route support: /retail/labs/{batchNumber}
+     * Redirects to new COA route
+     */
+    public function legacyShow(string $batchNumber)
+    {
+        return redirect()->route('public.coa.show', ['batchNumber' => $batchNumber], 301);
+    }
+}

app/Http/Controllers/Seller/BackorderController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Services\BackorderService;
+use Illuminate\Http\Request;
+
+class BackorderController extends Controller
+{
+    public function __construct(
+        protected BackorderService $backorderService
+    ) {}
+
+    /**
+     * Show backorders landing page (under Transactions)
+     */
+    public function index(Request $request, Business $business)
+    {
+        // Get backorders for this seller business
+        $backorders = $this->backorderService->getBackordersForSeller($business);
+
+        // Get stats
+        $stats = $this->backorderService->getBackorderStats($business);
+
+        return view('seller.backorders.index', [
+            'business' => $business,
+            'backorders' => $backorders,
+            'stats' => $stats,
+        ]);
+    }
+}

app/Http/Controllers/Seller/BatchController.php

@@ -0,0 +1,364 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Batch;
+use App\Models\Business;
+use App\Models\Product;
+use App\Services\QrCodeService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+
+class BatchController extends Controller
+{
+    /**
+     * Display a listing of batches for the business
+     */
+    public function index(Request $request, Business $business)
+    {
+        // Build query for batches
+        $query = Batch::where('business_id', $business->id)
+            ->with(['product.brand', 'coaFiles'])
+            ->orderBy('production_date', 'desc');
+
+        // Search filter
+        if ($request->filled('search')) {
+            $search = $request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('batch_number', 'LIKE', "%{$search}%")
+                    ->orWhere('test_id', 'LIKE', "%{$search}%")
+                    ->orWhere('lot_number', 'LIKE', "%{$search}%")
+                    ->orWhereHas('product', function ($productQuery) use ($search) {
+                        $productQuery->where('name', 'LIKE', "%{$search}%");
+                    });
+            });
+        }
+
+        $batches = $query->paginate(20)->withQueryString();
+
+        // Separate active and inactive batches
+        $activeBatches = $batches->filter(fn ($batch) => $batch->is_active);
+        $inactiveBatches = $batches->filter(fn ($batch) => ! $batch->is_active);
+
+        return view('seller.batches.index', compact('business', 'batches', 'activeBatches', 'inactiveBatches'));
+    }
+
+    /**
+     * Show the form for creating a new batch
+     */
+    public function create(Request $request, Business $business)
+    {
+        // Get products owned by this business
+        $products = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->orderBy('name', 'asc')->get();
+
+        // For the new architecture, components are products (the view expects $components)
+        $components = $products;
+
+        // Get existing component batches that can be used as sources for homogenized batches
+        $componentBatches = Batch::where('business_id', $business->id)
+            ->where('quantity_remaining', '>', 0)
+            ->where('is_active', true)
+            ->where('is_quarantined', false)
+            ->with('component')
+            ->orderBy('batch_number')
+            ->get();
+
+        return view('seller.batches.create', compact('business', 'products', 'components', 'componentBatches'));
+    }
+
+    /**
+     * Store a newly created batch
+     */
+    public function store(Request $request, Business $business)
+    {
+        // Determine max value based on unit (% vs mg/g, mg/ml, mg/unit)
+        $maxValue = $request->cannabinoid_unit === '%' ? 100 : 1000;
+
+        $validated = $request->validate([
+            'product_id' => 'required|exists:products,id',
+            'cannabinoid_unit' => 'required|string|in:%,MG/ML,MG/G,MG/UNIT',
+            'batch_number' => 'nullable|string|max:100|unique:batches,batch_number',
+            'production_date' => 'nullable|date',
+            'test_date' => 'nullable|date',
+            'test_id' => 'nullable|string|max:100',
+            'lot_number' => 'nullable|string|max:100',
+            'lab_name' => 'nullable|string|max:255',
+            'thc_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'thca_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbd_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbda_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbg_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbn_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'delta_9_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'total_terps_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'notes' => 'nullable|string',
+            'coa_files.*' => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240', // 10MB max per file
+        ]);
+
+        // Verify product belongs to this business
+        $product = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->findOrFail($validated['product_id']);
+
+        // Set business_id
+        $validated['business_id'] = $business->id;
+        $validated['is_active'] = true; // New batches are active by default
+
+        // Create batch (calculations happen in model boot method)
+        $batch = Batch::create($validated);
+
+        // Handle COA file uploads
+        if ($request->hasFile('coa_files')) {
+            foreach ($request->file('coa_files') as $index => $file) {
+                $storagePath = "businesses/{$business->uuid}/batches/{$batch->id}/coas";
+                $fileName = uniqid().'.'.$file->getClientOriginalExtension();
+                $filePath = $file->storeAs($storagePath, $fileName, 'public');
+
+                $batch->coaFiles()->create([
+                    'file_name' => $file->getClientOriginalName(),
+                    'file_path' => $filePath,
+                    'file_type' => $file->getClientOriginalExtension(),
+                    'file_size' => $file->getSize(),
+                    'is_primary' => $index === 0,
+                    'display_order' => $index,
+                ]);
+            }
+        }
+
+        // Auto-generate QR code for the new batch (with brand logo if available)
+        $qrService = app(QrCodeService::class);
+        $qrService->generateWithLogo($batch);
+
+        return redirect()
+            ->route('seller.business.batches.index', $business->slug)
+            ->with('success', 'Batch created successfully.');
+    }
+
+    /**
+     * Show the form for editing the specified batch
+     */
+    public function edit(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        // Get products owned by this business
+        $products = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->orderBy('name', 'asc')->get();
+
+        $batch->load('coaFiles');
+
+        return view('seller.batches.edit', compact('business', 'batch', 'products'));
+    }
+
+    /**
+     * Update the specified batch
+     */
+    public function update(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        // Determine max value based on unit (% vs mg/g, mg/ml, mg/unit)
+        $maxValue = $request->cannabinoid_unit === '%' ? 100 : 1000;
+
+        $validated = $request->validate([
+            'product_id' => 'required|exists:products,id',
+            'cannabinoid_unit' => 'required|string|in:%,MG/ML,MG/G,MG/UNIT',
+            'batch_number' => 'nullable|string|max:100|unique:batches,batch_number,'.$batch->id,
+            'production_date' => 'nullable|date',
+            'test_date' => 'nullable|date',
+            'test_id' => 'nullable|string|max:100',
+            'lot_number' => 'nullable|string|max:100',
+            'lab_name' => 'nullable|string|max:255',
+            'thc_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'thca_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbd_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbda_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbg_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'cbn_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'delta_9_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'total_terps_percentage' => "nullable|numeric|min:0|max:{$maxValue}",
+            'notes' => 'nullable|string',
+            'coa_files.*' => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240', // 10MB max per file
+        ]);
+
+        // Verify product belongs to this business
+        $product = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->findOrFail($validated['product_id']);
+
+        // Update batch (calculations happen in model boot method)
+        $batch->update($validated);
+
+        // Handle new COA file uploads
+        if ($request->hasFile('coa_files')) {
+            $existingFilesCount = $batch->coaFiles()->count();
+            foreach ($request->file('coa_files') as $index => $file) {
+                $storagePath = "businesses/{$business->uuid}/batches/{$batch->id}/coas";
+                $fileName = uniqid().'.'.$file->getClientOriginalExtension();
+                $filePath = $file->storeAs($storagePath, $fileName, 'public');
+
+                $batch->coaFiles()->create([
+                    'file_name' => $file->getClientOriginalName(),
+                    'file_path' => $filePath,
+                    'file_type' => $file->getClientOriginalExtension(),
+                    'file_size' => $file->getSize(),
+                    'is_primary' => $existingFilesCount === 0 && $index === 0,
+                    'display_order' => $existingFilesCount + $index,
+                ]);
+            }
+        }
+
+        return redirect()
+            ->route('seller.business.batches.index', $business->slug)
+            ->with('success', 'Batch updated successfully.');
+    }
+
+    /**
+     * Remove the specified batch
+     */
+    public function destroy(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        // Delete associated COA files from storage
+        foreach ($batch->coaFiles as $coaFile) {
+            if (Storage::exists($coaFile->file_path)) {
+                Storage::delete($coaFile->file_path);
+            }
+        }
+
+        $batch->delete();
+
+        return redirect()
+            ->route('seller.business.batches.index', $business->slug)
+            ->with('success', 'Batch deleted successfully.');
+    }
+
+    /**
+     * Generate QR code for a batch
+     */
+    public function generateQrCode(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        $qrService = app(QrCodeService::class);
+        $result = $qrService->generateWithLogo($batch);
+
+        // Refresh batch to get updated qr_code_path
+        $batch->refresh();
+
+        return response()->json([
+            'success' => $result['success'],
+            'message' => $result['message'],
+            'qr_code_url' => $batch->qr_code_path ? Storage::url($batch->qr_code_path) : null,
+            'download_url' => $batch->qr_code_path ? route('seller.business.batches.qr-code.download', [$business->slug, $batch->id]) : null,
+        ]);
+    }
+
+    /**
+     * Download QR code for a batch
+     */
+    public function downloadQrCode(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        $qrService = app(QrCodeService::class);
+        $download = $qrService->download($batch);
+
+        if (! $download) {
+            return back()->with('error', 'QR code not found');
+        }
+
+        return $download;
+    }
+
+    /**
+     * Regenerate QR code for a batch
+     */
+    public function regenerateQrCode(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        $qrService = app(QrCodeService::class);
+        $result = $qrService->regenerate($batch);
+
+        // Refresh batch to get updated qr_code_path
+        $batch->refresh();
+
+        return response()->json([
+            'success' => $result['success'],
+            'message' => $result['message'],
+            'qr_code_url' => $batch->qr_code_path ? Storage::url($batch->qr_code_path) : null,
+            'download_url' => $batch->qr_code_path ? route('seller.business.batches.qr-code.download', [$business->slug, $batch->id]) : null,
+        ]);
+    }
+
+    /**
+     * Delete QR code for a batch
+     */
+    public function deleteQrCode(Request $request, Business $business, Batch $batch)
+    {
+        // Verify batch belongs to this business
+        if ($batch->business_id !== $business->id) {
+            abort(403, 'Unauthorized');
+        }
+
+        $qrService = app(QrCodeService::class);
+        $result = $qrService->delete($batch);
+
+        return response()->json([
+            'success' => $result['success'],
+            'message' => $result['message'],
+        ]);
+    }
+
+    /**
+     * Bulk generate QR codes for multiple batches
+     */
+    public function bulkGenerateQrCodes(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'batch_ids' => 'required|array',
+            'batch_ids.*' => 'exists:batches,id',
+        ]);
+
+        // Verify all batches belong to this business
+        $batches = Batch::whereIn('id', $validated['batch_ids'])
+            ->where('business_id', $business->id)
+            ->get();
+
+        if ($batches->count() !== count($validated['batch_ids'])) {
+            return response()->json([
+                'success' => false,
+                'message' => 'Some batches do not belong to this business',
+            ], 403);
+        }
+
+        $qrService = app(QrCodeService::class);
+        $result = $qrService->bulkGenerate($validated['batch_ids']);
+
+        return response()->json($result);
+    }
+}

app/Http/Controllers/Seller/BrandController.php

@@ -0,0 +1,845 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Concerns\HandlesPrecognition;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\StoreBrandRequest;
+use App\Http\Requests\UpdateBrandRequest;
+use App\Models\Brand;
+use App\Models\Business;
+use App\Models\Menu;
+use App\Models\Promotion;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+
+class BrandController extends Controller
+{
+    use HandlesPrecognition;
+
+    /**
+     * Display a listing of brands for the business
+     */
+    public function index(Request $request, Business $business)
+    {
+        $this->authorize('viewAny', [Brand::class, $business]);
+
+        // Get brands for this business and parent company (if division)
+        // Eager load product count to prevent N+1 queries
+        $brands = Brand::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })
+            ->withCount('products')
+            ->orderBy('name')
+            ->get();
+
+        return view('seller.brands.index', compact('business', 'brands'));
+    }
+
+    /**
+     * Show the form for creating a new brand
+     */
+    public function create(Business $business)
+    {
+        $this->authorize('create', [Brand::class, $business]);
+
+        return view('seller.brands.create', compact('business'));
+    }
+
+    /**
+     * Show the Nexus version of the brand create form (demo/test)
+     */
+    public function createNexus(Business $business)
+    {
+        return view('seller.brands.create-nexus', compact('business'));
+    }
+
+    /**
+     * Show the Nexus version of the brand edit form (demo/test)
+     */
+    public function editNexus(Business $business, Brand $brand)
+    {
+        return view('seller.brands.edit-nexus', compact('business', 'brand'));
+    }
+
+    /**
+     * Store a newly created brand in storage
+     */
+    public function store(StoreBrandRequest $request, Business $business)
+    {
+        // Authorization is handled by StoreBrandRequest
+        $validated = $request->validated();
+
+        // Clean and normalize website URL - strip any protocol user entered, then add https://
+        if ($request->filled('website_url')) {
+            $url = $validated['website_url'];
+
+            // Strip http:// or https:// if user entered it
+            $url = preg_replace('#^https?://#i', '', $url);
+
+            // Strip any leading/trailing whitespace
+            $url = trim($url);
+
+            // Validate that we have a valid domain format
+            if (! empty($url) && ! filter_var('https://'.$url, FILTER_VALIDATE_URL)) {
+                return redirect()
+                    ->back()
+                    ->withInput()
+                    ->withErrors(['website_url' => 'Please enter a valid website URL (e.g., example.com)']);
+            }
+
+            // Add https:// prefix
+            $validated['website_url'] = ! empty($url) ? 'https://'.$url : null;
+        }
+
+        // Generate slug from name
+        $validated['slug'] = Str::slug($validated['name']);
+
+        // Handle logo upload
+        if ($request->hasFile('logo')) {
+            $validated['logo_path'] = $request->file('logo')->store('brands/logos', 'public');
+        }
+
+        // Handle banner upload
+        if ($request->hasFile('banner')) {
+            $validated['banner_path'] = $request->file('banner')->store('brands/banners', 'public');
+        }
+
+        // Set boolean defaults
+        $validated['is_public'] = $request->boolean('is_public');
+        $validated['is_featured'] = $request->boolean('is_featured');
+        $validated['is_active'] = $request->boolean('is_active');
+
+        // Create brand
+        $brand = $business->brands()->create($validated);
+
+        return redirect()
+            ->route('seller.business.brands.index', $business->slug)
+            ->with('success', 'Brand created successfully!');
+    }
+
+    /**
+     * Display the specified brand (read-only view)
+     */
+    public function show(Business $business, Brand $brand)
+    {
+        $this->authorize('view', [$brand, $business]);
+
+        // Load relationships
+        $brand->load(['business', 'products']);
+
+        return view('seller.brands.show', compact('business', 'brand'));
+    }
+
+    /**
+     * Show the brand dashboard (seller admin view)
+     */
+    public function dashboard(Request $request, Business $business, Brand $brand)
+    {
+        $this->authorize('view', [$brand, $business]);
+
+        // Load relationships
+        $brand->load(['business', 'products']);
+
+        // Get stats data for Analytics tab (default to this month)
+        $preset = $request->input('preset', 'this_month');
+        $startDate = null;
+        $endDate = null;
+
+        switch ($preset) {
+            case 'this_week':
+                $startDate = now()->startOfWeek();
+                $endDate = now()->endOfWeek();
+                break;
+            case 'last_week':
+                $startDate = now()->subWeek()->startOfWeek();
+                $endDate = now()->subWeek()->endOfWeek();
+                break;
+            case 'this_month':
+                $startDate = now()->startOfMonth();
+                $endDate = now()->endOfMonth();
+                break;
+            case 'last_month':
+                $startDate = now()->subMonth()->startOfMonth();
+                $endDate = now()->subMonth()->endOfMonth();
+                break;
+            case 'this_year':
+                $startDate = now()->startOfYear();
+                $endDate = now()->endOfYear();
+                break;
+            case 'custom':
+                $startDate = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date'))->startOfDay() : now()->startOfMonth();
+                $endDate = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date'))->endOfDay() : now();
+                break;
+            default: // all_time
+                $startDate = now()->subYears(10);
+                $endDate = now();
+        }
+
+        // Calculate stats for analytics tab
+        $stats = $this->calculateBrandStats($brand, $startDate, $endDate);
+
+        // Load promotions filtered by brand
+        $promotions = Promotion::where('business_id', $business->id)
+            ->where('brand_id', $brand->id)
+            ->withCount('products')
+            ->orderBy('created_at', 'desc')
+            ->get();
+
+        // Load menus filtered by brand
+        $menus = Menu::where('business_id', $business->id)
+            ->where('brand_id', $brand->id)
+            ->withCount('products')
+            ->orderBy('created_at', 'desc')
+            ->get();
+
+        // Load all brands for the brand selector dropdown
+        $brands = $business->brands()
+            ->where('is_active', true)
+            ->withCount('products')
+            ->orderBy('name')
+            ->get();
+
+        return view('seller.brands.dashboard', array_merge($stats, [
+            'business' => $business,
+            'brand' => $brand,
+            'brands' => $brands,
+            'preset' => $preset,
+            'startDate' => $startDate,
+            'endDate' => $endDate,
+            'promotions' => $promotions,
+            'menus' => $menus,
+        ]));
+    }
+
+    /**
+     * Preview the brand as it would appear to buyers
+     */
+    public function preview(Business $business, Brand $brand)
+    {
+        $this->authorize('view', [$brand, $business]);
+
+        // Load relationships including active products with images, strain, unit, and product line
+        // Only load parent products (exclude varieties from top level) and eager load their varieties
+        $brand->load([
+            'business',
+            'products' => function ($query) {
+                $query->where('is_active', true)
+                    ->whereNull('parent_product_id') // Only parent products
+                    ->with([
+                        'images',
+                        'strain',
+                        'unit',
+                        'productLine',
+                        'varieties' => function ($q) {
+                            $q->where('is_active', true)
+                                ->with(['images', 'strain', 'unit'])
+                                ->orderBy('name');
+                        },
+                    ])
+                    ->orderBy('name');
+            },
+        ]);
+
+        // Get other brands from the same business
+        $otherBrands = Brand::where('business_id', $brand->business_id)
+            ->where('id', '!=', $brand->id)
+            ->orderBy('name')
+            ->get();
+
+        // Group products by product line
+        $productsByLine = $brand->products->groupBy(function ($product) {
+            return $product->productLine->name ?? 'Uncategorized';
+        });
+
+        // Allow viewing as buyer with ?as=buyer query parameter (for testing)
+        $isSeller = request()->query('as') !== 'buyer';
+
+        return view('seller.brands.preview', compact('business', 'brand', 'otherBrands', 'productsByLine', 'isSeller'));
+    }
+
+    /**
+     * Show the form for editing the specified brand
+     */
+    public function edit(Business $business, Brand $brand)
+    {
+        $this->authorize('update', [$brand, $business]);
+
+        return view('seller.brands.edit', compact('business', 'brand'));
+    }
+
+    /**
+     * Update the specified brand in storage
+     */
+    public function update(UpdateBrandRequest $request, Business $business, Brand $brand)
+    {
+        // Handle Laravel Precognition validation-only requests
+        if ($this->isPrecognitive($request)) {
+            // Validation happens automatically via UpdateBrandRequest
+            return;
+        }
+
+        // Authorization is handled by UpdateBrandRequest
+        $validated = $request->validated();
+
+        // Clean and normalize website URL - strip any protocol user entered, then add https://
+        if ($request->filled('website_url')) {
+            $url = $validated['website_url'];
+
+            // Strip http:// or https:// if user entered it
+            $url = preg_replace('#^https?://#i', '', $url);
+
+            // Strip any leading/trailing whitespace
+            $url = trim($url);
+
+            // Validate that we have a valid domain format
+            if (! empty($url) && ! filter_var('https://'.$url, FILTER_VALIDATE_URL)) {
+                return redirect()
+                    ->back()
+                    ->withInput()
+                    ->withErrors(['website_url' => 'Please enter a valid website URL (e.g., example.com)']);
+            }
+
+            // Add https:// prefix
+            $validated['website_url'] = ! empty($url) ? 'https://'.$url : null;
+        } else {
+            $validated['website_url'] = null;
+        }
+
+        // Update slug if name changed
+        if ($validated['name'] !== $brand->name) {
+            $validated['slug'] = Str::slug($validated['name']);
+        }
+
+        // Handle logo removal
+        if ($request->boolean('remove_logo') && $brand->logo_path) {
+            Storage::delete($brand->logo_path);
+            $validated['logo_path'] = null;
+        }
+
+        // Handle logo upload
+        if ($request->hasFile('logo')) {
+            // Delete old logo
+            if ($brand->logo_path) {
+                Storage::delete($brand->logo_path);
+            }
+            $validated['logo_path'] = $request->file('logo')->store('brands/logos');
+        }
+
+        // Handle banner removal
+        if ($request->boolean('remove_banner') && $brand->banner_path) {
+            Storage::delete($brand->banner_path);
+            $validated['banner_path'] = null;
+        }
+
+        // Handle banner upload
+        if ($request->hasFile('banner')) {
+            // Delete old banner
+            if ($brand->banner_path) {
+                Storage::delete($brand->banner_path);
+            }
+            $validated['banner_path'] = $request->file('banner')->store('brands/banners');
+        }
+
+        // Set boolean defaults
+        $validated['is_public'] = $request->boolean('is_public');
+        $validated['is_featured'] = $request->boolean('is_featured');
+        $validated['is_active'] = $request->boolean('is_active');
+
+        // Set social media preview toggles
+        $validated['show_website_in_preview'] = $request->boolean('show_website_in_preview');
+        $validated['show_instagram_in_preview'] = $request->boolean('show_instagram_in_preview');
+        $validated['show_facebook_in_preview'] = $request->boolean('show_facebook_in_preview');
+        $validated['show_twitter_in_preview'] = $request->boolean('show_twitter_in_preview');
+        $validated['show_youtube_in_preview'] = $request->boolean('show_youtube_in_preview');
+        $validated['show_tiktok_in_preview'] = $request->boolean('show_tiktok_in_preview');
+        $validated['show_cannagrams_in_preview'] = $request->boolean('show_cannagrams_in_preview');
+
+        // Remove form-only fields
+        unset($validated['remove_logo'], $validated['remove_banner']);
+
+        // Update brand
+        $brand->update($validated);
+
+        // Redirect back to edit page with success message
+        return redirect()
+            ->route('seller.business.brands.edit', [$business->slug, $brand->hashid])
+            ->with('success', 'Brand updated successfully!');
+    }
+
+    /**
+     * Show brand performance statistics
+     */
+    public function stats(Request $request, Business $business, Brand $brand)
+    {
+        Gate::authorize('view', [$brand, $business]);
+
+        // Determine date range from request
+        $preset = $request->input('preset', 'this_month');
+        $startDate = null;
+        $endDate = null;
+
+        switch ($preset) {
+            case 'this_week':
+                $startDate = now()->startOfWeek();
+                $endDate = now()->endOfWeek();
+                break;
+            case 'last_week':
+                $startDate = now()->subWeek()->startOfWeek();
+                $endDate = now()->subWeek()->endOfWeek();
+                break;
+            case 'this_month':
+                $startDate = now()->startOfMonth();
+                $endDate = now()->endOfMonth();
+                break;
+            case 'last_month':
+                $startDate = now()->subMonth()->startOfMonth();
+                $endDate = now()->subMonth()->endOfMonth();
+                break;
+            case 'this_year':
+                $startDate = now()->startOfYear();
+                $endDate = now()->endOfYear();
+                break;
+            case 'custom':
+                $startDate = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date'))->startOfDay() : now()->startOfMonth();
+                $endDate = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date'))->endOfDay() : now();
+                break;
+            default: // all_time
+                $startDate = now()->subYears(10);
+                $endDate = now();
+        }
+
+        // Create cache key for this stats request
+        $cacheKey = sprintf(
+            'brand_stats:%d:%s:%s:%s',
+            $brand->id,
+            $preset,
+            $startDate->format('Y-m-d'),
+            $endDate->format('Y-m-d')
+        );
+
+        // Cache for 5 minutes (stats don't need real-time updates)
+        $stats = \Illuminate\Support\Facades\Cache::remember($cacheKey, 300, function () use ($brand, $startDate, $endDate) {
+            return $this->calculateBrandStats($brand, $startDate, $endDate);
+        });
+
+        return view('seller.brands.stats', array_merge($stats, [
+            'business' => $business,
+            'brand' => $brand,
+            'preset' => $preset,
+            'startDate' => $startDate,
+            'endDate' => $endDate,
+        ]));
+    }
+
+    /**
+     * Calculate brand statistics for the given date range
+     */
+    private function calculateBrandStats(Brand $brand, $startDate, $endDate): array
+    {
+        // Eager load products with their varieties
+        $brand->load([
+            'products' => function ($query) {
+                $query->with('varieties');
+            },
+        ]);
+
+        // Calculate overall brand metrics
+        $totalProducts = $brand->products->count();
+        $activeProducts = $brand->products->where('is_active', true)->count();
+
+        // Get all order items for this brand's products in the selected date range
+        // WITH eager loading to prevent N+1 queries
+        $orderItems = \App\Models\OrderItem::whereHas('product', function ($query) use ($brand) {
+            $query->where('brand_id', $brand->id);
+        })
+            ->whereHas('order', function ($query) use ($startDate, $endDate) {
+                $query->whereBetween('created_at', [$startDate, $endDate]);
+            })
+            ->with('order.business', 'product')
+            ->get();
+
+        // Calculate metrics
+        $totalOrders = $orderItems->pluck('order_id')->unique()->count();
+        $totalRevenue = $orderItems->sum('line_total');
+        $totalUnits = $orderItems->sum('quantity');
+
+        // Previous period comparison (same duration before start date)
+        $daysDiff = $startDate->diffInDays($endDate);
+        $previousStartDate = $startDate->copy()->subDays($daysDiff + 1);
+        $previousEndDate = $startDate->copy()->subDay();
+
+        $previousOrderItems = \App\Models\OrderItem::whereHas('product', function ($query) use ($brand) {
+            $query->where('brand_id', $brand->id);
+        })
+            ->whereHas('order', function ($query) use ($previousStartDate, $previousEndDate) {
+                $query->whereBetween('created_at', [$previousStartDate, $previousEndDate]);
+            })
+            ->get();
+
+        $previousRevenue = $previousOrderItems->sum('line_total');
+        $previousOrders = $previousOrderItems->pluck('order_id')->unique()->count();
+
+        // Calculate percent changes
+        $revenueChange = $previousRevenue > 0 ? (($totalRevenue - $previousRevenue) / $previousRevenue) * 100 : 0;
+        $ordersChange = $previousOrders > 0 ? (($totalOrders - $previousOrders) / $previousOrders) * 100 : 0;
+
+        // Average order value
+        $avgOrderValue = $totalOrders > 0 ? $totalRevenue / $totalOrders : 0;
+
+        // Revenue by day
+        $revenueByDay = $orderItems->groupBy(function ($item) {
+            return $item->order->created_at->format('Y-m-d');
+        })->map(function ($items) {
+            return $items->sum('line_total');
+        })->sortKeys();
+
+        // Build a map of product_id => order items for efficient lookup
+        $productOrderItemsMap = $orderItems->groupBy('product_id');
+
+        // Top products by revenue (with varieties nested under parents)
+        // Filter to only show parent products (exclude varieties from top level)
+        $productStats = $brand->products
+            ->filter(function ($product) {
+                return is_null($product->parent_product_id); // Only parent products
+            })
+            ->map(function ($product) use ($productOrderItemsMap) {
+                // Get order items for this product from the map (no additional query!)
+                $items = $productOrderItemsMap->get($product->id, collect());
+
+                $revenue = $items->sum('line_total');
+                $units = $items->sum('quantity');
+                $orders = $items->pluck('order_id')->unique()->count();
+
+                // Always get variety breakdown if product has varieties
+                $varietyStats = [];
+                if ($product->has_varieties) {
+                    $varietyStats = $product->varieties->map(function ($variety) use ($productOrderItemsMap) {
+                        // Get order items for this variety from the map (no additional query!)
+                        $varietyItems = $productOrderItemsMap->get($variety->id, collect());
+
+                        return [
+                            'product' => $variety,
+                            'revenue' => $varietyItems->sum('line_total'),
+                            'units' => $varietyItems->sum('quantity'),
+                            'orders' => $varietyItems->pluck('order_id')->unique()->count(),
+                        ];
+                    })->sortByDesc('revenue');
+                }
+
+                return [
+                    'product' => $product,
+                    'revenue' => $revenue,
+                    'units' => $units,
+                    'orders' => $orders,
+                    'varieties' => $varietyStats,
+                ];
+            })->sortByDesc('revenue');
+
+        // Get best selling SKU
+        $bestSellingSku = $productStats->first();
+
+        // Top buyers by revenue
+        $topBuyers = $orderItems->groupBy(function ($item) {
+            return $item->order->business_id;
+        })->map(function ($items) {
+            $business = $items->first()->order->business;
+            return [
+                'business' => $business,
+                'revenue' => $items->sum('line_total'),
+                'orders' => $items->pluck('order_id')->unique()->count(),
+                'units' => $items->sum('quantity'),
+            ];
+        })->sortByDesc('revenue')->take(5);
+
+        return [
+            'totalProducts' => $totalProducts,
+            'activeProducts' => $activeProducts,
+            'totalOrders' => $totalOrders,
+            'totalRevenue' => $totalRevenue,
+            'totalUnits' => $totalUnits,
+            'avgOrderValue' => $avgOrderValue,
+            'revenueChange' => $revenueChange,
+            'ordersChange' => $ordersChange,
+            'revenueByDay' => $revenueByDay,
+            'productStats' => $productStats,
+            'bestSellingSku' => $bestSellingSku,
+            'topBuyers' => $topBuyers,
+        ];
+    }
+
+    /**
+     * Generate and download PDF report
+     */
+    public function exportPdf(Request $request, Business $business, Brand $brand)
+    {
+        Gate::authorize('view', [$brand, $business]);
+
+        // Get the same data as stats view
+        $statsData = $this->getStatsData($request, $business, $brand);
+
+        $pdf = \Barryvdh\DomPDF\Facade\Pdf::loadView('seller.brands.stats-pdf', $statsData);
+
+        return $pdf->download($brand->slug.'-stats-'.$statsData['startDate']->format('Y-m-d').'-to-'.$statsData['endDate']->format('Y-m-d').'.pdf');
+    }
+
+    /**
+     * Email PDF report to user
+     */
+    public function emailPdf(Request $request, Business $business, Brand $brand)
+    {
+        Gate::authorize('view', [$brand, $business]);
+
+        // Validate email addresses (comma-separated)
+        $validated = $request->validate([
+            'emails' => 'required|string',
+        ]);
+
+        // Parse and validate each email address
+        $emailList = array_map('trim', explode(',', $validated['emails']));
+        $validEmails = [];
+
+        foreach ($emailList as $email) {
+            if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
+                $validEmails[] = $email;
+            }
+        }
+
+        if (empty($validEmails)) {
+            return redirect()
+                ->back()
+                ->withInput()
+                ->withErrors(['emails' => 'Please provide at least one valid email address.']);
+        }
+
+        // Get the same data as stats view
+        $statsData = $this->getStatsData($request, $business, $brand);
+
+        $pdf = \Barryvdh\DomPDF\Facade\Pdf::loadView('seller.brands.stats-pdf', $statsData);
+
+        // Send email with PDF attachment to all recipients
+        \Illuminate\Support\Facades\Mail::send('emails.stats-report', [
+            'brand' => $brand,
+            'business' => $business,
+            'startDate' => $statsData['startDate'],
+            'endDate' => $statsData['endDate'],
+        ], function ($message) use ($validEmails, $brand, $pdf, $statsData) {
+            $message->to($validEmails)
+                ->subject('Brand Statistics Report: '.$brand->name)
+                ->attachData($pdf->output(), $brand->slug.'-stats-'.$statsData['startDate']->format('Y-m-d').'-to-'.$statsData['endDate']->format('Y-m-d').'.pdf');
+        });
+
+        $recipientCount = count($validEmails);
+        $recipientList = $recipientCount === 1 ? $validEmails[0] : $recipientCount.' recipients';
+
+        return redirect()
+            ->route('seller.business.brands.stats', [$business->slug, $brand->hashid, 'preset' => $statsData['preset']])
+            ->with('success', 'Report emailed to '.$recipientList);
+    }
+
+    /**
+     * Extract stats data logic into reusable method
+     */
+    private function getStatsData(Request $request, Business $business, Brand $brand): array
+    {
+        // Determine date range from request
+        $preset = $request->input('preset', 'last_30_days');
+        $startDate = null;
+        $endDate = null;
+
+        switch ($preset) {
+            case 'this_week':
+                $startDate = now()->startOfWeek();
+                $endDate = now()->endOfWeek();
+                break;
+            case 'last_week':
+                $startDate = now()->subWeek()->startOfWeek();
+                $endDate = now()->subWeek()->endOfWeek();
+                break;
+            case 'next_week':
+                $startDate = now()->addWeek()->startOfWeek();
+                $endDate = now()->addWeek()->endOfWeek();
+                break;
+            case 'this_month':
+                $startDate = now()->startOfMonth();
+                $endDate = now()->endOfMonth();
+                break;
+            case 'last_month':
+                $startDate = now()->subMonth()->startOfMonth();
+                $endDate = now()->subMonth()->endOfMonth();
+                break;
+            case 'this_year':
+                $startDate = now()->startOfYear();
+                $endDate = now()->endOfYear();
+                break;
+            case 'custom':
+                $startDate = $request->input('start_date') ? \Carbon\Carbon::parse($request->input('start_date'))->startOfDay() : now()->subDays(30);
+                $endDate = $request->input('end_date') ? \Carbon\Carbon::parse($request->input('end_date'))->endOfDay() : now();
+                break;
+            default: // last_30_days
+                $startDate = now()->subDays(30);
+                $endDate = now();
+        }
+
+        // Load brand with products
+        $brand->load(['products' => function ($query) {
+            $query->with(['orderItems.order']);
+        }]);
+
+        // Calculate overall brand metrics
+        $totalProducts = $brand->products->count();
+        $activeProducts = $brand->products->where('is_active', true)->count();
+
+        // Get all order items for this brand's products in the selected date range
+        $orderItems = \App\Models\OrderItem::whereHas('product', function ($query) use ($brand) {
+            $query->where('brand_id', $brand->id);
+        })
+            ->whereHas('order', function ($query) use ($startDate, $endDate) {
+                $query->whereBetween('created_at', [$startDate, $endDate]);
+            })
+            ->with('order', 'product')
+            ->get();
+
+        // Calculate metrics
+        $totalOrders = $orderItems->pluck('order_id')->unique()->count();
+        $totalRevenue = $orderItems->sum('line_total');
+        $totalUnits = $orderItems->sum('quantity');
+
+        // Previous period comparison (same duration before start date)
+        $daysDiff = $startDate->diffInDays($endDate);
+        $previousStartDate = $startDate->copy()->subDays($daysDiff + 1);
+        $previousEndDate = $startDate->copy()->subDay();
+
+        $previousOrderItems = \App\Models\OrderItem::whereHas('product', function ($query) use ($brand) {
+            $query->where('brand_id', $brand->id);
+        })
+            ->whereHas('order', function ($query) use ($previousStartDate, $previousEndDate) {
+                $query->whereBetween('created_at', [$previousStartDate, $previousEndDate]);
+            })
+            ->get();
+
+        $previousRevenue = $previousOrderItems->sum('line_total');
+        $previousOrders = $previousOrderItems->pluck('order_id')->unique()->count();
+
+        // Calculate percent changes
+        $revenueChange = $previousRevenue > 0 ? (($totalRevenue - $previousRevenue) / $previousRevenue) * 100 : 0;
+        $ordersChange = $previousOrders > 0 ? (($totalOrders - $previousOrders) / $previousOrders) * 100 : 0;
+
+        // Average order value
+        $avgOrderValue = $totalOrders > 0 ? $totalRevenue / $totalOrders : 0;
+
+        // Revenue by day
+        $revenueByDay = $orderItems->groupBy(function ($item) {
+            return $item->order->created_at->format('Y-m-d');
+        })->map(function ($items) {
+            return $items->sum('line_total');
+        })->sortKeys();
+
+        // Top products by revenue (with varieties nested under parents)
+        // Filter to only show parent products (exclude varieties from top level)
+        $productStats = $brand->products
+            ->filter(function ($product) {
+                return is_null($product->parent_product_id); // Only parent products
+            })
+            ->map(function ($product) use ($startDate, $endDate) {
+                $items = $product->orderItems()
+                    ->whereHas('order', function ($query) use ($startDate, $endDate) {
+                        $query->whereBetween('created_at', [$startDate, $endDate]);
+                    })
+                    ->with('order')
+                    ->get();
+
+                $revenue = $items->sum('line_total');
+                $units = $items->sum('quantity');
+                $orders = $items->pluck('order_id')->unique()->count();
+
+                // Always get variety breakdown if product has varieties
+                $varietyStats = [];
+                if ($product->has_varieties) {
+                    $varietyStats = $product->varieties->map(function ($variety) use ($startDate, $endDate) {
+                        $varietyItems = $variety->orderItems()
+                            ->whereHas('order', function ($query) use ($startDate, $endDate) {
+                                $query->whereBetween('created_at', [$startDate, $endDate]);
+                            })
+                            ->with('order')
+                            ->get();
+
+                        return [
+                            'product' => $variety,
+                            'revenue' => $varietyItems->sum('line_total'),
+                            'units' => $varietyItems->sum('quantity'),
+                            'orders' => $varietyItems->pluck('order_id')->unique()->count(),
+                        ];
+                    })->sortByDesc('revenue');
+                }
+
+                return [
+                    'product' => $product,
+                    'revenue' => $revenue,
+                    'units' => $units,
+                    'orders' => $orders,
+                    'varieties' => $varietyStats,
+                ];
+            })->sortByDesc('revenue');
+
+        // Get best selling SKU
+        $bestSellingSku = $productStats->first();
+
+        return compact(
+            'business',
+            'brand',
+            'totalProducts',
+            'activeProducts',
+            'totalOrders',
+            'totalRevenue',
+            'totalUnits',
+            'avgOrderValue',
+            'revenueChange',
+            'ordersChange',
+            'revenueByDay',
+            'productStats',
+            'bestSellingSku',
+            'preset',
+            'startDate',
+            'endDate'
+        );
+    }
+
+    /**
+     * Remove the specified brand from storage
+     */
+    public function destroy(Business $business, Brand $brand)
+    {
+        $this->authorize('delete', [$brand, $business]);
+
+        // Check if brand has any products with sales/orders
+        $hasProductsWithSales = $brand->products()
+            ->whereHas('orderItems')
+            ->exists();
+
+        if ($hasProductsWithSales) {
+            return redirect()
+                ->route('seller.business.brands.index', $business->slug)
+                ->with('error', 'Cannot delete brand - it has products with sales activity.');
+        }
+
+        // Delete logo and banner files
+        if ($brand->logo_path) {
+            Storage::delete($brand->logo_path);
+        }
+        if ($brand->banner_path) {
+            Storage::delete($brand->banner_path);
+        }
+
+        $brand->delete();
+
+        return redirect()
+            ->route('seller.business.brands.index', $business->slug)
+            ->with('success', 'Brand deleted successfully!');
+    }
+}

app/Http/Controllers/Seller/BrandPreviewController.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Brand;
+use App\Models\Business;
+use Illuminate\Http\Request;
+
+class BrandPreviewController extends Controller
+{
+    /**
+     * Show brand menu preview for sellers
+     * This allows sellers to preview how buyers will see their brand menu
+     *
+     * @return \Illuminate\View\View
+     */
+    public function preview(Request $request, Business $business, Brand $brand)
+    {
+        // Verify the brand belongs to the business (business isolation)
+        if ($brand->business_id !== $business->id) {
+            abort(404, 'Brand not found for this business');
+        }
+
+        // Load brand with business relationship
+        $brand->load('business');
+
+        // Get products organized by product line
+        $products = $brand->products()
+            ->with(['strain', 'images', 'productLine'])
+            ->where('is_active', true)
+            ->orderBy('product_line_id')
+            ->orderBy('name')
+            ->get();
+
+        // Group products by product line
+        $productsByLine = $products->groupBy(function ($product) {
+            return $product->productLine ? $product->productLine->name : 'Other Products';
+        });
+
+        // Get other brands from same business
+        $otherBrands = $business
+            ->brands()
+            ->where('id', '!=', $brand->id)
+            ->where('is_active', true)
+            ->get();
+
+        // Mark this as seller view
+        $isSeller = true;
+
+        return view('seller.brands.preview', compact(
+            'business',
+            'brand',
+            'products',
+            'productsByLine',
+            'otherBrands',
+            'isSeller'
+        ));
+    }
+}

app/Http/Controllers/Seller/BulkActionController.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\Product;
+use Illuminate\Http\Request;
+
+class BulkActionController extends Controller
+{
+    public function index(Business $business)
+    {
+        return view('seller.bulk-actions.index', compact('business'));
+    }
+
+    public function updatePrices(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'product_ids' => 'required|array',
+            'product_ids.*' => 'integer|exists:products,id',
+            'action' => 'required|in:increase,decrease,set',
+            'value' => 'required|numeric|min:0',
+            'type' => 'required_if:action,increase,decrease|in:percentage,fixed',
+        ]);
+
+        $products = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->whereIn('id', $validated['product_ids'])->get();
+
+        foreach ($products as $product) {
+            $newPrice = $product->price;
+
+            if ($validated['action'] === 'set') {
+                $newPrice = $validated['value'];
+            } elseif ($validated['action'] === 'increase') {
+                if ($validated['type'] === 'percentage') {
+                    $newPrice = $product->price * (1 + $validated['value'] / 100);
+                } else {
+                    $newPrice = $product->price + $validated['value'];
+                }
+            } elseif ($validated['action'] === 'decrease') {
+                if ($validated['type'] === 'percentage') {
+                    $newPrice = $product->price * (1 - $validated['value'] / 100);
+                } else {
+                    $newPrice = $product->price - $validated['value'];
+                }
+            }
+
+            $product->update(['price' => max(0, $newPrice)]);
+        }
+
+        return redirect()->route('seller.business.bulk-actions.index', $business->slug)
+            ->with('success', "Prices updated for {$products->count()} products");
+    }
+
+    public function updateVisibility(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'product_ids' => 'required|array',
+            'product_ids.*' => 'integer|exists:products,id',
+            'action' => 'required|in:publish,hide,archive',
+        ]);
+
+        $products = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->whereIn('id', $validated['product_ids'])->get();
+
+        foreach ($products as $product) {
+            switch ($validated['action']) {
+                case 'publish':
+                    $product->update(['is_active' => true, 'is_archived' => false]);
+                    break;
+                case 'hide':
+                    $product->update(['is_active' => false]);
+                    break;
+                case 'archive':
+                    $product->update(['is_active' => false, 'is_archived' => true]);
+                    break;
+            }
+        }
+
+        return redirect()->route('seller.business.bulk-actions.index', $business->slug)
+            ->with('success', "Visibility updated for {$products->count()} products");
+    }
+
+    public function bulkAssign(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'product_ids' => 'required|array',
+            'product_ids.*' => 'integer|exists:products,id',
+            'type' => 'required|in:category,strain,brand',
+            'value_id' => 'required|integer',
+        ]);
+
+        $products = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->whereIn('id', $validated['product_ids'])->get();
+
+        $field = $validated['type'] === 'category' ? 'category_id' : ($validated['type'] === 'strain' ? 'strain_id' : 'brand_id');
+
+        foreach ($products as $product) {
+            $product->update([$field => $validated['value_id']]);
+        }
+
+        return redirect()->route('seller.business.bulk-actions.index', $business->slug)
+            ->with('success', ucfirst($validated['type'])." assigned to {$products->count()} products");
+    }
+
+    public function updateInventory(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'product_ids' => 'required|array',
+            'product_ids.*' => 'integer|exists:products,id',
+            'action' => 'required|in:adjust,set,enable,disable',
+            'value' => 'required_if:action,adjust,set|nullable|integer',
+        ]);
+
+        $products = Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })->whereIn('id', $validated['product_ids'])->get();
+
+        foreach ($products as $product) {
+            switch ($validated['action']) {
+                case 'adjust':
+                    $newQuantity = ($product->stock_quantity ?? 0) + $validated['value'];
+                    $product->update(['stock_quantity' => max(0, $newQuantity)]);
+                    break;
+                case 'set':
+                    $product->update(['stock_quantity' => $validated['value']]);
+                    break;
+                case 'enable':
+                    $product->update(['track_inventory' => true]);
+                    break;
+                case 'disable':
+                    $product->update(['track_inventory' => false]);
+                    break;
+            }
+        }
+
+        return redirect()->route('seller.business.bulk-actions.index', $business->slug)
+            ->with('success', "Inventory updated for {$products->count()} products");
+    }
+}

app/Http/Controllers/Seller/CategoryController.php

@@ -0,0 +1,291 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\ComponentCategory;
+use App\Models\ProductCategory;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+
+class CategoryController extends Controller
+{
+    public function dashboard(Business $business)
+    {
+        // Load product categories for the dashboard view
+        $categories = ProductCategory::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })
+            ->with('products')
+            ->orderBy('sort_order')
+            ->orderBy('name')
+            ->get();
+
+        // Count unassigned products
+        $unassignedProductsCount = \App\Models\Product::whereHas('brand', function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+        })
+            ->whereNull('category_id')
+            ->count();
+
+        return view('seller.categories.index', compact('business', 'categories', 'unassignedProductsCount'));
+    }
+
+    public function index(Business $business)
+    {
+        // Load product categories with nesting and counts (include parent if division)
+        $productCategories = ProductCategory::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })
+            ->whereNull('parent_id')
+            ->with(['children' => function ($query) {
+                $query->orderBy('sort_order')->orderBy('name');
+            }])
+            ->withCount('products')
+            ->orderBy('sort_order')
+            ->orderBy('name')
+            ->get();
+
+        // Load component categories with nesting and counts (include parent if division)
+        $componentCategories = ComponentCategory::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })
+            ->whereNull('parent_id')
+            ->with(['children' => function ($query) {
+                $query->orderBy('sort_order')->orderBy('name');
+            }])
+            ->withCount('components')
+            ->orderBy('sort_order')
+            ->orderBy('name')
+            ->get();
+
+        return view('seller.settings.categories.index', compact('business', 'productCategories', 'componentCategories'));
+    }
+
+    public function create(Business $business, string $type)
+    {
+        // Validate type
+        if (! in_array($type, ['product', 'component'])) {
+            abort(404);
+        }
+
+        // Get all categories of this type for parent selection (include parent if division)
+        $categories = $type === 'product'
+            ? ProductCategory::where(function ($query) use ($business) {
+                $query->where('business_id', $business->id);
+                if ($business->parent_id) {
+                    $query->orWhere('business_id', $business->parent_id);
+                }
+            })
+                ->whereNull('parent_id')
+                ->with('children')
+                ->orderBy('name')
+                ->get()
+            : ComponentCategory::where(function ($query) use ($business) {
+                $query->where('business_id', $business->id);
+                if ($business->parent_id) {
+                    $query->orWhere('business_id', $business->parent_id);
+                }
+            })
+                ->whereNull('parent_id')
+                ->with('children')
+                ->orderBy('name')
+                ->get();
+
+        return view('seller.settings.categories.create', compact('business', 'type', 'categories'));
+    }
+
+    public function store(Request $request, Business $business, string $type)
+    {
+        // Validate type
+        if (! in_array($type, ['product', 'component'])) {
+            abort(404);
+        }
+
+        $tableName = $type === 'product' ? 'product_categories' : 'component_categories';
+
+        $validated = $request->validate([
+            'name' => 'required|string|max:255',
+            'parent_id' => "nullable|exists:{$tableName},id",
+            'description' => 'nullable|string',
+            'sort_order' => 'nullable|integer|min:0',
+            'is_active' => 'boolean',
+            'image' => 'nullable|image|max:2048',
+        ]);
+
+        $validated['business_id'] = $business->id;
+        $validated['slug'] = Str::slug($validated['name']);
+        $validated['is_active'] = $request->has('is_active') ? true : false;
+
+        // Handle image upload
+        if ($request->hasFile('image')) {
+            $validated['image_path'] = $request->file('image')->store('categories', 'public');
+        }
+
+        // Validate parent belongs to same business if provided
+        if (! empty($validated['parent_id'])) {
+            $model = $type === 'product' ? ProductCategory::class : ComponentCategory::class;
+            $parent = $model::where('business_id', $business->id)->find($validated['parent_id']);
+
+            if (! $parent) {
+                return back()->withErrors(['parent_id' => 'Invalid parent category'])->withInput();
+            }
+        }
+
+        $model = $type === 'product' ? ProductCategory::class : ComponentCategory::class;
+        $model::create($validated);
+
+        return redirect()->route('seller.business.settings.categories.index', $business->slug)
+            ->with('success', ucfirst($type).' category created successfully');
+    }
+
+    public function edit(Business $business, string $type, int $id)
+    {
+        // Validate type
+        if (! in_array($type, ['product', 'component'])) {
+            abort(404);
+        }
+
+        $model = $type === 'product' ? ProductCategory::class : ComponentCategory::class;
+        // Allow accessing categories from parent company if division
+        $category = $model::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })->findOrFail($id);
+
+        // Get all categories of this type for parent selection (excluding self and descendants, include parent if division)
+        $categories = $model::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })
+            ->whereNull('parent_id')
+            ->where('id', '!=', $id)
+            ->with('children')
+            ->orderBy('name')
+            ->get();
+
+        return view('seller.settings.categories.edit', compact('business', 'type', 'category', 'categories'));
+    }
+
+    public function update(Request $request, Business $business, string $type, int $id)
+    {
+        // Validate type
+        if (! in_array($type, ['product', 'component'])) {
+            abort(404);
+        }
+
+        $model = $type === 'product' ? ProductCategory::class : ComponentCategory::class;
+        // Allow accessing categories from parent company if division
+        $category = $model::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })->findOrFail($id);
+
+        $tableName = $type === 'product' ? 'product_categories' : 'component_categories';
+
+        $validated = $request->validate([
+            'name' => 'required|string|max:255',
+            'parent_id' => "nullable|exists:{$tableName},id",
+            'description' => 'nullable|string',
+            'sort_order' => 'nullable|integer|min:0',
+            'is_active' => 'boolean',
+            'image' => 'nullable|image|max:2048',
+        ]);
+
+        $validated['slug'] = Str::slug($validated['name']);
+        $validated['is_active'] = $request->has('is_active') ? true : false;
+
+        // Handle image upload
+        if ($request->hasFile('image')) {
+            // Delete old image if exists
+            if ($category->image_path) {
+                \Storage::delete($category->image_path);
+            }
+            $validated['image_path'] = $request->file('image')->store('categories', 'public');
+        }
+
+        // Validate parent (can't be self or descendant)
+        if (! empty($validated['parent_id'])) {
+            if ($validated['parent_id'] == $id) {
+                return back()->withErrors(['parent_id' => 'Category cannot be its own parent'])->withInput();
+            }
+
+            $parent = $model::where('business_id', $business->id)->find($validated['parent_id']);
+            if (! $parent) {
+                return back()->withErrors(['parent_id' => 'Invalid parent category'])->withInput();
+            }
+
+            // Check for circular reference (if parent's parent is this category)
+            if ($parent->parent_id == $id) {
+                return back()->withErrors(['parent_id' => 'This would create a circular reference'])->withInput();
+            }
+        }
+
+        $category->update($validated);
+
+        return redirect()->route('seller.business.settings.categories.index', $business->slug)
+            ->with('success', ucfirst($type).' category updated successfully');
+    }
+
+    public function destroy(Business $business, string $type, int $id)
+    {
+        // Validate type
+        if (! in_array($type, ['product', 'component'])) {
+            abort(404);
+        }
+
+        $model = $type === 'product' ? ProductCategory::class : ComponentCategory::class;
+        // Allow accessing categories from parent company if division
+        $category = $model::where(function ($query) use ($business) {
+            $query->where('business_id', $business->id);
+            if ($business->parent_id) {
+                $query->orWhere('business_id', $business->parent_id);
+            }
+        })->findOrFail($id);
+
+        // Check if has products/components
+        if ($type === 'product') {
+            $count = $category->products()->count();
+            if ($count > 0) {
+                return back()->with('error', "Cannot delete category with {$count} products. Please reassign or delete products first.");
+            }
+        } else {
+            $count = $category->components()->count();
+            if ($count > 0) {
+                return back()->with('error', "Cannot delete category with {$count} components. Please reassign or delete components first.");
+            }
+        }
+
+        // Check if has children
+        $childCount = $category->children()->count();
+        if ($childCount > 0) {
+            return back()->with('error', "Cannot delete category with {$childCount} subcategories. Please delete or move subcategories first.");
+        }
+
+        // Delete image if exists
+        if ($category->image_path) {
+            \Storage::delete($category->image_path);
+        }
+
+        $category->delete();
+
+        return redirect()->route('seller.business.settings.categories.index', $business->slug)
+            ->with('success', ucfirst($type).' category deleted successfully');
+    }
+}

app/Http/Controllers/Seller/ComponentController.php

@@ -158,7 +158,7 @@ class ComponentController extends Controller
         if ($request->hasFile('image')) {
             // Delete old image if exists
             if ($component->image_path) {
-                Storage::disk('public')->delete($component->image_path);
+                Storage::delete($component->image_path);
             }
 
             // Store new image with UUID-based path
@@ -172,7 +172,7 @@ class ComponentController extends Controller
         // Handle image removal
         if ($request->has('remove_image') && $request->remove_image) {
             if ($component->image_path) {
-                Storage::disk('public')->delete($component->image_path);
+                Storage::delete($component->image_path);
                 $validated['image_path'] = null;
             }
         }

app/Http/Controllers/Seller/ConsolidatedAnalyticsController.php

@@ -0,0 +1,222 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\Conversion;
+use App\Models\Department;
+use App\Models\WorkOrder;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ConsolidatedAnalyticsController extends Controller
+{
+    /**
+     * Analytics overview
+     */
+    public function index(Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403, 'Consolidated analytics only available for parent companies');
+        }
+
+        return view('seller.analytics.index', compact('business'));
+    }
+
+    /**
+     * Manufacturing analytics across all divisions
+     */
+    public function manufacturing(Business $business, Request $request)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        $divisionIds = $business->divisions->pluck('id');
+
+        // Date range filter
+        $startDate = $request->input('start_date', now()->startOfMonth()->format('Y-m-d'));
+        $endDate = $request->input('end_date', now()->endOfMonth()->format('Y-m-d'));
+
+        // Work Orders by Division
+        $workOrdersByDivision = $business->divisions->map(function ($division) use ($startDate, $endDate) {
+            return [
+                'division' => $division->division_name,
+                'total' => WorkOrder::where('business_id', $division->id)
+                    ->whereBetween('created_at', [$startDate, $endDate])
+                    ->count(),
+                'completed' => WorkOrder::where('business_id', $division->id)
+                    ->where('status', 'completed')
+                    ->whereBetween('completed_at', [$startDate, $endDate])
+                    ->count(),
+                'in_progress' => WorkOrder::where('business_id', $division->id)
+                    ->where('status', 'in_progress')
+                    ->count(),
+                'overdue' => WorkOrder::where('business_id', $division->id)
+                    ->overdue()
+                    ->count(),
+            ];
+        });
+
+        // Wash Reports by Division
+        $washReportsByDivision = $business->divisions->map(function ($division) use ($startDate, $endDate) {
+            $completed = Conversion::where('business_id', $division->id)
+                ->where('conversion_type', 'hash_wash')
+                ->where('status', 'completed')
+                ->whereBetween('completed_at', [$startDate, $endDate])
+                ->get();
+
+            return [
+                'division' => $division->division_name,
+                'total' => $completed->count(),
+                'total_input_weight' => $completed->sum('input_weight'),
+                'total_output_weight' => $completed->sum('output_weight'),
+                'average_yield' => $completed->avg('yield_percentage'),
+            ];
+        });
+
+        // Department Performance
+        $departmentPerformance = Department::whereIn('business_id', $divisionIds)
+            ->with('business')
+            ->withCount(['workOrders as active_work_orders' => function ($q) {
+                $q->active();
+            }])
+            ->withCount(['workOrders as completed_work_orders' => function ($q) use ($startDate, $endDate) {
+                $q->where('status', 'completed')
+                    ->whereBetween('completed_at', [$startDate, $endDate]);
+            }])
+            ->get()
+            ->map(function ($dept) {
+                return [
+                    'division' => $dept->business->division_name ?? 'Unknown',
+                    'department' => $dept->name,
+                    'active_work_orders' => $dept->active_work_orders,
+                    'completed_work_orders' => $dept->completed_work_orders,
+                ];
+            });
+
+        // Work Order Completion Trend (last 30 days)
+        $completionTrend = WorkOrder::whereIn('business_id', $divisionIds)
+            ->where('status', 'completed')
+            ->whereBetween('completed_at', [now()->subDays(30), now()])
+            ->select(DB::raw('DATE(completed_at) as date'), DB::raw('COUNT(*) as count'))
+            ->groupBy('date')
+            ->orderBy('date')
+            ->get();
+
+        return view('seller.analytics.manufacturing', compact(
+            'business',
+            'workOrdersByDivision',
+            'washReportsByDivision',
+            'departmentPerformance',
+            'completionTrend',
+            'startDate',
+            'endDate'
+        ));
+    }
+
+    /**
+     * Production analytics (detailed manufacturing metrics)
+     */
+    public function production(Business $business, Request $request)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        $divisionIds = $business->divisions->pluck('id');
+
+        // Date range
+        $startDate = $request->input('start_date', now()->startOfMonth()->format('Y-m-d'));
+        $endDate = $request->input('end_date', now()->endOfMonth()->format('Y-m-d'));
+
+        // Yield Analysis by Division
+        $yieldAnalysis = $business->divisions->map(function ($division) use ($startDate, $endDate) {
+            $washes = Conversion::where('business_id', $division->id)
+                ->where('conversion_type', 'hash_wash')
+                ->where('status', 'completed')
+                ->whereBetween('completed_at', [$startDate, $endDate])
+                ->get();
+
+            return [
+                'division' => $division->division_name,
+                'total_washes' => $washes->count(),
+                'total_input_kg' => round($washes->sum('input_weight') / 1000, 2),
+                'total_output_kg' => round($washes->sum('output_weight') / 1000, 2),
+                'average_yield' => round($washes->avg('yield_percentage'), 2),
+                'best_yield' => round($washes->max('yield_percentage'), 2),
+                'worst_yield' => round($washes->min('yield_percentage'), 2),
+            ];
+        });
+
+        // Top Strains (by output weight)
+        $topStrains = Conversion::whereIn('business_id', $divisionIds)
+            ->where('conversion_type', 'hash_wash')
+            ->where('status', 'completed')
+            ->whereBetween('completed_at', [$startDate, $endDate])
+            ->whereNotNull('metadata->strain')
+            ->select(DB::raw("metadata->>'strain' as strain"), DB::raw('SUM(output_weight) as total_output'))
+            ->groupBy('strain')
+            ->orderByDesc('total_output')
+            ->limit(10)
+            ->get();
+
+        // Equipment Utilization (if tracked in metadata)
+        $equipmentUtilization = Conversion::whereIn('business_id', $divisionIds)
+            ->where('conversion_type', 'hash_wash')
+            ->where('status', 'completed')
+            ->whereBetween('completed_at', [$startDate, $endDate])
+            ->whereNotNull('metadata->washer')
+            ->select(DB::raw("metadata->>'washer' as washer"), DB::raw('COUNT(*) as uses'))
+            ->groupBy('washer')
+            ->orderBy('washer')
+            ->get();
+
+        return view('seller.analytics.production', compact(
+            'business',
+            'yieldAnalysis',
+            'topStrains',
+            'equipmentUtilization',
+            'startDate',
+            'endDate'
+        ));
+    }
+
+    /**
+     * Department efficiency report
+     */
+    public function departments(Business $business, Request $request)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        $divisionIds = $business->divisions->pluck('id');
+
+        $departments = Department::whereIn('business_id', $divisionIds)
+            ->with(['business', 'users'])
+            ->withCount('workOrders')
+            ->get()
+            ->map(function ($dept) {
+                $activeWorkOrders = $dept->workOrders()->active()->count();
+                $completedThisMonth = $dept->workOrders()
+                    ->where('status', 'completed')
+                    ->whereMonth('completed_at', now()->month)
+                    ->count();
+
+                return [
+                    'division' => $dept->business->division_name ?? 'Unknown',
+                    'department' => $dept->name,
+                    'code' => $dept->code,
+                    'users_count' => $dept->users->count(),
+                    'active_work_orders' => $activeWorkOrders,
+                    'completed_this_month' => $completedThisMonth,
+                    'total_work_orders' => $dept->work_orders_count,
+                    'is_active' => $dept->is_active,
+                ];
+            });
+
+        return view('seller.analytics.departments', compact('business', 'departments'));
+    }
+}

app/Http/Controllers/Seller/CorporateSettingsController.php

@@ -0,0 +1,234 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+
+class CorporateSettingsController extends Controller
+{
+    /**
+     * Corporate settings overview
+     */
+    public function index(Business $business)
+    {
+        // Verify this is a parent company
+        if (! $business->isParentCompany()) {
+            abort(403, 'Corporate settings only available for parent companies');
+        }
+
+        return redirect()->route('seller.business.corporate.divisions', $business->slug);
+    }
+
+    /**
+     * Manage divisions
+     */
+    public function divisions(Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        $divisions = $business->divisions()->with('departments')->get();
+
+        return view('seller.corporate.divisions', compact('business', 'divisions'));
+    }
+
+    /**
+     * Show form to create a new division
+     */
+    public function createDivision(Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        return view('seller.corporate.create-division', compact('business'));
+    }
+
+    /**
+     * Store a new division
+     */
+    public function storeDivision(Request $request, Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'division_name' => 'required|string|max:255',
+            'dba_name' => 'nullable|string|max:255',
+            'description' => 'nullable|string',
+            'business_type' => 'required|in:brand,retailer,distributor,cultivator,processor,testing_lab,both',
+            'override_billing' => 'boolean',
+            'override_legal_name' => 'nullable|string|max:255',
+            'override_address' => 'nullable|string|max:255',
+            'override_city' => 'nullable|string|max:255',
+            'override_state' => 'nullable|string|max:2',
+            'override_zip' => 'nullable|string|max:10',
+            'override_phone' => 'nullable|string|max:20',
+            'override_email' => 'nullable|email|max:255',
+        ]);
+
+        // Generate slug from division name
+        $slug = Str::slug($validated['division_name']);
+
+        // Ensure unique slug
+        $originalSlug = $slug;
+        $counter = 1;
+        while (Business::where('slug', $slug)->exists()) {
+            $slug = $originalSlug.'-'.$counter;
+            $counter++;
+        }
+
+        $division = Business::create([
+            'parent_id' => $business->id,
+            'owner_user_id' => $business->owner_user_id,
+            'name' => $business->name, // Inherit parent legal name
+            'division_name' => $validated['division_name'],
+            'slug' => $slug,
+            'dba_name' => $validated['dba_name'] ?? $validated['division_name'],
+            'description' => $validated['description'],
+            'type' => $business->type,
+            'business_type' => $validated['business_type'],
+            'is_active' => true,
+            'status' => 'approved',
+            'approved_at' => now(),
+            'onboarding_completed' => true,
+
+            // Inherit or override settings
+            'override_billing' => $validated['override_billing'] ?? false,
+            'override_legal_name' => $validated['override_legal_name'],
+            'override_address' => $validated['override_address'],
+            'override_city' => $validated['override_city'],
+            'override_state' => $validated['override_state'],
+            'override_zip' => $validated['override_zip'],
+            'override_phone' => $validated['override_phone'],
+            'override_email' => $validated['override_email'],
+
+            // Inherit parent info
+            'physical_address' => $business->physical_address,
+            'physical_city' => $business->physical_city,
+            'physical_state' => $business->physical_state,
+            'physical_zipcode' => $business->physical_zipcode,
+            'business_phone' => $business->business_phone,
+            'business_email' => $business->business_email,
+            'license_number' => $business->license_number,
+            'tin_ein' => $business->tin_ein,
+        ]);
+
+        return redirect()
+            ->route('seller.business.corporate.divisions', $business->slug)
+            ->with('success', 'Division created successfully! You can now add departments to it.');
+    }
+
+    /**
+     * Show form to edit a division
+     */
+    public function editDivision(Business $business, Business $division)
+    {
+        if (! $business->isParentCompany() || $division->parent_id !== $business->id) {
+            abort(403);
+        }
+
+        return view('seller.corporate.edit-division', compact('business', 'division'));
+    }
+
+    /**
+     * Update a division
+     */
+    public function updateDivision(Request $request, Business $business, Business $division)
+    {
+        if (! $business->isParentCompany() || $division->parent_id !== $business->id) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'division_name' => 'required|string|max:255',
+            'dba_name' => 'nullable|string|max:255',
+            'description' => 'nullable|string',
+            'business_type' => 'required|in:brand,retailer,distributor,cultivator,processor,testing_lab,both',
+            'is_active' => 'boolean',
+            'override_billing' => 'boolean',
+            'override_legal_name' => 'nullable|string|max:255',
+            'override_address' => 'nullable|string|max:255',
+            'override_city' => 'nullable|string|max:255',
+            'override_state' => 'nullable|string|max:2',
+            'override_zip' => 'nullable|string|max:10',
+            'override_phone' => 'nullable|string|max:20',
+            'override_email' => 'nullable|email|max:255',
+        ]);
+
+        $division->update($validated);
+
+        return redirect()
+            ->route('seller.business.corporate.divisions', $business->slug)
+            ->with('success', 'Division updated successfully!');
+    }
+
+    /**
+     * Manage company-wide information (for all divisions)
+     */
+    public function companyInformation(Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        return view('seller.corporate.company-information', compact('business'));
+    }
+
+    /**
+     * Update company information
+     */
+    public function updateCompanyInformation(Request $request, Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'name' => 'required|string|max:255',
+            'physical_address' => 'required|string|max:255',
+            'physical_city' => 'required|string|max:255',
+            'physical_state' => 'required|string|max:2',
+            'physical_zipcode' => 'required|string|max:10',
+            'business_phone' => 'required|string|max:20',
+            'business_email' => 'required|email|max:255',
+            'tin_ein' => 'nullable|string|max:20',
+            'license_number' => 'nullable|string|max:255',
+        ]);
+
+        $business->update($validated);
+
+        return redirect()
+            ->route('seller.business.corporate.company-information', $business->slug)
+            ->with('success', 'Company information updated successfully!');
+    }
+
+    /**
+     * Manage users across all divisions
+     */
+    public function users(Business $business)
+    {
+        if (! $business->isParentCompany()) {
+            abort(403);
+        }
+
+        // Get all users associated with parent or any division
+        $divisionIds = $business->divisions->pluck('id')->push($business->id);
+
+        $users = User::whereHas('businesses', function ($q) use ($divisionIds) {
+            $q->whereIn('businesses.id', $divisionIds);
+        })->with(['businesses' => function ($q) use ($divisionIds) {
+            $q->whereIn('businesses.id', $divisionIds);
+        }, 'departments'])->get();
+
+        $divisions = $business->divisions;
+
+        return view('seller.corporate.users', compact('business', 'users', 'divisions'));
+    }
+}

app/Http/Controllers/Seller/DashboardController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class DashboardController extends Controller
+{
+    public function index()
+    {
+        return view('seller.dashboard.index');
+    }
+
+    public function create()
+    {
+        return view('seller.dashboard.create');
+    }
+
+    public function store(Request $request)
+    {
+        // TODO: Implement store logic
+        return redirect()->route('seller.business.dashboard.index');
+    }
+
+    public function show($id)
+    {
+        return view('seller.dashboard.show');
+    }
+
+    public function edit($id)
+    {
+        return view('seller.dashboard.edit');
+    }
+
+    public function update(Request $request, $id)
+    {
+        // TODO: Implement update logic
+        return redirect()->route('seller.business.dashboard.index');
+    }
+
+    public function destroy($id)
+    {
+        // TODO: Implement destroy logic
+        return redirect()->route('seller.business.dashboard.index');
+    }
+
+    public function preview($id)
+    {
+        return view('seller.dashboard.preview');
+    }
+}