Merge branch 'task/MAR10001-0-qol-fixes-orocommerce-bridge' into main…

…tenance/3.0

src/Marello/Bundle/AddressBundle/Resources/config/validation.yml

@@ -0,0 +1,13 @@
+Marello\Bundle\AddressBundle\Entity\MarelloAddress:
+    properties:
+        street:
+            - NotBlank: ~
+        city:
+            - NotBlank: ~
+        postalCode:
+            - NotBlank: ~
+        country:
+            - NotBlank: ~
+        phone:
+            - Length:
+                max: 255

src/Marello/Bundle/CustomerBundle/Form/Type/CompanyType.php

@@ -73,9 +73,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'mapped'   => false,
                     'multiple' => true,
                 ]
-            )
-            ->addEventListener(FormEvents::PRE_SUBMIT, [$this, 'preSubmit'])
-            ->addEventListener(FormEvents::POST_SUBMIT, [$this, 'postSubmit']);
+            );
 
         if ($this->authorizationChecker->isGranted('marello_customer_company_address_update')) {
             $options = [
@@ -105,20 +103,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         }
     }
 
-    /**
-     * @param FormEvent $event
-     */
-    public function preSubmit(FormEvent $event)
-    {
-    }
-
-    /**
-     * @param FormEvent $event
-     */
-    public function postSubmit(FormEvent $event)
-    {
-    }
-
     /**
      * {@inheritdoc}
      */

src/Marello/Bundle/CustomerBundle/Form/Type/CustomerType.php

@@ -28,25 +28,19 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
             ])
             ->add('firstName', TextType::class, [
-                'required'    => true,
-                'constraints' => new NotNull,
+                'required'    => true
             ])
             ->add('middleName', TextType::class, [
                 'required' => false,
             ])
             ->add('lastName', TextType::class, [
-                'required'    => true,
-                'constraints' => new NotNull,
+                'required'    => true
             ])
             ->add('nameSuffix', TextType::class, [
                 'required' => false,
             ])
             ->add('email', EmailType::class, [
-                'required'    => true,
-                'constraints' => [
-                    new NotNull,
-                    new Email,
-                ],
+                'required'    => true
             ])
             ->add('taxIdentificationNumber', TextType::class, [
                 'required' => false,

src/Marello/Bundle/CustomerBundle/Resources/config/validation.yml

@@ -0,0 +1,14 @@
+Marello\Bundle\CustomerBundle\Entity\Customer:
+    properties:
+        firstName:
+            - NotBlank: ~
+        lastName:
+            - NotBlank: ~
+        email:
+            - NotBlank: ~
+            - Email: ~
+
+Marello\Bundle\CustomerBundle\Entity\Company:
+    properties:
+        name:
+            - NotBlank: ~

src/Marello/Bundle/OrderBundle/Resources/config/validation.yml

@@ -1,17 +1,3 @@
-Marello\Bundle\AddressBundle\Entity\MarelloAddress:
-    properties:
-        street:
-            - NotBlank: ~
-        city:
-            - NotBlank: ~
-        postalCode:
-            - NotBlank: ~
-        country:
-            - NotBlank: ~
-        phone:
-            - Length:
-                max: 255
-
 Marello\Bundle\OrderBundle\Entity\OrderItem:
     properties:
         product:

src/Marello/Bundle/ShippingBundle/Resources/translations/validators.en.yml

@@ -0,0 +1,6 @@
+marello:
+    shipping:
+        shippingrule:
+            enabled.message: 'Shipping method can not be enabled'
+            type.config.count.message: 'At least one shipping method needs to be enabled in this group'
+            method.config.count.message: 'At least one shipping method needs to be configured for this rule.'