# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: lyle@ubercart.org-20100622180523-2fgr73y96k8t7pf3
# target_branch: bzr://bazaar.ubercart.org/drupal7-uc3/ubercart
# testament_sha1: ed024e94b489be21ddd21f615c7eda017eed99d6
# timestamp: 2010-06-23 15:35:51 -0400
# base_revision_id: lyle@ubercart.org-20100621191724-nl79yu6bspkxm132
#
# Begin patch
=== modified file 'payment/uc_payment/uc_payment.info'
--- payment/uc_payment/uc_payment.info 2010-04-05 19:25:15 +0000
+++ payment/uc_payment/uc_payment.info 2010-06-21 19:34:42 +0000
@@ -1,7 +1,6 @@
; $Id$
name = Payment
description = Defines an API to let payment modules interact with the cart.
-dependencies[] = ca
dependencies[] = uc_order
dependencies[] = uc_store
package = "Ubercart - core (optional)"
=== modified file 'payment/uc_payment/uc_payment.module'
--- payment/uc_payment/uc_payment.module 2010-06-11 19:09:52 +0000
+++ payment/uc_payment/uc_payment.module 2010-06-14 15:27:41 +0000
@@ -15,7 +15,6 @@
require_once('uc_payment_checkout_pane.inc');
require_once('uc_payment_order_pane.inc');
-require_once('uc_payment.ca.inc');
/*******************************************************************************
* Hook Functions (Drupal)
@@ -579,7 +578,7 @@
$account = user_load($uid);
module_invoke_all('uc_payment_entered', $order, $method, $amount, $account, $data, $comment);
- ca_pull_trigger('uc_payment_entered', $order, $account);
+ rules_invoke_event('uc_payment_entered', $order, $account);
}
/**
=== renamed file 'payment/uc_payment/uc_payment.ca.inc' => 'payment/uc_payment/uc_payment.rules.inc'
--- payment/uc_payment/uc_payment.ca.inc 2010-06-03 14:49:55 +0000
+++ payment/uc_payment/uc_payment.rules.inc 2010-06-17 19:25:47 +0000
@@ -3,173 +3,64 @@
/**
* @file
- * This file contains the Conditional Actions hooks and functions necessary to make the
- * order related entity, conditions, events, and actions work.
- */
-
-
-/******************************************************************************
- * Conditional Actions Hooks *
- ******************************************************************************/
-
-/**
- * Implement hook_ca_predicate().
- */
-function uc_payment_ca_predicate() {
- $predicates = array();
-
- // Set the order status to "Payment Received" when a payment is received
- // and the balance is less than or equal to 0.
- $predicates['uc_payment_received'] = array(
- '#title' => t('Update order status on full payment'),
- '#description' => t('Only happens when a payment is entered and the balance is <= $0.00.'),
- '#class' => 'payment',
- '#trigger' => 'uc_payment_entered',
- '#status' => 1,
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_payment_condition_order_balance',
- '#title' => t('If the balance is less than or equal to $0.00.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => FALSE,
- 'balance_comparison' => 'less_equal',
- ),
- ),
- array(
- '#name' => 'uc_order_status_condition',
- '#title' => t('If the order status is not already Payment Received.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => TRUE,
- 'order_status' => 'payment_received',
- ),
- ),
- ),
- ),
- '#actions' => array(
- array(
- '#name' => 'uc_order_update_status',
- '#title' => t('Update the order status to Payment Received.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'order_status' => 'payment_received',
- ),
- ),
- ),
- );
-
- // Set the order status to "Completed" when checkout is complete, none
- // of the products are shippable, and the balance is less than or equal to 0.
- $predicates['uc_checkout_complete_paid'] = array(
- '#title' => t('Update order status upon checkout completion with full payment'),
- '#trigger' => 'uc_checkout_complete',
- '#class' => 'payment',
- '#status' => 1,
- '#weight' => 1,
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_payment_condition_order_balance',
- '#title' => t('If the balance is less than or equal to $0.00.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => FALSE,
- 'balance_comparison' => 'less_equal',
- ),
- ),
- array(
- '#name' => 'uc_order_condition_is_shippable',
- '#title' => t('If the order is not shippable.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => TRUE,
- ),
- ),
- ),
- ),
- '#actions' => array(
- array(
- '#name' => 'uc_order_update_status',
- '#title' => t('Update the order status to Completed.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'order_status' => 'completed',
- ),
- )
- ),
- );
-
- return $predicates;
-}
-
-/**
- * Implement hook_ca_trigger().
- */
-function uc_payment_ca_trigger() {
- $triggers['uc_payment_entered'] = array(
- '#title' => t('A payment gets entered for an order'),
- '#category' => t('Payment'),
- '#arguments' => array(
+ * Rules definitions.
+ */
+
+/**
+ * Implement hook_rules_event_info().
+ */
+function uc_payment_rules_event_info() {
+ $events['uc_payment_entered'] = array(
+ 'label' => t('A payment gets entered for an order'),
+ 'group' => t('Payment'),
+ 'variables' => array(
'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
),
'account' => array(
- '#entity' => 'user',
- '#title' => t('User'),
+ 'type' => 'user',
+ 'label' => t('User'),
),
),
);
- return $triggers;
+ return $events;
}
/**
- * Implement hook_ca_condition().
+ * Implement hook_rules_condition_info().
*/
-function uc_payment_ca_condition() {
+function uc_payment_rules_condition_info() {
$conditions['uc_payment_condition_order_balance'] = array(
- '#title' => t('Check the order balance'),
- '#category' => t('Payment'),
- '#callback' => 'uc_payment_condition_order_balance',
- '#arguments' => array('order' => array('#entity' => 'uc_order')),
- );
- $conditions['uc_order_condition_payment_method'] = array(
- '#title' => t('Check the payment method'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_condition_payment_method',
- '#arguments' => array('order' => array('#entity' => 'uc_order')),
+ 'label' => t('Check the order balance'),
+ 'group' => t('Payment'),
+ 'base' => 'uc_payment_condition_order_balance',
+ 'parameter' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ 'restriction' => 'selector',
+ ),
+ 'balance_comparison' => array(
+ 'type' => 'text',
+ 'label' => t('Operator'),
+ 'options list' => 'uc_payment_condition_balance_options',
+ 'restriction' => 'input',
+ ),
+ ),
);
return $conditions;
}
-
-/******************************************************************************
- * Condition Callbacks and Forms *
- ******************************************************************************/
-
-// Check the current order balance.
-function uc_payment_condition_order_balance($order, $settings) {
+/**
+ * Condition: Check the current order balance.
+ */
+function uc_payment_condition_order_balance($order, $balance_comparison) {
$balance = uc_payment_balance($order);
- switch ($settings['balance_comparison']) {
+ switch ($balance_comparison) {
case 'less':
return $balance < 0;
case 'less_equal':
@@ -181,7 +72,7 @@
}
}
-function uc_payment_condition_order_balance_form($form_state, $settings = array()) {
+function uc_payment_condition_balance_options() {
$context = array(
'revision' => 'formatted',
'type' => 'amount',
@@ -194,32 +85,6 @@
'greater' => t('Balance is greater than !zero.', $zero),
);
- $form['balance_comparison'] = array(
- '#type' => 'radios',
- '#title' => t('Balance comparison type'),
- '#options' => $options,
- '#default_value' => isset($settings['balance_comparison']) ? $settings['balance_comparison'] : 'equal',
- );
-
- return $form;
-}
-
-// Check the order payment method.
-function uc_order_condition_payment_method($order, $settings) {
- return $order->payment_method == $settings['payment_method'];
-}
-
-function uc_order_condition_payment_method_form($form_state, $settings = array()) {
- foreach (_uc_payment_method_list() as $method) {
- $options[$method['id']] = $method['title'];
- }
-
- $form['payment_method'] = array(
- '#type' => 'radios',
- '#title' => t('Payment method'),
- '#options' => $options,
- '#default_value' => $settings['payment_method'],
- );
-
- return $form;
-}
+ return $options;
+}
+
=== added file 'payment/uc_payment/uc_payment.rules_defaults.inc'
--- payment/uc_payment/uc_payment.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ payment/uc_payment/uc_payment.rules_defaults.inc 2010-06-21 18:52:52 +0000
@@ -0,0 +1,59 @@
+label = t('Update order status on full payment');
+ $rule->active = TRUE;
+ $rule->event('uc_payment_entered')
+ ->condition(rules_and()
+ ->condition('uc_payment_condition_order_balance', array(
+ 'order:select' => 'order',
+ 'balance_comparison' => 'less_equal',
+ ))
+ ->condition(rules_condition('data_is', array(
+ 'data:select' => 'order:order_status',
+ 'value' => 'in_checkout',
+ ))
+ ->negate()))
+ ->action('uc_order_update_status', array(
+ 'order:select' => 'order',
+ 'order_status' => 'payment_received',
+ ));
+ $configs['uc_payment_received'] = $rule;
+
+ // Set the order status to "Completed" when checkout is complete, none
+ // of the products are shippable, and the balance is less than or equal to 0.
+ $rule = rules_reaction_rule();
+ $rule->label = t('Update order status upon checkout completion with full payment');
+ $rule->active = TRUE;
+ $rule->event('uc_checkout_complete')
+ ->condition(rules_and()
+ ->condition('uc_payment_condition_order_balance', array(
+ 'order:select' => 'order',
+ 'balance_comparison' => 'less_equal',
+ ))
+ ->condition(rules_condition('uc_order_condition_is_shippable', array(
+ 'order:select' => 'order',
+ ))->negate())
+ )
+ ->action('uc_order_update_status', array(
+ 'order:select' => 'order',
+ 'order_status' => 'payment_received',
+ ));
+ $configs['uc_checkout_complete_paid'] = $rule;
+
+ return $configs;
+}
=== modified file 'shipping/uc_flatrate/uc_flatrate.admin.inc'
--- shipping/uc_flatrate/uc_flatrate.admin.inc 2010-04-05 14:37:18 +0000
+++ shipping/uc_flatrate/uc_flatrate.admin.inc 2010-06-10 19:18:33 +0000
@@ -27,12 +27,11 @@
$row[] = uc_price($method->base_rate, $context);
$row[] = uc_price($method->product_rate, $context);
$row[] = l(t('edit'), 'admin/store/settings/quotes/methods/flatrate/' . $method->mid);
- $row[] = l(t('conditions'), CA_UI_PATH . '/uc_flatrate_get_quote_' . $method->mid . '/edit/conditions');
$rows[] = $row;
}
if (count($rows)) {
- $header = array(t('Title'), t('Label'), t('Base rate'), t('Default product rate'), array('data' => t('Operations'), 'colspan' => 2));
+ $header = array(t('Title'), t('Label'), t('Base rate'), t('Default product rate'), array('data' => t('Operations'), 'colspan' => 1));
$build['methods'] = array(
'#theme' => 'table',
'#header' => $header,
@@ -101,6 +100,11 @@
'#field_suffix' => $sign_flag ? $currency_sign : '',
);
+ $conditions = rules_config_load('get_quote_from_flatrate_' . $mid);
+ if ($conditions) {
+ $conditions->form($form, $form_state);
+ }
+
$form['buttons']['submit'] = array(
'#type' => 'submit',
'#value' => t('Submit'),
@@ -195,7 +199,8 @@
db_delete('uc_flatrate_products')
->condition('mid', $form_state['values']['mid'])
->execute();
- ca_delete_predicate('uc_flatrate_get_quote_' . $form_state['values']['mid']);
+
+ rules_config_delete('get_quote_from_flatrate_' . $form_state['values']['mid']);
$enabled = variable_get('uc_quote_enabled', array());
unset($enabled['flatrate_' . $form_state['values']['mid']]);
=== modified file 'shipping/uc_flatrate/uc_flatrate.module'
--- shipping/uc_flatrate/uc_flatrate.module 2010-04-05 14:37:18 +0000
+++ shipping/uc_flatrate/uc_flatrate.module 2010-06-10 15:53:53 +0000
@@ -167,41 +167,6 @@
******************************************************************************/
/**
- * Implement hook_ca_predicate().
- *
- * Connect the quote action with the quote event.
- */
-function uc_flatrate_ca_predicate() {
- $enabled = variable_get('uc_quote_enabled', array());
- $predicates = array();
-
- $result = db_query("SELECT mid, title FROM {uc_flatrate_methods}");
- foreach ($result as $method) {
- // Ensure default status is set.
- $enabled += array('flatrate_' . $method->mid => TRUE);
-
- $predicates['uc_flatrate_get_quote_' . $method->mid] = array(
- '#title' => t('Shipping quote via @method', array('@method' => $method->title)),
- '#trigger' => 'get_quote_from_flatrate_' . $method->mid,
- '#class' => 'uc_flatrate',
- '#status' => $enabled['flatrate_' . $method->mid],
- '#actions' => array(
- array(
- '#name' => 'uc_quote_action_get_quote',
- '#title' => t('Fetch a flatrate shipping quote.'),
- '#argument_map' => array(
- 'order' => 'order',
- 'method' => 'method',
- ),
- ),
- ),
- );
- }
-
- return $predicates;
-}
-
-/**
* Implement hook_uc_shipping_method().
*/
function uc_flatrate_uc_shipping_method() {
=== modified file 'shipping/uc_quote/uc_quote.info'
--- shipping/uc_quote/uc_quote.info 2010-02-02 15:41:04 +0000
+++ shipping/uc_quote/uc_quote.info 2010-06-10 14:30:33 +0000
@@ -1,11 +1,12 @@
; $Id$
name = Shipping Quotes
description = Retrieve and display quotes for shipping products.
+dependencies[] = rules
dependencies[] = uc_cart
-dependencies[] = ca
package = "Ubercart - core (optional)"
core = 7.x
files[] = uc_quote.module
files[] = uc_quote.install
files[] = uc_quote.admin.inc
files[] = uc_quote.pages.inc
+files[] = uc_quote.rules_defaults.inc
=== modified file 'shipping/uc_quote/uc_quote.module'
--- shipping/uc_quote/uc_quote.module 2010-06-21 19:17:24 +0000
+++ shipping/uc_quote/uc_quote.module 2010-06-21 19:38:44 +0000
@@ -320,30 +320,6 @@
******************************************************************************/
/**
- * Implement hook_ca_trigger().
- *
- * Register an event for each shipping method. Enabled methods have active
- * configurations.
- */
-function uc_quote_ca_trigger() {
- $methods = module_invoke_all('uc_shipping_method');
- $triggers = array();
- foreach ($methods as $id => $method) {
- $triggers['get_quote_from_' . $id] = array(
- '#title' => t('Getting shipping quote via !method', array('!method' => $method['title'])),
- '#category' => t('Quote'),
- '#hidden' => TRUE,
- '#arguments' => array(
- 'order' => array('#entity' => 'uc_order', '#title' => t('Order')),
- 'method' => array('#entity' => 'quote_method', '#title' => t('Quote method')),
- 'account' => array('#entity' => 'user', '#title' => t('User account')),
- ),
- );
- }
- return $triggers;
-}
-
-/**
* Implement hook_ca_condition().
*/
function uc_quote_ca_condition() {
@@ -457,70 +433,6 @@
return $form;
}
-/**
- * Implement hook_ca_action().
- */
-function uc_quote_ca_action() {
- return array(
- 'uc_quote_action_get_quote' => array(
- '#title' => t('Fetch a shipping quote'),
- '#category' => t('Quote'),
- '#arguments' => array(
- 'order' => array('#entity' => 'uc_order', '#title' => t('Order')),
- 'method' => array('#entity' => 'quote_method', '#title' => t('Quote method')),
- ),
- ),
- );
-}
-
-/**
- * Retrieve shipping quote.
- *
- * @param $order
- * The order the quote is for.
- * @param $method
- * The shipping method to generate the quote.
- * @return
- * Array of shipping quotes.
- */
-function uc_quote_action_get_quote($order, $method) {
- $details = array();
- foreach ($order as $key => $value) {
- if (substr($key, 0, 9) == 'delivery_') {
- $field = substr($key, 9);
- $details[$field] = $value;
- }
- }
- ob_start();
- // Load include file containing quote callback, if there is one
- if (isset($method['quote']['file'])) {
- $inc_file = drupal_get_path('module', $method['module']) . '/' . $method['quote']['file'];
- if (is_file($inc_file)) {
- require_once $inc_file;
- }
- }
-
- if (function_exists($method['quote']['callback'])) {
- // This feels wrong, but it's the only way I can ensure that shipping
- // methods won't mess up the products in their methods.
- $products = array();
- foreach ($order->products as $key => $item) {
- if (uc_cart_product_is_shippable($item)) {
- $products[$key] = clone $item;
- }
- }
- $quote_data = call_user_func($method['quote']['callback'], $products, $details, $method);
- }
- $messages = ob_get_contents();
- ob_end_clean();
-
- if ($messages && variable_get('uc_quote_log_errors', FALSE)) {
- watchdog('quote', '!messages', array('!messages' => $messages), WATCHDOG_WARNING);
- watchdog('quote', '
@data
', array('@data' => print_r($quote_data, TRUE)), WATCHDOG_WARNING);
- }
- return $quote_data;
-}
-
/******************************************************************************
* Ubercart Hooks *
******************************************************************************/
=== modified file 'shipping/uc_quote/uc_quote.pages.inc'
--- shipping/uc_quote/uc_quote.pages.inc 2010-06-03 20:06:32 +0000
+++ shipping/uc_quote/uc_quote.pages.inc 2010-06-10 14:30:33 +0000
@@ -52,28 +52,9 @@
);
$quote_data = array();
- $arguments = array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- '#data' => $order,
- ),
- 'method' => array(
- '#entity' => 'quote_method',
- '#title' => t('Quote method'),
- // #data => each $method in the following foreach() loop;
- ),
- 'account' => array(
- '#entity' => 'user',
- '#title' => t('User'),
- '#data' => $account,
- ),
- );
foreach ($methods as $method) {
- $arguments['method']['#data'] = $method;
- $predicates = ca_load_trigger_predicates('get_quote_from_' . $method['id']);
- $predicate = array_shift($predicates);
- if ($predicate && ca_evaluate_conditions($predicate, $arguments)) {
+ $set = rules_config_load('get_quote_from_' . $method['id']);
+ if (!$set || $set->execute($order)) {
$data = uc_quote_action_get_quote($order, $method, $user);
foreach ($data as &$quote) {
@@ -94,3 +75,51 @@
return $quote_data;
}
+/**
+ * Retrieve shipping quote.
+ *
+ * @param $order
+ * The order the quote is for.
+ * @param $method
+ * The shipping method to generate the quote.
+ * @return
+ * Array of shipping quotes.
+ */
+function uc_quote_action_get_quote($order, $method) {
+ $details = array();
+ foreach ($order as $key => $value) {
+ if (substr($key, 0, 9) == 'delivery_') {
+ $field = substr($key, 9);
+ $details[$field] = $value;
+ }
+ }
+ ob_start();
+ // Load include file containing quote callback, if there is one
+ if (isset($method['quote']['file'])) {
+ $inc_file = drupal_get_path('module', $method['module']) . '/' . $method['quote']['file'];
+ if (is_file($inc_file)) {
+ require_once $inc_file;
+ }
+ }
+
+ if (function_exists($method['quote']['callback'])) {
+ // This feels wrong, but it's the only way I can ensure that shipping
+ // methods won't mess up the products in their methods.
+ $products = array();
+ foreach ($order->products as $key => $item) {
+ if (uc_cart_product_is_shippable($item)) {
+ $products[$key] = clone $item;
+ }
+ }
+ $quote_data = call_user_func($method['quote']['callback'], $products, $details, $method);
+ }
+ $messages = ob_get_contents();
+ ob_end_clean();
+
+ if ($messages && variable_get('uc_quote_log_errors', FALSE)) {
+ watchdog('quote', '!messages', array('!messages' => $messages), WATCHDOG_WARNING);
+ watchdog('quote', '@data
', array('@data' => print_r($quote_data, TRUE)), WATCHDOG_WARNING);
+ }
+ return $quote_data;
+}
+
=== added file 'shipping/uc_quote/uc_quote.rules_defaults.inc'
--- shipping/uc_quote/uc_quote.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ shipping/uc_quote/uc_quote.rules_defaults.inc 2010-06-10 19:17:11 +0000
@@ -0,0 +1,22 @@
+ array('type' => 'uc_order', 'label' => 'Order'),
+ ));
+ $set->label = t('@method conditions', array('@method' => $method['title']));
+
+ $configs['get_quote_from_' . $method['id']] = $set;
+ }
+
+ return $configs;
+}
=== modified file 'shipping/uc_ups/uc_ups.admin.inc'
--- shipping/uc_ups/uc_ups.admin.inc 2010-06-03 14:23:08 +0000
+++ shipping/uc_ups/uc_ups.admin.inc 2010-06-10 15:53:53 +0000
@@ -130,9 +130,12 @@
'#description' => t('When enabled, products are insured for their full value.'),
);
- $form['#validate'][] = 'uc_ups_admin_settings_validate';
+ $conditions = rules_config_load('get_quote_from_ups');
+ if ($conditions) {
+ $conditions->form($form, $form_state);
+ }
- return system_settings_form($form);
+ return $form;
}
/**
@@ -159,6 +162,47 @@
}
/**
+ * Submit handler for uc_ups_admin_settings().
+ *
+ * Emulate system_settings_form_submit(), but only on a subset of the form values.
+ *
+ * @see uc_ups_admin_settings()
+ */
+function uc_ups_admin_settings_submit($form, &$form_state) {
+ $fields = array(
+ 'uc_ups_access_license',
+ 'uc_ups_shipper_number',
+ 'uc_ups_user_id',
+ 'uc_ups_password',
+ 'uc_ups_connection_address',
+ 'uc_ups_services',
+ 'uc_ups_pickup_type',
+ 'uc_ups_classification',
+ 'uc_ups_negotiated_rates',
+ 'uc_ups_residential_quotes',
+ 'uc_ups_markup_type',
+ 'uc_ups_markup',
+ 'uc_ups_all_in_one',
+ 'uc_ups_unit_system',
+ 'uc_ups_insurance',
+ );
+
+ foreach ($fields as $key) {
+ $value = $form_state['values'][$key];
+
+ if (is_array($value) && isset($form_state['values']['array_filter'])) {
+ $value = array_keys(array_filter($value));
+ }
+ variable_set($key, $value);
+ }
+
+ drupal_set_message(t('The configuration options have been saved.'));
+
+ cache_clear_all();
+ drupal_theme_rebuild();
+}
+
+/**
* Last chance for user to review shipment.
*
* @ingroup forms
=== modified file 'shipping/uc_ups/uc_ups.module'
--- shipping/uc_ups/uc_ups.module 2010-06-03 14:23:08 +0000
+++ shipping/uc_ups/uc_ups.module 2010-06-10 15:53:53 +0000
@@ -207,40 +207,6 @@
}
/******************************************************************************
- * Conditional Actions Hooks *
- ******************************************************************************/
-
-/**
- * Implement hook_ca_predicate().
- *
- * Connect the UPS quote action and event.
- */
-function uc_ups_ca_predicate() {
- $enabled = variable_get('uc_quote_enabled', array()) + array('ups' => FALSE);
-
- $predicates = array(
- 'uc_ups_get_quote' => array(
- '#title' => t('Shipping quote from UPS'),
- '#trigger' => 'get_quote_from_ups',
- '#class' => 'uc_ups',
- '#status' => $enabled['ups'],
- '#actions' => array(
- array(
- '#name' => 'uc_quote_action_get_quote',
- '#title' => t('Fetch a shipping quote'),
- '#argument_map' => array(
- 'order' => 'order',
- 'method' => 'method',
- ),
- ),
- ),
- ),
- );
-
- return $predicates;
-}
-
-/******************************************************************************
* Ubercart Hooks *
******************************************************************************/
=== modified file 'shipping/uc_usps/uc_usps.admin.inc'
--- shipping/uc_usps/uc_usps.admin.inc 2010-03-16 21:15:17 +0000
+++ shipping/uc_usps/uc_usps.admin.inc 2010-06-10 15:53:53 +0000
@@ -42,6 +42,17 @@
'#description' => t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
);
+ $form['domestic']['env_conditions'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Envelope service conditions'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $conditions = rules_config_load('get_quote_from_usps_env');
+ if ($conditions) {
+ $conditions->form($form['domestic']['env_conditions'], $form_state);
+ }
+
$form['domestic']['uc_usps_services'] = array(
'#type' => 'checkboxes',
'#title' => t('USPS parcel services'),
@@ -50,6 +61,17 @@
'#description' => t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
);
+ $form['domestic']['parcel_conditions'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Parcel service conditions'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $conditions = rules_config_load('get_quote_from_usps');
+ if ($conditions) {
+ $conditions->form($form['domestic']['parcel_conditions'], $form_state);
+ }
+
$form['international'] = array(
'#type' => 'fieldset',
'#title' => t('USPS International'),
@@ -66,6 +88,17 @@
'#description' => t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
);
+ $form['international']['env_conditions'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Envelope service conditions'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $conditions = rules_config_load('get_quote_from_usps_intl_env');
+ if ($conditions) {
+ $conditions->form($form['international']['env_conditions'], $form_state);
+ }
+
$form['international']['uc_usps_intl_services'] = array(
'#type' => 'checkboxes',
'#title' => t('USPS international parcel services'),
@@ -74,6 +107,17 @@
'#description' => t('Select the USPS services that are available to customers. Be sure to include the services that the Postal Service agrees are available to you.'),
);
+ $form['international']['parcel_conditions'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Parcel service conditions'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $conditions = rules_config_load('get_quote_from_usps_intl');
+ if ($conditions) {
+ $conditions->form($form['international']['parcel_conditions'], $form_state);
+ }
+
$form['uc_usps_markup_type'] = array(
'#type' => 'select',
'#title' => t('Markup type'),
@@ -101,7 +145,7 @@
'#description' => t('Indicate whether each product is quoted as shipping separately or all in one package. Orders with one kind of product will still use the package quantity to determine the number of packages needed, however.'),
);
- return system_settings_form($form);
+ return $form;
}
/**
@@ -113,3 +157,34 @@
}
}
+/**
+ * Submit handler for uc_usps_admin_settings form.
+ */
+function uc_usps_admin_settings_submit($form, &$form_state) {
+ $fields = array(
+ 'uc_usps_user_id',
+ 'uc_usps_online_rates',
+ 'uc_usps_env_services',
+ 'uc_usps_services',
+ 'uc_usps_intl_env_services',
+ 'uc_usps_intl_services',
+ 'uc_usps_markup_type',
+ 'uc_usps_markup',
+ 'uc_usps_all_in_once',
+ );
+
+ foreach ($fields as $key) {
+ $value = $form_state['values'][$key];
+
+ if (is_array($value) && isset($form_state['values']['array_filter'])) {
+ $value = array_keys(array_filter($value));
+ }
+ variable_set($key, $value);
+ }
+
+ drupal_set_message(t('The configuration options have been saved.'));
+
+ cache_clear_all();
+ drupal_theme_rebuild();
+}
+
=== modified file 'shipping/uc_usps/uc_usps.info'
--- shipping/uc_usps/uc_usps.info 2010-02-02 15:41:04 +0000
+++ shipping/uc_usps/uc_usps.info 2010-06-10 18:09:44 +0000
@@ -8,3 +8,4 @@
files[] = uc_usps.install
files[] = uc_usps.admin.inc
files[] = uc_usps.countries.inc
+files[] = uc_usps.rules_defaults.inc
=== modified file 'shipping/uc_usps/uc_usps.module'
--- shipping/uc_usps/uc_usps.module 2010-06-03 14:23:08 +0000
+++ shipping/uc_usps/uc_usps.module 2010-06-10 15:53:53 +0000
@@ -157,136 +157,6 @@
}
/******************************************************************************
- * Conditional Actions Hooks *
- ******************************************************************************/
-
-/**
- * Implement hook_ca_predicate().
- *
- * Connect USPS quote action and event.
- */
-function uc_usps_ca_predicate() {
- $enabled = variable_get('uc_quote_enabled', array()) + array(
- 'usps' => FALSE,
- 'usps_env' => FALSE,
- 'usps_intl' => FALSE,
- 'usps_intl_env' => FALSE,
- );
- $quote_action = array(
- '#name' => 'uc_quote_action_get_quote',
- '#title' => t('Fetch a shipping quote'),
- '#argument_map' => array(
- 'order' => 'order',
- 'method' => 'method',
- ),
- );
- // Domestic areas include U.S., American Samoa, Guam, Puerto Rico, and the Virgin Islands
- $countries = array(16, 316, 630, 840, 850);
- $predicates = array(
- 'uc_usps_get_quote' => array(
- '#title' => t('Shipping quote from USPS'),
- '#trigger' => 'get_quote_from_usps',
- '#class' => 'uc_usps',
- '#status' => $enabled['usps'],
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_order_condition_delivery_country',
- '#title' => t('Is in domestic US areas (US, AS, GU, PR, VI)'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'countries' => $countries,
- ),
- ),
- ),
- ),
- '#actions' => array(
- $quote_action,
- ),
- ),
- 'uc_usps_get_env_quote' => array(
- '#title' => t('Shipping quote from USPS'),
- '#trigger' => 'get_quote_from_usps_env',
- '#class' => 'uc_usps',
- '#status' => $enabled['usps_env'],
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_order_condition_delivery_country',
- '#title' => t('Is in domestic US areas (US, AS, GU, PR, VI)'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'countries' => $countries,
- ),
- ),
- ),
- ),
- '#actions' => array(
- $quote_action,
- ),
- ),
- 'uc_usps_get_intl_quote' => array(
- '#title' => t('Shipping quote from USPS Intl.'),
- '#trigger' => 'get_quote_from_usps_intl',
- '#class' => 'uc_usps',
- '#status' => $enabled['usps_intl'],
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_order_condition_delivery_country',
- '#title' => t('Is not in domestic US areas (US, AS, GU, PR, VI)'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => TRUE,
- 'countries' => $countries,
- ),
- ),
- ),
- ),
- '#actions' => array(
- $quote_action,
- ),
- ),
- 'uc_usps_get_intl_env_quote' => array(
- '#title' => t('Shipping quote from USPS Intl.'),
- '#trigger' => 'get_quote_from_usps_intl_env',
- '#class' => 'uc_usps',
- '#status' => $enabled['usps_intl_env'],
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_order_condition_delivery_country',
- '#title' => t('Is not in domestic US areas (US, AS, GU, PR, VI)'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => TRUE,
- 'countries' => $countries,
- ),
- ),
- ),
- ),
- '#actions' => array(
- $quote_action,
- ),
- ),
- );
-
- return $predicates;
-}
-
-/******************************************************************************
* Ubercart Hooks *
******************************************************************************/
=== added file 'shipping/uc_usps/uc_usps.rules_defaults.inc'
--- shipping/uc_usps/uc_usps.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ shipping/uc_usps/uc_usps.rules_defaults.inc 2010-06-10 15:53:53 +0000
@@ -0,0 +1,42 @@
+ t('American Samoa'),
+ 316 => t('Guam'),
+ 630 => t('Puerto Rico'),
+ 840 => t('United States'),
+ 850 => t('Virgin Islands (US)'),
+ );
+
+ $domestic = rules_or();
+ $domestic->label = t('Order delivers to one of');
+ $domestic_env = clone $domestic;
+
+ $foreign = rules_or();
+ $foreign->negate();
+ $foreign->label = t('NOT Order delivers to one of');
+ $foreign_env = clone $foreign;
+
+ foreach ($countries as $country => $name) {
+ $condition = rules_condition('data_is', array('data:select' => 'order:delivery-address:country', 'value' => $country));
+ $condition->label = $name;
+
+ $domestic->condition(clone $condition);
+ $domestic_env->condition(clone $condition);
+ $foreign->condition(clone $condition);
+ $foreign_env->condition($condition);
+ }
+
+
+ $configs['get_quote_from_usps']->condition($domestic);
+ $configs['get_quote_from_usps_env']->condition($domestic_env);
+ $configs['get_quote_from_usps_intl']->condition($foreign);
+ $configs['get_quote_from_usps_intl_env']->condition($foreign_env);
+}
+
=== modified file 'shipping/uc_weightquote/uc_weightquote.admin.inc'
--- shipping/uc_weightquote/uc_weightquote.admin.inc 2010-04-05 14:37:18 +0000
+++ shipping/uc_weightquote/uc_weightquote.admin.inc 2010-06-10 19:18:33 +0000
@@ -4,7 +4,6 @@
/**
* @file
* Weight quote shipping method administration menu items.
- *
*/
/**
@@ -29,15 +28,14 @@
$row[] = uc_price($method->base_rate, $context);
$row[] = uc_price($method->product_rate, $context);
$row[] = l(t('edit'), 'admin/store/settings/quotes/methods/weightquote/' . $method->mid);
- $row[] = l(t('conditions'), CA_UI_PATH . '/uc_weightquote_get_quote_' . $method->mid . '/edit/conditions');
$rows[] = $row;
}
if (count($rows)) {
- $header = array(t('Title'), t('Label'), t('Base rate'), t('Default product rate'), array('data' => t('Operations'), 'colspan' => 2));
+ $header = array(t('Title'), t('Label'), t('Base rate'), t('Default product rate'), array('data' => t('Operations'), 'colspan' => 1));
$build['methods'] = array(
'#theme' => 'table',
'#header' => $header,
- 'rows' => $rows,
+ '#rows' => $rows,
);
}
@@ -105,6 +103,11 @@
'#field_suffix' => t('!sign per !unit', array('!sign' => $sign_flag ? $currency_sign : '', '!unit' => variable_get('uc_weight_unit', 'lb'))),
);
+ $conditions = rules_config_load('get_quote_from_weightquote_' . $mid);
+ if ($conditions) {
+ $conditions->form($form, $form_state);
+ }
+
$form['buttons']['submit'] = array(
'#type' => 'submit',
'#value' => t('Submit'),
@@ -199,7 +202,8 @@
db_delete('uc_weightquote_products')
->condition('mid', $mid)
->execute();
- ca_delete_predicate('uc_weightquote_get_quote_' . $form_state['values']['mid']);
+
+ rules_config_delete('get_quote_from_weightquote_' . $mid);
$enabled = variable_get('uc_quote_enabled', array());
unset($enabled['weightquote_' . $mid]);
=== modified file 'shipping/uc_weightquote/uc_weightquote.module'
--- shipping/uc_weightquote/uc_weightquote.module 2010-04-05 14:37:18 +0000
+++ shipping/uc_weightquote/uc_weightquote.module 2010-06-10 19:18:33 +0000
@@ -169,41 +169,6 @@
******************************************************************************/
/**
- * Implement hook_ca_predicate().
- *
- * Connect the quote action with the quote event.
- */
-function uc_weightquote_ca_predicate() {
- $enabled = variable_get('uc_quote_enabled', array());
- $predicates = array();
-
- $result = db_query("SELECT mid, title FROM {uc_weightquote_methods}");
- foreach ($result as $method) {
- // Ensure the default status is set.
- $enabled += array('weightquote_' . $method->mid => FALSE);
-
- $predicates['uc_weightquote_get_quote_' . $method->mid] = array(
- '#title' => t('Shipping quote via @method', array('@method' => $method->title)),
- '#trigger' => 'get_quote_from_weightquote_' . $method->mid,
- '#class' => 'uc_weightquote',
- '#status' => $enabled['weightquote_' . $method->mid],
- '#actions' => array(
- array(
- '#name' => 'uc_quote_action_get_quote',
- '#title' => t('Fetch a weightquote shipping quote.'),
- '#argument_map' => array(
- 'order' => 'order',
- 'method' => 'method',
- ),
- ),
- ),
- );
- }
-
- return $predicates;
-}
-
-/**
* Implement hook_uc_shipping_method().
*/
function uc_weightquote_uc_shipping_method() {
=== modified file 'uc_cart/uc_cart.info'
--- uc_cart/uc_cart.info 2010-02-25 16:24:47 +0000
+++ uc_cart/uc_cart.info 2010-06-21 19:34:42 +0000
@@ -1,7 +1,6 @@
; $Id$
name = Cart
description = REQUIRED. Controls the shopping cart for an Ubercart e-commerce site.
-dependencies[] = ca
dependencies[] = uc_order
dependencies[] = uc_product
package = Ubercart - core
@@ -9,7 +8,8 @@
files[] = uc_cart.module
files[] = uc_cart.install
files[] = uc_cart.admin.inc
-files[] = uc_cart.ca.inc
files[] = uc_cart.pages.inc
+files[] = uc_cart.rules.inc
+files[] = uc_cart.rules_defaults.inc
files[] = uc_cart.test
files[] = uc_cart_checkout_pane.inc
=== modified file 'uc_cart/uc_cart.module'
--- uc_cart/uc_cart.module 2010-06-03 14:53:42 +0000
+++ uc_cart/uc_cart.module 2010-06-15 13:40:04 +0000
@@ -12,7 +12,6 @@
*/
require_once('uc_cart_checkout_pane.inc');
-require_once('uc_cart.ca.inc');
/*******************************************************************************
* Hook Functions (Drupal)
@@ -1341,7 +1340,7 @@
unset($_SESSION['cart_order'], $_SESSION['do_complete'], $_SESSION['new_user']);
module_invoke_all('uc_uc_checkout_complete', $order, $account);
- ca_pull_trigger('uc_checkout_complete', $order, $account);
+ rules_invoke_event('uc_checkout_complete', $order);
return array(
'#theme' => 'uc_cart_complete_sale',
=== renamed file 'uc_cart/uc_cart.ca.inc' => 'uc_cart/uc_cart.rules.inc'
--- uc_cart/uc_cart.ca.inc 2010-04-08 21:22:14 +0000
+++ uc_cart/uc_cart.rules.inc 2010-05-27 20:39:22 +0000
@@ -3,157 +3,29 @@
/**
* @file
- * This file contains the Conditional Actions hooks and functions necessary to
+ * This file contains the Rules hooks and functions necessary to
* make the cart related entity, conditions, events, and actions work.
*/
/******************************************************************************
- * Conditional Actions Hooks *
- ******************************************************************************/
-
-/**
- * Implement hook_ca_condition().
- */
-function uc_cart_ca_condition() {
- $conditions['uc_cart_condition_product_class'] = array(
- '#title' => t('Order has a product of a particular class'),
- '#category' => t('Order: Product'),
- '#callback' => 'uc_cart_condition_product_class',
- '#arguments' => array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- ),
- ),
- );
-
- return $conditions;
-}
-
-/**
- * Implement hook_ca_trigger().
- */
-function uc_cart_ca_trigger() {
- $triggers['uc_checkout_complete'] = array(
- '#title' => t('Customer completes checkout'),
- '#category' => t('Cart'),
- '#arguments' => array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- ),
- 'account' => array(
- '#entity' => 'user',
- '#title' => t('Customer user account'),
- )
- ),
- );
-
- return $triggers;
-}
-
-/**
- * Implement hook_ca_predicate().
- */
-function uc_cart_ca_predicate() {
- $predicates = array();
-
- // Setup a default predicate for customer checkout notifications.
- $predicates['uc_checkout_customer_notification'] = array(
- '#title' => t('E-mail customer checkout notification'),
- '#description' => t('E-mail the customer an invoice from their recent order.'),
- '#class' => 'notification',
- '#status' => 1,
- '#trigger' => 'uc_checkout_complete',
- '#actions' => array(
- array(
- '#name' => 'uc_order_email_invoice',
- '#title' => t('Send an e-mail to the customer'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'from' => uc_store_email_from(),
- 'addresses' => '[uc_order:email]',
- 'subject' => t('Your Order at [store:name]'),
- 'template' => 'customer',
- 'view' => 'checkout-mail',
- ),
- ),
- ),
- );
-
- // Setup a default predicate for admin checkout notifications.
- $predicates['uc_checkout_admin_notification'] = array(
- '#title' => t('E-mail admin checkout notification'),
- '#description' => t('E-mail a short order summary to an administrator when a customer checks out.'),
- '#class' => 'notification',
- '#status' => 1,
- '#trigger' => 'uc_checkout_complete',
- '#actions' => array(
- array(
- '#name' => 'uc_order_email_invoice',
- '#title' => t('Send an e-mail to the administrator(s)'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'from' => uc_store_email_from(),
- 'addresses' => variable_get('uc_store_email', ''),
- 'subject' => t('New Order at [store:name]'),
- 'template' => 'admin',
- 'view' => 'admin-mail',
- ),
- ),
- ),
- );
-
- return $predicates;
-}
-
-/******************************************************************************
- * Condition Callbacks and Forms *
- ******************************************************************************/
-
-/**
- * Check that an order has a product of the selected class.
- *
- * @see uc_cart_condition_product_class_form()
- */
-function uc_cart_condition_product_class($order, $settings) {
- $result = FALSE;
- $types = array();
- foreach ($order->products as $product) {
- // Ignore "blank line" custom products.
- if ($product->nid) {
- // Cache product types to avoid extra queries.
- if (!isset($types[$product->nid])) {
- if (isset($product->type)) {
- $types[$product->nid] = $product->type;
- }
- else {
- $types[$product->nid] = db_query("SELECT type FROM {node} WHERE nid = :nid", array(':nid' => $product->nid))->fetchField();
- }
- }
- if ($types[$product->nid] == $settings['class']) {
- $result = TRUE;
- break;
- }
- }
- }
-
- return $result;
-}
-
-/**
- * @see uc_cart_condition_product_class()
- */
-function uc_cart_condition_product_class_form($form, &$form_state, $settings = array()) {
- $form['class'] = array('#type' => 'select',
- '#title' => t('Product class'),
- '#options' => uc_product_type_names(),
- '#default_value' => $settings['class'],
- );
-
- return $form;
-}
+ * Rules Hooks *
+ ******************************************************************************/
+
+/**
+ * Implement hook_rules_event_info().
+ */
+function uc_cart_rules_event_info() {
+ $events['uc_checkout_complete'] = array(
+ 'label' => t('Customer completes checkout'),
+ 'group' => t('Cart'),
+ 'variables' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ ),
+ ),
+ );
+
+ return $events;
+}
+
=== added file 'uc_cart/uc_cart.rules_defaults.inc'
--- uc_cart/uc_cart.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ uc_cart/uc_cart.rules_defaults.inc 2010-06-21 18:52:52 +0000
@@ -0,0 +1,47 @@
+label = t('E-mail customer checkout notification');
+ $rule->active = TRUE;
+ $rule->event('uc_checkout_complete')
+ ->action('uc_order_email_invoice', array(
+ 'order:select' => 'order',
+ 'from' => uc_store_email_from(),
+ 'addresses' => '[uc_order:email]',
+ 'subject' => t('Your Order at [store:name]'),
+ 'template' => 'customer',
+ 'view' => 'checkout-mail',
+ ));
+
+ $configs['uc_checkout_customer_notification'] = $rule;
+
+ // Setup a default predicate for admin checkout notifications.
+ $rule = rules_reaction_rule();
+ $rule ->label = t('E-mail admin checkout notification');
+ $rule->active = TRUE;
+ $rule->event('uc_checkout_complete')
+ ->action('uc_order_email_invoice', array(
+ 'order:select' => 'order',
+ 'from' => uc_store_email_from(),
+ 'addresses' => variable_get('uc_store_email', ''),
+ 'subject' => t('New Order at [store:name]'),
+ 'template' => 'admin',
+ 'view' => 'admin-mail',
+ ));
+
+ $configs['uc_checkout_admin_notification'] = $rule;
+
+ return $configs;
+}
+
=== modified file 'uc_file/uc_file.install'
--- uc_file/uc_file.install 2010-04-01 18:42:54 +0000
+++ uc_file/uc_file.install 2010-06-21 18:54:19 +0000
@@ -147,7 +147,7 @@
'file_key' => array(
'description' => 'A hash of the data in this row.',
'type' => 'varchar',
- 'length' => 32,
+ 'length' => 64,
'not null' => TRUE,
'default' => '',
),
@@ -227,3 +227,15 @@
return t("Variable 'uc_file_file_mask' changed to @mask.", array('@mask', $mask));
}
+
+/**
+ * Increase the length of {uc_file_users}.file_key.
+ */
+function uc_file_update_7001() {
+ db_change_field('uc_file_users', 'file_key', 'file_key', array(
+ 'type' => 'varchar',
+ 'length' => 64,
+ 'not null' => TRUE,
+ 'default' => '',
+ ));
+}
=== modified file 'uc_file/uc_file.module'
--- uc_file/uc_file.module 2010-04-26 18:08:32 +0000
+++ uc_file/uc_file.module 2010-06-21 19:08:20 +0000
@@ -14,8 +14,6 @@
* Development sponsored by the Ubercart project. http://www.ubercart.org
*/
-require_once('uc_file.ca.inc');
-
/**
* The max amount of files shown on any page that displays files
* in a table/pager.
@@ -28,15 +26,6 @@
******************************************************************************/
/**
- * Implement hook_help().
- */
-function uc_file_help($path, $arg) {
- if ($path == 'node/%/edit/features' && $arg[4] == 'file') {
- return t('Add file downloads through this page and then use the conditional actions interface to limit which orders they are applied to. Most important is the order status on which file download access will be triggered.', array('!url' => url(CA_UI_PATH)));
- }
-}
-
-/**
* Implement hook_form_alter().
*/
function uc_file_form_alter(&$form, &$form_state, $form_id) {
@@ -712,10 +701,24 @@
$granularity_value = $time_status ? $file_product->time_granularity : 'never';
}
else {
- $default_shippable = $node->shippable;
- $download_status = FALSE;
- $address_status = FALSE;
- $time_status = FALSE;
+ $file_product = FALSE;
+
+ $default_feature = NULL;
+
+ $default_model = '';
+ $default_filename = '';
+ $default_description = '';
+ $default_shippable = $node->shippable;
+
+ $download_status = FALSE;
+ $download_value = NULL;
+
+ $address_status = FALSE;
+ $address_value = NULL;
+
+ $time_status = FALSE;
+ $quantity_value = NULL;
+ $granularity_value = 'never';
}
$form['nid'] = array(
@@ -1690,7 +1693,7 @@
$file_user['expiration'] = $file_user['expiration'] ? $file_user['expiration'] : 0;
// Calculate hash
- $file_user['file_key'] = $file_user['file_key'] ? $file_user['file_key'] : drupal_get_token(serialize($file_user));
+ $file_user['file_key'] = isset($file_user['file_key']) && $file_user['file_key'] ? $file_user['file_key'] : drupal_get_token(serialize($file_user));
// Write and queue the file_user object.
drupal_write_record('uc_file_users', $file_user, $key);
=== renamed file 'uc_file/uc_file.ca.inc' => 'uc_file/uc_file.rules.inc'
--- uc_file/uc_file.ca.inc 2010-04-26 18:08:32 +0000
+++ uc_file/uc_file.rules.inc 2010-06-22 16:57:29 +0000
@@ -3,130 +3,134 @@
/**
* @file
- * This file contains the Conditional Actions hooks and functions necessary to
- * make the file-related entity, conditions, events, and actions work.
+ * Rules hooks and functions for uc_file.module.
*/
-/******************************************************************************
- * Conditional Actions Hooks *
- ******************************************************************************/
-
/**
- * Implement hook_ca_entity().
+ * Implement hook_rules_data_info().
*
* An entity is defined in order to get file expiration(s) down to token in the
* email.
*/
-function uc_file_ca_entity() {
-
- // CA entity for a file expiration object.
- $entities['uc_file_expiration'] = array(
- '#title' => t('Ubercart file expiration(s)'),
- '#type' => 'array',
- );
-
- return $entities;
-}
-
-/**
- * Implement hook_ca_predicate().
- */
-function uc_file_ca_predicate() {
-
- // Renew all the files on an order when the status matches what's set in the files admin settings.
- $configurations['uc_file_renewal'] = array(
- '#title' => t('Renew purchased files'),
- '#description' => t('Renew purchased files if the order status matches.'),
- '#class' => 'renewal',
- '#trigger' => 'uc_order_status_update',
- '#status' => 1,
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_order_status_condition',
- '#title' => t('If the order status is completed.'),
- '#argument_map' => array(
- 'order' => 'updated_order',
- ),
- '#settings' => array(
- 'order_status' => 'completed',
- ),
- ),
- ),
- ),
- '#actions' => array(
- array(
- '#name' => 'uc_file_order_renew',
- '#title' => t('Update all file expirations for this order.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- ),
- ),
- );
-
- $order_args = array(
- 'order' => 'order',
- 'expiration' => 'expiration',
- );
-
- // Notify the user when a file is granted.
- $configurations['uc_file_notify_grant_trigger'] = array(
- '#title' => t('Notify customer when a file is granted'),
- '#description' => t('Notify the customer when they have had a file granted on their user.'),
- '#class' => 'notification',
- '#trigger' => 'uc_file_notify_grant',
- '#status' => 1,
- '#actions' => array(
- array(
- '#name' => 'uc_file_order_email',
- '#title' => t('Send an e-mail to the customer'),
- '#argument_map' => $order_args,
- '#settings' => array(
- 'from' => uc_store_email_from(),
- 'addresses' => '[uc_order:email]',
- 'subject' => t("File Downloads for Order# [uc_order:order-id]"),
- 'message' => t("Your order (order# [uc_order:link]) at [store:name] included file download(s). You may access them with the following link(s):\n\n[uc_file:downloads]\n\nAfter downloading these files these links will have expired. If you need to download the files again, you can login at [site:login-link] and visit the \"My Account\" section of the site.\n\nThanks again, \n\n[store:name]\n[site:slogan]"),
- 'format' => filter_default_format(),
- ),
- ),
- ),
- );
-
- return $configurations;
-}
-
-/**
- * Implement hook_ca_action().
- */
-function uc_file_ca_action() {
-
+function uc_file_rules_data_info() {
+ $data['uc_file_expiration'] = array(
+ 'label' => t('Ubercart file expiration(s)'),
+ 'wrap' => TRUE,
+ 'property info' => array(
+ 'fuid' => array(
+ 'type' => 'integer',
+ 'label' => t('File-user ID'),
+ 'description' => t('Primary key for user permission to download a file.'),
+ ),
+ 'fid' => array(
+ 'type' => 'integer',
+ 'label' => t('File ID'),
+ 'description' => t('The file that may be downloaded.'),
+ ),
+ 'uid' => array(
+ 'type' => 'integer',
+ 'label' => t('User ID'),
+ 'description' => t('The user account that has permission to download a file.'),
+ ),
+ 'pfid' => array(
+ 'type' => 'integer',
+ 'label' => t('Product feature ID'),
+ 'description' => t('The product feature that granted permission to download the file.'),
+ ),
+ 'file-key' => array(
+ 'type' => 'text',
+ 'label' => t('File key'),
+ 'description' => t('A hash of the permission and expiraiton data.'),
+ ),
+ 'granted' => array(
+ 'type' => 'date',
+ 'label' => t('Granted time'),
+ 'description' => t('The time the permission to download the file was granted.'),
+ ),
+ 'expiration' => array(
+ 'type' => 'date',
+ 'label' => t('Expiration time'),
+ 'description' => t('The time when the permission to download the file will expire.'),
+ ),
+ 'accessed' => array(
+ 'type' => 'integer',
+ 'label' => t('Accesses'),
+ 'description' => t('The number of times the file has been accessed.'),
+ ),
+ 'addresses' => array(
+ 'type' => 'list',
+ 'label' => t('IP addresses'),
+ 'description' => t('List of IP addresses to which the file has been downloaded.'),
+ ),
+ 'download-limit' => array(
+ 'type' => 'integer',
+ 'label' => t('Download limit'),
+ 'description' => t('The numer of times the user may download the file.'),
+ ),
+ 'address-limit' => array(
+ 'type' => 'integer',
+ 'label' => t('Address limit'),
+ 'description' => t('The number of different IP addresses that may download the file.'),
+ ),
+ ),
+ 'group' => t('File download'),
+ 'token type' => 'uc_file',
+ );
+
+ return $data;
+}
+
+/**
+ * Implement hook_rules_action_info().
+ */
+function uc_file_rules_action_info() {
+ // Renew file expirations.
$actions['uc_file_order_renew'] = array(
- '#title' => t('Renew the files on an order.'),
- '#category' => t('renewal'),
- '#callback' => 'uc_file_action_order_renew',
- '#arguments' => array(
+ 'label' => t('Renew the files on an order.'),
+ 'group' => t('renewal'),
+ 'base' => 'uc_file_action_order_renew',
+ 'parameter' => array(
'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
),
),
);
// Send an email to an order with a file expiration
$actions['uc_file_order_email'] = array(
- '#title' => t('Send an order email regarding files.'),
- '#category' => t('Notification'),
- '#callback' => 'uc_file_action_order_email',
- '#arguments' => array(
+ 'label' => t('Send an order email regarding files.'),
+ 'group' => t('Notification'),
+ 'base' => 'uc_file_action_order_email',
+ 'parameter' => array(
'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
),
'expiration' => array(
- '#entity' => 'uc_file_expiration',
- '#title' => t('File expiration'),
+ 'type' => 'uc_file_expiration',
+ 'label' => t('File expiration'),
+ ),
+ 'from' => array(
+ 'type' => 'text',
+ 'label' => t('Sender'),
+ ),
+ 'addresses' => array(
+ 'type' => 'text',
+ 'label' => t('Recipients'),
+ ),
+ 'subject' => array(
+ 'type' => 'text',
+ 'label' => t('Subject'),
+ ),
+ 'message' => array(
+ 'type' => 'text',
+ 'label' => t('Message'),
+ ),
+ 'format' => array(
+ 'type' => 'integer',
+ 'label' => t('Message format'),
+ 'options list' => 'uc_file_message_formats',
),
),
);
@@ -135,38 +139,58 @@
}
/**
- * Implement hook_ca_trigger().
- */
-function uc_file_ca_trigger() {
-
+ * Options list callback for message formats.
+ */
+function uc_file_message_formats() {
+ global $user;
+
+ $options = array();
+ $formats = filter_formats($user);
+ foreach ($formats as $format) {
+ $options[$format->format] = $format->name;
+ }
+
+ return $options;
+}
+
+/**
+ * Implement hook_rules_event_info().
+ */
+function uc_file_rules_event_info() {
$args = array(
'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
),
'expiration' => array(
- '#entity' => 'uc_file_expiration',
- '#title' => t('File expiration'),
+ 'type' => 'uc_file_expiration',
+ 'label' => t('File expiration'),
),
);
- $triggers['uc_file_notify_grant'] = array(
- '#title' => t('E-mail for granted files'),
- '#category' => t('Notification'),
- '#arguments' => $args,
+ $events['uc_file_notify_grant'] = array(
+ 'label' => t('E-mail for granted files'),
+ 'group' => t('Notification'),
+ 'variables' => $args,
);
- return $triggers;
+ return $events;
}
/**
* Send an email with order and file replacement tokens.
*
* The recipients, subject, and message fields take order token replacements.
- *
- * @see uc_file_action_order_email_form()
*/
-function uc_file_action_order_email($order, $file_expiration, $settings) {
+function uc_file_action_order_email($order, $file_expiration, $from, $addresses, $subject, $message, $format) {
+ $settings = array(
+ 'from' => $from,
+ 'addresses' => $addresses,
+ 'subject' => $subject,
+ 'message' => $message,
+ 'format' => $format,
+ );
+
// Token replacements for the subject and body
$settings['replacements'] = array(
'uc_order' => $order,
@@ -191,63 +215,6 @@
}
/**
- * @see uc_file_action_order_email()
- */
-function uc_file_action_order_email_form($form_state, $settings = array()) {
- return uc_file_build_email_form($form_state, $settings, array('site', 'store', 'uc_order', 'uc_file'));
-}
-
-/**
- * Build an email action settings form.
- */
-function uc_file_build_email_form($form, &$form_state, $settings, $token_filters) {
- $form['from'] = array(
- '#type' => 'textfield',
- '#title' => t('Sender'),
- '#default_value' => $settings['from'],
- '#description' => t('The "From" address.'),
- '#required' => TRUE,
- );
- $form['addresses'] = array(
- '#type' => 'textarea',
- '#title' => t('Recipients'),
- '#default_value' => $settings['addresses'],
- '#description' => t('Enter the email addresses to receive the notifications, one on each line. You may use order tokens for dynamic email addresses.'),
- '#required' => TRUE,
- );
- $form['subject'] = array(
- '#type' => 'textfield',
- '#title' => t('Subject'),
- '#default_value' => $settings['subject'],
- '#required' => TRUE,
- );
- $form['message'] = array(
- '#type' => 'textarea',
- '#title' => t('Message'),
- '#default_value' => $settings['message'],
- '#text_format' => $settings['format'],
- );
-
- $form['token_help'] = array(
- '#type' => 'fieldset',
- '#title' => t('Replacement patterns'),
- '#description' => t('You can make use of the replacement patterns in the recipients field, the subject, and the message body.'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- foreach ($token_filters as $name) {
- $form['token_help'][$name] = array(
- '#type' => 'fieldset',
- '#title' => t('@name replacement patterns', array('@name' => drupal_ucfirst($name))),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- }
-
- return $form;
-}
-
-/**
* Renew an orders product files.
*
* @param $order
@@ -290,7 +257,7 @@
$file_modification = array(
'download_limit' => uc_file_get_download_limit($file),
'address_limit' => uc_file_get_address_limit($file),
- 'expiration' => _uc_file_expiration_date(uc_file_get_time_limit($file), $file_user->expiration),
+ 'expiration' => _uc_file_expiration_date(uc_file_get_time_limit($file), ($file_user ? $file_user->expiration : NULL)),
);
// Add file_user(s) for this file/directory. (No overwrite)
@@ -312,6 +279,6 @@
// Notify the user of their download(s).
if ($user_downloads) {
- ca_pull_trigger('uc_file_notify_grant', $order, $user_downloads);
+ rules_invoke_event('uc_file_notify_grant', $order, $user_downloads);
}
}
=== added file 'uc_file/uc_file.rules_defaults.inc'
--- uc_file/uc_file.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ uc_file/uc_file.rules_defaults.inc 2010-06-22 16:53:15 +0000
@@ -0,0 +1,42 @@
+label = t('Renew purchased files');
+ $rule->active = TRUE;
+ $rule->event('uc_order_status_update');
+ $rule->condition('data_is', array('data:select' => 'updated_order:order-status', 'value' => 'completed'))
+ ->action('uc_file_order_renew', array(
+ 'order:select' => 'order',
+ ));
+ $configs['uc_file_renewal'] = $rule;
+
+ // Notify the user when a file is granted.
+ $rule = rules_reaction_rule();
+ $rule->label = t('Notify customer when a file is granted');
+ $rule->active = TRUE;
+ $rule->event('uc_file_notify_grant');
+ $rule->action('uc_file_order_email', array(
+ 'order:select' => 'order',
+ 'expiration:select' => 'expiration',
+ 'from' => uc_store_email_from(),
+ 'addresses' => '[order:email]',
+ 'subject' => t("File Downloads for Order# [order:order-id]"),
+ 'message' => t("Your order (order# [order:link]) at [store:name] included file download(s). You may access them with the following link(s):\n\n[expiration:downloads]\n\nAfter downloading these files these links will have expired. If you need to download the files again, you can login at [site:login-link] and visit the \"My Account\" section of the site.\n\nThanks again, \n\n[store:name]\n[site:slogan]"),
+ 'format' => filter_default_format(),
+ ));
+ $configs['uc_file_notify_grant_trigger'] = $rule;
+
+ return $configs;
+}
+
=== modified file 'uc_order/uc_order.admin.inc'
--- uc_order/uc_order.admin.inc 2010-05-24 21:22:53 +0000
+++ uc_order/uc_order.admin.inc 2010-06-21 19:34:42 +0000
@@ -99,7 +99,7 @@
$form['customer']['uc_cust_order_invoice_template'] = array(
'#type' => 'select',
'#title' => t('On-site invoice template'),
- '#description' => t('Select the invoice template to use when invoices are viewed on the site.
This is separate from the template used to e-mail invoices to customers which is configured through Conditional actions.', array('!url' => url(CA_UI_PATH))),
+ '#description' => t('Select the invoice template to use when invoices are viewed on the site.
This is separate from the template used to e-mail invoices to customers which is configured through Rules.', array('!url' => url(RULES_UI_PATH))),
'#options' => uc_order_template_options(),
'#summary' => t('You are using the %template order invoice template.', array('%template' => variable_get('uc_cust_order_invoice_template', 'customer'))),
'#default_value' => variable_get('uc_cust_order_invoice_template', 'customer'),
=== modified file 'uc_order/uc_order.api.php'
--- uc_order/uc_order.api.php 2010-06-03 14:04:58 +0000
+++ uc_order/uc_order.api.php 2010-06-21 19:34:42 +0000
@@ -91,7 +91,7 @@
*/
function hook_uc_line_item_alter(&$item, $order) {
$account = user_load($order->uid);
- ca_pull_trigger('calculate_line_item_discounts', $item, $account);
+ rules_invoke_event('calculate_line_item_discounts', $item, $account);
}
/**
@@ -272,6 +272,15 @@
}
/**
+ * Respond to order product deletion.
+ */
+function hook_uc_order_product_delete($order_product_id) {
+ // Put back the stock.
+ $product = db_query("SELECT model, qty FROM {uc_order_products} WHERE order_product_id = :id", array(':id' => $order_product_id))->fetchObject();
+ uc_stock_adjust($product->model, $product->qty);
+}
+
+/**
* Register static order states.
*
* Order states are module-defined categories for order statuses. Each state
=== modified file 'uc_order/uc_order.info'
--- uc_order/uc_order.info 2010-04-05 19:24:56 +0000
+++ uc_order/uc_order.info 2010-06-21 19:34:42 +0000
@@ -1,13 +1,13 @@
; $Id$
name = Order
description = REQUIRED. Receive and manage orders through your website.
-dependencies[] = ca
package = Ubercart - core
core = 7.x
files[] = uc_order.module
files[] = uc_order.install
files[] = uc_order.admin.inc
-files[] = uc_order.ca.inc
files[] = uc_order.line_item.inc
files[] = uc_order.order_pane.inc
+files[] = uc_order.rules.inc
+files[] = uc_order.rules_defaults.inc
files[] = uc_order.tokens.inc
=== added file 'uc_order/uc_order.info.inc'
--- uc_order/uc_order.info.inc 1970-01-01 00:00:00 +0000
+++ uc_order/uc_order.info.inc 2010-06-09 19:04:17 +0000
@@ -0,0 +1,251 @@
+ array(
+ 'type' => 'text',
+ 'label' => t('First name'),
+ 'description' => t('First name of the addressee.'),
+ ),
+ 'last-name' => array(
+ 'type' => 'text',
+ 'label' => t('Last name'),
+ 'description' => t('Last naem of the addressee.'),
+ ),
+ 'company' => array(
+ 'type' => 'text',
+ 'label' => t('Company'),
+ 'description' => t('Name of the company at the address.'),
+ ),
+ 'street1' => array(
+ 'type' => 'text',
+ 'label' => t('Street line 1'),
+ 'description' => t('First line of the street address.'),
+ ),
+ 'street2' => array(
+ 'type' => 'text',
+ 'label' => t('Street line 2'),
+ 'description' => t('Second line of the street address.'),
+ ),
+ 'city' => array(
+ 'type' => 'text',
+ 'label' => t('City'),
+ 'description' => t('Address city.'),
+ ),
+ 'zone' => array(
+ 'type' => 'integer',
+ 'label' => t('Zone'),
+ 'description' => t('Address state/province/zone.'),
+ 'options list' => 'uc_zone_option_list',
+ ),
+ 'postal-code' => array(
+ 'type' => 'text',
+ 'label' => t('Postal code'),
+ 'description' => t('Address post code.'),
+ ),
+ 'country' => array(
+ 'type' => 'integer',
+ 'label' => t('Country'),
+ 'description' => t('Address country.'),
+ 'options list' => 'uc_country_option_list',
+ ),
+ 'phone' => array(
+ 'type' => 'text',
+ 'label' => t('Phone'),
+ 'description' => t('Contact phone number.'),
+ ),
+ 'email' => array(
+ 'type' => 'text',
+ 'label' => t('Email'),
+ 'description' => t('Contact email address.'),
+ ),
+ );
+
+ return array(
+ 'uc_order_product' => array(
+ 'properties' => array(
+ 'order-product-id' => array(
+ 'type' => 'integer',
+ 'label' => t('Order product ID'),
+ 'description' => t('The unique ID for the purchased product.'),
+ ),
+ 'order-id' => array(
+ 'type' => 'integer',
+ 'label' => t('Order ID'),
+ 'description' => t('The order ID that owns the product.'),
+ 'required' => TRUE,
+ ),
+ 'nid' => array(
+ 'type' => 'integer',
+ 'label' => t('Node ID'),
+ 'description' => t('The unique ID of the node representing the product.'),
+ 'clear' => array('node'),
+ ),
+ 'node' => array(
+ 'type' => 'node',
+ 'label' => t('Node'),
+ 'description' => t('The node representing the product.'),
+ ),
+ 'title' => array(
+ 'type' => 'text',
+ 'label' => t('Title'),
+ 'description' => t('The product title.'),
+ ),
+ 'model' => array(
+ 'type' => 'text',
+ 'label' => t('Model/SKU'),
+ 'description' => t('The model number of the product.'),
+ ),
+ 'qty' => array(
+ 'type' => 'integer',
+ 'label' => t('Quantity'),
+ 'description' => t('The number of the same product ordered.'),
+ ),
+ 'cost' => array(
+ 'type' => 'decimal',
+ 'label' => t('Cost'),
+ 'description' => t('The cost to the store for the product.'),
+ ),
+ 'price' => array(
+ 'type' => 'decimal',
+ 'label' => t('Price'),
+ 'description' => t('The price paid for the ordered product.'),
+ ),
+ 'weight' => array(
+ 'type' => 'decimal',
+ 'label' => t('Weight'),
+ 'description' => t('The physical weight of the product.'),
+ ),
+ ),
+ ),
+ 'uc_order' => array(
+ 'properties' => array(
+ 'order-id' => array(
+ 'type' => 'integer',
+ 'label' => t('Order ID'),
+ 'description' => t('Primary key: the order ID.'),
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'uid' => array(
+ 'type' => 'integer',
+ 'label' => t('User ID'),
+ 'description' => t('The unique ID of the customer who placed the order.'),
+ 'clear' => array('customer'),
+ 'query callback' => 'entity_metadata_table_query',
+ 'setter permission' => 'edit orders',
+ ),
+ 'customer' => array(
+ 'type' => 'user',
+ 'label' => t('Customer'),
+ 'destription' => t('The user who placed the order.'),
+ 'getter callback' => 'uc_order_uc_order_get_properties',
+ 'setter callback' => 'uc_order_uc_order_set_properties',
+ 'setter permission' => 'edit orders',
+ 'clear' => array('uid'),
+ ),
+ 'delivery-address' => array(
+ 'type' => 'struct',
+ 'label' => t('Delivery address'),
+ 'description' => t('The destination of the shipped products.'),
+ 'getter callback' => 'uc_order_address_property_get',
+ 'setter callback' => 'uc_order_address_property_set',
+ 'setter permission' => 'edit orders',
+ 'property info' => $address_info,
+ ),
+ 'billing-address' => array(
+ 'type' => 'struct',
+ 'label' => t('Billing address'),
+ 'description' => t('The destination of the bill and invoice.'),
+ 'getter callback' => 'uc_order_address_property_get',
+ 'setter callback' => 'uc_order_address_property_set',
+ 'setter permission' => 'edit orders',
+ 'property info' => $address_info,
+ ),
+ 'order-status' => array(
+ 'type' => 'text',
+ 'label' => t('Order status'),
+ 'description' => t('The status of the order.'),
+ 'required' => TRUE,
+ 'options list' => 'uc_order_status_list',
+ 'setter permission' => 'edit orders',
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'order-total' => array(
+ 'type' => 'decimal',
+ 'label' => t('Order total'),
+ 'description' => t('The total amount due for the order.'),
+ 'getter callback' => 'uc_order_get_total',
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'primary-email' => array(
+ 'type' => 'text',
+ 'label' => t('Primary email'),
+ 'description' => t('The primary email address of the customer.'),
+ 'setter permission' => 'edit orders',
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'payment-method' => array(
+ 'type' => 'text',
+ 'label' => t('Payment method'),
+ 'description' => t('The method of payment.'),
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'created' => array(
+ 'type' => 'date',
+ 'label' => t('Date created'),
+ 'description' => t('The date the order was placed.'),
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'modified' => array(
+ 'type' => 'date',
+ 'label' => t('Date modified'),
+ 'description' => t('The date the order was most recently changed.'),
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'host' => array(
+ 'type' => 'text',
+ 'label' => t('Host IP'),
+ 'description' => t('Host IP address of the person paying for the order.'),
+ 'query callback' => 'entity_metadata_table_query',
+ ),
+ 'products' => array(
+ 'type' => 'list',
+ 'label' => t('Products'),
+ 'description' => t('The products that have been ordered.'),
+ 'getter callback' => 'uc_order_get_properties',
+ 'setter callback' => 'uc_order_set_properties',
+ 'setter permission' => 'edit orders',
+ 'clear' => array('order_total'),
+ ),
+ ),
+ ),
+ );
+}
+
+/**
+ * Callback for getting node properties.
+ * @see entity_metadata_node_entity_info_alter()
+ */
+function uc_order_uc_order_get_properties($order, array $options, $name, $entity_type) {
+ switch ($name) {
+ case 'customer':
+ return $order->uid;
+ }
+}
+
+/**
+ * Callback for setting node properties.
+ * @see entity_metadata_node_entity_info_alter()
+ */
+function uc_order_uc_order_set_properties($order, $name, $value) {
+ if ($name == 'customer') {
+ $order->uid = $value;
+ }
+}
+
=== modified file 'uc_order/uc_order.module'
--- uc_order/uc_order.module 2010-05-24 19:55:46 +0000
+++ uc_order/uc_order.module 2010-06-16 14:20:51 +0000
@@ -13,7 +13,6 @@
require_once('uc_order.order_pane.inc');
require_once('uc_order.line_item.inc');
-require_once('uc_order.ca.inc');
class UcOrder {
@@ -444,6 +443,56 @@
}
/**
+ * Implement hook_entity_info().
+ */
+function uc_order_entity_info() {
+ return array(
+ 'uc_order' => array(
+ 'label' => t('Order'),
+ 'base table' => 'uc_orders',
+ 'uri callback' => 'uc_order_uri',
+ 'fieldable' => TRUE,
+ 'entity keys' => array(
+ 'id' => 'order_id',
+ ),
+ 'bundles' => array(
+ 'uc_order' => array(
+ 'label' => t('Order'),
+ ),
+ ),
+ 'view modes' => array(
+ 'full' => array(
+ 'label' => t('Invoice'),
+ 'admin' => array(
+ 'path' => 'admin/store/settings/orders',
+ 'access arguments' => array('administer store'),
+ ),
+ ),
+ ),
+ 'access callback' => 'uc_order_order_entity_access',
+ 'create callback' => 'uc_order_new',
+ 'save callback' => 'uc_order_save',
+ 'delete callback' => 'uc_order_delete',
+ ),
+ 'uc_order_product' => array(
+ 'label' => t('Order product'),
+ 'base table' => 'uc_order_products',
+ 'entity keys' => array(
+ 'id' => 'order_product_id',
+ ),
+ 'bundles' => array(
+ 'uc_order_product' => array(
+ 'label' => t('Order product'),
+ ),
+ ),
+ 'access callback' => 'uc_order_order_product_access',
+ 'save callback' => 'uc_order_product_entity_save',
+ 'delete callback' => 'uc_order_product_delete',
+ ),
+ );
+}
+
+/**
* Implement hook_user_view().
*/
function uc_order_user_view($account, $view_mode) {
@@ -923,54 +972,47 @@
* Module and Helper Functions
******************************************************************************/
+function uc_order_order_entity_access($op, $order = NULL, $account = NULL) {
+ if ($op == 'delete') {
+ if (!empty($order)) {
+ return uc_order_can_delete($order, $account);
+ }
+ else {
+ return FALSE;
+ }
+ }
+
+ if ($op == 'edit') {
+ return user_access('edit orders', $account);
+ }
+
+ if ($op == 'view') {
+ if (user_access('view all_orders', $account)) {
+ return TRUE;
+ }
+
+ return (!empty($order) && $order->uid == $account->uid && user_access('view own orders', $account));
+ }
+}
+
/**
* Generate a new order for user $uid.
*/
function uc_order_new($uid = 0, $state = 'in_checkout') {
- $order = new stdClass();
+ $order = new UcOrder();
if ($uid > 0) {
$user = user_load($uid);
$email = $user->mail;
+ $order->primary_email = $email;
}
$order->uid = $uid;
$order->order_status = uc_order_state_default($state);
- $order->primary_email = $email;
- $order->products = array();
+ $order->created = REQUEST_TIME;
+ $order->modified = REQUEST_TIME;
- $order->order_id = db_insert('uc_orders')
- ->fields(array(
- 'uid' => $uid,
- 'order_status' => $order->order_status,
- 'order_total' => 0,
- 'primary_email' => $email,
- 'delivery_first_name' => '',
- 'delivery_last_name' => '',
- 'delivery_phone' => '',
- 'delivery_company' => '',
- 'delivery_street1' => '',
- 'delivery_street2' => '',
- 'delivery_city' => '',
- 'delivery_zone' => 0,
- 'delivery_postal_code' => '',
- 'delivery_country' => 0,
- 'billing_first_name' => '',
- 'billing_last_name' => '',
- 'billing_phone' => '',
- 'billing_company' => '',
- 'billing_street1' => '',
- 'billing_street2' => '',
- 'billing_city' => '',
- 'billing_zone' => 0,
- 'billing_postal_code' => '',
- 'billing_country' => 0,
- 'payment_method' => '',
- 'data' => '',
- 'created' => REQUEST_TIME,
- 'modified' => REQUEST_TIME,
- ))
- ->execute();
+ drupal_write_record('uc_orders', $order);
uc_order_module_invoke('new', $order, NULL);
@@ -1021,6 +1063,15 @@
return $user;
}
+function uc_order_order_product_access($op, $product = NULL, $account = NULL) {
+ if (isset($product) && $product->order_id) {
+ $order = uc_order_load($product->order_id);
+ return uc_order_order_entity_access($op, $order, $account);
+ }
+
+ return FALSE;
+}
+
/**
* Save a product to an order.
*/
@@ -1039,6 +1090,26 @@
}
/**
+ * API wrapper for uc_order_product_save().
+ *
+ * @todo: Change the signature for uc_order_product_save() to this one.
+ */
+function uc_order_product_entity_save($product) {
+ return uc_order_product_save($product->order_id, $product);
+}
+
+/**
+ * Remove a product from an order.
+ */
+function uc_order_product_delete($order_product_id) {
+ db_delete('uc_order_products')
+ ->condition('order_product_id', $order_product_id)
+ ->execute();
+
+ module_invoke_all('uc_order_product_delete', $order_product_id);
+}
+
+/**
* Load an order from the database.
*/
function uc_order_load($order_id) {
@@ -1297,7 +1368,7 @@
uc_order_log_changes($order->order_id, $change);
$updated = uc_order_load($order_id);
- ca_pull_trigger('uc_order_status_update', $order, $updated);
+ rules_invoke_event('uc_order_status_update', $order, $updated);
return TRUE;
}
@@ -1750,6 +1821,7 @@
}
if ($sql) {
+ $ids = array();
foreach ($statuses[$scope] as $status) {
$ids[] = $status['id'];
}
@@ -1816,38 +1888,14 @@
);
}
- if (user_access('delete orders') || user_access('unconditionally delete orders')) {
- // Unconditional deletion perms are always TRUE.
- $can_delete = TRUE;
- if (!user_access('unconditionally delete orders')) {
- // Only users with unconditional deletion perms can delete completed orders.
- if ($state == 'completed') {
- $can_delete = FALSE;
- }
- else {
- // See if any modules have a say in this order's eligibility for deletion
- foreach (module_implements('uc_order') as $module) {
- $function = $module . '_uc_order';
- // $order must be passed by reference.
- if (function_exists($function) && ($response = $function('can_delete', $order, NULL))) {
- // Break out early if possible.
- if ($response === FALSE) {
- $can_delete = FALSE;
- break;
- }
- }
- }
- }
- }
- if ($can_delete) {
- $alt = t('Delete order @order_id.', $order_id);
- $actions[] = array(
- 'name' => t('Delete'),
- 'url' => 'admin/store/orders/' . $order->order_id . '/delete',
- 'icon' => '
',
- 'title' => $alt,
- );
- }
+ if (uc_order_can_delete($order)) {
+ $alt = t('Delete order @order_id.', $order_id);
+ $actions[] = array(
+ 'name' => t('Delete'),
+ 'url' => 'admin/store/orders/' . $order->order_id . '/delete',
+ 'icon' => '
',
+ 'title' => $alt,
+ );
}
$extra = module_invoke_all('uc_order_actions', $order);
@@ -1872,13 +1920,84 @@
*
* Access callback for admin/store/orders/%uc_order/delete.
*/
-function uc_order_can_delete($order) {
- $can_delete = FALSE;
- foreach (uc_order_actions($order) as $action) {
- if ($action['name'] == t('Delete')) {
+function uc_order_can_delete($order, $account = NULL) {
+ if (user_access('unconditionally delete orders', $account)) {
+ // Unconditional deletion perms are always TRUE.
+ return TRUE;
+ }
+ elseif (user_access('delete orders', $account)) {
+ // Only users with unconditional deletion perms can delete completed orders.
+ if ($state == 'completed') {
+ return FALSE;
+ }
+ else {
$can_delete = TRUE;
+ // See if any modules have a say in this order's eligibility for deletion
+ foreach (module_implements('uc_order') as $module) {
+ $function = $module . '_uc_order';
+ // $order must be passed by reference.
+ if (function_exists($function) && ($response = $function('can_delete', $order, NULL))) {
+ // Break out early if possible.
+ if ($response === FALSE) {
+ $can_delete = FALSE;
+ break;
+ }
+ }
+ }
+
+ return $can_delete;
}
}
-
- return $can_delete;
-}
+ else {
+ return FALSE;
+ }
+}
+
+/**
+ * Entity metadata callback to get delivery or billing address of an order.
+ */
+function uc_order_address_property_get($order, array $options, $name, $entity_type) {
+ switch ($name) {
+ case 'delivery-address':
+ $type = 'delivery_';
+ break;
+
+ case 'billing-address':
+ $type = 'billing_';
+ break;
+
+ default:
+ return NULL;
+ }
+
+ $address = new UcAddress();
+
+ foreach ($address as $field => $value) {
+ $address->{$field} = $order->{$type . $field};
+ }
+
+ return $address;
+}
+
+/**
+ * Entity metadata callback to set delivery or billing address of an order.
+ */
+function uc_order_address_property_set($order, $name, $address) {
+ switch ($name) {
+ case 'delivery-address':
+ $type = 'delivery_';
+ break;
+
+ case 'billing-address':
+ $type = 'billing_';
+ break;
+
+ default:
+ return;
+ }
+
+ foreach ($address as $field => $value) {
+ $order->{$type . $field} = $value;
+ }
+}
+
=== modified file 'uc_order/uc_order.order_pane.inc'
--- uc_order/uc_order.order_pane.inc 2010-06-03 19:26:32 +0000
+++ uc_order/uc_order.order_pane.inc 2010-06-15 13:40:04 +0000
@@ -678,14 +678,7 @@
$order_product_id = intval($form_state['triggering_element']['#return_value']);
- // Put back the stock.
- if (module_exists('uc_stock')) {
- $product = db_query("SELECT model, qty FROM {uc_order_products} WHERE order_product_id = :id", array(':id' => $order_product_id))->fetchObject();
- uc_stock_adjust($product->model, $product->qty);
- }
- db_delete('uc_order_products')
- ->condition('order_product_id', $order_product_id)
- ->execute();
+ uc_order_product_delete($order_product_id);
$order = $form_state['build_info']['args'][0];
$matches = array();
@@ -1148,7 +1141,7 @@
// Let conditional actions send email if requested.
if ($form_state['values']['notify']) {
$order = uc_order_load($form_state['values']['order_id']);
- ca_pull_trigger('uc_order_status_email_update', $order);
+ rules_invoke_event('uc_order_status_email_update', $order);
}
drupal_set_message(t('Order updated.'));
=== renamed file 'uc_order/uc_order.ca.inc' => 'uc_order/uc_order.rules.inc'
--- uc_order/uc_order.ca.inc 2010-04-08 21:22:14 +0000
+++ uc_order/uc_order.rules.inc 2010-06-15 13:32:57 +0000
@@ -3,285 +3,120 @@
/**
* @file
- * This file contains the Conditional Actions hooks and functions necessary to
- * make the order related entity, conditions, events, and actions work.
+ * This file contains the Rules hooks and functions necessary to make the order
+ * related entity, conditions, events, and actions work.
*/
/******************************************************************************
- * Conditional Actions Hooks *
+ * Rules Hooks *
******************************************************************************/
/**
- * Implement hook_ca_entity().
+ * Implement hook_rules_data_info().
*/
-function uc_order_ca_entity() {
- $entities['uc_order'] = array(
- '#title' => t('Ubercart order object'),
- '#type' => 'object',
- '#load' => 'uc_order_load',
- '#save' => 'uc_order_save',
- );
- $entities['uc_line_item'] = array(
- '#title' => t('Order line item'),
- '#type' => 'array',
- );
-
- return $entities;
+function uc_order_rules_data_info() {
+ $types['uc_order'] = array(
+ 'label' => t('Ubercart order object'),
+ 'wrap' => TRUE,
+ 'group' => t('Ubercart'),
+ );
+ $types['uc_order_product'] = array(
+ 'label' => t('Ubercart ordered product'),
+ 'wrap' => TRUE,
+ 'parent' => 'node',
+ 'group' => t('Ubercart'),
+ );
+
+ $types['uc_line_item'] = array(
+ 'label' => t('Order line item'),
+ 'wrap' => TRUE,
+ 'group' => t('Ubercart'),
+ 'token type' => FALSE,
+ );
+
+ return $types;
}
/**
- * Implement hook_ca_trigger().
+ * Implement hook_rules_event_info().
*/
-function uc_order_ca_trigger() {
- $triggers['uc_order_status_update'] = array(
- '#title' => t('Order status gets updated'),
- '#category' => t('Order'),
- '#arguments' => array(
+function uc_order_rules_event_info() {
+ $events['uc_order_status_update'] = array(
+ 'label' => t('Order status gets updated'),
+ 'group' => t('Order'),
+ 'variables' => array(
'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Original order'),
+ 'type' => 'uc_order',
+ 'label' => t('Original order'),
),
'updated_order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Updated order'),
+ 'type' => 'uc_order',
+ 'label' => t('Updated order'),
),
),
);
- $triggers['uc_order_status_email_update'] = array(
- '#title' => t('E-mail requested for order status update'),
- '#category' => t('Order'),
- '#arguments' => array(
+ $events['uc_order_status_email_update'] = array(
+ 'label' => t('E-mail requested for order status update'),
+ 'group' => t('Order'),
+ 'variables' => array(
'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- ),
- ),
- );
-
- return $triggers;
-}
-
-/**
- * Implement hook_ca_predicate().
- */
-function uc_order_ca_predicate() {
- $predicates = array();
-
- $predicates['uc_order_update_email_customer'] = array(
- '#title' => t('E-mail an order update notification'),
- '#description' => t('Notify the customer when the order status is changed.'),
- '#class' => 'notification',
- '#status' => 1,
- '#trigger' => 'uc_order_status_email_update',
- '#conditions' => array(
- '#operator' => 'AND',
- '#conditions' => array(
- array(
- '#name' => 'uc_order_status_condition',
- '#title' => t('If the order status is not still In Checkout.'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'negate' => TRUE,
- 'order_status' => 'in_checkout',
- ),
- ),
- ),
- ),
- '#actions' => array(
- array(
- '#name' => 'uc_order_email',
- '#title' => t('Send an e-mail to the customer'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
- '#settings' => array(
- 'from' => uc_store_email_from(),
- 'addresses' => '[uc_order:email]',
- 'subject' => t('Order #[uc_order:order-id] Update'),
- 'message' => uc_get_message('order_update_email'),
- 'format' => filter_default_format(),
- ),
- ),
- ),
- );
-
- return $predicates;
-}
-
-/**
- * Implement hook_ca_condition().
- */
-function uc_order_ca_condition() {
- $order_arg = array(
- '#entity' => 'uc_order',
- );
-
- $conditions['uc_order_status_condition'] = array(
- '#title' => t('Check the order status'),
- '#description' => t('Returns TRUE if the current order status matches the status specified below.'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_condition_check_order_status',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
-
- $conditions['uc_order_condition_total'] = array(
- '#title' => t('Check the order total'),
- '#description' => t('Returns TRUE if the current order total is within the parameters below.'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_condition_total',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
-
- $conditions['uc_order_condition_delivery_postal_code'] = array(
- '#title' => t("Check an order's shipping postal code"),
- '#category' => t('Order: Shipping address'),
- '#description' => t('Returns TRUE if the shipping postal code is in the specified area.'),
- '#callback' => 'uc_order_condition_delivery_postal_code',
- '#arguments' => array(
- 'order' => $order_arg
- ),
- );
- $conditions['uc_order_condition_delivery_zone'] = array(
- '#title' => t("Check an order's shipping @zone", array('@zone' => uc_get_field_name('zone'))),
- '#category' => t('Order: Shipping address'),
- '#description' => t('Returns TRUE if the shipping @zone is in the specified list.', array('@zone' => uc_get_field_name('zone'))),
- '#callback' => 'uc_order_condition_delivery_zone',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_delivery_country'] = array(
- '#title' => t("Check an order's shipping country"),
- '#category' => t('Order: Shipping address'),
- '#description' => t('Returns TRUE if the shipping country is in the specified list.'),
- '#callback' => 'uc_order_condition_delivery_country',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_billing_postal_code'] = array(
- '#title' => t("Check an order's billing postal code"),
- '#category' => t('Order: Billing address'),
- '#description' => t('Returns TRUE if the billing postal code is in the specified area.'),
- '#callback' => 'uc_order_condition_billing_postal_code',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_billing_zone'] = array(
- '#title' => t("Check an order's billing @zone", array('@zone' => uc_get_field_name('zone'))),
- '#category' => t('Order: Billing address'),
- '#description' => t('Returns TRUE if the billing @zone is in the specified list.', array('@zone' => uc_get_field_name('zone'))),
- '#callback' => 'uc_order_condition_billing_zone',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_billing_country'] = array(
- '#title' => t("Check an order's billing country"),
- '#category' => t('Order: Billing address'),
- '#description' => t('Returns TRUE if the billing country is in the specified list.'),
- '#callback' => 'uc_order_condition_billing_country',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ ),
+ ),
+ );
+
+ return $events;
+}
+
+/**
+ * Implement hook_rules_condition_info().
+ */
+function uc_order_rules_condition_info() {
$conditions['uc_order_condition_has_products'] = array(
- '#title' => t("Check an order's products"),
- '#category' => t('Order: Product'),
- '#description' => t('Returns TRUE if the order has any, all, or only the products in the list.'),
- '#callback' => 'uc_order_condition_has_products',
- '#arguments' => array(
- 'order' => $order_arg,
+ 'label' => t("Check an order's products"),
+ 'group' => t('Order: Product'),
+ 'base' => 'uc_order_condition_has_products',
+ 'parameter' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ ),
),
);
$conditions['uc_order_condition_count_products'] = array(
- '#title' => t("Check an order's number of products"),
- '#category' => t('Order: Product'),
- '#description' => t('Determines if the order has the specified number of products, possibly of a certain type.'),
- '#callback' => 'uc_order_condition_count_products',
- '#arguments' => array(
- 'order' => $order_arg,
+ 'label' => t("Check an order's number of products"),
+ 'group' => t('Order: Product'),
+ 'base' => 'uc_order_condition_count_products',
+ 'parameter' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ ),
),
);
$conditions['uc_order_condition_products_weight'] = array(
- '#title' => t("Check an order's total weight"),
- '#category' => t('Order: Product'),
- '#description' => t('Determines if the order has the specified weight, possibly counting only a certain type of product.'),
- '#callback' => 'uc_order_condition_products_weight',
- '#arguments' => array(
- 'order' => $order_arg,
+ 'label' => t("Check an order's total weight"),
+ 'group' => t('Order: Product'),
+ 'help' => t('Compare the weight of all of the products, or the weight of just one type in the order.'),
+ 'base' => 'uc_order_condition_products_weight',
+ 'parameter' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ ),
),
);
$conditions['uc_order_condition_is_shippable'] = array(
- '#title' => t('Check if an order can be shipped'),
- '#category' => t('Order'),
- '#description' => t('Returns TRUE if the order has any shippable products.'),
- '#callback' => 'uc_order_condition_is_shippable',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
-
- $conditions['uc_order_condition_user_name'] = array(
- '#title' => t('Check the user name.'),
- '#category' => t('Order: User'),
- '#description' => t('Returns TRUE if the user name matches the condition.'),
- '#callback' => 'uc_order_condition_user_name',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_user_mail'] = array(
- '#title' => t('Check the user email address.'),
- '#category' => t('Order: User'),
- '#description' => t('Returns TRUE if the user email addresses matches the condition.'),
- '#callback' => 'uc_order_condition_user_mail',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_user_created'] = array(
- '#title' => t('Check the user creation date.'),
- '#category' => t('Order: User'),
- '#description' => t('Returns TRUE if the user creation date matches the condition.'),
- '#callback' => 'uc_order_condition_user_created',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_user_login'] = array(
- '#title' => t('Check the user last login date.'),
- '#category' => t('Order: User'),
- '#description' => t('Returns TRUE if the user last login date matches the condition.'),
- '#callback' => 'uc_order_condition_user_login',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_user_language'] = array(
- '#title' => t('Check the user language setting.'),
- '#category' => t('Order: User'),
- '#description' => t('Returns TRUE if the user language setting matches the condition.'),
- '#callback' => 'uc_order_condition_user_language',
- '#arguments' => array(
- 'order' => $order_arg,
- ),
- );
- $conditions['uc_order_condition_user_roles'] = array(
- '#title' => t('Check the role of the user.'),
- '#category' => t('Order: User'),
- '#description' => t('Returns TRUE if the user roles match your settings.'),
- '#callback' => 'uc_order_condition_user_roles',
- '#arguments' => array(
- 'order' => $order_arg,
+ 'label' => t('Check if an order can be shipped'),
+ 'group' => t('Order'),
+ 'base' => 'uc_order_condition_is_shippable',
+ 'parameter' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
+ ),
),
);
@@ -289,297 +124,111 @@
}
/**
- * Implement hook_ca_action().
+ * Implement hook_rules_action_info().
*/
-function uc_order_ca_action() {
+function uc_order_rules_action_info() {
$order_arg = array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
);
$actions['uc_order_update_status'] = array(
- '#title' => t('Update the order status'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_action_update_status',
- '#arguments' => array(
+ 'label' => t('Update the order status'),
+ 'group' => t('Order'),
+ 'base' => 'uc_order_action_update_status',
+ 'parameter' => array(
'order' => $order_arg,
+ 'order_status' => array(
+ 'type' => 'text',
+ 'label' => t('Status'),
+ 'options list' => 'uc_order_action_update_status_options',
+ ),
),
);
$actions['uc_order_action_add_comment'] = array(
- '#title' => t('Add a comment to the order'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_action_add_comment',
- '#arguments' => array(
+ 'label' => t('Add a comment to the order'),
+ 'group' => t('Order'),
+ 'base' => 'uc_order_action_add_comment',
+ 'parameter' => array(
'order' => $order_arg,
+ 'comment' => array(
+ 'type' => 'text',
+ 'label' => t('Comment'),
+ ),
+ 'comment_type' => array(
+ 'type' => 'text',
+ 'label' => t('Comment type'),
+ 'restriction' => 'input',
+ 'options list' => 'uc_order_action_comment_types',
+ ),
),
);
$actions['uc_order_email'] = array(
- '#title' => t('Send an order email'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_action_email',
- '#arguments' => array(
+ 'label' => t('Send an order email'),
+ 'group' => t('Order'),
+ 'base' => 'uc_order_action_email',
+ 'parameter' => array(
'order' => $order_arg,
+ 'from' => array(
+ 'type' => 'text',
+ 'label' => t('Sender'),
+ ),
+ 'addresses' => array(
+ 'type' => 'text',
+ 'label' => t('Recipients'),
+ 'description' => t('Enter the email addresses to receive the notifications, one on each line. You may use order tokens for dynamic email addresses.'),
+ ),
+ 'subject' => array(
+ 'type' => 'text',
+ 'label' => t('Subject'),
+ ),
+ 'message' => array(
+ 'type' => 'text',
+ 'label' => t('Message'),
+ ),
),
);
$actions['uc_order_email_invoice'] = array(
- '#title' => t('Email an order invoice'),
- '#category' => t('Order'),
- '#callback' => 'uc_order_action_email_invoice',
- '#arguments' => array(
+ 'label' => t('Email an order invoice'),
+ 'group' => t('Order'),
+ 'base' => 'uc_order_action_email_invoice',
+ 'parameter' => array(
'order' => $order_arg,
+ 'from' => array(
+ 'type' => 'text',
+ 'label' => t('Sender'),
+ ),
+ 'addresses' => array(
+ 'type' => 'text',
+ 'label' => t('Recipients'),
+ ),
+ 'subject' => array(
+ 'type' => 'text',
+ 'label' => t('Subject'),
+ ),
+ 'template' => array(
+ 'type' => 'text',
+ 'label' => t('Invoice template'),
+ 'options list' => 'uc_order_template_options',
+ 'restriction' => 'input',
+ ),
+ 'view' => array(
+ 'type' => 'text',
+ 'label' => t('Included information'),
+ 'options list' => 'uc_order_action_email_invoice_view_options',
+ 'restriction' => 'input',
+ ),
),
);
return $actions;
}
-
/******************************************************************************
* Condition Callbacks and Forms *
******************************************************************************/
/**
- * Check the current order status.
- *
- * @see uc_order_condition_check_order_status_form()
- */
-function uc_order_condition_check_order_status($order, $settings) {
- // Return TRUE if the order status matches.
- return $order->order_status == $settings['order_status'];
-}
-
-/**
- * @see uc_order_condition_check_order_status()
- */
-function uc_order_condition_check_order_status_form($form_state, $settings = array()) {
- foreach (uc_order_status_list('general') as $status) {
- $options[$status['id']] = $status['title'];
- }
- foreach (uc_order_status_list('specific') as $status) {
- $options[$status['id']] = $status['title'];
- }
- $form['order_status'] = array(
- '#type' => 'select',
- '#title' => t('Order status'),
- '#options' => $options,
- '#default_value' => $settings['order_status'],
- );
-
- return $form;
-}
-
-/**
- * Check the current order balance.
- *
- * @see uc_order_condition_total_form()
- */
-function uc_order_condition_total($order, $settings) {
- switch ($settings['order_total_comparison']) {
- case 'less':
- return $order->order_total < $settings['order_total_value'];
- case 'less_equal':
- return $order->order_total <= $settings['order_total_value'];
- case 'equal':
- return $order->order_total == $settings['order_total_value'];
- case 'greater_equal':
- return $order->order_total >= $settings['order_total_value'];
- case 'greater':
- return $order->order_total > $settings['order_total_value'];
- }
-}
-
-/**
- * @see uc_order_condition_total()
- */
-function uc_order_condition_total_form($form_state, $settings = array()) {
- $form['order_total_value'] = array(
- '#type' => 'textfield',
- '#title' => t('Order total value'),
- '#description' => t('Specify a value to compare the order total against.'),
- '#default_value' => $settings['order_total_value'],
- '#size' => 16,
- '#field_prefix' => variable_get('uc_sign_after_amount', FALSE) ? '' : variable_get('uc_currency_sign', '$'),
- '#field_suffix' => variable_get('uc_sign_after_amount', FALSE) ? variable_get('uc_currency_sign', '$') : '',
- );
-
- $options = array(
- 'less' => t('Total is less than specified value.'),
- 'less_equal' => t('Total is less than or equal to specified value.'),
- 'equal' => t('Total is equal to specified value.'),
- 'greater_equal' => t('Total is greater than or equal to specified value.'),
- 'greater' => t('Total is greater than specified value.'),
- );
- $form['order_total_comparison'] = array(
- '#type' => 'radios',
- '#title' => t('Order total comparison type'),
- '#options' => $options,
- '#default_value' => isset($settings['order_total_comparison']) ? $settings['order_total_comparison'] : 'greater_equal',
- );
-
- return $form;
-}
-
-/**
- * Check an order's delivery postal code.
- *
- * @see uc_order_condition_delivery_postal_code_form()
- */
-function uc_order_condition_delivery_postal_code($order, $settings) {
- // Trim the wildcard off the pattern.
- $pattern = rtrim($settings['pattern'], '*');
-
- // Return TRUE if the delivery postal code begins with the pattern.
- return strpos($order->delivery_postal_code, $pattern) === 0;
-}
-
-/**
- * @see uc_order_condition_delivery_postal_code()
- */
-function uc_order_condition_delivery_postal_code_form($form_state, $settings = array()) {
- $form['pattern'] = array(
- '#type' => 'textfield',
- '#title' => uc_get_field_name('postal_code'),
- '#default_value' => $settings['pattern'],
- '#description' => t('Specify a postal code or postal code pattern. Use "*" as a wild card to specify a range of postal codes.
Example: In the US, 402* represents all areas from 40200 to 40299.'),
- '#size' => 15,
- // '#required' => TRUE,
- );
-
- return $form;
-}
-
-/**
- * Check an order's delivery zone.
- *
- * @see uc_order_condition_delivery_zone_form()
- */
-function uc_order_condition_delivery_zone($order, $settings) {
- return in_array($order->delivery_zone, $settings['zones']);
-}
-
-/**
- * @see uc_order_condition_delivery_zone_form()
- */
-function uc_order_condition_delivery_zone_form($form_state, $settings = array()) {
- $result = db_query("SELECT z.*, c.country_name FROM {uc_zones} AS z LEFT JOIN {uc_countries} AS c ON z.zone_country_id = c.country_id ORDER BY c.country_name, z.zone_name");
- foreach ($result as $zone) {
- $options[$zone->country_name][$zone->zone_id] = $zone->zone_name;
- }
-
- $form['zones'] = array(
- '#type' => 'select',
- '#title' => uc_get_field_name('zone'),
- '#options' => $options,
- '#default_value' => $settings['zones'],
- '#multiple' => TRUE,
- // '#required' => TRUE,
- );
-
- return $form;
-}
-
-/**
- * Check an order's delivery country.
- *
- * @see uc_order_condition_delivery_country_form()
- */
-function uc_order_condition_delivery_country($order, $settings) {
- return in_array($order->delivery_country, $settings['countries']);
-}
-
-/**
- * @see uc_order_condition_delivery_country()
- */
-function uc_order_condition_delivery_country_form($form_state, $settings = array()) {
- $form['countries'] = uc_country_select(uc_get_field_name('country'));
- $form['countries']['#default_value'] = $settings['countries'];
- $form['countries']['#multiple'] = TRUE;
- // $form['countries']['#required'] = TRUE;
-
- return $form;
-}
-
-/**
- * Check an order's billing postal code.
- *
- * @see uc_order_condition_billing_postal_code_form()
- */
-function uc_order_condition_billing_postal_code($order, $settings) {
- // Trim the wildcard off the pattern.
- $pattern = rtrim($settings['pattern'], '*');
-
- // Return TRUE if the delivery postal code begins with the pattern.
- return strpos($order->billing_postal_code, $pattern) === 0;
-}
-
-/**
- * @see uc_order_condition_billing_postal_code()
- */
-function uc_order_condition_billing_postal_code_form($form_state, $settings = array()) {
- $form['pattern'] = array(
- '#type' => 'textfield',
- '#title' => uc_get_field_name('postal_code'),
- '#default_value' => $settings['pattern'],
- '#description' => t('Specify a postal code or postal code pattern. Use "*" as a wild card to specify a range of postal codes.
Example: In the US, 402* represents all areas from 40200 to 40299.'),
- '#size' => 15,
- // '#required' => TRUE,
- );
-
- return $form;
-}
-
-/**
- * Check an order's billing zone.
- *
- * @see uc_order_condition_billing_zone_form()
- */
-function uc_order_condition_billing_zone($order, $settings) {
- return in_array($order->billing_zone, $settings['zones']);
-}
-
-/**
- * @see uc_order_condition_billing_zone()
- */
-function uc_order_condition_billing_zone_form($form_state, $settings = array()) {
- $result = db_query("SELECT z.*, c.country_name FROM {uc_zones} AS z LEFT JOIN {uc_countries} AS c ON z.zone_country_id = c.country_id ORDER BY c.country_name, z.zone_name");
- foreach ($result as $zone) {
- $options[$zone->country_name][$zone->zone_id] = $zone->zone_name;
- }
-
- $form['zones'] = array(
- '#type' => 'select',
- '#title' => uc_get_field_name('zone'),
- '#options' => $options,
- '#default_value' => $settings['zones'],
- '#multiple' => TRUE,
- // '#required' => TRUE,
- );
-
- return $form;
-}
-
-/**
- * Check an order's billing country.
- *
- * @see uc_order_condition_billing_country_form()
- */
-function uc_order_condition_billing_country($order, $settings) {
- return in_array($order->billing_country, $settings['countries']);
-}
-
-/**
- * @see uc_order_condition_billing_country()
- */
-function uc_order_condition_billing_country_form($form_state, $settings = array()) {
- $form['countries'] = uc_country_select(uc_get_field_name('country'));
- $form['countries']['#default_value'] = $settings['countries'];
- $form['countries']['#multiple'] = TRUE;
- // $form['countries']['#required'] = TRUE;
-
- return $form;
-}
-
-/**
* Check that the order has the selected combination of products.
*
* @see uc_order_condition_has_products_form()
@@ -806,255 +455,6 @@
return uc_order_is_shippable($order);
}
-/**
- * Check a user name.
- *
- * @see uc_order_condition_user_name()
- */
-function uc_order_condition_user_name($order, $settings) {
- if (empty($order->uid)) {
- // Anonymous users have no names.
- return empty($settings['name']);
- }
- else {
- // Load from the order.
- if ($account = uc_order_user_load($order)) {
- return $account->name == $settings['name'];
- }
- // Or, if the user doesn't exist anymore, return FALSE
- else {
- return FALSE;
- }
- }
-}
-
-/**
- * @see uc_order_condition_user_name()
- */
-function uc_order_condition_user_name_form($form_state, $settings = array()) {
- $form['name'] = array(
- '#type' => 'textfield',
- '#title' => t('User name'),
- '#default_value' => isset($settings['name']) ? $settings['name'] : '',
- '#autocomplete_path' => 'user/autocomplete',
- '#description' => t('Leave blank for %anonymous.', array('%anonymous' => variable_get('anonymous', t('Anonymous')))),
- );
-
- return $form;
-}
-
-/**
- * Check an user email.
- *
- * @see uc_order_condition_user_email_form()
- */
-function uc_order_condition_user_mail($order, $settings) {
- $account = uc_order_user_load($order);
- return $account->mail == $settings['mail'];
-}
-
-/**
- * @see uc_order_condition_user_mail()
- */
-function uc_order_condition_user_mail_form($form_state, $settings = array()) {
- $form['mail'] = array(
- '#type' => 'textfield',
- '#title' => t('User email'),
- '#default_value' => isset($settings['mail']) ? $settings['mail'] : '',
- );
-
- return $form;
-}
-
-/**
- * Check an user creation date.
- *
- * @see uc_order_condition_user_created_form()
- */
-function uc_order_condition_user_created($order, $settings) {
- $account = uc_order_user_load($order);
-
- // Get the beginning of the day the user registered.
- $user_created = $account->created - ($account->created % 86400);
- $settings_created = gmmktime(0, 0, 0, $settings['created']['month'], $settings['created']['day'], $settings['created']['year']);
-
- switch ($settings['operator']) {
- case 'less':
- return $user_created < $settings_created;
- case 'less_equal':
- return $user_created <= $settings_created;
- case 'equal':
- return $user_created == $settings_created;
- case 'not_equal':
- return $user_created != $settings_created;
- case 'greater_equal':
- return $user_created >= $settings_created;
- case 'greater':
- return $user_created > $settings_created;
- }
-}
-
-/**
- * @see uc_order_condition_user_created()
- */
-function uc_order_condition_user_created_form($form_state, $settings = array()) {
- $form['operator'] = array(
- '#type' => 'radios',
- '#title' => t('Operator'),
- '#options' => array(
- 'less' => t('User was created before the specified date.'),
- 'less_equal' => t('User was created on or before the specified date.'),
- 'equal' => t('User was created on the specified date.'),
- 'not_equal' => t('User was not created on the specified date.'),
- 'greater_equal' => t('User was created on or after the specified date.'),
- 'greater' => t('User was created after the specified date.'),
- ),
- '#default_value' => isset($settings['operator']) ? $settings['operator'] : 'equal',
- );
- $form['created'] = array(
- '#type' => 'date',
- '#title' => t('User creation date'),
- '#default_value' => isset($settings['created']) ? $settings['created'] : '',
- );
-
- return $form;
-}
-
-/**
- * Check an user last login date.
- *
- * @see uc_order_condition_user_login_form()
- */
-function uc_order_condition_user_login($order, $settings) {
- $account = uc_order_user_load($order);
-
- // Get the beginning of the day the user last logged in.
- $user_login = $account->login - ($account->login % 86400);
- $settings_login = gmmktime(0, 0, 0, $settings['login']['month'], $settings['login']['day'], $settings['login']['year']);
-
- switch ($settings['operator']) {
- case 'less':
- return $user_login < $settings_login;
- case 'less_equal':
- return $user_login <= $settings_login;
- case 'equal':
- return $user_login == $settings_login;
- case 'not_equal':
- return $user_login != $settings_login;
- case 'greater_equal':
- return $user_login >= $settings_login;
- case 'greater':
- return $user_login > $settings_login;
- }
-}
-
-/**
- * @see uc_order_condition_user_login()
- */
-function uc_order_condition_user_login_form($form_state, $settings = array()) {
- $form['operator'] = array(
- '#type' => 'radios',
- '#title' => t('Operator'),
- '#options' => array(
- 'less' => t('User last logged in before the specified date.'),
- 'less_equal' => t('User last logged in on, or before the specified date.'),
- 'equal' => t('User last logged in on the specified date.'),
- 'not_equal' => t('User did not log in last on the specified date.'),
- 'greater_equal' => t('User last logged in on or after the specified date.'),
- 'greater' => t('User last logged after the specified date.'),
- ),
- '#default_value' => isset($settings['operator']) ? $settings['operator'] : 'equal',
- );
- $form['login'] = array(
- '#type' => 'date',
- '#title' => t('User last login date'),
- '#default_value' => isset($settings['created']) ? $settings['created'] : '',
- );
-
- return $form;
-}
-
-/**
- * Check an user language setting.
- *
- * @see uc_order_condition_user_language_form()
- */
-function uc_order_condition_user_language($order, $settings) {
- $account = uc_order_user_load($order);
- $user_prefered_language = user_preferred_language($account);
- return $user_prefered_language->language == $settings['language'];
-}
-
-/**
- * @see uc_order_condition_user_language()
- */
-function uc_order_condition_user_language_form($form_state, $settings = array()) {
- $languages = language_list();
- $options = array();
- foreach ($languages as $language) {
- $options[$language->language] = $language->name . ' (' . $language->native . ')';
- }
- $form['language'] = array(
- '#type' => 'select',
- '#title' => t('User language setting'),
- '#options' => $options,
- '#default_value' => isset($settings['language']) ? $settings['language'] : '',
- );
-
- return $form;
-}
-
-/**
- * Check an user roles.
- *
- * @see uc_order_condition_user_roles_form()
- */
-function uc_order_condition_user_roles($order, $settings) {
- $account = uc_order_user_load($order);
- $settings['roles'] = array_filter($settings['roles']);
-
- if ($settings['operator'] == 'AND') {
- foreach ($settings['roles'] as $key) {
- if (!isset($account->roles[$key])) {
- return FALSE;
- }
- }
- return TRUE;
- }
- else {
- foreach ($settings['roles'] as $key) {
- if (isset($account->roles[$key])) {
- return TRUE;
- }
- }
- return FALSE;
- }
-}
-
-/**
- * @see uc_order_condition_user_roles()
- */
-function uc_order_condition_user_roles_form($form_state, $settings = array()) {
- $form['operator'] = array(
- '#type' => 'radios',
- '#title' => t('Operator'),
- '#description' => t('If you use an AND case and want to check a custom role, make sure authenticated user is checked too or the condition will return FALSE.'),
- '#options' => array(
- 'AND' => t('AND: If the user has all of these roles.'),
- 'OR' => t('OR: If the user has any of these roles.'),
- ),
- '#default_value' => isset($settings['operator']) ? $settings['operator'] : 'AND',
- );
- $form['roles'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Roles'),
- '#options' => user_roles(),
- '#default_value' => isset($settings['roles']) ? $settings['roles'] : array(),
- );
-
- return $form;
-}
-
/******************************************************************************
* Action Callbacks and Forms *
******************************************************************************/
@@ -1073,21 +473,17 @@
/**
* @see uc_order_action_update_status()
*/
-function uc_order_action_update_status_form($form_state, $settings = array()) {
+function uc_order_action_update_status_options() {
+ $options = array();
+
foreach (uc_order_status_list('general') as $status) {
$options[$status['id']] = $status['title'];
}
foreach (uc_order_status_list('specific') as $status) {
$options[$status['id']] = $status['title'];
}
- $form['order_status'] = array(
- '#type' => 'select',
- '#title' => t('Order status'),
- '#options' => $options,
- '#default_value' => $settings['order_status'],
- );
- return $form;
+ return $options;
}
/**
@@ -1105,25 +501,12 @@
/**
* @see uc_order_action_add_comment()
*/
-function uc_order_action_add_comment_form($form_state, $settings = array()) {
- $form['comment_type'] = array(
- '#type' => 'radios',
- '#title' => t('Select an order comment type'),
- '#options' => array(
- 'admin' => t('Enter this as an admin comment.'),
- 'order' => t('Enter this as a customer order comment.'),
- 'notified' => t('Enter this as a customer order comment with a notified icon.'),
- ),
- '#default_value' => $settings['comment_type'],
- );
- $form['comment'] = array(
- '#type' => 'textarea',
- '#title' => t('Comment'),
- '#description' => t('Enter the comment message. Uses order, store, and site tokens.', array('!url' => url('admin/store/help/tokens'))),
- '#default_value' => $settings['comment'],
- );
-
- return $form;
+function uc_order_action_order_comment_types() {
+ return array(
+ 'admin' => t('Enter this as an admin comment.'),
+ 'order' => t('Enter this as a customer order comment.'),
+ 'notified' => t('Enter this as a customer order comment with a notified icon.'),
+ );
}
/**
@@ -1247,61 +630,10 @@
/**
* @see uc_order_action_email_invoice()
*/
-function uc_order_action_email_invoice_form($form_state, $settings = array()) {
- $form['from'] = array(
- '#type' => 'textfield',
- '#title' => t('Sender'),
- '#default_value' => isset($settings['from']) ? $settings['from'] : uc_store_email_from(),
- '#description' => t('The "From" address.'),
- '#required' => TRUE,
- );
- $form['addresses'] = array(
- '#type' => 'textarea',
- '#title' => t('Recipients'),
- '#default_value' => isset($settings['addresses']) ? $settings['addresses'] : '[uc_order:email]',
- '#description' => t('Enter the email addresses to receive the notifications, one on each line. You may use order tokens for dynamic email addresses.'),
- '#required' => TRUE,
- );
- $form['subject'] = array(
- '#type' => 'textfield',
- '#title' => t('Subject'),
- '#default_value' => $settings['subject'],
- '#required' => TRUE,
- );
-
- $form['token_help'] = array(
- '#type' => 'fieldset',
- '#title' => t('Replacement patterns'),
- '#description' => t('You can make use of the replacement patterns in the recipients, the subject, and the template file.'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- foreach (array('global', 'order') as $name) {
- $form['token_help'][$name] = array(
- '#type' => 'fieldset',
- '#title' => t('@name replacement patterns', array('@name' => drupal_ucfirst($name))),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- );
- }
-
- $form['template'] = array(
- '#type' => 'select',
- '#title' => t('Invoice template'),
- '#description' => t('Select the invoice template to use for this email.'),
- '#options' => uc_order_template_options(),
- '#default_value' => $settings['template'],
- );
- $form['view'] = array(
- '#type' => 'radios',
- '#title' => t('Included information'),
- '#options' => array(
- 'print' => t('Show the business header and shipping method.'),
- 'admin-mail' => t('Show all of the above plus the help text, email text, and store footer.'),
- 'checkout-mail' => t('Show all of the above plus the "thank you" message.'),
- ),
- '#default_value' => $settings['view'],
- );
-
- return $form;
+function uc_order_action_email_invoice_view_options() {
+ return array(
+ 'print' => t('Show the business header and shipping method.'),
+ 'admin-mail' => t('Show all of the above plus the help text, email text, and store footer.'),
+ 'checkout-mail' => t('Show all of the above plus the "thank you" message.'),
+ );
}
=== added file 'uc_order/uc_order.rules_defaults.inc'
--- uc_order/uc_order.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ uc_order/uc_order.rules_defaults.inc 2010-06-21 18:52:52 +0000
@@ -0,0 +1,31 @@
+label = t('E-mail an order update notification');
+ $rule->active = TRUE;
+ $rule->event('uc_order_status_email_update')
+ ->condition(rules_condition('data_is', array('data:select' => 'order:order-status', 'value' => 'in_checkout'))->negate())
+ ->action('uc_order_email', array(
+ 'order:select' => 'order',
+ 'from' => uc_store_email_from(),
+ 'addresses' => '[uc_order:email]',
+ 'subject' => t('Order #[uc_order:order-id] Update'),
+ 'message' => uc_get_message('order_update_email'),
+ 'format' => filter_default_format(),
+ ));
+
+ $configs['uc_order_update_email_customer'] = $rule;
+
+ return $configs;
+}
+
=== modified file 'uc_order/uc_order.tokens.inc'
--- uc_order/uc_order.tokens.inc 2010-04-05 19:24:56 +0000
+++ uc_order/uc_order.tokens.inc 2010-06-22 16:51:50 +0000
@@ -157,8 +157,12 @@
break;
}
- $values[$tokens['url']] = $url;
- $values[$tokens['link']] = l($order->order_id, $url);
+ if (isset($tokens['url'])) {
+ $values[$tokens['url']] = $url;
+ }
+ if (isset($tokens['link'])) {
+ $values[$tokens['link']] = l($order->order_id, $url);
+ }
break;
case 'admin-url':
@@ -170,8 +174,12 @@
break;
}
- $values[$tokens['admin-url']] = $admin_url;
- $values[$tokens['admin-link']] = l($order->order_id, $admin_url);
+ if (isset($tokens['admin-url'])) {
+ $values[$tokens['admin-url']] = $admin_url;
+ }
+ if (isset($tokens['admin-link'])) {
+ $values[$tokens['admin-link']] = l($order->order_id, $admin_url);
+ }
break;
case 'subtotal':
=== modified file 'uc_stock/uc_stock.info'
--- uc_stock/uc_stock.info 2010-04-05 19:55:02 +0000
+++ uc_stock/uc_stock.info 2010-06-22 18:05:23 +0000
@@ -1,7 +1,6 @@
; $Id$
name = Stock
description = Manage stock levels of your Ubercart products
-dependencies[] = ca
dependencies[] = uc_product
dependencies[] = uc_reports
dependencies[] = uc_store
=== modified file 'uc_stock/uc_stock.module'
--- uc_stock/uc_stock.module 2010-04-13 13:27:26 +0000
+++ uc_stock/uc_stock.module 2010-06-22 18:05:23 +0000
@@ -14,8 +14,6 @@
* Development sponsored by the Ubercart project. http://www.ubercart.org
*/
-require_once('uc_stock.ca.inc');
-
/******************************************************************************
* Hook Functions (Drupal) *
******************************************************************************/
@@ -148,6 +146,15 @@
return $messages;
}
+/**
+ * Implement hook_uc_order_product_delete().
+ */
+function uc_stock_uc_order_product_delete($order_product_id) {
+ // Put back the stock.
+ $product = db_query("SELECT model, qty FROM {uc_order_products} WHERE order_product_id = :id", array(':id' => $order_product_id))->fetchObject();
+ uc_stock_adjust($product->model, $product->qty);
+}
+
/******************************************************************************
* Module and Helper Functions *
******************************************************************************/
=== renamed file 'uc_stock/uc_stock.ca.inc' => 'uc_stock/uc_stock.rules.inc'
--- uc_stock/uc_stock.ca.inc 2010-04-13 13:27:26 +0000
+++ uc_stock/uc_stock.rules.inc 2010-06-22 18:05:23 +0000
@@ -3,61 +3,32 @@
/**
* @file
- * This file contains all the Workflow-NG hooks that are neccesary for Workflow
- * integeration with the uc_stock module
+ * Rules hooks for uc_stock.module.
*/
-/******************************************************************************
- * Conditional Action Hooks *
- ******************************************************************************/
-
/**
- * Implement hook_ca_predicate().
+ * Implement hook_rules_action_info().
*/
-function uc_stock_ca_predicate() {
- $predicates['uc_stock_decrement_on_order'] = array(
- '#title' => t('Decrement stock upon order submission'),
- '#trigger' => 'uc_checkout_complete',
- '#class' => 'uc_stock',
- '#status' => 1,
- '#actions' => array(
- array(
- '#name' => 'uc_stock_action_decrement_stock',
- '#title' => t('Decrement stock of products in order'),
- '#argument_map' => array(
- 'order' => 'order',
- ),
+function uc_stock_rules_action_info() {
+ $actions['uc_stock_action_decrement_stock'] = array(
+ 'label' => t('Decrement stock of products on the order with tracking activated.'),
+ 'group' => t('Stock'),
+ 'base' => 'uc_stock_action_decrement_stock',
+ 'parameter' => array(
+ 'order' => array(
+ 'type' => 'uc_order',
+ 'label' => t('Order'),
),
),
);
- return $predicates;
-}
-
-/**
- * Implement hook_action().
- */
-function uc_stock_ca_action() {
- $actions['uc_stock_action_decrement_stock'] = array(
- '#title' => t('Decrement stock of products on the order with tracking activated.'),
- '#callback' => 'uc_stock_action_decrement_stock',
- '#arguments' => array(
- 'order' => array('#entity' => 'uc_order', '#title' => t('Order')),
- ),
- '#category' => t('Stock'),
- );
-
return $actions;
}
-/******************************************************************************
- * Conditional Action Callbacks and Forms *
- ******************************************************************************/
-
/**
* Decrease the stock of ordered products.
*/
-function uc_stock_action_decrement_stock($order, $settings) {
+function uc_stock_action_decrement_stock($order) {
if (is_array($order->products)) {
array_walk($order->products, 'uc_stock_adjust_product_stock', $order);
}
=== added file 'uc_stock/uc_stock.rules_defaults.inc'
--- uc_stock/uc_stock.rules_defaults.inc 1970-01-01 00:00:00 +0000
+++ uc_stock/uc_stock.rules_defaults.inc 2010-06-22 18:05:23 +0000
@@ -0,0 +1,23 @@
+label = t('Decrement stock upon order submission');
+ $rule->active = TRUE;
+ $rule->event('uc_checkout_complete');
+ $rule->action('uc_stock_action_decrement_stock', array('order:select' => 'order'));
+ $configs['uc_stock_decrement_on_order'] = $rule;
+
+ return $configs;
+}
+
=== modified file 'uc_store/uc_store.module'
--- uc_store/uc_store.module 2010-06-11 19:31:18 +0000
+++ uc_store/uc_store.module 2010-06-11 20:14:33 +0000
@@ -68,10 +68,10 @@
public $street2 = '';
public $city = '';
public $zone = 0;
- public $postal_code = 0;
+ public $postal_code = '';
public $country = 0;
public $phone = '';
- public $emial = '';
+ public $email = '';
function __construct() { }
@@ -1289,6 +1289,19 @@
}
/**
+ * Helper function to return zone options, grouped by country.
+ */
+function uc_zone_option_list() {
+ $result = db_query("SELECT z.*, c.country_name FROM {uc_zones} AS z LEFT JOIN {uc_countries} AS c ON z.zone_country_id = c.country_id ORDER BY c.country_name, z.zone_name");
+
+ foreach ($result as $zone) {
+ $options[$zone->country_name][$zone->zone_id] = $zone->zone_name;
+ }
+
+ return $options;
+}
+
+/**
* Retrieve a country's name from the database, using its ID.
*
* @param $id
@@ -1339,6 +1352,20 @@
return $select;
}
+function uc_country_option_list() {
+ $result = db_query("SELECT * FROM {uc_countries} WHERE version > :version ORDER BY :sort", array(':version' => 0, ':sort' => 'country_name'));
+
+ $options = array();
+ while ($country = $result->fetchAssoc()) {
+ $options[$country['country_id']] = $country['country_name'];
+ }
+ if (count($options) == 0) {
+ $options[] = t('No countries found.');
+ }
+
+ return $options;
+}
+
/**
* Create a day select box for a form.
*/
=== modified file 'uc_taxes/uc_taxes.admin.inc'
--- uc_taxes/uc_taxes.admin.inc 2010-03-24 13:11:48 +0000
+++ uc_taxes/uc_taxes.admin.inc 2010-06-10 19:18:33 +0000
@@ -12,7 +12,7 @@
function uc_taxes_admin_settings() {
$rows = array();
- $header = array(t('Name'), t('Rate'), t('Taxed products'), t('Taxed product types'), t('Taxed line items'), t('Weight'), array('data' => t('Operations'), 'colspan' => 4));
+ $header = array(t('Name'), t('Rate'), t('Taxed products'), t('Taxed product types'), t('Taxed line items'), t('Weight'), array('data' => t('Operations'), 'colspan' => 3));
// Loop through all the defined tax rates.
foreach (uc_taxes_rate_load() as $rate_id => $rate) {
@@ -27,7 +27,6 @@
implode(', ', $rate->taxed_line_items),
$rate->weight,
l(t('edit'), 'admin/store/settings/taxes/' . $rate_id . '/edit'),
- l(t('conditions'), CA_UI_PATH . '/uc_taxes_' . $rate_id . '/edit/conditions'),
l(t('clone'), 'admin/store/settings/taxes/' . $rate_id . '/clone'),
l(t('delete'), 'admin/store/settings/taxes/' . $rate_id . '/delete'),
);
@@ -35,7 +34,7 @@
// Let the user know if no tax rates are defined.
if (empty($rows)) {
- $rows[] = array(array('data' => t('No rates available.'), 'colspan' => 10));
+ $rows[] = array(array('data' => t('No rates available.'), 'colspan' => 9));
}
// Build the output including the table and a link to add a new rate.
@@ -140,6 +139,11 @@
'#default_value' => $rate_id ? $rate->weight : 0,
);
+ if (module_exists('rules')) {
+ $conditions = rules_config_load('uc_taxes_' . $rate->id);
+ $conditions->form($form, $form_state);
+ }
+
$form['submit'] = array(
'#type' => 'submit',
'#value' => t('Submit'),
@@ -184,11 +188,14 @@
);
uc_taxes_rate_save((object) $rate);
- // Update the name of the associated predicate.
- db_update('ca_predicates')
- ->fields(array('title' => $rate['name']))
- ->condition('pid', 'uc_taxes_' . $rate['id'])
- ->execute();
+ // Update the name of the associated conditions.
+ if (module_exists('rules')) {
+ $conditions = rules_config_load('uc_taxes_' . $rate['id']);
+ if ($conditions) {
+ $conditions->label = $rate['name'];
+ $conditions->save();
+ }
+ }
// Display a message and redirect back to the overview.
drupal_set_message(t('Tax rate %name saved.', array('%name' => $form_state['values']['name'])));
@@ -211,10 +218,10 @@
// Save the new rate.
$rate = uc_taxes_rate_save($rate);
- // Clone the associated predicate as well.
- if ($predicate = ca_load_predicate('uc_taxes_' . $rate_id)) {
- $predicate['#pid'] = 'uc_taxes_' . $rate->id;
- ca_save_predicate($predicate);
+ // Clone the associated conditions as well.
+ if ($conditions = rules_config_load('uc_taxes_' . $rate_id)) {
+ unset($conditions->id);
+ $conditions->save('uc_taxes_' . $rate->id);
}
// Display a message and redirect back to the overview.
=== modified file 'uc_taxes/uc_taxes.api.php'
--- uc_taxes/uc_taxes.api.php 2010-03-16 21:15:17 +0000
+++ uc_taxes/uc_taxes.api.php 2010-06-09 19:05:00 +0000
@@ -20,17 +20,6 @@
* An array of tax line item objects keyed by a module-specific id.
*/
function hook_uc_calculate_tax($order) {
- global $user;
- if (is_numeric($order)) {
- $order = uc_order_load($order);
- $account = user_load(array('uid' => $order->uid));
- }
- elseif ((int)$order->uid) {
- $account = user_load(array('uid' => intval($order->uid)));
- }
- else {
- $account = $user;
- }
if (!is_object($order)) {
return array();
}
@@ -54,25 +43,8 @@
$use_same_rates = FALSE;
}
- $arguments = array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- '#data' => $order,
- ),
- 'tax' => array(
- '#entity' => 'tax',
- '#title' => t('Tax rule'),
- // #data => each $tax in the following foreach() loop;
- ),
- 'account' => array(
- '#entity' => 'user',
- '#title' => t('User'),
- '#data' => $account,
- ),
- );
+ $use_rules = module_exists('rules');
- $predicates = ca_load_trigger_predicates('calculate_taxes');
foreach (uc_taxes_rate_load() as $tax) {
if ($use_same_rates) {
foreach ((array)$order->line_items as $old_line) {
@@ -83,9 +55,16 @@
}
}
- $arguments['tax']['#data'] = $tax;
- if (ca_evaluate_conditions($predicates['uc_taxes_' . $tax->id], $arguments)) {
- $line_item = uc_taxes_action_apply_tax($order, $tax);
+ if ($use_rules) {
+ $set = rules_config_load('uc_taxes_' . $tax->id);
+ $apply = $set->execute($order);
+ }
+ else {
+ $apply = TRUE;
+ }
+
+ if ($apply) {
+ $line_item = uc_taxes_apply_tax($order, $tax);
if ($line_item) {
$order->taxes[$line_item->id] = $line_item;
}
=== modified file 'uc_taxes/uc_taxes.info'
--- uc_taxes/uc_taxes.info 2010-02-02 15:41:04 +0000
+++ uc_taxes/uc_taxes.info 2010-06-21 19:34:42 +0000
@@ -4,10 +4,10 @@
dependencies[] = uc_store
dependencies[] = uc_payment
dependencies[] = uc_product
-dependencies[] = ca
package = "Ubercart - core (optional)"
core = 7.x
files[] = uc_taxes.module
files[] = uc_taxes.install
files[] = uc_taxes.admin.inc
files[] = uc_taxes.ca.inc
+files[] = uc_taxes.rules_defaults.inc
=== modified file 'uc_taxes/uc_taxes.module'
--- uc_taxes/uc_taxes.module 2010-06-03 19:26:32 +0000
+++ uc_taxes/uc_taxes.module 2010-06-21 19:34:42 +0000
@@ -8,27 +8,11 @@
* Allows tax rules to be set up and applied to orders.
*/
-require_once('uc_taxes.ca.inc');
-
/******************************************************************************
* Drupal Hooks *
******************************************************************************/
/**
- * Implement hook_help().
- */
-function uc_taxes_help($path, $arg) {
- $output = '';
-
- switch ($path) {
- case 'admin/store/settings/taxes':
- return t('Add tax rates through this page and then use the conditional actions interface to add conditions to the taxes that limit which orders they are applied to. Especially important are the geographic area conditions for the delivery address. Use the conditions link to jump to a particular tax rate conditions configuration page.', array('!url' => url(CA_UI_PATH)));
- }
-
- return $output;
-}
-
-/**
* Implement hook_permission().
*/
function uc_taxes_permission() {
@@ -276,6 +260,10 @@
drupal_write_record('uc_taxes', $rate, array('id'));
}
+ if (module_exists('rules')) {
+ rules_clear_cache();
+ }
+
return $rate;
}
@@ -328,8 +316,10 @@
->condition('id', $rate_id)
->execute();
- // Delete the associated predicated if it has been saved to the database.
- ca_delete_predicate('uc_taxes_' . $rate_id);
+ // Delete the associated conditions if they have been saved to the database.
+ if (module_exists('rules')) {
+ rules_config_delete(array('uc_taxes_' . $rate_id));
+ }
}
/**
@@ -351,17 +341,6 @@
* Calculate the amount and types of taxes that apply to an order.
*/
function uc_taxes_uc_calculate_tax($order) {
- global $user;
- if (is_numeric($order)) {
- $order = uc_order_load($order);
- $account = user_load($order->uid);
- }
- elseif ((int)$order->uid) {
- $account = user_load(intval($order->uid));
- }
- else {
- $account = $user;
- }
if (!is_object($order)) {
return array();
}
@@ -385,25 +364,8 @@
$use_same_rates = FALSE;
}
- $arguments = array(
- 'order' => array(
- '#entity' => 'uc_order',
- '#title' => t('Order'),
- '#data' => $order,
- ),
- 'tax' => array(
- '#entity' => 'tax',
- '#title' => t('Tax rule'),
- // #data => each $tax in the following foreach() loop;
- ),
- 'account' => array(
- '#entity' => 'user',
- '#title' => t('User'),
- '#data' => $account,
- ),
- );
+ $use_rules = module_exists('rules');
- $predicates = ca_load_trigger_predicates('calculate_taxes');
foreach (uc_taxes_rate_load() as $tax) {
if ($use_same_rates) {
foreach ((array)$order->line_items as $old_line) {
@@ -414,9 +376,16 @@
}
}
- $arguments['tax']['#data'] = $tax;
- if (ca_evaluate_conditions($predicates['uc_taxes_' . $tax->id], $arguments)) {
- $line_item = uc_taxes_action_apply_tax($order, $tax);
+ if ($use_rules) {
+ $set = rules_config_load('uc_taxes_' . $tax->id);
+ $apply = $set->execute($order);
+ }
+ else {
+ $apply = TRUE;
+ }
+
+ if ($apply) {
+ $line_item = uc_taxes_apply_tax($order, $tax);
if ($line_item) {
$order->taxes[$line_item->id] = $line_item;
}
=== renamed file 'uc_taxes/uc_taxes.ca.inc' => 'uc_taxes/uc_taxes.rules_defaults.inc'
--- uc_taxes/uc_taxes.ca.inc 2010-03-16 21:15:17 +0000
+++ uc_taxes/uc_taxes.rules_defaults.inc 2010-06-10 19:17:11 +0000
@@ -3,109 +3,27 @@
/**
* @file
- * This file contains the Conditional Action hooks and functions necessary to
- * make the tax related entity, conditions, events, and actions work.
- */
-
-/******************************************************************************
- * Conditional Action Hooks *
- ******************************************************************************/
-
-/**
- * Implement hook_ca_entity().
- */
-function uc_taxes_ca_entity() {
- $entities['tax'] = array(
- '#title' => t('Tax rule'),
- '#type' => 'object',
- );
- return $entities;
-}
-
-/**
- * Implement hook_ca_trigger().
- *
- * Register an event for each tax rule in {uc_taxes}.
- */
-function uc_taxes_ca_trigger() {
- $triggers = array();
-
- $triggers['calculate_taxes'] = array(
- '#title' => t('Calculate taxes'),
- '#category' => t('Taxes'),
- '#arguments' => array(
- 'order' => array('#entity' => 'uc_order', '#title' => t('Order')),
- 'tax' => array('#entity' => 'tax', '#title' => t('Tax rule')),
- 'account' => array('#entity' => 'user', '#title' => t('User account')),
- ),
- );
-
- return $triggers;
-}
-
-/**
- * Implement hook_action_info().
- */
-function uc_taxes_ca_action() {
- $actions = array();
-
- // Loop through all the defined tax rates.
- foreach (uc_taxes_rate_load() as $rate) {
- $actions['uc_taxes_action_apply_tax_' . $rate->id] = array(
- '#title' => t('Apply !name', array('!name' => $rate->name)),
- '#category' => t('Taxes'),
- '#callback' => 'uc_taxes_action_apply_tax',
- '#arguments' => array(
- 'order' => array('#entity' => 'uc_order', '#title' => t('Order')),
- 'tax' => array('#entity' => 'tax', '#title' => t('Tax')),
- ),
- );
- }
-
- return $actions;
-}
-
-/**
- * Action callback to calculate a tax.
- *
- * @param $order
- * The order object being considered.
- * @param $tax
- * The tax rule calculating the amount.
- * @return
- * The line item array representing the amount of tax.
- */
-function uc_taxes_action_apply_tax($order, $tax) {
- return uc_taxes_apply_tax($order, $tax);
-}
-
-/**
- * Implement hook_ca_predicate().
- *
- * Create a predicate for each event corresponding to a tax rule.
- */
-function uc_taxes_ca_predicate() {
- $predicates = array();
-
- // Loop through all the defined tax rates.
- foreach (uc_taxes_rate_load() as $rate) {
- $predicates['uc_taxes_' . $rate->id] = array(
- '#title' => $rate->name,
- '#class' => 'taxes',
- '#trigger' => 'calculate_taxes',
- '#status' => 1,
- '#actions' => array(
- array(
- '#name' => 'uc_taxes_action_apply_tax_' . $rate->id,
- '#title' => t('Apply !name', array('!name' => $rate->name)),
- '#argument_map' => array(
- 'order' => 'order',
- 'tax' => 'tax',
- ),
- ),
- ),
- );
- }
-
- return $predicates;
+ * This file contains the default Rules configurations that allow conditions to
+ * be applied to taxes.
+ */
+
+/**
+ * Implement hook_default_rules_configuration().
+ *
+ * Create a condition set for each tax rule.
+ */
+function uc_taxes_default_rules_configuration() {
+ $configs = array();
+
+ // Loop through all the defined tax rates.
+ foreach (uc_taxes_rate_load() as $rate) {
+ $set = rules_and(array(
+ 'order' => array('type' => 'uc_order', 'label' => 'Order'),
+ ));
+ $set->label = t('@name conditions', array('@name' => $rate->name));
+
+ $configs['uc_taxes_' . $rate->id] = $set;
+ }
+
+ return $configs;
}
# Begin bundle
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
nChIXjxgcAA=