makes address fields consistent. #406

cross-solution · Sep 29, 2017 · f5bc459 · f5bc459
1 parent fd95f70
commit f5bc459
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 9 deletions.
diff --git a/module/Auth/src/Auth/Entity/Info.php b/module/Auth/src/Auth/Entity/Info.php
@@ -123,7 +123,14 @@ class Info extends AbstractEntity implements InfoInterface
      * @var string
      * @ODM\Field(type="string") */
     protected $street;
-
+
+    /**
+     * country of the users address
+     *
+     * @var string
+     * @ODM\Field(type="string") */
+    protected $country;
+
     /**
      * {@inheritdoc}
      *
@@ -432,4 +439,25 @@ public function getStreet()
     {
         return $this->street;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return $this
+     */
+    public function setCountry($country)
+    {
+        $this->country=$country;
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return string
+     */
+    public function getCountry()
+    {
+        return $this->country;
+    }
 }
diff --git a/module/Auth/src/Auth/Entity/InfoInterface.php b/module/Auth/src/Auth/Entity/InfoInterface.php
@@ -228,4 +228,20 @@ public function setCity($city);
      * @return string
      */
     public function getCity();
+
+    /**
+     * Sets the users country
+     *
+     * @param string $country
+     * @since 0.30
+     */
+    public function setCountry($country);
+
+    /**
+     * Gets the users country
+     *
+     * @since 0.30
+     * @return string
+     */
+    public function getCountry();
 }
diff --git a/module/Auth/src/Auth/Form/UserInfoFieldset.php b/module/Auth/src/Auth/Form/UserInfoFieldset.php
@@ -189,6 +189,15 @@ public function init()
                 ]
             ]
         );
+
+        $this->add(
+            [
+                'name'    => 'country',
+                'options' => [
+                    'label' => /*@translate*/ 'country'
+                ]
+            ]
+        );
     }
 
     /**

diff --git a/module/Auth/test/AuthTest/Entity/InfoTest.php b/module/Auth/test/AuthTest/Entity/InfoTest.php
@@ -213,6 +213,19 @@ public function testSetGetHouseNumber()
         $this->assertEquals($output, $this->target->getHouseNumber());
     }
 
+    /**
+     * @testdox Allows setting the users country
+     * @covers Auth\Entity\Info::getCountry
+     * @covers Auth\Entity\Info::setCountry
+     */
+    public function testSetGetCountry()
+    {
+        $input = 'Deutschland';
+        $output = 'Deutschland';
+        $this->target->setCountry($input);
+        $this->assertEquals($output, $this->target->getCountry());
+    }
+
     /**
      * @testdox Allows setting the users city
      * @covers Auth\Entity\Info::getLastName

diff --git a/module/Auth/view/form/contact.form.phtml b/module/Auth/view/form/contact.form.phtml
@@ -26,6 +26,7 @@
                 <?php echo $this->formRowCombined(
                     array(2 => $element->get('postalCode'), 7 => $element->get('city')), null, null, $layout
                 );?>
+                <?php echo $this->formRow($element->get('country'), null, null, $layout); ?>
                 <?php echo $this->formRow($element->get('phone'), null, null, $layout);
                       echo $this->formRow($element->get('email'), null, null, $layout);?>
 

diff --git a/module/Auth/view/form/contact.view.phtml b/module/Auth/view/form/contact.view.phtml
@@ -18,7 +18,8 @@
             <strong><?php echo $info->getDisplayName()?></strong><br><br>
             <adress>
                 <?php echo $info->getStreet()?> <?php echo $info->getHouseNumber()?><br>
-                <?php echo $info->getPostalCode()?> <?php echo $info->getCity()?>
+                <?php echo $info->getPostalCode()?> <?php echo $info->getCity()?><br>
+                <?php echo $info->getCountry()?>
             </adress>
         </div>
         <div class="col-md-6">

diff --git a/module/Orders b/module/Orders
diff --git a/module/Organizations/src/Organizations/Entity/OrganizationContact.php b/module/Organizations/src/Organizations/Entity/OrganizationContact.php
@@ -56,6 +56,13 @@ class OrganizationContact extends AbstractIdentifiableHydratorAwareEntity implem
      * @ODM\Field(type="string") */
     protected $phone;
 
+    /**
+     * country of an organization address
+     *
+     * @var string
+     * @ODM\Field(type="string") */
+    protected $country;
+
     /**
      * Fax number of an organization address
      *
@@ -159,6 +166,30 @@ public function getStreet()
         return $this->street;
     }
 
+    /**
+     * Sets teh country of an organization address
+     *
+     * @param string $country
+     * @return OrganizationContact
+     */
+    public function setCountry($country = "")
+    {
+        $this->country=$country;
+        return $this;
+    }
+
+    /**
+     * Gets the country of an organization address
+     *
+     * @return string
+     */
+    public function getCountry()
+    {
+        return $this->country;
+    }
+
+
+
     /**
      * Sets a phone number of an organization address
      *

diff --git a/module/Organizations/src/Organizations/Entity/OrganizationContactInterface.php b/module/Organizations/src/Organizations/Entity/OrganizationContactInterface.php
@@ -78,6 +78,21 @@ public function setStreet($street = "");
      */
     public function getStreet();
 
+    /**
+     * Sets the country of an organization address
+     *
+     * @param string $country
+     * @return OrganizationContact
+     */
+    public function setCountry($country = "");
+
+    /**
+     * Gets the country of an organization address
+     *
+     * @return string
+     */
+    public function getCountry();
+
     /**
      * Sets a phone number of an organization address
      *

diff --git a/module/Organizations/src/Organizations/Form/OrganizationsContactFieldset.php b/module/Organizations/src/Organizations/Form/OrganizationsContactFieldset.php
@@ -78,6 +78,14 @@ public function init()
                 )
             )
         );
+        $this->add(
+            [
+                'name' => 'country',
+                'options' => [
+                    'label' => /* @translate */ 'Country'
+                ]
+            ]
+        );
         $this->add(
             array(
                 'name' => 'phone',

diff --git a/module/Organizations/test/OrganizationsTest/Entity/OrganizationContactTest.php b/module/Organizations/test/OrganizationsTest/Entity/OrganizationContactTest.php
@@ -81,12 +81,14 @@ public function testSettingValuesViaSetterMethods($setter, $getter, $value)
     public function provideSetterTestValues()
     {
         return array(
-            array('setFax', 'getFax', 'test1'),
-            array('setPhone', 'getPhone', 'test2'),
-            array('setHouseNumber', 'getHouseNumber', 'test2'),
-            array('setStreet', 'getStreet', 'test2'),
-            array('setPostalcode', 'getPostalcode', 'test2'),
-            array('setCity', 'getCity', 'test2'),
+            ['setFax', 'getFax', 'test1'],
+            ['setPhone', 'getPhone', 'test2'],
+            ['setHouseNumber', 'getHouseNumber', 'test2'],
+            ['setStreet', 'getStreet', 'test2'],
+            ['setPostalcode', 'getPostalcode', 'test2'],
+            ['setCity', 'getCity', 'test2'],
+            ['setCountry', 'getCountry', 'Deutschland'],
+            ['setWebsite', 'getWebsite', '0815.4711'],
         );
     }
 }
+21 −2		src/Entity/InvoiceAddress.php
+19 −1		src/Entity/InvoiceAddressInterface.php
+9 −1		src/Entity/InvoiceAddressSettings.php
+9 −0		src/Form/InvoiceAddressFieldset.php
+1 −0		test/OrdersTest/Entity/InvoiceAddressTest.php