#1 Editform extended

DMKEBUSINESSGMBH · Oct 8, 2015 · 887bc8f · 887bc8f
1 parent 7b51d68
commit 887bc8f
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 15 deletions.
diff --git a/src/DMKClub/Bundle/MemberBundle/Entity/Member.php b/src/DMKClub/Bundle/MemberBundle/Entity/Member.php
@@ -140,7 +140,7 @@ class Member extends ExtendMember implements Taggable, ChannelAwareInterface, Cu
     /**
      * @var string
      *
-     * @ORM\Column(name="name", type="string", length=255)
+     * @ORM\Column(name="name", type="string", length=255, nullable=true)
      * @Soap\ComplexType("string")
      * @Oro\Versioned
      * @ConfigField(

diff --git a/src/DMKClub/Bundle/MemberBundle/Form/Handler/MemberHandler.php b/src/DMKClub/Bundle/MemberBundle/Form/Handler/MemberHandler.php
@@ -9,6 +9,7 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use DMKClub\Bundle\MemberBundle\Entity\Member;
+use Oro\Bundle\TagBundle\Entity\TagManager;
 
 class MemberHandler
 {
@@ -62,14 +63,22 @@ public function process(Member $entity)
         return false;
     }
 
-    /**
-     * "Success" form handler
-     *
-     * @param Lead $entity
-     */
-    protected function onSuccess(Member $entity)
-    {
-        $this->manager->persist($entity);
-        $this->manager->flush();
-    }
+	/**
+	 * "Success" form handler
+	 *
+	 * @param Member $entity
+	 */
+	protected function onSuccess(Member $entity) {
+		$this->manager->persist($entity);
+		$this->manager->flush();
+		$this->tagManager->saveTagging($entity);
+	}
+	/**
+	 * Setter for tag manager
+	 *
+	 * @param TagManager $tagManager
+	 */
+	public function setTagManager(TagManager $tagManager) {
+		$this->tagManager = $tagManager;
+	}
 }
diff --git a/src/DMKClub/Bundle/MemberBundle/Form/Type/MemberStatusType.php b/src/DMKClub/Bundle/MemberBundle/Form/Type/MemberStatusType.php
@@ -6,6 +6,7 @@
 use Symfony\Component\Form\AbstractType;
 
 use Oro\Bundle\UserBundle\Provider\GenderProvider;
+use DMKClub\Bundle\MemberBundle\Provider\MemberStatusProvider;
 
 class MemberStatusType extends AbstractType
 {

diff --git a/src/DMKClub/Bundle/MemberBundle/Form/Type/MemberType.php b/src/DMKClub/Bundle/MemberBundle/Form/Type/MemberType.php
@@ -27,7 +27,11 @@ protected function buildPlainFields(FormBuilderInterface $builder, array $option
 			->add('startDate', 'oro_date', array('required' => false, 'label' => 'dmkclub.member.start_date.label'))
 			->add('endDate', 'oro_date', array('required' => false, 'label' => 'dmkclub.member.end_date.label'))
 			->add('name', 'text', array('required' => true, 'label' => 'dmkclub.member.name.label'))
+			->add('status', 'dmkclub_memberstatus', array('required' => true, 'label' => 'dmkclub.member.status.label'))
+			->add('paymentOption', 'dmkclub_paymentoptions', array('required' => true, 'label' => 'dmkclub.member.payment_option.label'))
 			->add('isActive')
+			->add('isHonorary')
+			->add('isFreeOfCharge')
 			->add('owner')
 			->add('organization')
 		;

diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/config/form.yml b/src/DMKClub/Bundle/MemberBundle/Resources/config/form.yml
@@ -40,6 +40,8 @@ services:
             - @dmkclub.member.form
             - @request
             - @doctrine.orm.entity_manager
+        tags:
+            - { name: oro_tag.tag_manager }
 
     dmkclub.member.form.handler.api:
         class: %dmkclub.member.form.handler.class%

diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/translations/messages.de.yml b/src/DMKClub/Bundle/MemberBundle/Resources/translations/messages.de.yml
@@ -9,7 +9,10 @@ dmkclub:
         name.label:          Name
         member_code.label:   Mitgliedsnummer
         is_active.label:     Aktives Mitglied
+        is_honorary.label:   Ehrenmitglied
+        is_free_of_charge.label:  Beitragsfrei
         contact.label:       Kontakt
+        payment_option.label:  Zahlungsweise
         postal_address.label:  Postadresse
         organization.label:  Organisation
         start_date.label:    Eintrittsdatum

diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/translations/messages.en.yml b/src/DMKClub/Bundle/MemberBundle/Resources/translations/messages.en.yml
@@ -10,8 +10,11 @@ dmkclub:
         name.label:          Name
         member_code.label:   Club ID
         is_active.label:     Active member
+        is_honorary.label:   Honorary member
+        is_free_of_charge.label:  Free of charge
         contact.label:       Contact
         postal_address.label:  Postal Address
+        payment_option.label:  Payment option
         organization.label:  Organization
         start_date.label:    Joining
         end_date.label:      Resignation

diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/views/Member/update.html.twig b/src/DMKClub/Bundle/MemberBundle/Resources/views/Member/update.html.twig
@@ -18,7 +18,13 @@
     {% if form.vars.value.id and resource_granted('DELETE', form.vars.value) %}
         {{ UI.buttonSeparator() }}
     {% endif %}
-    {{ UI.cancelButton(path('dmkclub_member_index')) }}
+
+    {% if form.vars.value.id %}
+	    {{ UI.cancelButton(path('dmkclub_member_view', { 'id': form.vars.value.id })) }}
+    {% else %}
+	    {{ UI.cancelButton(path('dmkclub_member_index')) }}
+    {% endif %}
+
     {% set html = UI.saveAndCloseButton() %}
     {% if form.vars.value.id or resource_granted('dmkclub_member_update') %}
         {% set html = html ~ UI.saveAndStayButton() %}
@@ -61,11 +67,15 @@
     {% set formFields = formFields|merge([
         form_row(form.name),
         form_row(form.memberCode),
+        form_row(form.status),
 
         form_row(form.contact),
         form_row(form.startDate),
         form_row(form.endDate),
         form_row(form.isActive),
+        form_row(form.isHonorary),
+        form_row(form.isFreeOfCharge),
+        form_row(form.paymentOption),
         form_row(form.dataChannel)
     ]) %}
     {% if form.owner is defined %}

diff --git a/src/DMKClub/Bundle/MemberBundle/Resources/views/Member/view.html.twig b/src/DMKClub/Bundle/MemberBundle/Resources/views/Member/view.html.twig
@@ -5,7 +5,13 @@
 {% oro_title_set({params : {"%member.name%": fullname} }) %}
 
 {% block navButtons %}
-    {{ parent() }}
+    {{ UI.cancelButton(path('dmkclub_member_index')) }}
+    {% if resource_granted('EDIT', entity) %}
+        {{ UI.editButton({
+            'path' : path('dmkclub_member_update', { 'id': entity.id }),
+            'entity_label': 'dmkclub.member.entity_label'|trans
+        }) }}
+    {% endif %}
 {% endblock navButtons %}
 
 {% block pageHeader %}

diff --git a/src/DMKClub/Bundle/PaymentBundle/Form/Type/PaymentOptionsType.php b/src/DMKClub/Bundle/PaymentBundle/Form/Type/PaymentOptionsType.php
@@ -6,6 +6,7 @@
 use Symfony\Component\Form\AbstractType;
 
 use Oro\Bundle\UserBundle\Provider\GenderProvider;
+use DMKClub\Bundle\PaymentBundle\Provider\PaymentOptionsProvider;
 
 class PaymentOptionsType extends AbstractType
 {
@@ -50,7 +51,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
                 'choices'     => $this->paymentOptionsProvider->getChoices(),
                 'multiple'    => false,
                 'expanded'    => false,
-                'empty_value' => 'dmkclub.payment.form.choose_option',
+                'empty_value' => 'dmkclub.payment_option.form.choose',
                 'translatable_options' => false
             )
         );

diff --git a/src/DMKClub/Bundle/PaymentBundle/Provider/PaymentOptionsProvider.php b/src/DMKClub/Bundle/PaymentBundle/Provider/PaymentOptionsProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DMKClub\Bundle\MemberBundle\Provider;
+namespace DMKClub\Bundle\PaymentBundle\Provider;
 
 use Symfony\Component\Translation\TranslatorInterface;
 use DMKClub\Bundle\PaymentBundle\Model\PaymentOption;

diff --git a/src/DMKClub/Bundle/PaymentBundle/Resources/translations/messages.de.yml b/src/DMKClub/Bundle/PaymentBundle/Resources/translations/messages.de.yml
@@ -3,4 +3,5 @@ dmkclub:
         sepa_direct_debit: Sepa Bankeinzug
         banktransfer: Überweisung
         creditcard: Kreditkarte
+        form.choose: Wählen Sie ein Zahlungsart
 
diff --git a/src/DMKClub/Bundle/PaymentBundle/Resources/translations/messages.en.yml b/src/DMKClub/Bundle/PaymentBundle/Resources/translations/messages.en.yml
@@ -3,4 +3,5 @@ dmkclub:
         sepa_direct_debit: Sepa Direct Debit
         banktransfer: Bank transfer
         creditcard: Creditcard
+        form.choose: Choose payment option