From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 2 Oct 2014 23:08:42 +0000 (+0200)
Subject: Added support for terms of service confirmation
X-Git-Tag: 2.1.0_Alpha_1~285
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e73af0213912e118af95232403f7ea37727ce844;p=GitHub%2FWoltLab%2FWCF.git

Added support for terms of service confirmation
---

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 3d763a0a2e..173a949f57 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -844,6 +844,17 @@ memcached:cache_source_memcached_host]]></enableoptions>
 				<categoryname>general.payment</categoryname>
 				<optiontype>boolean</optiontype>
 			</option>
+			
+			<option name="paid_subscription_enable_tos_confirmation">
+				<categoryname>general.payment</categoryname>
+				<optiontype>boolean</optiontype>
+				<enableoptions><![CDATA[paid_subscription_tos_url]]></enableoptions>
+			</option>
+			
+			<option name="paid_subscription_tos_url">
+				<categoryname>general.payment</categoryname>
+				<optiontype>text</optiontype>
+			</option>
 			<!-- /general.payment -->
 			
 			<option name="attachment_storage">
diff --git a/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptions.tpl b/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptions.tpl
index d8153d1bd5..759629aa7c 100644
--- a/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptions.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptions.tpl
@@ -11,12 +11,20 @@
 					<small>{lang}wcf.paidSubscription.formattedCost{/lang}</small> 
 				</div>
 				
-				<ul class="buttonList marginTopTiny">
-					{foreach from=$subscription->getPurchaseButtons() item=button}
-						<li>{@$button}</li>
-					{/foreach}
-				</ul>
+				{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+					<ul class="buttonList marginTopTiny">
+						{foreach from=$subscription->getPurchaseButtons() item=button}
+							<li>{@$button}</li>
+						{/foreach}
+					</ul>
+				{/if}
 			</li>
 		{/foreach}
 	</ul>
+	
+	{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+		<ul class="buttonList">
+			<li><a class="button small" href="{link controller='PaidSubscriptionList'}{/link}">{lang}wcf.paidSubscription.button.moreInformation{/lang}</a></li>
+		</ul>
+	{/if}
 </div>
diff --git a/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptionsSidebar.tpl b/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptionsSidebar.tpl
index 35a716e987..b338552ab0 100644
--- a/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptionsSidebar.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxPaidSubscriptionsSidebar.tpl
@@ -6,11 +6,17 @@
 				<small>{lang}wcf.paidSubscription.formattedCost{/lang}</small> 
 			</div>
 			
-			<ul class="buttonList marginTopTiny">
-				{foreach from=$subscription->getPurchaseButtons() item=button}
-					<li>{@$button}</li>
-				{/foreach}
-			</ul>
+			{if !PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+				<ul class="buttonList marginTopTiny">
+					{foreach from=$subscription->getPurchaseButtons() item=button}
+						<li>{@$button}</li>
+					{/foreach}
+				</ul>
+			{/if}
 		</li>
 	{/foreach}
 </ul>
+
+{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+	<a class="button small more" href="{link controller='PaidSubscriptionList'}{/link}">{lang}wcf.paidSubscription.button.moreInformation{/lang}</a>
+{/if}
\ No newline at end of file
diff --git a/com.woltlab.wcf/templates/paidSubscriptionList.tpl b/com.woltlab.wcf/templates/paidSubscriptionList.tpl
index 7b29a158a7..e7e9147687 100644
--- a/com.woltlab.wcf/templates/paidSubscriptionList.tpl
+++ b/com.woltlab.wcf/templates/paidSubscriptionList.tpl
@@ -4,6 +4,30 @@
 	<title>{lang}wcf.user.menu.settings.paidSubscription{/lang} - {lang}wcf.user.menu.settings{/lang} - {PAGE_TITLE|language}</title>
 	
 	{include file='headInclude'}
+	
+	{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+		<script data-relocate="true">
+			$(function() {
+				$('#tosConfirmed').change(function () {
+					if ($('#tosConfirmed').is(':checked')) {
+						$('.paidSubscriptionList button').enable();
+					}
+					else {
+						$('.paidSubscriptionList button').disable();
+					}
+				});
+				$('#tosConfirmed').change();
+			});
+		</script>
+		
+		<noscript>
+			<style type="text/css">
+				.paidSubscriptionList button {
+					display: none;
+				}
+			</style>
+		</noscript>
+	{/if}
 </head>
 
 <body id="tpl{$templateName|ucfirst}" data-template="{$templateName}" data-application="{$templateNameApplication}">
@@ -35,7 +59,13 @@
 		<h2>{lang}wcf.paidSubscription.availableSubscriptions{/lang}</h2>
 	</header>
 	
-	<div class="container marginTop">
+	{if PAID_SUBSCRIPTION_ENABLE_TOS_CONFIRMATION}
+		<div class="container containerPadding marginTop">
+			<label><input type="checkbox" id="tosConfirmed" name="tosConfirmed" value="1" /> {lang}wcf.paidSubscription.confirmTOS{/lang}</label>
+		</div>
+	{/if}
+	
+	<div class="container marginTop paidSubscriptionList">
 		<ul class="containerList">
 			{foreach from=$subscriptions item=subscription}
 				<li>
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index b1f9934eb3..05415b3b21 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1045,6 +1045,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.paypal_email_address.description"><![CDATA[TODO]]></item>
 		<item name="wcf.acp.option.module_paid_subscription"><![CDATA[Bezahlte Mitgliedschaften aktivieren]]></item>
 		<item name="wcf.acp.option.module_paid_subscription.description"><![CDATA[TODO]]></item>
+		<item name="wcf.acp.option.paid_subscription_enable_tos_confirmation"><![CDATA[Benutzer müssen vor dem Kauf Nutzungsbedingungen akzeptieren]]></item>
+		<item name="wcf.acp.option.paid_subscription_tos_url"><![CDATA[URL zu Nutzungsbedingungen]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
@@ -2506,6 +2508,8 @@ Fehler sind beispielsweise:
 		<item name="wcf.paidSubscription.formattedCost"><![CDATA[{$subscription->currency} {$subscription->cost|currency}{if $subscription->subscriptionLength} {if $subscription->subscriptionLength != 1}für{else}pro{/if} {if $subscription->subscriptionLength != 1}{@$subscription->subscriptionLength} {/if}{if $subscription->subscriptionLengthUnit == 'D'}Tag{if $subscription->subscriptionLength != 1}e{/if}{/if}{if $subscription->subscriptionLengthUnit == 'M'}Monat{if $subscription->subscriptionLength != 1}e{/if}{/if}{if $subscription->subscriptionLengthUnit == 'Y'}Jahr{if $subscription->subscriptionLength != 1}e{/if}{/if}{/if}]]></item>
 		<item name="wcf.paidSubscription.expires"><![CDATA[Gültig bis]]></item>
 		<item name="wcf.paidSubscription.returnMessage"><![CDATA[Danke für Ihre Zahlung. Ihre Transaktion wurde abgeschlossen. Sobald Ihre Zahlung von uns verarbeitet wurde, wird die erworbene Mitgliedschaft aktiviert.]]></item>
+		<item name="wcf.paidSubscription.confirmTOS"><![CDATA[Hiermit bestätige ich mein Einverständnis mit den <a href="{PAID_SUBSCRIPTION_TOS_URL}">Nutzungsbedingungen</a>]]></item>
+		<item name="wcf.paidSubscription.button.moreInformation"><![CDATA[Mehr Informationen]]></item>
 	</category>
 	
 	<category name="wcf.payment">
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 32fea855d6..15c5450be0 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -1044,6 +1044,8 @@ GmbH=Gesellschaft mit beschränkter Haftung]]></item>
 		<item name="wcf.acp.option.paypal_email_address.description"><![CDATA[TODO]]></item>
 		<item name="wcf.acp.option.module_paid_subscription"><![CDATA[TODO: Bezahlte Mitgliedschaften aktivieren]]></item>
 		<item name="wcf.acp.option.module_paid_subscription.description"><![CDATA[TODO]]></item>
+		<item name="wcf.acp.option.paid_subscription_enable_tos_confirmation"><![CDATA[TODO: Benutzer müssen vor dem Kauf Nutzungsbedingungen akzeptieren]]></item>
+		<item name="wcf.acp.option.paid_subscription_tos_url"><![CDATA[TODO: URL zu Nutzungsbedingungen]]></item>
 	</category>
 	
 	<category name="wcf.acp.package">
@@ -2482,6 +2484,8 @@ Errors are:
 		<item name="wcf.paidSubscription.formattedCost"><![CDATA[TODO: {$subscription->currency} {$subscription->cost|currency}{if $subscription->subscriptionLength} {if $subscription->subscriptionLength != 1}für{else}pro{/if} {if $subscription->subscriptionLength != 1}{@$subscription->subscriptionLength} {/if}{if $subscription->subscriptionLengthUnit == 'D'}Tag{if $subscription->subscriptionLength != 1}e{/if}{/if}{if $subscription->subscriptionLengthUnit == 'M'}Monat{if $subscription->subscriptionLength != 1}e{/if}{/if}{if $subscription->subscriptionLengthUnit == 'Y'}Jahr{if $subscription->subscriptionLength != 1}e{/if}{/if}{/if}]]></item>
 		<item name="wcf.paidSubscription.expires"><![CDATA[TODO: Gültig bis]]></item>
 		<item name="wcf.paidSubscription.returnMessage"><![CDATA[TODO: Danke für Ihre Zahlung. Ihre Transaktion wurde abgeschlossen. Sobald Ihre Zahlung von uns verarbeitet wurde, wird die erworbene Mitgliedschaft aktiviert.]]></item>
+		<item name="wcf.paidSubscription.confirmTOS"><![CDATA[TODO: Hiermit bestätige ich mein Einverständnis mit den <a href="{PAID_SUBSCRIPTION_TOS_URL}">Nutzungsbedingungen</a>]]></item>
+		<item name="wcf.paidSubscription.button.moreInformation"><![CDATA[TODO: Mehr Informationen]]></item>
 	</category>
 	
 	<category name="wcf.payment">