diff --git a/uc_userpoints_discount.install b/uc_userpoints_discount.install
index 0597ba8..a4662b3 100644
--- a/uc_userpoints_discount.install
+++ b/uc_userpoints_discount.install
@@ -64,4 +64,6 @@ function uc_userpoints_discount_uninstall() {
variable_del('userpoints_discount_category');
variable_del('uc_userpoints_discount_moderate');
variable_del('uc_userpoints_discount_classes');
+ variable_del('uc_userpoints_discount_mode');
+ variable_del('uc_userpoints_discount_rate');
}
diff --git a/uc_userpoints_discount.module b/uc_userpoints_discount.module
index c3fe93f..b8c44e5 100644
--- a/uc_userpoints_discount.module
+++ b/uc_userpoints_discount.module
@@ -1,13 +1,14 @@
'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Ubercart Discount Options'),
- );
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Ubercart Discount Options'),
+ );
+ $form[$group][UC_USERPOINTS_DISCOUNT_MODE] = array(
+ '#type' => 'radios',
+ '#title' => t('Choose discount mode', userpoints_translation()),
+ '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_MODE, 1),
+ '#options' => array(t('Point Based'), t('Currency Based (default)')),
+ );
$form[$group][USERPOINTS_UC_DISC] = array(
- '#type' => 'textfield',
- '#title' => t('!Points used in discount (for every @currency)', array('!Points' => $userpoints_translation['!Points'], '@currency' => variable_get('uc_currency_code', 'USD'))),
- '#default_value' => variable_get(USERPOINTS_UC_DISC, 1),
- '#size' => 5,
- '#maxlength' => 5,
- );
+ '#type' => 'textfield',
+ '#title' => t('!Points used in discount (for every @currency) in Currency Based discount mode', array('!Points' => $userpoints_translation['!Points'], '@currency' => variable_get('uc_currency_code', 'USD'))),
+ '#default_value' => variable_get(USERPOINTS_UC_DISC, 1),
+ '#size' => 5,
+ '#maxlength' => 5,
+ );
+ $form[$group][UC_USERPOINTS_DISCOUNT_RATE] = array(
+ '#type' => 'textfield',
+ '#title' => t('Per point for how many @currency in Point Based discount mode', array('@currency' => variable_get('uc_currency_code', 'USD'))),
+ '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_RATE, 20),
+ '#size' => 5,
+ '#maxlength' => 5,
+ );
$form[$group][UC_USERPOINTS_DISCOUNT_MAXP] = array(
- '#type' => 'textfield',
- '#title' => t('Enter the maximum percentage of the order total that can be discounted using points. Please do not include a % sign'),
- '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_MAXP, 100),
- '#size' => 5,
- '#maxlength' => 5,
- );
+ '#type' => 'textfield',
+ '#title' => t('Enter the maximum percentage of the order total that can be discounted using points. Please do not include a % sign'),
+ '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_MAXP, 100),
+ '#size' => 5,
+ '#maxlength' => 5,
+ );
$form[$group][USERPOINTS_DISCOUNT] = array(
- '#type' => 'radios',
- '#title' => t('Enable !points as a discount method', userpoints_translation()),
- '#default_value' => variable_get(USERPOINTS_DISCOUNT,1),
- '#options' => array(t('No'), t('Yes')),
- );
- $form[$group][USERPOINTS_DISCOUNT_CATEGORY] = array(
- '#type' => 'select',
- '#title' => t('Discount Category'),
- '#description' => t('Category to assign awarded !points.', userpoints_translation()),
- '#default_value' => variable_get(USERPOINTS_DISCOUNT_CATEGORY, NULL),
- '#options' => userpoints_get_categories(),
- );
+ '#type' => 'radios',
+ '#title' => t('Enable !points as a discount method', userpoints_translation()),
+ '#default_value' => variable_get(USERPOINTS_DISCOUNT, 1),
+ '#options' => array(t('No'), t('Yes')),
+ );
+ $form[$group][USERPOINTS_DISCOUNT_CATEGORY] = array(
+ '#type' => 'select',
+ '#title' => t('Discount Category'),
+ '#description' => t('Category to assign awarded !points.', userpoints_translation()),
+ '#default_value' => variable_get(USERPOINTS_DISCOUNT_CATEGORY, NULL),
+ '#options' => userpoints_get_categories(),
+ );
$form[$group][UC_USERPOINTS_DISCOUNT_MODERATE] = array(
- '#type' => 'radios',
- '#title' => t('Moderate userpoints transaction'),
- '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_MODERATE, 0),
- '#options' => array(t('No'), t('Yes')),
- );
+ '#type' => 'radios',
+ '#title' => t('Moderate userpoints transaction'),
+ '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_MODERATE, 0),
+ '#options' => array(t('No'), t('Yes')),
+ );
$form[$group][UC_USERPOINTS_DISCOUNT_CLASSES] = array(
- '#type' => 'checkboxes',
- '#title' => t('Product classes discounts can be applied to'),
- '#description' => t('Leave blank for all.'),
- '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_CLASSES, array()),
- '#options' => uc_product_type_names(),
- );
+ '#type' => 'checkboxes',
+ '#title' => t('Product classes discounts can be applied to'),
+ '#description' => t('Leave blank for all.'),
+ '#default_value' => variable_get(UC_USERPOINTS_DISCOUNT_CLASSES, array()),
+ '#options' => uc_product_type_names(),
+ );
}
return $form;
break;
@@ -87,18 +105,18 @@ function uc_userpoints_discount_userpoints($op, $points = 0, $uid = 0, $event =
*/
function uc_userpoints_discount_checkout_pane() {
global $user;
- $curUserId = $user->uid;
+ $curUserId = $user->uid;
$curUserPoints = intval(userpoints_get_current_points($uid = $curUserId, $tid = NULL));
- $discMethod = variable_get(USERPOINTS_DISCOUNT,1);
-
- if ($discMethod != 0 && ($curUserPoints > 0 || request_uri() != '/cart/checkout')) {
+ $discMethod = variable_get(USERPOINTS_DISCOUNT, 1);
+
+ if (user_access('access uc_userpoints_discount') && $discMethod != 0 && ($curUserPoints > 0 || request_uri() != '/cart/checkout')) {
$panes[] = array(
- 'id' => 'up_uc_discounts',
- 'title' => t('!Points Discount', userpoints_translation()),
- 'desc' => t('Show !points discounts for the order', userpoints_translation()),
- 'callback' => 'uc_checkout_pane_uc_userpoints_discount',
- 'weight' => 7,
- );
+ 'id' => 'up_uc_discounts',
+ 'title' => t('!Points Discount', userpoints_translation()),
+ 'desc' => t('Show !points discounts for the order', userpoints_translation()),
+ 'callback' => 'uc_checkout_pane_uc_userpoints_discount',
+ 'weight' => 7,
+ );
return $panes;
}
}
@@ -109,32 +127,60 @@ function uc_checkout_pane_uc_userpoints_discount($op, &$arg1, $arg2) {
// get point discounts to apply to this order
global $user;
$curUserId = $user->uid;
+ $discountMode = intval(variable_get(UC_USERPOINTS_DISCOUNT_MODE, 1)); // 1: Currency Based, 0: Point Based
+ $discountRate = intval(variable_get(UC_USERPOINTS_DISCOUNT_RATE, 20));
+ $userpoints_translation = userpoints_translation();
switch ($op) {
case 'view':
- $curUserPoints = intval(userpoints_get_current_points($uid = $curUserId, $tid = NULL));
- $maxdisc = ($curUserPoints / intval(variable_get(USERPOINTS_UC_DISC, 1)));
- $maxpt = variable_get(UC_USERPOINTS_DISCOUNT_MAXP, 100);
- $description = t('Enter the amount to discount this order with !points by. This field will be ignored if paying with !points.', userpoints_translation());
- $description .= theme('uc_userpoints_discount_info_pane', uc_currency_format(uc_userpoints_discount_discountable_total()), uc_currency_format(uc_userpoints_discount_max()), uc_currency_format($maxdisc));
- $contents['ptamt'] = array(
- '#type' => 'textfield',
- '#title' => t('Discount Amount (in @currency)', array('@currency' => variable_get('uc_currency_code', 'USD'))),
- '#description' => t('Enter the amount that you want to spend from your !points as a discount for this order.', userpoints_translation()),
- '#default_value' => $arg1->ptamt,
- );
- return array('description' => $description, 'contents' => $contents);
- break;
+ $curUserPoints = intval(userpoints_get_current_points($uid = $curUserId, $tid = NULL));
+
+ if ($discountMode == 1) { // Currency Based
+ $maxdisc = ($curUserPoints / intval(variable_get(USERPOINTS_UC_DISC, 1)));
+ $description = t('Enter the amount to discount this order with !points by. This field will be ignored if paying with !points.',
+ userpoints_translation());
+ $description .= theme('uc_userpoints_discount_info_pane', uc_currency_format(uc_userpoints_discount_discountable_total()),
+ uc_currency_format(uc_userpoints_discount_max()), uc_currency_format($maxdisc));
+ $contents['ptamt'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Discount Amount (in @currency)', array('@currency' => variable_get('uc_currency_code', 'USD'))),
+ '#description' => t('Enter the amount that you want to spend from your !points as a discount for this order.', userpoints_translation()),
+ '#default_value' => $arg1->ptamt,
+ );
+ }
+ else { // Point Based
+ $maxdisc = $curUserPoints;
+ $description = t('Enter the !points to discount this order. Each !points for @rate @currency. This field will be ignored if paying with !points.',
+ array('!points' => $userpoints_translation['!points'],
+ '@rate' => variable_get(UC_USERPOINTS_DISCOUNT_RATE, 20),
+ '@currency' => variable_get('uc_currency_code', 'USD')));
+ $description .= theme('uc_userpoints_discount_info_pane', uc_currency_format(uc_userpoints_discount_discountable_total()),
+ uc_currency_format(uc_userpoints_discount_max()), $maxdisc);
+ $contents['ptamt'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Discount Amount'),
+ '#description' => t('Enter the amount that you want to spend from your !points as a discount for this order.', userpoints_translation()),
+ '#default_value' => intval($arg1->ptamt / $discountRate),
+ );
+ }
+
+ return array('description' => $description, 'contents' => $contents);
+ break;
case 'process':
- $ptamt = $arg2['ptamt'];
- if (!empty($ptamt) || $ptamt != '') {
- $arg1->ptamt = $ptamt;
- }
- else {
- $arg1->ptamt = 0;
- }
- return TRUE;
- break;
+ $ptamt = $arg2['ptamt'];
+ if ((!empty($ptamt) || $ptamt != '') && is_numeric($ptamt)) {
+ if ($discountMode == 1) {
+ $arg1->ptamt = $ptamt;
+ }
+ else {
+ $arg1->ptamt = intval($ptamt) * $discountRate;
+ }
+ }
+ else {
+ $arg1->ptamt = 0;
+ }
+ return TRUE;
+ break;
}
}
@@ -145,20 +191,20 @@ function uc_checkout_pane_uc_userpoints_discount($op, &$arg1, $arg2) {
*/
function uc_userpoints_discount_line_item() {
$items[] = array(
- 'id' => 'ptdiscount',
- 'title' => t('Userpoints Discount'),
- 'callback' => 'uc_userpoints_discount_line_item_calc',
- 'weight' => -2,
- 'stored' => TRUE,
- 'calculated' => TRUE,
- 'display_only' => FALSE,
- );
+ 'id' => 'ptdiscount',
+ 'title' => t('Userpoints Discount'),
+ 'callback' => 'uc_userpoints_discount_line_item_calc',
+ 'weight' => -2,
+ 'stored' => TRUE,
+ 'calculated' => TRUE,
+ 'display_only' => FALSE,
+ );
return $items;
}
function uc_userpoints_discount_line_item_calc($op, $arg1) {
$lines = array();
-
+
#discount value
$ptamt = $arg1->ptamt;
@@ -167,14 +213,14 @@ function uc_userpoints_discount_line_item_calc($op, $arg1) {
case 'display':
$lines[] = array(
- 'id' => 'ptdiscount',
- 'title' => t('Discounts'),
- 'amount' => $ptamt,
- );
+ 'id' => 'ptdiscount',
+ 'title' => t('Discounts'),
+ 'amount' => $ptamt,
+ );
+
return $lines;
break;
-
}
}
@@ -185,123 +231,144 @@ function uc_userpoints_discount_line_item_calc($op, $arg1) {
* This is where all the important stuff happens like taking the points...
*/
function uc_userpoints_discount_order($op, &$arg1, $arg2) {
- $order = $arg1;
+ $order = $arg1;
$paymethod = strtolower($order->payment_method);
+ $discountMode = intval(variable_get(UC_USERPOINTS_DISCOUNT_MODE, 1)); // 1: Currency Based, 0: Point Based
+ $discountRate = intval(variable_get(UC_USERPOINTS_DISCOUNT_RATE, 20));
+
switch ($op) {
case 'save':
- db_query("DELETE FROM {uc_updiscounts} WHERE oid=%d", $arg1->order_id);
- db_query("DELETE FROM {uc_order_line_items} WHERE order_id=%d AND type='ptdiscount'", $arg1->order_id);
- uc_line_items_calculate($arg1->order_id);
- global $user;
- $curUserId = $user->uid;
- $pagepath = str_replace('destination=','',urldecode(drupal_get_destination()));
- $multiplier = (variable_get(USERPOINTS_UC_DISC, 0));
- $maxdisc = variable_get(UC_USERPOINTS_DISCOUNT_MAXP, 100)/100;
-
- #discountable money value of order
- $orderamt = uc_userpoints_discount_discountable_total() + $arg1->quote['rate'];
-
- $curUserPoints = intval(userpoints_get_current_points($uid = $curUserId, $tid = NULL));
- $maxdisc = ($curUserPoints / intval(variable_get(USERPOINTS_UC_DISC, 1)));
-
- #discount value
- $ptamt = $arg1->ptamt;
- #discount value in points
- $points = -(($ptamt) * $multiplier);
- $ptdisc = (($ptamt) * $multiplier);
-
- #max discount on order total
- $ptmaxd = uc_userpoints_discount_max();
- $ptmaxdPoints = $ptmaxd * $multiplier;
-
- if (variable_get(USERPOINTS_DISCOUNT,1) != 0 && $paymethod != 'points') {
- if ((!empty($ptamt) || $ptamt != '') && $ptamt < $orderamt && $ptdisc <= min($curUserPoints, $ptmaxdPoints)) {
- db_query("DELETE FROM {uc_order_line_items} WHERE order_id=%d AND type='ptdiscount'", $arg1->order_id);
- db_query('INSERT INTO {uc_updiscounts} (uid, oid, ptamt, points) VALUES (%d, %d, \'%f\', %d)', $curUserId, $arg1->order_id, $ptamt, $points);
- uc_order_line_item_add($arg1->order_id, 'ptdiscount', t('Discount order using !points',userpoints_translation()), -$ptamt, 1);
- }
- elseif ($ptdisc <= $orderamt && (!empty($ptamt) || $ptamt != '')) {
- #this should be to check it greater than order total
- drupal_set_message('You cannot discount an order for more than the order total.', 'error');
- drupal_goto($pagepath);
- }
- elseif ($ptdisc > min($curUserPoints, $ptmaxdPoints) && (!empty($ptamt) || $ptamt != '')) {
- #this should be to check if discount greater than max
- drupal_set_message(t('The maximum you can discount this order by using points is %maxamount.', array('%maxamount' => uc_currency_format(min($ptmaxd, $maxdisc)))), 'error');
- drupal_goto($pagepath);
- }
- }
- elseif ($paymethod == 'points' && (!empty($ptamt) || $ptamt != '')) {
- drupal_set_message(t('You cannot use !points to pay for a product and use !points as a discount method.', userpoints_translation()), 'error');
- drupal_goto($pagepath);
- }
- break;
- case 'submit':
- // fires when the order is submitted and adds/subtracts thier points
- if ($paymethod != 'points') {
- if (variable_get(USERPOINTS_DISCOUNT,1) != 0) {
- global $user;
- $curUserId = $user->uid;
- $ptamt = $arg1->ptamt;
- $multiplier = intval(variable_get(USERPOINTS_UC_DISC, 0));
-
- // Payment completed
- if ($curUserId != 0) {
- // User id from the transaction
- $points = intval(($ptamt) * $multiplier);
- $points = -$points;
- $params = array (
- 'tid' => variable_get(USERPOINTS_DISCOUNT_CATEGORY, 0),
- 'uid' => $curUserId,
- 'points' => $points,
- 'operation' => 'delete',
- 'description' => 'User Discount, taking poings (Ubercart Order ID ' . $order->order_id . ')',
- 'entity_id' => $order->order_id,
- 'entity_type' => 'Ubercart Transaction',
- 'moderate' => variable_get(UC_USERPOINTS_DISCOUNT_MODERATE, 0),
- );
- userpoints_userpointsapi($params);
- db_query('INSERT INTO {uc_updiscounts} (uid, oid, ptamt, points) VALUES (%d, %d, \'%f\', %d)', $curUserId, $arg1->order_id, $ptamt, $points);
- }
-
- }
- }
- break;
- case 'load':
- $arg1->ptamt = '';
- $result = db_query("SELECT * FROM {uc_updiscounts} WHERE oid = %d", $arg1->order_id);
- if ($data = db_fetch_object($result)) {
- $arg1->ptamt = $data->ptamt;
- }
- break;
- case 'delete':
- if (variable_get(USERPOINTS_DISCOUNT,1) != 0 && $paymethod != 'points') {
- global $user;
- $curUserId = $user->uid;
- $oid = $order->order_id;
- $result = db_query("select updlog_id, points from {uc_updiscounts} where oid = %d and uid = %d and referrer = 0 and discount =1", $oid, $curUserId);
-
- if ($result != FALSE && $pointinfo = db_fetch_object($result) != FALSE) {
- $points = intval(($pointinfo->points) * (-1));
- $description = 'User Discount (Ubercart Order ' . $oid . ') that has been deleted.';
-
- $params = array (
- 'tid' => variable_get(USERPOINTS_DISCOUNT_CATEGORY, 0),
- 'uid' => $curUserId,
- 'points' => $points,
- 'operation' => 'delete',
- 'description' => $description,
- 'entity_id' => $oid,
- 'entity_type' => 'Ubercart Transaction',
- 'moderate' => variable_get(UC_USERPOINTS_DISCOUNT_MODERATE, 0),
- );
-
- userpoints_userpointsapi($params);
- db_query("delete from {uc_updiscounts} where uplog_id = %d", $pointinfo->uplog_id);
- db_query("DELETE FROM {uc_order_line_items} WHERE order_id=%d AND type='ptdiscount'", $arg1->order_id);
- }
- }
- break;
+ db_query("DELETE FROM {uc_updiscounts} WHERE oid=%d", $arg1->order_id);
+ db_query("DELETE FROM {uc_order_line_items} WHERE order_id=%d AND type='ptdiscount'", $arg1->order_id);
+ uc_line_items_calculate($arg1->order_id);
+ global $user;
+ $curUserId = $user->uid;
+ $pagepath = str_replace('destination=', '', urldecode(drupal_get_destination()));
+ $multiplier = (variable_get(USERPOINTS_UC_DISC, 0)); // Used in Currency Mode
+
+ //discountable money value of order
+ $orderamt = uc_userpoints_discount_discountable_total() + $arg1->quote['rate'];
+
+ $curUserPoints = intval(userpoints_get_current_points($uid = $curUserId, $tid = NULL));
+ //discount value in currency
+ $ptamt = $arg1->ptamt;
+
+ if ($discountMode == 1) {
+ //max discount amount (in currency) of the current user
+ $maxdisc = ($curUserPoints / intval(variable_get(USERPOINTS_UC_DISC, 1)));
+ //discount value in points
+ $points = -(($ptamt) * $multiplier);
+ $ptdisc = abs($points);
+ //max discount on order total
+ $ptmaxd = uc_userpoints_discount_max(); //actually discountable amount
+ $ptmaxdPoints = $ptmaxd * $multiplier; //max possible points be consumed
+ }
+ else {
+ $maxdisc = ($curUserPoints * $discountRate);
+ $points = -(($ptamt) / $discountRate);
+ $ptdisc = abs($points);
+ $ptmaxd = uc_userpoints_discount_max();
+ $ptmaxdPoints = intval($ptmaxd / $discountRate);
+ }
+
+ if (variable_get(USERPOINTS_DISCOUNT, 1) != 0 && $paymethod != 'points') {
+ if ((!empty($ptamt) || $ptamt != '') && $ptamt < $orderamt && $ptdisc <= min($curUserPoints, $ptmaxdPoints)) {
+ // everything is right, do things we have to do
+ db_query("DELETE FROM {uc_order_line_items} WHERE order_id=%d AND type='ptdiscount'", $arg1->order_id);
+ db_query('INSERT INTO {uc_updiscounts} (uid, oid, ptamt, points) VALUES (%d, %d, \'%f\', %d)', $curUserId, $arg1->order_id, $ptamt, $points);
+ uc_order_line_item_add($arg1->order_id, 'ptdiscount', t('Discount order using !points', userpoints_translation()), -$ptamt, 1);
+ }
+ elseif ($ptdisc <= $orderamt && (!empty($ptamt) || $ptamt != '')) {
+ //this should be to check it greater than order total
+ drupal_set_message('You cannot discount an order for more than the order total.', 'error');
+ drupal_goto($pagepath);
+ }
+ elseif ($ptdisc > min($curUserPoints, $ptmaxdPoints) && (!empty($ptamt) || $ptamt != '')) {
+ //this should be to check if discount greater than max
+ drupal_set_message(t('The maximum you can discount this order by using points is %maxamount.', array('%maxamount' => uc_currency_format(min($ptmaxd, $maxdisc)))), 'error');
+ drupal_goto($pagepath);
+ }
+ }
+ elseif ($paymethod == 'points' && (!empty($ptamt) || $ptamt != '')) {
+ drupal_set_message(t('You cannot use !points to pay for a product and use !points as a discount method.', userpoints_translation()), 'error');
+ drupal_goto($pagepath);
+ }
+ break;
+ case 'submit':
+ // fires when the order is submitted and adds/subtracts their points
+ if ($paymethod != 'points') {
+ if (variable_get(USERPOINTS_DISCOUNT, 1) != 0) {
+ global $user;
+ $curUserId = $user->uid;
+ $ptamt = $arg1->ptamt;
+ $multiplier = intval(variable_get(USERPOINTS_UC_DISC, 0));
+
+ // Payment completed
+ if ($curUserId != 0) {
+ // User id from the transaction
+ if ($discountMode == 1) {
+ $points = intval(($ptamt) * $multiplier);
+ $points = -$points;
+ }
+ else {
+ $points = intval(($ptamt) / $discountRate);
+ $points = -$points;
+ }
+
+ $params = array(
+ 'tid' => variable_get(USERPOINTS_DISCOUNT_CATEGORY, 0),
+ 'uid' => $curUserId,
+ 'points' => $points,
+ 'operation' => 'delete',
+ 'description' => 'User Discount, taking poings (Ubercart Order ID ' . $order->order_id . ')',
+ 'entity_id' => $order->order_id,
+ 'entity_type' => 'Ubercart Transaction',
+ 'moderate' => variable_get(UC_USERPOINTS_DISCOUNT_MODERATE, 0),
+ );
+
+ userpoints_userpointsapi($params);
+ db_query('INSERT INTO {uc_updiscounts} (uid, oid, ptamt, points) VALUES (%d, %d, \'%f\', %d)', $curUserId, $arg1->order_id, $ptamt, $points);
+ }
+ }
+ }
+ break;
+
+ case 'load':
+ $arg1->ptamt = '';
+ $result = db_query("SELECT * FROM {uc_updiscounts} WHERE oid = %d", $arg1->order_id);
+ if ($data = db_fetch_object($result)) {
+ $arg1->ptamt = $data->ptamt;
+ }
+ break;
+
+ case 'delete':
+ if (variable_get(USERPOINTS_DISCOUNT, 1) != 0 && $paymethod != 'points') {
+ global $user;
+ $curUserId = $user->uid;
+ $oid = $order->order_id;
+ $result = db_query("select updlog_id, points from {uc_updiscounts} where oid = %d and uid = %d and referrer = 0 and discount =1", $oid, $curUserId);
+
+ if ($result != FALSE && $pointinfo = db_fetch_object($result) != FALSE) {
+ $points = intval(($pointinfo->points) * (-1));
+ $description = 'User Discount (Ubercart Order ' . $oid . ') that has been deleted.';
+
+ $params = array(
+ 'tid' => variable_get(USERPOINTS_DISCOUNT_CATEGORY, 0),
+ 'uid' => $curUserId,
+ 'points' => $points,
+ 'operation' => 'delete',
+ 'description' => $description,
+ 'entity_id' => $oid,
+ 'entity_type' => 'Ubercart Transaction',
+ 'moderate' => variable_get(UC_USERPOINTS_DISCOUNT_MODERATE, 0),
+ );
+
+ userpoints_userpointsapi($params);
+ db_query("delete from {uc_updiscounts} where uplog_id = %d", $pointinfo->uplog_id);
+ db_query("DELETE FROM {uc_order_line_items} WHERE order_id=%d AND type='ptdiscount'", $arg1->order_id);
+ }
+ }
+ break;
}
}
@@ -316,7 +383,7 @@ function uc_userpoints_discount_order($op, &$arg1, $arg2) {
function uc_userpoints_discount_checkboxes_status($array) {
$status = FALSE;
if (!empty($array)) {
- foreach($array as $row) {
+ foreach ($array as $row) {
if (!empty($row)) {
$status = TRUE;
}
@@ -353,7 +420,7 @@ function uc_userpoints_discount_discountable_products() {
$cart_contents = uc_cart_get_contents();
$discountable_classes = variable_get(UC_USERPOINTS_DISCOUNT_CLASSES, NULL);
$discountable_products = array();
- foreach($cart_contents as $cart_item) {
+ foreach ($cart_contents as $cart_item) {
$node = node_load($cart_item->nid);
if (uc_userpoints_discount_checkboxes_status($discountable_classes) === TRUE) {
if ($discountable_classes[$node->type] === $node->type) {
@@ -363,17 +430,17 @@ function uc_userpoints_discount_discountable_products() {
'class' => $node->type,
'price' => $cart_item->price,
'qty' => $cart_item->qty,
- );
+ );
}
}
else {
$discountable_products[] = array(
- 'nid' => $cart_item->nid,
- 'name' => $node->title,
- 'class' => $node->type,
- 'price' => $cart_item->price,
- 'qty' => $cart_item->qty,
- );
+ 'nid' => $cart_item->nid,
+ 'name' => $node->title,
+ 'class' => $node->type,
+ 'price' => $cart_item->price,
+ 'qty' => $cart_item->qty,
+ );
}
}
return $discountable_products;
@@ -388,7 +455,7 @@ function uc_userpoints_discount_discountable_products() {
function uc_userpoints_discount_discountable_total() {
$discountable_products = uc_userpoints_discount_discountable_products();
$discountable_total = 0;
- foreach($discountable_products as $discountable_product) {
+ foreach ($discountable_products as $discountable_product) {
$discountable_total += intval($discountable_product['price']) * intval($discountable_product['qty']);
}
return $discountable_total;
@@ -412,14 +479,14 @@ function uc_userpoints_discount_max() {
*/
function uc_userpoints_discount_theme() {
return array(
- 'uc_userpoints_discount_info_pane' => array(
- 'arguments' => array(
- 'discountable_total' => NULL,
- 'discount_max' => NULL,
- 'discount_points_available' => NULL,
- ),
- ),
- );
+ 'uc_userpoints_discount_info_pane' => array(
+ 'arguments' => array(
+ 'discountable_total' => NULL,
+ 'discount_max' => NULL,
+ 'discount_points_available' => NULL,
+ ),
+ ),
+ );
}
@@ -433,32 +500,32 @@ function uc_userpoints_discount_theme() {
*/
function theme_uc_userpoints_discount_info_pane($discountable_total = 0, $discount_max = 0, $discount_points_available = 0) {
$content = '
-
- '
- . t('Discountable total from this order') .
- ':
- '
- . $discountable_total .
- '
-
-
- '
- . t('Maximum you can discount the order by') .
- ':
- '
- . $discount_max .
- '
-
-
- '
- . t('Your !points available to use', userpoints_translation()) .
- ':
- '
- . $discount_points_available .
- '
-
-
+ '
+ . t('Discountable total from this order') .
+ ':
+ '
+ . $discountable_total .
+ '
+
+
+ '
+ . t('Maximum you can discount the order by') .
+ ':
+ '
+ . $discount_max .
+ '
+
+
+ '
+ . t('Your !points available to use', userpoints_translation()) .
+ ':
+ '
+ . $discount_points_available .
+ '
+
+ ';
+
return $content;
}