0000077: Remove "grid_float_range_filter" block

Index: admin_templates/incs/grid_blocks.tpl =================================================================== --- admin_templates/incs/grid_blocks.tpl (revision 14707) +++ admin_templates/incs/grid_blocks.tpl (working copy) @@ -394,34 +394,6 @@ </table> </inp2:m_DefineElement> ~~-<inp2:m_DefineElement name="grid_float_range_filter" filter_width="90%">~~ ~~- <table class="range-filter">~~ ~~- <tr>~~ ~~- <td style="width: 100%">~~ ~~- <input type="text"~~ ~~- class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='from' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"~~ ~~- name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"~~ ~~- value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"~~ ~~- style="width: <inp2:m_Param name="filter_width"/>"~~ ~~- onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>~~ ~~- </td>~~ ~~- <td rowspan="2" valign="middle">~~ - <img src="<inp2:m_TemplatesBase/>/img/expand_filter.gif" width="7" height="9" alt="" onclick="filter_toggle('<inp2:SearchInputName field='$filter_field' filter_type='range' type='to' grid='$grid'/>_row', '<inp2:m_Param name='PrefixSpecial'/>');"/> ~~- </td>~~ ~~- </tr>~~ - <tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>" id="<inp2:SearchInputName field='$filter_field' filter_type='float_range' type='to' grid='$grid'/>_row"> ~~- <td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">~~ ~~- <input type="text"~~ ~~- class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='to' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"~~ ~~- name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"~~ ~~- value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"~~ ~~- style="width: <inp2:m_Param name="filter_width"/>"~~ ~~- onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>~~ ~~- </td>~~ ~~- </tr>~~ ~~- </table>~~ ~~-</inp2:m_DefineElement>~~ - <inp2:m_DefineElement name="grid_date_range_filter" calendar_format="" filter_width="80%"> <table class="range-filter"> <tr> Index: units/agents/agents_config.php =================================================================== --- units/agents/agents_config.php (revision 14707) +++ units/agents/agents_config.php (working copy) @@ -160,7 +160,7 @@ 'RunInterval' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ), 'RunMode' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ), 'LastRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), ~~- 'RunTime' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 145, ),~~ + 'RunTime' => Array ('filter_block' => 'grid_range_filter', 'width' => 145, ), 'LastRunStatus' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ), 'NextRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 65, ), Index: units/helpers/search_helper.php =================================================================== --- units/helpers/search_helper.php (revision 14707) +++ units/helpers/search_helper.php (working copy) @@ -536,24 +536,6 @@ switch ($filter_type) { case 'range': ~~- $from = $this->getRangeValue($field_options['submit_value']['from']);~~ ~~- $to = $this->getRangeValue($field_options['submit_value']['to']);~~ - ~~- if ($from !== false && $to !== false) {~~ ~~- // add range filter~~ ~~- $filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to;~~ ~~- }~~ ~~- elseif ($from !== false) {~~ ~~- // add equals filter on $from~~ ~~- $filter_value = $table_name.'`'.$field_name.'` = '.$from;~~ ~~- }~~ ~~- elseif ($to !== false) {~~ ~~- // add equals filter on $to~~ ~~- $filter_value = $table_name.'`'.$field_name.'` = '.$to;~~ ~~- }~~ ~~- break;~~ - ~~- case 'float_range':~~ // MySQL can't compare values in "float" type columns using "=" operator $from = $this->getRangeValue($field_options['submit_value']['from']); $to = $this->getRangeValue($field_options['submit_value']['to']); @@ -562,14 +544,25 @@ // add range filter $filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to; } ~~- elseif ($from !== false) {~~ ~~- // add equals filter on $from~~ ~~- $filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$from.') <= 0.0001';~~ + elseif ($field_type == 'float') { + if ($from !== false) { + // add equals filter on $from + $filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$from.') <= 0.0001'; + } + elseif ($to !== false) { + // add equals filter on $to + $filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$to.') <= 0.0001'; + } + } else { + if ($from !== false) { + // add equals filter on $from + $filter_value = $table_name.'`'.$field_name.'` = '.$from; + } + elseif ($to !== false) { + // add equals filter on $to + $filter_value = $table_name.'`'.$field_name.'` = '.$to; + } } ~~- elseif ($to !== false) {~~ ~~- // add equals filter on $to~~ ~~- $filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$to.') <= 0.0001';~~ ~~- }~~ break; case 'date_range':

Index: in-auction/units/schedule/schedule_config.php =================================================================== --- in-auction/units/schedule/schedule_config.php (revision 14707) +++ in-auction/units/schedule/schedule_config.php (working copy) @@ -137,8 +137,8 @@ 'StartDate' => Array('filter_block' => 'grid_date_range_filter', 'width' => 110,), 'StartTime' => Array('filter_block' => 'grid_like_filter', 'width' => 90,), 'EndTime' => Array('filter_block' => 'grid_like_filter', 'width' => 90,), ~~- 'ListingQuantity' => Array('filter_block' => 'grid_float_range_filter', 'width' => 95,),~~ ~~- 'ContinueUntilQty' => Array('title' => 'column:la_fld_ContinueUntilQuantity', 'filter_block' => 'grid_float_range_filter', 'width' => 87,),~~ + 'ListingQuantity' => Array('filter_block' => 'grid_range_filter', 'width' => 95,), + 'ContinueUntilQty' => Array('title' => 'column:la_fld_ContinueUntilQuantity', 'filter_block' => 'grid_range_filter', 'width' => 87,), 'LastProcessed' => Array('filter_block' => 'grid_date_range_filter', 'width' => 143,), 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100,), ), Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php =================================================================== --- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 14707) +++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy) @@ -128,7 +128,7 @@ 'Fields' => Array( 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), ~~- 'Amount' => Array( 'filter_block' => 'grid_float_range_filter'),~~ + 'Amount' => Array( 'filter_block' => 'grid_range_filter'), 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'), 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), @@ -143,7 +143,7 @@ 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'Username' => Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'), 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), ~~- 'Amount' => Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'Amount' => Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_range_filter'), 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'), 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), Index: in-commerce/units/coupons/coupons_config.php =================================================================== --- in-commerce/units/coupons/coupons_config.php (revision 14707) +++ in-commerce/units/coupons/coupons_config.php (working copy) @@ -144,7 +144,7 @@ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), ~~- 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Amount' => Array('filter_block' => 'grid_range_filter', 'width' => 100, ), 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ), 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ), @@ -166,7 +166,7 @@ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), ~~- 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Amount' => Array('filter_block' => 'grid_range_filter', 'width' => 100, ), 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ), 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ), Index: in-commerce/units/currencies/currencies_config.php =================================================================== --- in-commerce/units/currencies/currencies_config.php (revision 14707) +++ in-commerce/units/currencies/currencies_config.php (working copy) @@ -143,7 +143,7 @@ 'CurrencyId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'ISO' => Array ( 'title' => 'column:la_fld_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ), 'Translation' => Array ( 'title' => 'column:la_fld_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ), ~~- 'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),~~ + 'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_range_filter', 'width' => 130, ), 'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), Index: in-commerce/units/discounts/discounts_config.php =================================================================== --- in-commerce/units/discounts/discounts_config.php (revision 14707) +++ in-commerce/units/discounts/discounts_config.php (working copy) @@ -134,7 +134,7 @@ 'GroupId' => Array( 'title'=>'column:la_fld_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ), 'Type' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ), 'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ), ~~- 'Amount' => Array( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Amount' => Array( 'filter_block' => 'grid_range_filter', 'width' => 100, ), ), ), ), Index: in-commerce/units/files/files_config.php =================================================================== --- in-commerce/units/files/files_config.php (revision 14707) +++ in-commerce/units/files/files_config.php (working copy) @@ -130,7 +130,7 @@ 'Name' => Array ( 'title' => 'column:la_fld_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'), 'FilePath' => Array ( 'filter_block' => 'grid_like_filter'), 'Version' => Array ( 'filter_block' => 'grid_like_filter'), ~~- 'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_float_range_filter'),~~ + 'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_range_filter'), 'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'), 'Status' => Array ( 'filter_block' => 'grid_options_filter'), ), Index: in-commerce/units/gift_certificates/gift_certificates_config.php =================================================================== --- in-commerce/units/gift_certificates/gift_certificates_config.php (revision 14707) +++ in-commerce/units/gift_certificates/gift_certificates_config.php (working copy) @@ -116,8 +116,8 @@ 'GiftCertificateId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'Code' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ), 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ~~- 'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),~~ ~~- 'Amount' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_range_filter', 'width' => 160, ), + 'Amount' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ), 'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), ), ), Index: in-commerce/units/order_items/order_items_config.php =================================================================== --- in-commerce/units/order_items/order_items_config.php (revision 14707) +++ in-commerce/units/order_items/order_items_config.php (working copy) @@ -143,11 +143,11 @@ 'Quantity' => Array ('title' => 'la_col_Quantity', 'data_block' => 'grid_quantity_td', 'filter_block' => 'grid_range_filter'), 'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'), 'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'), ~~- 'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_range_filter'), + 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_range_filter'), 'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'), ~~- 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_range_filter'), 'ReturnedOn' => Array ('title' => 'la_col_ReturnedOn', 'data_block' => 'grid_date_td', 'filter_block' => 'grid_date_range_filter'), ), ), @@ -164,11 +164,11 @@ 'Quantity' => Array ('title' => 'la_col_Quantity', 'filter_block' => 'grid_range_filter'), 'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'), 'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'), ~~- 'Price' => Array ('filter_block' => 'grid_float_range_filter'),~~ ~~- 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_float_range_filter'),~~ + 'Price' => Array ('filter_block' => 'grid_range_filter'), + 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_range_filter'), 'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'), ~~- 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_range_filter'), 'ReturnedOn' => Array ('title' => 'la_col_ReturnedOn', 'data_block' => 'grid_date_td', 'filter_block' => 'grid_date_range_filter'), ), ), Index: in-commerce/units/orders/orders_config.php =================================================================== --- in-commerce/units/orders/orders_config.php (revision 14707) +++ in-commerce/units/orders/orders_config.php (working copy) @@ -553,7 +553,7 @@ 'OrderDate' => Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'CustomerName' => Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), 'PaymentType' => Array ('data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'), ~~- 'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter'), 'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'), 'OrderIP' => Array ('filter_block' => 'grid_like_filter'), 'Username' => Array ('filter_block' => 'grid_user_like_filter'), Index: in-commerce/units/pricing/pricing_config.php =================================================================== --- in-commerce/units/pricing/pricing_config.php (revision 14707) +++ in-commerce/units/pricing/pricing_config.php (working copy) @@ -129,7 +129,7 @@ 'AccessDuration' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), 'AccessUnit' => Array ( 'title'=> 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), 'Description' => Array ('filter_block' => 'grid_like_filter'), ~~- 'Price' => Array ( 'filter_block' => 'grid_float_range_filter'),~~ + 'Price' => Array ( 'filter_block' => 'grid_range_filter'), ), ), Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php =================================================================== --- in-commerce/units/product_option_combinations/product_option_combinations_config.php (revision 14707) +++ in-commerce/units/product_option_combinations/product_option_combinations_config.php (working copy) @@ -104,8 +104,8 @@ 'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_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'),~~ + 'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_range_filter'), +// 'Weight' => Array ( 'data_block' => 'weight_td', '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' => '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'),~~ + 'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_range_filter'), +// 'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_range_filter'), ), ), ), Index: in-commerce/units/products/products_config.php =================================================================== --- in-commerce/units/products/products_config.php (revision 14707) +++ in-commerce/units/products/products_config.php (working copy) @@ -651,7 +651,7 @@ 'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ), 'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ), 'OnSale' => Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ), ~~- /*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),~~ + /*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_range_filter', 'width' => 150, ), 'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/ ), Index: in-commerce/units/reports/reports_config.php =================================================================== --- in-commerce/units/reports/reports_config.php (revision 14707) +++ in-commerce/units/reports/reports_config.php (working copy) @@ -125,7 +125,7 @@ 'End' => Array('filter_block' => 'grid_date_range_filter'), 'GroupId' => Array( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'), 'Type' => Array('filter_block' => 'grid_options_filter'), ~~- 'Amount' => Array('filter_block' => 'grid_float_range_filter'),~~ + 'Amount' => Array('filter_block' => 'grid_range_filter'), ), ), Index: in-commerce/units/reports/reports_event_handler.php =================================================================== --- in-commerce/units/reports/reports_event_handler.php (revision 14707) +++ in-commerce/units/reports/reports_event_handler.php (working copy) @@ -375,16 +375,16 @@ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); @@ -440,12 +440,12 @@ 'FirstName' => Array ('filter_block' => 'grid_like_filter'), 'LastName' => Array ('filter_block' => 'grid_like_filter'), 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); @@ -478,16 +478,16 @@ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); @@ -544,12 +544,12 @@ 'Fields' => Array( 'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'), 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); Index: in-commerce/units/shipping/shipping_config.php =================================================================== --- in-commerce/units/shipping/shipping_config.php (revision 14707) +++ in-commerce/units/shipping/shipping_config.php (working copy) @@ -192,10 +192,10 @@ 'Name' => Array ( 'title' => 'column:la_fld_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ), 'Type' => Array ( 'title' => 'column:la_fld_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ), 'SpeedCode' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 130, ), ~~- 'BaseFee' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'BaseFee' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 100, ), 'IsFreePromoShipping' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 70, ), 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 170, ), ~~-// 'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter'),~~ +// 'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter'), ), ), Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== --- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 14707) +++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy) @@ -209,8 +209,8 @@ 'Fields' => Array ( 'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), 'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ), ~~- 'FlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),~~ ~~- 'PercentSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),~~ + 'FlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ), + 'PercentSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ), 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ), ), ), Index: in-commerce/units/taxes/taxes_config.php =================================================================== --- in-commerce/units/taxes/taxes_config.php (revision 14707) +++ in-commerce/units/taxes/taxes_config.php (working copy) @@ -119,7 +119,7 @@ 'Fields' => Array ( 'TaxZoneId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), 'Name' => Array ( 'title' => 'column:la_fld_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ), ~~- 'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),~~ + 'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_range_filter', 'width' => 110, ), 'Type' => Array ( 'title' => 'column:la_fld_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ), 'ApplyToShipping' => Array ( 'title' => 'column:la_fld_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ), 'ApplyToProcessing' => Array ( 'title' => 'column:la_fld_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),

Index: admin_templates/incs/grid_blocks.tpl =================================================================== --- admin_templates/incs/grid_blocks.tpl (revision 14705) +++ admin_templates/incs/grid_blocks.tpl (working copy) @@ -394,34 +394,6 @@ </table> </inp2:m_DefineElement> ~~-<inp2:m_DefineElement name="grid_float_range_filter" filter_width="90%">~~ ~~- <table class="range-filter">~~ ~~- <tr>~~ ~~- <td style="width: 100%">~~ ~~- <input type="text"~~ ~~- class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='from' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"~~ ~~- name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"~~ ~~- value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="from" grid="$grid"/>"~~ ~~- style="width: <inp2:m_Param name="filter_width"/>"~~ ~~- onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>~~ ~~- </td>~~ ~~- <td rowspan="2" valign="middle">~~ - <img src="<inp2:m_TemplatesBase/>/img/expand_filter.gif" width="7" height="9" alt="" onclick="filter_toggle('<inp2:SearchInputName field='$filter_field' filter_type='range' type='to' grid='$grid'/>_row', '<inp2:m_Param name='PrefixSpecial'/>');"/> ~~- </td>~~ ~~- </tr>~~ - <tr class="to-range-filter<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> hidden-filter</inp2:m_ifnot>" id="<inp2:SearchInputName field='$filter_field' filter_type='float_range' type='to' grid='$grid'/>_row"> ~~- <td style="width: 100%;<inp2:m_ifnot check='RangeFiltersUsed' grid='$grid'> display: none;</inp2:m_ifnot>">~~ ~~- <input type="text"~~ ~~- class="filter <inp2:m_ifnot check='SearchField' field='$filter_field' filter_type='float_range' type='to' grid='$grid' equals_to=''>filter-active</inp2:m_ifnot>"~~ ~~- name="<inp2:SearchInputName field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"~~ ~~- value="<inp2:SearchField field="$filter_field" filter_type="float_range" type="to" grid="$grid"/>"~~ ~~- style="width: <inp2:m_Param name="filter_width"/>"~~ ~~- onkeypress="search_keydown(event, '<inp2:m_Param name="PrefixSpecial"/>', '<inp2:m_Param name="grid"/>', '<inp2:m_Param name="ajax"/>')"/>~~ ~~- </td>~~ ~~- </tr>~~ ~~- </table>~~ ~~-</inp2:m_DefineElement>~~ - <inp2:m_DefineElement name="grid_date_range_filter" calendar_format="" filter_width="80%"> <table class="range-filter"> <tr> Index: units/agents/agents_config.php =================================================================== --- units/agents/agents_config.php (revision 14705) +++ units/agents/agents_config.php (working copy) @@ -160,7 +160,7 @@ 'RunInterval' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ), 'RunMode' => Array ('filter_block' => 'grid_options_filter', 'width' => 85, ), 'LastRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), ~~- 'RunTime' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 145, ),~~ + 'RunTime' => Array ('filter_block' => 'grid_range_filter', 'width' => 145, ), 'LastRunStatus' => Array ('filter_block' => 'grid_options_filter', 'width' => 120, ), 'NextRunOn' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 65, ), Index: units/helpers/search_helper.php =================================================================== --- units/helpers/search_helper.php (revision 14705) +++ units/helpers/search_helper.php (working copy) @@ -539,39 +539,33 @@ $from = $this->getRangeValue($field_options['submit_value']['from']); $to = $this->getRangeValue($field_options['submit_value']['to']); ~~- if ($from !== false && $to !== false) {~~ + if ( $from !== false && $to !== false ) { // add range filter ~~- $filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to;~~ + $filter_value = $table_name . '`' . $field_name . '` >= ' . $from . ' AND ' . $table_name . '`' . $field_name . '` <= ' . $to; } ~~- elseif ($from !== false) {~~ ~~- // add equals filter on $from~~ ~~- $filter_value = $table_name.'`'.$field_name.'` = '.$from;~~ + elseif ( $field_type == 'int' || $field_type == 'integer' ) { + if ( $from !== false ) { + // add equals filter on $from + $filter_value = $table_name . '`' . $field_name . '` = ' . $from; + } + elseif ( $to !== false ) { + // add equals filter on $to + $filter_value = $table_name . '`' . $field_name . '` = ' . $to; + } } ~~- elseif ($to !== false) {~~ ~~- // add equals filter on $to~~ ~~- $filter_value = $table_name.'`'.$field_name.'` = '.$to;~~ + else { + // MySQL can't compare values in "float" type columns using "=" operator + if ( $from !== false ) { + // add equals filter on $from + $filter_value = 'ABS(' . $table_name . '`' . $field_name . '` - ' . $from . ') <= 0.0001'; + } + elseif ( $to !== false ) { + // add equals filter on $to + $filter_value = 'ABS(' . $table_name . '`' . $field_name . '` - ' . $to . ') <= 0.0001'; + } } break; ~~- case 'float_range':~~ ~~- // MySQL can't compare values in "float" type columns using "=" operator~~ ~~- $from = $this->getRangeValue($field_options['submit_value']['from']);~~ ~~- $to = $this->getRangeValue($field_options['submit_value']['to']);~~ - ~~- if ($from !== false && $to !== false) {~~ ~~- // add range filter~~ ~~- $filter_value = $table_name.'`'.$field_name.'` >= '.$from.' AND '.$table_name.'`'.$field_name.'` <= '.$to;~~ ~~- }~~ ~~- elseif ($from !== false) {~~ ~~- // add equals filter on $from~~ ~~- $filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$from.') <= 0.0001';~~ ~~- }~~ ~~- elseif ($to !== false) {~~ ~~- // add equals filter on $to~~ ~~- $filter_value = 'ABS('.$table_name.'`'.$field_name.'` - '.$to.') <= 0.0001';~~ ~~- }~~ ~~- break;~~ - case 'date_range': $from = $this->processRangeField($object, $field_name, $field_options['submit_value'], 'from'); $to = $this->processRangeField($object, $field_name, $field_options['submit_value'], 'to');

Index: custom/units/widgets/widgets_config.php =================================================================== --- custom/units/widgets/widgets_config.php (revision 14705) +++ custom/units/widgets/widgets_config.php (working copy) @@ -200,7 +200,7 @@ 'Type' => Array ('filter_block' => 'grid_options_filter'), 'Status' => Array ('filter_block' => 'grid_options_filter'), 'Good' => Array ('filter_block' => 'grid_like_filter'), ~~- 'Qty' => Array ('header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_float_range_filter'),~~ + 'Qty' => Array ('header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_range_filter'), 'Email' => Array ('filter_block' => 'grid_like_filter'), 'Phone' => Array ('filter_block' => 'grid_like_filter'), 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'), Index: in-auction/units/schedule/schedule_config.php =================================================================== --- in-auction/units/schedule/schedule_config.php (revision 14705) +++ in-auction/units/schedule/schedule_config.php (working copy) @@ -137,8 +137,8 @@ 'StartDate' => Array('filter_block' => 'grid_date_range_filter', 'width' => 110,), 'StartTime' => Array('filter_block' => 'grid_like_filter', 'width' => 90,), 'EndTime' => Array('filter_block' => 'grid_like_filter', 'width' => 90,), ~~- 'ListingQuantity' => Array('filter_block' => 'grid_float_range_filter', 'width' => 95,),~~ ~~- 'ContinueUntilQty' => Array('title' => 'column:la_fld_ContinueUntilQuantity', 'filter_block' => 'grid_float_range_filter', 'width' => 87,),~~ + 'ListingQuantity' => Array('filter_block' => 'grid_range_filter', 'width' => 95,), + 'ContinueUntilQty' => Array('title' => 'column:la_fld_ContinueUntilQuantity', 'filter_block' => 'grid_range_filter', 'width' => 87,), 'LastProcessed' => Array('filter_block' => 'grid_date_range_filter', 'width' => 143,), 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100,), ), Index: in-commerce/units/affiliate_payments/affiliate_payments_config.php =================================================================== --- in-commerce/units/affiliate_payments/affiliate_payments_config.php (revision 14705) +++ in-commerce/units/affiliate_payments/affiliate_payments_config.php (working copy) @@ -128,7 +128,7 @@ 'Fields' => Array( 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), ~~- 'Amount' => Array( 'filter_block' => 'grid_float_range_filter'),~~ + 'Amount' => Array( 'filter_block' => 'grid_range_filter'), 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'), 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), @@ -143,7 +143,7 @@ 'AffiliatePaymentId'=> Array( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'Username' => Array( 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'), 'PaymentDate' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), ~~- 'Amount' => Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'Amount' => Array( 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_range_filter'), 'Comment' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), 'PaymentTypeId' => Array( 'title' => 'column:la_fld_PaymentType', 'filter_block' => 'grid_options_filter'), 'PaymentReference' => Array( 'filter_block' => 'grid_like_filter', 'first_chars' => 50), Index: in-commerce/units/coupons/coupons_config.php =================================================================== --- in-commerce/units/coupons/coupons_config.php (revision 14705) +++ in-commerce/units/coupons/coupons_config.php (working copy) @@ -144,7 +144,7 @@ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), ~~- 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Amount' => Array('filter_block' => 'grid_range_filter', 'width' => 100, ), 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ), 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ), @@ -166,7 +166,7 @@ 'Expiration' => Array('filter_block' => 'grid_date_range_filter', 'width' => 145, ), 'Type' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), 'Status' => Array('filter_block' => 'grid_options_filter', 'width' => 100, ), ~~- 'Amount' => Array('filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Amount' => Array('filter_block' => 'grid_range_filter', 'width' => 100, ), 'LastUsedBy' => Array('filter_block' => 'grid_like_filter', 'width' => 140, ), 'LastUsedOn' => Array('filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'NumberOfUses' => Array('filter_block' => 'grid_range_filter', 'width' => 130, ), Index: in-commerce/units/currencies/currencies_config.php =================================================================== --- in-commerce/units/currencies/currencies_config.php (revision 14705) +++ in-commerce/units/currencies/currencies_config.php (working copy) @@ -143,7 +143,7 @@ 'CurrencyId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'ISO' => Array ( 'title' => 'column:la_fld_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ), 'Translation' => Array ( 'title' => 'column:la_fld_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ), ~~- 'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ),~~ + 'RateToPrimary' => Array ( 'title' => 'column:la_fld_RateToPrimary', 'filter_block' => 'grid_range_filter', 'width' => 130, ), 'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), Index: in-commerce/units/discounts/discounts_config.php =================================================================== --- in-commerce/units/discounts/discounts_config.php (revision 14705) +++ in-commerce/units/discounts/discounts_config.php (working copy) @@ -134,7 +134,7 @@ 'GroupId' => Array( 'title'=>'column:la_fld_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ), 'Type' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ), 'Status' => Array( 'filter_block' => 'grid_options_filter', 'width' => 90, ), ~~- 'Amount' => Array( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Amount' => Array( 'filter_block' => 'grid_range_filter', 'width' => 100, ), ), ), ), Index: in-commerce/units/files/files_config.php =================================================================== --- in-commerce/units/files/files_config.php (revision 14705) +++ in-commerce/units/files/files_config.php (working copy) @@ -130,7 +130,7 @@ 'Name' => Array ( 'title' => 'column:la_fld_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'), 'FilePath' => Array ( 'filter_block' => 'grid_like_filter'), 'Version' => Array ( 'filter_block' => 'grid_like_filter'), ~~- 'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_float_range_filter'),~~ + 'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_range_filter'), 'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'), 'Status' => Array ( 'filter_block' => 'grid_options_filter'), ), Index: in-commerce/units/gift_certificates/gift_certificates_config.php =================================================================== --- in-commerce/units/gift_certificates/gift_certificates_config.php (revision 14705) +++ in-commerce/units/gift_certificates/gift_certificates_config.php (working copy) @@ -116,8 +116,8 @@ 'GiftCertificateId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'Code' => Array ('filter_block' => 'grid_like_filter', 'width' => 100, ), 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ~~- 'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ),~~ ~~- 'Amount' => Array ('filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'Debit' => Array ('title' => 'column:la_fld_RemainingAmount', 'filter_block' => 'grid_range_filter', 'width' => 160, ), + 'Amount' => Array ('filter_block' => 'grid_range_filter', 'width' => 100, ), 'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), ), ), Index: in-commerce/units/order_items/order_items_config.php =================================================================== --- in-commerce/units/order_items/order_items_config.php (revision 14705) +++ in-commerce/units/order_items/order_items_config.php (working copy) @@ -143,11 +143,11 @@ 'Quantity' => Array ('title' => 'la_col_Quantity', 'data_block' => 'grid_quantity_td', 'filter_block' => 'grid_range_filter'), 'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'), 'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'), ~~- 'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'Price' => Array ('data_block' => 'grid_price_td', 'filter_block' => 'grid_range_filter'), + 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'data_block' => 'grid_extendedprice_td', 'filter_block' => 'grid_range_filter'), 'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'), ~~- 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_range_filter'), 'ReturnedOn' => Array ('title' => 'la_col_ReturnedOn', 'data_block' => 'grid_date_td', 'filter_block' => 'grid_date_range_filter'), ), ), @@ -164,11 +164,11 @@ 'Quantity' => Array ('title' => 'la_col_Quantity', 'filter_block' => 'grid_range_filter'), 'QuantityReserved' => Array ('title' => 'la_col_QuantityReserved', 'filter_block' => 'grid_range_filter'), 'QuantityAvailable' => Array ('title' => 'la_col_QuantityAvailable', 'filter_block' => 'grid_range_filter'), ~~- 'Price' => Array ('filter_block' => 'grid_float_range_filter'),~~ ~~- 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_float_range_filter'),~~ + 'Price' => Array ('filter_block' => 'grid_range_filter'), + 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_range_filter'), 'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'), ~~- 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'ReturnAmount' => Array ('title' => 'la_col_ReturnAmount', 'data_block' => 'grid_edit_td', 'filter_block' => 'grid_range_filter'), 'ReturnedOn' => Array ('title' => 'la_col_ReturnedOn', 'data_block' => 'grid_date_td', 'filter_block' => 'grid_date_range_filter'), ), ), Index: in-commerce/units/orders/orders_config.php =================================================================== --- in-commerce/units/orders/orders_config.php (revision 14705) +++ in-commerce/units/orders/orders_config.php (working copy) @@ -553,7 +553,7 @@ 'OrderDate' => Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), 'CustomerName' => Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), 'PaymentType' => Array ('data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'), ~~- 'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'),~~ + 'TotalAmount' => Array ('data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter'), 'AffiliateUser' => Array ('data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'), 'OrderIP' => Array ('filter_block' => 'grid_like_filter'), 'Username' => Array ('filter_block' => 'grid_user_like_filter'), Index: in-commerce/units/pricing/pricing_config.php =================================================================== --- in-commerce/units/pricing/pricing_config.php (revision 14705) +++ in-commerce/units/pricing/pricing_config.php (working copy) @@ -129,7 +129,7 @@ 'AccessDuration' => Array ('data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), 'AccessUnit' => Array ( 'title'=> 'column:la_fld_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), 'Description' => Array ('filter_block' => 'grid_like_filter'), ~~- 'Price' => Array ( 'filter_block' => 'grid_float_range_filter'),~~ + 'Price' => Array ( 'filter_block' => 'grid_range_filter'), ), ), Index: in-commerce/units/product_option_combinations/product_option_combinations_config.php =================================================================== --- in-commerce/units/product_option_combinations/product_option_combinations_config.php (revision 14705) +++ in-commerce/units/product_option_combinations/product_option_combinations_config.php (working copy) @@ -104,8 +104,8 @@ 'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_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'),~~ + 'Price' => Array ( 'data_block' => 'price_td', 'filter_block' => 'grid_range_filter'), +// 'Weight' => Array ( 'data_block' => 'weight_td', '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' => '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'),~~ + 'FinalPrice' => Array ( 'title' => 'column:la_fld_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_range_filter'), +// 'Weight' => Array ('data_block' => 'weight_td', 'filter_block' => 'grid_range_filter'), ), ), ), Index: in-commerce/units/products/products_config.php =================================================================== --- in-commerce/units/products/products_config.php (revision 14711) +++ in-commerce/units/products/products_config.php (working copy) @@ -651,7 +651,7 @@ 'QtyInStock' => Array ('title' => 'column:la_fld_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ), 'QtyBackOrdered' => Array ('title' => 'column:la_fld_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ), 'OnSale' => Array ('title' => 'column:la_fld_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ), ~~- /*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),~~ + /*'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_range_filter', 'width' => 150, ), 'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ),*/ ), Index: in-commerce/units/reports/reports_config.php =================================================================== --- in-commerce/units/reports/reports_config.php (revision 14705) +++ in-commerce/units/reports/reports_config.php (working copy) @@ -125,7 +125,7 @@ 'End' => Array('filter_block' => 'grid_date_range_filter'), 'GroupId' => Array( 'title' => 'column:la_fld_Group', 'filter_block' => 'grid_options_filter'), 'Type' => Array('filter_block' => 'grid_options_filter'), ~~- 'Amount' => Array('filter_block' => 'grid_float_range_filter'),~~ + 'Amount' => Array('filter_block' => 'grid_range_filter'), ), ), Index: in-commerce/units/reports/reports_event_handler.php =================================================================== --- in-commerce/units/reports/reports_event_handler.php (revision 14705) +++ in-commerce/units/reports/reports_event_handler.php (working copy) @@ -375,16 +375,16 @@ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); @@ -440,12 +440,12 @@ 'FirstName' => Array ('filter_block' => 'grid_like_filter'), 'LastName' => Array ('filter_block' => 'grid_like_filter'), 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); @@ -478,16 +478,16 @@ 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'StoreQty' => Array ('title' => 'la_col_StoreQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), 'eBayQty' => Array ('title' => 'la_col_eBayQty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreAmount' => Array ('title' => 'la_col_StoreGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayAmount' => Array ('title' => 'la_col_eBayGMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'StoreProfit' => Array ('title' => 'la_col_StoreProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'eBayProfit' => Array ('title' => 'la_col_eBayProfit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); @@ -544,12 +544,12 @@ 'Fields' => Array( 'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'), 'Qty' => Array ('td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ~~- 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ ~~- 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'),~~ + 'Cost' => Array ('td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Amount' => Array ('title' => 'la_col_GMV', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Tax' => Array ('title' => 'la_col_Tax', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Shipping' => Array ('title' => 'la_col_Shipping', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Processing' => Array ('title' => 'la_col_Processing', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + 'Profit' => Array ('title' => 'la_col_Profit', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), ), ); Index: in-commerce/units/shipping/shipping_config.php =================================================================== --- in-commerce/units/shipping/shipping_config.php (revision 14705) +++ in-commerce/units/shipping/shipping_config.php (working copy) @@ -192,10 +192,10 @@ 'Name' => Array ( 'title' => 'column:la_fld_ShippingName', 'filter_block' => 'grid_range_filter', 'width' => 250, ), 'Type' => Array ( 'title' => 'column:la_fld_ShippingType', 'filter_block' => 'grid_options_filter', 'width' => 100, ), 'SpeedCode' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 130, ), ~~- 'BaseFee' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 100, ),~~ + 'BaseFee' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 100, ), 'IsFreePromoShipping' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 70, ), 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 170, ), ~~-// 'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter'),~~ +// 'CODFlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter'), ), ), Index: in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== --- in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (revision 14705) +++ in-commerce/units/shipping_quote_engines/shipping_quote_engines_config.php (working copy) @@ -209,8 +209,8 @@ 'Fields' => Array ( 'EngineId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), 'Name' => Array ( 'title' => 'column:la_fld_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ), ~~- 'FlatSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),~~ ~~- 'PercentSurcharge' => Array ( 'filter_block' => 'grid_float_range_filter', 'width' => 150, ),~~ + 'FlatSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ), + 'PercentSurcharge' => Array ( 'filter_block' => 'grid_range_filter', 'width' => 150, ), 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ), ), ), Index: in-commerce/units/taxes/taxes_config.php =================================================================== --- in-commerce/units/taxes/taxes_config.php (revision 14705) +++ in-commerce/units/taxes/taxes_config.php (working copy) @@ -119,7 +119,7 @@ 'Fields' => Array ( 'TaxZoneId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), 'Name' => Array ( 'title' => 'column:la_fld_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ), ~~- 'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ),~~ + 'TaxValue' => Array ( 'title' => 'column:la_fld_TaxValue', 'filter_block' => 'grid_range_filter', 'width' => 110, ), 'Type' => Array ( 'title' => 'column:la_fld_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ), 'ApplyToShipping' => Array ( 'title' => 'column:la_fld_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ), 'ApplyToProcessing' => Array ( 'title' => 'column:la_fld_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ),

Issue History
Date Modified	Username	Field	Change
2012-07-25 05:33	alex	Note Added: 0005066
2012-07-25 05:33	alex	Status	resolved => closed
2011-11-01 05:40	alex	Changeset attached	5.2.x r14718
2011-11-01 05:40	alex	Note Added: 0004107
2011-11-01 05:40	alex	Status	reviewed and tested => resolved
2011-11-01 05:40	alex	Fixed in Version	=> 5.2.0-B1
2011-11-01 05:40	alex	Resolution	open => fixed
2011-11-01 05:40	alex	Assigned To	!COMMUNITY => alex
2011-11-01 05:39	alex	Changeset attached	5.2.x r14717
2011-11-01 05:39	alex	Changeset attached	5.2.x r14716
2011-11-01 05:39	alex	Changeset attached	1.2.x r14715
2011-11-01 05:36	alex	Note Added: 0004106
2011-11-01 05:36	alex	Assigned To	alex => !COMMUNITY
2011-11-01 05:36	alex	Status	needs testing => reviewed and tested
2011-11-01 05:34	alex	File Added: range_filter_modules_v2.patch
2011-11-01 05:33	alex	File Added: range_filter_core_v2.patch
2011-10-31 13:04	erik	File Added: range_filter_modules_77.patch
2011-10-31 13:04	erik	File Deleted: range_filter_modules_77.patch
2011-10-31 12:51	erik	Time Estimate Removed	1 =>
2011-10-31 12:51	erik	Note Added: 0004105
2011-10-31 12:51	erik	Assigned To	erik => alex
2011-10-31 12:51	erik	Developer	=> erik
2011-10-31 12:51	erik	Status	needs work => needs testing
2011-10-31 12:39	erik	File Added: range_filter_modules_77.patch
2011-10-31 12:38	erik	File Added: range_filter_core_77.patch
2011-10-31 03:08	alex	Additional Information Updated	View Revisions
2011-10-22 05:25	alex	Estimate Points	=> 1
2011-10-21 09:09	Dmitry	Assigned To	=> erik
2011-10-21 09:09	Dmitry	Status	active => needs work
2011-09-27 05:07	alex	Time Estimate Added	1
2011-09-23 21:58	Dmitry	Target Version	Icebox => 5.2.0
2009-10-06 14:27	alex	Type	bug report => task
2009-06-15 23:31	Dmitry	Target Version	=> Icebox
2009-06-15 08:04	alex	New Issue

Notes
(0004105) erik (manager) 2011-10-31 12:51	Patches are attached - needs testing.

(0004106) alex (manager) 2011-11-01 05:36	Test in most cases, but theese cases were fixed additionally: 1. module "Custom" wasn't processed (still using grid_float_range_filter block) resulting fatal error, since block was removed 2. only "float" field type was checked, but there could be also "double" and "real" field types (was used in demo grid in Custom module)

(0004107) alex (manager) 2011-11-01 05:40	Fix committed to 5.2.x branch. Commit Message: Fixes 0000077: Remove "grid_float_range_filter" block Commit on behalf of Erik

(0005066) alex (manager) 2012-07-25 05:33	Since 5.2.0 version was released.

Related Changesets
In-Portal CMS: 5.2.x r14718 Timestamp: 2011-11-01 05:40:06 Author: alex [ Details ] [ Diff ]	Fixes 0000077: Remove "grid_float_range_filter" block Commit on behalf of Erik
	mod - /in-portal/branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/units/agents/agents_config.php	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/units/helpers/search_helper.php	[ Diff ] [ File ]

Modules :: In-Commerce: 5.2.x r14717 Timestamp: 2011-11-01 05:39:34 Author: alex [ Details ] [ Diff ]	Bug 0000077: Remove "grid_float_range_filter" block Commit on behalf of Erik
	mod - /w/in-commerce/branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/coupons/coupons_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/currencies/currencies_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/discounts/discounts_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/files/files_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/gift_certificates/gift_certificates_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/order_items/order_items_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/orders/orders_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/pricing/pricing_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/product_option_combinations/product_option_combinations_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/products/products_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/reports/reports_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/reports/reports_event_handler.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/shipping/shipping_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/units/taxes/taxes_config.php	[ Diff ] [ File ]

Modules :: Custom: 1.2.x r14715 Timestamp: 2011-11-01 05:39:05 Author: alex [ Details ] [ Diff ]	Bug 0000077: Remove "grid_float_range_filter" block Commit on behalf of Erik
	mod - /modules/custom/branches/1.2.x/units/widgets/widgets_config.php	[ Diff ] [ File ]

Relationships [ Relation Graph ] [ Dependency Graph ]

In-Portal Issue Tracker