Merge branch 'release/4.5.0' into main

Author: brandonkelly

.github/ISSUE_TEMPLATE/config.yml

@@ -1,20 +1,41 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Feature Request
-    url: https://github.com/craftcms/commerce/discussions/new?category=ideas
-    about: Start a new discussion about your idea
   - name: Documentation
-    url: https://craftcms.com/docs/commerce/4.x/
+    url: https://craftcms.com/docs
     about: Read the official documentation
   - name: Knowledge Base
     url: https://craftcms.com/knowledge-base
-    about: Find answers to common problems
+    about: Find official answers to common problems
   - name: Developer Support Services
     url: https://craftcms.com/support-services
     about: Priority developer support from the team that makes Craft
   - name: Craft Discord
     url: https://craftcms.com/discord
     about: Meet the community
-  - name: Stack Exchange
+  - name: Craft Stack Exchange
     url: https://craftcms.stackexchange.com/
     about: Get help and help others
+  - name: 'Feature Request: Craft CMS'
+    url: https://github.com/craftcms/cms/discussions/new?category=ideas
+    about: Make a feature request or enhancement for Craft CMS
+  - name: 'Feature Request: Craft Console / Plugin Store'
+    url: https://github.com/craftcms/console/discussions/new?category=ideas
+    about: Make a feature request or enhancement for Craft Console or the Plugin Store
+  - name: 'Feature Request: Craft Cloud'
+    url: https://github.com/craftcms/cloud/discussions/new?category=ideas
+    about: Make a feature request or enhancement for Craft Cloud
+  - name: 'Feature Request: Craft Commerce'
+    url: https://github.com/craftcms/commerce/discussions/new?category=ideas
+    about: Make a feature request or enhancement for Craft Commerce
+  - name: 'Bug Report: Craft CMS'
+    url: https://github.com/craftcms/cms/issues/new/choose
+    about: Create a bug report for Craft CMS
+  - name: 'Bug Report: Craft Console / Plugin Store'
+    url: https://github.com/craftcms/console/issues/new/choose
+    about: Create a bug report for Craft Console or the Plugin Store
+  - name: 'Bug Report: Craft Cloud'
+    url: https://craftcms.com/contact
+    about: Create a bug report for Craft Cloud
+  - name: 'Bug Report: Craft Commerce'
+    url: https://github.com/craftcms/commerce/issues/new/choose
+    about: Create a bug report for Craft Commerce

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Release Notes for Craft Commerce
 
+## 4.5.0 - 2024-02-26
+
+- Removed the Lite edition.
+- Deprecated `craft\commerce\models\ShippingMethod::isLite`.
+- Deprecated `craft\commerce\models\ShippingRule::isLite`.
+- Deprecated `craft\commerce\models\TaxRate::isLite`.
+- Deprecated `craft\commerce\models\LiteShippingSettings`.
+- Deprecated `craft\commerce\models\LiteTaxSettings`.
+- Deprecated `craft\commerce\controllers\LiteShippingController`.
+- Deprecated `craft\commerce\controllers\LiteTaxController`.
+- Deprecated `craft\commerce\services\ShippingMethods::getLiteShippingMethod()`. `getAllShippingMethods()` should be used instead.
+- Deprecated `craft\commerce\services\ShippingMethods::saveLiteShippingMethod()`. `saveShippingMethod()` should be used instead.
+- Deprecated `craft\commerce\services\ShippingRules::getLiteShippingRule()`. `getAllShippingRules()` should be used instead.
+- Deprecated `craft\commerce\services\ShippingRules::saveLiteShippingRule()`. `saveShippingRule()` should be used instead.
+- Deprecated `craft\commerce\services\TaxRates::getLiteTaxRate()`. `getAllTaxRates()` should be used instead.
+- Deprecated `craft\commerce\services\TaxRates::saveLiteTaxRate()`. `saveTaxRate()` should be used instead.
+- Fixed a SQL error that occurred when running the `commerce/upgrade` command on PostgreSQL. ([#3380](https://github.com/craftcms/commerce/pull/3380))
+
 ## 4.4.1.1 - 2024-01-12
 
 - Fixed a PHP error that occurred when saving a sale. ([#3364](https://github.com/craftcms/commerce/issues/3364))
@@ -25,7 +43,7 @@
 - Improved the performance of variant queries’ `hasProduct` and `hasVariant` params. ([#3325](https://github.com/craftcms/commerce/pull/3325))
 - Order statuses with long names no longer wrap on the Orders index page. ([#3335](https://github.com/craftcms/commerce/issues/3335))
 - Fixed a bug where carts could get duplicate validation errors. ([3334](https://github.com/craftcms/commerce/issues/3334))
-- Fixed a bug where tab selection was inconsistent on Edit Order pages. 
+- Fixed a bug where tab selection was inconsistent on Edit Order pages.
 - Fixed a bug where sales weren’t respecting elements’ site statuses. ([#3328](https://github.com/craftcms/commerce/issues/3328))
 - Fixed a bug where soft-deleted order statuses and line item statuses weren’t getting restored when applying project config changes. ([#3164](https://github.com/craftcms/commerce/issues/3164))
 - Fixed a bug where carts weren’t getting restored after signing in.
@@ -98,7 +116,7 @@
 
 ## 4.2.11 - 2023-06-05
 
-- Fixed a bug where “Send Email” option text wasn’t getting translated. ([#3172](https://github.com/craftcms/commerce/issues/3172)) 
+- Fixed a bug where “Send Email” option text wasn’t getting translated. ([#3172](https://github.com/craftcms/commerce/issues/3172))
 - Fixed a bug where discounts’ user condition values weren’t getting migrated properly when upgrading to Commerce 4. ([#3176](https://github.com/craftcms/commerce/issues/3176))
 
 ## 4.2.10 - 2023-05-31
@@ -156,7 +174,7 @@
 - Fixed a PHP error that occurred if `null` was passed to `craft\commerce\services\Discounts::getDiscountByCode()`. ([#3045](https://github.com/craftcms/commerce/issues/3045))
 - Fixed a bug where a large number of shipping rule category queries could be executed.
 - Fixed a PHP error that occurred if a product was re-saved before it had finished propagating to all sites. ([#1954](https://github.com/craftcms/commerce/issues/1954))
-- Fixed a PHP error that occurred if `craft\commerce\services\ProductTypes::getEditableProductTypes()` was called when no user was logged in. 
+- Fixed a PHP error that occurred if `craft\commerce\services\ProductTypes::getEditableProductTypes()` was called when no user was logged in.
 - Fixed a PHP error that occurred when saving an invalid shipping method.
 - Fixed a bug where gateways’ “Enabled for customers to select during checkout” setting wasn’t properly supporting environment variables. ([#3052](https://github.com/craftcms/commerce/issues/3052))
 - Fixed a PHP error that could occur when entering values on an Edit Discount page. ([#3067](https://github.com/craftcms/commerce/issues/3067))
@@ -294,7 +312,7 @@
 - Fixed a SQL error that occurred when restoring a soft-deleted product. ([#2982](https://github.com/craftcms/commerce/issues/2982))
 - Fixed a bug where the Edit Product page wasn’t handling site selection changes properly. ([#2971](https://github.com/craftcms/commerce/issues/2971))
 - Fixed a bug where it wasn't possible to add variants to a sale from the Edit Product page. ([#2976](https://github.com/craftcms/commerce/issues/2976))
-- Fixed a bug where primary addresses weren’t being automatically set on the Edit Order page. ([#2963](https://github.com/craftcms/commerce/issues/2963)) 
+- Fixed a bug where primary addresses weren’t being automatically set on the Edit Order page. ([#2963](https://github.com/craftcms/commerce/issues/2963))
 - Fixed a bug where it wasn’t possible to change the default order status. ([#2915](https://github.com/craftcms/commerce/issues/2915))
 
 ## 4.1.2 - 2022-09-15
@@ -314,7 +332,7 @@
 - Fixed a bug where Edit Subscription pages were blank. ([#2913](https://github.com/craftcms/commerce/issues/2913))
 - Fixed a bug where `craft\commerce\elements\Order::hasMatchingAddresses()` wasn’t checking the `fullName` property. ([#2917](https://github.com/craftcms/commerce/issues/2917))
 - Fixed a bug where discounts’ Purchase Total values weren’t getting saved.
-- Fixed a bug where discounts’ shipping address conditions were being saved as billing address conditions. ([#2938](https://github.com/craftcms/commerce/issues/2938)) 
+- Fixed a bug where discounts’ shipping address conditions were being saved as billing address conditions. ([#2938](https://github.com/craftcms/commerce/issues/2938))
 - Fixed an error that occurred when exporting orders using the “Expanded” export type. ([#2953](https://github.com/craftcms/commerce/issues/2953))
 - Fixed a bug where it wasn’t possible to clear out variants’ min and max quantities. ([#2954](https://github.com/craftcms/commerce/issues/2954))
 

example-templates/dist/shop/_private/layouts/includes/footer.twig

@@ -4,17 +4,6 @@ Outputs the global site footer.
 
 @var currentUser \craft\elements\User
 #}
-{% if craft.commerce.edition == 'lite' %}
-  <div class="bg-red-800 text-white">
-    <div class="container mx-auto p-6">
-      {{ 'You’re limited to one cart item at a time with Craft Commerce <span class="{classes}"> {edition}</span>. <a href="{url}" class="underline">Learn more</a>.'|t({
-        classes: 'bg-white text-red-700 tracking-wide px-2 py-1 mx-1 rounded',
-        edition: craft.commerce.edition|upper,
-        url: 'https://craftcms.com/docs/commerce/4.x/editions.html',
-      })|raw }}
-    </div>
-  </div>
-{% endif %}
 
 <div class="bg-gray-500 text-white">
   <div class="container mx-auto p-6">

example-templates/src/shop/_private/layouts/includes/footer.twig

@@ -4,17 +4,6 @@ Outputs the global site footer.
 
 @var currentUser \craft\elements\User
 #}
-{% if craft.commerce.edition == 'lite' %}
-  <div class="bg-[[dangerColor]]-800 text-white">
-    <div class="container mx-auto p-6">
-      {{ 'You’re limited to one cart item at a time with Craft Commerce <span class="{classes}"> {edition}</span>. <a href="{url}" class="underline">Learn more</a>.'|t({
-        classes: 'bg-white text-red-700 tracking-wide px-2 py-1 mx-1 rounded',
-        edition: craft.commerce.edition|upper,
-        url: 'https://craftcms.com/docs/commerce/4.x/editions.html',
-      })|raw }}
-    </div>
-  </div>
-{% endif %}
 
 <div class="bg-gray-500 text-white">
   <div class="container mx-auto p-6">

example-templates/src/shop/checkout/options.twig

@@ -33,7 +33,7 @@
       <form action="" method="post">
         {{ csrfInput() }}
         {{ actionInput('commerce/cart/update-cart') }}
-        {{ redirectInput(siteUrl('shop/checkout/payment')) }}
+        {{ redirectInput(siteUrl('[[folderName]]/checkout/payment')) }}
         {{ successMessageInput('Options saved.') }}
 
         {% set user = cart.email ? craft.users.email(cart.email).one() : null %}

src/Plugin.php

@@ -148,7 +148,6 @@
 class Plugin extends BasePlugin
 {
     // Edition constants
-    public const EDITION_LITE = 'lite';
     public const EDITION_PRO = 'pro';
 
     public static function config(): array
@@ -201,15 +200,14 @@ public static function config(): array
     public static function editions(): array
     {
         return [
-            self::EDITION_LITE,
             self::EDITION_PRO,
         ];
     }
 
     /**
      * @inheritDoc
      */
-    public string $schemaVersion = '4.2.8';
+    public string $schemaVersion = '4.5.0';
 
     /**
      * @inheritdoc
@@ -334,22 +332,22 @@ public function getCpNavItem(): ?array
             ];
         }
 
-        if (self::getInstance()->is(self::EDITION_PRO, '>=')) {
-            if (Craft::$app->getUser()->checkPermission('commerce-manageShipping')) {
-                $ret['subnav']['shipping'] = [
-                    'label' => Craft::t('commerce', 'Shipping'),
-                    'url' => 'commerce/shipping',
-                ];
-            }
 
-            if (Craft::$app->getUser()->checkPermission('commerce-manageTaxes')) {
-                $ret['subnav']['tax'] = [
-                    'label' => Craft::t('commerce', 'Tax'),
-                    'url' => 'commerce/tax',
-                ];
-            }
+        if (Craft::$app->getUser()->checkPermission('commerce-manageShipping')) {
+            $ret['subnav']['shipping'] = [
+                'label' => Craft::t('commerce', 'Shipping'),
+                'url' => 'commerce/shipping',
+            ];
         }
 
+        if (Craft::$app->getUser()->checkPermission('commerce-manageTaxes')) {
+            $ret['subnav']['tax'] = [
+                'label' => Craft::t('commerce', 'Tax'),
+                'url' => 'commerce/tax',
+            ];
+        }
+
+
         if (Craft::$app->getUser()->checkPermission('commerce-manageStoreSettings')) {
             $ret['subnav']['store-settings'] = [
                 'label' => Craft::t('commerce', 'Store Settings'),

src/base/ShippingMethod.php

@@ -7,10 +7,12 @@
 
 namespace craft\commerce\base;
 
+use Craft;
 use craft\commerce\base\Model as BaseModel;
 use craft\commerce\elements\Order;
 use craft\commerce\errors\NotImplementedException;
 use craft\commerce\Plugin;
+use craft\errors\DeprecationException;
 use DateTime;
 
 /**
@@ -23,6 +25,7 @@
  * @property-read array $shippingRules
  * @property-read bool $isEnabled
  * @property-read string $type
+ * @property bool $isLite
  */
 abstract class ShippingMethod extends BaseModel implements ShippingMethodInterface
 {
@@ -59,10 +62,28 @@ abstract class ShippingMethod extends BaseModel implements ShippingMethodInterfa
     public ?DateTime $dateUpdated = null;
 
     /**
-     * @var bool Is this the shipping method for the lite edition.
+     * @return bool
+     * @throws DeprecationException
+     * @since 4.5.0
+     * @deprecated in 4.5.0.
      */
-    public bool $isLite = false;
+    public function getIsLite(): bool
+    {
+        Craft::$app->getDeprecator()->log(__METHOD__, 'ShippingMethod::getIsLite() is deprecated.');
+        return false;
+    }
 
+    /**
+     * @param bool $isLite
+     * @return void
+     * @throws DeprecationException
+     * @since 4.5.0
+     * @deprecated in 4.5.0.
+     */
+    public function setIsLite(bool $isLite): void
+    {
+        Craft::$app->getDeprecator()->log(__METHOD__, 'ShippingMethod::setIsLite() is deprecated.');
+    }
 
     /**
      * @inheritdoc

src/console/controllers/UpgradeController.php

@@ -888,32 +888,32 @@ private function _migrateAddresses()
 WHERE NOT EXISTS (
   SELECT 1
   FROM $ordersTable AS o1
-  WHERE o1.v3billingAddressId = a.id
+  WHERE o1."v3billingAddressId" = a.id
 )
 AND NOT EXISTS (
   SELECT 1
   FROM $ordersTable AS o2
-  WHERE o2.v3shippingAddressId = a.id
+  WHERE o2."v3shippingAddressId" = a.id
 )
 AND NOT EXISTS (
   SELECT 1
   FROM $ordersTable AS o2
-  WHERE o2.v3estimatedBillingAddressId = a.id
+  WHERE o2."v3estimatedBillingAddressId" = a.id
 )
 AND NOT EXISTS (
   SELECT 1
   FROM $ordersTable AS o2
-  WHERE o2.v3shippingAddressId = a.id
+  WHERE o2."v3shippingAddressId" = a.id
 )
 AND NOT EXISTS (
   SELECT 1
   FROM $ordersTable AS o2
-  WHERE o2.v3estimatedShippingAddressId = a.id
+  WHERE o2."v3estimatedShippingAddressId" = a.id
 )
 AND NOT EXISTS (
   SELECT 1
   FROM $customersAddressesTable AS ca
-  WHERE ca.addressId = a.id
+  WHERE ca."addressId" = a.id
 );
 SQL;
 
@@ -1194,10 +1194,10 @@ public function _migrateCustomers(): void
         $this->stdout('  Updating all orders with the email of its real user.');
         if ($isPsql) {
             $sql = <<<SQL
-    update $ordersTable [[o]]
-    set [[o.email]] = [[u.email]]
-    from $customersTable [[cu]], $usersTable [[u]], $ordersTable [[o]]
-    where [[o.v3customerId]] = [[cu.id]]
+    update $ordersTable [[o1]]
+    set [[email]] = [[u.email]]
+    from $customersTable [[cu]], $usersTable [[u]], $ordersTable [[o2]]
+    where [[o2.v3customerId]] = [[cu.id]]
     and [[cu.v3userId]] = [[u.id]]
 SQL;
         } else {
@@ -1251,7 +1251,7 @@ public function _migrateCustomers(): void
         if ($isPsql) {
             $sql = <<<SQL
     update $customersTable [[cu]]
-    set [[cu.customerId]] = [[cu.v3userId]]
+    set [[customerId]] = [[cu.v3userId]]
     where [[cu.v3userId]] is not null
 SQL;
         } else {
@@ -1267,10 +1267,10 @@ public function _migrateCustomers(): void
         $this->stdout('  Updating all orders with their correct user ID.');
         if ($isPsql) {
             $sql = <<<SQL
-    update $ordersTable [[o]]
-    set [[o.customerId]] = [[u.userId]]
-    from $usersTable [[u]], $ordersTable [[o]]
-    where [[o.email]] = [[u.email]]
+    update $ordersTable [[o1]]
+    set [[customerId]] = [[u.id]]
+    from $usersTable [[u]], $ordersTable [[o2]]
+    where [[o2.email]] = [[u.email]]
 SQL;
         } else {
             $sql = <<<SQL
@@ -1371,12 +1371,12 @@ public function stdoutlast($string)
      */
     private function _getBatchUpdateQueryWithParams($tableName, $byField, $fieldValues, $params)
     {
-        $str = 'UPDATE `' . $this->db->getSchema()->getRawTableName($tableName) . '` SET ';
+        $str = 'UPDATE ' . $this->db->quoteTableName($this->db->getSchema()->getRawTableName($tableName)) . ' SET ';
         $row = [];
         $bind = [];
 
         foreach (array_keys($params) as $param) {
-            $rowStr = '`' . $param . '` = (CASE `' . $byField . '` ';
+            $rowStr = $this->db->quoteColumnName($param) . ' = (CASE ' . $this->db->quoteColumnName($byField) . ' ';
             $cel = [];
             foreach ($fieldValues as $fieldValue) {
                 if (array_key_exists($fieldValue, $params[$param])) {

src/controllers/DiscountsController.php

@@ -59,10 +59,6 @@ public function init(): void
     {
         parent::init();
 
-        if (Plugin::getInstance()->is(Plugin::EDITION_PRO, '<')) {
-            throw new ForbiddenHttpException('Managing discounts is not permitted on the Lite edition.');
-        }
-
         $this->requirePermission('commerce-managePromotions');
     }