Fixed minor issues in payment procession

diff --git a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
index eade0a880dbfc7a3a360be446e53a794ffe1241b..eac28595ba55740c2b0ba4327385ea3a9a6c7494 100644 (file)
--- a/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
+++ b/wcfsetup/install/files/lib/page/PaidSubscriptionReturnPage.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\page;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 
 /**
@@ -25,7 +26,9 @@ class PaidSubscriptionReturnPage extends AbstractPage {
                parent::assignVariables();
                
                WCF::getTPL()->assign(array(
-                       'message' => WCF::getLanguage()->get('wcf.paidSubscription.returnMessage')
+                       'message' => WCF::getLanguage()->get('wcf.paidSubscription.returnMessage'),
+                       'wait' => 60,
+                       'url' => LinkHandler::getInstance()->getLink()
                ));
        }
 }

diff --git a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
index f48fea916ac1d2c67873fe993952b27f67eacdb0..9cee94f8fc8f76a33cbdb1ef419d495ed13e4bd0 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
+++ b/wcfsetup/install/files/lib/system/payment/type/PaidSubscriptionPaymentType.class.php
@@ -96,7 +96,7 @@ class PaidSubscriptionPaymentType extends AbstractPaymentType {
                        // log success
                        $action = new PaidSubscriptionTransactionLogAction(array(), 'create', array('data' => array(
                                'subscriptionUserID' => $userSubscription->subscriptionUserID,
-                               'user' => $user->userID,
+                               'userID' => $user->userID,
                                'subscriptionID' => $subscription->subscriptionID,
                                'paymentMethodObjectTypeID' => $paymentMethodObjectTypeID,
                                'logTime' => TIME_NOW,
@@ -110,7 +110,7 @@ class PaidSubscriptionPaymentType extends AbstractPaymentType {
                        // log failure
                        $action = new PaidSubscriptionTransactionLogAction(array(), 'create', array('data' => array(
                                'subscriptionUserID' => ($userSubscription !== null ? $userSubscription->subscriptionUserID : null),
-                               'user' => ($user !== null ? $user->userID : null),
+                               'userID' => ($user !== null ? $user->userID : null),
                                'subscriptionID' => ($subscription !== null ? $subscription->subscriptionID : null),
                                'paymentMethodObjectTypeID' => $paymentMethodObjectTypeID,
                                'logTime' => TIME_NOW,