fix: correct BannerAdResource navigationGroup type hint

Banner Ad System:
- BannerAd model with scheduling (starts_at, ends_at)
- BannerAdEvent model for impression/click tracking
- BannerAdDailyStat model for analytics rollups
- BannerAdZone enum (6 zones: hero, leaderboard, sidebar, inline, brand, deals)
- BannerAdStatus enum (draft, active, scheduled, paused, expired)

Service & Controller:
- BannerAdService with weighted random rotation, caching
- BannerAdController for click tracking and image serving
- Routes for /ads/click, /ads/impression, /images/banner-ad

Filament Admin:
- Full CRUD resource at /admin/banner-ads
- Image upload to MinIO
- Status/zone filters
- Analytics display (impressions, clicks, CTR)

Display Components:
- <x-banner-ad zone="..." /> Blade component
- Automatic impression tracking
- Click tracking via redirect
- Sponsored badge overlay

View Placements:
- Marketplace homepage: leaderboard + sidebar
- Brand page: banner below breadcrumbs
- Deals page: hero banner

Background Jobs:
- UpdateBannerAdStatuses: activate scheduled, expire ended (every minute)
- RollupBannerAdStats: daily aggregation + event cleanup

.dockerignore

@@ -8,8 +8,8 @@ node_modules
 npm-debug.log
 yarn-error.log
 
-# Composer
-/vendor
+# Composer (NOT excluded - Dockerfile.fast needs pre-built vendor)
+# /vendor
 
 # Environment
 .env
@@ -58,7 +58,7 @@ docker-compose.*.yml
 # Build artifacts
 /public/hot
 /public/storage
-/public/build
+# /public/build - NOT excluded, Dockerfile.fast needs pre-built assets
 
 # Misc
 .env.backup

.env.example

@@ -24,12 +24,13 @@ LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
+# PostgreSQL: 10.100.6.50:5432
 DB_CONNECTION=pgsql
-DB_HOST=pgsql
+DB_HOST=10.100.6.50
 DB_PORT=5432
-DB_DATABASE=cannabrands_app
-DB_USERNAME=sail
-DB_PASSWORD=password
+DB_DATABASE=cannabrands_dev
+DB_USERNAME=cannabrands
+DB_PASSWORD=SpDyCannaBrands2024
 
 SESSION_DRIVER=redis
 SESSION_LIFETIME=120
@@ -66,9 +67,10 @@ CACHE_PREFIX=
 
 MEMCACHED_HOST=127.0.0.1
 
+# Redis: 10.100.9.50:6379
 REDIS_CLIENT=phpredis
-REDIS_HOST=redis
-REDIS_PASSWORD=null
+REDIS_HOST=10.100.9.50
+REDIS_PASSWORD=SpDyR3d1s2024!
 REDIS_PORT=6379
 
 MAIL_MAILER=smtp
@@ -88,43 +90,18 @@ MAIL_FROM_NAME="${APP_NAME}"
 # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 # ┌─────────────────────────────────────────────────────────────────────┐
-# │ LOCAL DEVELOPMENT (Docker MinIO)                                    │
+# │ MinIO (S3-Compatible Storage)                                       │
 # └─────────────────────────────────────────────────────────────────────┘
-# Use local MinIO container for development (versioning enabled)
-# Access MinIO Console: http://localhost:9001 (minioadmin/minioadmin)
+# Server: 10.100.9.80:9000 | Console: 10.100.9.80:9001
 FILESYSTEM_DISK=minio
-AWS_ACCESS_KEY_ID=minioadmin
-AWS_SECRET_ACCESS_KEY=minioadmin
+AWS_ACCESS_KEY_ID=cannabrands-app
+AWS_SECRET_ACCESS_KEY=cdbdcd0c7b6f3994d4ab09f68eaff98665df234f
 AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=media
-AWS_ENDPOINT=http://minio:9000
-AWS_URL=http://localhost:9000/media
+AWS_BUCKET=cannabrands
+AWS_ENDPOINT=http://10.100.9.80:9000
+AWS_URL=http://10.100.9.80:9000/cannabrands
 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
-# AWS_BUCKET=media
-# AWS_ENDPOINT=https://cdn.cannabrands.app
-# AWS_URL=https://cdn.cannabrands.app/media
-# AWS_USE_PATH_STYLE_ENDPOINT=true
-
 VITE_APP_NAME="${APP_NAME}"
 
 # ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

.woodpecker/.ci.yml

@@ -1,29 +1,24 @@
 # Woodpecker CI/CD Pipeline for Cannabrands Hub
-# Documentation: https://woodpecker-ci.org/docs/intro
+# Optimized for fast deploys (~8-10 min)
 #
-# 2-Environment Workflow (Optimized for small team):
-#   - develop branch → dev.cannabrands.app (integration/testing)
-#   - master branch  → cannabrands.app (production)
-#   - tags (2025.X)  → cannabrands.app (versioned production releases)
+# Optimizations:
+#   - Parallel composer + frontend builds
+#   - Split tests (unit + feature run in parallel)
+#   - Dependency caching (npm + composer)
+#   - Single-stage Dockerfile.fast
+#   - Kaniko layer caching
 #
-# Pipeline Strategy:
-#   - PRs: Run tests (lint, style, phpunit) IN PARALLEL
-#   - Push to develop/master: Skip tests (already passed on PR), build + deploy
-#   - Tags: Build versioned release
-#
-# Optimization Notes:
-#   - php-lint, code-style, and tests run in parallel after composer install
-#   - Uses parallel-lint for faster PHP syntax checking
-#   - PostgreSQL tuned for CI (fsync disabled)
-#   - Cache rebuild only on merge builds
+# External Services:
+#   - PostgreSQL: 10.100.6.50:5432 (cannabrands_dev)
+#   - Redis: 10.100.9.50:6379
+#   - MinIO: 10.100.9.80:9000
+#   - Docker Registry: git.spdy.io (for k8s pulls)
 
 when:
   - branch: [develop, master]
     event: push
   - event: [pull_request, tag]
 
-# Use explicit git clone plugin to fix auth issues
-# The default clone was failing with "could not read Username"
 clone:
   git:
     image: woodpeckerci/plugin-git
@@ -34,310 +29,220 @@ clone:
 
 steps:
   # ============================================
-  # DEPENDENCY INSTALLATION (Sequential)
+  # PARALLEL: Composer + Frontend (with caching)
   # ============================================
 
-  # Restore Composer cache
-  restore-composer-cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "composer-{{ checksum \"composer.lock\" }}"
-      archive_format: "gzip"
-      mount:
-        - "vendor"
-    volumes:
-      - /tmp/woodpecker-cache:/tmp/cache
-
-  # Install dependencies (uses pre-built Laravel image with all extensions)
   composer-install:
-    image: kirschbaumdevelopment/laravel-test-runner:8.3
-    depends_on:
-      - restore-composer-cache
+    image: 10.100.9.70:5000/kirschbaumdevelopment/laravel-test-runner:8.3
     commands:
-      - echo "Creating minimal .env for package discovery..."
       - |
         cat > .env << 'EOF'
         APP_NAME="Cannabrands Hub"
-        APP_ENV=testing
+        APP_ENV=development
         APP_KEY=base64:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
-        APP_DEBUG=true
-        CACHE_STORE=array
-        SESSION_DRIVER=array
-        QUEUE_CONNECTION=sync
-        DB_CONNECTION=pgsql
-        DB_HOST=postgres
-        DB_PORT=5432
-        DB_DATABASE=testing
-        DB_USERNAME=testing
-        DB_PASSWORD=testing
         EOF
-      - echo "Checking for cached dependencies..."
-      - |
-        if [ -d "vendor" ] && [ -f "vendor/autoload.php" ]; then
-          echo "✅ Restored vendor from cache"
-          composer install --no-interaction --prefer-dist --optimize-autoloader --no-progress
-        else
-          echo "📦 Installing fresh dependencies (cache miss)"
-          composer install --no-interaction --prefer-dist --optimize-autoloader --no-progress
-        fi
-      - echo "✅ Composer dependencies ready!"
+      # Restore composer cache if available
+      - mkdir -p /root/.composer/cache
+      - if [ -d .composer-cache ]; then cp -r .composer-cache/* /root/.composer/cache/ 2>/dev/null || true; fi
+      # Clean vendor and bootstrap cache to force fresh install
+      - rm -rf vendor bootstrap/cache/*.php
+      - composer install --no-interaction --prefer-dist --optimize-autoloader --no-progress
+      # Verify test command is available
+      - php artisan list test | head -5
+      # Save cache for next build
+      - mkdir -p .composer-cache && cp -r /root/.composer/cache/* .composer-cache/ 2>/dev/null || true
+      - echo "✅ Composer done"
 
-  # Rebuild Composer cache (only on merge builds, not PRs)
-  rebuild-composer-cache:
-    image: meltwater/drone-cache:dev
-    depends_on:
-      - composer-install
-    settings:
-      backend: "filesystem"
-      rebuild: true
-      cache_key: "composer-{{ checksum \"composer.lock\" }}"
-      archive_format: "gzip"
-      mount:
-        - "vendor"
-    volumes:
-      - /tmp/woodpecker-cache:/tmp/cache
-    when:
-      branch: [develop, master]
-      event: push
+  build-frontend:
+    image: 10.100.9.70:5000/library/node:22-alpine
+    environment:
+      VITE_REVERB_APP_KEY: 6VDQTxU0fknXHCgKOI906Py03abktP8GatzNw3DvJkU=
+      VITE_REVERB_HOST: dev.cannabrands.app
+      VITE_REVERB_PORT: "443"
+      VITE_REVERB_SCHEME: https
+      npm_config_cache: .npm-cache
+    commands:
+      # Use cached node_modules if available
+      - npm ci --prefer-offline
+      - npm run build
+      - echo "✅ Frontend built"
 
   # ============================================
-  # PR CHECKS (Run in Parallel for Speed)
+  # PR CHECKS (Parallel: lint, style, tests)
   # ============================================
 
-  # PHP Syntax Check - Uses parallel-lint for 5-10x speed improvement
   php-lint:
-    image: kirschbaumdevelopment/laravel-test-runner:8.3
+    image: 10.100.9.70:5000/kirschbaumdevelopment/laravel-test-runner:8.3
     depends_on:
       - composer-install
     commands:
-      - echo "Checking PHP syntax (parallel)..."
       - ./vendor/bin/parallel-lint app routes database config --colors --blame
-      - echo "✅ PHP syntax check complete!"
     when:
       event: pull_request
 
-  # Run Laravel Pint (code style)
   code-style:
-    image: kirschbaumdevelopment/laravel-test-runner:8.3
+    image: 10.100.9.70:5000/kirschbaumdevelopment/laravel-test-runner:8.3
     depends_on:
       - composer-install
     commands:
-      - echo "Checking code style with Laravel Pint..."
       - ./vendor/bin/pint --test
-      - echo "✅ Code style check complete!"
     when:
       event: pull_request
 
-  # Run PHPUnit Tests
-  # Note: Uses array cache/session for speed and isolation (Laravel convention)
-  # Redis + Reverb services used for real-time broadcasting tests
-  tests:
-    image: kirschbaumdevelopment/laravel-test-runner:8.3
+  # Split tests: Unit tests (with DB - some unit tests use factories)
+  tests-unit:
+    image: 10.100.9.70:5000/kirschbaumdevelopment/laravel-test-runner:8.3
     depends_on:
       - composer-install
     when:
       event: pull_request
     environment:
       APP_ENV: testing
-      BROADCAST_CONNECTION: reverb
       CACHE_STORE: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
       DB_CONNECTION: pgsql
-      DB_HOST: postgres
+      DB_HOST: 10.100.6.50
       DB_PORT: 5432
-      DB_DATABASE: testing
-      DB_USERNAME: testing
-      DB_PASSWORD: testing
-      REDIS_HOST: redis
-      REVERB_APP_ID: test-app-id
-      REVERB_APP_KEY: test-key
-      REVERB_APP_SECRET: test-secret
-      REVERB_HOST: localhost
-      REVERB_PORT: 8080
-      REVERB_SCHEME: http
+      DB_DATABASE: cannabrands_test
+      DB_USERNAME: cannabrands
+      DB_PASSWORD: SpDyCannaBrands2024
     commands:
-      - echo "Setting up Laravel environment..."
       - cp .env.example .env
       - php artisan key:generate
-      - echo "Waiting for PostgreSQL to be ready..."
-      - |
-        for i in 1 2 3 4 5 6 7 8 9 10; do
-          if pg_isready -h postgres -p 5432 -U testing 2>/dev/null; then
-            echo "✅ PostgreSQL is ready!"
-            break
-          fi
-          echo "Waiting for postgres... attempt $i/10"
-          sleep 3
-        done
-      - echo "Starting Reverb server in background..."
-      - php artisan reverb:start --host=0.0.0.0 --port=8080 > /dev/null 2>&1 &
-      - sleep 2
-      - echo "Running tests in parallel..."
-      - php artisan test --parallel
-      - echo "✅ Tests complete!"
+      - php artisan test --testsuite=Unit
+      - echo "✅ Unit tests passed"
 
-  # ============================================
-  # MERGE BUILD STEPS (Sequential, after PR passes)
-  # ============================================
-
-  # Validate migrations before deployment
-  # Only runs pending migrations - never fresh or seed
-  validate-migrations:
-    image: kirschbaumdevelopment/laravel-test-runner:8.3
+  # Split tests: Feature tests (with DB)
+  tests-feature:
+    image: 10.100.9.70:5000/kirschbaumdevelopment/laravel-test-runner:8.3
     depends_on:
       - composer-install
+    when:
+      event: pull_request
     environment:
-      APP_ENV: production
-      DB_CONNECTION: pgsql
-      DB_HOST: postgres
-      DB_PORT: 5432
-      DB_DATABASE: testing
-      DB_USERNAME: testing
-      DB_PASSWORD: testing
+      APP_ENV: testing
       CACHE_STORE: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
+      DB_CONNECTION: pgsql
+      DB_HOST: 10.100.7.50
+      DB_PORT: 5432
+      DB_DATABASE: cannabrands_test
+      DB_USERNAME: cannabrands
+      DB_PASSWORD: SpDyCannaBrands2024
+      REDIS_HOST: 10.100.9.50
+      REDIS_PORT: 6379
+      REDIS_PASSWORD: SpDyR3d1s2024!
     commands:
-      - echo "Validating migrations..."
       - cp .env.example .env
       - php artisan key:generate
-      - echo "Waiting for PostgreSQL to be ready..."
+      - php artisan test --testsuite=Feature
+      - echo "✅ Feature tests passed"
+
+  # ============================================
+  # BUILD & DEPLOY
+  # ============================================
+
+  # Create Docker config for registry auth (runs before Kaniko)
+  setup-registry-auth:
+    image: alpine
+    depends_on:
+      - composer-install
+      - build-frontend
+    environment:
+      REGISTRY_USER:
+        from_secret: registry_user
+      REGISTRY_PASSWORD:
+        from_secret: registry_password
+    commands:
+      - mkdir -p /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker
       - |
-        for i in 1 2 3 4 5 6 7 8 9 10; do
-          if pg_isready -h postgres -p 5432 -U testing 2>/dev/null; then
-            echo "✅ PostgreSQL is ready!"
-            break
-          fi
-          echo "Waiting for postgres... attempt $i/10"
-          sleep 3
-        done
-      - echo "Running pending migrations only..."
-      - php artisan migrate --force
-      - echo "✅ Migration validation complete!"
+        cat > /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker/config.json << EOF
+        {"auths":{"registry.spdy.io":{"username":"$REGISTRY_USER","password":"$REGISTRY_PASSWORD"}}}
+        EOF
+      - echo "Auth config created"
     when:
       branch: [develop, master]
       event: push
 
-  # Build and push Docker image for DEV environment (develop branch)
   build-image-dev:
-    image: woodpeckerci/plugin-docker-buildx
+    image: 10.100.9.70:5000/kaniko-project/executor:debug
     depends_on:
-      - composer-install
-      # TODO: Re-enable when Woodpecker services are working
-      # - validate-migrations
-    settings:
-      registry: git.spdy.io
-      repo: git.spdy.io/cannabrands/hub
-      username:
-        from_secret: gitea_username
-      password:
-        from_secret: gitea_token
-      tags:
-        - dev                           # Latest dev build → dev.cannabrands.app
-        - dev-${CI_COMMIT_SHA:0:7}      # Unique dev tag with SHA
-        - sha-${CI_COMMIT_SHA:0:7}      # Commit SHA (industry standard)
-        - ${CI_COMMIT_BRANCH}           # Branch name (develop)
-      build_args:
-        GIT_COMMIT_SHA: "${CI_COMMIT_SHA:0:7}"
-        APP_VERSION: "dev"
-        VITE_REVERB_APP_KEY: "6VDQTxU0fknXHCgKOI906Py03abktP8GatzNw3DvJkU="
-        VITE_REVERB_HOST: "dev.cannabrands.app"
-        VITE_REVERB_PORT: "443"
-        VITE_REVERB_SCHEME: "https"
-      cache_from:
-        - git.spdy.io/cannabrands/hub:buildcache-dev
-      cache_to: git.spdy.io/cannabrands/hub:buildcache-dev
-      platforms: linux/amd64
-      # Disable provenance attestations - can cause Gitea registry 500 errors
-      provenance: false
+      - setup-registry-auth
+    commands:
+      - cp -r /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker /kaniko/.docker
+      - |
+        /kaniko/executor \
+          --context=/woodpecker/src/git.spdy.io/Cannabrands/hub \
+          --dockerfile=/woodpecker/src/git.spdy.io/Cannabrands/hub/Dockerfile.fast \
+          --destination=registry.spdy.io/cannabrands/hub:dev \
+          --destination=registry.spdy.io/cannabrands/hub:dev-${CI_COMMIT_SHA:0:7} \
+          --build-arg=GIT_COMMIT_SHA=${CI_COMMIT_SHA:0:7} \
+          --build-arg=APP_VERSION=dev \
+          --registry-mirror=10.100.9.70:5000 \
+          --insecure-registry=10.100.9.70:5000 \
+          --cache=true \
+          --cache-ttl=168h \
+          --cache-repo=10.100.9.70:5000/cannabrands/hub-cache
     when:
       branch: develop
       event: push
 
-  # Auto-deploy to dev.cannabrands.app (develop branch only)
   deploy-dev:
-    image: bitnami/kubectl:latest
+    image: 10.100.9.70:5000/bitnami/kubectl:latest
     depends_on:
       - build-image-dev
     environment:
       KUBECONFIG_CONTENT:
         from_secret: kubeconfig_dev
     commands:
-      - echo "🚀 Auto-deploying to dev.cannabrands.app..."
-      - echo "Commit SHA${CI_COMMIT_SHA:0:7}"
-      - echo ""
-      # Setup kubeconfig
       - mkdir -p ~/.kube
       - echo "$KUBECONFIG_CONTENT" | tr -d '[:space:]' | base64 -d > ~/.kube/config
       - chmod 600 ~/.kube/config
-      # Update deployment to use new SHA-tagged image (both app and init containers)
       - |
         kubectl set image deployment/cannabrands-hub \
-          app=git.spdy.io/cannabrands/hub:dev-${CI_COMMIT_SHA:0:7} \
-          migrate=git.spdy.io/cannabrands/hub:dev-${CI_COMMIT_SHA:0:7} \
+          app=registry.spdy.io/cannabrands/hub:dev-${CI_COMMIT_SHA:0:7} \
+          migrate=registry.spdy.io/cannabrands/hub:dev-${CI_COMMIT_SHA:0:7} \
           -n cannabrands-dev
-      # Wait for rollout to complete (timeout 5 minutes)
       - kubectl rollout status deployment/cannabrands-hub -n cannabrands-dev --timeout=300s
-      # Verify deployment health
-      - |
-        echo ""
-        echo "✅ Deployment successful!"
-        echo "Pod status:"
-        kubectl get pods -n cannabrands-dev -l app=cannabrands-hub
-        echo ""
-        echo "Image deployed:"
-        kubectl get deployment cannabrands-hub -n cannabrands-dev -o jsonpath='{.spec.template.spec.containers[0].image}'
-        echo ""
+      - echo "✅ Deployed to dev.cannabrands.app"
     when:
       branch: develop
       event: push
 
-  # Build and push Docker image for PRODUCTION (master branch)
   build-image-production:
-    image: woodpeckerci/plugin-docker-buildx
+    image: 10.100.9.70:5000/kaniko-project/executor:debug
     depends_on:
-      - composer-install
-      # TODO: Re-enable when Woodpecker services are working
-      # - validate-migrations
-    settings:
-      registry: git.spdy.io
-      repo: git.spdy.io/cannabrands/hub
-      username:
-        from_secret: gitea_username
-      password:
-        from_secret: gitea_token
-      tags:
-        - latest                        # Latest production build
-        - prod-${CI_COMMIT_SHA:0:7}     # Unique prod tag with SHA
-        - sha-${CI_COMMIT_SHA:0:7}      # Commit SHA (industry standard)
-        - ${CI_COMMIT_BRANCH}           # Branch name (master)
-      build_args:
-        GIT_COMMIT_SHA: "${CI_COMMIT_SHA:0:7}"
-        APP_VERSION: "production"
-      cache_from:
-        - git.spdy.io/cannabrands/hub:buildcache-prod
-      cache_to: git.spdy.io/cannabrands/hub:buildcache-prod
-      platforms: linux/amd64
-      # Disable provenance attestations - can cause Gitea registry 500 errors
-      provenance: false
+      - setup-registry-auth
+    commands:
+      - cp -r /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker /kaniko/.docker
+      - |
+        /kaniko/executor \
+          --context=/woodpecker/src/git.spdy.io/Cannabrands/hub \
+          --dockerfile=/woodpecker/src/git.spdy.io/Cannabrands/hub/Dockerfile.fast \
+          --destination=git.spdy.io/cannabrands/hub:latest \
+          --destination=git.spdy.io/cannabrands/hub:prod-${CI_COMMIT_SHA:0:7} \
+          --build-arg=GIT_COMMIT_SHA=${CI_COMMIT_SHA:0:7} \
+          --build-arg=APP_VERSION=production \
+          --cache=true \
+          --cache-ttl=168h \
+          --cache-repo=10.100.9.70:5000/cannabrands/hub-cache \
+          --insecure \
+          --insecure-pull \
+          --skip-tls-verify
     when:
       branch: master
       event: push
 
-  # Deploy to production (master branch)
   deploy-production:
-    image: bitnami/kubectl:latest
+    image: 10.100.9.70:5000/bitnami/kubectl:latest
     depends_on:
       - build-image-production
     environment:
       KUBECONFIG_CONTENT:
         from_secret: kubeconfig_prod
     commands:
-      - echo "🚀 Deploying to PRODUCTION (cannabrands.app)..."
-      - echo "Commit SHA ${CI_COMMIT_SHA:0:7}"
       - mkdir -p ~/.kube
       - echo "$KUBECONFIG_CONTENT" | tr -d '[:space:]' | base64 -d > ~/.kube/config
       - chmod 600 ~/.kube/config
@@ -347,123 +252,50 @@ steps:
           migrate=git.spdy.io/cannabrands/hub:prod-${CI_COMMIT_SHA:0:7} \
           -n cannabrands-prod
       - kubectl rollout status deployment/cannabrands-hub -n cannabrands-prod --timeout=300s
-      - |
-        echo ""
-        echo "✅ PRODUCTION deployment successful!"
-        echo "Pod status:"
-        kubectl get pods -n cannabrands-prod -l app=cannabrands-hub
+      - echo "✅ Deployed to cannabrands.app"
     when:
       branch: master
       event: push
 
-  # Build and push Docker image for tagged releases (optional versioned releases)
-  build-image-release:
-    image: woodpeckerci/plugin-docker-buildx
+  # For tags, setup auth first
+  setup-registry-auth-release:
+    image: alpine
     depends_on:
       - composer-install
-    settings:
-      registry: git.spdy.io
-      repo: git.spdy.io/cannabrands/hub
-      username:
-        from_secret: gitea_username
-      password:
-        from_secret: gitea_token
-      tags:
-        - ${CI_COMMIT_TAG}              # CalVer tag (e.g., 2025.10.1)
-        - latest                         # Latest stable release
-      build_args:
-        GIT_COMMIT_SHA: "${CI_COMMIT_SHA:0:7}"
-        APP_VERSION: "${CI_COMMIT_TAG}"
-      cache_images:
-        - git.spdy.io/cannabrands/hub:buildcache-prod
-      platforms: linux/amd64
-      # Disable provenance attestations - can cause Gitea registry 500 errors
-      provenance: false
+      - build-frontend
+    environment:
+      REGISTRY_USER:
+        from_secret: registry_user
+      REGISTRY_PASSWORD:
+        from_secret: registry_password
+    commands:
+      - mkdir -p /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker
+      - |
+        cat > /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker/config.json << EOF
+        {"auths":{"git.spdy.io":{"username":"$REGISTRY_USER","password":"$REGISTRY_PASSWORD"}}}
+        EOF
     when:
       event: tag
 
-  # Success notification
-  success:
-    image: alpine:latest
-    when:
-      - evaluate: 'CI_PIPELINE_STATUS == "success"'
+  build-image-release:
+    image: 10.100.9.70:5000/kaniko-project/executor:debug
+    depends_on:
+      - setup-registry-auth-release
     commands:
-      - echo "✅ Pipeline completed successfully!"
-      - echo "All checks passed for commit ${CI_COMMIT_SHA:0:7}"
+      - cp -r /woodpecker/src/git.spdy.io/Cannabrands/hub/.docker /kaniko/.docker
       - |
-        if [ "${CI_PIPELINE_EVENT}" = "tag" ]; then
-          echo ""
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "🎉 PRODUCTION RELEASE BUILD COMPLETE"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "Version: ${CI_COMMIT_TAG}"
-          echo "Registry: git.spdy.io/cannabrands/hub"
-          echo ""
-          echo "Available as:"
-          echo "  - git.spdy.io/cannabrands/hub:${CI_COMMIT_TAG}"
-          echo "  - git.spdy.io/cannabrands/hub:latest"
-          echo ""
-          echo "🚀 Deploy to PRODUCTION (cannabrands.app):"
-          echo "  docker pull git.spdy.io/cannabrands/hub:${CI_COMMIT_TAG}"
-          echo "  docker-compose -f docker-compose.production.yml up -d"
-          echo ""
-          echo "⚠️  This is a CUSTOMER-FACING release!"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-        elif [ "${CI_PIPELINE_EVENT}" = "push" ] && [ "${CI_COMMIT_BRANCH}" = "master" ]; then
-          echo ""
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "🚀 PRODUCTION DEPLOYED"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "Site: https://cannabrands.app"
-          echo "Image: prod-${CI_COMMIT_SHA:0:7}"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-        elif [ "${CI_PIPELINE_EVENT}" = "push" ] && [ "${CI_COMMIT_BRANCH}" = "develop" ]; then
-          echo ""
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "🚀 DEV BUILD + AUTO-DEPLOY COMPLETE"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "Branch: develop"
-          echo "Commit: ${CI_COMMIT_SHA:0:7}"
-          echo ""
-          echo "✅ Built & Tagged:"
-          echo "  - git.spdy.io/cannabrands/hub:dev"
-          echo "  - git.spdy.io/cannabrands/hub:dev-${CI_COMMIT_SHA:0:7}"
-          echo "  - git.spdy.io/cannabrands/hub:sha-${CI_COMMIT_SHA:0:7}"
-          echo ""
-          echo "✅ Auto-Deployed to Kubernetes:"
-          echo "  - Environment: dev.cannabrands.app"
-          echo "  - Namespace: cannabrands-dev"
-          echo "  - Image: dev-${CI_COMMIT_SHA:0:7}"
-          echo ""
-          echo "🧪 Test your changes:"
-          echo "  - Visit: https://dev.cannabrands.app"
-          echo "  - Login: admin@example.com / password"
-          echo "  - Check: https://dev.cannabrands.app/telescope"
-          echo ""
-          echo "Ready for production? Open PR: develop → master"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-        elif [ "${CI_PIPELINE_EVENT}" = "pull_request" ]; then
-          echo ""
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "✅ PR CHECKS PASSED"
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-          echo "Ready to merge to master for production deployment."
-          echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-        fi
-
-# Services for tests (optimized for CI speed)
-services:
-  postgres:
-    image: postgres:15
-    environment:
-      POSTGRES_USER: testing
-      POSTGRES_PASSWORD: testing
-      POSTGRES_DB: testing
-      # CI-optimized settings via environment (faster writes, safe for ephemeral test DB)
-      POSTGRES_INITDB_ARGS: "--data-checksums"
-      POSTGRES_HOST_AUTH_METHOD: trust
-
-  redis:
-    image: redis:7-alpine
-    commands:
-      - redis-server --bind 0.0.0.0
+        /kaniko/executor \
+          --context=/woodpecker/src/git.spdy.io/Cannabrands/hub \
+          --dockerfile=/woodpecker/src/git.spdy.io/Cannabrands/hub/Dockerfile.fast \
+          --destination=git.spdy.io/cannabrands/hub:${CI_COMMIT_TAG} \
+          --destination=git.spdy.io/cannabrands/hub:latest \
+          --build-arg=GIT_COMMIT_SHA=${CI_COMMIT_SHA:0:7} \
+          --build-arg=APP_VERSION=${CI_COMMIT_TAG} \
+          --cache=true \
+          --cache-ttl=168h \
+          --cache-repo=10.100.9.70:5000/cannabrands/hub-cache \
+          --insecure \
+          --insecure-pull \
+          --skip-tls-verify
+    when:
+      event: tag

.woodpecker/AUTO_DEPLOY_SETUP.md

@@ -69,14 +69,14 @@ git push origin develop
 
 **Before (Mutable Tags - Problematic):**
 ```
-code.cannabrands.app/cannabrands/hub:dev        # Overwritten each build
+git.spdy.io/cannabrands/hub:dev        # Overwritten each build
 ```
 
 **After (Immutable Tags - Best Practice):**
 ```
-code.cannabrands.app/cannabrands/hub:dev-a28d5b5      # Unique SHA tag
-code.cannabrands.app/cannabrands/hub:dev              # Latest dev (convenience)
-code.cannabrands.app/cannabrands/hub:sha-a28d5b5      # Generic SHA
+git.spdy.io/cannabrands/hub:dev-a28d5b5      # Unique SHA tag
+git.spdy.io/cannabrands/hub:dev              # Latest dev (convenience)
+git.spdy.io/cannabrands/hub:sha-a28d5b5      # Generic SHA
 ```
 
 ### Auto-Deploy Flow
@@ -109,14 +109,14 @@ If a deployment breaks dev, roll back to the previous version:
 kubectl get deployment cannabrands-hub -n cannabrands-dev \
   -o jsonpath='{.spec.template.spec.containers[0].image}'
 
-# Output: code.cannabrands.app/cannabrands/hub:dev-a28d5b5
+# Output: git.spdy.io/cannabrands/hub:dev-a28d5b5
 
 # 2. Check git log for previous commit
 git log --oneline develop | head -5
 
 # 3. Rollback to previous SHA
 kubectl set image deployment/cannabrands-hub \
-  app=code.cannabrands.app/cannabrands/hub:dev-PREVIOUS_SHA \
+  app=git.spdy.io/cannabrands/hub:dev-PREVIOUS_SHA \
   -n cannabrands-dev
 
 # 4. Verify rollback
@@ -156,7 +156,7 @@ deploy-staging:
     - chmod 600 ~/.kube/config
     - |
       kubectl set image deployment/cannabrands-hub \
-        app=code.cannabrands.app/cannabrands/hub:staging-${CI_COMMIT_SHA:0:7} \
+        app=git.spdy.io/cannabrands/hub:staging-${CI_COMMIT_SHA:0:7} \
         -n cannabrands-staging
     - kubectl rollout status deployment/cannabrands-hub -n cannabrands-staging --timeout=300s
   when:
@@ -207,7 +207,7 @@ kubectl logs -n cannabrands-dev deployment/cannabrands-hub --tail=100
    cannabrands-hub-7d85986845-gnkbv   1/1     Running   0          45s
 
    Image deployed:
-   code.cannabrands.app/cannabrands/hub:dev-a28d5b5
+   git.spdy.io/cannabrands/hub:dev-a28d5b5
    ```
 
 ---

.woodpecker/CI_CD_STRATEGIES.md

@@ -47,8 +47,8 @@ steps:
   build-image:
     image: plugins/docker
     settings:
-      registry: code.cannabrands.app
-      repo: code.cannabrands.app/cannabrands/hub
+      registry: git.spdy.io
+      repo: git.spdy.io/cannabrands/hub
       tags: [latest, ${CI_COMMIT_SHA:0:8}]
     when:
       branch: master
@@ -68,7 +68,7 @@ steps:
 ```bash
 # On production server
 ssh cannabrands-prod
-docker pull code.cannabrands.app/cannabrands/hub:bef77df8
+docker pull git.spdy.io/cannabrands/hub:bef77df8
 docker-compose up -d
 # Or use deployment tool like Ansible, Deployer, etc.
 ```
@@ -108,7 +108,7 @@ steps:
         from_secret: ssh_private_key
       script:
         - cd /var/www/cannabrands
-        - docker pull code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}
+        - docker pull git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}
         - docker-compose up -d
         - docker exec cannabrands php artisan migrate --force
         - docker exec cannabrands php artisan config:cache
@@ -160,7 +160,7 @@ steps:
         from_secret: ssh_private_key
       script:
         - cd /var/www/cannabrands
-        - docker pull code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}
+        - docker pull git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}
         - docker-compose up -d
     when:
       branch: develop
@@ -176,7 +176,7 @@ steps:
         from_secret: ssh_private_key
       script:
         - cd /var/www/cannabrands
-        - docker pull code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}
+        - docker pull git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}
         - docker-compose up -d
     when:
       branch: master
@@ -367,7 +367,7 @@ Production:
 ```bash
 # Quick rollback (under 2 minutes)
 ssh cannabrands-prod
-docker pull code.cannabrands.app/cannabrands/hub:PREVIOUS_COMMIT_SHA
+docker pull git.spdy.io/cannabrands/hub:PREVIOUS_COMMIT_SHA
 docker-compose up -d
 
 # Database rollback (if migrations ran)
@@ -536,8 +536,8 @@ steps:
   build-image:
     image: plugins/docker
     settings:
-      registry: code.cannabrands.app
-      repo: code.cannabrands.app/cannabrands/hub
+      registry: git.spdy.io
+      repo: git.spdy.io/cannabrands/hub
       tags:
         - ${CI_COMMIT_BRANCH}
         - ${CI_COMMIT_SHA:0:8}
@@ -559,7 +559,7 @@ steps:
         from_secret: staging_ssh_key
       script:
         - cd /var/www/cannabrands
-        - docker pull code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}
+        - docker pull git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}
         - docker-compose up -d
         - docker exec cannabrands php artisan migrate --force
         - docker exec cannabrands php artisan config:cache
@@ -582,7 +582,7 @@ steps:
       - echo "To deploy to production:"
       - echo "  ssh cannabrands-prod"
       - echo "  cd /var/www/cannabrands"
-      - echo "  docker pull code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}"
+      - echo "  docker pull git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}"
       - echo "  docker-compose up -d"
       - echo ""
       - echo "⚠️  Remember: Check deployment checklist first!"

.woodpecker/DOCKER_IMAGES_EXPLAINED.md

@@ -102,7 +102,7 @@ Push to master → Woodpecker runs:
   → Build Docker image
   → Tag: cannabrands-hub:c165bf9 (commit SHA)
   → Tag: cannabrands-hub:latest
-  → Push to code.cannabrands.app/cannabrands/hub
+  → Push to git.spdy.io/cannabrands/hub
 → Image ready, no deployment yet
 ```
 
@@ -177,7 +177,7 @@ CMD ["php-fpm"]
 ### Staging Deployment:
 ```bash
 # Pull the same image
-docker pull code.cannabrands.app/cannabrands/hub:c165bf9
+docker pull git.spdy.io/cannabrands/hub:c165bf9
 
 # Run with staging environment
 docker run \
@@ -186,13 +186,13 @@ docker run \
   -e DB_DATABASE=cannabrands_staging \
   -e APP_DEBUG=true \
   -e MAIL_MAILER=log \
-  code.cannabrands.app/cannabrands/hub:c165bf9
+  git.spdy.io/cannabrands/hub:c165bf9
 ```
 
 ### Production Deployment:
 ```bash
 # Pull THE EXACT SAME IMAGE
-docker pull code.cannabrands.app/cannabrands/hub:c165bf9
+docker pull git.spdy.io/cannabrands/hub:c165bf9
 
 # Run with production environment
 docker run \
@@ -201,7 +201,7 @@ docker run \
   -e DB_DATABASE=cannabrands_production \
   -e APP_DEBUG=false \
   -e MAIL_MAILER=smtp \
-  code.cannabrands.app/cannabrands/hub:c165bf9
+  git.spdy.io/cannabrands/hub:c165bf9
 ```
 
 **Key point**: Notice it's the **exact same image** (`c165bf9`), only environment variables differ.
@@ -218,7 +218,7 @@ docker run \
 version: '3.8'
 services:
   app:
-    image: code.cannabrands.app/cannabrands/hub:latest
+    image: git.spdy.io/cannabrands/hub:latest
     env_file:
       - .env.staging  # Staging-specific vars
     ports:
@@ -253,7 +253,7 @@ secrets:
 version: '3.8'
 services:
   app:
-    image: code.cannabrands.app/cannabrands/hub:c165bf9  # Specific SHA
+    image: git.spdy.io/cannabrands/hub:c165bf9  # Specific SHA
     env_file:
       - .env.production  # Production-specific vars
     ports:
@@ -301,7 +301,7 @@ spec:
     spec:
       containers:
       - name: app
-        image: code.cannabrands.app/cannabrands/hub:c165bf9
+        image: git.spdy.io/cannabrands/hub:c165bf9
         envFrom:
         - configMapRef:
             name: app-config-staging  # Different per namespace
@@ -350,8 +350,8 @@ steps:
   build-and-publish:
     image: plugins/docker
     settings:
-      registry: code.cannabrands.app
-      repo: code.cannabrands.app/cannabrands/hub
+      registry: git.spdy.io
+      repo: git.spdy.io/cannabrands/hub
       tags:
         - latest                    # Always overwrite
         - ${CI_COMMIT_SHA:0:8}     # Immutable SHA
@@ -384,7 +384,7 @@ Date: 2025-01-15 14:30:00 PST
 Image: cannabrands-hub:c165bf9
 Deployed by: jon@cannabrands.com
 Approved by: compliance@cannabrands.com
-Git commit: https://code.cannabrands.app/.../c165bf9
+Git commit: https://git.spdy.io/.../c165bf9
 Changes: Invoice picking workflow update
 Tests passed: ✅ 28/28
 Staging tested: ✅ 2 hours
@@ -424,7 +424,7 @@ Rollback image: cannabrands-hub:a1b2c3d
 ```bash
 # On production server
 ssh cannabrands-prod
-docker pull code.cannabrands.app/cannabrands/hub:c165bf9
+docker pull git.spdy.io/cannabrands/hub:c165bf9
 docker-compose -f docker-compose.production.yml up -d
 ```
 
@@ -487,14 +487,14 @@ steps:
   security-scan:
     image: aquasec/trivy
     commands:
-      - trivy image code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}
+      - trivy image git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}
 ```
 
 ### 4. Sign Images (Advanced)
 
 Use Cosign to cryptographically sign images:
 ```bash
-cosign sign code.cannabrands.app/cannabrands/hub:c165bf9
+cosign sign git.spdy.io/cannabrands/hub:c165bf9
 ```
 
 Compliance benefit: Prove image hasn't been tampered with.
@@ -507,10 +507,10 @@ Compliance benefit: Prove image hasn't been tampered with.
 
 ```bash
 # List recent deployments
-docker images code.cannabrands.app/cannabrands/hub
+docker images git.spdy.io/cannabrands/hub
 
 # Rollback to previous version
-docker pull code.cannabrands.app/cannabrands/hub:a1b2c3d
+docker pull git.spdy.io/cannabrands/hub:a1b2c3d
 docker-compose -f docker-compose.production.yml up -d
 ```
 
@@ -531,7 +531,7 @@ deploy:
 # Before risky deployment
 git tag -a v1.5.2-stable -m "Last known good version"
 docker tag cannabrands-hub:current cannabrands-hub:v1.5.2-stable
-docker push code.cannabrands.app/cannabrands/hub:v1.5.2-stable
+docker push git.spdy.io/cannabrands/hub:v1.5.2-stable
 ```
 
 ---

.woodpecker/ENABLING_CACHE.md

@@ -254,25 +254,25 @@ WORKDIR /woodpecker/src
 
 **Build and push to Gitea:**
 ```bash
-docker build -f docker/ci-php.Dockerfile -t code.cannabrands.app/cannabrands/ci-php:8.3 .
-docker push code.cannabrands.app/cannabrands/ci-php:8.3
+docker build -f docker/ci-php.Dockerfile -t git.spdy.io/cannabrands/ci-php:8.3 .
+docker push git.spdy.io/cannabrands/ci-php:8.3
 ```
 
 **Update `.woodpecker/.ci.yml`:**
 ```yaml
 steps:
   php-lint:
-    image: code.cannabrands.app/cannabrands/ci-php:8.3
+    image: git.spdy.io/cannabrands/ci-php:8.3
     commands:
       - find app routes database -name "*.php" -exec php -l {} \;
 
   composer-install:
-    image: code.cannabrands.app/cannabrands/ci-php:8.3
+    image: git.spdy.io/cannabrands/ci-php:8.3
     commands:
       - composer install --no-interaction --prefer-dist --optimize-autoloader
 
   code-style:
-    image: code.cannabrands.app/cannabrands/ci-php:8.3
+    image: git.spdy.io/cannabrands/ci-php:8.3
     commands:
       - ./vendor/bin/pint --test
 ```

.woodpecker/PRE_RELEASE_DEPLOYMENT.md

@@ -107,7 +107,7 @@ version: '3.8'
 
 services:
   app:
-    image: code.cannabrands.app/cannabrands/hub:latest
+    image: git.spdy.io/cannabrands/hub:latest
     container_name: cannabrands_app
     restart: unless-stopped
     ports:
@@ -204,8 +204,8 @@ steps:
   build-image:
     image: woodpeckerci/plugin-docker-buildx
     settings:
-      registry: code.cannabrands.app
-      repo: code.cannabrands.app/cannabrands/hub
+      registry: git.spdy.io
+      repo: git.spdy.io/cannabrands/hub
       username:
         from_secret: gitea_username
       password:
@@ -564,7 +564,7 @@ docker images | grep cannabrands
 
 ```bash
 # Pull previous commit's image
-docker pull code.cannabrands.app/cannabrands/hub:PREVIOUS_SHA
+docker pull git.spdy.io/cannabrands/hub:PREVIOUS_SHA
 
 # Update docker-compose.yml to use specific tag
 docker compose up -d app

.woodpecker/PUBLISHING_TO_GITEA.md

@@ -11,10 +11,10 @@ Once you implement production deployments, Woodpecker will:
 
 Your images will be available at:
 ```
-code.cannabrands.app/cannabrands/hub
+git.spdy.io/cannabrands/hub
 ```
 
-**View packages**: https://code.cannabrands.app/Cannabrands/hub/-/packages
+**View packages**: https://git.spdy.io/Cannabrands/hub/-/packages
 
 ## Step 1: Enable Gitea Package Registry
 
@@ -22,7 +22,7 @@ First, verify the registry is enabled on your Gitea instance:
 
 1. **Check as admin**: Admin → Site Administration → Configuration
 2. **Look for**: `[packages]` section with `ENABLED = true`
-3. **Test**: Visit https://code.cannabrands.app/-/packages
+3. **Test**: Visit https://git.spdy.io/-/packages
 
 If not enabled, ask your Gitea admin to enable it in `app.ini`:
 ```ini
@@ -61,8 +61,8 @@ steps:
   build-and-publish:
     image: plugins/docker
     settings:
-      registry: code.cannabrands.app
-      repo: code.cannabrands.app/cannabrands/hub
+      registry: git.spdy.io
+      repo: git.spdy.io/cannabrands/hub
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:8}
@@ -136,15 +136,15 @@ Once images are published, you can pull them on your production servers:
 
 ```bash
 # Login to Gitea registry
-docker login code.cannabrands.app
+docker login git.spdy.io
 # Username: your-gitea-username
 # Password: your-personal-access-token
 
 # Pull latest image
-docker pull code.cannabrands.app/cannabrands/hub:latest
+docker pull git.spdy.io/cannabrands/hub:latest
 
 # Or pull specific commit
-docker pull code.cannabrands.app/cannabrands/hub:bef77df8
+docker pull git.spdy.io/cannabrands/hub:bef77df8
 ```
 
 ## Image Tagging Strategy
@@ -218,8 +218,8 @@ steps:
   build-and-publish:
     image: plugins/docker
     settings:
-      registry: code.cannabrands.app
-      repo: code.cannabrands.app/cannabrands/hub
+      registry: git.spdy.io
+      repo: git.spdy.io/cannabrands/hub
       tags:
         - latest
         - ${CI_COMMIT_SHA:0:8}
@@ -236,7 +236,7 @@ steps:
   notify-deploy:
     image: alpine:latest
     commands:
-      - echo "✅ New image published: code.cannabrands.app/cannabrands/hub:${CI_COMMIT_SHA:0:8}"
+      - echo "✅ New image published: git.spdy.io/cannabrands/hub:${CI_COMMIT_SHA:0:8}"
       - echo "Ready for deployment to production!"
     when:
       - branch: master
@@ -271,8 +271,8 @@ services:
 - Subsequent builds will work fine
 
 **Images not appearing in Gitea packages**
-- Check Gitea packages are enabled: https://code.cannabrands.app/-/packages
-- Verify registry URL is `code.cannabrands.app` (not `ci.cannabrands.app`)
+- Check Gitea packages are enabled: https://git.spdy.io/-/packages
+- Verify registry URL is `git.spdy.io` (not `ci.cannabrands.app`)
 
 ## Next Steps
 

.woodpecker/README.md

@@ -85,7 +85,7 @@ git push origin 2025.11.3
 
 ### Step 3: Wait for CI Build (2-4 minutes)
 
-Watch at: `code.cannabrands.app/cannabrands/hub/pipelines`
+Watch at: `git.spdy.io/cannabrands/hub/pipelines`
 
 CI will automatically:
 - Run tests
@@ -113,7 +113,7 @@ git push origin master
 ```bash
 # Deploy specific version
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:2025.11.3
+  app=git.spdy.io/cannabrands/hub:2025.11.3
 
 # Watch deployment
 kubectl rollout status deployment/cannabrands
@@ -131,7 +131,7 @@ kubectl get pods
 ```bash
 # Option 1: Rollback to previous version
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:2025.11.2
+  app=git.spdy.io/cannabrands/hub:2025.11.2
 
 # Option 2: Kubernetes automatic rollback
 kubectl rollout undo deployment/cannabrands
@@ -154,7 +154,7 @@ git push origin 2025.11.4
 
 # 4. Deploy when confident
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:2025.11.4
+  app=git.spdy.io/cannabrands/hub:2025.11.4
 ```
 
 ---
@@ -170,7 +170,7 @@ master              → Branch tracking
 
 **Use in K3s dev/staging:**
 ```yaml
-image: code.cannabrands.app/cannabrands/hub:latest-dev
+image: git.spdy.io/cannabrands/hub:latest-dev
 imagePullPolicy: Always
 ```
 
@@ -182,7 +182,7 @@ stable              → Latest production release
 
 **Use in K3s production:**
 ```yaml
-image: code.cannabrands.app/cannabrands/hub:2025.11.3
+image: git.spdy.io/cannabrands/hub:2025.11.3
 imagePullPolicy: IfNotPresent
 ```
 
@@ -214,7 +214,7 @@ docker build -t cannabrands:test .
 ### View CI Status
 ```bash
 # Visit Woodpecker
-open https://code.cannabrands.app/cannabrands/hub/pipelines
+open https://git.spdy.io/cannabrands/hub/pipelines
 
 # Or check latest build
 # (Visit Gitea → Repository → Pipelines)
@@ -227,7 +227,7 @@ open https://code.cannabrands.app/cannabrands/hub/pipelines
 ### CI Build Failing
 ```bash
 # Check Woodpecker logs
-# Visit: code.cannabrands.app/cannabrands/hub/pipelines
+# Visit: git.spdy.io/cannabrands/hub/pipelines
 
 # Run tests locally first
 ./vendor/bin/sail artisan test
@@ -362,8 +362,8 @@ Before deploying:
 - Pair with senior dev for first release
 
 ### CI/CD
-- Woodpecker: `code.cannabrands.app/cannabrands/hub`
-- Gitea: `code.cannabrands.app/cannabrands/hub`
+- Woodpecker: `git.spdy.io/cannabrands/hub`
+- Gitea: `git.spdy.io/cannabrands/hub`
 - K3s Dashboard: (ask devops for link)
 
 ---
@@ -371,13 +371,13 @@ Before deploying:
 ## Important URLs
 
 **Code Repository:**
-https://code.cannabrands.app/cannabrands/hub
+https://git.spdy.io/cannabrands/hub
 
 **CI/CD Pipeline:**
-https://code.cannabrands.app/cannabrands/hub/pipelines
+https://git.spdy.io/cannabrands/hub/pipelines
 
 **Container Registry:**
-https://code.cannabrands.app/-/packages/container/cannabrands%2Fhub
+https://git.spdy.io/-/packages/container/cannabrands%2Fhub
 
 **Documentation:**
 `.woodpecker/` directory in repository
@@ -430,7 +430,7 @@ Closes #42"
 | Deploy | `kubectl set image deployment/cannabrands app=...:2025.11.1` |
 | Rollback | `kubectl set image deployment/cannabrands app=...:2025.11.0` |
 | Check version | `kubectl get deployment cannabrands -o jsonpath='{.spec.template.spec.containers[0].image}'` |
-| View builds | Visit `code.cannabrands.app/cannabrands/hub/pipelines` |
+| View builds | Visit `git.spdy.io/cannabrands/hub/pipelines` |
 
 ---
 

.woodpecker/RELEASE_PROCESS.md

@@ -33,7 +33,7 @@ git push origin master
 2. Tests run (PHP lint, Pint, PHPUnit)
 3. Docker image builds (if tests pass)
 4. Tagged as: latest-dev, dev-c658193, master
-5. Pushed to code.cannabrands.app/cannabrands/hub
+5. Pushed to git.spdy.io/cannabrands/hub
 6. Available in K3s dev namespace (manual or auto-pull)
 ```
 
@@ -47,7 +47,7 @@ git push origin master
 **Use in K3s:**
 ```yaml
 # dev/staging namespace
-image: code.cannabrands.app/cannabrands/hub:latest-dev
+image: git.spdy.io/cannabrands/hub:latest-dev
 imagePullPolicy: Always  # Always pull newest
 ```
 
@@ -81,7 +81,7 @@ git push origin 2025.11.1
 **Use in K3s:**
 ```yaml
 # production namespace
-image: code.cannabrands.app/cannabrands/hub:2025.11.1
+image: git.spdy.io/cannabrands/hub:2025.11.1
 imagePullPolicy: IfNotPresent  # Pin to specific version
 ```
 
@@ -212,7 +212,7 @@ git push origin master
 ./vendor/bin/sail artisan test
 
 # Check CI is green
-# Visit: code.cannabrands.app/cannabrands/hub/pipelines
+# Visit: git.spdy.io/cannabrands/hub/pipelines
 
 # Test in staging/dev environment
 # Verify key workflows work
@@ -264,12 +264,12 @@ git push origin 2025.11.3
 
 ```bash
 # Watch Woodpecker build
-# Visit: code.cannabrands.app/cannabrands/hub/pipelines
+# Visit: git.spdy.io/cannabrands/hub/pipelines
 
 # Wait for success (2-4 minutes)
 # CI will build and push:
-#   - code.cannabrands.app/cannabrands/hub:2025.11.3
-#   - code.cannabrands.app/cannabrands/hub:stable
+#   - git.spdy.io/cannabrands/hub:2025.11.3
+#   - git.spdy.io/cannabrands/hub:stable
 ```
 
 #### 5. Deploy to Production (When Ready)
@@ -277,7 +277,7 @@ git push origin 2025.11.3
 ```bash
 # Deploy new version
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:2025.11.3
+  app=git.spdy.io/cannabrands/hub:2025.11.3
 
 # Watch rollout
 kubectl rollout status deployment/cannabrands
@@ -328,11 +328,11 @@ git push origin master
 ```bash
 # Option 1: Rollback to specific version
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:2025.11.2
+  app=git.spdy.io/cannabrands/hub:2025.11.2
 
 # Option 2: Use previous stable
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:stable
+  app=git.spdy.io/cannabrands/hub:stable
 
 # Note: 'stable' is updated on every release
 # So if you just deployed 2025.11.3, 'stable' points to 2025.11.3
@@ -367,7 +367,7 @@ git push origin 2025.11.4
 
 # Deploy
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:2025.11.4
+  app=git.spdy.io/cannabrands/hub:2025.11.4
 ```
 
 ---

.woodpecker/VERSIONING.md

@@ -4,9 +4,9 @@
 
 **Current tagging strategy:**
 ```
-code.cannabrands.app/cannabrands/hub:latest     # Always changes
-code.cannabrands.app/cannabrands/hub:c658193    # Commit SHA (meaningless)
-code.cannabrands.app/cannabrands/hub:master     # Branch name (changes)
+git.spdy.io/cannabrands/hub:latest     # Always changes
+git.spdy.io/cannabrands/hub:c658193    # Commit SHA (meaningless)
+git.spdy.io/cannabrands/hub:master     # Branch name (changes)
 ```
 
 **Issues:**
@@ -143,8 +143,8 @@ The CI pipeline now builds images with version metadata for both development and
 build-image-dev:
   image: woodpeckerci/plugin-docker-buildx
   settings:
-    registry: code.cannabrands.app
-    repo: code.cannabrands.app/cannabrands/hub
+    registry: git.spdy.io
+    repo: git.spdy.io/cannabrands/hub
     tags:
       - dev                           # Latest dev build
       - sha-${CI_COMMIT_SHA:0:7}      # Commit SHA
@@ -170,13 +170,13 @@ build-image-release:
 **Result:**
 ```
 # Development push to master
-code.cannabrands.app/cannabrands/hub:dev
-code.cannabrands.app/cannabrands/hub:sha-c658193
-code.cannabrands.app/cannabrands/hub:master
+git.spdy.io/cannabrands/hub:dev
+git.spdy.io/cannabrands/hub:sha-c658193
+git.spdy.io/cannabrands/hub:master
 
 # Release (git tag 2025.10.1)
-code.cannabrands.app/cannabrands/hub:2025.10.1    # Specific version
-code.cannabrands.app/cannabrands/hub:latest       # Latest stable
+git.spdy.io/cannabrands/hub:2025.10.1    # Specific version
+git.spdy.io/cannabrands/hub:latest       # Latest stable
 ```
 
 ---
@@ -243,11 +243,11 @@ git checkout c658193
 ```bash
 # Option 1: Rollback to specific version (recommended)
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:v1.2.2
+  app=git.spdy.io/cannabrands/hub:v1.2.2
 
 # Option 2: Rollback to last stable
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:stable
+  app=git.spdy.io/cannabrands/hub:stable
 
 # Option 3: Kubernetes rollback (uses previous deployment)
 kubectl rollout undo deployment/cannabrands
@@ -281,7 +281,7 @@ cat CHANGELOG.md
 
 # 5. Deploy specific version
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:v1.2.1
+  app=git.spdy.io/cannabrands/hub:v1.2.1
 ```
 
 ---
@@ -357,7 +357,7 @@ audit-deployment:
 ```
 Developer → Commit to master → CI tests → Build dev image
    ↓
-code.cannabrands.app/cannabrands/hub:dev-COMMIT
+git.spdy.io/cannabrands/hub:dev-COMMIT
    ↓
 Deploy to dev/staging (optional)
 ```
@@ -486,7 +486,7 @@ spec:
     spec:
       containers:
       - name: app
-        image: code.cannabrands.app/cannabrands/hub:v1.2.3
+        image: git.spdy.io/cannabrands/hub:v1.2.3
         imagePullPolicy: IfNotPresent  # Don't pull if tag exists
         ports:
         - containerPort: 80
@@ -535,7 +535,7 @@ git push origin master
 
 # 5. Deploy to production (manual)
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:v1.3.0
+  app=git.spdy.io/cannabrands/hub:v1.3.0
 ```
 
 ### Emergency Rollback
@@ -546,7 +546,7 @@ kubectl rollout undo deployment/cannabrands
 
 # Or specific version
 kubectl set image deployment/cannabrands \
-  app=code.cannabrands.app/cannabrands/hub:v1.2.3
+  app=git.spdy.io/cannabrands/hub:v1.2.3
 
 # Verify
 kubectl rollout status deployment/cannabrands

CLAUDE.md

@@ -65,15 +65,74 @@ ALL routes need auth + user type middleware except public pages
 **Creating PRs via Gitea API:**
 ```bash
 # Requires GITEA_TOKEN environment variable
-curl -X POST "https://code.cannabrands.app/api/v1/repos/Cannabrands/hub/pulls" \
+curl -X POST "https://git.spdy.io/api/v1/repos/Cannabrands/hub/pulls" \
   -H "Authorization: token $GITEA_TOKEN" \
   -H "Content-Type: application/json" \
   -d '{"title": "PR title", "body": "Description", "head": "feature-branch", "base": "develop"}'
 ```
 
-**Gitea Services:**
-- **Gitea:** `https://code.cannabrands.app`
-- **Woodpecker CI:** `https://ci.cannabrands.app`
+**Infrastructure Services:**
+
+| Service | Host | Notes |
+|---------|------|-------|
+| **Gitea** | `https://git.spdy.io` | Git repository |
+| **Woodpecker CI** | `https://ci.spdy.io` | CI/CD pipelines |
+| **Docker Registry** | `registry.spdy.io` | HTTPS registry with Let's Encrypt |
+
+**PostgreSQL (Dev) - EXTERNAL DATABASE**
+⚠️ **DO NOT create PostgreSQL databases on spdy.io infrastructure for cannabrands.**
+Cannabrands uses an external managed PostgreSQL database.
+```
+Host:     10.100.6.50 (read replica)
+Port:     5432
+Database: cannabrands_dev
+Username: cannabrands
+Password: SpDyCannaBrands2024
+URL:      postgresql://cannabrands:SpDyCannaBrands2024@10.100.6.50:5432/cannabrands_dev
+```
+
+**PostgreSQL (CI)** - Ephemeral container for isolated tests
+```
+Host:     postgres (service name)
+Port:     5432
+Database: testing
+Username: testing
+Password: testing
+```
+
+**Redis**
+```
+Host:     10.100.9.50
+Port:     6379
+Password: SpDyR3d1s2024!
+URL:      redis://:SpDyR3d1s2024!@10.100.9.50:6379
+```
+
+**MinIO (S3-Compatible Storage)**
+```
+Endpoint:   10.100.9.80:9000
+Console:    10.100.9.80:9001
+Region:     us-east-1
+Path Style: true
+Bucket:     cannabrands
+Access Key: cannabrands-app
+Secret Key: cdbdcd0c7b6f3994d4ab09f68eaff98665df234f
+```
+
+**Gitea Container Registry** (for CI image pushes)
+```
+Registry:   git.spdy.io
+User:       kelly@spdy.io
+Token:      c89fa0eeb417343b171f11de6b8e4292b2f50e2b
+Scope:      write:package
+```
+Woodpecker secrets: `registry_user`, `registry_password`
+
+**CI/CD Notes:**
+- Uses **Kaniko** for Docker builds (no Docker daemon, avoids DNS issues)
+- Images pushed to `registry.spdy.io/cannabrands/hub`
+- Base images pulled from `registry.spdy.io` (HTTPS with Let's Encrypt)
+- Deploy: `develop` → dev.cannabrands.app, `master` → cannabrands.app
 
 ### 8. User-Business Relationship (Pivot Table)
 Users connect to businesses via `business_user` pivot table (many-to-many).

CONTRIBUTING.md

@@ -44,7 +44,7 @@ Our workflow provides audit trails regulators love:
 
 1. **Clone the repository**
    ```bash
-   git clone https://code.cannabrands.app/Cannabrands/hub.git
+   git clone https://git.spdy.io/Cannabrands/hub.git
    cd hub
    ```
 
@@ -86,7 +86,7 @@ git commit -m "feat: add new feature"
 git push origin feature/my-feature-name
 
 # 4. Create Pull Request on Gitea
-#    - Navigate to https://code.cannabrands.app
+#    - Navigate to https://git.spdy.io
 #    - Create PR to merge your branch into develop
 #    - CI will run automatically
 #    - Request review from team
@@ -630,7 +630,7 @@ git push origin chore/changelog-2025.11.1
 
 ### Services
 - **Woodpecker CI:** `https://ci.cannabrands.app`
-- **Gitea:** `https://code.cannabrands.app`
+- **Gitea:** `https://git.spdy.io`
 - **Production:** `https://app.cannabrands.com` (future)
 
 ---

Dockerfile

@@ -3,7 +3,7 @@
 # ============================================
 
 # ==================== Stage 1: Node Builder ====================
-FROM node:22-alpine AS node-builder
+FROM 10.100.9.70:5000/library/node:22-alpine AS node-builder
 
 WORKDIR /app
 
@@ -35,10 +35,10 @@ RUN npm run build
 
 # ==================== Stage 2: Composer Builder ====================
 # Pin to PHP 8.4 - composer:2 uses latest PHP which may not be supported by dependencies yet
-FROM php:8.4-cli-alpine AS composer-builder
+FROM 10.100.9.70:5000/library/php:8.4-cli-alpine AS composer-builder
 
 # Install Composer
-COPY --from=composer:2.8 /usr/bin/composer /usr/bin/composer
+COPY --from=10.100.9.70:5000/library/composer:2.8 /usr/bin/composer /usr/bin/composer
 
 WORKDIR /app
 
@@ -60,7 +60,7 @@ RUN composer install \
     --optimize-autoloader
 
 # ==================== Stage 3: Production Runtime ====================
-FROM php:8.3-fpm-alpine
+FROM 10.100.9.70:5000/library/php:8.3-fpm-alpine
 
 LABEL maintainer="CannaBrands Team"
 

Dockerfile.fast

@@ -0,0 +1,93 @@
+# ============================================
+# Fast Production Dockerfile
+# Single-stage build using CI pre-built assets
+# Saves time by skipping multi-stage node/composer builders
+# ============================================
+#
+# This Dockerfile expects:
+#   - vendor/ already populated (from CI composer-install step)
+#   - public/build/ already populated (from CI build-frontend step)
+#
+# Build time: ~5-7 min (vs 15-20 min with multi-stage Dockerfile)
+# ============================================
+
+FROM 10.100.9.70:5000/library/php:8.3-fpm-alpine
+
+LABEL maintainer="CannaBrands Team"
+
+# Install system dependencies
+RUN apk add --no-cache \
+    nginx \
+    supervisor \
+    postgresql-dev \
+    libpng-dev \
+    libjpeg-turbo-dev \
+    freetype-dev \
+    libzip-dev \
+    icu-dev \
+    icu-data-full \
+    zip \
+    unzip \
+    git \
+    curl \
+    bash
+
+# Install build dependencies for PHP extensions
+RUN apk add --no-cache --virtual .build-deps \
+    autoconf \
+    g++ \
+    make
+
+# Install PHP extensions
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) \
+        pdo_pgsql \
+        pgsql \
+        gd \
+        zip \
+        intl \
+        pcntl \
+        bcmath \
+        opcache
+
+# Install Redis extension
+RUN pecl install redis \
+    && docker-php-ext-enable redis \
+    && apk del .build-deps
+
+WORKDIR /var/www/html
+
+ARG GIT_COMMIT_SHA=unknown
+ARG APP_VERSION=dev
+
+# Copy application code
+COPY --chown=www-data:www-data . .
+
+# Copy pre-built frontend assets (built in CI step)
+# These are already in public/build from the build-frontend step
+
+# Copy pre-installed vendor (from CI composer-install step)
+# Already included in COPY . .
+
+# Create version metadata file
+RUN echo "VERSION=${APP_VERSION}" > /var/www/html/version.env && \
+    echo "COMMIT=${GIT_COMMIT_SHA}" >> /var/www/html/version.env && \
+    chown www-data:www-data /var/www/html/version.env
+
+# Copy production configurations
+COPY docker/production/nginx/default.conf /etc/nginx/http.d/default.conf
+COPY docker/production/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
+COPY docker/production/php/php.ini /usr/local/etc/php/conf.d/99-custom.ini
+
+# Remove default PHP-FPM pool config and use our custom one
+RUN rm -f /usr/local/etc/php-fpm.d/www.conf /usr/local/etc/php-fpm.d/www.conf.default
+COPY docker/production/php/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf
+
+# Create supervisor log directory and fix permissions
+RUN mkdir -p /var/log/supervisor \
+    && chown -R www-data:www-data /var/www/html/storage /var/www/html/bootstrap/cache \
+    && chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache
+
+EXPOSE 80
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

app/Console/Commands/MigrateDbaData.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Business;
+use App\Models\BusinessDba;
+use Illuminate\Console\Command;
+
+/**
+ * Migrate existing business DBA data to the new business_dbas table.
+ *
+ * This command creates DBA records from existing business fields:
+ * - dba_name
+ * - invoice_payable_company_name, invoice_payable_address, etc.
+ * - ap_contact_* fields
+ * - primary_contact_* fields
+ */
+class MigrateDbaData extends Command
+{
+    protected $signature = 'dba:migrate
+        {--dry-run : Show what would be created without actually creating records}
+        {--business= : Migrate only a specific business by ID or slug}
+        {--force : Skip confirmation prompt}';
+
+    protected $description = 'Migrate existing dba_name and invoice_payable_* fields to the business_dbas table';
+
+    public function handle(): int
+    {
+        $this->info('DBA Data Migration');
+        $this->line('==================');
+
+        $dryRun = $this->option('dry-run');
+        $specificBusiness = $this->option('business');
+
+        if ($dryRun) {
+            $this->warn('DRY RUN MODE - No records will be created');
+        }
+
+        // Build query
+        $query = Business::query()
+            ->whereNotNull('dba_name')
+            ->where('dba_name', '!=', '');
+
+        if ($specificBusiness) {
+            $query->where(function ($q) use ($specificBusiness) {
+                $q->where('id', $specificBusiness)
+                    ->orWhere('slug', $specificBusiness);
+            });
+        }
+
+        $businesses = $query->get();
+        $this->info("Found {$businesses->count()} businesses with dba_name set.");
+
+        if ($businesses->isEmpty()) {
+            $this->info('No businesses to migrate.');
+
+            return self::SUCCESS;
+        }
+
+        // Show preview
+        $this->newLine();
+        $this->table(
+            ['ID', 'Business Name', 'DBA Name', 'Has Invoice Address', 'Already Has DBAs'],
+            $businesses->map(fn ($b) => [
+                $b->id,
+                \Illuminate\Support\Str::limit($b->name, 30),
+                \Illuminate\Support\Str::limit($b->dba_name, 30),
+                $b->invoice_payable_address ? 'Yes' : 'No',
+                $b->dbas()->exists() ? 'Yes' : 'No',
+            ])
+        );
+
+        if (! $dryRun && ! $this->option('force')) {
+            if (! $this->confirm('Do you want to proceed with creating DBA records?')) {
+                $this->info('Aborted.');
+
+                return self::SUCCESS;
+            }
+        }
+
+        $created = 0;
+        $skipped = 0;
+
+        foreach ($businesses as $business) {
+            // Skip if business already has DBAs
+            if ($business->dbas()->exists()) {
+                $this->line("  Skipping {$business->name} - already has DBAs");
+                $skipped++;
+
+                continue;
+            }
+
+            if ($dryRun) {
+                $this->line("  Would create DBA for: {$business->name} -> {$business->dba_name}");
+                $created++;
+
+                continue;
+            }
+
+            // Create DBA from existing business fields
+            $dba = BusinessDba::create([
+                'business_id' => $business->id,
+                'trade_name' => $business->dba_name,
+
+                // Address - prefer invoice_payable fields, fall back to physical
+                'address' => $business->invoice_payable_address ?: $business->physical_address,
+                'city' => $business->invoice_payable_city ?: $business->physical_city,
+                'state' => $business->invoice_payable_state ?: $business->physical_state,
+                'zip' => $business->invoice_payable_zipcode ?: $business->physical_zipcode,
+
+                // License
+                'license_number' => $business->license_number,
+                'license_type' => $business->license_type,
+
+                // Contacts
+                'primary_contact_name' => trim(($business->primary_contact_first_name ?? '').' '.($business->primary_contact_last_name ?? '')) ?: null,
+                'primary_contact_email' => $business->primary_contact_email,
+                'primary_contact_phone' => $business->primary_contact_phone,
+                'ap_contact_name' => trim(($business->ap_contact_first_name ?? '').' '.($business->ap_contact_last_name ?? '')) ?: null,
+                'ap_contact_email' => $business->ap_contact_email,
+                'ap_contact_phone' => $business->ap_contact_phone,
+
+                // Invoice Settings
+                'invoice_footer' => $business->order_invoice_footer,
+
+                // Status
+                'is_default' => true,
+                'is_active' => true,
+            ]);
+
+            $this->info("  Created DBA #{$dba->id} for {$business->name}: {$dba->trade_name}");
+            $created++;
+        }
+
+        $this->newLine();
+        $this->info("Summary: {$created} created, {$skipped} skipped");
+
+        if ($dryRun) {
+            $this->warn('Run without --dry-run to actually create records.');
+        }
+
+        return self::SUCCESS;
+    }
+}

app/Console/Kernel.php

@@ -131,6 +131,20 @@ class Kernel extends ConsoleKernel
             ->withoutOverlapping()
             ->runInBackground();
 
+        // ─────────────────────────────────────────────────────────────────────
+        // BANNER ADS
+        // ─────────────────────────────────────────────────────────────────────
+
+        // Update banner ad statuses (activate scheduled, expire ended) - every minute
+        $schedule->job(new \App\Jobs\UpdateBannerAdStatuses)
+            ->everyMinute()
+            ->withoutOverlapping();
+
+        // Rollup daily banner ad stats - daily at 2 AM
+        $schedule->job(new \App\Jobs\RollupBannerAdStats)
+            ->dailyAt('02:00')
+            ->withoutOverlapping();
+
         // ─────────────────────────────────────────────────────────────────────
         // HOUSEKEEPING & MAINTENANCE
         // ─────────────────────────────────────────────────────────────────────

app/Enums/BannerAdStatus.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Enums;
+
+enum BannerAdStatus: string
+{
+    case DRAFT = 'draft';
+    case ACTIVE = 'active';
+    case SCHEDULED = 'scheduled';
+    case PAUSED = 'paused';
+    case EXPIRED = 'expired';
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::DRAFT => 'Draft',
+            self::ACTIVE => 'Active',
+            self::SCHEDULED => 'Scheduled',
+            self::PAUSED => 'Paused',
+            self::EXPIRED => 'Expired',
+        };
+    }
+
+    public function color(): string
+    {
+        return match ($this) {
+            self::DRAFT => 'gray',
+            self::ACTIVE => 'success',
+            self::SCHEDULED => 'info',
+            self::PAUSED => 'warning',
+            self::EXPIRED => 'danger',
+        };
+    }
+
+    public static function options(): array
+    {
+        return collect(self::cases())->mapWithKeys(fn (self $status) => [
+            $status->value => $status->label(),
+        ])->toArray();
+    }
+}

app/Enums/BannerAdZone.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Enums;
+
+enum BannerAdZone: string
+{
+    case MARKETPLACE_HERO = 'marketplace_hero';
+    case MARKETPLACE_LEADERBOARD = 'marketplace_leaderboard';
+    case MARKETPLACE_SIDEBAR = 'marketplace_sidebar';
+    case MARKETPLACE_INLINE = 'marketplace_inline';
+    case BRAND_PAGE_BANNER = 'brand_page_banner';
+    case DEALS_PAGE_HERO = 'deals_page_hero';
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::MARKETPLACE_HERO => 'Marketplace Hero (Full Width)',
+            self::MARKETPLACE_LEADERBOARD => 'Marketplace Leaderboard (728x90)',
+            self::MARKETPLACE_SIDEBAR => 'Marketplace Sidebar (300x250)',
+            self::MARKETPLACE_INLINE => 'Marketplace Inline (Between Products)',
+            self::BRAND_PAGE_BANNER => 'Brand Page Banner',
+            self::DEALS_PAGE_HERO => 'Deals Page Hero',
+        };
+    }
+
+    public function dimensions(): array
+    {
+        return match ($this) {
+            self::MARKETPLACE_HERO => ['width' => 1920, 'height' => 400, 'display' => '1920x400'],
+            self::MARKETPLACE_LEADERBOARD => ['width' => 728, 'height' => 90, 'display' => '728x90'],
+            self::MARKETPLACE_SIDEBAR => ['width' => 300, 'height' => 250, 'display' => '300x250'],
+            self::MARKETPLACE_INLINE => ['width' => 970, 'height' => 250, 'display' => '970x250'],
+            self::BRAND_PAGE_BANNER => ['width' => 1344, 'height' => 280, 'display' => '1344x280'],
+            self::DEALS_PAGE_HERO => ['width' => 1920, 'height' => 350, 'display' => '1920x350'],
+        };
+    }
+
+    public static function options(): array
+    {
+        return collect(self::cases())->mapWithKeys(fn (self $zone) => [
+            $zone->value => $zone->label().' - '.$zone->dimensions()['display'],
+        ])->toArray();
+    }
+
+    public static function optionsSimple(): array
+    {
+        return collect(self::cases())->mapWithKeys(fn (self $zone) => [
+            $zone->value => $zone->label(),
+        ])->toArray();
+    }
+}

app/Events/CrmAgentStatusChanged.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\AgentStatus;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class CrmAgentStatusChanged implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(
+        public AgentStatus $agentStatus
+    ) {}
+
+    public function broadcastOn(): array
+    {
+        return [new PrivateChannel("crm-inbox.{$this->agentStatus->business_id}")];
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'agent.status';
+    }
+
+    public function broadcastWith(): array
+    {
+        return [
+            'user_id' => $this->agentStatus->user_id,
+            'user_name' => $this->agentStatus->user?->name,
+            'status' => $this->agentStatus->status,
+            'status_label' => AgentStatus::statuses()[$this->agentStatus->status] ?? $this->agentStatus->status,
+            'status_message' => $this->agentStatus->status_message,
+            'last_seen_at' => $this->agentStatus->last_seen_at?->toIso8601String(),
+        ];
+    }
+}

app/Events/CrmThreadMessageSent.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Crm\CrmChannelMessage;
+use App\Models\Crm\CrmThread;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
+
+class CrmThreadMessageSent implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(
+        public CrmChannelMessage $message,
+        public CrmThread $thread
+    ) {}
+
+    public function broadcastOn(): array
+    {
+        $channels = [
+            new PrivateChannel("crm-inbox.{$this->thread->business_id}"),
+            new PrivateChannel("crm-thread.{$this->thread->id}"),
+        ];
+
+        // For marketplace B2B threads, also broadcast to buyer/seller businesses
+        if ($this->thread->buyer_business_id) {
+            $channels[] = new PrivateChannel("crm-inbox.{$this->thread->buyer_business_id}");
+        }
+        if ($this->thread->seller_business_id) {
+            $channels[] = new PrivateChannel("crm-inbox.{$this->thread->seller_business_id}");
+        }
+
+        return $channels;
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'message.new';
+    }
+
+    public function broadcastWith(): array
+    {
+        return [
+            'message' => [
+                'id' => $this->message->id,
+                'thread_id' => $this->message->thread_id,
+                'body' => $this->message->body,
+                'body_html' => $this->message->body_html,
+                'direction' => $this->message->direction,
+                'channel_type' => $this->message->channel_type,
+                'sender_id' => $this->message->user_id,
+                'sender_name' => $this->message->user?->name ?? ($this->message->direction === 'inbound' ? $this->thread->contact?->getFullName() : 'System'),
+                'status' => $this->message->status,
+                'created_at' => $this->message->created_at->toIso8601String(),
+                'attachments' => $this->message->attachments->map(fn ($a) => [
+                    'id' => $a->id,
+                    'filename' => $a->original_filename ?? $a->filename,
+                    'mime_type' => $a->mime_type,
+                    'size' => $a->size,
+                    'url' => Storage::disk($a->disk ?? 'minio')->url($a->path),
+                ])->toArray(),
+            ],
+            'thread' => [
+                'id' => $this->thread->id,
+                'subject' => $this->thread->subject,
+                'status' => $this->thread->status,
+                'priority' => $this->thread->priority,
+                'last_message_at' => $this->thread->last_message_at?->toIso8601String(),
+                'last_message_preview' => $this->message->body ? \Str::limit(strip_tags($this->message->body), 100) : null,
+                'last_message_direction' => $this->message->direction,
+                'last_channel_type' => $this->message->channel_type,
+            ],
+        ];
+    }
+}

app/Events/CrmThreadUpdated.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\Crm\CrmThread;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class CrmThreadUpdated implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public const UPDATE_ASSIGNED = 'assigned';
+
+    public const UPDATE_CLOSED = 'closed';
+
+    public const UPDATE_REOPENED = 'reopened';
+
+    public const UPDATE_SNOOZED = 'snoozed';
+
+    public const UPDATE_PRIORITY = 'priority';
+
+    public const UPDATE_STATUS = 'status';
+
+    public function __construct(
+        public CrmThread $thread,
+        public string $updateType
+    ) {}
+
+    public function broadcastOn(): array
+    {
+        $channels = [
+            new PrivateChannel("crm-inbox.{$this->thread->business_id}"),
+            new PrivateChannel("crm-thread.{$this->thread->id}"),
+        ];
+
+        // For marketplace B2B threads, also broadcast to buyer/seller businesses
+        if ($this->thread->buyer_business_id) {
+            $channels[] = new PrivateChannel("crm-inbox.{$this->thread->buyer_business_id}");
+        }
+        if ($this->thread->seller_business_id) {
+            $channels[] = new PrivateChannel("crm-inbox.{$this->thread->seller_business_id}");
+        }
+
+        return $channels;
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'thread.updated';
+    }
+
+    public function broadcastWith(): array
+    {
+        return [
+            'thread' => [
+                'id' => $this->thread->id,
+                'subject' => $this->thread->subject,
+                'status' => $this->thread->status,
+                'priority' => $this->thread->priority,
+                'assigned_to' => $this->thread->assigned_to,
+                'assignee_name' => $this->thread->assignee?->name,
+                'snoozed_until' => $this->thread->snoozed_until?->toIso8601String(),
+                'last_message_at' => $this->thread->last_message_at?->toIso8601String(),
+            ],
+            'update_type' => $this->updateType,
+            'updated_at' => now()->toIso8601String(),
+        ];
+    }
+}

app/Events/CrmTypingIndicator.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class CrmTypingIndicator implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(
+        public int $threadId,
+        public int $userId,
+        public string $userName,
+        public bool $isTyping
+    ) {}
+
+    public function broadcastOn(): array
+    {
+        return [new PrivateChannel("crm-thread.{$this->threadId}")];
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'typing';
+    }
+
+    public function broadcastWith(): array
+    {
+        return [
+            'user_id' => $this->userId,
+            'user_name' => $this->userName,
+            'is_typing' => $this->isTyping,
+            'timestamp' => now()->toIso8601String(),
+        ];
+    }
+}

app/Events/TeamMessageSent.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\TeamMessage;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class TeamMessageSent implements ShouldBroadcast
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public function __construct(
+        public TeamMessage $message
+    ) {}
+
+    public function broadcastOn(): array
+    {
+        // Broadcast to the team conversation channel
+        return [
+            new PrivateChannel('team-conversation.'.$this->message->conversation_id),
+        ];
+    }
+
+    public function broadcastAs(): string
+    {
+        return 'message.sent';
+    }
+
+    public function broadcastWith(): array
+    {
+        return [
+            'id' => $this->message->id,
+            'conversation_id' => $this->message->conversation_id,
+            'sender_id' => $this->message->sender_id,
+            'sender_name' => $this->message->getSenderName(),
+            'sender_initials' => $this->message->getSenderInitials(),
+            'body' => $this->message->body,
+            'type' => $this->message->type,
+            'metadata' => $this->message->metadata,
+            'created_at' => $this->message->created_at->toIso8601String(),
+        ];
+    }
+}

app/Filament/Resources/BannerAdResource.php

@@ -0,0 +1,292 @@
+<?php
+
+namespace App\Filament\Resources;
+
+use App\Enums\BannerAdStatus;
+use App\Enums\BannerAdZone;
+use App\Filament\Resources\BannerAdResource\Pages;
+use App\Models\BannerAd;
+use BackedEnum;
+use Filament\Forms\Components\DateTimePicker;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Placeholder;
+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\Resources\Resource;
+use Filament\Schemas\Schema;
+use Filament\Support\Icons\Heroicon;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
+use UnitEnum;
+
+class BannerAdResource extends Resource
+{
+    protected static ?string $model = BannerAd::class;
+
+    protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedPhoto;
+
+    protected static UnitEnum|string|null $navigationGroup = 'Marketing';
+
+    protected static ?int $navigationSort = 10;
+
+    protected static ?string $navigationLabel = 'Banner Ads';
+
+    public static function getNavigationBadge(): ?string
+    {
+        return cache()->remember('banner_ad_active_count', 60, function () {
+            $count = static::getModel()::where('status', BannerAdStatus::ACTIVE)->count();
+
+            return $count ?: null;
+        });
+    }
+
+    public static function form(Schema $schema): Schema
+    {
+        return $schema
+            ->components([
+                Section::make('Basic Information')
+                    ->columns(2)
+                    ->schema([
+                        TextInput::make('name')
+                            ->label('Internal Name')
+                            ->required()
+                            ->maxLength(255)
+                            ->helperText('Internal reference name (not shown to users)'),
+
+                        Select::make('zone')
+                            ->label('Ad Zone')
+                            ->options(BannerAdZone::options())
+                            ->required()
+                            ->live()
+                            ->afterStateUpdated(fn ($state, $set) => $state
+                                ? $set('zone_info', BannerAdZone::from($state)->dimensions()['display'])
+                                : $set('zone_info', null)),
+
+                        Placeholder::make('zone_info')
+                            ->label('Recommended Dimensions')
+                            ->content(fn ($get) => $get('zone')
+                                ? BannerAdZone::from($get('zone'))->dimensions()['display']
+                                : 'Select a zone'),
+
+                        Select::make('status')
+                            ->options(BannerAdStatus::options())
+                            ->default('draft')
+                            ->required(),
+
+                        Select::make('brand_id')
+                            ->label('Brand (Optional)')
+                            ->relationship('brand', 'name')
+                            ->searchable()
+                            ->preload()
+                            ->helperText('Leave empty for platform-wide ads'),
+                    ]),
+
+                Section::make('Creative Content')
+                    ->columns(2)
+                    ->schema([
+                        FileUpload::make('image_path')
+                            ->label('Banner Image')
+                            ->image()
+                            ->required()
+                            ->disk('minio')
+                            ->directory('banner-ads')
+                            ->visibility('public')
+                            ->maxSize(5120)
+                            ->helperText('Upload banner image at recommended dimensions')
+                            ->columnSpanFull(),
+
+                        TextInput::make('image_alt')
+                            ->label('Alt Text')
+                            ->maxLength(255)
+                            ->helperText('Accessibility description'),
+
+                        TextInput::make('headline')
+                            ->maxLength(100)
+                            ->helperText('Optional overlay headline'),
+
+                        Textarea::make('description')
+                            ->maxLength(200)
+                            ->helperText('Optional overlay description'),
+
+                        TextInput::make('cta_text')
+                            ->label('Button Text')
+                            ->maxLength(50)
+                            ->placeholder('Shop Now')
+                            ->helperText('Call-to-action button text'),
+
+                        TextInput::make('cta_url')
+                            ->label('Destination URL')
+                            ->required()
+                            ->url()
+                            ->maxLength(500)
+                            ->columnSpanFull(),
+                    ]),
+
+                Section::make('Scheduling')
+                    ->columns(2)
+                    ->schema([
+                        DateTimePicker::make('starts_at')
+                            ->label('Start Date')
+                            ->helperText('Leave empty to start immediately'),
+
+                        DateTimePicker::make('ends_at')
+                            ->label('End Date')
+                            ->helperText('Leave empty to run indefinitely'),
+                    ]),
+
+                Section::make('Targeting & Priority')
+                    ->columns(2)
+                    ->schema([
+                        Toggle::make('is_platform_wide')
+                            ->label('Platform Wide')
+                            ->default(true)
+                            ->helperText('Show to all users'),
+
+                        Select::make('target_business_types')
+                            ->label('Target Business Types')
+                            ->multiple()
+                            ->options([
+                                'buyer' => 'Buyers (Dispensaries)',
+                                'seller' => 'Sellers (Brands)',
+                            ])
+                            ->helperText('Leave empty for all types'),
+
+                        TextInput::make('priority')
+                            ->numeric()
+                            ->default(0)
+                            ->helperText('Higher = shown first (0-100)'),
+
+                        TextInput::make('weight')
+                            ->numeric()
+                            ->default(100)
+                            ->minValue(1)
+                            ->maxValue(1000)
+                            ->helperText('Weight for random rotation (1-1000)'),
+                    ]),
+
+                Section::make('Analytics')
+                    ->columns(3)
+                    ->schema([
+                        Placeholder::make('impressions_display')
+                            ->label('Impressions')
+                            ->content(fn (?BannerAd $record) => number_format($record?->impressions ?? 0)),
+
+                        Placeholder::make('clicks_display')
+                            ->label('Clicks')
+                            ->content(fn (?BannerAd $record) => number_format($record?->clicks ?? 0)),
+
+                        Placeholder::make('ctr_display')
+                            ->label('CTR')
+                            ->content(fn (?BannerAd $record) => ($record?->click_through_rate ?? 0).'%'),
+                    ])
+                    ->hiddenOn('create'),
+            ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\ImageColumn::make('image_path')
+                    ->label('Preview')
+                    ->disk('minio')
+                    ->width(120)
+                    ->height(60),
+
+                Tables\Columns\TextColumn::make('name')
+                    ->searchable()
+                    ->sortable()
+                    ->weight('bold'),
+
+                Tables\Columns\TextColumn::make('zone')
+                    ->badge()
+                    ->formatStateUsing(fn ($state) => $state instanceof BannerAdZone
+                        ? $state->label()
+                        : BannerAdZone::tryFrom($state)?->label() ?? $state),
+
+                Tables\Columns\TextColumn::make('status')
+                    ->badge()
+                    ->color(fn ($state) => $state instanceof BannerAdStatus
+                        ? $state->color()
+                        : BannerAdStatus::tryFrom($state)?->color() ?? 'gray'),
+
+                Tables\Columns\TextColumn::make('impressions')
+                    ->numeric()
+                    ->sortable()
+                    ->toggleable(),
+
+                Tables\Columns\TextColumn::make('clicks')
+                    ->numeric()
+                    ->sortable()
+                    ->toggleable(),
+
+                Tables\Columns\TextColumn::make('click_through_rate')
+                    ->label('CTR')
+                    ->suffix('%')
+                    ->sortable()
+                    ->toggleable(),
+
+                Tables\Columns\TextColumn::make('starts_at')
+                    ->dateTime('M j, Y')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+
+                Tables\Columns\TextColumn::make('ends_at')
+                    ->dateTime('M j, Y')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+
+                Tables\Columns\TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->defaultSort('created_at', 'desc')
+            ->filters([
+                Tables\Filters\SelectFilter::make('status')
+                    ->options(BannerAdStatus::options()),
+                Tables\Filters\SelectFilter::make('zone')
+                    ->options(BannerAdZone::optionsSimple()),
+                Tables\Filters\TrashedFilter::make(),
+            ])
+            ->actions([
+                Tables\Actions\ViewAction::make(),
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                    Tables\Actions\ForceDeleteBulkAction::make(),
+                    Tables\Actions\RestoreBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListBannerAds::route('/'),
+            'create' => Pages\CreateBannerAd::route('/create'),
+            'view' => Pages\ViewBannerAd::route('/{record}'),
+            'edit' => Pages\EditBannerAd::route('/{record}/edit'),
+        ];
+    }
+
+    public static function getEloquentQuery(): Builder
+    {
+        return parent::getEloquentQuery()
+            ->withoutGlobalScopes([
+                SoftDeletingScope::class,
+            ]);
+    }
+}

app/Filament/Resources/BannerAdResource/Pages/CreateBannerAd.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Filament\Resources\BannerAdResource\Pages;
+
+use App\Filament\Resources\BannerAdResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateBannerAd extends CreateRecord
+{
+    protected static string $resource = BannerAdResource::class;
+
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        $data['created_by_user_id'] = auth()->id();
+
+        return $data;
+    }
+
+    protected function getRedirectUrl(): string
+    {
+        return $this->getResource()::getUrl('index');
+    }
+}

app/Filament/Resources/BannerAdResource/Pages/EditBannerAd.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Resources\BannerAdResource\Pages;
+
+use App\Filament\Resources\BannerAdResource;
+use App\Services\BannerAdService;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditBannerAd extends EditRecord
+{
+    protected static string $resource = BannerAdResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\ViewAction::make(),
+            Actions\DeleteAction::make(),
+            Actions\ForceDeleteAction::make(),
+            Actions\RestoreAction::make(),
+        ];
+    }
+
+    protected function afterSave(): void
+    {
+        // Clear caches when banner ad is updated
+        app(BannerAdService::class)->clearAllCaches();
+    }
+}

app/Filament/Resources/BannerAdResource/Pages/ListBannerAds.php

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

app/Filament/Resources/BannerAdResource/Pages/ViewBannerAd.php

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

app/Filament/Resources/BusinessResource.php

@@ -699,6 +699,11 @@ class BusinessResource extends Resource
                                                     '</div>'
                                                 );
                                             }),
+
+                                        Toggle::make('ping_pong_enabled')
+                                            ->label('Ping Pong Order Flow')
+                                            ->helperText('When enabled, buyers and sellers can send order details back and forth during the order process. Shows order progress stages and enables collaborative order editing.')
+                                            ->default(false),
                                     ]),
 
                                 // ===== SUITE ASSIGNMENT SECTION =====
@@ -2082,6 +2087,7 @@ class BusinessResource extends Resource
     public static function getRelations(): array
     {
         return [
+            BusinessResource\RelationManagers\DbasRelationManager::class,
             \Tapp\FilamentAuditing\RelationManagers\AuditsRelationManager::class,
         ];
     }

app/Filament/Resources/BusinessResource/RelationManagers/DbasRelationManager.php

@@ -0,0 +1,235 @@
+<?php
+
+namespace App\Filament\Resources\BusinessResource\RelationManagers;
+
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Grid;
+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\Actions\CreateAction;
+use Filament\Actions\DeleteAction;
+use Filament\Actions\EditAction;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Schemas\Schema;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+
+class DbasRelationManager extends RelationManager
+{
+    protected static string $relationship = 'dbas';
+
+    protected static ?string $title = 'Trade Names (DBAs)';
+
+    protected static ?string $recordTitleAttribute = 'trade_name';
+
+    public function form(Schema $schema): Schema
+    {
+        return $schema
+            ->components([
+                Section::make('Basic Information')
+                    ->schema([
+                        TextInput::make('trade_name')
+                            ->label('Trade Name')
+                            ->required()
+                            ->maxLength(255),
+                        TextInput::make('slug')
+                            ->label('Slug')
+                            ->disabled()
+                            ->dehydrated(false)
+                            ->helperText('Auto-generated from trade name'),
+                        Toggle::make('is_default')
+                            ->label('Default DBA')
+                            ->helperText('Use for new invoices by default'),
+                        Toggle::make('is_active')
+                            ->label('Active')
+                            ->default(true),
+                    ])
+                    ->columns(2),
+
+                Section::make('Address')
+                    ->schema([
+                        TextInput::make('address')
+                            ->label('Street Address')
+                            ->maxLength(255),
+                        TextInput::make('address_line_2')
+                            ->label('Address Line 2')
+                            ->maxLength(255),
+                        Grid::make(3)
+                            ->schema([
+                                TextInput::make('city')
+                                    ->maxLength(255),
+                                TextInput::make('state')
+                                    ->maxLength(2)
+                                    ->extraAttributes(['class' => 'uppercase']),
+                                TextInput::make('zip')
+                                    ->label('ZIP Code')
+                                    ->maxLength(10),
+                            ]),
+                    ])
+                    ->collapsible(),
+
+                Section::make('License Information')
+                    ->schema([
+                        TextInput::make('license_number')
+                            ->maxLength(255),
+                        TextInput::make('license_type')
+                            ->maxLength(255),
+                        DatePicker::make('license_expiration')
+                            ->label('Expiration Date'),
+                    ])
+                    ->columns(3)
+                    ->collapsible(),
+
+                Section::make('Banking Information')
+                    ->description('Sensitive data is encrypted at rest.')
+                    ->schema([
+                        TextInput::make('bank_name')
+                            ->maxLength(255),
+                        TextInput::make('bank_account_name')
+                            ->maxLength(255),
+                        TextInput::make('bank_routing_number')
+                            ->maxLength(50)
+                            ->password()
+                            ->revealable(),
+                        TextInput::make('bank_account_number')
+                            ->maxLength(50)
+                            ->password()
+                            ->revealable(),
+                        Select::make('bank_account_type')
+                            ->options([
+                                'checking' => 'Checking',
+                                'savings' => 'Savings',
+                            ]),
+                    ])
+                    ->columns(2)
+                    ->collapsible()
+                    ->collapsed(),
+
+                Section::make('Tax Information')
+                    ->description('Sensitive data is encrypted at rest.')
+                    ->schema([
+                        TextInput::make('tax_id')
+                            ->label('Tax ID')
+                            ->maxLength(50)
+                            ->password()
+                            ->revealable(),
+                        Select::make('tax_id_type')
+                            ->label('Tax ID Type')
+                            ->options([
+                                'ein' => 'EIN',
+                                'ssn' => 'SSN',
+                            ]),
+                    ])
+                    ->columns(2)
+                    ->collapsible()
+                    ->collapsed(),
+
+                Section::make('Contacts')
+                    ->schema([
+                        Grid::make(2)
+                            ->schema([
+                                Section::make('Primary Contact')
+                                    ->schema([
+                                        TextInput::make('primary_contact_name')
+                                            ->label('Name')
+                                            ->maxLength(255),
+                                        TextInput::make('primary_contact_email')
+                                            ->label('Email')
+                                            ->email()
+                                            ->maxLength(255),
+                                        TextInput::make('primary_contact_phone')
+                                            ->label('Phone')
+                                            ->tel()
+                                            ->maxLength(50),
+                                    ]),
+                                Section::make('AP Contact')
+                                    ->schema([
+                                        TextInput::make('ap_contact_name')
+                                            ->label('Name')
+                                            ->maxLength(255),
+                                        TextInput::make('ap_contact_email')
+                                            ->label('Email')
+                                            ->email()
+                                            ->maxLength(255),
+                                        TextInput::make('ap_contact_phone')
+                                            ->label('Phone')
+                                            ->tel()
+                                            ->maxLength(50),
+                                    ]),
+                            ]),
+                    ])
+                    ->collapsible()
+                    ->collapsed(),
+
+                Section::make('Invoice Settings')
+                    ->schema([
+                        TextInput::make('payment_terms')
+                            ->maxLength(50)
+                            ->placeholder('Net 30'),
+                        TextInput::make('invoice_prefix')
+                            ->maxLength(10)
+                            ->placeholder('INV-'),
+                        Textarea::make('payment_instructions')
+                            ->rows(2)
+                            ->columnSpanFull(),
+                        Textarea::make('invoice_footer')
+                            ->rows(2)
+                            ->columnSpanFull(),
+                    ])
+                    ->columns(2)
+                    ->collapsible()
+                    ->collapsed(),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('trade_name')
+                    ->label('Trade Name')
+                    ->searchable()
+                    ->sortable(),
+                TextColumn::make('city')
+                    ->label('Location')
+                    ->formatStateUsing(fn ($record) => $record->city && $record->state
+                        ? "{$record->city}, {$record->state}"
+                        : ($record->city ?? $record->state ?? '-'))
+                    ->sortable(),
+                TextColumn::make('license_number')
+                    ->label('License')
+                    ->limit(15)
+                    ->tooltip(fn ($state) => $state),
+                IconColumn::make('is_default')
+                    ->label('Default')
+                    ->boolean()
+                    ->trueIcon('heroicon-o-star')
+                    ->falseIcon('heroicon-o-minus')
+                    ->trueColor('warning'),
+                IconColumn::make('is_active')
+                    ->label('Active')
+                    ->boolean(),
+                TextColumn::make('created_at')
+                    ->label('Created')
+                    ->dateTime('M j, Y')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->defaultSort('is_default', 'desc')
+            ->headerActions([
+                CreateAction::make(),
+            ])
+            ->actions([
+                EditAction::make(),
+                DeleteAction::make()
+                    ->requiresConfirmation(),
+            ])
+            ->emptyStateHeading('No Trade Names')
+            ->emptyStateDescription('Add a DBA to manage different trade names for invoices and licenses.')
+            ->emptyStateIcon('heroicon-o-building-office-2');
+    }
+}

app/Filament/Resources/ProductResource/Tables/ProductsTable.php

@@ -25,7 +25,7 @@ class ProductsTable
                 ImageColumn::make('image_path')
                     ->label('Image')
                     ->circular()
-                    ->defaultImageUrl(url('/images/placeholder-product.png'))
+                    ->defaultImageUrl(\Storage::disk('minio')->url('defaults/placeholder-product.svg'))
                     ->toggleable(),
 
                 TextColumn::make('name')

app/Http/Controllers/Api/AgentStatusController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Api;
 
+use App\Events\CrmAgentStatusChanged;
 use App\Http\Controllers\Controller;
 use App\Models\AgentStatus;
 use Illuminate\Http\JsonResponse;
@@ -26,12 +27,77 @@ class AgentStatusController extends Controller
         }
 
         $agentStatus = AgentStatus::getOrCreate($user->id, $validated['business_id']);
+        $oldStatus = $agentStatus->status;
         $agentStatus->setStatus($validated['status'], $validated['status_message'] ?? null);
 
+        // Broadcast status change if it changed
+        if ($oldStatus !== $validated['status']) {
+            broadcast(new CrmAgentStatusChanged($agentStatus->fresh()))->toOthers();
+        }
+
         return response()->json([
             'success' => true,
             'status' => $agentStatus->status,
             'status_label' => AgentStatus::statuses()[$agentStatus->status],
         ]);
     }
+
+    /**
+     * Heartbeat to maintain online status
+     */
+    public function heartbeat(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'business_id' => 'required|integer|exists:businesses,id',
+        ]);
+
+        $user = $request->user();
+
+        // Verify user belongs to the business
+        if (! $user->businesses()->where('businesses.id', $validated['business_id'])->exists()) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $agentStatus = AgentStatus::where('user_id', $user->id)
+            ->where('business_id', $validated['business_id'])
+            ->first();
+
+        if ($agentStatus) {
+            $agentStatus->updateLastSeen();
+        }
+
+        return response()->json(['success' => true]);
+    }
+
+    /**
+     * Get team members' statuses for a business
+     */
+    public function team(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'business_id' => 'required|integer|exists:businesses,id',
+        ]);
+
+        $user = $request->user();
+
+        // Verify user belongs to the business
+        if (! $user->businesses()->where('businesses.id', $validated['business_id'])->exists()) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $statuses = AgentStatus::where('business_id', $validated['business_id'])
+            ->where('status', '!=', AgentStatus::STATUS_OFFLINE)
+            ->where('last_seen_at', '>=', now()->subMinutes(5))
+            ->with('user:id,name')
+            ->get()
+            ->map(fn ($s) => [
+                'user_id' => $s->user_id,
+                'user_name' => $s->user?->name,
+                'status' => $s->status,
+                'status_message' => $s->status_message,
+                'last_seen_at' => $s->last_seen_at?->toIso8601String(),
+            ]);
+
+        return response()->json(['team' => $statuses]);
+    }
 }

app/Http/Controllers/Api/TeamChatController.php

@@ -0,0 +1,237 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\TeamConversation;
+use App\Models\TeamMessage;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class TeamChatController extends Controller
+{
+    /**
+     * Get all team conversations for current user
+     */
+    public function index(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'business_id' => 'required|integer|exists:businesses,id',
+        ]);
+
+        $user = $request->user();
+
+        // Verify user belongs to business
+        if (! $user->businesses()->where('businesses.id', $validated['business_id'])->exists()) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $conversations = TeamConversation::forBusiness($validated['business_id'])
+            ->forUser($user->id)
+            ->with(['participants:id,first_name,last_name', 'messages' => fn ($q) => $q->latest()->limit(1)])
+            ->orderByDesc('last_message_at')
+            ->get()
+            ->map(fn ($conv) => $this->formatConversation($conv, $user->id));
+
+        return response()->json(['conversations' => $conversations]);
+    }
+
+    /**
+     * Get or create a direct conversation with another user
+     */
+    public function getOrCreateDirect(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'business_id' => 'required|integer|exists:businesses,id',
+            'user_id' => 'required|integer|exists:users,id',
+        ]);
+
+        $user = $request->user();
+
+        // Verify current user belongs to business
+        if (! $user->businesses()->where('businesses.id', $validated['business_id'])->exists()) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        // Verify target user belongs to same business
+        $targetUser = User::find($validated['user_id']);
+        if (! $targetUser->businesses()->where('businesses.id', $validated['business_id'])->exists()) {
+            return response()->json(['error' => 'User not in business'], 400);
+        }
+
+        // Can't chat with yourself
+        if ($validated['user_id'] === $user->id) {
+            return response()->json(['error' => 'Cannot chat with yourself'], 400);
+        }
+
+        $conversation = TeamConversation::getOrCreateDirect(
+            $validated['business_id'],
+            $user->id,
+            $validated['user_id']
+        );
+
+        $conversation->load('participants:id,first_name,last_name');
+
+        return response()->json([
+            'conversation' => $this->formatConversation($conversation, $user->id),
+        ]);
+    }
+
+    /**
+     * Get messages for a conversation
+     */
+    public function messages(Request $request, int $conversationId): JsonResponse
+    {
+        $user = $request->user();
+
+        $conversation = TeamConversation::with('participants')
+            ->findOrFail($conversationId);
+
+        // Verify user is participant
+        if (! $conversation->participants->contains('id', $user->id)) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $messages = $conversation->messages()
+            ->with('sender:id,first_name,last_name')
+            ->orderBy('created_at')
+            ->limit(100)
+            ->get()
+            ->map(fn ($msg) => $this->formatMessage($msg));
+
+        // Mark conversation as read
+        $conversation->markReadFor($user->id);
+
+        return response()->json(['messages' => $messages]);
+    }
+
+    /**
+     * Send a message to a conversation
+     */
+    public function send(Request $request, int $conversationId): JsonResponse
+    {
+        $validated = $request->validate([
+            'body' => 'required|string|max:10000',
+            'type' => 'sometimes|string|in:text,file,image',
+            'metadata' => 'sometimes|array',
+        ]);
+
+        $user = $request->user();
+
+        $conversation = TeamConversation::with('participants')
+            ->findOrFail($conversationId);
+
+        // Verify user is participant
+        if (! $conversation->participants->contains('id', $user->id)) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $message = TeamMessage::create([
+            'conversation_id' => $conversationId,
+            'sender_id' => $user->id,
+            'body' => $validated['body'],
+            'type' => $validated['type'] ?? TeamMessage::TYPE_TEXT,
+            'metadata' => $validated['metadata'] ?? null,
+            'read_by' => [$user->id], // Sender has read it
+        ]);
+
+        $message->load('sender:id,first_name,last_name');
+
+        return response()->json([
+            'message' => $this->formatMessage($message),
+        ]);
+    }
+
+    /**
+     * Mark conversation as read
+     */
+    public function markRead(Request $request, int $conversationId): JsonResponse
+    {
+        $user = $request->user();
+
+        $conversation = TeamConversation::with('participants')
+            ->findOrFail($conversationId);
+
+        // Verify user is participant
+        if (! $conversation->participants->contains('id', $user->id)) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $conversation->markReadFor($user->id);
+
+        return response()->json(['success' => true]);
+    }
+
+    /**
+     * Get team members available for chat
+     */
+    public function teamMembers(Request $request): JsonResponse
+    {
+        $validated = $request->validate([
+            'business_id' => 'required|integer|exists:businesses,id',
+        ]);
+
+        $user = $request->user();
+
+        // Verify user belongs to business
+        if (! $user->businesses()->where('businesses.id', $validated['business_id'])->exists()) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        // Get all users in the business except current user
+        $members = User::whereHas('businesses', fn ($q) => $q->where('businesses.id', $validated['business_id']))
+            ->where('id', '!=', $user->id)
+            ->select('id', 'first_name', 'last_name')
+            ->orderBy('first_name')
+            ->get()
+            ->map(fn ($u) => [
+                'id' => $u->id,
+                'name' => $u->name,
+                'initials' => strtoupper(substr($u->first_name ?? '', 0, 1).substr($u->last_name ?? '', 0, 1)),
+            ]);
+
+        return response()->json(['members' => $members]);
+    }
+
+    /**
+     * Format conversation for API response
+     */
+    private function formatConversation(TeamConversation $conversation, int $currentUserId): array
+    {
+        $other = $conversation->getOtherParticipant($currentUserId);
+
+        return [
+            'id' => $conversation->id,
+            'type' => $conversation->type,
+            'name' => $conversation->getDisplayName($currentUserId),
+            'other_user' => $other ? [
+                'id' => $other->id,
+                'name' => $other->name,
+                'initials' => strtoupper(substr($other->first_name ?? '', 0, 1).substr($other->last_name ?? '', 0, 1)),
+            ] : null,
+            'last_message_preview' => $conversation->last_message_preview,
+            'last_message_at' => $conversation->last_message_at?->toIso8601String(),
+            'unread_count' => $conversation->getUnreadCountFor($currentUserId),
+            'is_pinned' => $conversation->participants->firstWhere('id', $currentUserId)?->pivot?->is_pinned ?? false,
+            'is_muted' => $conversation->participants->firstWhere('id', $currentUserId)?->pivot?->is_muted ?? false,
+        ];
+    }
+
+    /**
+     * Format message for API response
+     */
+    private function formatMessage(TeamMessage $message): array
+    {
+        return [
+            'id' => $message->id,
+            'sender_id' => $message->sender_id,
+            'sender_name' => $message->getSenderName(),
+            'sender_initials' => $message->getSenderInitials(),
+            'body' => $message->body,
+            'type' => $message->type,
+            'metadata' => $message->metadata,
+            'created_at' => $message->created_at->toIso8601String(),
+        ];
+    }
+}

app/Http/Controllers/BannerAdController.php

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\BannerAd;
+use App\Services\BannerAdService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Intervention\Image\Drivers\Gd\Driver;
+use Intervention\Image\ImageManager;
+
+class BannerAdController extends Controller
+{
+    public function __construct(
+        protected BannerAdService $bannerAdService
+    ) {}
+
+    /**
+     * Handle click tracking and redirect
+     * URL: /ads/click/{bannerAd}
+     */
+    public function click(Request $request, BannerAd $bannerAd)
+    {
+        $this->bannerAdService->recordClick($bannerAd, [
+            'business_id' => auth()->user()?->businesses->first()?->id,
+            'user_id' => auth()->id(),
+            'session_id' => session()->getId(),
+            'page_url' => $request->header('referer'),
+        ]);
+
+        return redirect()->away($bannerAd->cta_url);
+    }
+
+    /**
+     * Track impression via AJAX (for lazy-loaded ads)
+     * URL: POST /ads/impression/{bannerAd}
+     */
+    public function impression(Request $request, BannerAd $bannerAd)
+    {
+        $this->bannerAdService->recordImpression($bannerAd, [
+            'business_id' => auth()->user()?->businesses->first()?->id,
+            'user_id' => auth()->id(),
+            'session_id' => session()->getId(),
+        ]);
+
+        return response()->json(['success' => true]);
+    }
+
+    /**
+     * Serve banner ad image at specific width
+     * URL: /images/banner-ad/{bannerAd}/{width?}
+     */
+    public function image(BannerAd $bannerAd, ?int $width = null)
+    {
+        if (! $bannerAd->image_path || ! Storage::exists($bannerAd->image_path)) {
+            abort(404);
+        }
+
+        // Return original if no width specified
+        if (! $width) {
+            $contents = Storage::get($bannerAd->image_path);
+            $mimeType = Storage::mimeType($bannerAd->image_path);
+
+            return response($contents)
+                ->header('Content-Type', $mimeType)
+                ->header('Cache-Control', 'public, max-age=86400');
+        }
+
+        // Generate and cache resized version
+        $ext = pathinfo($bannerAd->image_path, PATHINFO_EXTENSION);
+        $thumbnailName = "banner-ad-{$bannerAd->id}-{$width}w.{$ext}";
+        $thumbnailPath = "banner-ads/cache/{$thumbnailName}";
+
+        if (! Storage::disk('local')->exists($thumbnailPath)) {
+            $originalContents = Storage::get($bannerAd->image_path);
+
+            $manager = new ImageManager(new Driver);
+            $image = $manager->read($originalContents);
+            $image->scale(width: $width);
+
+            if (! Storage::disk('local')->exists('banner-ads/cache')) {
+                Storage::disk('local')->makeDirectory('banner-ads/cache');
+            }
+
+            $encoded = $ext === 'png' ? $image->toPng() : $image->toJpeg(quality: 90);
+            Storage::disk('local')->put($thumbnailPath, $encoded);
+        }
+
+        $mimeType = $ext === 'png' ? 'image/png' : 'image/jpeg';
+
+        return response()->file(
+            storage_path("app/private/{$thumbnailPath}"),
+            ['Content-Type' => $mimeType, 'Cache-Control' => 'public, max-age=86400']
+        );
+    }
+}

app/Http/Controllers/MarketplaceController.php

@@ -4,19 +4,24 @@ namespace App\Http\Controllers;
 
 use App\Models\Brand;
 use App\Models\Product;
+use App\Models\ProductCategory;
 use App\Models\Strain;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class MarketplaceController extends Controller
 {
     /**
-     * Display marketplace browse page
+     * Display marketplace browse page (Amazon/Shopify style)
      */
     public function index(Request $request)
     {
+        $business = auth()->user()->businesses->first();
+        $hasFilters = $request->hasAny(['search', 'brand_id', 'strain_type', 'price_min', 'price_max', 'in_stock', 'category_id']);
+
         // Start with active products only
         $query = Product::query()
-            ->with(['brand', 'strain'])
+            ->with(['brand', 'strain', 'category'])
             ->active();
 
         // Search filter (name, SKU, description)
@@ -28,9 +33,15 @@ class MarketplaceController extends Controller
             });
         }
 
-        // Brand filter
-        if ($brandId = $request->input('brand_id')) {
-            $query->where('brand_id', $brandId);
+        // Brand filter (supports multiple)
+        if ($brandIds = $request->input('brand_id')) {
+            $brandIds = is_array($brandIds) ? $brandIds : [$brandIds];
+            $query->whereIn('brand_id', $brandIds);
+        }
+
+        // Category filter (uses category_id foreign key)
+        if ($categoryId = $request->input('category_id')) {
+            $query->where('category_id', $categoryId);
         }
 
         // Strain type filter
@@ -64,23 +75,96 @@ class MarketplaceController extends Controller
             default => $query->latest(),
         };
 
+        // View mode (grid/list)
+        $viewMode = $request->input('view', 'grid');
+
         // Paginate results
-        $products = $query->paginate(12)->withQueryString();
+        $perPage = $viewMode === 'list' ? 10 : 12;
+        $products = $query->paginate($perPage)->withQueryString();
 
-        // Get all active brands for filters
-        $brands = Brand::active()->orderBy('name')->get();
+        // Get brands with product counts for faceted filter
+        $brands = Brand::query()
+            ->active()
+            ->withCount(['products' => fn ($q) => $q->active()])
+            ->orderBy('name')
+            ->get()
+            ->filter(fn ($b) => $b->products_count > 0);
 
-        // Get featured products for carousel (exclude from main results if in first page)
+        // Get categories with product counts
+        $categories = ProductCategory::query()
+            ->whereNull('parent_id') // Only top-level categories
+            ->where('is_active', true)
+            ->withCount(['products' => fn ($q) => $q->active()])
+            ->get()
+            ->filter(fn ($c) => $c->products_count > 0)
+            ->sortByDesc('products_count');
+
+        // Featured products for hero carousel
         $featuredProducts = Product::query()
             ->with(['brand', 'strain'])
             ->featured()
             ->inStock()
-            ->limit(3)
+            ->limit(5)
             ->get();
 
-        $business = auth()->user()->businesses->first();
+        // Top brands (by product count) for homepage section
+        $topBrands = Brand::query()
+            ->active()
+            ->withCount(['products' => fn ($q) => $q->active()])
+            ->get()
+            ->filter(fn ($b) => $b->products_count > 0)
+            ->sortByDesc('products_count')
+            ->take(6);
 
-        return view('buyer.marketplace.index', compact('products', 'brands', 'featuredProducts', 'business'));
+        // New arrivals (products created in last 14 days)
+        $newArrivals = Product::query()
+            ->with(['brand', 'strain', 'category'])
+            ->active()
+            ->inStock()
+            ->where('created_at', '>=', now()->subDays(14))
+            ->orderByDesc('created_at')
+            ->limit(8)
+            ->get();
+
+        // Trending products (most ordered in last 30 days - simplified query)
+        $trendingIds = DB::table('order_items')
+            ->select('product_id', DB::raw('SUM(quantity) as total_sold'))
+            ->where('created_at', '>=', now()->subDays(30))
+            ->groupBy('product_id')
+            ->orderByDesc('total_sold')
+            ->limit(8)
+            ->pluck('product_id');
+
+        $trending = $trendingIds->isNotEmpty()
+            ? Product::with(['brand', 'strain', 'category'])
+                ->whereIn('id', $trendingIds)
+                ->active()
+                ->get()
+                ->sortBy(fn ($p) => array_search($p->id, $trendingIds->toArray()))
+            : collect();
+
+        // Active filters for pills display
+        $activeFilters = collect([
+            'search' => $request->input('search'),
+            'brand_id' => $request->input('brand_id'),
+            'category_id' => $request->input('category_id'),
+            'strain_type' => $request->input('strain_type'),
+            'in_stock' => $request->input('in_stock'),
+        ])->filter();
+
+        return view('buyer.marketplace.index', compact(
+            'products',
+            'brands',
+            'categories',
+            'featuredProducts',
+            'topBrands',
+            'newArrivals',
+            'trending',
+            'business',
+            'viewMode',
+            'activeFilters',
+            'hasFilters'
+        ));
     }
 
     /**
@@ -180,7 +264,7 @@ class MarketplaceController extends Controller
 
         // Get featured products from this brand
         $featuredProducts = Product::query()
-            ->with(['strain'])
+            ->with(['strain', 'brand'])
             ->where('brand_id', $brand->id)
             ->featured()
             ->inStock()
@@ -189,7 +273,7 @@ class MarketplaceController extends Controller
 
         // Get all products from this brand
         $products = Product::query()
-            ->with(['strain'])
+            ->with(['strain', 'brand'])
             ->where('brand_id', $brand->id)
             ->active()
             ->orderBy('is_featured', 'desc')

app/Http/Controllers/OrderController.php

@@ -97,6 +97,135 @@ class OrderController extends Controller
         return view('seller.orders.index', compact('orders', 'business'));
     }
 
+    /**
+     * Show the form for creating a new order (seller-initiated).
+     */
+    public function create(\App\Models\Business $business): View
+    {
+        // Get all buyer businesses for the customer dropdown
+        $buyers = \App\Models\Business::where('is_active', true)
+            ->whereIn('business_type', ['buyer', 'both'])
+            ->with(['locations' => function ($query) {
+                $query->where('is_active', true)->orderBy('is_primary', 'desc')->orderBy('name');
+            }])
+            ->orderBy('name')
+            ->get();
+
+        // Get recently ordered products (last 30 days, top 10 most common)
+        $recentProducts = \App\Models\Product::forBusiness($business)
+            ->whereHas('orderItems', function ($query) {
+                $query->where('created_at', '>=', now()->subDays(30));
+            })
+            ->with(['brand', 'images'])
+            ->withCount(['orderItems' => function ($query) {
+                $query->where('created_at', '>=', now()->subDays(30));
+            }])
+            ->orderByDesc('order_items_count')
+            ->take(10)
+            ->get()
+            ->map(function ($product) use ($business) {
+                // Calculate inventory from InventoryItem model
+                $totalOnHand = $product->inventoryItems()
+                    ->where('business_id', $business->id)
+                    ->sum('quantity_on_hand');
+                $totalAllocated = $product->inventoryItems()
+                    ->where('business_id', $business->id)
+                    ->sum('quantity_allocated');
+
+                return [
+                    'id' => $product->id,
+                    'name' => $product->name,
+                    'sku' => $product->sku,
+                    'brand_name' => $product->brand?->name,
+                    'wholesale_price' => $product->wholesale_price,
+                    'quantity_available' => max(0, $totalOnHand - $totalAllocated),
+                    'type' => $product->type,
+                ];
+            });
+
+        return view('seller.orders.create', compact('business', 'buyers', 'recentProducts'));
+    }
+
+    /**
+     * Store a newly created order (seller-initiated).
+     */
+    public function store(\App\Models\Business $business, Request $request): RedirectResponse
+    {
+        $validated = $request->validate([
+            'buyer_business_id' => 'required|exists:businesses,id',
+            'location_id' => 'nullable|exists:locations,id',
+            'contact_id' => 'nullable|exists:contacts,id',
+            'payment_terms' => 'required|in:cod,net_15,net_30,net_60,net_90',
+            'notes' => 'nullable|string|max:1000',
+            'items' => 'required|array|min:1',
+            'items.*.product_id' => 'required|exists:products,id',
+            'items.*.quantity' => 'required|integer|min:1',
+            'items.*.unit_price' => 'required|numeric|min:0',
+            'items.*.discount_amount' => 'nullable|numeric|min:0',
+            'items.*.discount_type' => 'nullable|in:fixed,percent',
+            'items.*.notes' => 'nullable|string|max:500',
+            'items.*.batch_id' => 'nullable|exists:batches,id',
+        ]);
+
+        try {
+            // Create the order
+            $order = Order::create([
+                'business_id' => $validated['buyer_business_id'],
+                'location_id' => $validated['location_id'] ?? null,
+                'contact_id' => $validated['contact_id'] ?? null,
+                'user_id' => auth()->id(),
+                'status' => 'new',
+                'created_by' => 'seller',
+                'payment_terms' => $validated['payment_terms'],
+                'notes' => $validated['notes'] ?? null,
+            ]);
+
+            // Add line items
+            $subtotal = 0;
+            foreach ($validated['items'] as $item) {
+                $product = \App\Models\Product::findOrFail($item['product_id']);
+
+                $lineSubtotal = $item['quantity'] * $item['unit_price'];
+                $discountAmount = 0;
+
+                if (! empty($item['discount_amount']) && $item['discount_amount'] > 0) {
+                    if (($item['discount_type'] ?? 'percent') === 'percent') {
+                        $discountAmount = $lineSubtotal * ($item['discount_amount'] / 100);
+                    } else {
+                        $discountAmount = $item['discount_amount'];
+                    }
+                }
+
+                $lineTotal = $lineSubtotal - $discountAmount;
+                $subtotal += $lineTotal;
+
+                $order->items()->create([
+                    'product_id' => $item['product_id'],
+                    'batch_id' => $item['batch_id'] ?? null,
+                    'quantity' => $item['quantity'],
+                    'price' => $item['unit_price'],
+                    'discount_amount' => $discountAmount,
+                    'total' => $lineTotal,
+                    'notes' => $item['notes'] ?? null,
+                ]);
+            }
+
+            // Update order totals
+            $order->update([
+                'subtotal' => $subtotal,
+                'total' => $subtotal, // Tax can be added later
+            ]);
+
+            return redirect()
+                ->route('seller.business.orders.show', [$business->slug, $order])
+                ->with('success', 'Order created successfully!');
+        } catch (\Exception $e) {
+            return back()
+                ->withInput()
+                ->with('error', 'Failed to create order: '.$e->getMessage());
+        }
+    }
+
     /**
      * Display order detail with workorder/picking ticket functionality.
      */
@@ -213,6 +342,41 @@ class OrderController extends Controller
         return back()->with('success', "Order {$order->order_number} has been cancelled.");
     }
 
+    /**
+     * Update item comment for an order line item.
+     */
+    public function updateItemComment(\App\Models\Business $business, Order $order, \App\Models\OrderItem $orderItem, Request $request): RedirectResponse
+    {
+        // Verify the item belongs to this order
+        if ($orderItem->order_id !== $order->id) {
+            abort(404);
+        }
+
+        $validated = $request->validate([
+            'item_comment' => 'nullable|string|max:2000',
+        ]);
+
+        $orderItem->update([
+            'item_comment' => $validated['item_comment'],
+        ]);
+
+        return back()->with('success', 'Item comment updated.');
+    }
+
+    /**
+     * Toggle ping pong mode for an order.
+     */
+    public function togglePingPong(\App\Models\Business $business, Order $order): RedirectResponse
+    {
+        $order->update([
+            'is_ping_pong' => ! $order->is_ping_pong,
+        ]);
+
+        $status = $order->is_ping_pong ? 'enabled' : 'disabled';
+
+        return back()->with('success', "Ping Pong flow {$status} for this order.");
+    }
+
     /**
      * Approve order for delivery (after buyer selects delivery method).
      */

app/Http/Controllers/Seller/BrandController.php

@@ -55,6 +55,7 @@ class BrandController extends Controller
                 'is_active' => $brand->is_active,
                 'is_public' => $brand->is_public,
                 'is_featured' => $brand->is_featured,
+                'is_cannaiq_connected' => $brand->isCannaiqConnected(),
                 'products_count' => $brand->products_count ?? 0,
                 'updated_at' => $brand->updated_at?->diffForHumans(),
                 'website_url' => $brand->website_url,
@@ -770,6 +771,11 @@ class BrandController extends Controller
         // ═══════════════════════════════════════════════════════════════
         $salesStats = $this->calculateBrandStats($brand, $ninetyDaysAgo, now());
 
+        // ═══════════════════════════════════════════════════════════════
+        // STORE INTELLIGENCE (90 days)
+        // ═══════════════════════════════════════════════════════════════
+        $storeStats = $this->calculateStoreStats($brand, 90);
+
         // ═══════════════════════════════════════════════════════════════
         // PRODUCT VELOCITY DATA
         // ═══════════════════════════════════════════════════════════════
@@ -883,6 +889,7 @@ class BrandController extends Controller
             'isBrandManager' => $isBrandManager,
             // Core stats
             'salesStats' => $salesStats,
+            'storeStats' => $storeStats,
             'productCategories' => $productCategories,
             'productVelocity' => $productVelocity,
             // Product states
@@ -2092,4 +2099,185 @@ class BrandController extends Controller
                 'store_id' => $storeId,
             ]);
     }
+
+    /**
+     * Connect brand to CannaiQ API.
+     *
+     * Normalizes the brand name and stores as cannaiq_brand_key.
+     */
+    public function cannaiqConnect(Request $request, Business $business, Brand $brand)
+    {
+        $this->authorize('update', [$brand, $business]);
+
+        $validated = $request->validate([
+            'brand_name' => 'required|string|max:255',
+        ]);
+
+        $brand->connectToCannaiq($validated['brand_name']);
+
+        if ($request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Brand connected to CannaiQ',
+                'cannaiq_brand_key' => $brand->cannaiq_brand_key,
+            ]);
+        }
+
+        return redirect()
+            ->route('seller.business.brands.dashboard', [$business->slug, $brand->hashid, 'tab' => 'settings'])
+            ->with('success', 'Brand connected to CannaiQ successfully!');
+    }
+
+    /**
+     * Disconnect brand from CannaiQ API.
+     */
+    public function cannaiqDisconnect(Request $request, Business $business, Brand $brand)
+    {
+        $this->authorize('update', [$brand, $business]);
+
+        $brand->disconnectFromCannaiq();
+
+        if ($request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'message' => 'Brand disconnected from CannaiQ',
+            ]);
+        }
+
+        return redirect()
+            ->route('seller.business.brands.dashboard', [$business->slug, $brand->hashid, 'tab' => 'settings'])
+            ->with('success', 'Brand disconnected from CannaiQ.');
+    }
+
+    /**
+     * CannaiQ product mapping page.
+     *
+     * Shows Hub products for this brand and allows mapping to CannaiQ products.
+     */
+    public function cannaiqMapping(Business $business, Brand $brand)
+    {
+        $this->authorize('view', [$brand, $business]);
+
+        if (! $brand->isCannaiqConnected()) {
+            return redirect()
+                ->route('seller.business.brands.dashboard', [$business->slug, $brand->hashid, 'tab' => 'settings'])
+                ->with('error', 'Please connect this brand to CannaiQ first.');
+        }
+
+        $products = $brand->products()
+            ->with('cannaiqMappings')
+            ->where('is_active', true)
+            ->orderBy('name')
+            ->get();
+
+        return view('seller.brands.cannaiq-mapping', [
+            'business' => $business,
+            'brand' => $brand,
+            'products' => $products,
+        ]);
+    }
+
+    /**
+     * Map a Hub product to a CannaiQ product.
+     */
+    public function cannaiqMapProduct(Request $request, Business $business, Brand $brand)
+    {
+        $this->authorize('update', [$brand, $business]);
+
+        $validated = $request->validate([
+            'product_id' => 'required|exists:products,id',
+            'cannaiq_product_id' => 'required|integer',
+            'cannaiq_product_name' => 'required|string|max:255',
+            'cannaiq_store_id' => 'nullable|string|max:255',
+            'cannaiq_store_name' => 'nullable|string|max:255',
+        ]);
+
+        // Verify product belongs to this brand
+        $product = $brand->products()->findOrFail($validated['product_id']);
+
+        // Create mapping (ignore if already exists)
+        $mapping = $product->cannaiqMappings()->firstOrCreate(
+            ['cannaiq_product_id' => $validated['cannaiq_product_id']],
+            [
+                'cannaiq_product_name' => $validated['cannaiq_product_name'],
+                'cannaiq_store_id' => $validated['cannaiq_store_id'] ?? null,
+                'cannaiq_store_name' => $validated['cannaiq_store_name'] ?? null,
+            ]
+        );
+
+        if ($request->wantsJson()) {
+            return response()->json([
+                'success' => true,
+                'mapping' => $mapping,
+            ]);
+        }
+
+        return redirect()
+            ->route('seller.business.brands.cannaiq.mapping', [$business->slug, $brand->hashid])
+            ->with('success', 'Product mapped successfully.');
+    }
+
+    /**
+     * Remove a product mapping.
+     */
+    public function cannaiqUnmapProduct(Request $request, Business $business, Brand $brand, \App\Models\ProductCannaiqMapping $mapping)
+    {
+        $this->authorize('update', [$brand, $business]);
+
+        // Verify mapping belongs to a product of this brand
+        if ($mapping->product->brand_id !== $brand->id) {
+            abort(403);
+        }
+
+        $mapping->delete();
+
+        if ($request->wantsJson()) {
+            return response()->json(['success' => true]);
+        }
+
+        return redirect()
+            ->route('seller.business.brands.cannaiq.mapping', [$business->slug, $brand->hashid])
+            ->with('success', 'Mapping removed.');
+    }
+
+    /**
+     * Calculate store/distribution metrics for the brand.
+     *
+     * Returns metrics about store penetration, SKU stock rate, and average SKUs per store.
+     */
+    private function calculateStoreStats(Brand $brand, int $days = 90): array
+    {
+        // Count unique buyer businesses (stores) that ordered this brand in current period
+        $currentStores = \App\Models\Order::whereHas('items.product', fn ($q) => $q->where('brand_id', $brand->id))
+            ->where('created_at', '>=', now()->subDays($days))
+            ->distinct('business_id')
+            ->count('business_id');
+
+        // Previous period for comparison
+        $previousStores = \App\Models\Order::whereHas('items.product', fn ($q) => $q->where('brand_id', $brand->id))
+            ->whereBetween('created_at', [now()->subDays($days * 2), now()->subDays($days)])
+            ->distinct('business_id')
+            ->count('business_id');
+
+        // SKU stock rate: % of brand's active SKUs that have been ordered
+        $activeSkus = $brand->products()->where('is_active', true)->count();
+        $orderedSkus = \App\Models\OrderItem::whereHas('product', fn ($q) => $q->where('brand_id', $brand->id))
+            ->whereHas('order', fn ($q) => $q->where('created_at', '>=', now()->subDays($days)))
+            ->distinct('product_id')
+            ->count('product_id');
+
+        $stockRate = $activeSkus > 0 ? round(($orderedSkus / $activeSkus) * 100, 1) : 0;
+
+        // Avg SKUs per store
+        $avgSkusPerStore = $currentStores > 0 ? round($orderedSkus / $currentStores, 1) : 0;
+
+        return [
+            'currentStores' => $currentStores,
+            'storeChange' => $currentStores - $previousStores,
+            'stockRate' => $stockRate,
+            'avgSkusPerStore' => $avgSkusPerStore,
+            'orderedSkus' => $orderedSkus,
+            'activeSkus' => $activeSkus,
+        ];
+    }
 }

app/Http/Controllers/Seller/BrandPortalController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Seller;
 use App\Http\Controllers\Controller;
 use App\Models\Brand;
 use App\Models\Business;
+use App\Models\Crm\CrmThread;
 use App\Models\Order;
 use App\Models\Product;
 use App\Models\Promotion;
@@ -268,19 +269,26 @@ class BrandPortalController extends Controller
     /**
      * Inbox - Conversations (messaging).
      *
-     * Shows conversations related to the business.
-     * Uses existing messaging infrastructure but scoped to Brand Portal context.
+     * Shows CRM threads related to the user's linked brands only.
+     * Uses CrmThread scoped by brand_id for filtering.
      */
     public function inbox(Request $request, Business $business)
     {
         $brandIds = $this->validateAccessAndGetBrandIds($business);
         $brands = Brand::whereIn('id', $brandIds)->get();
 
-        // For inbox, we show conversations but in a limited Brand Portal context
-        // This integrates with existing messaging system
+        // Get threads filtered to only those related to linked brands
+        $threads = CrmThread::forBusiness($business->id)
+            ->forBrandPortal($brandIds)
+            ->with(['contact', 'assignee', 'brand'])
+            ->withCount('messages')
+            ->orderByDesc('last_message_at')
+            ->paginate(25);
+
         return view('seller.brand-portal.inbox', compact(
             'business',
-            'brands'
+            'brands',
+            'threads'
         ));
     }
 

app/Http/Controllers/Seller/BrandStoresController.php

@@ -176,9 +176,10 @@ class BrandStoresController extends Controller
         // Calculate metrics
         $daysPeriod = 28; // 4 weeks
         $totalSkusAvailable = $brand->products()->where('is_active', true)->count();
+        $avgPrice = $brand->products()->avg('wholesale_price') ?? 0; // Calculate once outside loop
 
         // Build store rows with enhanced columns
-        $storeRows = $storesSales->map(function ($sales, $storeId) use ($stores, $daysPeriod, $totalSkusAvailable, $brand) {
+        $storeRows = $storesSales->map(function ($sales, $storeId) use ($stores, $daysPeriod, $totalSkusAvailable, $avgPrice) {
             $store = $stores->get($storeId);
             if (! $store) {
                 return null;
@@ -190,7 +191,6 @@ class BrandStoresController extends Controller
             $avgDailyUnits = $daysPeriod > 0 ? round($sales->total_units / $daysPeriod, 1) : 0;
 
             // Calculate lost opportunity (simplified)
-            $avgPrice = $brand->products()->avg('wholesale_price') ?? 0;
             $lostOpportunity = $oosSkus * $avgPrice * 7;
 
             return [
@@ -198,6 +198,7 @@ class BrandStoresController extends Controller
                 'slug' => $store->slug,
                 'name' => $store->name,
                 'address' => $this->formatStoreAddress($store),
+                'business_type' => $store->business_type,
                 'tags' => [], // CannaiQ: will provide "must_win" etc.
                 'active_skus' => $activeSkus,
                 'oos_skus' => $oosSkus,
@@ -285,9 +286,10 @@ class BrandStoresController extends Controller
         // Calculate metrics
         $daysPeriod = 28; // 4 weeks
         $totalSkusAvailable = $brand->products()->where('is_active', true)->count();
+        $avgPrice = $brand->products()->avg('wholesale_price') ?? 0; // Calculate once outside loop
 
         // Build store rows
-        $storeRows = $storesSales->map(function ($sales, $storeId) use ($stores, $daysPeriod, $totalSkusAvailable, $brand) {
+        $storeRows = $storesSales->map(function ($sales, $storeId) use ($stores, $daysPeriod, $totalSkusAvailable, $avgPrice) {
             $store = $stores->get($storeId);
             if (! $store) {
                 return null;
@@ -299,7 +301,6 @@ class BrandStoresController extends Controller
             $avgDailyUnits = $daysPeriod > 0 ? round($sales->total_units / $daysPeriod, 1) : 0;
 
             // Calculate lost opportunity (simplified: OOS SKUs * avg price * estimated days)
-            $avgPrice = $brand->products()->avg('wholesale_price') ?? 0;
             $lostOpportunity = $oosSkus * $avgPrice * 7; // 7 days estimated
 
             return [
@@ -307,6 +308,7 @@ class BrandStoresController extends Controller
                 'slug' => $store->slug,
                 'name' => $store->name,
                 'address' => $this->formatStoreAddress($store),
+                'business_type' => $store->business_type,
                 'active_skus' => $activeSkus,
                 'oos_skus' => $oosSkus,
                 'oos_percent' => $oosPercent,

app/Http/Controllers/Seller/ChatController.php

@@ -0,0 +1,415 @@
+<?php
+
+namespace App\Http\Controllers\Seller;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\Crm\CrmActiveView;
+use App\Models\Crm\CrmChannel;
+use App\Models\Crm\CrmInternalNote;
+use App\Models\Crm\CrmThread;
+use App\Models\User;
+use App\Services\Crm\CrmAiService;
+use App\Services\Crm\CrmChannelService;
+use App\Services\Crm\CrmSlaService;
+use Illuminate\Http\Request;
+
+class ChatController extends Controller
+{
+    public function __construct(
+        protected CrmChannelService $channelService,
+        protected CrmSlaService $slaService,
+        protected CrmAiService $aiService
+    ) {}
+
+    /**
+     * Unified chat inbox view (Chatwoot-style)
+     */
+    public function index(Request $request, Business $business)
+    {
+        $query = CrmThread::forBusiness($business->id)
+            ->with(['contact', 'assignee', 'brand', 'channel', 'messages' => fn ($q) => $q->latest()->limit(1)])
+            ->withCount('messages');
+
+        // Filters
+        if ($request->filled('status')) {
+            $query->where('status', $request->status);
+        }
+
+        if ($request->filled('assigned_to')) {
+            if ($request->assigned_to === 'unassigned') {
+                $query->unassigned();
+            } else {
+                $query->assignedTo($request->assigned_to);
+            }
+        }
+
+        if ($request->filled('department')) {
+            $query->forDepartment($request->department);
+        }
+
+        if ($request->filled('brand_id')) {
+            $query->forBrand($request->brand_id);
+        }
+
+        if ($request->filled('search')) {
+            $query->where(function ($q) use ($request) {
+                $q->where('subject', 'ilike', "%{$request->search}%")
+                    ->orWhere('last_message_preview', 'ilike', "%{$request->search}%")
+                    ->orWhereHas('contact', fn ($c) => $c->where('name', 'ilike', "%{$request->search}%"));
+            });
+        }
+
+        $threads = $query->orderByDesc('last_message_at')->paginate(50);
+
+        // Get team members for assignment dropdown
+        $teamMembers = User::whereHas('businesses', fn ($q) => $q->where('businesses.id', $business->id))->get();
+
+        // Get available channels
+        $channels = $this->channelService->getAvailableChannels($business->id);
+
+        // Get brands for filter dropdown
+        $brands = \App\Models\Brand::where('business_id', $business->id)
+            ->where('is_active', true)
+            ->orderBy('name')
+            ->get();
+
+        // Get departments for filter dropdown
+        $departments = CrmChannel::DEPARTMENTS;
+
+        // Get contacts for new conversation modal
+        // Include: 1) Customer contacts (from businesses that ordered), 2) Own business contacts (coworkers)
+        $customerBusinessIds = \App\Models\Order::whereHas('items.product.brand', fn ($q) => $q->where('business_id', $business->id))
+            ->pluck('business_id')
+            ->unique();
+
+        // Add the seller's own business ID to include coworkers
+        $allBusinessIds = $customerBusinessIds->push($business->id)->unique();
+
+        $contacts = \App\Models\Contact::whereIn('business_id', $allBusinessIds)
+            ->with('business:id,name')
+            ->orderBy('first_name')
+            ->limit(200)
+            ->get();
+
+        return view('seller.chat.index', compact(
+            'business',
+            'threads',
+            'teamMembers',
+            'channels',
+            'brands',
+            'departments',
+            'contacts'
+        ));
+    }
+
+    /**
+     * API: Get thread data for inline loading
+     */
+    public function getThread(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $thread->load([
+            'contact',
+            'account',
+            'assignee',
+            'brand',
+            'channel',
+            'messages.attachments',
+            'messages.user',
+            'deals',
+            'internalNotes.user',
+            'tags.tag',
+        ]);
+
+        // Mark as read
+        $thread->markAsRead($request->user());
+
+        // Start viewing (collision detection)
+        CrmActiveView::startViewing($thread, $request->user());
+
+        // Get other viewers
+        $otherViewers = CrmActiveView::getActiveViewers($thread, $request->user()->id);
+
+        // Get SLA status
+        $slaStatus = $this->slaService->getThreadSlaStatus($thread);
+
+        // Get AI suggestions
+        $suggestions = $thread->aiSuggestions()->pending()->notExpired()->get();
+
+        // Get available channels for reply
+        $channels = $this->channelService->getAvailableChannels($business->id);
+
+        // Get team members for assignment dropdown
+        $teamMembers = User::whereHas('businesses', fn ($q) => $q->where('businesses.id', $business->id))->get();
+
+        return response()->json([
+            'thread' => $thread,
+            'otherViewers' => $otherViewers->map(fn ($v) => [
+                'id' => $v->user->id,
+                'name' => $v->user->name,
+                'type' => $v->view_type,
+            ]),
+            'slaStatus' => $slaStatus,
+            'suggestions' => $suggestions,
+            'channels' => $channels,
+            'teamMembers' => $teamMembers,
+        ]);
+    }
+
+    /**
+     * API: Send reply in thread
+     */
+    public function reply(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $validated = $request->validate([
+            'body' => 'required|string|max:10000',
+            'channel_type' => 'required|string|in:sms,email,whatsapp,instagram,in_app',
+        ]);
+
+        $contact = $thread->contact;
+        $to = $validated['channel_type'] === CrmChannel::TYPE_EMAIL
+            ? $contact->email
+            : $contact->phone;
+
+        if (! $to) {
+            return response()->json(['error' => 'Contact does not have required contact info for this channel.'], 422);
+        }
+
+        $success = $this->channelService->sendMessage(
+            businessId: $business->id,
+            channelType: $validated['channel_type'],
+            to: $to,
+            body: $validated['body'],
+            subject: null,
+            threadId: $thread->id,
+            contactId: $contact->id,
+            userId: $request->user()->id,
+            attachments: []
+        );
+
+        if (! $success) {
+            return response()->json(['error' => 'Failed to send message.'], 500);
+        }
+
+        // Auto-assign thread to sender if unassigned
+        if ($thread->assigned_to === null) {
+            $thread->assigned_to = $request->user()->id;
+            $thread->save();
+        }
+
+        // Handle SLA
+        $this->slaService->handleOutboundMessage($thread);
+
+        // Reload messages
+        $thread->load(['messages.attachments', 'messages.user']);
+
+        return response()->json([
+            'success' => true,
+            'messages' => $thread->messages,
+        ]);
+    }
+
+    /**
+     * API: Create new thread
+     */
+    public function store(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'contact_id' => 'required|exists:contacts,id',
+            'channel_type' => 'required|string|in:sms,email,whatsapp,instagram,in_app',
+            'body' => 'required|string|max:10000',
+        ]);
+
+        // Get allowed business IDs (customers + own business for coworkers)
+        $customerBusinessIds = \App\Models\Order::whereHas('items.product.brand', fn ($q) => $q->where('business_id', $business->id))
+            ->pluck('business_id')
+            ->unique();
+        $allBusinessIds = $customerBusinessIds->push($business->id)->unique();
+
+        // SECURITY: Verify contact belongs to a customer business or own business (coworker)
+        $contact = \App\Models\Contact::whereIn('business_id', $allBusinessIds)
+            ->findOrFail($validated['contact_id']);
+
+        $to = $validated['channel_type'] === CrmChannel::TYPE_EMAIL
+            ? $contact->email
+            : $contact->phone;
+
+        if (! $to) {
+            return response()->json(['error' => 'Contact does not have the required contact info for this channel.'], 422);
+        }
+
+        // Create thread
+        $thread = CrmThread::create([
+            'business_id' => $business->id,
+            'contact_id' => $contact->id,
+            'account_id' => $contact->account_id,
+            'status' => 'open',
+            'priority' => 'normal',
+            'last_channel_type' => $validated['channel_type'],
+            'assigned_to' => $request->user()->id,
+        ]);
+
+        // Send the message
+        $success = $this->channelService->sendMessage(
+            businessId: $business->id,
+            channelType: $validated['channel_type'],
+            to: $to,
+            body: $validated['body'],
+            subject: null,
+            threadId: $thread->id,
+            contactId: $contact->id,
+            userId: $request->user()->id,
+            attachments: []
+        );
+
+        if (! $success) {
+            $thread->delete();
+
+            return response()->json(['error' => 'Failed to send message.'], 500);
+        }
+
+        $thread->load(['contact', 'messages']);
+
+        return response()->json([
+            'success' => true,
+            'thread' => $thread,
+        ]);
+    }
+
+    /**
+     * API: Assign thread
+     */
+    public function assign(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $validated = $request->validate([
+            'assigned_to' => 'nullable|exists:users,id',
+        ]);
+
+        if ($validated['assigned_to']) {
+            $assignee = User::where('id', $validated['assigned_to'])
+                ->whereHas('businesses', fn ($q) => $q->where('businesses.id', $business->id))
+                ->first();
+
+            if (! $assignee) {
+                return response()->json(['error' => 'Invalid user.'], 422);
+            }
+
+            $thread->assignTo($assignee, $request->user());
+        } else {
+            $thread->assigned_to = null;
+            $thread->save();
+        }
+
+        return response()->json(['success' => true]);
+    }
+
+    /**
+     * API: Close thread
+     */
+    public function close(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $thread->close($request->user());
+
+        return response()->json(['success' => true, 'status' => 'closed']);
+    }
+
+    /**
+     * API: Reopen thread
+     */
+    public function reopen(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $thread->reopen($request->user());
+        $this->slaService->resumeTimers($thread);
+
+        return response()->json(['success' => true, 'status' => 'open']);
+    }
+
+    /**
+     * API: Add internal note
+     */
+    public function addNote(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $validated = $request->validate([
+            'content' => 'required|string|max:5000',
+        ]);
+
+        $note = CrmInternalNote::create([
+            'business_id' => $business->id,
+            'user_id' => $request->user()->id,
+            'notable_type' => CrmThread::class,
+            'notable_id' => $thread->id,
+            'content' => $validated['content'],
+        ]);
+
+        $note->load('user');
+
+        return response()->json(['success' => true, 'note' => $note]);
+    }
+
+    /**
+     * API: Generate AI reply
+     */
+    public function generateAiReply(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Not found'], 404);
+        }
+
+        $suggestion = $this->aiService->generateReplyDraft($thread, $request->input('tone', 'professional'));
+
+        if (! $suggestion) {
+            return response()->json(['error' => 'Failed to generate reply.'], 500);
+        }
+
+        return response()->json([
+            'content' => $suggestion->content,
+            'suggestion_id' => $suggestion->id,
+        ]);
+    }
+
+    /**
+     * API: Heartbeat for active viewing
+     */
+    public function heartbeat(Request $request, Business $business, CrmThread $thread)
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        CrmActiveView::startViewing($thread, $request->user(), $request->input('view_type', 'viewing'));
+
+        $otherViewers = CrmActiveView::getActiveViewers($thread, $request->user()->id);
+
+        return response()->json([
+            'other_viewers' => $otherViewers->map(fn ($v) => [
+                'id' => $v->user->id,
+                'name' => $v->user->name,
+                'type' => $v->view_type,
+            ]),
+        ]);
+    }
+}

app/Http/Controllers/Seller/Crm/AccountController.php

@@ -39,11 +39,16 @@ class AccountController extends Controller
             });
         }
 
-        // Status filter - default to approved, but allow viewing all
-        if ($request->filled('status') && $request->status !== 'all') {
-            $query->where('status', $request->status);
-        } else {
-            $query->where('status', 'approved');
+        // Only show approved accounts (approved buyers)
+        $query->where('status', 'approved');
+
+        // Active/Inactive filter
+        if ($request->filled('status')) {
+            if ($request->status === 'active') {
+                $query->where('is_active', true);
+            } elseif ($request->status === 'inactive') {
+                $query->where('is_active', false);
+            }
         }
 
         $accounts = $query->orderBy('name')->paginate(25);

app/Http/Controllers/Seller/Crm/DealController.php

@@ -115,13 +115,13 @@ class DealController extends Controller
             ->limit(100)
             ->get();
 
-        // Limit accounts for dropdown - buyers who have ordered from this seller
-        $accounts = Business::where('type', 'buyer')
-            ->whereHas('orders', function ($q) use ($business) {
-                $q->whereHas('items.product.brand', fn ($b) => $b->where('business_id', $business->id));
-            })
+        // Limit accounts for dropdown - most recent 100
+        // Get businesses that have placed orders containing this seller's products
+        $accounts = Business::whereHas('orders', function ($q) use ($business) {
+            $q->whereHas('items.product.brand', fn ($b) => $b->where('business_id', $business->id));
+        })
             ->select('id', 'name')
-            ->orderBy('name')
+            ->orderByDesc('updated_at')
             ->limit(100)
             ->get();
 

app/Http/Controllers/Seller/Crm/InvoiceController.php

@@ -165,7 +165,7 @@ class InvoiceController extends Controller
             'title' => 'required|string|max:255',
             'contact_id' => 'required|exists:contacts,id',
             'account_id' => 'nullable|exists:businesses,id',
-            'location_id' => 'nullable|exists:business_locations,id',
+            'location_id' => 'nullable|exists:locations,id',
             'quote_id' => 'nullable|exists:crm_quotes,id',
             'deal_id' => 'nullable|exists:crm_deals,id',
             'due_date' => 'required|date|after_or_equal:today',
@@ -309,7 +309,7 @@ class InvoiceController extends Controller
             'title' => 'required|string|max:255',
             'contact_id' => 'required|exists:contacts,id',
             'account_id' => 'nullable|exists:businesses,id',
-            'location_id' => 'nullable|exists:business_locations,id',
+            'location_id' => 'nullable|exists:locations,id',
             'deal_id' => 'nullable|exists:crm_deals,id',
             'due_date' => 'required|date',
             'tax_rate' => 'nullable|numeric|min:0|max:100',

app/Http/Controllers/Seller/Crm/QuoteController.php

@@ -13,7 +13,6 @@ use App\Models\Crm\CrmQuoteItem;
 use App\Models\Location;
 use App\Models\Order;
 use App\Models\OrderItem;
-use App\Models\Product;
 use App\Services\Accounting\ArService;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Illuminate\Http\Request;
@@ -247,7 +246,7 @@ class QuoteController extends Controller
             abort(404);
         }
 
-        $quote->load(['contact', 'account', 'deal', 'creator', 'items.product', 'invoice', 'files']);
+        $quote->load(['contact', 'account', 'deal', 'creator', 'items.product.brand', 'invoice', 'files']);
 
         return view('seller.crm.quotes.show', compact('quote', 'business'));
     }
@@ -265,16 +264,9 @@ class QuoteController extends Controller
             return back()->withErrors(['error' => 'This quote cannot be edited.']);
         }
 
-        $quote->load('items');
+        $quote->load(['items.product', 'contact', 'account', 'deal']);
 
-        $contacts = Contact::where('business_id', $business->id)->get();
-        $accounts = Business::whereHas('ordersAsCustomer')->get();
-        $deals = CrmDeal::forBusiness($business->id)->open()->get();
-        $products = Product::whereHas('brand', fn ($q) => $q->where('business_id', $business->id))
-            ->where('is_active', true)
-            ->get();
-
-        return view('seller.crm.quotes.edit', compact('quote', 'contacts', 'accounts', 'deals', 'products', 'business'));
+        return view('seller.crm.quotes.edit', compact('quote', 'business'));
     }
 
     /**
@@ -589,7 +581,7 @@ class QuoteController extends Controller
             'sellerBusiness' => $business,
         ]);
 
-        return $pdf->inline("{$quote->quote_number}.pdf");
+        return $pdf->stream("{$quote->quote_number}.pdf");
     }
 
     /**

app/Http/Controllers/Seller/Crm/ThreadController.php

@@ -2,17 +2,24 @@
 
 namespace App\Http\Controllers\Seller\Crm;
 
+use App\Events\CrmTypingIndicator;
 use App\Http\Controllers\Controller;
+use App\Models\AgentStatus;
 use App\Models\Business;
+use App\Models\ChatQuickReply;
+use App\Models\Contact;
 use App\Models\Crm\CrmActiveView;
 use App\Models\Crm\CrmChannel;
 use App\Models\Crm\CrmInternalNote;
 use App\Models\Crm\CrmThread;
+use App\Models\SalesRepAssignment;
 use App\Models\User;
 use App\Services\Crm\CrmAiService;
 use App\Services\Crm\CrmChannelService;
 use App\Services\Crm\CrmSlaService;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 
 class ThreadController extends Controller
 {
@@ -446,4 +453,363 @@ class ThreadController extends Controller
             ]),
         ]);
     }
+
+    // ========================================
+    // API Endpoints for Real-Time Inbox
+    // ========================================
+
+    /**
+     * API: Get threads list for real-time updates
+     */
+    public function apiIndex(Request $request, Business $business): JsonResponse
+    {
+        $user = $request->user();
+
+        $query = CrmThread::forBusiness($business->id)
+            ->with(['contact:id,first_name,last_name,email,phone', 'assignee:id,name', 'channel:id,type,name', 'account:id,name'])
+            ->withCount('messages');
+
+        // Apply "my accounts" filter for sales reps
+        if ($request->boolean('my_accounts')) {
+            $query->forSalesRep($business->id, $user->id);
+        }
+
+        // Status filter
+        if ($request->filled('status') && $request->status !== 'all') {
+            $query->where('status', $request->status);
+        }
+
+        // Channel filter
+        if ($request->filled('channel') && $request->channel !== 'all') {
+            $query->where('last_channel_type', $request->channel);
+        }
+
+        // Assigned filter
+        if ($request->filled('assigned')) {
+            if ($request->assigned === 'me') {
+                $query->where('assigned_to', $user->id);
+            } elseif ($request->assigned === 'unassigned') {
+                $query->whereNull('assigned_to');
+            } elseif (is_numeric($request->assigned)) {
+                $query->where('assigned_to', $request->assigned);
+            }
+        }
+
+        // Search
+        if ($request->filled('search')) {
+            $search = $request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('subject', 'ilike', "%{$search}%")
+                    ->orWhere('last_message_preview', 'ilike', "%{$search}%")
+                    ->orWhereHas('contact', fn ($c) => $c->whereRaw("CONCAT(first_name, ' ', last_name) ILIKE ?", ["%{$search}%"]))
+                    ->orWhereHas('account', fn ($a) => $a->where('name', 'ilike', "%{$search}%"));
+            });
+        }
+
+        $threads = $query->orderByDesc('last_message_at')
+            ->limit($request->input('limit', 50))
+            ->get();
+
+        return response()->json([
+            'threads' => $threads->map(fn ($t) => [
+                'id' => $t->id,
+                'subject' => $t->subject,
+                'status' => $t->status,
+                'priority' => $t->priority,
+                'is_read' => $t->is_read,
+                'last_message_at' => $t->last_message_at?->toIso8601String(),
+                'last_message_preview' => $t->last_message_preview,
+                'last_message_direction' => $t->last_message_direction,
+                'last_channel_type' => $t->last_channel_type,
+                'contact' => $t->contact ? [
+                    'id' => $t->contact->id,
+                    'name' => $t->contact->getFullName(),
+                    'email' => $t->contact->email,
+                    'phone' => $t->contact->phone,
+                ] : null,
+                'account' => $t->account ? [
+                    'id' => $t->account->id,
+                    'name' => $t->account->name,
+                ] : null,
+                'assignee' => $t->assignee ? [
+                    'id' => $t->assignee->id,
+                    'name' => $t->assignee->name,
+                ] : null,
+                'messages_count' => $t->messages_count,
+            ]),
+        ]);
+    }
+
+    /**
+     * API: Get messages for a thread
+     */
+    public function apiMessages(Request $request, Business $business, CrmThread $thread): JsonResponse
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $query = $thread->messages()
+            ->with(['user:id,name', 'attachments'])
+            ->orderBy('created_at', 'asc');
+
+        // Pagination for infinite scroll
+        if ($request->filled('before_id')) {
+            $query->where('id', '<', $request->before_id);
+        }
+
+        $messages = $query->limit($request->input('limit', 50))->get();
+
+        // Mark thread as read
+        if ($messages->isNotEmpty()) {
+            $thread->markAsRead($request->user());
+        }
+
+        return response()->json([
+            'messages' => $messages->map(fn ($m) => [
+                'id' => $m->id,
+                'body' => $m->body,
+                'body_html' => $m->body_html,
+                'direction' => $m->direction,
+                'channel_type' => $m->channel_type,
+                'sender_id' => $m->user_id,
+                'sender_name' => $m->user?->name ?? ($m->direction === 'inbound' ? $thread->contact?->getFullName() : 'System'),
+                'status' => $m->status,
+                'created_at' => $m->created_at->toIso8601String(),
+                'attachments' => $m->attachments->map(fn ($a) => [
+                    'id' => $a->id,
+                    'filename' => $a->original_filename ?? $a->filename,
+                    'mime_type' => $a->mime_type,
+                    'size' => $a->size,
+                    'url' => Storage::disk($a->disk ?? 'minio')->url($a->path),
+                ]),
+            ]),
+            'has_more' => $messages->count() === $request->input('limit', 50),
+            'thread' => [
+                'id' => $thread->id,
+                'subject' => $thread->subject,
+                'status' => $thread->status,
+                'contact' => $thread->contact ? [
+                    'id' => $thread->contact->id,
+                    'name' => $thread->contact->getFullName(),
+                    'email' => $thread->contact->email,
+                    'phone' => $thread->contact->phone,
+                ] : null,
+            ],
+        ]);
+    }
+
+    /**
+     * API: Send typing indicator
+     */
+    public function typing(Request $request, Business $business, CrmThread $thread): JsonResponse
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $validated = $request->validate([
+            'is_typing' => 'required|boolean',
+        ]);
+
+        broadcast(new CrmTypingIndicator(
+            threadId: $thread->id,
+            userId: $request->user()->id,
+            userName: $request->user()->name,
+            isTyping: $validated['is_typing']
+        ))->toOthers();
+
+        // Update active view type
+        CrmActiveView::startViewing(
+            $thread,
+            $request->user(),
+            $validated['is_typing'] ? CrmActiveView::VIEW_TYPE_TYPING : CrmActiveView::VIEW_TYPE_VIEWING
+        );
+
+        return response()->json(['success' => true]);
+    }
+
+    /**
+     * API: Get quick replies
+     */
+    public function quickReplies(Request $request, Business $business): JsonResponse
+    {
+        $quickReplies = ChatQuickReply::where('business_id', $business->id)
+            ->where('is_active', true)
+            ->orderByDesc('usage_count')
+            ->orderBy('sort_order')
+            ->get()
+            ->groupBy('category');
+
+        return response()->json([
+            'quick_replies' => $quickReplies,
+        ]);
+    }
+
+    /**
+     * API: Use a quick reply (increment usage count)
+     */
+    public function useQuickReply(Request $request, Business $business, ChatQuickReply $quickReply): JsonResponse
+    {
+        if ($quickReply->business_id !== $business->id) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        // Increment usage count
+        $quickReply->increment('usage_count');
+
+        // Process template variables
+        $message = $quickReply->message;
+
+        if ($request->filled('contact_id')) {
+            $contact = Contact::find($request->contact_id);
+            if ($contact) {
+                $message = str_replace(
+                    ['{{name}}', '{{first_name}}', '{{last_name}}', '{{company}}'],
+                    [$contact->getFullName(), $contact->first_name, $contact->last_name, $contact->business?->name ?? ''],
+                    $message
+                );
+            }
+        }
+
+        return response()->json([
+            'message' => $message,
+            'label' => $quickReply->label,
+        ]);
+    }
+
+    /**
+     * API: Get contact details with email engagement
+     */
+    public function apiContact(Request $request, Business $business, CrmThread $thread): JsonResponse
+    {
+        if ($thread->business_id !== $business->id) {
+            return response()->json(['error' => 'Unauthorized'], 403);
+        }
+
+        $contact = $thread->contact;
+        if (! $contact) {
+            return response()->json(['contact' => null]);
+        }
+
+        // Get recent email engagement
+        $emailEngagement = [];
+        if (class_exists(\App\Models\Analytics\EmailInteraction::class)) {
+            $emailEngagement = \App\Models\Analytics\EmailInteraction::where(function ($q) use ($contact) {
+                $q->where('recipient_email', $contact->email);
+                if ($contact->user_id) {
+                    $q->orWhere('recipient_user_id', $contact->user_id);
+                }
+            })
+                ->whereNotNull('first_opened_at')
+                ->with('emailCampaign:id,subject')
+                ->orderByDesc('first_opened_at')
+                ->limit(10)
+                ->get()
+                ->map(fn ($i) => [
+                    'id' => $i->id,
+                    'campaign_subject' => $i->emailCampaign?->subject ?? 'Unknown Campaign',
+                    'opened_at' => $i->first_opened_at?->toIso8601String(),
+                    'open_count' => $i->open_count,
+                    'clicked_at' => $i->first_clicked_at?->toIso8601String(),
+                    'click_count' => $i->click_count,
+                ]);
+        }
+
+        // Get recent orders from this contact's account
+        $recentOrders = [];
+        if ($thread->account_id) {
+            $recentOrders = \App\Models\Order::where('business_id', $thread->account_id)
+                ->whereHas('items.product.brand', fn ($q) => $q->where('business_id', $business->id))
+                ->orderByDesc('created_at')
+                ->limit(5)
+                ->get()
+                ->map(fn ($o) => [
+                    'id' => $o->id,
+                    'hashid' => $o->hashid,
+                    'total' => $o->total,
+                    'status' => $o->status,
+                    'created_at' => $o->created_at->toIso8601String(),
+                ]);
+        }
+
+        return response()->json([
+            'contact' => [
+                'id' => $contact->id,
+                'name' => $contact->getFullName(),
+                'email' => $contact->email,
+                'phone' => $contact->phone,
+                'title' => $contact->title,
+                'contact_type' => $contact->contact_type,
+            ],
+            'account' => $thread->account ? [
+                'id' => $thread->account->id,
+                'name' => $thread->account->name,
+                'address' => $thread->account->full_address ?? null,
+            ] : null,
+            'email_engagement' => $emailEngagement,
+            'recent_orders' => $recentOrders,
+        ]);
+    }
+
+    /**
+     * Unified inbox view (Chatwoot-style)
+     */
+    public function unified(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Get initial threads
+        $query = CrmThread::forBusiness($business->id)
+            ->with(['contact:id,first_name,last_name,email,phone', 'assignee:id,name', 'account:id,name'])
+            ->withCount('messages')
+            ->orderByDesc('last_message_at')
+            ->limit(50);
+
+        $threads = $query->get();
+
+        // Get team members with their status
+        $teamMemberStatuses = AgentStatus::where('business_id', $business->id)
+            ->where('last_seen_at', '>=', now()->subMinutes(5))
+            ->pluck('status', 'user_id');
+
+        $teamMembers = User::whereHas('businesses', fn ($q) => $q->where('businesses.id', $business->id))
+            ->select('id', 'first_name', 'last_name')
+            ->get()
+            ->map(fn ($member) => [
+                'id' => $member->id,
+                'name' => trim($member->first_name.' '.$member->last_name),
+                'status' => $teamMemberStatuses[$member->id] ?? 'offline',
+            ]);
+
+        // Get agent status
+        $agentStatus = AgentStatus::where('business_id', $business->id)
+            ->where('user_id', $user->id)
+            ->first();
+
+        // Get quick replies
+        $quickReplies = ChatQuickReply::where('business_id', $business->id)
+            ->where('is_active', true)
+            ->orderByDesc('usage_count')
+            ->get()
+            ->groupBy('category');
+
+        // Get channels
+        $channels = $this->channelService->getAvailableChannels($business->id);
+
+        // Check if user has sales rep assignments (for "My Accounts" filter)
+        $hasSalesRepAssignments = SalesRepAssignment::where('business_id', $business->id)
+            ->where('user_id', $user->id)
+            ->exists();
+
+        return view('seller.crm.inbox.unified', compact(
+            'business',
+            'threads',
+            'teamMembers',
+            'agentStatus',
+            'quickReplies',
+            'channels',
+            'hasSalesRepAssignments'
+        ));
+    }
 }

app/Http/Controllers/Seller/ProductController.php

@@ -881,9 +881,9 @@ class ProductController extends Controller
             'content' => [
                 'description' => ['nullable', 'string', 'max:255'],
                 'tagline' => ['nullable', 'string', 'max:100'],
-                'long_description' => ['nullable', 'string', 'max:500'],
-                'consumer_long_description' => ['nullable', 'string', 'max:500'],
-                'buyer_long_description' => ['nullable', 'string', 'max:500'],
+                'long_description' => ['nullable', 'string'],
+                'consumer_long_description' => ['nullable', 'string'],
+                'buyer_long_description' => ['nullable', 'string'],
                 'product_link' => 'nullable|url|max:255',
                 'creatives_json' => 'nullable|json',
                 'seo_title' => ['nullable', 'string', 'max:70'],

app/Http/Controllers/Seller/Sales/AccountsController.php

@@ -0,0 +1,274 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\AccountNote;
+use App\Models\Business;
+use App\Models\Order;
+use App\Models\SalesRepAssignment;
+use Illuminate\Http\Request;
+
+class AccountsController extends Controller
+{
+    /**
+     * My Accounts - list of accounts assigned to this sales rep
+     */
+    public function index(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Get account assignments with eager loading
+        $assignments = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->accounts()
+            ->with(['assignable', 'assignable.locations', 'assignable.contacts'])
+            ->get();
+
+        // Get account metrics in batch
+        $accountIds = $assignments->pluck('assignable_id');
+        $metrics = $this->getAccountMetrics($accountIds);
+
+        // Build account list with metrics
+        $accounts = $assignments->map(function ($assignment) use ($metrics) {
+            $accountId = $assignment->assignable_id;
+            $accountMetrics = $metrics[$accountId] ?? [];
+
+            return [
+                'assignment' => $assignment,
+                'account' => $assignment->assignable,
+                'metrics' => $accountMetrics,
+                'health' => $this->calculateHealth($accountMetrics),
+            ];
+        });
+
+        // Apply filters
+        $statusFilter = $request->get('status');
+        if ($statusFilter) {
+            $accounts = $accounts->filter(fn ($a) => $a['health']['status'] === $statusFilter);
+        }
+
+        // Sort by health priority (at_risk first)
+        $accounts = $accounts->sortBy(fn ($a) => $a['health']['priority'])->values();
+
+        return view('seller.sales.accounts.index', compact('business', 'accounts'));
+    }
+
+    /**
+     * Show account detail with full history
+     */
+    public function show(Request $request, Business $business, Business $account)
+    {
+        $user = $request->user();
+
+        // Verify user is assigned to this account
+        $assignment = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->where('assignable_type', Business::class)
+            ->where('assignable_id', $account->id)
+            ->first();
+
+        if (! $assignment) {
+            abort(403, 'You are not assigned to this account.');
+        }
+
+        // Get account details with relationships
+        $account->load(['locations', 'contacts']);
+
+        // Get order history
+        $orders = Order::where('business_id', $account->id)
+            ->with(['items.product.brand'])
+            ->orderByDesc('created_at')
+            ->limit(20)
+            ->get();
+
+        // Get account notes
+        $notes = AccountNote::forBusiness($business->id)
+            ->forAccount($account->id)
+            ->with('author')
+            ->orderByDesc('is_pinned')
+            ->orderByDesc('created_at')
+            ->get();
+
+        // Get account metrics
+        $metrics = $this->getAccountDetailMetrics($account);
+
+        return view('seller.sales.accounts.show', compact(
+            'business',
+            'account',
+            'assignment',
+            'orders',
+            'notes',
+            'metrics'
+        ));
+    }
+
+    /**
+     * Store a new account note
+     */
+    public function storeNote(Request $request, Business $business, Business $account)
+    {
+        $validated = $request->validate([
+            'note_type' => 'required|in:general,competitor,pain_point,opportunity,objection',
+            'content' => 'required|string|max:5000',
+        ]);
+
+        $note = AccountNote::create([
+            'business_id' => $business->id,
+            'account_id' => $account->id,
+            'user_id' => $request->user()->id,
+            'note_type' => $validated['note_type'],
+            'content' => $validated['content'],
+        ]);
+
+        return back()->with('success', 'Note added successfully.');
+    }
+
+    /**
+     * Toggle note pinned status
+     */
+    public function toggleNotePin(Request $request, Business $business, AccountNote $note)
+    {
+        // Verify note belongs to this business
+        if ($note->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $note->is_pinned = ! $note->is_pinned;
+        $note->save();
+
+        return back()->with('success', $note->is_pinned ? 'Note pinned.' : 'Note unpinned.');
+    }
+
+    /**
+     * Delete an account note
+     */
+    public function destroyNote(Request $request, Business $business, AccountNote $note)
+    {
+        // Verify note belongs to this business
+        if ($note->business_id !== $business->id) {
+            abort(403);
+        }
+
+        // Only allow deletion by author or admin
+        if ($note->user_id !== $request->user()->id && ! $request->user()->isAdmin()) {
+            abort(403);
+        }
+
+        $note->delete();
+
+        return back()->with('success', 'Note deleted.');
+    }
+
+    /**
+     * Get batch metrics for multiple accounts
+     */
+    protected function getAccountMetrics($accountIds): array
+    {
+        if ($accountIds->isEmpty()) {
+            return [];
+        }
+
+        $metrics = Order::whereIn('business_id', $accountIds)
+            ->where('status', 'completed')
+            ->groupBy('business_id')
+            ->selectRaw('
+                business_id,
+                COUNT(*) as order_count,
+                SUM(total) as total_revenue,
+                MAX(created_at) as last_order_date
+            ')
+            ->get()
+            ->keyBy('business_id');
+
+        // Get 4-week rolling revenue
+        $recentRevenue = Order::whereIn('business_id', $accountIds)
+            ->where('status', 'completed')
+            ->where('created_at', '>=', now()->subWeeks(4))
+            ->groupBy('business_id')
+            ->selectRaw('business_id, SUM(total) as four_week_revenue')
+            ->pluck('four_week_revenue', 'business_id');
+
+        return $accountIds->mapWithKeys(function ($id) use ($metrics, $recentRevenue) {
+            $m = $metrics[$id] ?? null;
+
+            return [$id => [
+                'order_count' => $m?->order_count ?? 0,
+                'total_revenue' => ($m?->total_revenue ?? 0) / 100,
+                'four_week_revenue' => ($recentRevenue[$id] ?? 0) / 100,
+                'last_order_date' => $m?->last_order_date,
+                'days_since_order' => $m?->last_order_date
+                    ? now()->diffInDays($m->last_order_date)
+                    : null,
+            ]];
+        })->all();
+    }
+
+    /**
+     * Get detailed metrics for a single account
+     */
+    protected function getAccountDetailMetrics(Business $account): array
+    {
+        $orders = Order::where('business_id', $account->id)
+            ->where('status', 'completed')
+            ->get();
+
+        if ($orders->isEmpty()) {
+            return [
+                'lifetime_revenue' => 0,
+                'lifetime_orders' => 0,
+                'avg_order_value' => 0,
+                'four_week_revenue' => 0,
+                'last_order_date' => null,
+                'days_since_order' => null,
+                'avg_order_interval' => null,
+            ];
+        }
+
+        $lifetime = $orders->sum('total') / 100;
+        $recentOrders = $orders->where('created_at', '>=', now()->subWeeks(4));
+        $fourWeekRevenue = $recentOrders->sum('total') / 100;
+
+        // Calculate average order interval
+        $sortedDates = $orders->pluck('created_at')->sort()->values();
+        $intervals = [];
+        for ($i = 1; $i < $sortedDates->count(); $i++) {
+            $intervals[] = $sortedDates[$i]->diffInDays($sortedDates[$i - 1]);
+        }
+        $avgInterval = count($intervals) > 0 ? array_sum($intervals) / count($intervals) : null;
+
+        return [
+            'lifetime_revenue' => $lifetime,
+            'lifetime_orders' => $orders->count(),
+            'avg_order_value' => $orders->count() > 0 ? $lifetime / $orders->count() : 0,
+            'four_week_revenue' => $fourWeekRevenue,
+            'last_order_date' => $orders->max('created_at'),
+            'days_since_order' => $orders->max('created_at')
+                ? now()->diffInDays($orders->max('created_at'))
+                : null,
+            'avg_order_interval' => $avgInterval ? round($avgInterval) : null,
+        ];
+    }
+
+    /**
+     * Calculate health status
+     */
+    protected function calculateHealth(array $metrics): array
+    {
+        $days = $metrics['days_since_order'] ?? null;
+
+        if ($days === null) {
+            return ['status' => 'new', 'label' => 'New', 'color' => 'info', 'priority' => 2];
+        }
+
+        if ($days >= 60) {
+            return ['status' => 'at_risk', 'label' => 'At Risk', 'color' => 'error', 'priority' => 0];
+        }
+
+        if ($days >= 30) {
+            return ['status' => 'needs_attention', 'label' => 'Needs Attention', 'color' => 'warning', 'priority' => 1];
+        }
+
+        return ['status' => 'healthy', 'label' => 'Healthy', 'color' => 'success', 'priority' => 3];
+    }
+}

app/Http/Controllers/Seller/Sales/CommissionController.php

@@ -0,0 +1,261 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\SalesCommission;
+use App\Models\SalesCommissionRate;
+use App\Models\User;
+use Illuminate\Http\Request;
+
+class CommissionController extends Controller
+{
+    /**
+     * Commission dashboard for sales rep - see their earnings
+     */
+    public function index(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Get commission summary
+        $summary = $this->getCommissionSummary($business, $user);
+
+        // Get recent commissions
+        $commissions = SalesCommission::forBusiness($business->id)
+            ->forUser($user->id)
+            ->with(['order', 'order.business'])
+            ->orderByDesc('created_at')
+            ->paginate(20);
+
+        // Get commission rates for this user
+        $rates = SalesCommissionRate::forBusiness($business->id)
+            ->where(function ($q) use ($user) {
+                $q->whereNull('user_id')
+                    ->orWhere('user_id', $user->id);
+            })
+            ->active()
+            ->effective()
+            ->orderBy('rate_type')
+            ->get();
+
+        return view('seller.sales.commissions.index', compact(
+            'business',
+            'summary',
+            'commissions',
+            'rates'
+        ));
+    }
+
+    /**
+     * Admin view - manage all commission rates and approve commissions
+     */
+    public function manage(Request $request, Business $business)
+    {
+        // Get pending commissions
+        $pendingCommissions = SalesCommission::forBusiness($business->id)
+            ->pending()
+            ->with(['salesRep', 'order', 'order.business'])
+            ->orderByDesc('created_at')
+            ->get();
+
+        // Get approved commissions ready for payment
+        $approvedCommissions = SalesCommission::forBusiness($business->id)
+            ->approved()
+            ->with(['salesRep', 'order'])
+            ->orderByDesc('approved_at')
+            ->get();
+
+        // Get commission rates
+        $rates = SalesCommissionRate::forBusiness($business->id)
+            ->with('user')
+            ->orderBy('rate_type')
+            ->orderBy('user_id')
+            ->get();
+
+        // Get sales reps for rate assignment
+        $salesReps = $this->getAvailableSalesReps($business);
+
+        // Summary stats
+        $stats = [
+            'pending_count' => $pendingCommissions->count(),
+            'pending_total' => $pendingCommissions->sum('commission_amount') / 100,
+            'approved_count' => $approvedCommissions->count(),
+            'approved_total' => $approvedCommissions->sum('commission_amount') / 100,
+            'paid_this_month' => SalesCommission::forBusiness($business->id)
+                ->paid()
+                ->whereMonth('paid_at', now()->month)
+                ->whereYear('paid_at', now()->year)
+                ->sum('commission_amount') / 100,
+        ];
+
+        return view('seller.sales.commissions.manage', compact(
+            'business',
+            'pendingCommissions',
+            'approvedCommissions',
+            'rates',
+            'salesReps',
+            'stats'
+        ));
+    }
+
+    /**
+     * Approve a commission
+     */
+    public function approve(Request $request, Business $business, SalesCommission $commission)
+    {
+        if ($commission->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $commission->approve($request->user());
+
+        return back()->with('success', 'Commission approved.');
+    }
+
+    /**
+     * Bulk approve commissions
+     */
+    public function bulkApprove(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'commission_ids' => 'required|array',
+            'commission_ids.*' => 'exists:sales_commissions,id',
+        ]);
+
+        $count = SalesCommission::forBusiness($business->id)
+            ->whereIn('id', $validated['commission_ids'])
+            ->pending()
+            ->update([
+                'status' => SalesCommission::STATUS_APPROVED,
+                'approved_at' => now(),
+                'approved_by' => $request->user()->id,
+            ]);
+
+        return back()->with('success', "{$count} commissions approved.");
+    }
+
+    /**
+     * Mark commissions as paid
+     */
+    public function markPaid(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'commission_ids' => 'required|array',
+            'commission_ids.*' => 'exists:sales_commissions,id',
+            'payment_reference' => 'nullable|string|max:255',
+        ]);
+
+        $count = SalesCommission::forBusiness($business->id)
+            ->whereIn('id', $validated['commission_ids'])
+            ->approved()
+            ->update([
+                'status' => SalesCommission::STATUS_PAID,
+                'paid_at' => now(),
+                'payment_reference' => $validated['payment_reference'] ?? null,
+            ]);
+
+        return back()->with('success', "{$count} commissions marked as paid.");
+    }
+
+    /**
+     * Store a new commission rate
+     */
+    public function storeRate(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'user_id' => 'nullable|exists:users,id',
+            'rate_type' => 'required|in:default,account,product,brand',
+            'commission_percent' => 'required|numeric|min:0|max:100',
+            'effective_from' => 'required|date',
+            'effective_to' => 'nullable|date|after:effective_from',
+        ]);
+
+        SalesCommissionRate::create([
+            'business_id' => $business->id,
+            'user_id' => $validated['user_id'],
+            'rate_type' => $validated['rate_type'],
+            'commission_percent' => $validated['commission_percent'],
+            'effective_from' => $validated['effective_from'],
+            'effective_to' => $validated['effective_to'] ?? null,
+            'is_active' => true,
+        ]);
+
+        return back()->with('success', 'Commission rate created.');
+    }
+
+    /**
+     * Update a commission rate
+     */
+    public function updateRate(Request $request, Business $business, SalesCommissionRate $rate)
+    {
+        if ($rate->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'commission_percent' => 'required|numeric|min:0|max:100',
+            'effective_to' => 'nullable|date',
+            'is_active' => 'boolean',
+        ]);
+
+        $rate->update([
+            'commission_percent' => $validated['commission_percent'],
+            'effective_to' => $validated['effective_to'] ?? null,
+            'is_active' => $validated['is_active'] ?? true,
+        ]);
+
+        return back()->with('success', 'Commission rate updated.');
+    }
+
+    /**
+     * Delete a commission rate
+     */
+    public function destroyRate(Request $request, Business $business, SalesCommissionRate $rate)
+    {
+        if ($rate->business_id !== $business->id) {
+            abort(403);
+        }
+
+        // Don't delete if commissions reference this rate
+        if ($rate->commissions()->exists()) {
+            $rate->update(['is_active' => false]);
+
+            return back()->with('warning', 'Rate deactivated (has existing commissions).');
+        }
+
+        $rate->delete();
+
+        return back()->with('success', 'Commission rate deleted.');
+    }
+
+    /**
+     * Get commission summary for a user
+     */
+    protected function getCommissionSummary(Business $business, User $user): array
+    {
+        $baseQuery = SalesCommission::forBusiness($business->id)->forUser($user->id);
+
+        return [
+            'pending' => (clone $baseQuery)->pending()->sum('commission_amount') / 100,
+            'approved' => (clone $baseQuery)->approved()->sum('commission_amount') / 100,
+            'paid_this_month' => (clone $baseQuery)
+                ->paid()
+                ->whereMonth('paid_at', now()->month)
+                ->whereYear('paid_at', now()->year)
+                ->sum('commission_amount') / 100,
+            'paid_total' => (clone $baseQuery)->paid()->sum('commission_amount') / 100,
+            'total_orders' => (clone $baseQuery)->count(),
+        ];
+    }
+
+    /**
+     * Get available sales reps for this business
+     */
+    protected function getAvailableSalesReps(Business $business)
+    {
+        return User::whereHas('businesses', function ($q) use ($business) {
+            $q->where('businesses.id', $business->id);
+        })->orderBy('name')->get();
+    }
+}

app/Http/Controllers/Seller/Sales/CompetitorController.php

@@ -0,0 +1,153 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\CompetitorReplacement;
+use App\Models\Product;
+use Illuminate\Http\Request;
+
+class CompetitorController extends Controller
+{
+    /**
+     * List competitor replacements - when you see competitor X, pitch product Y
+     */
+    public function index(Request $request, Business $business)
+    {
+        $replacements = CompetitorReplacement::forBusiness($business->id)
+            ->with(['product', 'product.brand', 'creator'])
+            ->orderBy('competitor_name')
+            ->get()
+            ->groupBy('competitor_name');
+
+        // Get products for the add form
+        $products = Product::whereHas('brand', function ($q) use ($business) {
+            $q->where('business_id', $business->id);
+        })
+            ->with('brand')
+            ->orderBy('name')
+            ->get();
+
+        // Get unique competitor names for filtering
+        $competitors = CompetitorReplacement::forBusiness($business->id)
+            ->distinct()
+            ->pluck('competitor_name')
+            ->sort();
+
+        return view('seller.sales.competitors.index', compact(
+            'business',
+            'replacements',
+            'products',
+            'competitors'
+        ));
+    }
+
+    /**
+     * Store a new competitor replacement mapping
+     */
+    public function store(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'competitor_name' => 'required|string|max:255',
+            'competitor_product_name' => 'nullable|string|max:255',
+            'cannaiq_product_id' => 'nullable|string|max:255',
+            'product_id' => 'required|exists:products,id',
+            'advantage_notes' => 'nullable|string|max:2000',
+        ]);
+
+        // Verify product belongs to this business
+        $product = Product::whereHas('brand', function ($q) use ($business) {
+            $q->where('business_id', $business->id);
+        })->findOrFail($validated['product_id']);
+
+        CompetitorReplacement::create([
+            'business_id' => $business->id,
+            'cannaiq_product_id' => $validated['cannaiq_product_id'] ?? uniqid('manual_'),
+            'competitor_name' => $validated['competitor_name'],
+            'competitor_product_name' => $validated['competitor_product_name'],
+            'product_id' => $product->id,
+            'advantage_notes' => $validated['advantage_notes'],
+            'created_by' => $request->user()->id,
+        ]);
+
+        return back()->with('success', 'Competitor replacement added.');
+    }
+
+    /**
+     * Update a competitor replacement
+     */
+    public function update(Request $request, Business $business, CompetitorReplacement $replacement)
+    {
+        if ($replacement->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'competitor_product_name' => 'nullable|string|max:255',
+            'product_id' => 'required|exists:products,id',
+            'advantage_notes' => 'nullable|string|max:2000',
+        ]);
+
+        // Verify product belongs to this business
+        $product = Product::whereHas('brand', function ($q) use ($business) {
+            $q->where('business_id', $business->id);
+        })->findOrFail($validated['product_id']);
+
+        $replacement->update([
+            'competitor_product_name' => $validated['competitor_product_name'],
+            'product_id' => $product->id,
+            'advantage_notes' => $validated['advantage_notes'],
+        ]);
+
+        return back()->with('success', 'Replacement updated.');
+    }
+
+    /**
+     * Delete a competitor replacement
+     */
+    public function destroy(Request $request, Business $business, CompetitorReplacement $replacement)
+    {
+        if ($replacement->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $replacement->delete();
+
+        return back()->with('success', 'Replacement deleted.');
+    }
+
+    /**
+     * Quick lookup - get our replacement for a competitor product
+     */
+    public function lookup(Request $request, Business $business)
+    {
+        $competitorName = $request->get('competitor');
+        $productName = $request->get('product');
+
+        $query = CompetitorReplacement::forBusiness($business->id)
+            ->with(['product', 'product.brand']);
+
+        if ($competitorName) {
+            $query->where('competitor_name', 'ILIKE', "%{$competitorName}%");
+        }
+
+        if ($productName) {
+            $query->where('competitor_product_name', 'ILIKE', "%{$productName}%");
+        }
+
+        $replacements = $query->limit(10)->get();
+
+        return response()->json([
+            'replacements' => $replacements->map(fn ($r) => [
+                'id' => $r->id,
+                'competitor' => $r->competitor_name,
+                'competitor_product' => $r->competitor_product_name,
+                'our_product' => $r->product->name,
+                'our_sku' => $r->product->sku,
+                'advantage' => $r->advantage_notes,
+                'pitch' => $r->getPitchSummary(),
+            ]),
+        ]);
+    }
+}

app/Http/Controllers/Seller/Sales/DashboardController.php

@@ -0,0 +1,285 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\Order;
+use App\Models\SalesRepAssignment;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+
+class DashboardController extends Controller
+{
+    /**
+     * Sales Rep Dashboard - My Accounts with health status
+     */
+    public function index(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Cache dashboard data for 5 minutes
+        $cacheKey = "sales_dashboard_{$business->id}_{$user->id}";
+
+        $data = Cache::remember($cacheKey, 300, function () use ($business, $user) {
+            return $this->getDashboardData($business, $user);
+        });
+
+        $data['business'] = $business;
+
+        return view('seller.sales.dashboard.index', $data);
+    }
+
+    /**
+     * My Accounts view - accounts assigned to this sales rep
+     */
+    public function myAccounts(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Get account assignments for this user
+        $assignments = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->accounts()
+            ->with(['assignable', 'assignable.locations'])
+            ->get();
+
+        // Get account IDs
+        $accountIds = $assignments->pluck('assignable_id');
+
+        // Calculate account health metrics in a single efficient query
+        $accountMetrics = $this->getAccountMetrics($accountIds);
+
+        // Combine assignments with metrics
+        $accounts = $assignments->map(function ($assignment) use ($accountMetrics) {
+            $accountId = $assignment->assignable_id;
+            $metrics = $accountMetrics[$accountId] ?? [];
+
+            return [
+                'assignment' => $assignment,
+                'account' => $assignment->assignable,
+                'metrics' => $metrics,
+                'health_status' => $this->calculateHealthStatus($metrics),
+            ];
+        })->sortBy(fn ($a) => $a['health_status']['priority']);
+
+        return view('seller.sales.accounts.index', compact('business', 'accounts'));
+    }
+
+    /**
+     * Get dashboard data
+     */
+    protected function getDashboardData(Business $business, $user): array
+    {
+        // Get assigned accounts count
+        $accountAssignments = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->accounts()
+            ->count();
+
+        // Get assigned locations count
+        $locationAssignments = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->locations()
+            ->count();
+
+        // Get accounts needing attention (no order in 30+ days)
+        $needsAttention = $this->getAccountsNeedingAttention($business, $user);
+
+        // Get accounts at risk (no order in 60+ days)
+        $atRisk = $this->getAccountsAtRisk($business, $user);
+
+        // Get recent orders for assigned accounts
+        $recentOrders = $this->getRecentOrders($business, $user, 10);
+
+        // Get commission summary
+        $commissionSummary = $this->getCommissionSummary($business, $user);
+
+        return [
+            'stats' => [
+                'assigned_accounts' => $accountAssignments,
+                'assigned_locations' => $locationAssignments,
+                'needs_attention' => $needsAttention->count(),
+                'at_risk' => $atRisk->count(),
+            ],
+            'needs_attention' => $needsAttention,
+            'at_risk' => $atRisk,
+            'recent_orders' => $recentOrders,
+            'commission_summary' => $commissionSummary,
+        ];
+    }
+
+    /**
+     * Get account metrics for multiple accounts efficiently
+     */
+    protected function getAccountMetrics($accountIds): array
+    {
+        if ($accountIds->isEmpty()) {
+            return [];
+        }
+
+        // Get order metrics per account
+        $orderMetrics = Order::whereIn('business_id', $accountIds)
+            ->where('status', 'completed')
+            ->groupBy('business_id')
+            ->selectRaw('business_id,
+                COUNT(*) as order_count,
+                SUM(total) as total_revenue,
+                MAX(created_at) as last_order_date,
+                AVG(EXTRACT(EPOCH FROM (created_at - LAG(created_at) OVER (PARTITION BY business_id ORDER BY created_at)))) as avg_order_interval_seconds
+            ')
+            ->get()
+            ->keyBy('business_id');
+
+        return $orderMetrics->mapWithKeys(function ($metrics, $accountId) {
+            return [$accountId => [
+                'order_count' => $metrics->order_count,
+                'total_revenue' => $metrics->total_revenue ?? 0,
+                'last_order_date' => $metrics->last_order_date,
+                'days_since_last_order' => $metrics->last_order_date
+                    ? now()->diffInDays($metrics->last_order_date)
+                    : null,
+                'avg_order_interval_days' => $metrics->avg_order_interval_seconds
+                    ? round($metrics->avg_order_interval_seconds / 86400)
+                    : null,
+            ]];
+        })->all();
+    }
+
+    /**
+     * Calculate health status based on metrics
+     */
+    protected function calculateHealthStatus(array $metrics): array
+    {
+        $daysSinceOrder = $metrics['days_since_last_order'] ?? null;
+        $avgInterval = $metrics['avg_order_interval_days'] ?? 30;
+
+        if ($daysSinceOrder === null) {
+            return [
+                'status' => 'new',
+                'label' => 'New Account',
+                'color' => 'info',
+                'priority' => 2,
+            ];
+        }
+
+        // At risk: More than 2x their average order interval, or 60+ days
+        if ($daysSinceOrder >= max($avgInterval * 2, 60)) {
+            return [
+                'status' => 'at_risk',
+                'label' => 'At Risk',
+                'color' => 'error',
+                'priority' => 0,
+            ];
+        }
+
+        // Needs attention: More than 1.5x their average order interval, or 30+ days
+        if ($daysSinceOrder >= max($avgInterval * 1.5, 30)) {
+            return [
+                'status' => 'needs_attention',
+                'label' => 'Needs Attention',
+                'color' => 'warning',
+                'priority' => 1,
+            ];
+        }
+
+        return [
+            'status' => 'healthy',
+            'label' => 'Healthy',
+            'color' => 'success',
+            'priority' => 3,
+        ];
+    }
+
+    /**
+     * Get accounts needing attention (no order in 30-59 days)
+     */
+    protected function getAccountsNeedingAttention(Business $business, $user)
+    {
+        $assignedAccountIds = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->accounts()
+            ->pluck('assignable_id');
+
+        return Business::whereIn('id', $assignedAccountIds)
+            ->whereHas('orders', function ($q) {
+                $q->where('status', 'completed')
+                    ->where('created_at', '<', now()->subDays(30))
+                    ->where('created_at', '>=', now()->subDays(60));
+            })
+            ->orWhereDoesntHave('orders')
+            ->with('locations')
+            ->limit(10)
+            ->get();
+    }
+
+    /**
+     * Get accounts at risk (no order in 60+ days)
+     */
+    protected function getAccountsAtRisk(Business $business, $user)
+    {
+        $assignedAccountIds = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->accounts()
+            ->pluck('assignable_id');
+
+        return Business::whereIn('id', $assignedAccountIds)
+            ->whereHas('orders', function ($q) {
+                $q->where('status', 'completed')
+                    ->where('created_at', '<', now()->subDays(60));
+            })
+            ->with('locations')
+            ->limit(10)
+            ->get();
+    }
+
+    /**
+     * Get recent orders for assigned accounts
+     */
+    protected function getRecentOrders(Business $business, $user, int $limit)
+    {
+        $assignedAccountIds = SalesRepAssignment::forBusiness($business->id)
+            ->forUser($user->id)
+            ->accounts()
+            ->pluck('assignable_id');
+
+        return Order::whereIn('business_id', $assignedAccountIds)
+            ->with(['business', 'items.product'])
+            ->orderByDesc('created_at')
+            ->limit($limit)
+            ->get();
+    }
+
+    /**
+     * Get commission summary for the current user
+     */
+    protected function getCommissionSummary(Business $business, $user): array
+    {
+        $pendingCommission = DB::table('sales_commissions')
+            ->where('business_id', $business->id)
+            ->where('user_id', $user->id)
+            ->where('status', 'pending')
+            ->sum('commission_amount');
+
+        $approvedCommission = DB::table('sales_commissions')
+            ->where('business_id', $business->id)
+            ->where('user_id', $user->id)
+            ->where('status', 'approved')
+            ->sum('commission_amount');
+
+        $paidThisMonth = DB::table('sales_commissions')
+            ->where('business_id', $business->id)
+            ->where('user_id', $user->id)
+            ->where('status', 'paid')
+            ->whereMonth('paid_at', now()->month)
+            ->whereYear('paid_at', now()->year)
+            ->sum('commission_amount');
+
+        return [
+            'pending' => $pendingCommission / 100,
+            'approved' => $approvedCommission / 100,
+            'paid_this_month' => $paidThisMonth / 100,
+        ];
+    }
+}

app/Http/Controllers/Seller/Sales/ExportController.php

@@ -0,0 +1,334 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\Crm\CrmLead;
+use App\Models\Order;
+use App\Models\SalesRepAssignment;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class ExportController extends Controller
+{
+    /**
+     * Export accounts assigned to the current sales rep as CSV.
+     */
+    public function accounts(Business $business): StreamedResponse
+    {
+        $user = Auth::user();
+
+        // Get assigned account IDs
+        $assignedAccountIds = SalesRepAssignment::where('business_id', $business->id)
+            ->where('user_id', $user->id)
+            ->where('assignable_type', Business::class)
+            ->pluck('assignable_id');
+
+        $accounts = Business::whereIn('id', $assignedAccountIds)
+            ->with(['locations', 'contacts'])
+            ->get();
+
+        $filename = 'my-accounts-'.now()->format('Y-m-d').'.csv';
+
+        return $this->streamCsv($filename, function () use ($accounts, $business) {
+            $handle = fopen('php://output', 'w');
+
+            // Header row
+            fputcsv($handle, [
+                'Account Name',
+                'Status',
+                'Primary Location',
+                'City',
+                'State',
+                'ZIP',
+                'Primary Contact',
+                'Email',
+                'Phone',
+                'Last Order Date',
+                'Last Order Total',
+                'Days Since Order',
+            ]);
+
+            foreach ($accounts as $account) {
+                $location = $account->locations->first();
+                $contact = $account->contacts->first();
+
+                // Get last order
+                $lastOrder = Order::where('business_id', $account->id)
+                    ->whereHas('items.product.brand', fn ($q) => $q->where('business_id', $business->id))
+                    ->orderBy('created_at', 'desc')
+                    ->first();
+
+                fputcsv($handle, [
+                    $account->name,
+                    $account->status ?? 'active',
+                    $location?->name ?? '',
+                    $location?->city ?? '',
+                    $location?->state ?? '',
+                    $location?->zipcode ?? '',
+                    $contact?->name ?? '',
+                    $contact?->email ?? '',
+                    $contact?->phone ?? '',
+                    $lastOrder?->created_at?->format('Y-m-d') ?? '',
+                    $lastOrder ? '$'.number_format($lastOrder->total / 100, 2) : '',
+                    $lastOrder ? now()->diffInDays($lastOrder->created_at) : '',
+                ]);
+            }
+
+            fclose($handle);
+        });
+    }
+
+    /**
+     * Export a single account's order history for meeting prep.
+     */
+    public function accountHistory(Business $business, Business $account): StreamedResponse
+    {
+        // Verify assignment
+        $isAssigned = SalesRepAssignment::where('business_id', $business->id)
+            ->where('user_id', Auth::id())
+            ->where('assignable_type', Business::class)
+            ->where('assignable_id', $account->id)
+            ->exists();
+
+        if (! $isAssigned) {
+            abort(403, 'Account not assigned to you');
+        }
+
+        $orders = Order::where('business_id', $account->id)
+            ->whereHas('items.product.brand', fn ($q) => $q->where('business_id', $business->id))
+            ->with(['items.product'])
+            ->orderBy('created_at', 'desc')
+            ->limit(50)
+            ->get();
+
+        $filename = Str::slug($account->name).'-history-'.now()->format('Y-m-d').'.csv';
+
+        return $this->streamCsv($filename, function () use ($orders, $account) {
+            $handle = fopen('php://output', 'w');
+
+            // Account summary header
+            fputcsv($handle, ['Account Summary: '.$account->name]);
+            fputcsv($handle, ['Generated: '.now()->format('F j, Y')]);
+            fputcsv($handle, ['Total Orders: '.$orders->count()]);
+            fputcsv($handle, ['']);
+
+            // Order details header
+            fputcsv($handle, [
+                'Order Number',
+                'Date',
+                'Status',
+                'Product',
+                'SKU',
+                'Quantity',
+                'Unit Price',
+                'Line Total',
+                'Order Total',
+            ]);
+
+            foreach ($orders as $order) {
+                $firstItem = true;
+                foreach ($order->items as $item) {
+                    fputcsv($handle, [
+                        $firstItem ? $order->order_number : '',
+                        $firstItem ? $order->created_at->format('Y-m-d') : '',
+                        $firstItem ? ucfirst($order->status) : '',
+                        $item->product?->name ?? 'Unknown',
+                        $item->product?->sku ?? '',
+                        $item->quantity,
+                        '$'.number_format($item->price / 100, 2),
+                        '$'.number_format(($item->price * $item->quantity) / 100, 2),
+                        $firstItem ? '$'.number_format($order->total / 100, 2) : '',
+                    ]);
+                    $firstItem = false;
+                }
+            }
+
+            fclose($handle);
+        });
+    }
+
+    /**
+     * Export prospect data with insights for pitch preparation.
+     */
+    public function prospects(Business $business): StreamedResponse
+    {
+        $user = Auth::user();
+
+        $leads = CrmLead::where('business_id', $business->id)
+            ->where('assigned_to', $user->id)
+            ->with(['insights'])
+            ->get();
+
+        $filename = 'prospects-'.now()->format('Y-m-d').'.csv';
+
+        return $this->streamCsv($filename, function () use ($leads) {
+            $handle = fopen('php://output', 'w');
+
+            // Header row
+            fputcsv($handle, [
+                'Company Name',
+                'Contact Name',
+                'Email',
+                'Phone',
+                'City',
+                'State',
+                'Status',
+                'Source',
+                'License Number',
+                'Gaps',
+                'Pain Points',
+                'Opportunities',
+                'Notes',
+            ]);
+
+            foreach ($leads as $lead) {
+                $gaps = $lead->insights->where('insight_type', 'gap')->pluck('description')->implode('; ');
+                $painPoints = $lead->insights->where('insight_type', 'pain_point')->pluck('description')->implode('; ');
+                $opportunities = $lead->insights->where('insight_type', 'opportunity')->pluck('description')->implode('; ');
+
+                fputcsv($handle, [
+                    $lead->company_name,
+                    $lead->contact_name ?? '',
+                    $lead->email ?? '',
+                    $lead->phone ?? '',
+                    $lead->city ?? '',
+                    $lead->state ?? '',
+                    ucfirst($lead->status),
+                    $lead->source ?? '',
+                    $lead->license_number ?? '',
+                    $gaps,
+                    $painPoints,
+                    $opportunities,
+                    $lead->notes ?? '',
+                ]);
+            }
+
+            fclose($handle);
+        });
+    }
+
+    /**
+     * Export competitor replacement data for sales training.
+     */
+    public function competitors(Business $business): StreamedResponse
+    {
+        $replacements = \App\Models\CompetitorReplacement::where('business_id', $business->id)
+            ->with(['product.brand'])
+            ->orderBy('competitor_name')
+            ->get();
+
+        $filename = 'competitor-replacements-'.now()->format('Y-m-d').'.csv';
+
+        return $this->streamCsv($filename, function () use ($replacements) {
+            $handle = fopen('php://output', 'w');
+
+            fputcsv($handle, [
+                'Competitor Brand',
+                'Competitor Product',
+                'Our Product',
+                'Our SKU',
+                'Our Brand',
+                'Why Ours is Better',
+            ]);
+
+            foreach ($replacements as $replacement) {
+                fputcsv($handle, [
+                    $replacement->competitor_name,
+                    $replacement->competitor_product_name ?? 'Any product',
+                    $replacement->product->name,
+                    $replacement->product->sku,
+                    $replacement->product->brand?->name ?? '',
+                    $replacement->advantage_notes ?? '',
+                ]);
+            }
+
+            fclose($handle);
+        });
+    }
+
+    /**
+     * Generate a pitch builder export for a specific prospect.
+     */
+    public function pitchBuilder(Business $business, CrmLead $lead): StreamedResponse
+    {
+        // Verify assignment
+        if ($lead->assigned_to !== Auth::id()) {
+            abort(403, 'Lead not assigned to you');
+        }
+
+        // Get similar successful accounts for reference
+        $successStories = Business::where('type', 'buyer')
+            ->whereHas('orders', function ($query) use ($business) {
+                $query->whereHas('items.product.brand', fn ($q) => $q->where('business_id', $business->id))
+                    ->where('created_at', '>=', now()->subMonths(3));
+            })
+            ->when($lead->city, fn ($q) => $q->whereHas('locations', fn ($l) => $l->where('city', $lead->city)))
+            ->with(['locations'])
+            ->limit(5)
+            ->get();
+
+        $filename = 'pitch-'.Str::slug($lead->company_name).'-'.now()->format('Y-m-d').'.csv';
+
+        return $this->streamCsv($filename, function () use ($lead, $successStories) {
+            $handle = fopen('php://output', 'w');
+
+            // Prospect info
+            fputcsv($handle, ['PITCH PREPARATION: '.$lead->company_name]);
+            fputcsv($handle, ['Generated: '.now()->format('F j, Y')]);
+            fputcsv($handle, ['']);
+
+            // Contact info
+            fputcsv($handle, ['CONTACT INFORMATION']);
+            fputcsv($handle, ['Contact Name', $lead->contact_name ?? 'N/A']);
+            fputcsv($handle, ['Email', $lead->email ?? 'N/A']);
+            fputcsv($handle, ['Phone', $lead->phone ?? 'N/A']);
+            fputcsv($handle, ['Location', ($lead->city ?? '').($lead->city && $lead->state ? ', ' : '').($lead->state ?? '')]);
+            fputcsv($handle, ['License', $lead->license_number ?? 'N/A']);
+            fputcsv($handle, ['']);
+
+            // Insights
+            fputcsv($handle, ['IDENTIFIED GAPS & OPPORTUNITIES']);
+            foreach ($lead->insights as $insight) {
+                fputcsv($handle, [
+                    ucfirst(str_replace('_', ' ', $insight->insight_type)),
+                    $insight->description,
+                ]);
+            }
+            fputcsv($handle, ['']);
+
+            // Success stories
+            fputcsv($handle, ['SIMILAR SUCCESSFUL ACCOUNTS (Reference for pitch)']);
+            fputcsv($handle, ['Account Name', 'Location']);
+            foreach ($successStories as $account) {
+                $location = $account->locations->first();
+                fputcsv($handle, [
+                    $account->name,
+                    ($location?->city ?? '').($location?->city && $location?->state ? ', ' : '').($location?->state ?? ''),
+                ]);
+            }
+
+            fputcsv($handle, ['']);
+            fputcsv($handle, ['NOTES']);
+            fputcsv($handle, [$lead->notes ?? 'No additional notes']);
+
+            fclose($handle);
+        });
+    }
+
+    /**
+     * Helper to stream a CSV response.
+     */
+    private function streamCsv(string $filename, callable $callback): StreamedResponse
+    {
+        return response()->stream($callback, 200, [
+            'Content-Type' => 'text/csv',
+            'Content-Disposition' => 'attachment; filename="'.$filename.'"',
+            'Pragma' => 'no-cache',
+            'Cache-Control' => 'must-revalidate, post-check=0, pre-check=0',
+            'Expires' => '0',
+        ]);
+    }
+}

app/Http/Controllers/Seller/Sales/ProspectController.php

@@ -0,0 +1,314 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\Crm\CrmLead;
+use App\Models\ProspectImport;
+use App\Models\ProspectInsight;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+
+class ProspectController extends Controller
+{
+    /**
+     * List prospects (leads) assigned to this sales rep
+     */
+    public function index(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Get leads assigned to this user
+        $leads = CrmLead::where('seller_business_id', $business->id)
+            ->where('assigned_to', $user->id)
+            ->with('insights')
+            ->orderByDesc('created_at')
+            ->paginate(20);
+
+        // Get insight counts by type
+        $insightCounts = ProspectInsight::forBusiness($business->id)
+            ->whereNotNull('lead_id')
+            ->selectRaw('insight_type, COUNT(*) as count')
+            ->groupBy('insight_type')
+            ->pluck('count', 'insight_type');
+
+        return view('seller.sales.prospects.index', compact(
+            'business',
+            'leads',
+            'insightCounts'
+        ));
+    }
+
+    /**
+     * Show prospect detail with insights
+     */
+    public function show(Request $request, Business $business, CrmLead $lead)
+    {
+        if ($lead->seller_business_id !== $business->id) {
+            abort(403);
+        }
+
+        $lead->load('insights.creator');
+
+        // Get similar successful accounts for reference
+        $successStories = $this->findSimilarSuccessStories($business, $lead);
+
+        return view('seller.sales.prospects.show', compact(
+            'business',
+            'lead',
+            'successStories'
+        ));
+    }
+
+    /**
+     * Add insight to a prospect
+     */
+    public function storeInsight(Request $request, Business $business, CrmLead $lead)
+    {
+        if ($lead->seller_business_id !== $business->id) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'insight_type' => 'required|in:gap,pain_point,opportunity,objection,competitor_weakness',
+            'category' => 'nullable|in:price_point,quality,consistency,service,margin,reliability,selection',
+            'description' => 'required|string|max:2000',
+        ]);
+
+        ProspectInsight::create([
+            'business_id' => $business->id,
+            'lead_id' => $lead->id,
+            'insight_type' => $validated['insight_type'],
+            'category' => $validated['category'],
+            'description' => $validated['description'],
+            'created_by' => $request->user()->id,
+        ]);
+
+        return back()->with('success', 'Insight added.');
+    }
+
+    /**
+     * Delete an insight
+     */
+    public function destroyInsight(Request $request, Business $business, ProspectInsight $insight)
+    {
+        if ($insight->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $insight->delete();
+
+        return back()->with('success', 'Insight deleted.');
+    }
+
+    /**
+     * Show import history and upload form
+     */
+    public function imports(Request $request, Business $business)
+    {
+        $imports = ProspectImport::forBusiness($business->id)
+            ->with('importer')
+            ->orderByDesc('created_at')
+            ->paginate(10);
+
+        return view('seller.sales.prospects.imports', compact('business', 'imports'));
+    }
+
+    /**
+     * Upload and process import file
+     */
+    public function upload(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'file' => 'required|file|mimes:csv,txt|max:5120', // 5MB max
+        ]);
+
+        $file = $request->file('file');
+        $filename = $file->getClientOriginalName();
+        $path = $file->store("imports/{$business->id}", 'local');
+
+        // Count rows
+        $content = file_get_contents($file->getRealPath());
+        $lines = explode("\n", trim($content));
+        $totalRows = count($lines) - 1; // Exclude header
+
+        // Create import record
+        $import = ProspectImport::create([
+            'business_id' => $business->id,
+            'user_id' => $request->user()->id,
+            'filename' => $filename,
+            'status' => ProspectImport::STATUS_PENDING,
+            'total_rows' => max(0, $totalRows),
+            'processed_rows' => 0,
+            'created_count' => 0,
+            'updated_count' => 0,
+            'skipped_count' => 0,
+            'error_count' => 0,
+        ]);
+
+        // Get headers for mapping
+        $headers = str_getcsv($lines[0]);
+
+        return view('seller.sales.prospects.map-columns', compact(
+            'business',
+            'import',
+            'headers',
+            'path'
+        ));
+    }
+
+    /**
+     * Process import with column mapping
+     */
+    public function processImport(Request $request, Business $business, ProspectImport $import)
+    {
+        if ($import->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'mapping' => 'required|array',
+            'mapping.company_name' => 'required|string',
+            'path' => 'required|string',
+        ]);
+
+        $import->update([
+            'column_mapping' => $validated['mapping'],
+            'status' => ProspectImport::STATUS_PROCESSING,
+        ]);
+
+        // Process synchronously for now (could dispatch to queue for large files)
+        $this->processImportFile($import, $validated['path'], $validated['mapping']);
+
+        return redirect()
+            ->route('seller.business.sales.prospects.imports', $business)
+            ->with('success', "Import completed. {$import->created_count} created, {$import->updated_count} updated, {$import->error_count} errors.");
+    }
+
+    /**
+     * Process the import file
+     */
+    protected function processImportFile(ProspectImport $import, string $path, array $mapping): void
+    {
+        $content = Storage::disk('local')->get($path);
+        $lines = explode("\n", trim($content));
+        $headers = str_getcsv(array_shift($lines));
+
+        // Create column index map
+        $columnMap = [];
+        foreach ($mapping as $field => $column) {
+            $index = array_search($column, $headers);
+            if ($index !== false) {
+                $columnMap[$field] = $index;
+            }
+        }
+
+        foreach ($lines as $lineNum => $line) {
+            if (empty(trim($line))) {
+                continue;
+            }
+
+            $row = str_getcsv($line);
+            $import->incrementProcessed();
+
+            try {
+                $companyName = $row[$columnMap['company_name']] ?? null;
+
+                if (! $companyName) {
+                    $import->addError($lineNum + 2, 'Missing company name');
+
+                    continue;
+                }
+
+                // Check for duplicate
+                $existing = CrmLead::where('seller_business_id', $import->business_id)
+                    ->where('company_name', $companyName)
+                    ->first();
+
+                if ($existing) {
+                    // Update existing
+                    $this->updateLeadFromRow($existing, $row, $columnMap);
+                    $import->incrementUpdated();
+                } else {
+                    // Create new
+                    $this->createLeadFromRow($import, $row, $columnMap);
+                    $import->incrementCreated();
+                }
+            } catch (\Exception $e) {
+                $import->addError($lineNum + 2, $e->getMessage());
+            }
+        }
+
+        $import->markCompleted();
+
+        // Clean up file
+        Storage::disk('local')->delete($path);
+    }
+
+    /**
+     * Create a new lead from import row
+     */
+    protected function createLeadFromRow(ProspectImport $import, array $row, array $columnMap): CrmLead
+    {
+        return CrmLead::create([
+            'seller_business_id' => $import->business_id,
+            'company_name' => $row[$columnMap['company_name']] ?? null,
+            'contact_name' => $row[$columnMap['contact_name'] ?? -1] ?? null,
+            'email' => $row[$columnMap['email'] ?? -1] ?? null,
+            'phone' => $row[$columnMap['phone'] ?? -1] ?? null,
+            'address' => $row[$columnMap['address'] ?? -1] ?? null,
+            'city' => $row[$columnMap['city'] ?? -1] ?? null,
+            'state' => $row[$columnMap['state'] ?? -1] ?? null,
+            'zipcode' => $row[$columnMap['zipcode'] ?? -1] ?? null,
+            'license_number' => $row[$columnMap['license_number'] ?? -1] ?? null,
+            'notes' => $row[$columnMap['notes'] ?? -1] ?? null,
+            'source' => 'import',
+            'status' => 'new',
+            'assigned_to' => $import->user_id,
+        ]);
+    }
+
+    /**
+     * Update existing lead from import row
+     */
+    protected function updateLeadFromRow(CrmLead $lead, array $row, array $columnMap): void
+    {
+        $updates = [];
+
+        foreach (['contact_name', 'email', 'phone', 'address', 'city', 'state', 'zipcode', 'license_number'] as $field) {
+            if (isset($columnMap[$field]) && ! empty($row[$columnMap[$field]])) {
+                $updates[$field] = $row[$columnMap[$field]];
+            }
+        }
+
+        if (! empty($updates)) {
+            $lead->update($updates);
+        }
+    }
+
+    /**
+     * Find similar successful accounts for a prospect
+     */
+    protected function findSimilarSuccessStories(Business $business, CrmLead $lead): \Illuminate\Support\Collection
+    {
+        // Get successful accounts in same city/state
+        $query = Business::query()
+            ->whereHas('orders', function ($q) {
+                $q->where('status', 'completed');
+            })
+            ->with('locations');
+
+        if ($lead->city) {
+            $query->whereHas('locations', function ($q) use ($lead) {
+                $q->where('city', 'ILIKE', "%{$lead->city}%");
+            });
+        } elseif ($lead->state) {
+            $query->whereHas('locations', function ($q) use ($lead) {
+                $q->where('state', $lead->state);
+            });
+        }
+
+        return $query->limit(5)->get();
+    }
+}

app/Http/Controllers/Seller/Sales/ReorderController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Services\Sales\ReorderPredictionService;
+use Illuminate\Http\Request;
+
+class ReorderController extends Controller
+{
+    public function __construct(
+        protected ReorderPredictionService $reorderService
+    ) {}
+
+    /**
+     * Reorder Alerts - accounts approaching their reorder window
+     */
+    public function index(Request $request, Business $business)
+    {
+        $user = $request->user();
+
+        // Get accounts approaching reorder with predictions
+        $accounts = $this->reorderService->getReorderAlerts($business->id, $user->id);
+
+        // Separate into categories
+        $overdue = $accounts->filter(fn ($a) => ($a['days_until_predicted_order'] ?? 0) < 0);
+        $dueSoon = $accounts->filter(fn ($a) => ($a['days_until_predicted_order'] ?? 0) >= 0 && ($a['days_until_predicted_order'] ?? 999) <= 7);
+        $upcoming = $accounts->filter(fn ($a) => ($a['days_until_predicted_order'] ?? 999) > 7 && ($a['days_until_predicted_order'] ?? 999) <= 14);
+
+        return view('seller.sales.reorders.index', compact(
+            'business',
+            'accounts',
+            'overdue',
+            'dueSoon',
+            'upcoming'
+        ));
+    }
+}

app/Http/Controllers/Seller/Sales/TerritoryController.php

@@ -0,0 +1,193 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Sales;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\SalesTerritory;
+use App\Models\SalesTerritoryArea;
+use App\Models\SalesTerritoryAssignment;
+use App\Models\User;
+use Illuminate\Http\Request;
+
+class TerritoryController extends Controller
+{
+    /**
+     * List all territories for this business
+     */
+    public function index(Request $request, Business $business)
+    {
+        $territories = SalesTerritory::forBusiness($business->id)
+            ->with(['areas', 'salesReps'])
+            ->withCount('assignments')
+            ->orderBy('name')
+            ->get();
+
+        // Get available sales reps for assignment
+        $salesReps = $this->getAvailableSalesReps($business);
+
+        return view('seller.sales.territories.index', compact('business', 'territories', 'salesReps'));
+    }
+
+    /**
+     * Show create territory form
+     */
+    public function create(Request $request, Business $business)
+    {
+        $salesReps = $this->getAvailableSalesReps($business);
+
+        return view('seller.sales.territories.create', compact('business', 'salesReps'));
+    }
+
+    /**
+     * Store a new territory
+     */
+    public function store(Request $request, Business $business)
+    {
+        $validated = $request->validate([
+            'name' => 'required|string|max:255',
+            'description' => 'nullable|string|max:1000',
+            'color' => 'required|string|max:7',
+            'areas' => 'nullable|array',
+            'areas.*.type' => 'required_with:areas|in:zip,city,state,county',
+            'areas.*.value' => 'required_with:areas|string|max:255',
+            'primary_rep_id' => 'nullable|exists:users,id',
+        ]);
+
+        $territory = SalesTerritory::create([
+            'business_id' => $business->id,
+            'name' => $validated['name'],
+            'description' => $validated['description'] ?? null,
+            'color' => $validated['color'],
+            'is_active' => true,
+        ]);
+
+        // Add areas
+        if (! empty($validated['areas'])) {
+            foreach ($validated['areas'] as $area) {
+                SalesTerritoryArea::create([
+                    'territory_id' => $territory->id,
+                    'area_type' => $area['type'],
+                    'area_value' => $area['value'],
+                ]);
+            }
+        }
+
+        // Assign primary rep
+        if (! empty($validated['primary_rep_id'])) {
+            SalesTerritoryAssignment::create([
+                'territory_id' => $territory->id,
+                'user_id' => $validated['primary_rep_id'],
+                'assignment_type' => 'primary',
+                'assigned_at' => now(),
+                'assigned_by' => $request->user()->id,
+            ]);
+        }
+
+        return redirect()
+            ->route('seller.business.sales.territories', $business)
+            ->with('success', 'Territory created successfully.');
+    }
+
+    /**
+     * Show edit territory form
+     */
+    public function edit(Request $request, Business $business, SalesTerritory $territory)
+    {
+        // Verify territory belongs to this business
+        if ($territory->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $territory->load(['areas', 'salesReps']);
+        $salesReps = $this->getAvailableSalesReps($business);
+
+        return view('seller.sales.territories.edit', compact('business', 'territory', 'salesReps'));
+    }
+
+    /**
+     * Update a territory
+     */
+    public function update(Request $request, Business $business, SalesTerritory $territory)
+    {
+        // Verify territory belongs to this business
+        if ($territory->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $validated = $request->validate([
+            'name' => 'required|string|max:255',
+            'description' => 'nullable|string|max:1000',
+            'color' => 'required|string|max:7',
+            'is_active' => 'boolean',
+            'areas' => 'nullable|array',
+            'areas.*.type' => 'required_with:areas|in:zip,city,state,county',
+            'areas.*.value' => 'required_with:areas|string|max:255',
+            'primary_rep_id' => 'nullable|exists:users,id',
+        ]);
+
+        $territory->update([
+            'name' => $validated['name'],
+            'description' => $validated['description'] ?? null,
+            'color' => $validated['color'],
+            'is_active' => $validated['is_active'] ?? true,
+        ]);
+
+        // Replace areas
+        $territory->areas()->delete();
+        if (! empty($validated['areas'])) {
+            foreach ($validated['areas'] as $area) {
+                SalesTerritoryArea::create([
+                    'territory_id' => $territory->id,
+                    'area_type' => $area['type'],
+                    'area_value' => $area['value'],
+                ]);
+            }
+        }
+
+        // Update primary rep
+        $territory->assignments()->where('assignment_type', 'primary')->delete();
+        if (! empty($validated['primary_rep_id'])) {
+            SalesTerritoryAssignment::create([
+                'territory_id' => $territory->id,
+                'user_id' => $validated['primary_rep_id'],
+                'assignment_type' => 'primary',
+                'assigned_at' => now(),
+                'assigned_by' => $request->user()->id,
+            ]);
+        }
+
+        return redirect()
+            ->route('seller.business.sales.territories', $business)
+            ->with('success', 'Territory updated successfully.');
+    }
+
+    /**
+     * Delete a territory
+     */
+    public function destroy(Request $request, Business $business, SalesTerritory $territory)
+    {
+        // Verify territory belongs to this business
+        if ($territory->business_id !== $business->id) {
+            abort(403);
+        }
+
+        $territory->areas()->delete();
+        $territory->assignments()->delete();
+        $territory->delete();
+
+        return redirect()
+            ->route('seller.business.sales.territories', $business)
+            ->with('success', 'Territory deleted successfully.');
+    }
+
+    /**
+     * Get available sales reps for this business
+     */
+    protected function getAvailableSalesReps(Business $business)
+    {
+        return User::whereHas('businesses', function ($q) use ($business) {
+            $q->where('businesses.id', $business->id);
+        })->orderBy('name')->get();
+    }
+}

app/Http/Controllers/Seller/Settings/DbaController.php

@@ -0,0 +1,263 @@
+<?php
+
+namespace App\Http\Controllers\Seller\Settings;
+
+use App\Http\Controllers\Controller;
+use App\Models\Business;
+use App\Models\BusinessDba;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class DbaController extends Controller
+{
+    /**
+     * Display a listing of all DBAs for the business.
+     */
+    public function index(Business $business): View
+    {
+        $dbas = $business->dbas()
+            ->orderByDesc('is_default')
+            ->orderBy('trade_name')
+            ->get();
+
+        return view('seller.settings.dbas.index', compact('business', 'dbas'));
+    }
+
+    /**
+     * Show the form for creating a new DBA.
+     */
+    public function create(Business $business): View
+    {
+        return view('seller.settings.dbas.create', compact('business'));
+    }
+
+    /**
+     * Store a newly created DBA in storage.
+     */
+    public function store(Request $request, Business $business): RedirectResponse
+    {
+        $validated = $request->validate([
+            // Identity
+            'trade_name' => 'required|string|max:255',
+
+            // Address
+            'address' => 'nullable|string|max:255',
+            'address_line_2' => 'nullable|string|max:255',
+            'city' => 'nullable|string|max:255',
+            'state' => 'nullable|string|max:2',
+            'zip' => 'nullable|string|max:10',
+
+            // License
+            'license_number' => 'nullable|string|max:255',
+            'license_type' => 'nullable|string|max:255',
+            'license_expiration' => 'nullable|date',
+
+            // Bank Info
+            'bank_name' => 'nullable|string|max:255',
+            'bank_account_name' => 'nullable|string|max:255',
+            'bank_routing_number' => 'nullable|string|max:50',
+            'bank_account_number' => 'nullable|string|max:50',
+            'bank_account_type' => 'nullable|string|in:checking,savings',
+
+            // Tax
+            'tax_id' => 'nullable|string|max:50',
+            'tax_id_type' => 'nullable|string|in:ein,ssn',
+
+            // Contacts
+            'primary_contact_name' => 'nullable|string|max:255',
+            'primary_contact_email' => 'nullable|email|max:255',
+            'primary_contact_phone' => 'nullable|string|max:50',
+            'ap_contact_name' => 'nullable|string|max:255',
+            'ap_contact_email' => 'nullable|email|max:255',
+            'ap_contact_phone' => 'nullable|string|max:50',
+
+            // Invoice Settings
+            'payment_terms' => 'nullable|string|max:50',
+            'payment_instructions' => 'nullable|string|max:2000',
+            'invoice_footer' => 'nullable|string|max:2000',
+            'invoice_prefix' => 'nullable|string|max:10',
+
+            // Branding
+            'logo_path' => 'nullable|string|max:255',
+            'brand_colors' => 'nullable|array',
+
+            // Status
+            'is_default' => 'boolean',
+            'is_active' => 'boolean',
+        ]);
+
+        $validated['business_id'] = $business->id;
+        $validated['is_default'] = $request->boolean('is_default');
+        $validated['is_active'] = $request->boolean('is_active', true);
+
+        $dba = BusinessDba::create($validated);
+
+        return redirect()
+            ->route('seller.business.settings.dbas.index', $business)
+            ->with('success', "DBA \"{$dba->trade_name}\" created successfully.");
+    }
+
+    /**
+     * Show the form for editing the specified DBA.
+     */
+    public function edit(Business $business, BusinessDba $dba): View
+    {
+        // Verify DBA belongs to this business
+        if ($dba->business_id !== $business->id) {
+            abort(403, 'This DBA does not belong to your business.');
+        }
+
+        return view('seller.settings.dbas.edit', compact('business', 'dba'));
+    }
+
+    /**
+     * Update the specified DBA in storage.
+     */
+    public function update(Request $request, Business $business, BusinessDba $dba): RedirectResponse
+    {
+        // Verify DBA belongs to this business
+        if ($dba->business_id !== $business->id) {
+            abort(403, 'This DBA does not belong to your business.');
+        }
+
+        $validated = $request->validate([
+            // Identity
+            'trade_name' => 'required|string|max:255',
+
+            // Address
+            'address' => 'nullable|string|max:255',
+            'address_line_2' => 'nullable|string|max:255',
+            'city' => 'nullable|string|max:255',
+            'state' => 'nullable|string|max:2',
+            'zip' => 'nullable|string|max:10',
+
+            // License
+            'license_number' => 'nullable|string|max:255',
+            'license_type' => 'nullable|string|max:255',
+            'license_expiration' => 'nullable|date',
+
+            // Bank Info
+            'bank_name' => 'nullable|string|max:255',
+            'bank_account_name' => 'nullable|string|max:255',
+            'bank_routing_number' => 'nullable|string|max:50',
+            'bank_account_number' => 'nullable|string|max:50',
+            'bank_account_type' => 'nullable|string|in:checking,savings',
+
+            // Tax
+            'tax_id' => 'nullable|string|max:50',
+            'tax_id_type' => 'nullable|string|in:ein,ssn',
+
+            // Contacts
+            'primary_contact_name' => 'nullable|string|max:255',
+            'primary_contact_email' => 'nullable|email|max:255',
+            'primary_contact_phone' => 'nullable|string|max:50',
+            'ap_contact_name' => 'nullable|string|max:255',
+            'ap_contact_email' => 'nullable|email|max:255',
+            'ap_contact_phone' => 'nullable|string|max:50',
+
+            // Invoice Settings
+            'payment_terms' => 'nullable|string|max:50',
+            'payment_instructions' => 'nullable|string|max:2000',
+            'invoice_footer' => 'nullable|string|max:2000',
+            'invoice_prefix' => 'nullable|string|max:10',
+
+            // Branding
+            'logo_path' => 'nullable|string|max:255',
+            'brand_colors' => 'nullable|array',
+
+            // Status
+            'is_default' => 'boolean',
+            'is_active' => 'boolean',
+        ]);
+
+        $validated['is_default'] = $request->boolean('is_default');
+        $validated['is_active'] = $request->boolean('is_active', true);
+
+        // Don't overwrite encrypted fields if left blank (preserve existing values)
+        $encryptedFields = ['bank_routing_number', 'bank_account_number', 'tax_id'];
+        foreach ($encryptedFields as $field) {
+            if (empty($validated[$field])) {
+                unset($validated[$field]);
+            }
+        }
+
+        $dba->update($validated);
+
+        return redirect()
+            ->route('seller.business.settings.dbas.index', $business)
+            ->with('success', "DBA \"{$dba->trade_name}\" updated successfully.");
+    }
+
+    /**
+     * Remove the specified DBA from storage.
+     */
+    public function destroy(Business $business, BusinessDba $dba): RedirectResponse
+    {
+        // Verify DBA belongs to this business
+        if ($dba->business_id !== $business->id) {
+            abort(403, 'This DBA does not belong to your business.');
+        }
+
+        // Check if this is the only active DBA
+        $activeCount = $business->dbas()->where('is_active', true)->count();
+        if ($activeCount <= 1 && $dba->is_active) {
+            return redirect()
+                ->route('seller.business.settings.dbas.index', $business)
+                ->with('error', 'You cannot delete the only active DBA. Create another DBA first or deactivate this one.');
+        }
+
+        $tradeName = $dba->trade_name;
+        $dba->delete();
+
+        return redirect()
+            ->route('seller.business.settings.dbas.index', $business)
+            ->with('success', "DBA \"{$tradeName}\" deleted successfully.");
+    }
+
+    /**
+     * Set the specified DBA as the default for the business.
+     */
+    public function setDefault(Business $business, BusinessDba $dba): RedirectResponse
+    {
+        // Verify DBA belongs to this business
+        if ($dba->business_id !== $business->id) {
+            abort(403, 'This DBA does not belong to your business.');
+        }
+
+        $dba->markAsDefault();
+
+        return redirect()
+            ->route('seller.business.settings.dbas.index', $business)
+            ->with('success', "\"{$dba->trade_name}\" is now your default DBA for invoices.");
+    }
+
+    /**
+     * Toggle the active status of a DBA.
+     */
+    public function toggleActive(Business $business, BusinessDba $dba): RedirectResponse
+    {
+        // Verify DBA belongs to this business
+        if ($dba->business_id !== $business->id) {
+            abort(403, 'This DBA does not belong to your business.');
+        }
+
+        // Prevent deactivating if it's the only active DBA
+        if ($dba->is_active) {
+            $activeCount = $business->dbas()->where('is_active', true)->count();
+            if ($activeCount <= 1) {
+                return redirect()
+                    ->route('seller.business.settings.dbas.index', $business)
+                    ->with('error', 'You cannot deactivate the only active DBA.');
+            }
+        }
+
+        $dba->update(['is_active' => ! $dba->is_active]);
+
+        $status = $dba->is_active ? 'activated' : 'deactivated';
+
+        return redirect()
+            ->route('seller.business.settings.dbas.index', $business)
+            ->with('success', "DBA \"{$dba->trade_name}\" has been {$status}.");
+    }
+}

app/Jobs/RollupBannerAdStats.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\BannerAdDailyStat;
+use App\Models\BannerAdEvent;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class RollupBannerAdStats implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function __construct(
+        protected ?string $date = null
+    ) {
+        $this->date = $date ?? now()->subDay()->toDateString();
+    }
+
+    public function handle(): void
+    {
+        $stats = BannerAdEvent::query()
+            ->whereDate('created_at', $this->date)
+            ->select([
+                'banner_ad_id',
+                DB::raw("SUM(CASE WHEN event_type = 'impression' THEN 1 ELSE 0 END) as impressions"),
+                DB::raw("SUM(CASE WHEN event_type = 'click' THEN 1 ELSE 0 END) as clicks"),
+                DB::raw("COUNT(DISTINCT CASE WHEN event_type = 'impression' THEN session_id END) as unique_impressions"),
+                DB::raw("COUNT(DISTINCT CASE WHEN event_type = 'click' THEN session_id END) as unique_clicks"),
+            ])
+            ->groupBy('banner_ad_id')
+            ->get();
+
+        $created = 0;
+        foreach ($stats as $stat) {
+            BannerAdDailyStat::updateOrCreate(
+                [
+                    'banner_ad_id' => $stat->banner_ad_id,
+                    'date' => $this->date,
+                ],
+                [
+                    'impressions' => $stat->impressions,
+                    'clicks' => $stat->clicks,
+                    'unique_impressions' => $stat->unique_impressions,
+                    'unique_clicks' => $stat->unique_clicks,
+                ]
+            );
+            $created++;
+        }
+
+        if ($created > 0) {
+            Log::info("Banner ad daily stats rolled up: {$created} records for {$this->date}");
+        }
+
+        // Optionally clean up old events (older than 30 days)
+        $deleted = BannerAdEvent::where('created_at', '<', now()->subDays(30))->delete();
+        if ($deleted > 0) {
+            Log::info("Cleaned up {$deleted} old banner ad events");
+        }
+    }
+}

app/Jobs/UpdateBannerAdStatuses.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Services\BannerAdService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Log;
+
+class UpdateBannerAdStatuses implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public function handle(BannerAdService $service): void
+    {
+        $updated = $service->updateScheduledStatuses();
+
+        if ($updated > 0) {
+            Log::info("Banner ad statuses updated: {$updated} ads changed");
+        }
+    }
+}

app/Mail/Concerns/HasBusinessReplyTo.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Mail\Concerns;
+
+use App\Models\Business;
+use App\Models\User;
+use Illuminate\Mail\Mailables\Address;
+
+/**
+ * Trait for adding Reply-To header using business's primary email identity.
+ *
+ * This ensures replies to transactional emails (quotes, invoices, orders)
+ * are routed back to the CRM inbox.
+ *
+ * Supports plus addressing: inbox+user123@domain.com routes replies
+ * to the specific user who sent the original message.
+ */
+trait HasBusinessReplyTo
+{
+    /**
+     * Get the Reply-To addresses for the business.
+     *
+     * @param  User|int|null  $user  Optional user for plus addressing
+     * @return array<Address>
+     */
+    protected function getBusinessReplyTo(Business $business, User|int|null $user = null): array
+    {
+        $inboundEmail = $business->primaryEmailIdentity?->email;
+
+        if (! $inboundEmail) {
+            return [];
+        }
+
+        // Add plus addressing for user routing
+        if ($user) {
+            $userId = $user instanceof User ? $user->id : $user;
+            $inboundEmail = $this->addPlusAddress($inboundEmail, "u{$userId}");
+        }
+
+        return [new Address($inboundEmail, $business->name)];
+    }
+
+    /**
+     * Add plus addressing to an email.
+     * inbox@domain.com + "u123" => inbox+u123@domain.com
+     */
+    protected function addPlusAddress(string $email, string $tag): string
+    {
+        $parts = explode('@', $email);
+        if (count($parts) !== 2) {
+            return $email;
+        }
+
+        return $parts[0].'+'.$tag.'@'.$parts[1];
+    }
+}

app/Mail/Invoices/InvoiceSentMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Mail\Invoices;
 
+use App\Mail\Concerns\HasBusinessReplyTo;
 use App\Models\Invoice;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Attachment;
@@ -12,7 +13,7 @@ use Illuminate\Queue\SerializesModels;
 
 class InvoiceSentMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use HasBusinessReplyTo, Queueable, SerializesModels;
 
     public function __construct(
         public Invoice $invoice,
@@ -22,9 +23,19 @@ class InvoiceSentMail extends Mailable
 
     public function envelope(): Envelope
     {
-        return new Envelope(
-            subject: "Invoice {$this->invoice->invoice_number} from ".config('app.name'),
+        $business = $this->invoice->sellerBusiness;
+        $envelope = new Envelope(
+            subject: "Invoice {$this->invoice->invoice_number} from ".($business?->name ?? config('app.name')),
         );
+
+        if ($business) {
+            $replyTo = $this->getBusinessReplyTo($business);
+            if ($replyTo) {
+                $envelope->replyTo($replyTo);
+            }
+        }
+
+        return $envelope;
     }
 
     public function content(): Content

app/Mail/Orders/OrderAcceptedMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Mail\Orders;
 
+use App\Mail\Concerns\HasBusinessReplyTo;
 use App\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@@ -11,7 +12,7 @@ use Illuminate\Queue\SerializesModels;
 
 class OrderAcceptedMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use HasBusinessReplyTo, Queueable, SerializesModels;
 
     /**
      * Create a new message instance.
@@ -25,9 +26,19 @@ class OrderAcceptedMail extends Mailable
      */
     public function envelope(): Envelope
     {
-        return new Envelope(
+        $business = $this->order->sellerBusiness;
+        $envelope = new Envelope(
             subject: "Order {$this->order->order_number} Accepted",
         );
+
+        if ($business) {
+            $replyTo = $this->getBusinessReplyTo($business);
+            if ($replyTo) {
+                $envelope->replyTo($replyTo);
+            }
+        }
+
+        return $envelope;
     }
 
     /**

app/Mail/Orders/OrderDeliveredMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Mail\Orders;
 
+use App\Mail\Concerns\HasBusinessReplyTo;
 use App\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@@ -11,7 +12,7 @@ use Illuminate\Queue\SerializesModels;
 
 class OrderDeliveredMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use HasBusinessReplyTo, Queueable, SerializesModels;
 
     public function __construct(
         public Order $order
@@ -19,9 +20,19 @@ class OrderDeliveredMail extends Mailable
 
     public function envelope(): Envelope
     {
-        return new Envelope(
+        $business = $this->order->sellerBusiness;
+        $envelope = new Envelope(
             subject: "Order {$this->order->order_number} Delivered",
         );
+
+        if ($business) {
+            $replyTo = $this->getBusinessReplyTo($business);
+            if ($replyTo) {
+                $envelope->replyTo($replyTo);
+            }
+        }
+
+        return $envelope;
     }
 
     public function content(): Content

app/Mail/Orders/OrderReadyForDeliveryMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Mail\Orders;
 
+use App\Mail\Concerns\HasBusinessReplyTo;
 use App\Models\Order;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
@@ -11,7 +12,7 @@ use Illuminate\Queue\SerializesModels;
 
 class OrderReadyForDeliveryMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use HasBusinessReplyTo, Queueable, SerializesModels;
 
     public function __construct(
         public Order $order
@@ -19,9 +20,19 @@ class OrderReadyForDeliveryMail extends Mailable
 
     public function envelope(): Envelope
     {
-        return new Envelope(
+        $business = $this->order->sellerBusiness;
+        $envelope = new Envelope(
             subject: "Order {$this->order->order_number} Ready for Delivery",
         );
+
+        if ($business) {
+            $replyTo = $this->getBusinessReplyTo($business);
+            if ($replyTo) {
+                $envelope->replyTo($replyTo);
+            }
+        }
+
+        return $envelope;
     }
 
     public function content(): Content

app/Mail/QuoteMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Mail;
 
+use App\Mail\Concerns\HasBusinessReplyTo;
 use App\Models\Business;
 use App\Models\Crm\CrmQuote;
 use Illuminate\Bus\Queueable;
@@ -14,7 +15,7 @@ use Illuminate\Support\Facades\Storage;
 
 class QuoteMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use HasBusinessReplyTo, Queueable, SerializesModels;
 
     public function __construct(
         public CrmQuote $quote,
@@ -25,9 +26,16 @@ class QuoteMail extends Mailable
 
     public function envelope(): Envelope
     {
-        return new Envelope(
+        $envelope = new Envelope(
             subject: "Quote {$this->quote->quote_number} from {$this->business->name}",
         );
+
+        $replyTo = $this->getBusinessReplyTo($this->business);
+        if ($replyTo) {
+            $envelope->replyTo($replyTo);
+        }
+
+        return $envelope;
     }
 
     public function content(): Content

app/Models/AccountNote.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Account Note - Sales rep notes on buyer accounts
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property int $account_id
+ * @property int $user_id
+ * @property string $note_type
+ * @property string $content
+ * @property bool $is_pinned
+ */
+class AccountNote extends Model
+{
+    public const TYPE_GENERAL = 'general';
+
+    public const TYPE_COMPETITOR = 'competitor';
+
+    public const TYPE_PAIN_POINT = 'pain_point';
+
+    public const TYPE_OPPORTUNITY = 'opportunity';
+
+    public const TYPE_OBJECTION = 'objection';
+
+    public const TYPES = [
+        self::TYPE_GENERAL => 'General',
+        self::TYPE_COMPETITOR => 'Competitor Intel',
+        self::TYPE_PAIN_POINT => 'Pain Point',
+        self::TYPE_OPPORTUNITY => 'Opportunity',
+        self::TYPE_OBJECTION => 'Objection',
+    ];
+
+    protected $fillable = [
+        'business_id',
+        'account_id',
+        'user_id',
+        'note_type',
+        'content',
+        'is_pinned',
+    ];
+
+    protected $casts = [
+        'is_pinned' => 'boolean',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function account(): BelongsTo
+    {
+        return $this->belongsTo(Business::class, 'account_id');
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function author(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeForAccount($query, int $accountId)
+    {
+        return $query->where('account_id', $accountId);
+    }
+
+    public function scopePinned($query)
+    {
+        return $query->where('is_pinned', true);
+    }
+
+    public function scopeOfType($query, string $type)
+    {
+        return $query->where('note_type', $type);
+    }
+
+    public function scopeCompetitor($query)
+    {
+        return $query->where('note_type', self::TYPE_COMPETITOR);
+    }
+
+    public function scopePainPoints($query)
+    {
+        return $query->where('note_type', self::TYPE_PAIN_POINT);
+    }
+
+    public function scopeOpportunities($query)
+    {
+        return $query->where('note_type', self::TYPE_OPPORTUNITY);
+    }
+
+    // ==================== Helpers ====================
+
+    public function getTypeLabel(): string
+    {
+        return self::TYPES[$this->note_type] ?? ucfirst($this->note_type);
+    }
+
+    public function pin(): void
+    {
+        $this->update(['is_pinned' => true]);
+    }
+
+    public function unpin(): void
+    {
+        $this->update(['is_pinned' => false]);
+    }
+}

app/Models/Activity.php

@@ -57,6 +57,11 @@ class Activity extends Model
         'task.reminder_sent' => ['icon' => 'heroicons--bell', 'color' => 'text-warning', 'label' => 'Reminder Sent'],
         'event.reminder_sent' => ['icon' => 'heroicons--bell', 'color' => 'text-warning', 'label' => 'Reminder Sent'],
 
+        // Email engagement activities
+        'email.opened' => ['icon' => 'heroicons--envelope-open', 'color' => 'text-success', 'label' => 'Email Opened'],
+        'email.clicked' => ['icon' => 'heroicons--cursor-arrow-rays', 'color' => 'text-info', 'label' => 'Email Link Clicked'],
+        'email.bounced' => ['icon' => 'heroicons--exclamation-circle', 'color' => 'text-error', 'label' => 'Email Bounced'],
+
         // Generic
         'note.added' => ['icon' => 'heroicons--document-text', 'color' => 'text-base-content', 'label' => 'Note Added'],
     ];

app/Models/AgentStatus.php

@@ -25,8 +25,11 @@ class AgentStatus extends Model
     ];
 
     public const STATUS_ONLINE = 'online';
+
     public const STATUS_AWAY = 'away';
+
     public const STATUS_BUSY = 'busy';
+
     public const STATUS_OFFLINE = 'offline';
 
     public static function statuses(): array
@@ -87,4 +90,22 @@ class AgentStatus extends Model
     {
         return self::statusColors()[$this->status] ?? 'ghost';
     }
+
+    /**
+     * Update last_seen_at timestamp (for heartbeat)
+     */
+    public function updateLastSeen(): self
+    {
+        $this->update(['last_seen_at' => now()]);
+
+        return $this;
+    }
+
+    /**
+     * Check if agent is active (seen within last 5 minutes)
+     */
+    public function isActive(): bool
+    {
+        return $this->last_seen_at && $this->last_seen_at->gte(now()->subMinutes(5));
+    }
 }

app/Models/Analytics/EmailInteraction.php

@@ -2,7 +2,9 @@
 
 namespace App\Models\Analytics;
 
+use App\Models\Activity;
 use App\Models\Business;
+use App\Models\Contact;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -118,6 +120,9 @@ class EmailInteraction extends Model
         // Update campaign stats
         if ($isFirstOpen && $this->campaign) {
             $this->campaign->increment('opened_count');
+
+            // Log activity for first open only
+            $this->logActivity('email.opened', "Opened '{$this->campaign->subject}'");
         }
     }
 
@@ -147,6 +152,10 @@ class EmailInteraction extends Model
         // Update campaign stats
         if ($isFirstClick && $this->campaign) {
             $this->campaign->increment('clicked_count');
+
+            // Log activity for first click only
+            $subject = $this->campaign->subject;
+            $this->logActivity('email.clicked', "Clicked link in '{$subject}'", ['url' => $url]);
         }
     }
 
@@ -179,4 +188,32 @@ class EmailInteraction extends Model
 
         $this->update(['engagement_score' => min(100, $score)]);
     }
+
+    /**
+     * Log activity for email engagement.
+     * Finds contact by email and logs activity to their timeline.
+     */
+    protected function logActivity(string $type, string $description, ?array $meta = null): void
+    {
+        // Find contact by email in the sender's business
+        $contact = Contact::where('email', $this->recipient_email)->first();
+
+        if (! $contact || ! $this->business_id) {
+            return;
+        }
+
+        Activity::create([
+            'seller_business_id' => $this->business_id,
+            'business_id' => $contact->business_id,
+            'contact_id' => $contact->id,
+            'subject_type' => self::class,
+            'subject_id' => $this->id,
+            'type' => $type,
+            'description' => $description,
+            'meta' => array_merge($meta ?? [], [
+                'campaign_id' => $this->email_campaign_id,
+                'interaction_id' => $this->id,
+            ]),
+        ]);
+    }
 }

app/Models/BannerAd.php

@@ -0,0 +1,201 @@
+<?php
+
+namespace App\Models;
+
+use App\Enums\BannerAdStatus;
+use App\Enums\BannerAdZone;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Storage;
+
+class BannerAd extends Model
+{
+    use SoftDeletes;
+
+    protected $fillable = [
+        'brand_id',
+        'created_by_user_id',
+        'name',
+        'headline',
+        'description',
+        'cta_text',
+        'cta_url',
+        'image_path',
+        'image_alt',
+        'zone',
+        'starts_at',
+        'ends_at',
+        'target_business_types',
+        'is_platform_wide',
+        'status',
+        'priority',
+        'weight',
+        'impressions',
+        'clicks',
+    ];
+
+    protected $casts = [
+        'starts_at' => 'datetime',
+        'ends_at' => 'datetime',
+        'target_business_types' => 'array',
+        'is_platform_wide' => 'boolean',
+        'status' => BannerAdStatus::class,
+        'zone' => BannerAdZone::class,
+        'impressions' => 'integer',
+        'clicks' => 'integer',
+        'priority' => 'integer',
+        'weight' => 'integer',
+    ];
+
+    // Relationships
+
+    public function brand(): BelongsTo
+    {
+        return $this->belongsTo(Brand::class);
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by_user_id');
+    }
+
+    public function events(): HasMany
+    {
+        return $this->hasMany(BannerAdEvent::class);
+    }
+
+    public function dailyStats(): HasMany
+    {
+        return $this->hasMany(BannerAdDailyStat::class);
+    }
+
+    // Scopes
+
+    public function scopeActive($query)
+    {
+        return $query->where('status', BannerAdStatus::ACTIVE)
+            ->where(function ($q) {
+                $q->whereNull('starts_at')->orWhere('starts_at', '<=', now());
+            })
+            ->where(function ($q) {
+                $q->whereNull('ends_at')->orWhere('ends_at', '>=', now());
+            });
+    }
+
+    public function scopeForZone($query, BannerAdZone|string $zone)
+    {
+        $zoneValue = $zone instanceof BannerAdZone ? $zone->value : $zone;
+
+        return $query->where('zone', $zoneValue);
+    }
+
+    public function scopePlatformWide($query)
+    {
+        return $query->where('is_platform_wide', true);
+    }
+
+    public function scopeForBusinessType($query, ?string $businessType)
+    {
+        if (! $businessType) {
+            return $query;
+        }
+
+        return $query->where(function ($q) use ($businessType) {
+            $q->whereNull('target_business_types')
+                ->orWhereJsonContains('target_business_types', $businessType);
+        });
+    }
+
+    public function scopeScheduled($query)
+    {
+        return $query->where('status', BannerAdStatus::SCHEDULED)
+            ->whereNotNull('starts_at')
+            ->where('starts_at', '>', now());
+    }
+
+    public function scopeExpired($query)
+    {
+        return $query->where('status', BannerAdStatus::EXPIRED);
+    }
+
+    // Accessors
+
+    public function getImageUrlAttribute(): ?string
+    {
+        if (! $this->image_path) {
+            return null;
+        }
+
+        return Storage::url($this->image_path);
+    }
+
+    public function getClickThroughRateAttribute(): float
+    {
+        if ($this->impressions === 0) {
+            return 0;
+        }
+
+        return round(($this->clicks / $this->impressions) * 100, 2);
+    }
+
+    public function getIsCurrentlyActiveAttribute(): bool
+    {
+        if ($this->status !== BannerAdStatus::ACTIVE) {
+            return false;
+        }
+
+        $now = now();
+
+        if ($this->starts_at && $this->starts_at > $now) {
+            return false;
+        }
+
+        if ($this->ends_at && $this->ends_at < $now) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public function getDimensionsAttribute(): array
+    {
+        return $this->zone?->dimensions() ?? ['width' => 728, 'height' => 90, 'display' => '728x90'];
+    }
+
+    // Methods
+
+    public function incrementImpressions(): void
+    {
+        $this->increment('impressions');
+    }
+
+    public function incrementClicks(): void
+    {
+        $this->increment('clicks');
+    }
+
+    /**
+     * Get image URL for serving via controller
+     */
+    public function getImageUrl(?int $width = null): ?string
+    {
+        if (! $this->image_path) {
+            return null;
+        }
+
+        return route('image.banner-ad', [
+            'bannerAd' => $this->id,
+            'width' => $width,
+        ]);
+    }
+
+    /**
+     * Get click tracking URL
+     */
+    public function getClickUrl(): string
+    {
+        return route('banner-ad.click', $this->id);
+    }
+}

app/Models/BannerAdDailyStat.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class BannerAdDailyStat extends Model
+{
+    protected $fillable = [
+        'banner_ad_id',
+        'date',
+        'impressions',
+        'clicks',
+        'unique_impressions',
+        'unique_clicks',
+    ];
+
+    protected $casts = [
+        'date' => 'date',
+        'impressions' => 'integer',
+        'clicks' => 'integer',
+        'unique_impressions' => 'integer',
+        'unique_clicks' => 'integer',
+    ];
+
+    // Relationships
+
+    public function bannerAd(): BelongsTo
+    {
+        return $this->belongsTo(BannerAd::class);
+    }
+
+    // Accessors
+
+    public function getClickThroughRateAttribute(): float
+    {
+        if ($this->impressions === 0) {
+            return 0;
+        }
+
+        return round(($this->clicks / $this->impressions) * 100, 2);
+    }
+
+    public function getUniqueClickThroughRateAttribute(): float
+    {
+        if ($this->unique_impressions === 0) {
+            return 0;
+        }
+
+        return round(($this->unique_clicks / $this->unique_impressions) * 100, 2);
+    }
+
+    // Scopes
+
+    public function scopeForDateRange($query, $startDate, $endDate)
+    {
+        return $query->whereBetween('date', [$startDate, $endDate]);
+    }
+
+    public function scopeForAd($query, $bannerAdId)
+    {
+        return $query->where('banner_ad_id', $bannerAdId);
+    }
+}

app/Models/BannerAdEvent.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class BannerAdEvent extends Model
+{
+    public $timestamps = false;
+
+    protected $fillable = [
+        'banner_ad_id',
+        'business_id',
+        'user_id',
+        'event_type',
+        'session_id',
+        'ip_address',
+        'user_agent',
+        'page_url',
+        'referer',
+        'created_at',
+    ];
+
+    protected $casts = [
+        'created_at' => 'datetime',
+    ];
+
+    protected static function booted(): void
+    {
+        static::creating(function (self $event) {
+            $event->created_at = $event->created_at ?? now();
+        });
+    }
+
+    // Relationships
+
+    public function bannerAd(): BelongsTo
+    {
+        return $this->belongsTo(BannerAd::class);
+    }
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    // Scopes
+
+    public function scopeImpressions($query)
+    {
+        return $query->where('event_type', 'impression');
+    }
+
+    public function scopeClicks($query)
+    {
+        return $query->where('event_type', 'click');
+    }
+
+    public function scopeForDate($query, $date)
+    {
+        return $query->whereDate('created_at', $date);
+    }
+
+    public function scopeForDateRange($query, $startDate, $endDate)
+    {
+        return $query->whereBetween('created_at', [$startDate, $endDate]);
+    }
+}

app/Models/Brand.php

@@ -129,6 +129,9 @@ class Brand extends Model implements Auditable
 
         // CRM Channel for inbound emails
         'inbound_email_channel_id',
+
+        // CannaIQ Integration
+        'cannaiq_brand_key', // Normalized brand name for CannaIQ API (e.g., "alohatymemachine")
     ];
 
     protected $casts = [
@@ -325,6 +328,47 @@ class Brand extends Model implements Auditable
             ->get();
     }
 
+    // CannaIQ Integration
+
+    /**
+     * Check if brand is connected to CannaIQ
+     */
+    public function isCannaiqConnected(): bool
+    {
+        return ! empty($this->cannaiq_brand_key);
+    }
+
+    /**
+     * Normalize a brand name for CannaIQ API key
+     * Removes spaces, special chars, converts to lowercase
+     *
+     * Example: "Aloha TymeMachine" → "alohatymemachine"
+     */
+    public static function normalizeCannaiqKey(string $brandName): string
+    {
+        // Remove all non-alphanumeric characters and convert to lowercase
+        return strtolower(preg_replace('/[^a-zA-Z0-9]/', '', $brandName));
+    }
+
+    /**
+     * Connect brand to CannaIQ using brand name
+     * Normalizes the name and stores as cannaiq_brand_key
+     */
+    public function connectToCannaiq(string $brandName): void
+    {
+        $this->cannaiq_brand_key = self::normalizeCannaiqKey($brandName);
+        $this->save();
+    }
+
+    /**
+     * Disconnect brand from CannaIQ
+     */
+    public function disconnectFromCannaiq(): void
+    {
+        $this->cannaiq_brand_key = null;
+        $this->save();
+    }
+
     /**
      * Generate slug from name
      */

app/Models/Business.php

@@ -293,6 +293,7 @@ class Business extends Model implements AuditableContract
         'has_enterprise_suite',
         'use_suite_navigation',
         'cannaiq_enabled',
+        'ping_pong_enabled',
 
         // Sales Suite Usage Limits
         'sales_suite_brand_limit',
@@ -368,6 +369,7 @@ class Business extends Model implements AuditableContract
         'is_enterprise_plan' => 'boolean', // Plan limit override - when true, usage limits are not enforced
         'use_suite_navigation' => 'boolean',
         'cannaiq_enabled' => 'boolean',
+        'ping_pong_enabled' => 'boolean',
         // Sales Suite Usage Limits
         'sales_suite_brand_limit' => 'integer',
         'sales_suite_sku_limit_per_brand' => 'integer',
@@ -531,6 +533,47 @@ class Business extends Model implements AuditableContract
         return $this->hasMany(Brand::class);
     }
 
+    // =========================================================================
+    // DBA (Doing Business As) Relationships
+    // =========================================================================
+
+    /**
+     * Get all DBAs for this business.
+     */
+    public function dbas(): HasMany
+    {
+        return $this->hasMany(BusinessDba::class);
+    }
+
+    /**
+     * Get active DBAs for this business.
+     */
+    public function activeDbas(): HasMany
+    {
+        return $this->hasMany(BusinessDba::class)->where('is_active', true);
+    }
+
+    /**
+     * Get the default DBA for this business.
+     */
+    public function defaultDba(): HasOne
+    {
+        return $this->hasOne(BusinessDba::class)->where('is_default', true);
+    }
+
+    /**
+     * Get DBA for invoice generation.
+     * Priority: explicit dba_id > default DBA > first active DBA > null
+     */
+    public function getDbaForInvoice(?int $dbaId = null): ?BusinessDba
+    {
+        if ($dbaId) {
+            return $this->dbas()->find($dbaId);
+        }
+
+        return $this->defaultDba ?? $this->activeDbas()->first();
+    }
+
     public function brandAiProfiles(): HasMany
     {
         return $this->hasMany(BrandAiProfile::class);
@@ -612,6 +655,24 @@ class Business extends Model implements AuditableContract
         return $this->hasOne(BusinessSettings::class);
     }
 
+    /**
+     * Get email identities for inbound email routing.
+     */
+    public function emailIdentities(): HasMany
+    {
+        return $this->hasMany(BusinessEmailIdentity::class);
+    }
+
+    /**
+     * Get the primary email identity (first active one).
+     */
+    public function primaryEmailIdentity(): HasOne
+    {
+        return $this->hasOne(BusinessEmailIdentity::class)
+            ->where('is_active', true)
+            ->orderBy('id');
+    }
+
     public function approver()
     {
         return $this->belongsTo(User::class, 'approved_by');

app/Models/BusinessDba.php

@@ -0,0 +1,250 @@
+<?php
+
+namespace App\Models;
+
+use App\Traits\BelongsToBusinessDirectly;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Str;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class BusinessDba extends Model implements Auditable
+{
+    use BelongsToBusinessDirectly;
+    use HasFactory;
+    use \OwenIt\Auditing\Auditable;
+    use SoftDeletes;
+
+    protected $table = 'business_dbas';
+
+    protected $fillable = [
+        'business_id',
+        'trade_name',
+        'slug',
+        // Address
+        'address',
+        'address_line_2',
+        'city',
+        'state',
+        'zip',
+        // License
+        'license_number',
+        'license_type',
+        'license_expiration',
+        // Bank Info
+        'bank_name',
+        'bank_account_name',
+        'bank_routing_number',
+        'bank_account_number',
+        'bank_account_type',
+        // Tax
+        'tax_id',
+        'tax_id_type',
+        // Contacts
+        'primary_contact_name',
+        'primary_contact_email',
+        'primary_contact_phone',
+        'ap_contact_name',
+        'ap_contact_email',
+        'ap_contact_phone',
+        // Invoice Settings
+        'payment_terms',
+        'payment_instructions',
+        'invoice_footer',
+        'invoice_prefix',
+        // Branding
+        'logo_path',
+        'brand_colors',
+        // Status
+        'is_default',
+        'is_active',
+    ];
+
+    protected $casts = [
+        'brand_colors' => 'array',
+        'is_default' => 'boolean',
+        'is_active' => 'boolean',
+        'license_expiration' => 'date',
+        // Encrypted fields
+        'bank_routing_number' => 'encrypted',
+        'bank_account_number' => 'encrypted',
+        'tax_id' => 'encrypted',
+    ];
+
+    /**
+     * Fields to exclude from audit logging (sensitive data)
+     */
+    protected array $auditExclude = [
+        'bank_routing_number',
+        'bank_account_number',
+        'tax_id',
+    ];
+
+    // =========================================================================
+    // Relationships
+    // =========================================================================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function invoices(): HasMany
+    {
+        return $this->hasMany(\App\Models\Crm\CrmInvoice::class, 'dba_id');
+    }
+
+    public function orders(): HasMany
+    {
+        return $this->hasMany(Order::class, 'seller_dba_id');
+    }
+
+    // =========================================================================
+    // Scopes
+    // =========================================================================
+
+    public function scopeActive($query)
+    {
+        return $query->where('is_active', true);
+    }
+
+    public function scopeDefault($query)
+    {
+        return $query->where('is_default', true);
+    }
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    // =========================================================================
+    // Accessors
+    // =========================================================================
+
+    /**
+     * Get the full formatted address.
+     */
+    public function getFullAddressAttribute(): string
+    {
+        $parts = array_filter([
+            $this->address,
+            $this->address_line_2,
+        ]);
+
+        $cityStateZip = trim(
+            ($this->city ?? '').
+            ($this->city && $this->state ? ', ' : '').
+            ($this->state ?? '').' '.
+            ($this->zip ?? '')
+        );
+
+        if ($cityStateZip) {
+            $parts[] = $cityStateZip;
+        }
+
+        return implode("\n", $parts);
+    }
+
+    /**
+     * Get masked bank account number (last 4 digits).
+     */
+    public function getMaskedAccountNumberAttribute(): ?string
+    {
+        if (! $this->bank_account_number) {
+            return null;
+        }
+
+        return '****'.substr($this->bank_account_number, -4);
+    }
+
+    /**
+     * Get masked tax ID (last 4 digits).
+     */
+    public function getMaskedTaxIdAttribute(): ?string
+    {
+        if (! $this->tax_id) {
+            return null;
+        }
+
+        return '***-**-'.substr($this->tax_id, -4);
+    }
+
+    // =========================================================================
+    // Methods
+    // =========================================================================
+
+    /**
+     * Mark this DBA as the default for the business.
+     */
+    public function markAsDefault(): void
+    {
+        // Clear default from other DBAs for this business
+        static::where('business_id', $this->business_id)
+            ->where('id', '!=', $this->id)
+            ->update(['is_default' => false]);
+
+        $this->update(['is_default' => true]);
+    }
+
+    /**
+     * Get display info for invoices/orders.
+     */
+    public function getDisplayInfo(): array
+    {
+        return [
+            'name' => $this->trade_name,
+            'address' => $this->full_address,
+            'license' => $this->license_number,
+            'logo' => $this->logo_path,
+            'payment_terms' => $this->payment_terms,
+            'payment_instructions' => $this->payment_instructions,
+            'invoice_footer' => $this->invoice_footer,
+            'primary_contact' => [
+                'name' => $this->primary_contact_name,
+                'email' => $this->primary_contact_email,
+                'phone' => $this->primary_contact_phone,
+            ],
+            'ap_contact' => [
+                'name' => $this->ap_contact_name,
+                'email' => $this->ap_contact_email,
+                'phone' => $this->ap_contact_phone,
+            ],
+        ];
+    }
+
+    // =========================================================================
+    // Boot
+    // =========================================================================
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        // Auto-generate slug on creation
+        static::creating(function ($dba) {
+            if (empty($dba->slug)) {
+                $dba->slug = Str::slug($dba->trade_name);
+
+                // Ensure unique
+                $original = $dba->slug;
+                $counter = 1;
+                while (static::withTrashed()->where('slug', $dba->slug)->exists()) {
+                    $dba->slug = $original.'-'.$counter++;
+                }
+            }
+        });
+
+        // Ensure only one default per business
+        static::saving(function ($dba) {
+            if ($dba->is_default && $dba->isDirty('is_default')) {
+                static::where('business_id', $dba->business_id)
+                    ->where('id', '!=', $dba->id ?? 0)
+                    ->update(['is_default' => false]);
+            }
+        });
+    }
+}

app/Models/CompetitorReplacement.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Competitor Replacement - Maps CannaiQ competitor products to our products
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property string $cannaiq_product_id
+ * @property string $competitor_name
+ * @property string|null $competitor_product_name
+ * @property int $product_id
+ * @property string|null $advantage_notes
+ * @property int $created_by
+ */
+class CompetitorReplacement extends Model
+{
+    protected $fillable = [
+        'business_id',
+        'cannaiq_product_id',
+        'competitor_name',
+        'competitor_product_name',
+        'product_id',
+        'advantage_notes',
+        'created_by',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeForCompetitor($query, string $competitorName)
+    {
+        return $query->where('competitor_name', $competitorName);
+    }
+
+    public function scopeForProduct($query, int $productId)
+    {
+        return $query->where('product_id', $productId);
+    }
+
+    // ==================== Helpers ====================
+
+    /**
+     * Get display label showing competitor → our product
+     */
+    public function getDisplayLabel(): string
+    {
+        $competitor = $this->competitor_product_name
+            ? "{$this->competitor_name} - {$this->competitor_product_name}"
+            : $this->competitor_name;
+
+        return "{$competitor} → {$this->product->name}";
+    }
+
+    /**
+     * Get short pitch summary
+     */
+    public function getPitchSummary(): string
+    {
+        if (! $this->advantage_notes) {
+            return "Replace with {$this->product->name}";
+        }
+
+        // Return first sentence or 100 chars
+        $notes = $this->advantage_notes;
+        $firstSentence = strtok($notes, '.');
+
+        return strlen($firstSentence) > 100
+            ? substr($notes, 0, 97).'...'
+            : $firstSentence.'.';
+    }
+}

app/Models/Contact.php

@@ -82,6 +82,7 @@ class Contact extends Model
         'work_hours', // JSON: schedule
         'availability_notes',
         'emergency_contact',
+        'best_time_to_contact',
 
         // Status & Settings
         'is_primary', // Primary contact for business/location
@@ -98,6 +99,7 @@ class Contact extends Model
         'last_contact_date',
         'next_followup_date',
         'relationship_notes',
+        'working_notes', // Sales notes on how they prefer to work
 
         // Account Management
         'archived_at',

app/Models/Crm/CrmInvoice.php

@@ -5,6 +5,7 @@ namespace App\Models\Crm;
 use App\Models\Accounting\ArInvoice;
 use App\Models\Activity;
 use App\Models\Business;
+use App\Models\BusinessDba;
 use App\Models\BusinessLocation;
 use App\Models\Contact;
 use App\Models\Order;
@@ -28,6 +29,17 @@ class CrmInvoice extends Model
 
     protected $table = 'crm_invoices';
 
+    protected static function boot(): void
+    {
+        parent::boot();
+
+        static::creating(function ($invoice) {
+            if (empty($invoice->view_token)) {
+                $invoice->view_token = \Illuminate\Support\Str::random(32);
+            }
+        });
+    }
+
     public const STATUS_DRAFT = 'draft';
 
     public const STATUS_SENT = 'sent';
@@ -44,6 +56,7 @@ class CrmInvoice extends Model
 
     protected $fillable = [
         'business_id',
+        'dba_id',
         'account_id',
         'location_id',
         'contact_id',
@@ -99,6 +112,14 @@ class CrmInvoice extends Model
         return $this->belongsTo(Business::class);
     }
 
+    /**
+     * The DBA (trade name) used for this invoice.
+     */
+    public function dba(): BelongsTo
+    {
+        return $this->belongsTo(BusinessDba::class, 'dba_id');
+    }
+
     public function account(): BelongsTo
     {
         return $this->belongsTo(Business::class, 'account_id');
@@ -389,4 +410,45 @@ class CrmInvoice extends Model
 
         return $prefix.str_pad($number, 5, '0', STR_PAD_LEFT);
     }
+
+    /**
+     * Get seller display information for the invoice.
+     * Prioritizes DBA if set, otherwise falls back to business defaults.
+     */
+    public function getSellerDisplayInfo(): array
+    {
+        if ($this->dba_id && $this->dba) {
+            return $this->dba->getDisplayInfo();
+        }
+
+        // Fall back to business info
+        $business = $this->business;
+
+        return [
+            'name' => $business->dba_name ?: $business->name,
+            'address' => implode("\n", array_filter([
+                $business->invoice_payable_address ?? $business->physical_address,
+                trim(
+                    ($business->invoice_payable_city ?? $business->physical_city ?? '').
+                    ($business->invoice_payable_state ?? $business->physical_state ? ', '.($business->invoice_payable_state ?? $business->physical_state) : '').' '.
+                    ($business->invoice_payable_zipcode ?? $business->physical_zipcode ?? '')
+                ),
+            ])),
+            'license' => $business->license_number,
+            'logo' => null,
+            'payment_terms' => null,
+            'payment_instructions' => $business->order_invoice_footer,
+            'invoice_footer' => $business->order_invoice_footer,
+            'primary_contact' => [
+                'name' => trim(($business->primary_contact_first_name ?? '').' '.($business->primary_contact_last_name ?? '')),
+                'email' => $business->primary_contact_email ?? $business->business_email,
+                'phone' => $business->primary_contact_phone ?? $business->business_phone,
+            ],
+            'ap_contact' => [
+                'name' => trim(($business->ap_contact_first_name ?? '').' '.($business->ap_contact_last_name ?? '')),
+                'email' => $business->ap_contact_email,
+                'phone' => $business->ap_contact_phone,
+            ],
+        ];
+    }
 }

app/Models/Crm/CrmInvoiceItem.php

@@ -34,6 +34,7 @@ class CrmInvoiceItem extends Model
         'tax_rate',
         'tax_amount',
         'line_total',
+        'item_comment',
     ];
 
     protected $casts = [
@@ -54,11 +55,18 @@ class CrmInvoiceItem extends Model
         });
 
         static::saved(function ($item) {
-            $item->invoice->calculateTotals();
+            // Use relationLoaded to prevent lazy loading violation
+            // The invoice totals are recalculated explicitly in the controller after all items are saved
+            if ($item->relationLoaded('invoice')) {
+                $item->invoice->calculateTotals();
+            }
         });
 
         static::deleted(function ($item) {
-            $item->invoice->calculateTotals();
+            // Use relationLoaded to prevent lazy loading violation
+            if ($item->relationLoaded('invoice')) {
+                $item->invoice->calculateTotals();
+            }
         });
     }
 

app/Models/Crm/CrmQuoteItem.php

@@ -28,6 +28,7 @@ class CrmQuoteItem extends Model
         'tax_rate',
         'line_total',
         'sort_order',
+        'item_comment',
     ];
 
     protected $casts = [
@@ -46,11 +47,18 @@ class CrmQuoteItem extends Model
         });
 
         static::saved(function ($item) {
-            $item->quote->calculateTotals();
+            // Use withoutRelations to prevent lazy loading violation
+            // The quote totals are recalculated explicitly in the controller after all items are saved
+            if ($item->relationLoaded('quote')) {
+                $item->quote->calculateTotals();
+            }
         });
 
         static::deleted(function ($item) {
-            $item->quote->calculateTotals();
+            // Use withoutRelations to prevent lazy loading violation
+            if ($item->relationLoaded('quote')) {
+                $item->quote->calculateTotals();
+            }
         });
     }
 

app/Models/Crm/CrmThread.php

@@ -9,6 +9,7 @@ use App\Models\Contact;
 use App\Models\Conversation;
 use App\Models\MarketplaceChatParticipant;
 use App\Models\Order;
+use App\Models\SalesRepAssignment;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -103,6 +104,10 @@ class CrmThread extends Model
         'snoozed_until' => 'datetime',
         'first_response_at' => 'datetime',
         'currently_viewing_since' => 'datetime',
+        'is_chat_request' => 'boolean',
+        'chat_request_at' => 'datetime',
+        'chat_request_responded_at' => 'datetime',
+        'buyer_context' => 'array',
     ];
 
     protected $appends = ['is_snoozed', 'other_viewers'];
@@ -294,6 +299,44 @@ class CrmThread extends Model
             ->where('snoozed_until', '<=', now());
     }
 
+    /**
+     * Scope to filter threads for a sales rep.
+     *
+     * Shows threads where:
+     * - The account (buyer business) is assigned to this sales rep, OR
+     * - The thread is directly assigned to this user
+     *
+     * @param  int  $businessId  The seller business ID
+     * @param  int  $userId  The sales rep user ID
+     */
+    public function scopeForSalesRep($query, int $businessId, int $userId)
+    {
+        // Get account IDs assigned to this sales rep
+        $assignedAccountIds = SalesRepAssignment::where('business_id', $businessId)
+            ->where('user_id', $userId)
+            ->where('assignable_type', Business::class)
+            ->pluck('assignable_id');
+
+        return $query->where(function ($q) use ($assignedAccountIds, $userId) {
+            // Threads for assigned accounts
+            $q->whereIn('account_id', $assignedAccountIds)
+                // OR threads directly assigned to this user
+                ->orWhere('assigned_to', $userId);
+        });
+    }
+
+    /**
+     * Scope to filter threads for a brand portal user.
+     *
+     * Shows only threads related to brands the user has access to.
+     *
+     * @param  array  $brandIds  Brand IDs the user can access
+     */
+    public function scopeForBrandPortal($query, array $brandIds)
+    {
+        return $query->whereIn('brand_id', $brandIds);
+    }
+
     // Accessors
 
     public function getIsSnoozedAttribute(): bool

app/Models/Order.php

@@ -44,6 +44,7 @@ class Order extends Model implements Auditable
         'tax',
         'total',
         'status',
+        'is_ping_pong',
         'created_by',
         'workorder_status',
         'payment_terms',
@@ -98,6 +99,7 @@ class Order extends Model implements Auditable
         'surcharge' => 'decimal:2',
         'tax' => 'decimal:2',
         'total' => 'decimal:2',
+        'is_ping_pong' => 'boolean',
         'workorder_status' => 'decimal:2',
         'due_date' => 'date',
         'delivery_window_date' => 'date',

app/Models/OrderItem.php

@@ -31,6 +31,7 @@ class OrderItem extends Model implements Auditable
         'product_name',
         'product_sku',
         'brand_name',
+        'item_comment',
     ];
 
     /**

app/Models/Product.php

@@ -265,6 +265,14 @@ class Product extends Model implements Auditable
         return $this->belongsTo(Brand::class);
     }
 
+    /**
+     * CannaiQ product mappings for this product.
+     */
+    public function cannaiqMappings(): HasMany
+    {
+        return $this->hasMany(ProductCannaiqMapping::class);
+    }
+
     public function category(): BelongsTo
     {
         return $this->belongsTo(ProductCategory::class, 'category_id');

app/Models/ProductCannaiqMapping.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Maps Hub products to CannaiQ products.
+ *
+ * Many-to-many relationship:
+ * - One Hub product can map to multiple CannaiQ products
+ * - One CannaiQ product can map to multiple Hub products
+ */
+class ProductCannaiqMapping extends Model
+{
+    protected $fillable = [
+        'product_id',
+        'cannaiq_product_id',
+        'cannaiq_product_name',
+        'cannaiq_store_id',
+        'cannaiq_store_name',
+    ];
+
+    protected $casts = [
+        'cannaiq_product_id' => 'integer',
+    ];
+
+    /**
+     * The Hub product this mapping belongs to.
+     */
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+}

app/Models/ProspectImport.php

@@ -0,0 +1,237 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Prospect Import - Track CSV/bulk import jobs
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property int $user_id
+ * @property string $filename
+ * @property string $status
+ * @property int $total_rows
+ * @property int $processed_rows
+ * @property int $created_count
+ * @property int $updated_count
+ * @property int $skipped_count
+ * @property int $error_count
+ * @property array|null $errors
+ * @property array|null $column_mapping
+ * @property \Carbon\Carbon|null $completed_at
+ */
+class ProspectImport extends Model
+{
+    public const STATUS_PENDING = 'pending';
+
+    public const STATUS_PROCESSING = 'processing';
+
+    public const STATUS_COMPLETED = 'completed';
+
+    public const STATUS_FAILED = 'failed';
+
+    protected $fillable = [
+        'business_id',
+        'user_id',
+        'filename',
+        'status',
+        'total_rows',
+        'processed_rows',
+        'created_count',
+        'updated_count',
+        'skipped_count',
+        'error_count',
+        'errors',
+        'column_mapping',
+        'completed_at',
+    ];
+
+    protected $casts = [
+        'total_rows' => 'integer',
+        'processed_rows' => 'integer',
+        'created_count' => 'integer',
+        'updated_count' => 'integer',
+        'skipped_count' => 'integer',
+        'error_count' => 'integer',
+        'errors' => 'array',
+        'column_mapping' => 'array',
+        'completed_at' => 'datetime',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function importer(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopePending($query)
+    {
+        return $query->where('status', self::STATUS_PENDING);
+    }
+
+    public function scopeProcessing($query)
+    {
+        return $query->where('status', self::STATUS_PROCESSING);
+    }
+
+    public function scopeCompleted($query)
+    {
+        return $query->where('status', self::STATUS_COMPLETED);
+    }
+
+    public function scopeFailed($query)
+    {
+        return $query->where('status', self::STATUS_FAILED);
+    }
+
+    // ==================== Helpers ====================
+
+    public function isPending(): bool
+    {
+        return $this->status === self::STATUS_PENDING;
+    }
+
+    public function isProcessing(): bool
+    {
+        return $this->status === self::STATUS_PROCESSING;
+    }
+
+    public function isCompleted(): bool
+    {
+        return $this->status === self::STATUS_COMPLETED;
+    }
+
+    public function isFailed(): bool
+    {
+        return $this->status === self::STATUS_FAILED;
+    }
+
+    /**
+     * Get progress percentage
+     */
+    public function getProgressPercent(): int
+    {
+        if ($this->total_rows === 0) {
+            return 0;
+        }
+
+        return (int) round(($this->processed_rows / $this->total_rows) * 100);
+    }
+
+    /**
+     * Get success rate percentage
+     */
+    public function getSuccessRate(): int
+    {
+        $total = $this->created_count + $this->updated_count + $this->skipped_count + $this->error_count;
+
+        if ($total === 0) {
+            return 0;
+        }
+
+        return (int) round((($this->created_count + $this->updated_count) / $total) * 100);
+    }
+
+    /**
+     * Mark import as processing
+     */
+    public function markProcessing(): void
+    {
+        $this->update(['status' => self::STATUS_PROCESSING]);
+    }
+
+    /**
+     * Mark import as completed
+     */
+    public function markCompleted(): void
+    {
+        $this->update([
+            'status' => self::STATUS_COMPLETED,
+            'completed_at' => now(),
+        ]);
+    }
+
+    /**
+     * Mark import as failed
+     */
+    public function markFailed(?string $reason = null): void
+    {
+        $errors = $this->errors ?? [];
+        if ($reason) {
+            $errors[] = ['row' => 0, 'error' => $reason];
+        }
+
+        $this->update([
+            'status' => self::STATUS_FAILED,
+            'errors' => $errors,
+            'completed_at' => now(),
+        ]);
+    }
+
+    /**
+     * Add error for a specific row
+     */
+    public function addError(int $row, string $error): void
+    {
+        $errors = $this->errors ?? [];
+        $errors[] = ['row' => $row, 'error' => $error];
+
+        $this->update([
+            'errors' => $errors,
+            'error_count' => $this->error_count + 1,
+        ]);
+    }
+
+    /**
+     * Increment processed count
+     */
+    public function incrementProcessed(): void
+    {
+        $this->increment('processed_rows');
+    }
+
+    /**
+     * Increment created count
+     */
+    public function incrementCreated(): void
+    {
+        $this->increment('created_count');
+    }
+
+    /**
+     * Increment updated count
+     */
+    public function incrementUpdated(): void
+    {
+        $this->increment('updated_count');
+    }
+
+    /**
+     * Increment skipped count
+     */
+    public function incrementSkipped(): void
+    {
+        $this->increment('skipped_count');
+    }
+}

app/Models/ProspectInsight.php

@@ -0,0 +1,196 @@
+<?php
+
+namespace App\Models;
+
+use App\Models\Crm\CrmLead;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Prospect Insight - Gap analysis and opportunity tracking
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property int|null $lead_id
+ * @property int|null $account_id
+ * @property string $insight_type
+ * @property string|null $category
+ * @property string $description
+ * @property array|null $supporting_data
+ * @property int $created_by
+ */
+class ProspectInsight extends Model
+{
+    // Insight types
+    public const TYPE_GAP = 'gap';
+
+    public const TYPE_PAIN_POINT = 'pain_point';
+
+    public const TYPE_OPPORTUNITY = 'opportunity';
+
+    public const TYPE_OBJECTION = 'objection';
+
+    public const TYPE_COMPETITOR_WEAKNESS = 'competitor_weakness';
+
+    public const TYPES = [
+        self::TYPE_GAP => 'Gap',
+        self::TYPE_PAIN_POINT => 'Pain Point',
+        self::TYPE_OPPORTUNITY => 'Opportunity',
+        self::TYPE_OBJECTION => 'Objection',
+        self::TYPE_COMPETITOR_WEAKNESS => 'Competitor Weakness',
+    ];
+
+    // Categories
+    public const CATEGORY_PRICE_POINT = 'price_point';
+
+    public const CATEGORY_QUALITY = 'quality';
+
+    public const CATEGORY_CONSISTENCY = 'consistency';
+
+    public const CATEGORY_SERVICE = 'service';
+
+    public const CATEGORY_MARGIN = 'margin';
+
+    public const CATEGORY_RELIABILITY = 'reliability';
+
+    public const CATEGORY_SELECTION = 'selection';
+
+    public const CATEGORIES = [
+        self::CATEGORY_PRICE_POINT => 'Price Point',
+        self::CATEGORY_QUALITY => 'Quality',
+        self::CATEGORY_CONSISTENCY => 'Consistency',
+        self::CATEGORY_SERVICE => 'Service',
+        self::CATEGORY_MARGIN => 'Margin',
+        self::CATEGORY_RELIABILITY => 'Reliability',
+        self::CATEGORY_SELECTION => 'Selection',
+    ];
+
+    protected $fillable = [
+        'business_id',
+        'lead_id',
+        'account_id',
+        'insight_type',
+        'category',
+        'description',
+        'supporting_data',
+        'created_by',
+    ];
+
+    protected $casts = [
+        'supporting_data' => 'array',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function lead(): BelongsTo
+    {
+        return $this->belongsTo(CrmLead::class, 'lead_id');
+    }
+
+    public function account(): BelongsTo
+    {
+        return $this->belongsTo(Business::class, 'account_id');
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeForLead($query, int $leadId)
+    {
+        return $query->where('lead_id', $leadId);
+    }
+
+    public function scopeForAccount($query, int $accountId)
+    {
+        return $query->where('account_id', $accountId);
+    }
+
+    public function scopeOfType($query, string $type)
+    {
+        return $query->where('insight_type', $type);
+    }
+
+    public function scopeOfCategory($query, string $category)
+    {
+        return $query->where('category', $category);
+    }
+
+    public function scopeGaps($query)
+    {
+        return $query->where('insight_type', self::TYPE_GAP);
+    }
+
+    public function scopePainPoints($query)
+    {
+        return $query->where('insight_type', self::TYPE_PAIN_POINT);
+    }
+
+    public function scopeOpportunities($query)
+    {
+        return $query->where('insight_type', self::TYPE_OPPORTUNITY);
+    }
+
+    // ==================== Helpers ====================
+
+    public function getTypeLabel(): string
+    {
+        return self::TYPES[$this->insight_type] ?? ucfirst($this->insight_type);
+    }
+
+    public function getCategoryLabel(): string
+    {
+        if (! $this->category) {
+            return 'General';
+        }
+
+        return self::CATEGORIES[$this->category] ?? ucfirst($this->category);
+    }
+
+    /**
+     * Check if this insight is for a lead (prospect) vs existing account
+     */
+    public function isForProspect(): bool
+    {
+        return ! is_null($this->lead_id);
+    }
+
+    /**
+     * Get the target entity (lead or account)
+     */
+    public function getTarget(): CrmLead|Business|null
+    {
+        if ($this->lead_id) {
+            return $this->lead;
+        }
+
+        if ($this->account_id) {
+            return $this->account;
+        }
+
+        return null;
+    }
+
+    /**
+     * Add supporting data reference
+     */
+    public function addSupportingData(string $key, mixed $value): void
+    {
+        $data = $this->supporting_data ?? [];
+        $data[$key] = $value;
+        $this->update(['supporting_data' => $data]);
+    }
+}

app/Models/SalesCommission.php

@@ -0,0 +1,185 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Sales Commission - Actual commission earned by sales rep on an order
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property int $user_id
+ * @property int $order_id
+ * @property int|null $order_item_id
+ * @property int|null $commission_rate_id
+ * @property int $order_total
+ * @property float $commission_percent
+ * @property int $commission_amount
+ * @property string $status
+ * @property \Carbon\Carbon|null $approved_at
+ * @property int|null $approved_by
+ * @property \Carbon\Carbon|null $paid_at
+ * @property string|null $payment_reference
+ * @property string|null $notes
+ */
+class SalesCommission extends Model
+{
+    public const STATUS_PENDING = 'pending';
+
+    public const STATUS_APPROVED = 'approved';
+
+    public const STATUS_PAID = 'paid';
+
+    protected $fillable = [
+        'business_id',
+        'user_id',
+        'order_id',
+        'order_item_id',
+        'commission_rate_id',
+        'order_total',
+        'commission_percent',
+        'commission_amount',
+        'status',
+        'approved_at',
+        'approved_by',
+        'paid_at',
+        'payment_reference',
+        'notes',
+    ];
+
+    protected $casts = [
+        'order_total' => 'integer',
+        'commission_percent' => 'decimal:2',
+        'commission_amount' => 'integer',
+        'approved_at' => 'datetime',
+        'paid_at' => 'datetime',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function salesRep(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    public function order(): BelongsTo
+    {
+        return $this->belongsTo(Order::class);
+    }
+
+    public function orderItem(): BelongsTo
+    {
+        return $this->belongsTo(OrderItem::class);
+    }
+
+    public function commissionRate(): BelongsTo
+    {
+        return $this->belongsTo(SalesCommissionRate::class, 'commission_rate_id');
+    }
+
+    public function approver(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'approved_by');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeForUser($query, int $userId)
+    {
+        return $query->where('user_id', $userId);
+    }
+
+    public function scopePending($query)
+    {
+        return $query->where('status', self::STATUS_PENDING);
+    }
+
+    public function scopeApproved($query)
+    {
+        return $query->where('status', self::STATUS_APPROVED);
+    }
+
+    public function scopePaid($query)
+    {
+        return $query->where('status', self::STATUS_PAID);
+    }
+
+    public function scopeUnpaid($query)
+    {
+        return $query->whereIn('status', [self::STATUS_PENDING, self::STATUS_APPROVED]);
+    }
+
+    // ==================== Helpers ====================
+
+    public function isPending(): bool
+    {
+        return $this->status === self::STATUS_PENDING;
+    }
+
+    public function isApproved(): bool
+    {
+        return $this->status === self::STATUS_APPROVED;
+    }
+
+    public function isPaid(): bool
+    {
+        return $this->status === self::STATUS_PAID;
+    }
+
+    /**
+     * Get commission amount in dollars
+     */
+    public function getCommissionDollars(): float
+    {
+        return $this->commission_amount / 100;
+    }
+
+    /**
+     * Get order total in dollars
+     */
+    public function getOrderDollars(): float
+    {
+        return $this->order_total / 100;
+    }
+
+    /**
+     * Approve this commission
+     */
+    public function approve(User $approver): void
+    {
+        $this->update([
+            'status' => self::STATUS_APPROVED,
+            'approved_at' => now(),
+            'approved_by' => $approver->id,
+        ]);
+    }
+
+    /**
+     * Mark as paid
+     */
+    public function markPaid(?string $reference = null): void
+    {
+        $this->update([
+            'status' => self::STATUS_PAID,
+            'paid_at' => now(),
+            'payment_reference' => $reference,
+        ]);
+    }
+}

app/Models/SalesCommissionRate.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+/**
+ * Sales Commission Rate - Defines commission rates for sales reps
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property int|null $user_id
+ * @property string $rate_type
+ * @property string|null $rateable_type
+ * @property int|null $rateable_id
+ * @property float $commission_percent
+ * @property \Carbon\Carbon $effective_from
+ * @property \Carbon\Carbon|null $effective_to
+ * @property bool $is_active
+ */
+class SalesCommissionRate extends Model
+{
+    public const TYPE_DEFAULT = 'default';
+
+    public const TYPE_ACCOUNT = 'account';
+
+    public const TYPE_PRODUCT = 'product';
+
+    public const TYPE_BRAND = 'brand';
+
+    protected $fillable = [
+        'business_id',
+        'user_id',
+        'rate_type',
+        'rateable_type',
+        'rateable_id',
+        'commission_percent',
+        'effective_from',
+        'effective_to',
+        'is_active',
+    ];
+
+    protected $casts = [
+        'commission_percent' => 'decimal:2',
+        'effective_from' => 'date',
+        'effective_to' => 'date',
+        'is_active' => 'boolean',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function rateable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    public function commissions(): HasMany
+    {
+        return $this->hasMany(SalesCommission::class, 'commission_rate_id');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeForUser($query, ?int $userId)
+    {
+        return $query->where('user_id', $userId);
+    }
+
+    public function scopeActive($query)
+    {
+        return $query->where('is_active', true);
+    }
+
+    public function scopeEffective($query, ?\Carbon\Carbon $date = null)
+    {
+        $date = $date ?? now();
+
+        return $query
+            ->where('effective_from', '<=', $date)
+            ->where(function ($q) use ($date) {
+                $q->whereNull('effective_to')
+                    ->orWhere('effective_to', '>=', $date);
+            });
+    }
+
+    public function scopeDefault($query)
+    {
+        return $query->where('rate_type', self::TYPE_DEFAULT);
+    }
+
+    // ==================== Helpers ====================
+
+    /**
+     * Check if this rate is currently effective
+     */
+    public function isEffective(?\Carbon\Carbon $date = null): bool
+    {
+        $date = $date ?? now();
+
+        if (! $this->is_active) {
+            return false;
+        }
+
+        if ($this->effective_from > $date) {
+            return false;
+        }
+
+        if ($this->effective_to && $this->effective_to < $date) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get display label for this rate
+     */
+    public function getDisplayLabel(): string
+    {
+        $label = "{$this->commission_percent}%";
+
+        if ($this->user) {
+            $label .= " for {$this->user->name}";
+        }
+
+        return match ($this->rate_type) {
+            self::TYPE_DEFAULT => "Default: {$label}",
+            self::TYPE_ACCOUNT => "Account: {$label}",
+            self::TYPE_PRODUCT => "Product: {$label}",
+            self::TYPE_BRAND => "Brand: {$label}",
+            default => $label,
+        };
+    }
+}

app/Models/SalesRepAssignment.php

@@ -0,0 +1,139 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+/**
+ * Sales Rep Assignment - Links sales reps to accounts or stores
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property int $user_id
+ * @property string $assignable_type
+ * @property int $assignable_id
+ * @property string $assignment_type
+ * @property float|null $commission_rate
+ * @property \Carbon\Carbon $assigned_at
+ * @property int|null $assigned_by
+ * @property string|null $notes
+ */
+class SalesRepAssignment extends Model
+{
+    public const TYPE_PRIMARY = 'primary';
+
+    public const TYPE_SECONDARY = 'secondary';
+
+    protected $fillable = [
+        'business_id',
+        'user_id',
+        'assignable_type',
+        'assignable_id',
+        'assignment_type',
+        'commission_rate',
+        'assigned_at',
+        'assigned_by',
+        'notes',
+    ];
+
+    protected $casts = [
+        'commission_rate' => 'decimal:2',
+        'assigned_at' => 'datetime',
+    ];
+
+    // ==================== Relationships ====================
+
+    /**
+     * The seller business that owns this assignment
+     */
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    /**
+     * The sales rep user
+     */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /**
+     * Alias for user - the sales rep
+     */
+    public function salesRep(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    /**
+     * The assigned entity (Business account or Location store)
+     */
+    public function assignable(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    /**
+     * Who made this assignment
+     */
+    public function assigner(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'assigned_by');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeForUser($query, int $userId)
+    {
+        return $query->where('user_id', $userId);
+    }
+
+    public function scopePrimary($query)
+    {
+        return $query->where('assignment_type', self::TYPE_PRIMARY);
+    }
+
+    public function scopeSecondary($query)
+    {
+        return $query->where('assignment_type', self::TYPE_SECONDARY);
+    }
+
+    public function scopeAccounts($query)
+    {
+        return $query->where('assignable_type', Business::class);
+    }
+
+    public function scopeLocations($query)
+    {
+        return $query->where('assignable_type', Location::class);
+    }
+
+    // ==================== Helpers ====================
+
+    public function isPrimary(): bool
+    {
+        return $this->assignment_type === self::TYPE_PRIMARY;
+    }
+
+    public function isSecondary(): bool
+    {
+        return $this->assignment_type === self::TYPE_SECONDARY;
+    }
+
+    /**
+     * Get the effective commission rate (override or default)
+     */
+    public function getEffectiveCommissionRate(?float $defaultRate = null): ?float
+    {
+        return $this->commission_rate ?? $defaultRate;
+    }
+}

app/Models/SalesTerritory.php

@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+/**
+ * Sales Territory - Geographic region for sales rep assignment
+ *
+ * @property int $id
+ * @property int $business_id
+ * @property string $name
+ * @property string|null $description
+ * @property string $color
+ * @property bool $is_active
+ */
+class SalesTerritory extends Model
+{
+    protected $fillable = [
+        'business_id',
+        'name',
+        'description',
+        'color',
+        'is_active',
+    ];
+
+    protected $casts = [
+        'is_active' => 'boolean',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function areas(): HasMany
+    {
+        return $this->hasMany(SalesTerritoryArea::class, 'territory_id');
+    }
+
+    public function assignments(): HasMany
+    {
+        return $this->hasMany(SalesTerritoryAssignment::class, 'territory_id');
+    }
+
+    public function salesReps(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'sales_territory_assignments', 'territory_id', 'user_id')
+            ->withPivot(['assignment_type', 'assigned_at', 'assigned_by'])
+            ->withTimestamps();
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    public function scopeActive($query)
+    {
+        return $query->where('is_active', true);
+    }
+
+    // ==================== Helpers ====================
+
+    /**
+     * Get the primary sales rep for this territory
+     */
+    public function getPrimaryRep(): ?User
+    {
+        return $this->salesReps()
+            ->wherePivot('assignment_type', 'primary')
+            ->first();
+    }
+
+    /**
+     * Check if a location falls within this territory
+     */
+    public function containsLocation(Location $location): bool
+    {
+        foreach ($this->areas as $area) {
+            if ($area->matchesLocation($location)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get all zip codes in this territory
+     */
+    public function getZipCodes(): array
+    {
+        return $this->areas()
+            ->where('area_type', 'zip')
+            ->pluck('area_value')
+            ->toArray();
+    }
+}

app/Models/SalesTerritoryArea.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Sales Territory Area - Geographic area definition (zip, city, state, county)
+ *
+ * @property int $id
+ * @property int $territory_id
+ * @property string $area_type
+ * @property string $area_value
+ */
+class SalesTerritoryArea extends Model
+{
+    public const TYPE_ZIP = 'zip';
+
+    public const TYPE_CITY = 'city';
+
+    public const TYPE_STATE = 'state';
+
+    public const TYPE_COUNTY = 'county';
+
+    protected $fillable = [
+        'territory_id',
+        'area_type',
+        'area_value',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function territory(): BelongsTo
+    {
+        return $this->belongsTo(SalesTerritory::class, 'territory_id');
+    }
+
+    // ==================== Helpers ====================
+
+    /**
+     * Check if a location matches this area definition
+     */
+    public function matchesLocation(Location $location): bool
+    {
+        $value = strtolower(trim($this->area_value));
+
+        return match ($this->area_type) {
+            self::TYPE_ZIP => strtolower(trim($location->zipcode ?? '')) === $value,
+            self::TYPE_CITY => strtolower(trim($location->city ?? '')) === $value,
+            self::TYPE_STATE => strtolower(trim($location->state ?? '')) === $value,
+            self::TYPE_COUNTY => strtolower(trim($location->county ?? '')) === $value,
+            default => false,
+        };
+    }
+
+    /**
+     * Get display label for this area
+     */
+    public function getDisplayLabel(): string
+    {
+        $typeLabel = match ($this->area_type) {
+            self::TYPE_ZIP => 'ZIP',
+            self::TYPE_CITY => 'City',
+            self::TYPE_STATE => 'State',
+            self::TYPE_COUNTY => 'County',
+            default => ucfirst($this->area_type),
+        };
+
+        return "{$typeLabel}: {$this->area_value}";
+    }
+}

app/Models/SalesTerritoryAssignment.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+/**
+ * Sales Territory Assignment - Links sales reps to territories
+ *
+ * @property int $id
+ * @property int $territory_id
+ * @property int $user_id
+ * @property string $assignment_type
+ * @property \Carbon\Carbon $assigned_at
+ * @property int|null $assigned_by
+ */
+class SalesTerritoryAssignment extends Model
+{
+    public const TYPE_PRIMARY = 'primary';
+
+    public const TYPE_SECONDARY = 'secondary';
+
+    protected $fillable = [
+        'territory_id',
+        'user_id',
+        'assignment_type',
+        'assigned_at',
+        'assigned_by',
+    ];
+
+    protected $casts = [
+        'assigned_at' => 'datetime',
+    ];
+
+    // ==================== Relationships ====================
+
+    public function territory(): BelongsTo
+    {
+        return $this->belongsTo(SalesTerritory::class, 'territory_id');
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function salesRep(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    public function assigner(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'assigned_by');
+    }
+
+    // ==================== Scopes ====================
+
+    public function scopePrimary($query)
+    {
+        return $query->where('assignment_type', self::TYPE_PRIMARY);
+    }
+
+    public function scopeSecondary($query)
+    {
+        return $query->where('assignment_type', self::TYPE_SECONDARY);
+    }
+
+    public function scopeForUser($query, int $userId)
+    {
+        return $query->where('user_id', $userId);
+    }
+
+    // ==================== Helpers ====================
+
+    public function isPrimary(): bool
+    {
+        return $this->assignment_type === self::TYPE_PRIMARY;
+    }
+}

app/Models/TeamConversation.php

@@ -0,0 +1,194 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class TeamConversation extends Model
+{
+    use HasFactory, SoftDeletes;
+
+    public const TYPE_DIRECT = 'direct';
+
+    public const TYPE_GROUP = 'group';
+
+    protected $fillable = [
+        'business_id',
+        'type',
+        'name',
+        'last_message_preview',
+        'last_message_at',
+        'created_by',
+    ];
+
+    protected $casts = [
+        'last_message_at' => 'datetime',
+    ];
+
+    // Relationships
+
+    public function business(): BelongsTo
+    {
+        return $this->belongsTo(Business::class);
+    }
+
+    public function creator(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'created_by');
+    }
+
+    public function participants(): BelongsToMany
+    {
+        return $this->belongsToMany(User::class, 'team_conversation_participants', 'conversation_id', 'user_id')
+            ->withPivot(['is_admin', 'last_read_at', 'is_muted', 'is_pinned'])
+            ->withTimestamps();
+    }
+
+    public function messages(): HasMany
+    {
+        return $this->hasMany(TeamMessage::class, 'conversation_id');
+    }
+
+    // Scopes
+
+    public function scopeForUser($query, int $userId)
+    {
+        return $query->whereHas('participants', fn ($q) => $q->where('user_id', $userId));
+    }
+
+    public function scopeForBusiness($query, int $businessId)
+    {
+        return $query->where('business_id', $businessId);
+    }
+
+    // Helper Methods
+
+    /**
+     * Get or create a direct conversation between two users
+     */
+    public static function getOrCreateDirect(int $businessId, int $userId1, int $userId2): self
+    {
+        // Find existing direct conversation between these two users
+        $conversation = self::where('business_id', $businessId)
+            ->where('type', self::TYPE_DIRECT)
+            ->whereHas('participants', fn ($q) => $q->where('user_id', $userId1))
+            ->whereHas('participants', fn ($q) => $q->where('user_id', $userId2))
+            ->first();
+
+        if ($conversation) {
+            return $conversation;
+        }
+
+        // Create new direct conversation
+        $conversation = self::create([
+            'business_id' => $businessId,
+            'type' => self::TYPE_DIRECT,
+            'created_by' => $userId1,
+        ]);
+
+        // Add both participants
+        $conversation->participants()->attach([
+            $userId1 => ['is_admin' => false],
+            $userId2 => ['is_admin' => false],
+        ]);
+
+        return $conversation;
+    }
+
+    /**
+     * Get the other participant in a direct conversation
+     */
+    public function getOtherParticipant(int $currentUserId): ?User
+    {
+        if ($this->type !== self::TYPE_DIRECT) {
+            return null;
+        }
+
+        return $this->participants->firstWhere('id', '!=', $currentUserId);
+    }
+
+    /**
+     * Get display name for the conversation
+     */
+    public function getDisplayName(int $currentUserId): string
+    {
+        if ($this->type === self::TYPE_GROUP) {
+            return $this->name ?? 'Group Chat';
+        }
+
+        $other = $this->getOtherParticipant($currentUserId);
+
+        return $other ? $other->name : 'Unknown';
+    }
+
+    /**
+     * Check if user has unread messages
+     */
+    public function hasUnreadFor(int $userId): bool
+    {
+        $participant = $this->participants->firstWhere('id', $userId);
+
+        if (! $participant) {
+            return false;
+        }
+
+        $lastRead = $participant->pivot->last_read_at;
+
+        if (! $lastRead) {
+            return $this->messages()->exists();
+        }
+
+        return $this->messages()
+            ->where('created_at', '>', $lastRead)
+            ->where('sender_id', '!=', $userId)
+            ->exists();
+    }
+
+    /**
+     * Get unread count for user
+     */
+    public function getUnreadCountFor(int $userId): int
+    {
+        $participant = $this->participants->firstWhere('id', $userId);
+
+        if (! $participant) {
+            return 0;
+        }
+
+        $lastRead = $participant->pivot->last_read_at;
+
+        $query = $this->messages()->where('sender_id', '!=', $userId);
+
+        if ($lastRead) {
+            $query->where('created_at', '>', $lastRead);
+        }
+
+        return $query->count();
+    }
+
+    /**
+     * Mark conversation as read for user
+     */
+    public function markReadFor(int $userId): void
+    {
+        $this->participants()->updateExistingPivot($userId, [
+            'last_read_at' => now(),
+        ]);
+    }
+
+    /**
+     * Update last message info
+     */
+    public function updateLastMessage(TeamMessage $message): void
+    {
+        $this->update([
+            'last_message_preview' => \Str::limit($message->body, 100),
+            'last_message_at' => $message->created_at,
+        ]);
+    }
+}

app/Models/TeamMessage.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Models;
+
+use App\Events\TeamMessageSent;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class TeamMessage extends Model
+{
+    use HasFactory, SoftDeletes;
+
+    public const TYPE_TEXT = 'text';
+
+    public const TYPE_FILE = 'file';
+
+    public const TYPE_IMAGE = 'image';
+
+    public const TYPE_SYSTEM = 'system';
+
+    protected $fillable = [
+        'conversation_id',
+        'sender_id',
+        'body',
+        'type',
+        'metadata',
+        'read_by',
+    ];
+
+    protected $casts = [
+        'metadata' => 'array',
+        'read_by' => 'array',
+    ];
+
+    // Relationships
+
+    public function conversation(): BelongsTo
+    {
+        return $this->belongsTo(TeamConversation::class, 'conversation_id');
+    }
+
+    public function sender(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'sender_id');
+    }
+
+    // Events
+
+    protected static function booted(): void
+    {
+        static::created(function (TeamMessage $message) {
+            // Update conversation's last message
+            $message->conversation->updateLastMessage($message);
+
+            // Broadcast to other participants
+            broadcast(new TeamMessageSent($message))->toOthers();
+        });
+    }
+
+    // Helper Methods
+
+    /**
+     * Mark message as read by user
+     */
+    public function markReadBy(int $userId): void
+    {
+        $readBy = $this->read_by ?? [];
+
+        if (! in_array($userId, $readBy)) {
+            $readBy[] = $userId;
+            $this->update(['read_by' => $readBy]);
+        }
+    }
+
+    /**
+     * Check if message has been read by user
+     */
+    public function isReadBy(int $userId): bool
+    {
+        return in_array($userId, $this->read_by ?? []);
+    }
+
+    /**
+     * Get sender's display name
+     */
+    public function getSenderName(): string
+    {
+        return $this->sender?->name ?? 'Unknown';
+    }
+
+    /**
+     * Get sender's initials
+     */
+    public function getSenderInitials(): string
+    {
+        if (! $this->sender) {
+            return '?';
+        }
+
+        $firstName = $this->sender->first_name ?? '';
+        $lastName = $this->sender->last_name ?? '';
+
+        return strtoupper(substr($firstName, 0, 1).substr($lastName, 0, 1)) ?: '?';
+    }
+}

app/Notifications/CrmNewMessageNotification.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\Crm\CrmChannelMessage;
+use App\Models\Crm\CrmThread;
+use App\Services\NotificationStyleService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Notification;
+
+class CrmNewMessageNotification extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    /**
+     * Create a new notification instance.
+     */
+    public function __construct(
+        protected CrmChannelMessage $message,
+        protected CrmThread $thread
+    ) {}
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @return array<int, string>
+     */
+    public function via(object $notifiable): array
+    {
+        // Database only - no email for each message
+        return ['database'];
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(object $notifiable): array
+    {
+        $business = $this->thread->business;
+        $businessSlug = $business?->slug ?? 'default';
+        $contact = $this->thread->contact;
+        $contactName = $contact?->getFullName() ?? 'Unknown';
+        $channelType = $this->message->channel_type;
+        $preview = \Illuminate\Support\Str::limit($this->message->body, 50);
+
+        $style = NotificationStyleService::getStyle('message');
+
+        return [
+            'type' => 'crm_message',
+            'title' => 'New Message',
+            'message' => "{$contactName} via {$channelType}: {$preview}",
+            'action_url' => route('seller.business.crm.inbox', $businessSlug),
+            'action_text' => 'View Inbox',
+            'icon' => $style['icon'],
+            'color' => $style['color'],
+            'meta' => [
+                'thread_id' => $this->thread->id,
+                'message_id' => $this->message->id,
+                'channel_type' => $channelType,
+                'contact_id' => $contact?->id,
+                'contact_name' => $contactName,
+            ],
+        ];
+    }
+}

app/Services/BannerAdService.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Services;
+
+use App\Enums\BannerAdStatus;
+use App\Enums\BannerAdZone;
+use App\Models\BannerAd;
+use App\Models\BannerAdEvent;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Cache;
+
+class BannerAdService
+{
+    /**
+     * Get active ads for a zone, optionally filtered by user context
+     */
+    public function getAdsForZone(
+        BannerAdZone $zone,
+        ?string $businessType = null,
+        int $limit = 10
+    ): Collection {
+        $cacheKey = "banner_ads:{$zone->value}:".($businessType ?? 'all');
+
+        return Cache::remember($cacheKey, 300, function () use ($zone, $businessType) {
+            $query = BannerAd::active()
+                ->forZone($zone)
+                ->forBusinessType($businessType)
+                ->orderByDesc('priority')
+                ->orderByDesc('weight');
+
+            return $query->get();
+        })->take($limit);
+    }
+
+    /**
+     * Get a single ad for display with weighted random selection
+     */
+    public function getAdForZone(
+        BannerAdZone $zone,
+        ?string $businessType = null
+    ): ?BannerAd {
+        $ads = $this->getAdsForZone($zone, $businessType, 10);
+
+        if ($ads->isEmpty()) {
+            return null;
+        }
+
+        // If only one ad, return it
+        if ($ads->count() === 1) {
+            return $ads->first();
+        }
+
+        // Weighted random selection
+        $totalWeight = $ads->sum('weight');
+        $random = rand(1, $totalWeight);
+        $currentWeight = 0;
+
+        foreach ($ads as $ad) {
+            $currentWeight += $ad->weight;
+            if ($random <= $currentWeight) {
+                return $ad;
+            }
+        }
+
+        return $ads->first();
+    }
+
+    /**
+     * Record an impression event (fire-and-forget)
+     */
+    public function recordImpression(BannerAd $ad, array $context = []): void
+    {
+        // Fire-and-forget to avoid blocking page load
+        dispatch(function () use ($ad, $context) {
+            BannerAdEvent::create([
+                'banner_ad_id' => $ad->id,
+                'business_id' => $context['business_id'] ?? null,
+                'user_id' => $context['user_id'] ?? null,
+                'event_type' => 'impression',
+                'session_id' => $context['session_id'] ?? session()->getId(),
+                'ip_address' => $context['ip_address'] ?? request()->ip(),
+                'user_agent' => $context['user_agent'] ?? request()->userAgent(),
+                'page_url' => $context['page_url'] ?? request()->fullUrl(),
+                'referer' => $context['referer'] ?? request()->header('referer'),
+            ]);
+
+            $ad->incrementImpressions();
+        })->afterResponse();
+    }
+
+    /**
+     * Record a click event
+     */
+    public function recordClick(BannerAd $ad, array $context = []): void
+    {
+        BannerAdEvent::create([
+            'banner_ad_id' => $ad->id,
+            'business_id' => $context['business_id'] ?? null,
+            'user_id' => $context['user_id'] ?? null,
+            'event_type' => 'click',
+            'session_id' => $context['session_id'] ?? session()->getId(),
+            'ip_address' => $context['ip_address'] ?? request()->ip(),
+            'user_agent' => $context['user_agent'] ?? request()->userAgent(),
+            'page_url' => $context['page_url'] ?? null,
+            'referer' => $context['referer'] ?? request()->header('referer'),
+        ]);
+
+        $ad->incrementClicks();
+    }
+
+    /**
+     * Clear cache for a zone
+     */
+    public function clearZoneCache(BannerAdZone $zone): void
+    {
+        Cache::forget("banner_ads:{$zone->value}:all");
+        Cache::forget("banner_ads:{$zone->value}:buyer");
+        Cache::forget("banner_ads:{$zone->value}:seller");
+        Cache::forget("banner_ads:{$zone->value}:both");
+    }
+
+    /**
+     * Clear all banner ad caches
+     */
+    public function clearAllCaches(): void
+    {
+        foreach (BannerAdZone::cases() as $zone) {
+            $this->clearZoneCache($zone);
+        }
+    }
+
+    /**
+     * Update ad statuses based on schedule
+     *
+     * @return int Number of ads updated
+     */
+    public function updateScheduledStatuses(): int
+    {
+        $now = now();
+        $updated = 0;
+
+        // Activate scheduled ads that have started
+        $updated += BannerAd::where('status', BannerAdStatus::SCHEDULED)
+            ->whereNotNull('starts_at')
+            ->where('starts_at', '<=', $now)
+            ->where(function ($q) use ($now) {
+                $q->whereNull('ends_at')->orWhere('ends_at', '>', $now);
+            })
+            ->update(['status' => BannerAdStatus::ACTIVE]);
+
+        // Expire active ads that have ended
+        $updated += BannerAd::where('status', BannerAdStatus::ACTIVE)
+            ->whereNotNull('ends_at')
+            ->where('ends_at', '<', $now)
+            ->update(['status' => BannerAdStatus::EXPIRED]);
+
+        // Clear caches if any ads were updated
+        if ($updated > 0) {
+            $this->clearAllCaches();
+        }
+
+        return $updated;
+    }
+}

app/Services/Crm/CrmChannelService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\Crm;
 
+use App\Events\CrmThreadMessageSent;
 use App\Jobs\Crm\SendChannelMessageJob;
 use App\Models\Contact;
 use App\Models\Crm\CrmChannel;
@@ -120,6 +121,12 @@ class CrmChannelService
         // Update thread
         $thread->updateLastMessage($message);
 
+        // Broadcast incoming message for real-time updates
+        broadcast(new CrmThreadMessageSent($message->fresh(['attachments', 'user']), $thread));
+
+        // Send notification to assigned user or business users
+        $this->notifyUsersOfNewMessage($message, $thread);
+
         // Trigger automations
         app(CrmAutomationService::class)->trigger('message_received', [
             'business_id' => $businessId,
@@ -227,7 +234,10 @@ class CrmChannelService
             $thread->update(['status' => CrmThread::STATUS_OPEN]);
         }
 
-        // 7) Trigger automations
+        // 7) Broadcast incoming message for real-time updates
+        broadcast(new CrmThreadMessageSent($message->fresh(['attachments', 'user']), $thread));
+
+        // 8) Trigger automations
         app(CrmAutomationService::class)->trigger('message_received', [
             'business_id' => $businessId,
             'message' => $message,
@@ -371,6 +381,9 @@ class CrmChannelService
                 if ($message->thread) {
                     $message->thread->updateLastMessage($message);
                     $message->thread->recordFirstResponse();
+
+                    // Broadcast the new message for real-time updates
+                    broadcast(new CrmThreadMessageSent($message->fresh(['attachments', 'user']), $message->thread))->toOthers();
                 }
 
                 return true;
@@ -757,4 +770,31 @@ class CrmChannelService
             default => 'crm',
         };
     }
+
+    /**
+     * Notify users of a new inbound message
+     */
+    protected function notifyUsersOfNewMessage(CrmChannelMessage $message, CrmThread $thread): void
+    {
+        $notification = new \App\Notifications\CrmNewMessageNotification($message, $thread);
+
+        // If thread is assigned to a specific user, notify them
+        if ($thread->assigned_to) {
+            $assignee = \App\Models\User::find($thread->assigned_to);
+            if ($assignee) {
+                $assignee->notify($notification);
+
+                return;
+            }
+        }
+
+        // Otherwise notify all business users (up to 5 to avoid spam)
+        $business = $thread->business;
+        if ($business) {
+            $users = $business->users()->limit(5)->get();
+            foreach ($users as $user) {
+                $user->notify($notification);
+            }
+        }
+    }
 }

app/Services/Email/InboundEmailService.php

@@ -50,11 +50,17 @@ class InboundEmailService
             return null;
         }
 
+        // Parse plus addressing (inbox+u123@domain.com => user ID 123)
+        $assignToUserId = $this->parseUserFromPlusAddress($toEmail);
+
+        // Strip plus address for identity lookup
+        $baseEmail = $this->stripPlusAddress($toEmail);
+
         // 1) Resolve business + email identity
-        $identity = BusinessEmailIdentity::findByEmail($toEmail);
+        $identity = BusinessEmailIdentity::findByEmail($baseEmail);
 
         if (! $identity) {
-            Log::info("InboundEmailService: No identity found for {$toEmail}");
+            Log::info("InboundEmailService: No identity found for {$baseEmail}");
 
             return null;
         }
@@ -77,13 +83,26 @@ class InboundEmailService
         // 4) Find or create thread (using In-Reply-To / Message-ID / contact)
         $thread = $this->findOrCreateThread($business, $channel, $contact, $payload);
 
-        // 5) Store the inbound message
+        // 5) Auto-assign thread if plus address specified a user
+        if ($assignToUserId && ! $thread->assigned_to) {
+            // Verify user belongs to this business
+            $user = \App\Models\User::find($assignToUserId);
+            if ($user && $user->businesses()->where('businesses.id', $business->id)->exists()) {
+                $thread->update(['assigned_to' => $assignToUserId]);
+                Log::info("InboundEmailService: Auto-assigned thread {$thread->id} to user {$assignToUserId} via plus address");
+            }
+        }
+
+        // 6) Store the inbound message
         $message = $this->storeInboundMessage($thread, $channel, $contact, $payload);
 
-        // 6) Update identity last received timestamp
+        // 7) Update identity last received timestamp
         $identity->recordReceived();
 
-        // 7) Trigger automations
+        // 8) Send notification to users
+        $this->notifyUsersOfNewMessage($message, $thread);
+
+        // 9) Trigger automations
         app(CrmAutomationService::class)->trigger('message_received', [
             'business_id' => $business->id,
             'message' => $message,
@@ -97,6 +116,33 @@ class InboundEmailService
         return $message;
     }
 
+    /**
+     * Parse user ID from plus address.
+     * inbox+u123@domain.com => 123
+     */
+    protected function parseUserFromPlusAddress(string $email): ?int
+    {
+        if (! str_contains($email, '+')) {
+            return null;
+        }
+
+        // Extract the part between + and @
+        if (preg_match('/\+u(\d+)@/', $email, $matches)) {
+            return (int) $matches[1];
+        }
+
+        return null;
+    }
+
+    /**
+     * Strip plus address from email.
+     * inbox+u123@domain.com => inbox@domain.com
+     */
+    protected function stripPlusAddress(string $email): string
+    {
+        return preg_replace('/\+[^@]+@/', '@', $email);
+    }
+
     /**
      * Find or create a contact from the sender's email.
      */
@@ -338,4 +384,31 @@ class InboundEmailService
 
         return $message;
     }
+
+    /**
+     * Notify users of a new inbound email message.
+     */
+    protected function notifyUsersOfNewMessage(CrmChannelMessage $message, CrmThread $thread): void
+    {
+        $notification = new \App\Notifications\CrmNewMessageNotification($message, $thread);
+
+        // If thread is assigned to a specific user, notify them
+        if ($thread->assigned_to) {
+            $assignee = \App\Models\User::find($thread->assigned_to);
+            if ($assignee) {
+                $assignee->notify($notification);
+
+                return;
+            }
+        }
+
+        // Otherwise notify all business users (up to 5 to avoid spam)
+        $business = $thread->business;
+        if ($business) {
+            $users = $business->users()->limit(5)->get();
+            foreach ($users as $user) {
+                $user->notify($notification);
+            }
+        }
+    }
 }

app/Services/NotificationStyleService.php

@@ -16,6 +16,12 @@ class NotificationStyleService
                 'icon' => 'bell',
             ],
 
+            // Messages - Info Blue
+            'message', 'chat', 'inbox' => [
+                'color' => 'primary',
+                'icon' => 'message-circle',
+            ],
+
             // Success - Green
             'success', 'approved', 'completed', 'achievement' => [
                 'color' => 'success',