[6.x] Converting CP templates to forms

composer.json

@@ -22,7 +22,7 @@
   "prefer-stable": true,
   "require": {
     "php": "^8.5",
-    "craftcms/cms": "6.x-dev",
+    "craftcms/cms": "dev-feature/6.x-form-component-compatibility-and-usage-updates",
     "dompdf/dompdf": "^3.1.6",
     "ibericode/vat": "^2.0",
     "iio/libmergepdf": "^4.0",

lang/en/commerce.php

@@ -249,6 +249,7 @@
     'Couldn’t save shipping method.' => 'Couldn’t save shipping method.',
     'Couldn’t save shipping rule.' => 'Couldn’t save shipping rule.',
     'Couldn’t save shipping zone.' => 'Couldn’t save shipping zone.',
+    'Couldn’t save store location address.' => 'Couldn’t save store location address.',
     'Couldn’t save store.' => 'Couldn’t save store.',
     'Couldn’t save subscription fields.' => 'Couldn’t save subscription fields.',
     'Couldn’t save subscription plan.' => 'Couldn’t save subscription plan.',
@@ -1034,6 +1035,7 @@
     'Shipping method saved.' => 'Shipping method saved.',
     'Shipping methods and rules deleted.' => 'Shipping methods and rules deleted.',
     'Shipping methods updated.' => 'Shipping methods updated.',
+    'Shipping rule deleted.' => 'Shipping rule deleted.',
     'Shipping rule saved.' => 'Shipping rule saved.',
     'Shipping zone saved.' => 'Shipping zone saved.',
     'Shipping' => 'Shipping',

routes/actions.php

@@ -5,35 +5,36 @@
 use CraftCms\Commerce\Http\Controllers\CartController;
 use CraftCms\Commerce\Http\Controllers\DonationsController;
 use CraftCms\Commerce\Http\Controllers\OrdersController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingRulesController;
 use CraftCms\Commerce\Http\Controllers\DownloadsController;
 use CraftCms\Commerce\Http\Controllers\EmailPreviewController;
-use CraftCms\Commerce\Http\Controllers\Settings\DiscountsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\DiscountsController;
 use CraftCms\Commerce\Http\Controllers\Settings\EmailsController;
 use CraftCms\Commerce\Http\Controllers\FormulasController;
 use CraftCms\Commerce\Http\Controllers\Settings\GatewaysController;
+use CraftCms\Commerce\Http\Controllers\Settings\GeneralSettingsController;
 use CraftCms\Commerce\Http\Controllers\InventoryController;
 use CraftCms\Commerce\Http\Controllers\InventoryLocationsController;
 use CraftCms\Commerce\Http\Controllers\Settings\LineItemStatusesController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderSettingsController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderStatusesController;
-use CraftCms\Commerce\Http\Controllers\Settings\PaymentCurrenciesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\PaymentCurrenciesController;
 use CraftCms\Commerce\Http\Controllers\PaymentSourcesController;
 use CraftCms\Commerce\Http\Controllers\PaymentsController;
 use CraftCms\Commerce\Http\Controllers\Settings\PdfsController;
 use CraftCms\Commerce\Http\Controllers\Settings\ProductTypesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SalesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SettingsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingMethodsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingRulesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingZonesController;
-use CraftCms\Commerce\Http\Controllers\Settings\StoreManagementController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\SalesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingMethodsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\StoreManagementController;
 use CraftCms\Commerce\Http\Controllers\Settings\StoresController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxRatesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxRatesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\Settings\TransferSettingsController;
 use CraftCms\Commerce\Http\Controllers\TransfersController;
 use CraftCms\Commerce\Http\Controllers\UserOrdersController;
 use CraftCms\Commerce\Http\Controllers\WebhooksController;
@@ -81,8 +82,8 @@
     Route::post('gateways/archive', [GatewaysController::class, 'archive']);
     Route::post('gateways/reorder', [GatewaysController::class, 'reorder']);
 
-    Route::post('settings/save-settings', [SettingsController::class, 'saveSettings']);
-    Route::post('settings/save-transfer-settings', [SettingsController::class, 'saveTransferSettings']);
+    Route::post('settings/save-settings', [GeneralSettingsController::class, 'saveSettings']);
+    Route::post('settings/save-transfer-settings', [TransferSettingsController::class, 'saveTransferSettings']);
     Route::post('order-settings/save', [OrderSettingsController::class, 'save']);
 
     Route::post('stores/save-store', [StoresController::class, 'saveStore']);
@@ -108,6 +109,7 @@
 // this group must check both, matching that legacy compound check exactly.
 Route::middleware(['auth', 'can:accessPlugin-commerce', 'can:commerce-manageStoreSettings'])->group(function () {
     Route::post('store-management/save', [StoreManagementController::class, 'save']);
+    Route::post('store-management/render-form', [StoreManagementController::class, 'renderForm']);
 
     Route::middleware('can:commerce-managePaymentCurrencies')->group(function () {
         Route::post('payment-currencies/save', [PaymentCurrenciesController::class, 'save']);
@@ -127,10 +129,12 @@
         Route::post('shipping-rules/duplicate', [ShippingRulesController::class, 'duplicate']);
         Route::post('shipping-rules/reorder', [ShippingRulesController::class, 'reorder']);
         Route::post('shipping-rules/delete', [ShippingRulesController::class, 'delete']);
+        Route::post('shipping-rules/render-form', [ShippingRulesController::class, 'renderForm']);
 
         Route::post('shipping-categories/save', [ShippingCategoriesController::class, 'save']);
         Route::post('shipping-categories/delete', [ShippingCategoriesController::class, 'delete']);
         Route::post('shipping-categories/set-default-category', [ShippingCategoriesController::class, 'setDefaultCategory']);
+        Route::post('shipping-categories/render-form', [ShippingCategoriesController::class, 'renderForm']);
     });
 
     Route::middleware('can:commerce-manageTaxes')->group(function () {
@@ -145,6 +149,7 @@
         Route::post('tax-rates/save', [TaxRatesController::class, 'save']);
         Route::post('tax-rates/delete', [TaxRatesController::class, 'delete']);
         Route::post('tax-rates/update-status', [TaxRatesController::class, 'updateStatus']);
+        Route::post('tax-rates/render-form', [TaxRatesController::class, 'renderForm']);
     });
 
     Route::middleware('can:commerce-managePromotions')->group(function () {

routes/cp.php

@@ -3,32 +3,33 @@
 use CraftCms\Cms\Http\Controllers\Elements\EditElementController;
 use CraftCms\Cms\Http\Middleware\RequireAdmin;
 use CraftCms\Commerce\Http\Controllers\DonationsController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingController;
-use CraftCms\Commerce\Http\Controllers\Settings\CatalogPricingRulesController;
-use CraftCms\Commerce\Http\Controllers\Settings\DiscountsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\CatalogPricingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\DiscountsController;
 use CraftCms\Commerce\Http\Controllers\Settings\EmailsController;
 use CraftCms\Commerce\Http\Controllers\Settings\GatewaysController;
 use CraftCms\Commerce\Http\Controllers\InventoryController;
 use CraftCms\Commerce\Http\Controllers\InventoryLocationsController;
 use CraftCms\Commerce\Http\Controllers\OrdersController;
+use CraftCms\Commerce\Http\Controllers\Settings\GeneralSettingsController;
 use CraftCms\Commerce\Http\Controllers\Settings\LineItemStatusesController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderSettingsController;
 use CraftCms\Commerce\Http\Controllers\Settings\OrderStatusesController;
-use CraftCms\Commerce\Http\Controllers\Settings\PaymentCurrenciesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\PaymentCurrenciesController;
 use CraftCms\Commerce\Http\Controllers\Settings\PdfsController;
 use CraftCms\Commerce\Http\Controllers\ProductsController;
 use CraftCms\Commerce\Http\Controllers\Settings\ProductTypesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SalesController;
-use CraftCms\Commerce\Http\Controllers\Settings\SettingsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingMethodsController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingRulesController;
-use CraftCms\Commerce\Http\Controllers\Settings\ShippingZonesController;
-use CraftCms\Commerce\Http\Controllers\Settings\StoreManagementController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\SalesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingMethodsController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingRulesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\ShippingZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\StoreManagementController;
 use CraftCms\Commerce\Http\Controllers\Settings\StoresController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxCategoriesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxRatesController;
-use CraftCms\Commerce\Http\Controllers\Settings\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxCategoriesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxRatesController;
+use CraftCms\Commerce\Http\Controllers\StoreManagement\TaxZonesController;
+use CraftCms\Commerce\Http\Controllers\Settings\TransferSettingsController;
 use CraftCms\Commerce\Http\Controllers\TransfersController;
 use CraftCms\Commerce\Http\Controllers\Users\UsersController;
 use CraftCms\Commerce\Http\Controllers\VariantsController;
@@ -41,11 +42,12 @@
     Route::middleware(RequireAdmin::class)->group(function () {
         Route::get('commerce/settings/gateways', [GatewaysController::class, 'index']);
         Route::get('commerce/settings/gateways/new', [GatewaysController::class, 'edit']);
+        Route::post('commerce/settings/gateways/render-form', [GatewaysController::class, 'renderForm']);
         Route::get('commerce/settings/gateways/{id}', [GatewaysController::class, 'edit'])->whereNumber('id');
 
-        Route::get('commerce/settings/general', [SettingsController::class, 'edit']);
+        Route::get('commerce/settings/general', [GeneralSettingsController::class, 'edit']);
         Route::get('commerce/settings/ordersettings', [OrderSettingsController::class, 'edit']);
-        Route::get('commerce/settings/transfers', [SettingsController::class, 'editTransferSettings']);
+        Route::get('commerce/settings/transfers', [TransferSettingsController::class, 'editTransferSettings']);
 
         Route::get('commerce/settings/stores', [StoresController::class, 'storesIndex']);
         Route::get('commerce/settings/stores/new', [StoresController::class, 'editStore']);
@@ -62,10 +64,12 @@
 
         Route::get('commerce/settings/producttypes', [ProductTypesController::class, 'productTypeIndex']);
         Route::get('commerce/settings/producttypes/new', [ProductTypesController::class, 'editProductType']);
+        Route::post('commerce/settings/producttypes/render-form', [ProductTypesController::class, 'renderForm']);
         Route::get('commerce/settings/producttypes/{productTypeId}', [ProductTypesController::class, 'editProductType'])->whereNumber('productTypeId');
 
         Route::get('commerce/settings/emails', [EmailsController::class, 'index']);
         Route::get('commerce/settings/emails/{storeHandle}/new', [EmailsController::class, 'edit']);
+        Route::post('commerce/settings/emails/render-form', [EmailsController::class, 'renderForm']);
         Route::get('commerce/settings/emails/{storeHandle}/{id}', [EmailsController::class, 'edit'])->whereNumber('id');
 
         Route::get('commerce/settings/pdfs', [PdfsController::class, 'index']);

src/CatalogPricing/CatalogPricing.php

@@ -301,9 +301,16 @@ public function getCatalogPrices(int $storeId, ?CatalogPricingCondition $conditi
 
     public function getCatalogPricesPageInfo(int $storeId, ?CatalogPricingCondition $conditionBuilder = null, bool $includeBasePrices = true, ?string $searchText = null, int $limit = 100, int $offset = 0): array
     {
+        // getCountForPagination() wraps the query as-is and counts a column from its SELECT —
+        // but this query only ever selects price/promotionalPrice/salePrice aggregates, never
+        // purchasableId, so that column was never there to count. select()ing it first (like
+        // the pre-port Yii2 version did) replaces the aggregate select instead of layering atop
+        // it, giving a plain "one row per purchasableId" result to just count.
         $total = $this->buildCatalogPricesQuery($storeId, $conditionBuilder, $includeBasePrices, $searchText)
+            ->select(['purchasableId'])
             ->groupBy('purchasableId')
-            ->getCountForPagination(['purchasableId']);
+            ->get()
+            ->count();
 
         return [
             'first' => $offset + 1,
@@ -486,6 +493,10 @@ private function _normalizeIds(?array $ids): ?array
      */
     public function createCatalogPricesQuery(?int $userId = null, int|string|null $storeId = null, bool $allPrices = false, ?CatalogPricingCondition $condition = null): \Illuminate\Database\Query\Builder
     {
+        // Quoted via the connection's own grammar, not embedded as bare SQL — the column is
+        // camelCase, and an unquoted raw fragment gets folded to lowercase by Postgres.
+        $isPromotionalPrice = DB::connection()->getQueryGrammar()->wrap('isPromotionalPrice');
+
         $query = DB::table(Table::CATALOG_PRICING . ' as cp')
             ->select([
                 DB::raw(Sql::decimalSql('MIN(CASE WHEN isPromotionalPrice = FALSE THEN price END)') . ' AS price'),
@@ -508,10 +519,12 @@ public function createCatalogPricesQuery(?int $userId = null, int|string|null $s
         /** @var CatalogPricingCondition $condition */
         $condition->modifyQuery($query);
 
+        // Plain where()s rather than whereRaw() — the column is camelCase, and an unquoted
+        // raw fragment gets folded to lowercase by Postgres, no longer matching it.
         $query->where(function($q) {
-            $q->whereNull('dateFrom')->orWhereRaw('dateFrom <= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateFrom')->orWhere('dateFrom', '<=', CraftDb::prepareDateForDb(new DateTime()));
         })->where(function($q) {
-            $q->whereNull('dateTo')->orWhereRaw('dateTo >= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateTo')->orWhere('dateTo', '>=', CraftDb::prepareDateForDb(new DateTime()));
         });
 
         if (!$allPrices) {
@@ -549,9 +562,9 @@ public function createCatalogPricingQuery(?int $userId = null, int|string|null $
         $condition->modifyQuery($query);
 
         $query->where(function($q) {
-            $q->whereNull('dateFrom')->orWhereRaw('dateFrom <= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateFrom')->orWhere('dateFrom', '<=', CraftDb::prepareDateForDb(new DateTime()));
         })->where(function($q) {
-            $q->whereNull('dateTo')->orWhereRaw('dateTo >= ?', [CraftDb::prepareDateForDb(new DateTime())]);
+            $q->whereNull('dateTo')->orWhere('dateTo', '>=', CraftDb::prepareDateForDb(new DateTime()));
         })->orderBy('purchasableId')->orderBy('price');
 
         if (!$allPrices) {

src/Customer/Conditions/DiscountGroupConditionRule.php

@@ -6,7 +6,7 @@
 
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
 use CraftCms\Cms\User\Conditions\GroupConditionRule;
-use Illuminate\Contracts\Database\Query\Builder;
+use Illuminate\Database\Query\Builder;
 use Override;
 use RuntimeException;
 

src/Http/Controllers/Concerns/HasStoreManagementScreen.php

@@ -19,7 +19,12 @@
  * (shipping, tax, promotions, payment currencies, etc). Every controller that needs it resolves
  * its own `Store` from a `storeHandle` route segment — there's no framework-level route binding
  * for handle-scoped resources in cms-6 (confirmed: every handle-scoped core controller does the
- * same manual resolve-and-404), so this stays a plain trait rather than a shared base class.
+ * same manual resolve-and-404) — so `resolveStore()` stays a plain method taking `$storeHandle`
+ * as a parameter, not something a shared base class could inject via its constructor.
+ *
+ * This still lives as a trait, mixed into {@see \CraftCms\Commerce\Http\Controllers\StoreManagement\BaseStoreManagementController}
+ * rather than inlined there directly, so the per-call resolution above isn't mistaken for
+ * something the base class's constructor could have done instead.
  */
 trait HasStoreManagementScreen
 {