From cb8cd790592a7b8517b14645ad4dad7ce97dcb4c Mon Sep 17 00:00:00 2001 From: quix0r Date: Mon, 4 Jul 2011 00:53:26 +0000 Subject: [PATCH] Introduced missing function getPaymentMethodFromExtensionName() --- inc/modules/member/what-cash_coupon.php | 2 +- inc/mysql-manager.php | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php index d45a15adf6..1a63224b2e 100644 --- a/inc/modules/member/what-cash_coupon.php +++ b/inc/modules/member/what-cash_coupon.php @@ -119,7 +119,7 @@ LIMIT 1", } // END - if // Now we just need to book that points on the user's account - addPointsThroughReferalSystem('coupon_cashed', getMemberId(), $content['points'], false, 0, getConfig('coupon_payment_method')); + addPointsThroughReferalSystem('coupon_cashed', getMemberId(), $content['points'], false, 0, getPaymentMethodFromExtensionName('coupon')); // Subtract points from member account if the admin has selected one if (isValidUserId(getConfig('coupon_userid'))) { diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 45dbbf1a0a..4eb508c5c4 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -2059,7 +2059,7 @@ function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) { $pointsData = getPointsDataArrayFromExtensionName($ext_name); // Regular points by default - $columnName = $pointsData['columnName']; + $columnName = $pointsData['column_name']; // Are the points locked? if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) { @@ -2071,5 +2071,23 @@ function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) { return $columName; } +// Determines the payment method for given extension and 'locked' +function getPaymentMethodFromExtensionName ($ext_name) { + // Extension sql_patches must be up-to-date + if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) { + // Please update ext-sql_patches + debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked)); + } // END - if + + // Get the points_data entry + $pointsData = getPointsDataArrayFromExtensionName($ext_name); + + // Regular points by default + $paymentMethod = $pointsData['payment_method']; + + // Return the result + return $columName; +} + // [EOF] ?> -- 2.39.5