Index: branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php =================================================================== diff -u -N -r14258 -r14582 --- branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 14258) +++ branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array ( 'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), - 'SKU' => Array ( 'title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'), - 'Availability' => Array ( 'title' => 'la_col_Availability', 'filter_block' => 'grid_options_filter'), - 'Price' => Array ( 'title' => 'la_col_Price', 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'), - /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/ + 'SKU' => Array ( 'filter_block' => 'grid_like_filter'), + 'Availability' => Array ( 'filter_block' => 'grid_options_filter'), + 'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'), +// 'Weight' => Array ( 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'), ), ), @@ -117,11 +117,11 @@ 'Selector' => 'radio', 'Fields' => Array ( 'Combination' => Array ('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), - 'SKU' => Array ('title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'), - 'QtyInStock' => Array ('title' => 'la_col_QtyInStock', 'filter_block' => 'grid_range_filter'), - 'QtyReserved' => Array ('title' => 'la_col_QtyReserved', 'filter_block' => 'grid_range_filter'), - 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter'), - 'QtyOnOrder' => Array ('title' => 'la_col_QtyOnOrder', 'filter_block' => 'grid_range_filter'), + 'SKU' => Array ('filter_block' => 'grid_like_filter'), + 'QtyInStock' => Array ('filter_block' => 'grid_range_filter'), + 'QtyReserved' => Array ('filter_block' => 'grid_range_filter'), + 'QtyBackOrdered' => Array ('filter_block' => 'grid_range_filter'), + 'QtyOnOrder' => Array ('filter_block' => 'grid_range_filter'), ), ), @@ -133,8 +133,8 @@ ), 'Fields' => Array ( 'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), - 'FinalPrice' => Array ( 'title' => 'la_col_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'), - /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/ + 'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'), +// 'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'), ), ), ),