Compare commits
merge into: Cannabrands:docs/add-feature-branch-sync-guide
Cannabrands:develop
Cannabrands:feat/marketplace-enhancements
Cannabrands:feat/dba-entity-system
Cannabrands:feat/dashboard-pwa-enhancements
Cannabrands:fix/crystal-issues
Cannabrands:feat/omnichannel-inbox
Cannabrands:feat/chat-ui
Cannabrands:feat/sales-rep-system
Cannabrands:feat/marketplace-chat-system
Cannabrands:feat/chat-settings-ui
Cannabrands:fix/crystal-quote-date
Cannabrands:feat/brand-profile-kpi-redesign
Cannabrands:feat/dashboard-sidebar-updates
Cannabrands:feat/standardize-list-pages
Cannabrands:fix/product-description-emoji-import
Cannabrands:fix/product-description-literals
Cannabrands:fix/product-image-upload
Cannabrands:fix/oldest-past-due-days
Cannabrands:fix/crystal-issues-batch-2
Cannabrands:fix/product-brand-descriptions
Cannabrands:fix/gitea-issues-batch
Cannabrands:fix/responsive-tables
Cannabrands:feature/server-side-search
Cannabrands:fix/ui-standardization-and-sidebar
Cannabrands:fix/brand-analysis-404
Cannabrands:fix/crystal-customer-edits-187
Cannabrands:fix/brand-analysis-v4-fixes
Cannabrands:fix/invoice-search-182
Cannabrands:fix/crystal-issues-2
Cannabrands:fix/product-search-case-insensitive
Cannabrands:fix/ci-git-auth
Cannabrands:fix/brand-analysis-v4
Cannabrands:feat/sidebar-build-date
Cannabrands:feature/cannaiq-marketing-intelligence
Cannabrands:feature/brand-analysis-v4
Cannabrands:fix/gitea-critical-issues
Cannabrands:fix/crystal-issues-162-166
Cannabrands:fix/gitea-issues-161-167
Cannabrands:fix/brand-hashid-fallback
Cannabrands:ci/trigger-rebuild
Cannabrands:feature/suite-shares
Cannabrands:fix/empty-doughnut-chart
Cannabrands:feature/shared-menu-badges-clean
Cannabrands:feature/shared-menu-badges
Cannabrands:fix/crm-route-patterns
Cannabrands:fix/ci-pod-stability
Cannabrands:fix/stock-actions-and-brands-cleanup
Cannabrands:fix/buyer-crm-namespaces
Cannabrands:fix/brand-switcher-null-hashid
Cannabrands:feature/cannabrands-seeder-users
Cannabrands:feat/show-contacts-in-users-tab
Cannabrands:fix/backfill-brand-hashids
Cannabrands:feat/admin-version-badge
Cannabrands:fix/business-config-seeder-create-parents
Cannabrands:fix/orchestrator-action-class
Cannabrands:fix/business-config-parent-relationships
Cannabrands:fix/seller-page-bugs-and-performance
Cannabrands:fix/business-settings-persistence
Cannabrands:fix/ci-buildx-provenance
Cannabrands:fix/business-resource-admin-urls
Cannabrands:fix/user-business-pivot-queries
Cannabrands:fixes/first-dev-rollout
Cannabrands:feat/cicd-optimization
Cannabrands:feature/dev-environment-seeders
Cannabrands:fix/asset-url-mixed-content
Cannabrands:fix/force-rebuild-filament-tabs
Cannabrands:feature/v1-finalization
Cannabrands:feature/database-seeders
Cannabrands:feature/messaging-foundations
Cannabrands:feature/product-and-inventory-management
Cannabrands:feature/admin-enhancements
Cannabrands:feature/conversations-and-marketing
Cannabrands:fix/telescope-dev-environment
Cannabrands:revert/remove-use-forwarded-headers
Cannabrands:fix/ingress-forwarded-headers
Cannabrands:fix/seeder-validation-use-testing-db
Cannabrands:feature/restore-order-ui-improvements
Cannabrands:feature/docs-consolidation
Cannabrands:feature/brand-improvements
Cannabrands:feature/inventory-module
Cannabrands:feature/order-flow-updates
Cannabrands:feature/settings-in-dropdown
Cannabrands:feature/settings-enhancements
Cannabrands:feature/pr-4-marketing-templates
Cannabrands:feature/pr-8-analytics-dashboard
Cannabrands:feature/analytics-implementation
Cannabrands:fix/route-exceptions
Cannabrands:golden-backup-20251111
Cannabrands:working-backup-20251111
Cannabrands:feature/pr-4-marketing-templates-clean
Cannabrands:feature/multi-tenancy-security
Cannabrands:hotfix/fix-image-placeholder-404-loop
Cannabrands:feature/pr-5-broadcast-system
Cannabrands:batch-tracking-coa-qr
Cannabrands:feature/fix-batch-architecture
Cannabrands:feature/analytics-system
Cannabrands:fix/settings-manufacturing-wash-reports-20251110
Cannabrands:golden-backup-20251110
Cannabrands:working-backup-20251110
Cannabrands:feature/batch-tracking-coa-qr
Cannabrands:feature/wash-reports-restore
Cannabrands:feature/web-push-notifications
Cannabrands:feature/module-based-view-switcher
Cannabrands:feature/export-companies-products-images
Cannabrands:feature/adding-minio-storage
Cannabrands:hotfix/fix-image-404-loop
Cannabrands:fix/cleanup-product-pr
Cannabrands:docs/add-feature-branch-sync-guide
Cannabrands:feature/product-page-migrate
Cannabrands:fixing-daisy-repo
Cannabrands:feature/implement-laravel-daisyui
Cannabrands:feature/fix-multi-tenancy-architecture
Cannabrands:chore/k8s-traefik-ingress
Cannabrands:feature/marketplace-url-refactor
Cannabrands:docs/update-branching-strategy
Cannabrands:feature/inventory-bamboo
Cannabrands:feature/platform-foundation
Cannabrands:feature/k8s-local-dev
Cannabrands:feature/favorites
Cannabrands:feature/component-categories
Cannabrands:feature/product-categories
Cannabrands:feature/real-time-cart-broadcasting
Cannabrands:feature/email-templating
Cannabrands:refactor/optimize-asset-publishing
Cannabrands:fix/publish-filament-assets
Cannabrands:fix/trusted-proxies-k8s-login
Cannabrands:feature/add-redis-to-kubernetes
Cannabrands:feature/email-templates
Cannabrands:feature/kubernetes-manifests
Cannabrands:feature/enable-ci-caching
Cannabrands:master
...
pull from: Cannabrands:feature/fix-multi-tenancy-architecture
Cannabrands:develop
Cannabrands:feat/marketplace-enhancements
Cannabrands:feat/dba-entity-system
Cannabrands:feat/dashboard-pwa-enhancements
Cannabrands:fix/crystal-issues
Cannabrands:feat/omnichannel-inbox
Cannabrands:feat/chat-ui
Cannabrands:feat/sales-rep-system
Cannabrands:feat/marketplace-chat-system
Cannabrands:feat/chat-settings-ui
Cannabrands:fix/crystal-quote-date
Cannabrands:feat/brand-profile-kpi-redesign
Cannabrands:feat/dashboard-sidebar-updates
Cannabrands:feat/standardize-list-pages
Cannabrands:fix/product-description-emoji-import
Cannabrands:fix/product-description-literals
Cannabrands:fix/product-image-upload
Cannabrands:fix/oldest-past-due-days
Cannabrands:fix/crystal-issues-batch-2
Cannabrands:fix/product-brand-descriptions
Cannabrands:fix/gitea-issues-batch
Cannabrands:fix/responsive-tables
Cannabrands:feature/server-side-search
Cannabrands:fix/ui-standardization-and-sidebar
Cannabrands:fix/brand-analysis-404
Cannabrands:fix/crystal-customer-edits-187
Cannabrands:fix/brand-analysis-v4-fixes
Cannabrands:fix/invoice-search-182
Cannabrands:fix/crystal-issues-2
Cannabrands:fix/product-search-case-insensitive
Cannabrands:fix/ci-git-auth
Cannabrands:fix/brand-analysis-v4
Cannabrands:feat/sidebar-build-date
Cannabrands:feature/cannaiq-marketing-intelligence
Cannabrands:feature/brand-analysis-v4
Cannabrands:fix/gitea-critical-issues
Cannabrands:fix/crystal-issues-162-166
Cannabrands:fix/gitea-issues-161-167
Cannabrands:fix/brand-hashid-fallback
Cannabrands:ci/trigger-rebuild
Cannabrands:feature/suite-shares
Cannabrands:fix/empty-doughnut-chart
Cannabrands:feature/shared-menu-badges-clean
Cannabrands:feature/shared-menu-badges
Cannabrands:fix/crm-route-patterns
Cannabrands:fix/ci-pod-stability
Cannabrands:fix/stock-actions-and-brands-cleanup
Cannabrands:fix/buyer-crm-namespaces
Cannabrands:fix/brand-switcher-null-hashid
Cannabrands:feature/cannabrands-seeder-users
Cannabrands:feat/show-contacts-in-users-tab
Cannabrands:fix/backfill-brand-hashids
Cannabrands:feat/admin-version-badge
Cannabrands:fix/business-config-seeder-create-parents
Cannabrands:fix/orchestrator-action-class
Cannabrands:fix/business-config-parent-relationships
Cannabrands:fix/seller-page-bugs-and-performance
Cannabrands:fix/business-settings-persistence
Cannabrands:fix/ci-buildx-provenance
Cannabrands:fix/business-resource-admin-urls
Cannabrands:fix/user-business-pivot-queries
Cannabrands:fixes/first-dev-rollout
Cannabrands:feat/cicd-optimization
Cannabrands:feature/dev-environment-seeders
Cannabrands:fix/asset-url-mixed-content
Cannabrands:fix/force-rebuild-filament-tabs
Cannabrands:feature/v1-finalization
Cannabrands:feature/database-seeders
Cannabrands:feature/messaging-foundations
Cannabrands:feature/product-and-inventory-management
Cannabrands:feature/admin-enhancements
Cannabrands:feature/conversations-and-marketing
Cannabrands:fix/telescope-dev-environment
Cannabrands:revert/remove-use-forwarded-headers
Cannabrands:fix/ingress-forwarded-headers
Cannabrands:fix/seeder-validation-use-testing-db
Cannabrands:feature/restore-order-ui-improvements
Cannabrands:feature/docs-consolidation
Cannabrands:feature/brand-improvements
Cannabrands:feature/inventory-module
Cannabrands:feature/order-flow-updates
Cannabrands:feature/settings-in-dropdown
Cannabrands:feature/settings-enhancements
Cannabrands:feature/pr-4-marketing-templates
Cannabrands:feature/pr-8-analytics-dashboard
Cannabrands:feature/analytics-implementation
Cannabrands:fix/route-exceptions
Cannabrands:golden-backup-20251111
Cannabrands:working-backup-20251111
Cannabrands:feature/pr-4-marketing-templates-clean
Cannabrands:feature/multi-tenancy-security
Cannabrands:hotfix/fix-image-placeholder-404-loop
Cannabrands:feature/pr-5-broadcast-system
Cannabrands:batch-tracking-coa-qr
Cannabrands:feature/fix-batch-architecture
Cannabrands:feature/analytics-system
Cannabrands:fix/settings-manufacturing-wash-reports-20251110
Cannabrands:golden-backup-20251110
Cannabrands:working-backup-20251110
Cannabrands:feature/batch-tracking-coa-qr
Cannabrands:feature/wash-reports-restore
Cannabrands:feature/web-push-notifications
Cannabrands:feature/module-based-view-switcher
Cannabrands:feature/export-companies-products-images
Cannabrands:feature/adding-minio-storage
Cannabrands:hotfix/fix-image-404-loop
Cannabrands:fix/cleanup-product-pr
Cannabrands:docs/add-feature-branch-sync-guide
Cannabrands:feature/product-page-migrate
Cannabrands:fixing-daisy-repo
Cannabrands:feature/implement-laravel-daisyui
Cannabrands:feature/fix-multi-tenancy-architecture
Cannabrands:chore/k8s-traefik-ingress
Cannabrands:feature/marketplace-url-refactor
Cannabrands:docs/update-branching-strategy
Cannabrands:feature/inventory-bamboo
Cannabrands:feature/platform-foundation
Cannabrands:feature/k8s-local-dev
Cannabrands:feature/favorites
Cannabrands:feature/component-categories
Cannabrands:feature/product-categories
Cannabrands:feature/real-time-cart-broadcasting
Cannabrands:feature/email-templating
Cannabrands:refactor/optimize-asset-publishing
Cannabrands:fix/publish-filament-assets
Cannabrands:fix/trusted-proxies-k8s-login
Cannabrands:feature/add-redis-to-kubernetes
Cannabrands:feature/email-templates
Cannabrands:feature/kubernetes-manifests
Cannabrands:feature/enable-ci-caching
Cannabrands:master
5 Commits
docs/add-f
...
feature/fi
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
b287c224f7 | Merge branch 'develop' into feature/fix-multi-tenancy-architecture | ||
|
|
42b9c1f1e5 |
fix: add missing buyer route definitions for backward compatibility
Add legacy redirect routes for buyer orders, invoices, and business profile that redirect to the new business-scoped routes. This maintains backward compatibility with existing tests and links while preserving the secure multi-tenant architecture. Changes: - Add /b/orders redirect route (buyer.orders.show) - Add /b/invoices redirect route (buyer.invoices.show) - Add /b/business/profile redirect route - Fix route redirects to use business slug explicitly - Update SmokeTest to expect redirects instead of 200 OK - Update OrderSurchargeDisplayTest to follow redirects Test Results: - Fixed 7 previously failing route tests - All smoke tests now passing (19/19) - OrderSurchargeDisplayTest all passing (4/4) - 79/82 tests passing (1 pre-existing schema issue, 2 skipped) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> |
||
|
|
2f8b8c49a5 |
fix: update OrderFactory to use valid order statuses
Updates the OrderFactory to use statuses that match the database check constraint. Replaces invalid statuses (pending, picked, manifested, shipped) with valid ones (new, accepted, in_progress, ready_for_manifest, ready_for_delivery, delivered, cancelled). Fixes test failures caused by check constraint violations. |
||
|
|
140411840d |
fix: add delivery_date and delivery_instructions columns to orders table
Adds nullable delivery_date and delivery_instructions columns to support delivery scheduling in orders. Fixes failing tests that expected these columns to exist. |
||
|
|
5ee662c6e0 |
style: fix code formatting issues identified by CI
- Fix braces_position in NotificationController - Fix blank_line_before_statement in 5 controllers 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> |