Merge pull request #1 from winzou/company

Add company form field
Sylius · May 23, 2013 · 184a6b6 · 184a6b6
2 parents 3ccde3a + cdc8321
commit 184a6b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Form/Type/AddressType.php b/Form/Type/AddressType.php
@@ -55,6 +55,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('lastName', 'text', array(
                 'label' => 'sylius.form.address.last_name'
             ))
+            ->add('company', 'text', array(
+                'required' => false,
+                'label'    => 'sylius.form.address.company'
+            ))
             ->add('country', 'sylius_country_choice', array(
                 'label' => 'sylius.form.address.country',
                 'empty_value' => 'sylius.form.country.select'

diff --git a/Resources/config/doctrine/Address.orm.xml b/Resources/config/doctrine/Address.orm.xml
@@ -24,7 +24,7 @@
             <join-column name="province_id" referenced-column-name="id" />
         </many-to-one>
         <field name="street" column="street" type="string" />
-        <field name="company" column="company" type="string" />
+        <field name="company" column="company" type="string" nullable="true" />
         <field name="city" column="city" type="string" />
         <field name="postcode" column="postcode" type="string" />
         <field name="createdAt" column="created_at" type="datetime">