From: Marcel Werk Date: Wed, 17 Sep 2014 15:06:01 +0000 (+0200) Subject: Added support for paid subscriptions X-Git-Tag: 2.1.0_Alpha_1~345 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4d8036f523edd1e53df7e06db1e291fb50ec0fa3;p=GitHub%2FWoltLab%2FWCF.git Added support for paid subscriptions --- diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml index 69229f1cbe..b46620fc29 100644 --- a/com.woltlab.wcf/acpMenu.xml +++ b/com.woltlab.wcf/acpMenu.xml @@ -307,6 +307,29 @@ admin.notice.canManageNotice + + wcf.acp.menu.link.user + 6 + + + + wcf.acp.menu.link.paidSubscription + admin.paidSubscription.canManageSubscription + module_paid_subscription + + + + wcf.acp.menu.link.paidSubscription + admin.paidSubscription.canManageSubscription + module_paid_subscription + + + + wcf.acp.menu.link.paidSubscription + admin.paidSubscription.canManageSubscription + module_paid_subscription + + 3 diff --git a/com.woltlab.wcf/dashboardBox.xml b/com.woltlab.wcf/dashboardBox.xml index fede92f786..f4ce0c6f46 100644 --- a/com.woltlab.wcf/dashboardBox.xml +++ b/com.woltlab.wcf/dashboardBox.xml @@ -6,6 +6,11 @@ content + + + content + + sidebar @@ -65,5 +70,10 @@ sidebar + + + + sidebar + diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml index 59665ac26d..0d875b4723 100644 --- a/com.woltlab.wcf/objectType.xml +++ b/com.woltlab.wcf/objectType.xml @@ -951,5 +951,23 @@ + + + com.woltlab.wcf.payment.method.paypal + com.woltlab.wcf.payment.method + + + + + + + com.woltlab.wcf.payment.type.paidSubscription + com.woltlab.wcf.payment.type + + diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml index 256f3c9856..4f9ddc2ba0 100644 --- a/com.woltlab.wcf/objectTypeDefinition.xml +++ b/com.woltlab.wcf/objectTypeDefinition.xml @@ -190,5 +190,15 @@ com.woltlab.wcf.message + + + com.woltlab.wcf.payment.method + + + + + com.woltlab.wcf.payment.type + + diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml index a119536fff..9e839e62b1 100644 --- a/com.woltlab.wcf/option.xml +++ b/com.woltlab.wcf/option.xml @@ -81,6 +81,9 @@ general.cache + + general + @@ -816,6 +819,23 @@ no:!cache_source_memcached_host]]> + + + + + + + + + +