Merge pull request #2624 from dpfaffenbauer/issue/2623

[OrderBundle] fix range condition with notInRangeMessage
coreshop · May 2, 2024 · 3f97e8b · 3f97e8b
2 parents 0333b34 + 9311bc0
commit 3f97e8b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -86,7 +86,7 @@
   "require": {
     "php": "^8.0",
     "ext-json": "*",
-    "dachcom-digital/emailizr": "^2.0 || ^3.0",
+    "dachcom-digital/emailizr": "^3.0",
     "doctrine/data-fixtures": "^1.5",
     "doctrine/doctrine-bundle": "^2.4",
     "doctrine/doctrine-fixtures-bundle": "^3.4",

diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/translations/messages.de.yaml b/src/CoreShop/Bundle/FrontendBundle/Resources/translations/messages.de.yaml
@@ -227,7 +227,6 @@ coreshop.checkout.address.invoice_as_shipping_invalid: 'Die Verwendung der Rechn
 coreshop.cart_price_rule_voucher_generator.amount.not_blank: 'Die Anzahl der zu erstellenden Gutscheincodes muss mindestens {{ limit }} sein.'
 coreshop.cart_price_rule_voucher_generator.amount.min: 'Bitte geben Sie die Anzahl der zu generierenden Gutscheincodes ein.'
 coreshop.cart_price_rule_voucher_generator.length.not_blank: 'Bitte geben Sie eine Gutscheincodelänge ein.'
-coreshop.cart_price_rule_voucher_generator.length.min: 'Der Gutscheincode muss mindestens {{ limit }} Zeichen lang sein.'
-coreshop.cart_price_rule_voucher_generator.length.max: 'Der Gutscheincode darf nicht länger als {{ limit }} Zeichen lang sein.'
+coreshop.cart_price_rule_voucher_generator.length.range: 'Der Gutscheincode muss mindestens {{ min }} und maximal {{ max }} Zeichen lang sein.'
 coreshop.cart_price_rule_voucher_generator.possible_generation_amount: 'Ungültige Gutscheincodelänge oder ungültiger Gutscheinbetrag. Es ist nicht möglich %expectedAmount% einzigartige Gutscheincodes mit einer Länge von %codeLength% Zeichen zu generieren. Es können maximal %possibleAmount% Gutscheincodes generiert werden.'
 coreshop.cart_item.quantity.min: 'Die Menge eines Produktes im Warenkorb kann nicht kleiner als 1 sein.'
diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/translations/messages.en.yaml b/src/CoreShop/Bundle/FrontendBundle/Resources/translations/messages.en.yaml
@@ -227,7 +227,6 @@ coreshop.checkout.address.invoice_as_shipping_invalid: 'Using the invoice addres
 coreshop.cart_price_rule_voucher_generator.amount.not_blank: 'Amount of coupons to generate must be at least {{ limit }}.'
 coreshop.cart_price_rule_voucher_generator.amount.min: 'Please enter amount of coupons to generate.'
 coreshop.cart_price_rule_voucher_generator.length.not_blank: 'Please enter coupon code length.'
-coreshop.cart_price_rule_voucher_generator.length.min: 'Coupon code must be at least {{ limit }} characters long.'
-coreshop.cart_price_rule_voucher_generator.length.max: 'Coupon code must not be longer than {{ limit }} characters.'
+coreshop.cart_price_rule_voucher_generator.length.range: 'Coupon must be at least {{ min }} and at most {{ max }} characters long.'
 coreshop.cart_price_rule_voucher_generator.possible_generation_amount: 'Invalid coupons code length or coupons amount. It is not possible to generate %expectedAmount% unique coupons with code length %codeLength%. The possible amount to generate is %possibleAmount%.'
 coreshop.cart_item.quantity.min: 'Quantity of an order item cannot be lower than 1.'
diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json
@@ -25,7 +25,7 @@
   ],
   "require": {
     "coreshop/core-bundle": "^4.0",
-    "dachcom-digital/emailizr": "^2.0.0",
+    "dachcom-digital/emailizr": "^3.0.0",
     "pimcore/pimcore": "^11.0"
   },
   "require-dev": {

diff --git a/...CoreShop/Bundle/OrderBundle/Resources/config/validation/CartPriceRuleVoucherGenerator.yml b/...CoreShop/Bundle/OrderBundle/Resources/config/validation/CartPriceRuleVoucherGenerator.yml
@@ -8,4 +8,4 @@ CoreShop\Component\Order\Model\CartPriceRuleVoucherGenerator:
             - Range: { min: 1,  minMessage: coreshop.cart_price_rule_voucher_generator.amount.min, groups: coreshop }
         length:
             - NotBlank: { message: coreshop.cart_price_rule_voucher_generator.length.not_blank, groups: coreshop }
-            - Range: { min: 1, minMessage: coreshop.cart_price_rule_voucher_generator.length.min, max: 40, maxMessage: coreshop.cart_price_rule_voucher_generator.length.max, groups: coreshop }
+            - Range: { min: 1, max: 40, notInRangeMessage: coreshop.cart_price_rule_voucher_generator.length.range, groups: coreshop }