Permalink
Browse files

Fix missing </tr> (report #107)

Only show new products if products exist
  • Loading branch information...
1 parent 4986359 commit df6135068cb5ee30bbe580597d549f0e71a2f381 @haraldpdl haraldpdl committed Nov 12, 2010
Showing with 27 additions and 14 deletions.
  1. +4 −1 catalog/includes/modules/also_purchased_products.php
  2. +23 −13 catalog/includes/modules/new_products.php
@@ -14,10 +14,13 @@
$orders_query = tep_db_query("select p.products_id, p.products_image from " . TABLE_ORDERS_PRODUCTS . " opa, " . TABLE_ORDERS_PRODUCTS . " opb, " . TABLE_ORDERS . " o, " . TABLE_PRODUCTS . " p where opa.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and opa.orders_id = opb.orders_id and opb.products_id != '" . (int)$HTTP_GET_VARS['products_id'] . "' and opb.products_id = p.products_id and opb.orders_id = o.orders_id and p.products_status = '1' group by p.products_id order by o.date_purchased desc limit " . MAX_DISPLAY_ALSO_PURCHASED);
$num_products_ordered = tep_db_num_rows($orders_query);
if ($num_products_ordered >= MIN_DISPLAY_ALSO_PURCHASED) {
+ $counter = 0;
$col = 0;
$also_pur_prods_content = '<table border="0" width="100%" cellspacing="0" cellpadding="2" class="ui-widget-content ui-corner-bottom">';
while ($orders = tep_db_fetch_array($orders_query)) {
+ $counter++;
+
$orders['products_name'] = tep_get_products_name($orders['products_id']);
if ($col === 0) {
@@ -28,7 +31,7 @@
$col ++;
- if ($col > 2) {
+ if (($col > 2) || ($counter == $num_products_ordered)) {
$also_pur_prods_content .= '</tr>';
$col = 0;
@@ -16,30 +16,40 @@
$new_products_query = tep_db_query("select distinct p.products_id, p.products_image, p.products_tax_class_id, pd.products_name, if(s.status, s.specials_new_products_price, p.products_price) as products_price from " . TABLE_PRODUCTS . " p left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c, " . TABLE_CATEGORIES . " c where p.products_id = p2c.products_id and p2c.categories_id = c.categories_id and c.parent_id = '" . (int)$new_products_category_id . "' and p.products_status = '1' and p.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' order by p.products_date_added desc limit " . MAX_DISPLAY_NEW_PRODUCTS);
}
- $col = 0;
+ $num_new_products = tep_db_num_rows($new_products_query);
- $new_prods_content = '<table border="0" width="100%" cellspacing="0" cellpadding="2">';
- while ($new_products = tep_db_fetch_array($new_products_query)) {
- if ($col === 0) {
- $new_prods_content .= '<tr>';
- }
+ if ($new_products_query > 0) {
+ $counter = 0;
+ $col = 0;
+
+ $new_prods_content = '<table border="0" width="100%" cellspacing="0" cellpadding="2">';
+ while ($new_products = tep_db_fetch_array($new_products_query)) {
+ $counter++;
- $new_prods_content .= '<td width="33%" align="center" valign="top"><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $new_products['products_id']) . '">' . tep_image(DIR_WS_IMAGES . $new_products['products_image'], $new_products['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a><br /><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $new_products['products_id']) . '">' . $new_products['products_name'] . '</a><br />' . $currencies->display_price($new_products['products_price'], tep_get_tax_rate($new_products['products_tax_class_id'])) . '</td>';
+ if ($col === 0) {
+ $new_prods_content .= '<tr>';
+ }
- $col ++;
+ $new_prods_content .= '<td width="33%" align="center" valign="top"><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $new_products['products_id']) . '">' . tep_image(DIR_WS_IMAGES . $new_products['products_image'], $new_products['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a><br /><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $new_products['products_id']) . '">' . $new_products['products_name'] . '</a><br />' . $currencies->display_price($new_products['products_price'], tep_get_tax_rate($new_products['products_tax_class_id'])) . '</td>';
- if ($col > 2) {
- $new_prods_content .= '</tr>';
+ $col ++;
- $col = 0;
+ if (($col > 2) || ($counter == $num_new_products)) {
+ $new_prods_content .= '</tr>';
+
+ $col = 0;
+ }
}
- }
- $new_prods_content .= '</table>';
+ $new_prods_content .= '</table>';
?>
<h2><?php echo sprintf(TABLE_HEADING_NEW_PRODUCTS, strftime('%B')); ?></h2>
<div class="contentText">
<?php echo $new_prods_content; ?>
</div>
+
+<?php
+ }
+?>

0 comments on commit df61350

Please sign in to comment.