Merge remote-tracking branch 'upstream/3.0' into feature/3.0-cp-line-…

…item-options-management

* upstream/3.0: (337 commits)
  Fixed delete orders permission
  Fixed edit orders permission
  Update translation method usage
  Remove EVENT_REGISTER_ADDRESS_VALIDATION_RULES event fixes craftcms#1031
  Fixed a js bug with the shipping zone field on shipping rules
  Added line item statuses table constant and updated references
  Added ability to sort by first, last and full name for billing and shipping addresses on the orders index page
  Fixed an error that would select the wrong tax zone when editing a tax rate
  finish 2.2.8
  Update changelog
  Added the COMMERCE_PAYMENT_CURRENCY environment variable
  Update save customer address, don’t force primary address if blank fixes craftcms#1069
  Build commerce UI files
  Update order status message max length craftcms#971
  Fixed order status condition IDs are strings at this point
  Changelog tweak
  Fixed old Customer field migration now that the Customer field has been removed
  Remove customer fieldtype
  Fixed random char in changelog
  Normalise duration settings to use seconds craftcms#1071
  ...

# Conflicts:
#	src/models/Settings.php
#	src/web/assets/commerceui/dist/js/app.js
#	src/web/assets/commerceui/dist/js/app.js.map
#	src/web/assets/commerceui/dist/js/chunk-vendors.js
#	src/web/assets/commerceui/dist/js/chunk-vendors.js.map

CHANGELOG-v3.md

@@ -10,6 +10,11 @@
 - Orders now have recalculation modes to determine what should be recalculated on the order.
 - Added the `origin` order query param.
 - `commerce/payments/pay` JSON responses now include an `orderErrors` array if there were any errors on the order.
+- Added warnings to settings that are being overridden in the config file.
+- Added the ability on promotions to choose the relationship type for related categories.
+- Added the ability to set a plain text template for Commerce emails.
+- Added the `showCustomerInfoTab` setting to allow control over showing the customer info tab on the User Edit page.
+- Added the ability to sort by shipping and billing first, last and full name on the Orders index page.
 - Added `craft\commerce\controllers\LineItemStatuses`.
 - Added `craft\commerce\controllers\OrdersController::actionNewOrder()`.
 - Added `craft\commerce\elements\Order::$origin`.
@@ -28,12 +33,17 @@
 - Controller actions now call `craft\commerce\elements\Order::toArray()` when generating the cart array for JSON responses.
 - `commerce/payments/pay` JSON responses now list payment form errors under `paymentFormErrors` rather than `paymentForm`.
 - Customer records that are anonymous and orphaned are now deleted during garbage collection.
+- Changed the default category relationship type on promotions from `sourceElement` to `element` .
+- `purgeInactiveCartsDuration` default value is number of seconds as an integer and is now being passed through `craft\cms\helpers\ConfigHelper::durationInSeconds()`.
+- `activeCartDuration` default value is number of seconds as an integer and is now being passed through `craft\cms\helpers\ConfigHelper::durationInSeconds()`.
+- `craft\commerce\controllers\CustomerAddressesController::actionSave()` no long forces primary shipping and billing addresses if they do not exist.
 
 ## Deprecated
 - Deprecated `craft\commerce\elements\Order::getShouldRecalculateAdjustments()` and `setShouldRecalculateAdjustments()`. `craft\commerce\elements\Order::$recalculationMode` should be used instead.
 - Deprecated `craft\commerce\services\Orders::cartArray()`. `craft\commerce\elements\Order::toArray()` should be used instead.
 
 ## Removed
+- Removed the Customer Info field type.
 - Removed the `craft.commerce.availableShippingMethods` Twig property.
 - Removed the `craft.commerce.cart` Twig property.
 - Removed the `craft.commerce.countriesList` Twig property.
@@ -58,6 +68,7 @@
 - Removed `craft\commerce\elements\Product::getSnapshot()`.
 - Removed `craft\commerce\elements\Product::getUnlimitedStock()`.
 - Removed `craft\commerce\elements\Variant::getSalesApplied()`.
+- Removed `craft\commerce\models\Address::getFullName()`.
 - Removed `craft\commerce\models\Discount::getFreeShipping()`.
 - Removed `craft\commerce\models\Discount::setFreeShipping()`.
 - Removed `craft\commerce\models\LineItem::fillFromPurchasable()`.
@@ -69,3 +80,4 @@
 - Removed `craft\commerce\services\Countries::getAllCountriesListData()`.
 - Removed `craft\commerce\services\Gateways::getAllFrontEndGateways()`.
 - Removed `craft\commerce\services\ShippingMethods::getOrderedAvailableShippingMethods()`.
+- Removed `craft\commerce\models\Address::EVENT_REGISTER_ADDRESS_VALIDATION_RULES` event use `craft\base\Model::EVENT_DEFINE_RULES` instead.

README.md

@@ -14,7 +14,7 @@ You can learn all about it at [craftcms.com/commerce](https://craftcms.com/comme
 
 ## Requirements
 
-This plugin requires Craft CMS 3.2.0 or later.
+This plugin requires Craft CMS 3.3.0 or later.
 
 ## Installation
 

composer.json

@@ -20,7 +20,7 @@
     "rss": "https://github.com/craftcms/commerce/releases.atom"
   },
   "require": {
-    "craftcms/cms": "^3.2.0",
+    "craftcms/cms": "^3.3.0",
     "dompdf/dompdf": "^0.8.3",
     "moneyphp/money": "^3.2.1",
     "ibericode/vat": "^1.1.2",
@@ -39,7 +39,14 @@
     "documentationUrl": "https://docs.craftcms.com/commerce/v2/"
   },
   "require-dev": {
+    "roave/security-advisories": "dev-master",
     "codeception/codeception": "^3.0",
     "vlucas/phpdotenv": "^3.4"
+  },
+  "scripts": {
+    "test": [
+      "Composer\\Config::disableProcessTimeout",
+      "codecept"
+    ]
   }
 }

docs/.vuepress/config-en.js

@@ -84,6 +84,7 @@ module.exports = {
                     'example-templates',
                     'commonly-used-variables',
                     'adding-to-and-updating-the-cart',
+                    'estimate-cart-addresses',
                     'update-cart-addresses',
                     'update-cart-customer',
                     'coupon-codes',
@@ -99,7 +100,6 @@ module.exports = {
                 collapsable: false,
                 children: [
                     'products-fields',
-                    'customer-info-fields',
                 ]
             },
         ]