Merge pull request #939 from wmde/toggle-paytypes

Introduce payment type toggle for membership applications
wmde · Aug 18, 2017 · 37c58bc · 37c58bc
2 parents ccefe8c + ac8cde2
commit 37c58bc
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 13 deletions.
diff --git a/app/config/config.dist.json b/app/config/config.dist.json
@@ -157,19 +157,24 @@
 	},
 	"payment-types": {
 		"BEZ": {
-			"donation-enabled": true
+			"donation-enabled": true,
+			"membership-enabled": true
 		},
 		"UEB": {
-			"donation-enabled": true
+			"donation-enabled": true,
+			"membership-enabled": false
 		},
 		"MCP": {
-			"donation-enabled": true
+			"donation-enabled": true,
+			"membership-enabled": false
 		},
 		"PPL": {
-			"donation-enabled": true
+			"donation-enabled": true,
+			"membership-enabled": false
 		},
 		"SUB": {
-			"donation-enabled": false
+			"donation-enabled": false,
+			"membership-enabled": false
 		}
 	}
 }
diff --git a/app/config/schema.json b/app/config/schema.json
@@ -720,16 +720,22 @@
               "type": "boolean",
               "title": "Donation Enabled Flag",
               "description": "Set to true if payment type is to be offered for donations"
+            },
+            "membership-enabled": {
+              "type": "boolean",
+              "title": "Membership application enabled flag",
+              "description": "Set to true if payment type is to be offered for membership applications"
             }
           },
           "required": [
-            "donation-enabled"
+            "donation-enabled",
+            "membership-enabled"
           ],
           "additionalProperties": false
         }
       },
       "additionalProperties": false,
-      "minProperties": 1
+      "minProperties": 2
     }
   },
   "additionalProperties": false,

diff --git a/app/routes.php b/app/routes.php
@@ -415,7 +415,7 @@ function( Request $request ) use ( $ffFactory ) {
 			$params['showMembershipTypeOption'] = false ;
 		}
 
-		return $ffFactory->getLayoutTemplate( 'Membership_Application.html.twig' )->render( $params );
+		return $ffFactory->getMembershipApplicationFormTemplate()->render( $params );
 	}
 );
 

diff --git a/app/templates/Membership_Application.html.twig b/app/templates/Membership_Application.html.twig
@@ -1,6 +1,7 @@
 {% set showMembershipTypeOption = showMembershipTypeOption is defined ? showMembershipTypeOption : 'true' %}
 {% set membershipAppeal = 'Werden Sie Mitglied für Freies Wissen!' %}
 {% set formSlideOpen = false %}
+{% set initialPaymentType = paymentTypes|length == 1 ? paymentTypes|first : '' %}
 
 {% extends 'Base_Layout.html.twig' %}
 
@@ -17,7 +18,7 @@
 	</div>
 
 	<script id="init-form" src="{$ basepath|e('html_attr') $}{$ '/res/js/membershipForm.js'|prefix_file $}"
-		data-initial-form-values="{% if initialFormValues %}{$ initialFormValues|merge({'paymentType': 'BEZ'})|json_encode|e('html_attr') $}{% else %}{$ {'paymentType': 'BEZ'}|json_encode|e('html_attr') $}{% endif %}"
+		data-initial-form-values="{% if initialFormValues %}{$ initialFormValues|merge({'paymentType': initialPaymentType})|json_encode|e('html_attr') $}{% else %}{$ {'paymentType': initialPaymentType}|json_encode|e('html_attr') $}{% endif %}"
 		data-violated-fields="{% if violatedFields %}{$ violatedFields|json_encode|e('html_attr') $}{% else %}{}{% endif %}"
 		data-validate-fee-url="{$ basepath|e('html_attr') $}/validate-fee"
 		data-validate-address-url="{$ basepath|e('html_attr') $}/validate-address"

diff --git a/app/templates/Membership_Application_Embedded.html.twig b/app/templates/Membership_Application_Embedded.html.twig
@@ -1,5 +1,6 @@
 {% set showMembershipTypeOption = false %}
 {% set formSlideOpen = true %}
+{% set initialPaymentType = paymentTypes|length == 1 ? paymentTypes|first : '' %}
 {% set trackOutgoingLinks = true %}
 {% if person.salutation and person.lastName %}
 	{% set membershipAppeal = "#{person.salutation} #{person.lastName}, werden Sie Fördermitglied!" %}
@@ -18,7 +19,7 @@
 </div>
 
 <script id="init-form" src="{$ basepath|e('html_attr') $}/res/js/membershipForm.js"
-		data-initial-form-values="{% if initialFormValues %}{$ initialFormValues|merge({'paymentType': 'BEZ'})|json_encode|e('html_attr') $}{% else %}{$ {'paymentType': 'BEZ'}|json_encode|e('html_attr') $}{% endif %}"
+		data-initial-form-values="{% if initialFormValues %}{$ initialFormValues|merge({'paymentType': initialPaymentType})|json_encode|e('html_attr') $}{% else %}{$ {'paymentType': initialPaymentType}|json_encode|e('html_attr') $}{% endif %}"
 		data-violated-fields="{% if violatedFields %}{$ violatedFields|json_encode|e('html_attr') $}{% else %}{}{% endif %}"
 		data-validate-fee-url="{$ basepath|e('html_attr') $}/validate-fee"
 		data-validate-address-url="{$ basepath|e('html_attr') $}/validate-address"

diff --git a/app/templates/Membership_Application_Form.html.twig b/app/templates/Membership_Application_Form.html.twig
@@ -245,17 +245,22 @@
 
 					<div class="container clearfix">
 
-						<ul class="horizontal clearfix payment-type-list">
+						<ul class="horizontal clearfix payment-type-list" style="{% if paymentTypes|length < 2 %}display: none;{% endif %}">
+{% if 'BEZ' in paymentTypes %}
 							<li class="first">
 								<input type="radio" title="Lastschrift" value="BEZ" class="payment-type-select" name="payment_type" id="paymentType-1">
 								<label for="paymentType-1">Lastschrift</label>
 							</li>
+{% endif %}
+{% if 'PPL' in paymentTypes %}
 							<li>
 								<input type="radio" title="PayPal" value="PPL" class="payment-type-select" name="payment_type" id="paymentType-2">
 								<label for="paymentType-2">PayPal</label>
 							</li>
+{% endif %}
 						</ul>
 
+{% if 'PPL' in paymentTypes %}
 						<div class="notice-ppl-recurrent">
 							<p>
 								{$ 'notice_membership_paypal'|trans $}
@@ -266,6 +271,7 @@
 						</div>
 
 						<hr />
+{% endif %}
 
 						<ul class="horizontal clearfix interval-list">
 							<li class="first">
@@ -339,6 +345,7 @@
 						</ul>
 					</div>
 
+{% if 'BEZ' in paymentTypes %}
 					<div class="fields-direct-debit">
 
 						<hr />
@@ -400,6 +407,7 @@
 					<div style="margin-left: 180px" class="input-container">
 						<span id="bank-name"></span>
 					</div>
+{% endif %}
 
 					<hr>
 				</div>

diff --git a/src/Factories/FunFunFactory.php b/src/Factories/FunFunFactory.php
@@ -1011,7 +1011,13 @@ public function getTokenGenerator(): TokenGenerator {
 
 	public function newDonationConfirmationPresenter(): DonationConfirmationHtmlPresenter {
 		return new DonationConfirmationHtmlPresenter(
-			$this->getIncludeTemplate( 'Donation_Confirmation.html.twig', [ 'piwikGoals' => [ 3 ] ] )
+			$this->getIncludeTemplate(
+				'Donation_Confirmation.html.twig',
+				[
+					'piwikGoals' => [ 3 ],
+					'paymentTypes' => $this->getEnabledMembershipApplicationPaymentTypes()
+				]
+			)
 		);
 	}
 
@@ -1168,6 +1174,18 @@ private function getEnabledDonationPaymentTypes(): array {
 		} ) );
 	}
 
+	public function getMembershipApplicationFormTemplate(): TwigTemplate {
+		return $this->getLayoutTemplate( 'Membership_Application.html.twig', [
+			'paymentTypes' => $this->getEnabledMembershipApplicationPaymentTypes()
+		] );
+	}
+
+	private function getEnabledMembershipApplicationPaymentTypes(): array {
+		return array_keys( array_filter( $this->config['payment-types'], function ( $config ) {
+			return ( $config['membership-enabled'] === true );
+		} ) );
+	}
+
 	public function newHandleSofortPaymentNotificationUseCase( string $updateToken ): SofortPaymentNotificationUseCase {
 		return new SofortPaymentNotificationUseCase(
 			$this->getDonationRepository(),
@@ -1244,7 +1262,7 @@ public function newMembershipApplicationConfirmationHtmlPresenter(): MembershipA
 
 	public function newMembershipFormViolationPresenter(): MembershipFormViolationPresenter {
 		return new MembershipFormViolationPresenter(
-			$this->getLayoutTemplate( 'Membership_Application.html.twig' )
+			$this->getMembershipApplicationFormTemplate()
 		);
 	}