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, ),