MAGETWO-91678: Minimum Order amount required in Admin orders

fascinosum · fascinosum · commit 965689dcdfda · 2018-08-17T11:50:36.000-05:00
diff --git a/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/AllowedCountryValidationRule.php
@@ -11,6 +11,9 @@
 use Magento\Framework\Validation\ValidationResultFactory;
 use Magento\Quote\Model\Quote;
 
+/**
+ * @inheritdoc
+ */
 class AllowedCountryValidationRule implements QuoteValidationRuleInterface
 {
     /**
@@ -57,7 +60,7 @@ public function validate(Quote $quote): array
                     $this->allowedCountryReader->getAllowedCountries()
                 );
             if (!$validationResult) {
-                $validationErrors = [$this->generalMessage];
+                $validationErrors = [__($this->generalMessage)];
             }
         }
 
diff --git a/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/BillingAddressValidationRule.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Validation\ValidationResultFactory;
 use Magento\Quote\Model\Quote;
 
+/**
+ * @inheritdoc
+ */
 class BillingAddressValidationRule implements QuoteValidationRuleInterface
 {
     /**
@@ -42,7 +45,7 @@ public function validate(Quote $quote): array
         $validationErrors = [];
         $validationResult = $quote->getBillingAddress()->validate();
         if ($validationResult !== true) {
-            $validationErrors = [$this->generalMessage];
+            $validationErrors = [__($this->generalMessage)];
         }
         if (is_array($validationResult)) {
             $validationErrors = array_merge($validationErrors, $validationResult);
diff --git a/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/MinimumAmountValidationRule.php
@@ -11,6 +11,9 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage;
 
+/**
+ * @inheritdoc
+ */
 class MinimumAmountValidationRule implements QuoteValidationRuleInterface
 {
     /**
@@ -55,7 +58,7 @@ public function validate(Quote $quote): array
             if (!$this->generalMessage) {
                 $this->generalMessage = $this->amountValidationMessage->getMessage();
             }
-            $validationErrors = [$this->generalMessage];
+            $validationErrors = [__($this->generalMessage)];
         }
 
         return [$this->validationResultFactory->create(['errors' => $validationErrors])];
diff --git a/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/PaymentMethodValidationRule.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Validation\ValidationResultFactory;
 use Magento\Quote\Model\Quote;
 
+/**
+ * @inheritdoc
+ */
 class PaymentMethodValidationRule implements QuoteValidationRuleInterface
 {
     /**
@@ -42,7 +45,7 @@ public function validate(Quote $quote): array
         $validationErrors = [];
         $validationResult = $quote->getPayment()->getMethod();
         if (!$validationResult) {
-            $validationErrors = [$this->generalMessage];
+            $validationErrors = [__($this->generalMessage)];
         }
 
         return [$this->validationResultFactory->create(['errors' => $validationErrors])];
diff --git a/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationComposite.php
@@ -9,6 +9,9 @@
 
 use Magento\Quote\Model\Quote;
 
+/**
+ * @inheritdoc
+ */
 class QuoteValidationComposite implements QuoteValidationRuleInterface
 {
     /**
diff --git a/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php b/app/code/Magento/Quote/Model/ValidationRules/QuoteValidationRuleInterface.php
@@ -9,10 +9,13 @@
 use Magento\Framework\Validation\ValidationResult;
 use Magento\Quote\Model\Quote;
 
+/**
+ * Provides validation of Quote model.
+ */
 interface QuoteValidationRuleInterface
 {
     /**
-     * Validate quote model.
+     * Validate Quote model.
      *
      * @param Quote $quote
      * @return ValidationResult[]
diff --git a/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/ShippingAddressValidationRule.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Validation\ValidationResultFactory;
 use Magento\Quote\Model\Quote;
 
+/**
+ * @inheritdoc
+ */
 class ShippingAddressValidationRule implements QuoteValidationRuleInterface
 {
     /**
@@ -45,7 +48,7 @@ public function validate(Quote $quote): array
         if (!$quote->isVirtual()) {
             $validationResult = $quote->getShippingAddress()->validate();
             if ($validationResult !== true) {
-                $validationErrors = [$this->generalMessage];
+                $validationErrors = [__($this->generalMessage)];
             }
             if (is_array($validationResult)) {
                 $validationErrors = array_merge($validationErrors, $validationResult);
diff --git a/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php b/app/code/Magento/Quote/Model/ValidationRules/ShippingMethodValidationRule.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Validation\ValidationResultFactory;
 use Magento\Quote\Model\Quote;
 
+/**
+ * @inheritdoc
+ */
 class ShippingMethodValidationRule implements QuoteValidationRuleInterface
 {
     /**
@@ -46,7 +49,7 @@ public function validate(Quote $quote): array
             $shippingRate = $quote->getShippingAddress()->getShippingRateByCode($shippingMethod);
             $validationResult = $shippingMethod && $shippingRate;
             if (!$validationResult) {
-                $validationErrors = [$this->generalMessage];
+                $validationErrors = [__($this->generalMessage)];
             }
         }
 
diff --git a/app/code/Magento/Quote/etc/di.xml b/app/code/Magento/Quote/etc/di.xml
@@ -41,7 +41,7 @@
     <preference for="Magento\Quote\Api\GuestCartTotalManagementInterface" type="Magento\Quote\Model\GuestCart\GuestCartTotalManagement" />
     <preference for="Magento\Quote\Api\Data\EstimateAddressInterface" type="Magento\Quote\Model\EstimateAddress" />
     <preference for="Magento\Quote\Api\Data\ProductOptionInterface" type="Magento\Quote\Model\Quote\ProductOption" />
-    <preference for="Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface" type="Magento\Quote\Model\ValidationRules\QuoteValidationComposite"/>
+    <preference for="Magento\Quote\Model\ValidationRules\QuoteValidationRuleInterface" type="Magento\Quote\Model\ValidationRules\QuoteValidationComposite\Proxy"/>
     <type name="Magento\Webapi\Controller\Rest\ParamsOverrider">
         <arguments>
             <argument name="paramOverriders" xsi:type="array">
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml b/app/code/Magento/Sales/Test/Mftf/Data/SalesConfigData.xml
@@ -7,14 +7,14 @@
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="EnabledMinimumOrderAmount" type="sales_minimum_order">
+    <entity name="EnabledMinimumOrderAmount500" type="sales_minimum_order">
         <requiredEntity type="active">EnableMinimumOrderCheck</requiredEntity>
-        <requiredEntity type="amount">MinimumOrderAmount</requiredEntity>
+        <requiredEntity type="amount">MinimumOrderAmount500</requiredEntity>
     </entity>
     <entity name="EnableMinimumOrderCheck" type="active">
         <data key="value">1</data>
     </entity>
-    <entity name="MinimumOrderAmount" type="amount">
+    <entity name="MinimumOrderAmount500" type="amount">
         <data key="value">500</data>
     </entity>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
@@ -18,7 +18,7 @@
             <group value="sales"/>
         </annotations>
         <before>
-            <createData entity="EnabledMinimumOrderAmount" stepKey="enableMinimumOrderAmount"/>
+            <createData entity="EnabledMinimumOrderAmount500" stepKey="enableMinimumOrderAmount"/>
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteValidatorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Quote\Model;
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`	`use Magento\Framework\Validation\ValidationResultFactory;`
`12`	`12`	`use Magento\Quote\Model\Quote;`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * @inheritdoc`
	`16`	`+ */`
`14`	`17`	`class AllowedCountryValidationRule implements QuoteValidationRuleInterface`
`15`	`18`	`{`
`16`	`19`	`/**`
`@@ -57,7 +60,7 @@ public function validate(Quote $quote): array`
`57`	`60`	`$this->allowedCountryReader->getAllowedCountries()`
`58`	`61`	`);`
`59`	`62`	`if (!$validationResult) {`
`60`		`- $validationErrors = [$this->generalMessage];`
	`63`	`+ $validationErrors = [__($this->generalMessage)];`
`61`	`64`	`}`
`62`	`65`	`}`
`63`	`66`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@`
`9`	`9`
`10`	`10`	`use Magento\Quote\Model\Quote;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * @inheritdoc`
	`14`	`+ */`
`12`	`15`	`class QuoteValidationComposite implements QuoteValidationRuleInterface`
`13`	`16`	`{`
`14`	`17`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,13 @@`
`9`	`9`	`use Magento\Framework\Validation\ValidationResult;`
`10`	`10`	`use Magento\Quote\Model\Quote;`
`11`	`11`
	`12`	`+/**`
	`13`	`+ * Provides validation of Quote model.`
	`14`	`+ */`
`12`	`15`	`interface QuoteValidationRuleInterface`
`13`	`16`	`{`
`14`	`17`	`/**`
`15`		`- * Validate quote model.`
	`18`	`+ * Validate Quote model.`
`16`	`19`	`*`
`17`	`20`	`* @param Quote $quote`
`18`	`21`	`* @return ValidationResult[]`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,9 @@`
`10`	`10`	`use Magento\Framework\Validation\ValidationResultFactory;`
`11`	`11`	`use Magento\Quote\Model\Quote;`
`12`	`12`
	`13`	`+/**`
	`14`	`+ * @inheritdoc`
	`15`	`+ */`
`13`	`16`	`class ShippingMethodValidationRule implements QuoteValidationRuleInterface`
`14`	`17`	`{`
`15`	`18`	`/**`
`@@ -46,7 +49,7 @@ public function validate(Quote $quote): array`
`46`	`49`	`$shippingRate = $quote->getShippingAddress()->getShippingRateByCode($shippingMethod);`
`47`	`50`	`$validationResult = $shippingMethod && $shippingRate;`
`48`	`51`	`if (!$validationResult) {`
`49`		`- $validationErrors = [$this->generalMessage];`
	`52`	`+ $validationErrors = [__($this->generalMessage)];`
`50`	`53`	`}`
`51`	`54`	`}`
`52`	`55`