diff --git a/shipping/uc_shipping/uc_shipping.admin.inc b/shipping/uc_shipping/uc_shipping.admin.inc index ecc70b7..7e10b7a 100644 --- a/shipping/uc_shipping/uc_shipping.admin.inc +++ b/shipping/uc_shipping/uc_shipping.admin.inc @@ -19,7 +19,7 @@ function uc_shipping_order_packages($order) { $row[] = $package->package_id; $product_list = array(); - $result2 = db_query("SELECT op.order_product_id, pp.qty, op.title, op.model FROM {uc_packaged_products} AS pp LEFT JOIN {uc_order_products} AS op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id", array(':id' => $package->package_id)); + $result2 = db_query("SELECT op.order_product_id, pp.qty, op.title, op.model FROM {uc_packaged_products} pp LEFT JOIN {uc_order_products} op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id", array(':id' => $package->package_id)); foreach ($result2 as $product) { $product_list[] = $product->qty . ' x ' . check_plain($product->model); } @@ -102,7 +102,7 @@ function uc_shipping_new_package($form, &$form_state, $order) { $shipping_type_weights = variable_get('uc_quote_type_weight', array()); - $result = db_query("SELECT op.order_product_id, SUM(pp.qty) AS quantity FROM {uc_packaged_products} AS pp LEFT JOIN {uc_packages} AS p ON pp.package_id = p.package_id LEFT JOIN {uc_order_products} AS op ON op.order_product_id = pp.order_product_id WHERE p.order_id = :id GROUP BY op.order_product_id", array(':id' => $order->order_id)); + $result = db_query("SELECT op.order_product_id, SUM(pp.qty) AS quantity FROM {uc_packaged_products} pp LEFT JOIN {uc_packages} p ON pp.package_id = p.package_id LEFT JOIN {uc_order_products} op ON op.order_product_id = pp.order_product_id WHERE p.order_id = :id GROUP BY op.order_product_id", array(':id' => $order->order_id)); $packaged_products = $result->fetchAllKeyed(); $form['shipping_types'] = array(); @@ -318,7 +318,7 @@ function uc_shipping_package_edit($form, &$form_state, $order, $package) { } } - $result = db_query("SELECT order_product_id, SUM(qty) AS quantity FROM {uc_packaged_products} AS pp LEFT JOIN {uc_packages} AS p ON pp.package_id = p.package_id WHERE p.order_id = :id GROUP BY order_product_id", array(':id' => $order->order_id)); + $result = db_query("SELECT order_product_id, SUM(qty) AS quantity FROM {uc_packaged_products} pp LEFT JOIN {uc_packages} p ON pp.package_id = p.package_id WHERE p.order_id = :id GROUP BY order_product_id", array(':id' => $order->order_id)); foreach ($result as $packaged_product) { // Make already packaged products unavailable, except those in this package. $products[$packaged_product->order_product_id]->qty -= $packaged_product->quantity; @@ -555,7 +555,7 @@ function uc_shipping_new_shipment($form, &$form_state, $order) { foreach ($result as $package) { $products = array(); $weight = 0; - $result2 = db_query("SELECT pp.order_product_id, pp.qty, pp.qty * op.weight AS weight, op.weight_units, op.title, op.model FROM {uc_packaged_products} AS pp LEFT JOIN {uc_order_products} AS op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id", array(':id' => $package->package_id)); + $result2 = db_query("SELECT pp.order_product_id, pp.qty, pp.qty * op.weight AS weight, op.weight_units, op.title, op.model FROM {uc_packaged_products} pp LEFT JOIN {uc_order_products} op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id", array(':id' => $package->package_id)); foreach ($result2 as $product) { $units_conversion = uc_weight_conversion($product->weight_units, $units); $weight += $product->weight * $units_conversion; diff --git a/shipping/uc_shipping/uc_shipping.module b/shipping/uc_shipping/uc_shipping.module index 09aa495..c52b6ce 100644 --- a/shipping/uc_shipping/uc_shipping.module +++ b/shipping/uc_shipping/uc_shipping.module @@ -405,7 +405,7 @@ function uc_shipping_package_load($package_id) { $weight = 0; $units = variable_get('uc_weight_unit', 'lb'); $addresses = array(); - $result = db_query("SELECT op.order_product_id, pp.qty, pp.qty * op.weight AS weight, op.weight_units, op.nid, op.title, op.model, op.price, op.data FROM {uc_packaged_products} AS pp LEFT JOIN {uc_order_products} AS op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id ORDER BY op.order_product_id", array(':id' => $package_id)); + $result = db_query("SELECT op.order_product_id, pp.qty, pp.qty * op.weight AS weight, op.weight_units, op.nid, op.title, op.model, op.price, op.data FROM {uc_packaged_products} pp LEFT JOIN {uc_order_products} op ON op.order_product_id = pp.order_product_id WHERE pp.package_id = :id ORDER BY op.order_product_id", array(':id' => $package_id)); foreach ($result as $product) { $address = uc_quote_get_default_shipping_address($product->nid); // TODO: Lodge complaint that array_unique() compares as strings. diff --git a/uc_attribute/uc_attribute.admin.inc b/uc_attribute/uc_attribute.admin.inc index c9fb190..6cbee44 100644 --- a/uc_attribute/uc_attribute.admin.inc +++ b/uc_attribute/uc_attribute.admin.inc @@ -623,7 +623,7 @@ function uc_object_attributes_form($form, &$form_state, $object, $type, $view = elseif ($view == 'add') { // Get list of attributes not already assigned to this node or class. $unused_attributes = array(); - $result = db_query("SELECT a.aid, a.name, a.label FROM {uc_attributes} AS a LEFT JOIN {uc_attribute_options} AS ao ON a.aid = ao.aid GROUP BY a.aid, a.name, a.label ORDER BY a.name"); + $result = db_query("SELECT a.aid, a.name, a.label FROM {uc_attributes} a LEFT JOIN {uc_attribute_options} ao ON a.aid = ao.aid GROUP BY a.aid, a.name, a.label ORDER BY a.name"); foreach ($result as $attribute) { if (!in_array($attribute->aid, $used_aids)) { $unused_attributes[$attribute->aid] = $attribute->name; @@ -1206,7 +1206,7 @@ function uc_product_adjustments_form($form, &$form_state, $node) { $query_from = " FROM"; $query_where = " WHERE"; $query_order = " ORDER BY"; - $result = db_query("SELECT pa.nid, pa.aid, pa.ordering, pa.display, a.name, a.ordering, ao.aid, COUNT(po.oid) FROM {uc_product_attributes} AS pa LEFT JOIN {uc_attributes} AS a ON pa.aid = a.aid LEFT JOIN {uc_attribute_options} AS ao ON a.aid = ao.aid LEFT JOIN {uc_product_options} AS po ON ao.oid = po.oid AND po.nid = :po_nid WHERE pa.nid = :pa_nid AND pa.display <> :pa_display GROUP BY ao.aid, pa.aid, pa.display, a.name, pa.ordering, a.ordering, pa.nid HAVING count(po.oid) > 0 ORDER BY pa.ordering, a.ordering", array(':po_nid' => $nid, ':pa_nid' => $nid, ':pa_display' => 3)); + $result = db_query("SELECT pa.nid, pa.aid, pa.ordering, pa.display, a.name, a.ordering, ao.aid, COUNT(po.oid) FROM {uc_product_attributes} pa LEFT JOIN {uc_attributes} a ON pa.aid = a.aid LEFT JOIN {uc_attribute_options} ao ON a.aid = ao.aid LEFT JOIN {uc_product_options} po ON ao.oid = po.oid AND po.nid = :po_nid WHERE pa.nid = :pa_nid AND pa.display <> :pa_display GROUP BY ao.aid, pa.aid, pa.display, a.name, pa.ordering, a.ordering, pa.nid HAVING count(po.oid) > 0 ORDER BY pa.ordering, a.ordering", array(':po_nid' => $nid, ':pa_nid' => $nid, ':pa_display' => 3)); $i = 1; $attribute_names = ''; $full_attributes = array(); diff --git a/uc_attribute/uc_attribute.module b/uc_attribute/uc_attribute.module index 9a01bb5..e9e0d0c 100644 --- a/uc_attribute/uc_attribute.module +++ b/uc_attribute/uc_attribute.module @@ -1154,7 +1154,7 @@ function uc_attribute_type_info($type) { function uc_product_get_attributes($nid) { $attributes = array(); - $result = db_query("SELECT upa.aid FROM {uc_product_attributes} AS upa LEFT JOIN {uc_attributes} AS ua ON upa.aid = ua.aid WHERE upa.nid = :nid ORDER BY upa.ordering, ua.name", array(':nid' => $nid)); + $result = db_query("SELECT upa.aid FROM {uc_product_attributes} upa LEFT JOIN {uc_attributes} ua ON upa.aid = ua.aid WHERE upa.nid = :nid ORDER BY upa.ordering, ua.name", array(':nid' => $nid)); foreach ($result as $attribute) { $attributes[$attribute->aid] = uc_attribute_load($attribute->aid, $nid, 'product'); } @@ -1168,7 +1168,7 @@ function uc_product_get_attributes($nid) { function uc_class_get_attributes($pcid) { $attributes = array(); - $result = db_query("SELECT uca.aid FROM {uc_class_attributes} AS uca LEFT JOIN {uc_attributes} AS ua ON uca.aid = ua.aid WHERE uca.pcid = :type ORDER BY uca.ordering, ua.name", array(':type' => $pcid)); + $result = db_query("SELECT uca.aid FROM {uc_class_attributes} uca LEFT JOIN {uc_attributes} ua ON uca.aid = ua.aid WHERE uca.pcid = :type ORDER BY uca.ordering, ua.name", array(':type' => $pcid)); foreach ($result as $attribute) { $attributes[$attribute->aid] = uc_attribute_load($attribute->aid, $pcid, 'class'); } @@ -1450,7 +1450,7 @@ function _uc_attribute_display_types() { * Array of attribute ids that have price affecting options. */ function uc_attribute_priced_attributes($nid) { - $aids = db_query("SELECT DISTINCT (pa.aid) FROM {uc_product_attributes} AS pa INNER JOIN {uc_attribute_options} AS ao ON ao.aid = pa.aid INNER JOIN {uc_product_options} AS po ON (po.oid = ao.oid AND po.nid = pa.nid) WHERE pa.nid = :nid AND po.price <> :price AND pa.display <> :display", array(':nid' => $nid, ':price' => 0, ':display' => 0))->fetchCol(); + $aids = db_query("SELECT DISTINCT (pa.aid) FROM {uc_product_attributes} pa INNER JOIN {uc_attribute_options} ao ON ao.aid = pa.aid INNER JOIN {uc_product_options} po ON (po.oid = ao.oid AND po.nid = pa.nid) WHERE pa.nid = :nid AND po.price <> :price AND pa.display <> :display", array(':nid' => $nid, ':price' => 0, ':display' => 0))->fetchCol(); return $aids; } diff --git a/uc_attribute/uc_attribute.rules.inc b/uc_attribute/uc_attribute.rules.inc index 45744bc..12ab0be 100644 --- a/uc_attribute/uc_attribute.rules.inc +++ b/uc_attribute/uc_attribute.rules.inc @@ -63,7 +63,7 @@ function uc_attribute_condition_ordered_product_option($order, $oid) { */ function uc_attribute_condition_ordered_product_options_list() { $options = array(); - $result = db_query("SELECT a.aid, a.name AS attr_name, a.ordering, o.oid, o.name AS opt_name, o.ordering FROM {uc_attributes} AS a JOIN {uc_attribute_options} AS o ON a.aid = o.aid ORDER BY a.ordering, o.ordering"); + $result = db_query("SELECT a.aid, a.name AS attr_name, a.ordering, o.oid, o.name AS opt_name, o.ordering FROM {uc_attributes} a JOIN {uc_attribute_options} o ON a.aid = o.aid ORDER BY a.ordering, o.ordering"); foreach ($result as $option) { $options[$option->attr_name][$option->oid] = $option->opt_name; } diff --git a/uc_catalog/uc_catalog.admin.inc b/uc_catalog/uc_catalog.admin.inc index f4f3cf3..4060a8d 100644 --- a/uc_catalog/uc_catalog.admin.inc +++ b/uc_catalog/uc_catalog.admin.inc @@ -70,7 +70,7 @@ function uc_catalog_orphaned_products() { $product_types = uc_product_types(); $field = field_info_field('taxonomy_catalog'); $types = array_intersect($product_types, $field['bundles']['node']); - $result = db_query("SELECT DISTINCT n.nid, n.title FROM {node} AS n LEFT JOIN (SELECT ti.nid, td.vid FROM {taxonomy_index} AS ti LEFT JOIN {taxonomy_term_data} AS td ON ti.tid = td.tid WHERE td.vid = :vid) AS txnome ON n.nid = txnome.nid WHERE n.type IN (:types) AND txnome.vid IS NULL", array(':vid' => $vid, ':types' => $types)); + $result = db_query("SELECT DISTINCT n.nid, n.title FROM {node} n LEFT JOIN (SELECT ti.nid, td.vid FROM {taxonomy_index} ti LEFT JOIN {taxonomy_term_data} td ON ti.tid = td.tid WHERE td.vid = :vid) txnome ON n.nid = txnome.nid WHERE n.type IN (:types) AND txnome.vid IS NULL", array(':vid' => $vid, ':types' => $types)); $rows = array(); while ($node = $result->fetchObject()) { diff --git a/uc_catalog/uc_catalog.module b/uc_catalog/uc_catalog.module index 2980073..f6583ce 100644 --- a/uc_catalog/uc_catalog.module +++ b/uc_catalog/uc_catalog.module @@ -222,7 +222,7 @@ function uc_catalog_taxonomy_term_delete($term) { */ function uc_catalog_link_alter(&$links, $node) { // Link back to the catalog and not the taxonomy term page. - foreach ($links AS $module => $link) { + foreach ($links as $module => $link) { if (strstr($module, 'taxonomy_term')) { $tid = explode('_', $module); $tid = $tid[2]; @@ -375,7 +375,7 @@ function uc_catalog_uc_store_status() { $product_types = uc_product_types(); $types = array_intersect($product_types, $field['bundles']['node']); $excluded = 0; - $result = db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} AS n LEFT JOIN {taxonomy_index} AS ti ON n.nid = ti.nid LEFT JOIN {taxonomy_term_data} AS td ON ti.tid = td.tid WHERE n.type IN (:types) AND ti.tid IS NULL AND td.vid = :vid", array(':types' => $types, ':vid' => $catalog->vid)); + $result = db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n LEFT JOIN {taxonomy_index} ti ON n.nid = ti.nid LEFT JOIN {taxonomy_term_data} td ON ti.tid = td.tid WHERE n.type IN (:types) AND ti.tid IS NULL AND td.vid = :vid", array(':types' => $types, ':vid' => $catalog->vid)); if ($excluded = $result->fetchField()) { $description = format_plural($excluded, 'There is 1 product not listed in the catalog.', 'There are @count products not listed in the catalog.') . t('Products are listed by assigning a category from the Product Catalog vocabulary to them.', array('!cat_url' => url('admin/structure/taxonomy/' . $catalog->machine_name))); diff --git a/uc_file/uc_file.module b/uc_file/uc_file.module index db1fa68..bd82a47 100644 --- a/uc_file/uc_file.module +++ b/uc_file/uc_file.module @@ -153,7 +153,7 @@ function uc_file_user_form($form, &$form_state, $account) { $form['file']['download']['file_download']['#tree'] = TRUE; $downloadable_files = array(); - $file_downloads = db_query("SELECT * FROM {uc_file_users} AS ufu INNER JOIN {uc_files} AS uf ON ufu.fid = uf.fid WHERE ufu.uid = :uid ORDER BY uf.filename ASC", array(':uid' => $account->uid)); + $file_downloads = db_query("SELECT * FROM {uc_file_users} ufu INNER JOIN {uc_files} uf ON ufu.fid = uf.fid WHERE ufu.uid = :uid ORDER BY uf.filename ASC", array(':uid' => $account->uid)); $behavior = 0; foreach ($file_downloads as $file_download) { @@ -413,9 +413,9 @@ function uc_file_uc_add_to_cart($nid, $qty, $data) { global $user; // Get all the files on this product. - $product_features = db_query("SELECT * FROM {uc_product_features} AS upf " . - "INNER JOIN {uc_file_products} AS ufp ON upf.pfid = ufp.pfid " . - "INNER JOIN {uc_files} AS uf ON ufp.fid = uf.fid " . + $product_features = db_query("SELECT * FROM {uc_product_features} upf " . + "INNER JOIN {uc_file_products} ufp ON upf.pfid = ufp.pfid " . + "INNER JOIN {uc_files} uf ON ufp.fid = uf.fid " . "WHERE upf.nid = :nid", array(':nid' => $nid)); foreach ($product_features as $product_feature) { @@ -473,7 +473,7 @@ function uc_file_uc_add_to_cart($nid, $qty, $data) { */ function uc_file_uc_order_product_can_ship($item) { // Check if this model is shippable as well as a file. - $files = db_query("SELECT shippable, model FROM {uc_file_products} as fp INNER JOIN {uc_product_features} as pf ON pf.pfid = fp.pfid WHERE nid = :nid", array(':nid' => $item->nid)); + $files = db_query("SELECT shippable, model FROM {uc_file_products} fp INNER JOIN {uc_product_features} pf ON pf.pfid = fp.pfid WHERE nid = :nid", array(':nid' => $item->nid)); foreach ($files as $file) { // If the model is 'any' then return. @@ -571,7 +571,7 @@ function uc_file_feature_form($form, &$form_state, $node, $feature) { // Use the feature's values to fill the form, if they exist. if (!empty($feature)) { - $file_product = db_query("SELECT * FROM {uc_file_products} as p LEFT JOIN {uc_files} as f ON p.fid = f.fid WHERE pfid = :pfid", array(':pfid' => $feature['pfid']))->fetchObject(); + $file_product = db_query("SELECT * FROM {uc_file_products} p LEFT JOIN {uc_files} f ON p.fid = f.fid WHERE pfid = :pfid", array(':pfid' => $feature['pfid']))->fetchObject(); $default_feature = $feature['pfid']; diff --git a/uc_file/uc_file.rules.inc b/uc_file/uc_file.rules.inc index 577cac1..de747ec 100644 --- a/uc_file/uc_file.rules.inc +++ b/uc_file/uc_file.rules.inc @@ -276,9 +276,9 @@ function uc_file_action_order_renew($order) { // Scan products for models matching downloads. foreach ($order->products as $product) { - $files = db_query("SELECT * FROM {uc_file_products} AS fp " . - "INNER JOIN {uc_product_features} AS pf ON pf.pfid = fp.pfid " . - "INNER JOIN {uc_files} as f ON f.fid = fp.fid " . + $files = db_query("SELECT * FROM {uc_file_products} fp " . + "INNER JOIN {uc_product_features} pf ON pf.pfid = fp.pfid " . + "INNER JOIN {uc_files} f ON f.fid = fp.fid " . "WHERE nid = :nid", array(':nid' => $product->nid)); foreach ($files as $file) { diff --git a/uc_order/uc_order.install b/uc_order/uc_order.install index bc24c6a..7099ecc 100644 --- a/uc_order/uc_order.install +++ b/uc_order/uc_order.install @@ -789,7 +789,7 @@ function uc_order_update_7004(&$sandbox) { $limit = 200; - $result = db_query_range("SELECT n.nid, n.title, p.weight_units FROM {node} AS n JOIN {uc_products} AS p ON n.vid = p.vid WHERE n.nid > :current ORDER BY n.nid", 0, $limit, array(':current' => $sandbox['current_nid'])); + $result = db_query_range("SELECT n.nid, n.title, p.weight_units FROM {node} n JOIN {uc_products} p ON n.vid = p.vid WHERE n.nid > :current ORDER BY n.nid", 0, $limit, array(':current' => $sandbox['current_nid'])); foreach ($result as $node) { db_update('uc_order_products') diff --git a/uc_order/uc_order.module b/uc_order/uc_order.module index 027de67..46a8fc6 100644 --- a/uc_order/uc_order.module +++ b/uc_order/uc_order.module @@ -1007,7 +1007,7 @@ function uc_order_product_save($order_id, $product) { $product->weight_units = variable_get('uc_weight_unit', 'lb'); } else { - $units = db_query("SELECT weight_units FROM {node} AS n JOIN {uc_products} AS p ON n.vid = p.vid WHERE n.nid = :nid", array(':nid' => $product->nid))->fetchField(); + $units = db_query("SELECT weight_units FROM {node} n JOIN {uc_products} p ON n.vid = p.vid WHERE n.nid = :nid", array(':nid' => $product->nid))->fetchField(); $product->weight_units = empty($units) ? variable_get('uc_weight_unit', 'lb') : $units; } } diff --git a/uc_order/uc_order.order_pane.inc b/uc_order/uc_order.order_pane.inc index 04f7d3e..4918061 100644 --- a/uc_order/uc_order.order_pane.inc +++ b/uc_order/uc_order.order_pane.inc @@ -479,8 +479,8 @@ function uc_order_pane_products_select($form, &$form_state) { ':model' => $search, ); - $result = db_query("SELECT n.nid, n.title FROM {node} AS n LEFT JOIN " - . "{uc_products} AS p ON n.nid = p.nid WHERE n.type IN " + $result = db_query("SELECT n.nid, n.title FROM {node} n LEFT JOIN " + . "{uc_products} p ON n.nid = p.nid WHERE n.type IN " . "(:types) AND (n.title LIKE :title OR p.model LIKE :model)" . " ORDER BY n.title", $search_args); } diff --git a/uc_product/uc_product.module b/uc_product/uc_product.module index 47547bf..14f782a 100644 --- a/uc_product/uc_product.module +++ b/uc_product/uc_product.module @@ -1150,7 +1150,7 @@ function uc_product_uc_product_class($pcid, $op) { )) ->condition('type', $pcid) ->execute(); - $result = db_query("SELECT n.vid, n.nid, p.unique_hash FROM {node} AS n LEFT JOIN {uc_products} AS p ON n.vid = p.vid WHERE n.type = :pcid", array(':pcid' => $pcid)); + $result = db_query("SELECT n.vid, n.nid, p.unique_hash FROM {node} n LEFT JOIN {uc_products} p ON n.vid = p.vid WHERE n.type = :pcid", array(':pcid' => $pcid)); foreach ($result as $node) { if (!$node->unique_hash) { $node->weight_units = variable_get('uc_weight_unit', 'lb'); diff --git a/uc_product_kit/uc_product_kit.module b/uc_product_kit/uc_product_kit.module index 9a218a9..91762c9 100644 --- a/uc_product_kit/uc_product_kit.module +++ b/uc_product_kit/uc_product_kit.module @@ -50,7 +50,7 @@ function uc_product_kit_form_uc_product_settings_form_alter(&$form, &$form_state */ function uc_product_kit_form_node_delete_confirm_alter(&$form, &$form_state) { if (uc_product_is_product((integer)$form['nid']['#value'])) { - $kits = db_query("SELECT COUNT(k.nid) FROM {node} AS n JOIN {uc_product_kits} AS k ON n.vid = k.vid WHERE k.vid IN (SELECT DISTINCT vid FROM {uc_product_kits} WHERE product_id = :nid) GROUP BY k.nid HAVING COUNT(product_id) = 1", array(':nid' => $form['nid']['#value']))->fetchField(); + $kits = db_query("SELECT COUNT(k.nid) FROM {node} n JOIN {uc_product_kits} k ON n.vid = k.vid WHERE k.vid IN (SELECT DISTINCT vid FROM {uc_product_kits} WHERE product_id = :nid) GROUP BY k.nid HAVING COUNT(product_id) = 1", array(':nid' => $form['nid']['#value']))->fetchField(); if ($kits) { $description = $form['description']['#markup']; diff --git a/uc_reports/uc_reports.admin.inc b/uc_reports/uc_reports.admin.inc index 982ca84..7459269 100644 --- a/uc_reports/uc_reports.admin.inc +++ b/uc_reports/uc_reports.admin.inc @@ -41,10 +41,10 @@ function uc_reports_customers() { )) ->condition('u.uid', 0, '>') ->groupBy('u.uid'); - $query->addExpression("(SELECT COUNT(DISTINCT(order_id)) FROM {uc_orders} as o WHERE o.uid = u.uid AND o.order_status IN (:statuses))", 'orders', array(':statuses' => $order_statuses)); - $query->addExpression("(SELECT SUM(qty) FROM {uc_order_products} as ps LEFT JOIN {uc_orders} as os ON ps.order_id = os.order_id WHERE os.order_status IN (:statuses) AND os.uid = u.uid)", 'products', array(':statuses' => $order_statuses)); - $query->addExpression("(SELECT SUM(ot.order_total) FROM {uc_orders} as ot WHERE ot.uid = u.uid AND ot.order_status IN (:statuses))", 'total', array(':statuses' => $order_statuses)); - $query->addExpression("ROUND((SELECT SUM(ot.order_total) FROM {uc_orders} as ot WHERE ot.uid = u.uid AND ot.order_status IN (:sum_statuses))/(SELECT COUNT(DISTINCT(order_id)) FROM {uc_orders} as o WHERE o.uid = u.uid AND o.order_status IN (:count_statuses)), 2)", 'average', array(':sum_statuses' => $order_statuses, ':count_statuses' => $order_statuses)); + $query->addExpression("(SELECT COUNT(DISTINCT(order_id)) FROM {uc_orders} o WHERE o.uid = u.uid AND o.order_status IN (:statuses))", 'orders', array(':statuses' => $order_statuses)); + $query->addExpression("(SELECT SUM(qty) FROM {uc_order_products} ps LEFT JOIN {uc_orders} os ON ps.order_id = os.order_id WHERE os.order_status IN (:statuses) AND os.uid = u.uid)", 'products', array(':statuses' => $order_statuses)); + $query->addExpression("(SELECT SUM(ot.order_total) FROM {uc_orders} ot WHERE ot.uid = u.uid AND ot.order_status IN (:statuses))", 'total', array(':statuses' => $order_statuses)); + $query->addExpression("ROUND((SELECT SUM(ot.order_total) FROM {uc_orders} ot WHERE ot.uid = u.uid AND ot.order_status IN (:sum_statuses))/(SELECT COUNT(DISTINCT(order_id)) FROM {uc_orders} o WHERE o.uid = u.uid AND o.order_status IN (:count_statuses)), 2)", 'average', array(':sum_statuses' => $order_statuses, ':count_statuses' => $order_statuses)); $count_query = db_select('users', 'u'); $count_query->leftJoin('uc_orders', 'ou', 'u.uid = ou.uid'); @@ -147,9 +147,9 @@ function uc_reports_products() { $query->addField('n', 'nid'); $query->addField('n', 'title'); - $query->addExpression("(SELECT SUM(uop.qty) FROM {uc_order_products} AS uop LEFT JOIN {uc_orders} AS uo ON uop.order_id = uo.order_id WHERE uo.order_status IN (:statuses) AND uop.nid = n.nid)", 'sold', array(':statuses' => $order_statuses)); - $query->addExpression("(SELECT (SUM(uop.price * uop.qty) - SUM(uop.cost * uop.qty)) FROM {uc_order_products} AS uop LEFT JOIN {uc_orders} AS uo ON uop.order_id = uo.order_id WHERE uo.order_status IN (:statuses) AND uop.nid = n.nid)", 'gross', array(':statuses' => $order_statuses)); - $query->addExpression("(SELECT (SUM(uop.price * uop.qty)) FROM {uc_order_products} AS uop LEFT JOIN {uc_orders} AS uo ON uop.order_id = uo.order_id WHERE uo.order_status IN (:statuses) AND uop.nid = n.nid)", 'revenue', array(':statuses' => $order_statuses)); + $query->addExpression("(SELECT SUM(uop.qty) FROM {uc_order_products} uop LEFT JOIN {uc_orders} uo ON uop.order_id = uo.order_id WHERE uo.order_status IN (:statuses) AND uop.nid = n.nid)", 'sold', array(':statuses' => $order_statuses)); + $query->addExpression("(SELECT (SUM(uop.price * uop.qty) - SUM(uop.cost * uop.qty)) FROM {uc_order_products} uop LEFT JOIN {uc_orders} uo ON uop.order_id = uo.order_id WHERE uo.order_status IN (:statuses) AND uop.nid = n.nid)", 'gross', array(':statuses' => $order_statuses)); + $query->addExpression("(SELECT (SUM(uop.price * uop.qty)) FROM {uc_order_products} uop LEFT JOIN {uc_orders} uo ON uop.order_id = uo.order_id WHERE uo.order_status IN (:statuses) AND uop.nid = n.nid)", 'revenue', array(':statuses' => $order_statuses)); $header = array( array('data' => t('#')), @@ -213,9 +213,9 @@ function uc_reports_products() { $models = uc_reports_product_get_skus($product['nid']); // Add the product breakdown rows foreach ($models as $model) { - $sold = db_query("SELECT SUM(qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid", array(':statuses' => $order_statuses, ':model' => $model, ':nid' => $product['nid']))->fetchField(); - $revenue = db_query("SELECT SUM(p.price * p.qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid", array(':statuses' => $order_statuses, ':model' => $model, ':nid' => $product['nid']))->fetchField(); - $gross = db_query("SELECT (SUM(p.price * p.qty) - SUM(p.cost * p.qty)) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid", array(':statuses' => $order_statuses, ':model' => $model, ':nid' => $product['nid']))->fetchField(); + $sold = db_query("SELECT SUM(qty) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid", array(':statuses' => $order_statuses, ':model' => $model, ':nid' => $product['nid']))->fetchField(); + $revenue = db_query("SELECT SUM(p.price * p.qty) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid", array(':statuses' => $order_statuses, ':model' => $model, ':nid' => $product['nid']))->fetchField(); + $gross = db_query("SELECT (SUM(p.price * p.qty) - SUM(p.cost * p.qty)) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid", array(':statuses' => $order_statuses, ':model' => $model, ':nid' => $product['nid']))->fetchField(); $breakdown_product = "     $model"; $product_csv = " $model"; @@ -362,9 +362,9 @@ function uc_reports_products_custom() { ->condition('type', $product_types, 'IN') ->groupBy('n.nid'); - $query->addExpression("(SELECT SUM(qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.nid = n.nid AND o.created >= :start AND o.created <= :end)", 'sold', array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'])); - $query->addExpression("(SELECT (SUM(p2.price * p2.qty)) FROM {uc_order_products} AS p2 LEFT JOIN {uc_orders} AS o ON p2.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p2.nid = n.nid AND o.created >= :start AND o.created <= :end)", 'revenue', array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'])); - $query->addExpression("(SELECT (SUM(p3.price * p3.qty) - SUM(p3.cost * p3.qty)) FROM {uc_order_products} AS p3 LEFT JOIN {uc_orders} AS o ON p3.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p3.nid = n.nid AND o.created >= :start AND o.created <= :end)", 'gross', array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'])); + $query->addExpression("(SELECT SUM(qty) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.nid = n.nid AND o.created >= :start AND o.created <= :end)", 'sold', array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'])); + $query->addExpression("(SELECT (SUM(p2.price * p2.qty)) FROM {uc_order_products} p2 LEFT JOIN {uc_orders} o ON p2.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p2.nid = n.nid AND o.created >= :start AND o.created <= :end)", 'revenue', array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'])); + $query->addExpression("(SELECT (SUM(p3.price * p3.qty) - SUM(p3.cost * p3.qty)) FROM {uc_order_products} p3 LEFT JOIN {uc_orders} o ON p3.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p3.nid = n.nid AND o.created >= :start AND o.created <= :end)", 'gross', array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'])); $header = array( array('data' => t('#')), @@ -406,11 +406,11 @@ function uc_reports_products_custom() { $models = uc_reports_product_get_skus($product['nid']); // Add the product breakdown rows foreach ($models as $model) { - $sold = db_query("SELECT SUM(qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid AND o.created >= :start AND o.created <= :end", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'], ':model' => $model, ':nid' => $product['nid']))->fetchField(); + $sold = db_query("SELECT SUM(qty) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid AND o.created >= :start AND o.created <= :end", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'], ':model' => $model, ':nid' => $product['nid']))->fetchField(); $sold = empty($sold) ? 0 : $sold; - $revenue = db_query("SELECT SUM(p.price * p.qty) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid AND o.created >= :start AND o.created <= :end", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'], ':model' => $model, ':nid' => $product['nid']))->fetchField(); + $revenue = db_query("SELECT SUM(p.price * p.qty) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid AND o.created >= :start AND o.created <= :end", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'], ':model' => $model, ':nid' => $product['nid']))->fetchField(); $revenue = empty($revenue) ? 0 : $revenue; - $gross = db_query("SELECT (SUM(p.price * p.qty) - SUM(p.cost * p.qty)) FROM {uc_order_products} AS p LEFT JOIN {uc_orders} AS o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid AND o.created >= :start AND o.created <= :end", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'], ':model' => $model, ':nid' => $product['nid']))->fetchField(); + $gross = db_query("SELECT (SUM(p.price * p.qty) - SUM(p.cost * p.qty)) FROM {uc_order_products} p LEFT JOIN {uc_orders} o ON p.order_id = o.order_id WHERE o.order_status IN (:statuses) AND p.model = :model AND p.nid = :nid AND o.created >= :start AND o.created <= :end", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date'], ':model' => $model, ':nid' => $product['nid']))->fetchField(); $gross = empty($gross) ? 0 : $gross; $breakdown_product .= "
     $model"; @@ -817,7 +817,7 @@ function uc_reports_sales_summary() { array(array('data' => t('Grand total sales')), array('data' => array('#theme' => 'uc_price', '#price' => db_query("SELECT SUM(order_total) FROM {uc_orders} WHERE order_status IN (:statuses)", array(':statuses' => $order_statuses))->fetchField()))), array(array('data' => t('Customers total')), array('data' => db_query("SELECT COUNT(DISTINCT uid) FROM {uc_orders} WHERE order_status IN (:statuses)", array(':statuses' => $order_statuses))->fetchField())), array(array('data' => t('New customers today')), array('data' => db_query("SELECT COUNT(DISTINCT uid) FROM {uc_orders} WHERE order_status IN (:statuses) AND :start <= created AND created <= :end", array(':statuses' => $order_statuses, ':start' => $today_start, ':end' => $today_end))->fetchField())), - array(array('data' => t('Online customers')), array('data' => db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} as s LEFT JOIN {uc_orders} as o ON s.uid = o.uid WHERE s.uid > 0 AND o.order_status IN (:statuses)", array(':statuses' => $order_statuses))->fetchField())), + array(array('data' => t('Online customers')), array('data' => db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s LEFT JOIN {uc_orders} o ON s.uid = o.uid WHERE s.uid > 0 AND o.order_status IN (:statuses)", array(':statuses' => $order_statuses))->fetchField())), ); // Add the statistics table to the output. @@ -834,7 +834,7 @@ function uc_reports_sales_summary() { $unknown = 0; // Loop through the order statuses with their total number of orders. - $result = db_query("SELECT s.order_status_id, order_status, s.title, s.weight, COUNT(o.order_status) as order_count FROM {uc_orders} as o LEFT JOIN {uc_order_statuses} as s ON s.order_status_id = o.order_status GROUP BY s.order_status_id, order_status, s.title, s.weight ORDER BY s.weight DESC"); + $result = db_query("SELECT s.order_status_id, order_status, s.title, s.weight, COUNT(o.order_status) as order_count FROM {uc_orders} o LEFT JOIN {uc_order_statuses} s ON s.order_status_id = o.order_status GROUP BY s.order_status_id, order_status, s.title, s.weight ORDER BY s.weight DESC"); while ($status = $result->fetchAssoc()) { if (!empty($status['title'])) { // Add the total number of orders with this status to the table. @@ -1076,7 +1076,7 @@ function uc_reports_sales_custom() { // Build the product data for the subreport. if ($args['detail']) { // Grab the detailed product breakdown if selected. - $result = db_query("SELECT SUM(op.qty) as count, n.title, n.nid FROM {uc_order_products} as op LEFT JOIN {uc_orders} as o ON o.order_id = op.order_id LEFT JOIN {node} as n ON n.nid = op.nid WHERE :start <= o.created AND o.created <= :end AND o.order_status IN (:statuses) GROUP BY n.nid ORDER BY count DESC, n.title ASC", array(':statuses' => $args['status'], ':start' => $subreport['start'], ':end' => $subreport['end'])); + $result = db_query("SELECT SUM(op.qty) as count, n.title, n.nid FROM {uc_order_products} op LEFT JOIN {uc_orders} o ON o.order_id = op.order_id LEFT JOIN {node} n ON n.nid = op.nid WHERE :start <= o.created AND o.created <= :end AND o.order_status IN (:statuses) GROUP BY n.nid ORDER BY count DESC, n.title ASC", array(':statuses' => $args['status'], ':start' => $subreport['start'], ':end' => $subreport['end'])); foreach ($result as $product_breakdown) { $product_data .= $product_breakdown->count . ' x ' . l($product_breakdown->title, 'node/' . $product_breakdown->nid) . "
\n"; $product_csv .= $product_breakdown->count . ' x ' . $product_breakdown->title . "\n"; @@ -1084,7 +1084,7 @@ function uc_reports_sales_custom() { } else { // Otherwise just display the total number of products sold. - $product_data = db_query("SELECT SUM(qty) FROM {uc_orders} as o LEFT JOIN {uc_order_products} as op ON o.order_id = op.order_id WHERE :start <= created AND created <= :end AND order_status IN (:statuses)", array(':statuses' => $args['status'], ':start' => $subreport['start'], ':end' => $subreport['end']))->fetchField(); + $product_data = db_query("SELECT SUM(qty) FROM {uc_orders} o LEFT JOIN {uc_order_products} op ON o.order_id = op.order_id WHERE :start <= created AND created <= :end AND order_status IN (:statuses)", array(':statuses' => $args['status'], ':start' => $subreport['start'], ':end' => $subreport['end']))->fetchField(); $product_csv = $product_data; } @@ -1110,7 +1110,7 @@ function uc_reports_sales_custom() { // Calculate the totals for the report. $order_total = db_query("SELECT COUNT(*) FROM {uc_orders} WHERE :start <= created AND created <= :end AND order_status IN (:statuses)", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date']))->fetchField(); - $product_total = db_query("SELECT SUM(qty) FROM {uc_orders} AS o LEFT JOIN {uc_order_products} AS op ON o.order_id = op.order_id WHERE :start <= created AND created <= :end AND order_status IN (:statuses)", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date']))->fetchField(); + $product_total = db_query("SELECT SUM(qty) FROM {uc_orders} o LEFT JOIN {uc_order_products} op ON o.order_id = op.order_id WHERE :start <= created AND created <= :end AND order_status IN (:statuses)", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date']))->fetchField(); $revenue_total = db_query("SELECT SUM(order_total) FROM {uc_orders} WHERE :start <= created AND created <= :end AND order_status IN (:statuses)", array(':statuses' => $args['status'], ':start' => $args['start_date'], ':end' => $args['end_date']))->fetchField(); // Add the total row to the report table. @@ -1357,13 +1357,13 @@ function uc_reports_get_sales($start, $interval = 'day') { // Get the total value of the orders. $output = array('income' => 0); - $orders = db_query("SELECT o.order_total FROM {uc_orders} as o WHERE o.order_status IN (:statuses) AND :start <= created AND created <= :end", array(':statuses' => $order_statuses, ':start' => $start, ':end' => $end)); + $orders = db_query("SELECT o.order_total FROM {uc_orders} o WHERE o.order_status IN (:statuses) AND :start <= created AND created <= :end", array(':statuses' => $order_statuses, ':start' => $start, ':end' => $end)); while ($order = $orders->fetchObject()) { $output['income'] += $order->order_total; } // Get the total amount of orders. - $count = db_query("SELECT COUNT(o.order_total) FROM {uc_orders} as o WHERE o.order_status IN (:statuses) AND :start <= created AND created <= :end", array(':statuses' => $order_statuses, ':start' => $start, ':end' => $end))->fetchField(); + $count = db_query("SELECT COUNT(o.order_total) FROM {uc_orders} o WHERE o.order_status IN (:statuses) AND :start <= created AND created <= :end", array(':statuses' => $order_statuses, ':start' => $start, ':end' => $end))->fetchField(); $output['total'] = $count; // Average for this period. diff --git a/uc_store/uc_store.module b/uc_store/uc_store.module index 48bfd28..bc9146c 100644 --- a/uc_store/uc_store.module +++ b/uc_store/uc_store.module @@ -1280,7 +1280,7 @@ function uc_zone_select($title = '', $default = NULL, $country_id = NULL, $optio * 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"); + $result = db_query("SELECT z.*, c.country_name FROM {uc_zones} z LEFT JOIN {uc_countries} c ON z.zone_country_id = c.country_id ORDER BY c.country_name, z.zone_name"); foreach ($result as $zone) { $options[t($zone->country_name)][$zone->zone_id] = $zone->zone_name;