Skip to content

Commit

Permalink
Attributes Sort Order
Browse files Browse the repository at this point in the history
  • Loading branch information
@gburton
gburton committed Mar 6, 2015
1 parent f410974 commit f13c91d
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 15 deletions.
3 changes: 2 additions & 1 deletion admin/includes/languages/english/products_attributes.php
View file
Expand Up @@ -32,4 +32,5 @@
define('TEXT_OK_TO_DELETE', 'This option has no products and values linked to it - it is safe to delete it.');
define('TEXT_OPTION_ID', 'Option ID');
define('TEXT_OPTION_NAME', 'Option Name');
?>

define('TABLE_HEADING_OPT_SORT_ORDER', 'Sort Order');
46 changes: 34 additions & 12 deletions admin/products_attributes.php
View file
Expand Up @@ -26,9 +26,11 @@
case 'add_product_options':
$products_options_id = tep_db_prepare_input($HTTP_POST_VARS['products_options_id']);
$option_name_array = $HTTP_POST_VARS['option_name'];
$option_sort_array = $HTTP_POST_VARS['option_sort'];

for ($i=0, $n=sizeof($languages); $i<$n; $i ++) {
$option_name = tep_db_prepare_input($option_name_array[$languages[$i]['id']]);
$option_sort = tep_db_prepare_input($option_sort_array[$languages[$i]['id']]);

tep_db_query("insert into " . TABLE_PRODUCTS_OPTIONS . " (products_options_id, products_options_name, language_id) values ('" . (int)$products_options_id . "', '" . tep_db_input($option_name) . "', '" . (int)$languages[$i]['id'] . "')");
}
Expand All @@ -55,6 +57,8 @@
$values_id = tep_db_prepare_input($HTTP_POST_VARS['values_id']);
$value_price = tep_db_prepare_input($HTTP_POST_VARS['value_price']);
$price_prefix = tep_db_prepare_input($HTTP_POST_VARS['price_prefix']);

$sort_order = tep_db_prepare_input($HTTP_POST_VARS['sort_order']);

tep_db_query("insert into " . TABLE_PRODUCTS_ATTRIBUTES . " values (null, '" . (int)$products_id . "', '" . (int)$options_id . "', '" . (int)$values_id . "', '" . (float)tep_db_input($value_price) . "', '" . tep_db_input($price_prefix) . "')");

Expand All @@ -74,12 +78,16 @@
break;
case 'update_option_name':
$option_name_array = $HTTP_POST_VARS['option_name'];
$option_sort_array = $HTTP_POST_VARS['option_sort'];

$option_id = tep_db_prepare_input($HTTP_POST_VARS['option_id']);

for ($i=0, $n=sizeof($languages); $i<$n; $i ++) {
$option_name = tep_db_prepare_input($option_name_array[$languages[$i]['id']]);
$option_sort = tep_db_prepare_input($option_sort_array[$languages[$i]['id']]);

tep_db_query("update " . TABLE_PRODUCTS_OPTIONS . " set products_options_name = '" . tep_db_input($option_name) . "' where products_options_id = '" . (int)$option_id . "' and language_id = '" . (int)$languages[$i]['id'] . "'");
tep_db_query("update " . TABLE_PRODUCTS_OPTIONS . " set products_options_sort_order = '" . tep_db_input($option_sort) . "' where products_options_id = '" . (int)$option_id . "' and language_id = '" . (int)$languages[$i]['id'] . "'");
}

tep_redirect(tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, $page_info));
Expand All @@ -106,8 +114,9 @@
$value_price = tep_db_prepare_input($HTTP_POST_VARS['value_price']);
$price_prefix = tep_db_prepare_input($HTTP_POST_VARS['price_prefix']);
$attribute_id = tep_db_prepare_input($HTTP_POST_VARS['attribute_id']);
$sort_order = tep_db_prepare_input($HTTP_POST_VARS['sort_order']);

tep_db_query("update " . TABLE_PRODUCTS_ATTRIBUTES . " set products_id = '" . (int)$products_id . "', options_id = '" . (int)$options_id . "', options_values_id = '" . (int)$values_id . "', options_values_price = '" . (float)tep_db_input($value_price) . "', price_prefix = '" . tep_db_input($price_prefix) . "' where products_attributes_id = '" . (int)$attribute_id . "'");
tep_db_query("update " . TABLE_PRODUCTS_ATTRIBUTES . " set products_id = '" . (int)$products_id . "', options_id = '" . (int)$options_id . "', options_values_id = '" . (int)$values_id . "', options_values_price = '" . (float)tep_db_input($value_price) . "', price_prefix = '" . tep_db_input($price_prefix) . "', sort_order = '" . tep_db_input($sort_order) . "' where products_attributes_id = '" . (int)$attribute_id . "'");

if (DOWNLOAD_ENABLED == 'true') {
$products_attributes_filename = tep_db_prepare_input($HTTP_POST_VARS['products_attributes_filename']);
Expand Down Expand Up @@ -224,10 +233,10 @@
} else {
?>
<tr>
<td colspan="3" class="pageHeading">&nbsp;<?php echo HEADING_TITLE_OPT; ?>&nbsp;</td>
<td colspan="4" class="pageHeading">&nbsp;<?php echo HEADING_TITLE_OPT; ?>&nbsp;</td>
</tr>
<tr>
<td colspan="3" class="smallText" align="right">
<td colspan="4" class="smallText" align="right">
<?php
$options = "select * from " . TABLE_PRODUCTS_OPTIONS . " where language_id = '" . (int)$languages_id . "' order by products_options_id";
$options_split = new splitPageResults($option_page, MAX_ROW_LISTS_OPTIONS, $options, $options_query_numrows);
Expand All @@ -237,15 +246,16 @@
</td>
</tr>
<tr>
<td colspan="3"><?php echo tep_black_line(); ?></td>
<td colspan="4"><?php echo tep_black_line(); ?></td>
</tr>
<tr class="dataTableHeadingRow">
<td class="dataTableHeadingContent">&nbsp;<?php echo TABLE_HEADING_ID; ?>&nbsp;</td>
<td class="dataTableHeadingContent">&nbsp;<?php echo TABLE_HEADING_OPT_NAME; ?>&nbsp;</td>
<td class="dataTableHeadingContent" align="center">&nbsp;<?php echo TABLE_HEADING_OPT_SORT_ORDER; ?>&nbsp;</td>
<td class="dataTableHeadingContent" align="center">&nbsp;<?php echo TABLE_HEADING_ACTION; ?>&nbsp;</td>
</tr>
<tr>
<td colspan="3"><?php echo tep_black_line(); ?></td>
<td colspan="4"><?php echo tep_black_line(); ?></td>
</tr>
<?php
$next_id = 1;
Expand All @@ -259,21 +269,25 @@
if (($action == 'update_option') && ($HTTP_GET_VARS['option_id'] == $options_values['products_options_id'])) {
echo '<form name="option" action="' . tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=update_option_name&' . $page_info) . '" method="post">';
$inputs = '';
$sort_order = '';
for ($i = 0, $n = sizeof($languages); $i < $n; $i ++) {
$option_name = tep_db_query("select products_options_name from " . TABLE_PRODUCTS_OPTIONS . " where products_options_id = '" . $options_values['products_options_id'] . "' and language_id = '" . $languages[$i]['id'] . "'");
$option_name = tep_db_query("select products_options_name, products_options_sort_order from " . TABLE_PRODUCTS_OPTIONS . " where products_options_id = '" . $options_values['products_options_id'] . "' and language_id = '" . $languages[$i]['id'] . "'");
$option_name = tep_db_fetch_array($option_name);
$inputs .= $languages[$i]['code'] . ':&nbsp;<input type="text" name="option_name[' . $languages[$i]['id'] . ']" size="20" value="' . $option_name['products_options_name'] . '">&nbsp;<br />';
$sort_order .= $languages[$i]['code'] . ':&nbsp;<input type="text" name="option_sort[' . $languages[$i]['id'] . ']" size="5" value="' . $option_name['products_options_sort_order'] . '">&nbsp;<br />';
}
?>
<td align="center" class="smallText">&nbsp;<?php echo $options_values['products_options_id']; ?><input type="hidden" name="option_id" value="<?php echo $options_values['products_options_id']; ?>">&nbsp;</td>
<td class="smallText"><?php echo $inputs; ?></td>
<td class="smallText"><?php echo $sort_order; ?></td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, $page_info)); ?>&nbsp;</td>
<?php
echo '</form>' . "\n";
} else {
?>
<td align="center" class="smallText">&nbsp;<?php echo $options_values["products_options_id"]; ?>&nbsp;</td>
<td class="smallText">&nbsp;<?php echo $options_values["products_options_name"]; ?>&nbsp;</td>
<td class="smallText" align="center">&nbsp;<?php echo $options_values["products_options_sort_order"]; ?>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_EDIT, 'document', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=update_option&option_id=' . $options_values['products_options_id'] . '&' . $page_info)) . tep_draw_button(IMAGE_DELETE, 'trash', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=delete_product_option&option_id=' . $options_values['products_options_id'] . '&' . $page_info)); ?>&nbsp;</td>
<?php
}
Expand All @@ -286,7 +300,7 @@
}
?>
<tr>
<td colspan="3"><?php echo tep_black_line(); ?></td>
<td colspan="4"><?php echo tep_black_line(); ?></td>
</tr>
<?php
if ($action != 'update_option') {
Expand All @@ -295,19 +309,22 @@
<?php
echo '<form name="options" action="' . tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=add_product_options&' . $page_info) . '" method="post"><input type="hidden" name="products_options_id" value="' . $next_id . '">';
$inputs = '';
$sort_order = '';
for ($i = 0, $n = sizeof($languages); $i < $n; $i ++) {
$inputs .= $languages[$i]['code'] . ':&nbsp;<input type="text" name="option_name[' . $languages[$i]['id'] . ']" size="20">&nbsp;<br />';
$sort_order .= $languages[$i]['code'] . ':&nbsp;<input type="text" name="option_sort[' . $languages[$i]['id'] . ']" size="5">&nbsp;<br />';
}
?>
<td align="center" class="smallText">&nbsp;<?php echo $next_id; ?>&nbsp;</td>
<td class="smallText"><?php echo $inputs; ?></td>
<td class="smallText"><?php echo $sort_order; ?></td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_INSERT, 'plus'); ?>&nbsp;</td>
<?php
echo '</form>';
?>
</tr>
<tr>
<td colspan="3"><?php echo tep_black_line(); ?></td>
<td colspan="4"><?php echo tep_black_line(); ?></td>
</tr>
<?php
}
Expand Down Expand Up @@ -531,7 +548,7 @@
</table>
<form name="attributes" action="<?php echo tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=' . $form_action . '&' . $page_info); ?>" method="post"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
<td colspan="7"><?php echo tep_black_line(); ?></td>
<td colspan="8"><?php echo tep_black_line(); ?></td>
</tr>
<tr class="dataTableHeadingRow">
<td class="dataTableHeadingContent">&nbsp;<?php echo TABLE_HEADING_ID; ?>&nbsp;</td>
Expand All @@ -540,10 +557,11 @@
<td class="dataTableHeadingContent">&nbsp;<?php echo TABLE_HEADING_OPT_VALUE; ?>&nbsp;</td>
<td class="dataTableHeadingContent" align="right">&nbsp;<?php echo TABLE_HEADING_OPT_PRICE; ?>&nbsp;</td>
<td class="dataTableHeadingContent" align="center">&nbsp;<?php echo TABLE_HEADING_OPT_PRICE_PREFIX; ?>&nbsp;</td>
<td class="dataTableHeadingContent" align="center">&nbsp;<?php echo TABLE_HEADING_OPT_SORT_ORDER; ?>&nbsp;</td>
<td class="dataTableHeadingContent" align="center">&nbsp;<?php echo TABLE_HEADING_ACTION; ?>&nbsp;</td>
</tr>
<tr>
<td colspan="7"><?php echo tep_black_line(); ?></td>
<td colspan="8"><?php echo tep_black_line(); ?></td>
</tr>
<?php
$next_id = 1;
Expand Down Expand Up @@ -597,6 +615,7 @@
</select>&nbsp;</td>
<td align="right" class="smallText">&nbsp;<input type="text" name="value_price" value="<?php echo $attributes_values['options_values_price']; ?>" size="6">&nbsp;</td>
<td align="center" class="smallText">&nbsp;<input type="text" name="price_prefix" value="<?php echo $attributes_values['price_prefix']; ?>" size="2">&nbsp;</td>
<td align="center" class="smallText">&nbsp;<input type="text" name="sort_order" value="<?php echo $attributes_values['sort_order']; ?>" size="5">&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_SAVE, 'disk', null, 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, $page_info)); ?>&nbsp;</td>
<?php
if (DOWNLOAD_ENABLED == 'true') {
Expand Down Expand Up @@ -640,6 +659,7 @@
<td class="smallText">&nbsp;<strong><?php echo $values_name; ?></strong>&nbsp;</td>
<td align="right" class="smallText">&nbsp;<strong><?php echo $attributes_values["options_values_price"]; ?></strong>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<strong><?php echo $attributes_values["price_prefix"]; ?></strong>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<strong><?php echo $attributes_values["sort_order"]; ?></strong>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_DELETE, 'trash', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=delete_attribute&attribute_id=' . $HTTP_GET_VARS['attribute_id'] . '&' . $page_info), 'primary') . tep_draw_button(IMAGE_CANCEL, 'close', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, $page_info)); ?>&nbsp;</td>
<?php
} else {
Expand All @@ -650,6 +670,7 @@
<td class="smallText">&nbsp;<?php echo $values_name; ?>&nbsp;</td>
<td align="right" class="smallText">&nbsp;<?php echo $attributes_values["options_values_price"]; ?>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo $attributes_values["price_prefix"]; ?>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo $attributes_values["sort_order"]; ?>&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_EDIT, 'document', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=update_attribute&attribute_id=' . $attributes_values['products_attributes_id'] . '&' . $page_info)) . tep_draw_button(IMAGE_DELETE, 'trash', tep_href_link(FILENAME_PRODUCTS_ATTRIBUTES, 'action=delete_product_attribute&attribute_id=' . $attributes_values['products_attributes_id'] . '&' . $page_info)); ?>&nbsp;</td>
<?php
}
Expand All @@ -663,7 +684,7 @@
if ($action != 'update_attribute') {
?>
<tr>
<td colspan="7"><?php echo tep_black_line(); ?></td>
<td colspan="8"><?php echo tep_black_line(); ?></td>
</tr>
<tr class="<?php echo (floor($rows/2) == ($rows/2) ? 'attributes-even' : 'attributes-odd'); ?>">
<td class="smallText">&nbsp;<?php echo $next_id; ?>&nbsp;</td>
Expand Down Expand Up @@ -693,6 +714,7 @@
</select>&nbsp;</td>
<td align="right" class="smallText">&nbsp;<input type="text" name="value_price" size="6">&nbsp;</td>
<td align="right" class="smallText">&nbsp;<input type="text" name="price_prefix" size="2" value="+">&nbsp;</td>
<td align="right" class="smallText">&nbsp;<input type="text" name="sort_order" size="5" value="">&nbsp;</td>
<td align="center" class="smallText">&nbsp;<?php echo tep_draw_button(IMAGE_INSERT, 'plus'); ?>&nbsp;</td>
</tr>
<?php
Expand Down Expand Up @@ -724,7 +746,7 @@
}
?>
<tr>
<td colspan="7"><?php echo tep_black_line(); ?></td>
<td colspan="8"><?php echo tep_black_line(); ?></td>
</tr>
</table></form></td>
</tr>
Expand Down
5 changes: 5 additions & 0 deletions install/oscommerce.sql
View file
Expand Up @@ -1630,3 +1630,8 @@ INSERT INTO configuration (configuration_title, configuration_key, configuration
INSERT INTO configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Enable New User Module', 'MODULE_CONTENT_CREATE_ACCOUNT_LINK_STATUS', 'True', 'Do you want to enable the new user module?', '6', '1', 'tep_cfg_select_option(array(\'True\', \'False\'), ', now());
INSERT INTO configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Content Width', 'MODULE_CONTENT_CREATE_ACCOUNT_LINK_CONTENT_WIDTH', 'Half', 'Should the content be shown in a full or half width container?', '6', '1', 'tep_cfg_select_option(array(\'Full\', \'Half\'), ', now());
INSERT INTO configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Sort Order', 'MODULE_CONTENT_CREATE_ACCOUNT_LINK_SORT_ORDER', '2000', 'Sort order of display. Lowest is displayed first.', '6', '0', now());

# attributes sort order
ALTER TABLE products_options ADD products_options_sort_order INT( 11 ) NOT NULL DEFAULT '0';
ALTER TABLE products_attributes ADD sort_order INT( 11 ) NOT NULL DEFAULT '0';

4 changes: 2 additions & 2 deletions product_info.php
View file
Expand Up @@ -156,10 +156,10 @@

<p>
<?php
$products_options_name_query = tep_db_query("select distinct popt.products_options_id, popt.products_options_name from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_ATTRIBUTES . " patrib where patrib.products_id='" . (int)$HTTP_GET_VARS['products_id'] . "' and patrib.options_id = popt.products_options_id and popt.language_id = '" . (int)$languages_id . "' order by popt.products_options_name");
$products_options_name_query = tep_db_query("select distinct popt.products_options_id, popt.products_options_name from " . TABLE_PRODUCTS_OPTIONS . " popt, " . TABLE_PRODUCTS_ATTRIBUTES . " patrib where patrib.products_id='" . (int)$HTTP_GET_VARS['products_id'] . "' and patrib.options_id = popt.products_options_id and popt.language_id = '" . (int)$languages_id . "' order by popt.products_options_sort_order, popt.products_options_name");
while ($products_options_name = tep_db_fetch_array($products_options_name_query)) {
$products_options_array = array();
$products_options_query = tep_db_query("select pov.products_options_values_id, pov.products_options_values_name, pa.options_values_price, pa.price_prefix from " . TABLE_PRODUCTS_ATTRIBUTES . " pa, " . TABLE_PRODUCTS_OPTIONS_VALUES . " pov where pa.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and pa.options_id = '" . (int)$products_options_name['products_options_id'] . "' and pa.options_values_id = pov.products_options_values_id and pov.language_id = '" . (int)$languages_id . "'");
$products_options_query = tep_db_query("select pov.products_options_values_id, pov.products_options_values_name, pa.options_values_price, pa.price_prefix from " . TABLE_PRODUCTS_ATTRIBUTES . " pa, " . TABLE_PRODUCTS_OPTIONS_VALUES . " pov where pa.products_id = '" . (int)$HTTP_GET_VARS['products_id'] . "' and pa.options_id = '" . (int)$products_options_name['products_options_id'] . "' and pa.options_values_id = pov.products_options_values_id and pov.language_id = '" . (int)$languages_id . "' order by pa.sort_order");
while ($products_options = tep_db_fetch_array($products_options_query)) {
$products_options_array[] = array('id' => $products_options['products_options_values_id'], 'text' => $products_options['products_options_values_name']);
if ($products_options['options_values_price'] != '0') {
Expand Down

1 comment on commit f13c91d

@skleiner
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just verifying after installing on a live shop, the sorting appears to be working as intended.

Please sign in to comment.