Merge pull request #1178 from wmde/membership-confirmation-print

T183558 Improve print styling of membership confirmation
wmde · Jan 11, 2018 · 3fd03a0 · 3fd03a0
2 parents 2484db2 + d95a732
commit 3fd03a0
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 46 deletions.
diff --git a/skins/10h16/templates/Donation_Confirmation.html.twig b/skins/10h16/templates/Donation_Confirmation.html.twig
@@ -101,14 +101,14 @@
 
 					<div class="container clearfix">
 						<div class="address f-left">
-						{% if person %}
+						{% if address %}
 							<p>
-								<span class="confirm-name">{$ person.salutation $} {$ person.fullName $}</span>
+								<span class="confirm-name">{$ address.salutation $} {$ address.fullName $}</span>
 							</p>
 							<p class="no-margin">
-								<span class="confirm-street">{$ person.streetAddress $}</span><br/>
-								<span class="confirm-postcode">{$ person.postalCode $}</span> <span class="confirm-city">{$ person.city $}</span><br/>
-								<span class="confirm-email">{$ person.email $}</span>
+								<span class="confirm-street">{$ address.streetAddress $}</span><br/>
+								<span class="confirm-postcode">{$ address.postalCode $}</span> <span class="confirm-city">{$ address.city $}</span><br/>
+								<span class="confirm-email">{$ address.email $}</span>
 							</p>
 						{% else %}
 							<p>

diff --git a/skins/10h16/templates/Membership_Application_Confirmation.html.twig b/skins/10h16/templates/Membership_Application_Confirmation.html.twig
@@ -71,13 +71,13 @@
 							<div class="address f-left">
 								<p class="title"><strong>Ihre Daten</strong></p>
 								<p>
-									<span class="confirm-name">{$ person.salutation $} {$ person.fullName $}</span>
+									<span class="confirm-name">{$ address.salutation $} {$ address.fullName $}</span>
 								</p>
 
 								<p class="no-margin">
-									<span class="confirm-street">{$ person.streetAddress $}</span><br/>
-									<span class="confirm-postcode">{$ person.postalCode $}</span> <span class="confirm-city">{$ person.city $}</span><br/>
-									<span class="confirm-email">{$ person.email $}</span>
+									<span class="confirm-street">{$ address.streetAddress $}</span><br/>
+									<span class="confirm-postcode">{$ address.postalCode $}</span> <span class="confirm-city">{$ address.city $}</span><br/>
+									<span class="confirm-email">{$ address.email $}</span>
 								</p>
 							</div>
 

diff --git a/skins/10h16/templates/Membership_Application_Embedded.html.twig b/skins/10h16/templates/Membership_Application_Embedded.html.twig
@@ -2,16 +2,16 @@
 {% 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 ab 2018 Fördermitglied!" %}
+{% if address.salutation and address.lastName %}
+	{% set membershipAppeal = "#{address.salutation} #{address.lastName}, werden Sie ab 2018 Fördermitglied!" %}
 {% else %}
 	{% set membershipAppeal = 'Werden Sie ab 2018 Fördermitglied!' %}
 {% endif %}
 
 {% include 'Validation_Errors.html.twig' %}
 
 <div id="personalDataPage">
-	{% include 'Membership_Application_Form.html.twig' %}
+	{% include 'Membership_Application_Form.html.twig' with { person: address } %}
 </div>
 
 <div id="bankConfirmationPage">

diff --git a/skins/cat17/src/sass/layouts/pages/membership_confirmation.scss b/skins/cat17/src/sass/layouts/pages/membership_confirmation.scss
@@ -78,3 +78,17 @@
 		}
 	}
 }
+
+@media print {
+	.page-membership-confirmation {
+		p.h1, p.h2 {
+			font-size: $font-size-base;
+			margin-top: 0;
+			margin-bottom: 11px;
+		}
+
+		.transfer-data-list dd {
+			font-family: monospace;
+		}
+	}
+}
diff --git a/skins/cat17/templates/Membership_Application_Confirmation.html.twig b/skins/cat17/templates/Membership_Application_Confirmation.html.twig
@@ -25,15 +25,47 @@
 					} ) | raw $}
 				</p>
 
-				<p class="text-moved visible-sm-block visible-md-block visible-lg-block">
+				<p class="text-moved visible-sm-block visible-md-block visible-lg-block hidden-print">
 					{$ 'membership_confirmation_welcome' | trans $}
 				</p>
 
 				{% if membershipApplication.paymentType == 'BEZ' %}
 					<div class="visible-print">
 						{$ web_content('membership/application/paymenttype_directdebit_mandate') $}
 
+						<h3>{$ 'membership_confirmation_debit_mandate_title' | trans $}</h3>
+
+						<p>
+							{$ web_content( 'address_of_suborganization' ) | nl2br $}
+						</p>
+
+						<div class="row">
+							<div class="col-xs-6">
+								<p>
+									{$ address.salutation $} {$ address.fullName $}<br/>
+									{$ address.streetAddress $}<br/>
+									{$ address.postalCode $} {$ address.city $}<br/>
+									{$ address.email $}
+								</p>
+							</div>
+							<div class="col-xs-6">
+								<p>
+									<strong>{$ 'iban' | trans $}</strong> {$ bankData.iban $}<br/>
+									<strong>{$ 'bic' | trans $}</strong> {$ bankData.bic $}<br/>
+									{% if bankData.bankName %}
+										<strong>{$ 'bank_name' | trans $}</strong> {$ bankData.bankName $}
+									{% endif %}
+								</p>
+							</div>
+						</div>
+
 						{$ web_content('membership/application/paymenttype_directdebit_affirmation') $}
+
+						<p style="text-align: right">
+							{$ 'membership_confirmation_debit_mandate_date' | trans( {
+							'%formattedDate%': 'now' | date( 'd.m.Y' )
+							} ) $}
+						</p>
 					</div>
 				{% endif %}
 			</div>

diff --git a/skins/cat17/templates/partials/donation_confirmation/direct_debit.html.twig b/skins/cat17/templates/partials/donation_confirmation/direct_debit.html.twig
@@ -46,12 +46,12 @@
 
                 <div class="row">
                     <div class="col-xs-6">
-                        {% if person %}
+                        {% if address %}
                             <p>
-                                {$ person.salutation $} {$ person.fullName $}<br/>
-                                {$ person.streetAddress $}<br/>
-                                {$ person.postalCode $} {$ person.city $}<br/>
-                                {$ person.email $}
+                                {$ address.salutation $} {$ address.fullName $}<br/>
+                                {$ address.streetAddress $}<br/>
+                                {$ address.postalCode $} {$ address.city $}<br/>
+                                {$ address.email $}
                             </p>
                         {% else %}
                             <p>
@@ -63,7 +63,9 @@
                         <p>
                             <strong>{$ 'iban' | trans $}</strong> {$ bankData.iban $}<br/>
                             <strong>{$ 'bic' | trans $}</strong> {$ bankData.bic $}<br/>
-                            <strong>{$ 'bank_name' | trans $}</strong> {$ bankData.bankname $}
+                            {% if bankData.bankname %}
+                                <strong>{$ 'bank_name' | trans $}</strong> {$ bankData.bankname $}
+                            {% endif %}
                         </p>
                     </div>
                 </div>

diff --git a/skins/test/templates/DonationConfirmation.twig b/skins/test/templates/DonationConfirmation.twig
@@ -7,14 +7,14 @@
 	Sie zahlen per {$ donation.paymentType|trans({}, 'paymentTypes') $}
 {% endif %}
 
-{% if person %}
+{% if address %}
 	<p>
-		{$ person.salutation $} <span id="confirm-name">{$ person.fullName $}</span>
+		{$ address.salutation $} <span id="confirm-name">{$ address.fullName $}</span>
 	</p>
 	<p class="no-margin">
-		<span id="confirm-street">{$ person.streetAddress $}</span><br/>
-		<span id="confirm-postcode">{$ person.postalCode $}</span> <span id="confirm-city">{$ person.city $}</span><br/>
-		<span id="confirm-mail">{$ person.email $}</span>
+		<span id="confirm-street">{$ address.streetAddress $}</span><br/>
+		<span id="confirm-postcode">{$ address.postalCode $}</span> <span id="confirm-city">{$ address.city $}</span><br/>
+		<span id="confirm-mail">{$ address.email $}</span>
 	</p>
 {% else %}
 	<p>

diff --git a/skins/test/templates/Membership_Application_Embedded.html.twig b/skins/test/templates/Membership_Application_Embedded.html.twig
@@ -8,14 +8,14 @@ donation.interval: {$ donation.interval $}
 donation.paymentType: {$ donation.paymentType $}
 donation.optsIntoNewsletter: {$ donation.optsIntoNewsletter $}
 
-person.salutation: {$ person.salutation $}
-person.fullName: {$ person.fullName $}
-person.firstName: {$ person.firstName $}
-person.lastName: {$ person.lastName $}
-person.streetAddress: {$ person.streetAddress $}
-person.postalCode: {$ person.postalCode $}
-person.city: {$ person.city $}
-person.email: {$ person.email $}
+address.salutation: {$ address.salutation $}
+address.fullName: {$ address.fullName $}
+address.firstName: {$ address.firstName $}
+address.lastName: {$ address.lastName $}
+address.streetAddress: {$ address.streetAddress $}
+address.postalCode: {$ address.postalCode $}
+address.city: {$ address.city $}
+address.email: {$ address.email $}
 
 bankData.iban: {$ bankData.iban $}
 bankData.bic: {$ bankData.bic $}

diff --git a/src/Presentation/Presenters/DonationConfirmationHtmlPresenter.php b/src/Presentation/Presenters/DonationConfirmationHtmlPresenter.php
@@ -60,7 +60,7 @@ private function getConfirmationPageArguments( Donation $donation, string $updat
 				'updateToken' => $updateToken,
 				'accessToken' => $accessToken
 			],
-			'person' => $this->getPersonArguments( $donation ),
+			'address' => $this->getAddressArguments( $donation ),
 			'bankData' => $this->getBankDataArguments( $donation->getPaymentMethod() ),
 			'initialFormValues' => $this->donationMembershipApplicationAdapter->getInitialMembershipFormValues( $donation ),
 			'piwikEvents' => $piwikEvents->getEvents(),
@@ -75,7 +75,7 @@ private function getConfirmationPageArguments( Donation $donation, string $updat
 		];
 	}
 
-	private function getPersonArguments( Donation $donation ): array {
+	private function getAddressArguments( Donation $donation ): array {
 		if ( $donation->getDonor() !== null ) {
 			return [
 				'salutation' => $donation->getDonor()->getName()->getSalutation(),

diff --git a/src/Presentation/Presenters/MembershipApplicationConfirmationHtmlPresenter.php b/src/Presentation/Presenters/MembershipApplicationConfirmationHtmlPresenter.php
@@ -56,7 +56,7 @@ public function getHtml(): string {
 	private function getConfirmationPageArguments( Application $membershipApplication, string $updateToken ): array {
 		return [
 			'membershipApplication' => $this->getApplicationArguments( $membershipApplication, $updateToken ),
-			'person' => $this->getPersonArguments( $membershipApplication->getApplicant() ),
+			'address' => $this->getAddressArguments( $membershipApplication->getApplicant() ),
 			'bankData' => $this->getBankDataArguments( $membershipApplication->getPayment()->getPaymentMethod() ),
 			'payPalData' => $this->getPayPalDataArguments(
 				$membershipApplication->getPayment()->getPaymentMethod()
@@ -76,7 +76,7 @@ private function getApplicationArguments( Application $membershipApplication, st
 		];
 	}
 
-	private function getPersonArguments( Applicant $applicant ): array {
+	private function getAddressArguments( Applicant $applicant ): array {
 		return [
 			'salutation' => $applicant->getName()->getSalutation(),
 			'title' => $applicant->getName()->getTitle(),

diff --git a/tests/EdgeToEdge/Routes/ShowDonationConfirmationRouteTest.php b/tests/EdgeToEdge/Routes/ShowDonationConfirmationRouteTest.php
@@ -178,14 +178,14 @@ private function assertDonationDataInResponse( Donation $donation, string $respo
 		$this->assertContains( 'donation.optsIntoNewsletter: ' . $donation->getOptsIntoNewsletter(), $responseContent );
 		$this->assertContains( 'donation.updateToken: ' . self::CORRECT_ACCESS_TOKEN, $responseContent );
 
-		$this->assertContains( 'person.salutation: ' . $personName->getSalutation(), $responseContent );
-		$this->assertContains( 'person.fullName: ' . $personName->getFullName(), $responseContent );
-		$this->assertContains( 'person.firstName: ' . $personName->getFirstName(), $responseContent );
-		$this->assertContains( 'person.lastName: ' . $personName->getLastName(), $responseContent );
-		$this->assertContains( 'person.streetAddress: ' . $physicalAddress->getStreetAddress(), $responseContent );
-		$this->assertContains( 'person.postalCode: ' . $physicalAddress->getPostalCode(), $responseContent );
-		$this->assertContains( 'person.city: ' . $physicalAddress->getCity(), $responseContent );
-		$this->assertContains( 'person.email: ' . $donor->getEmailAddress(), $responseContent );
+		$this->assertContains( 'address.salutation: ' . $personName->getSalutation(), $responseContent );
+		$this->assertContains( 'address.fullName: ' . $personName->getFullName(), $responseContent );
+		$this->assertContains( 'address.firstName: ' . $personName->getFirstName(), $responseContent );
+		$this->assertContains( 'address.lastName: ' . $personName->getLastName(), $responseContent );
+		$this->assertContains( 'address.streetAddress: ' . $physicalAddress->getStreetAddress(), $responseContent );
+		$this->assertContains( 'address.postalCode: ' . $physicalAddress->getPostalCode(), $responseContent );
+		$this->assertContains( 'address.city: ' . $physicalAddress->getCity(), $responseContent );
+		$this->assertContains( 'address.email: ' . $donor->getEmailAddress(), $responseContent );
 
 		$this->assertContains( 'bankData.iban: ' . $paymentMethod->getBankData()->getIban()->toString(), $responseContent );
 		$this->assertContains( 'bankData.bic: ' . $paymentMethod->getBankData()->getBic(), $responseContent );

diff --git a/tests/Integration/Presentation/Presenters/DonationConfirmationHtmlPresenterTest.php b/tests/Integration/Presentation/Presenters/DonationConfirmationHtmlPresenterTest.php
@@ -63,7 +63,7 @@ private function getExpectedRenderParams(): array {
 				'updateToken' => self::UPDATE_TOKEN,
 				'accessToken' => self::ACCESS_TOKEN
 			],
-			'person' => [],
+			'address' => [],
 			'bankData' => [],
 			'initialFormValues' => [],
 			'piwikEvents' => [

diff --git a/...ntegration/Presentation/Presenters/MembershipApplicationConfirmationHtmlPresenterTest.php b/...ntegration/Presentation/Presenters/MembershipApplicationConfirmationHtmlPresenterTest.php
@@ -56,7 +56,7 @@ private function getExpectedRenderParams( string $mappedStatus ): array {
 				'paymentIntervalInMonths' => 3,
 				'updateToken' => 'update_token'
 			],
-			'person' => [
+			'address' => [
 				'salutation' => 'Herr',
 				'title' => '',
 				'fullName' => 'Potato The Great',