Index: branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_config.php (.../affiliate_plans_items_config.php) (revision 14258) +++ branches/5.2.x/units/affiliate_plans_items/affiliate_plans_items_config.php (.../affiliate_plans_items_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'icon16_product_pending.png', ), 'Fields' => Array( - 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_checkbox_td' ), + 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_checkbox_td' ), 'ItemName' => Array( 'title'=>'la_col_ItemName' ), 'ItemType' => Array( 'title'=>'la_col_ItemType' ), ), Index: branches/5.2.x/units/taxes/taxes_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 14569) +++ branches/5.2.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'TaxZoneId', 'TitleField' => 'Name', - + 'TitlePresets' => Array ( - 'default' => Array ( + 'default' => Array ( 'new_status_labels' => Array ('tax' => '!la_title_AddingTaxZone!'), 'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'), ), @@ -58,7 +58,7 @@ 'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!", ), ), - + 'PermSection' => Array ('main' => 'in-commerce:taxes'), 'Sections' => Array ( @@ -94,17 +94,17 @@ 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => 1, 'default' => 1), 'TaxValue' => Array ('type' => 'double', 'not_null' => 1, 'default' => 0), 'ApplyToShipping' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, - 'default' => 0, 'not_null' => 1, + 'default' => 0, 'not_null' => 1, ), 'ApplyToProcessing' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, - 'default' => 0, 'not_null' => 1, - ), + 'default' => 0, 'not_null' => 1, + ), ), 'Grids' => Array ( @@ -117,12 +117,12 @@ 'module' => 'core', ), 'Fields' => Array ( - 'TaxZoneId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), - 'Name' => Array ( 'title' => 'la_col_TaxZoneName', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'TaxValue' => Array ( 'title' => 'la_col_TaxValue', 'filter_block' => 'grid_float_range_filter', 'width' => 110, ), - 'Type' => Array ( 'title' => 'la_col_ZoneType', 'filter_block' => 'grid_options_filter', 'width' => 90, ), - 'ApplyToShipping' => Array ( 'title' => 'la_col_TaxApplyToShipping', 'filter_block' => 'grid_options_filter', 'width' => 140, ), - 'ApplyToProcessing' => Array ( 'title' => 'la_col_TaxApplyToProcessing', 'filter_block' => 'grid_options_filter', 'width' => 150, ), + '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, ), + '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: branches/5.2.x/admin_templates/products/products_custom.tpl =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/admin_templates/products/products_custom.tpl (.../products_custom.tpl) (revision 14258) +++ branches/5.2.x/admin_templates/products/products_custom.tpl (.../products_custom.tpl) (revision 14582) @@ -1,7 +1,7 @@ - + @@ -52,15 +52,24 @@ - +
+ + + - +
+ + + +
+
+ \ No newline at end of file Index: branches/5.2.x/units/affiliate_plans/affiliate_plans_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/affiliate_plans/affiliate_plans_config.php (.../affiliate_plans_config.php) (revision 14258) +++ branches/5.2.x/units/affiliate_plans/affiliate_plans_config.php (.../affiliate_plans_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'Enabled' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, ), 'IsPrimary' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), ), @@ -114,10 +114,10 @@ 'module' => 'core', ), 'Fields' => Array ( - 'AffiliatePlanId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'PlanType' => Array ( 'title' => 'la_col_PlanType', 'filter_block' => 'grid_options_filter', 'width' => 150, ), - 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'AffiliatePlanId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'PlanType' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 150, ), + 'Enabled' => Array ( 'title' => 'column:la_fld_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), ), ), Index: branches/5.2.x/admin_templates/orders/orders_edit_preview.tpl =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/admin_templates/orders/orders_edit_preview.tpl (.../orders_edit_preview.tpl) (revision 14569) +++ branches/5.2.x/admin_templates/orders/orders_edit_preview.tpl (.../orders_edit_preview.tpl) (revision 14582) @@ -228,7 +228,7 @@ colspan="2" nowrap> - + Index: branches/5.2.x/units/files/files_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/files/files_config.php (.../files_config.php) (revision 14258) +++ branches/5.2.x/units/files/files_config.php (.../files_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'FileId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'), - 'Name' => Array ( 'title' => 'la_col_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'), - 'FilePath' => Array ( 'title' => 'la_col_FilePath', 'filter_block' => 'grid_like_filter'), - 'Version' => Array ( 'title' => 'la_col_Version', 'filter_block' => 'grid_like_filter'), + 'FileId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'), + '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'), - 'AddedOn' => Array ( 'title' => 'la_col_AddedOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'), - 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter'), + 'AddedOn' => Array ( 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'), + 'Status' => Array ( 'filter_block' => 'grid_options_filter'), ), ), ), Index: branches/5.2.x/units/shipping_quote_engines/usps.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 14258) +++ branches/5.2.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 14582) @@ -1,6 +1,6 @@ logFilePath = (defined('RESTRICTED') ? RESTRICTED : WRITEABLE . '/user_files') . '/usps.log'; + // EXPRESS, FIRST CLASS, PRIORITY, PARCEL, BMP, MEDIA $this->types = Array( 'EXPRESS' => 'Express Mail', @@ -1145,20 +1152,22 @@ $body = curl_exec($curl); curl_close($curl); - if (defined('USPS_LOG_FILE')) { - $filename = USPS_LOG_FILE; - if ( !$fp = fopen($filename, "a") ) echo("Failed opening file $filename"); + if ($this->logFilePath) { + $fp = fopen($this->logFilePath, 'a'); + + if ($fp) { + $request_url = sprintf("Date %s : IP %s\n\nPost\n\n%s\n\nReplay\n\n%s\n\n", + adodb_date('m/d/Y H:i:s'), + $_SERVER['REMOTE_ADDR'], + $usps_server . '/' . $api_dll . '?' . urldecode($request), + $body + ); + + fwrite($fp, $request_url); + fclose($fp); + } } - $request_url = sprintf("Date %s : IP %s\n\nPost\n\n%s\n\nReplay\n\n%s\n\n", - date("m/d/Y H:i:s",time()), - $_SERVER['REMOTE_ADDR'], - $usps_server.'/'.$api_dll.'?'.urldecode($request), - $body - ); - if (defined('USPS_LOG_FILE')) { - if (!fwrite($fp, $request_url)) echo("Failed writing to file $filename"); - fclose($fp); - } + return $body; } Index: branches/5.2.x/units/reports/reports_event_handler.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 14258) +++ branches/5.2.x/units/reports/reports_event_handler.php (.../reports_event_handler.php) (revision 14582) @@ -1,6 +1,6 @@ Array ( 'CategoryName' => Array ('title' => 'la_col_CategoryName', 'filter_block' => 'grid_like_filter'), - 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + '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 ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_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'), @@ -436,11 +436,11 @@ 'module' => 'core', ), 'Fields' => Array ( - 'Login' => Array ('title' => 'la_col_Login', 'filter_block' => 'grid_like_filter'), - 'FirstName' => Array ('title' => 'la_col_FirstName', 'filter_block' => 'grid_like_filter'), - 'LastName' => Array ('title' => 'la_col_LastName', 'filter_block' => 'grid_like_filter'), - 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), - 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_filter'), + 'Login' => Array ('filter_block' => 'grid_like_filter'), + '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'), @@ -475,10 +475,10 @@ ), 'Fields' => Array ( 'ProductName' => Array ('title' => 'la_col_ProductName', 'filter_block' => 'grid_like_filter'), - 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), + '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 ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'hidden' => 1, 'filter_block' => 'grid_float_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'), @@ -543,8 +543,8 @@ ), 'Fields' => Array( 'Marketplace' => Array ('title' => 'la_col_Marketplace', 'filter_block' => 'grid_options_filter'), - 'Qty' => Array ('title' => 'la_col_Qty', 'td_style' => 'text-align: center', 'total' => 'sum', 'filter_block' => 'grid_range_filter'), - 'Cost' => Array ('title' => 'la_col_Cost', 'td_style' => 'text-align: right', 'total' => 'sum', 'filter_block' => 'grid_float_range_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'), Index: branches/5.2.x/gw_notify.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/gw_notify.php (.../gw_notify.php) (revision 14258) +++ branches/5.2.x/gw_notify.php (.../gw_notify.php) (revision 14582) @@ -1,6 +1,6 @@ Init(); - /* + // for debugging payment gateway notifications, don't remove - $fh = fopen(WRITEABLE . '/gw.log', 'a'); + /*$fh = fopen((defined('RESTRICTED') ? RESTRICTED : WRITEABLE) . '/gw.log', 'a'); fwrite ($fh, "\n\n".date('d/m/y h:i:s').":\n"); foreach ($_REQUEST as $key => $val) { fwrite($fh, "\n"); } - fclose($fh); - */ - + fclose($fh);*/ + + $db =& $application->GetADODBConnection(); $application->setUnitOption('ord','AutoLoad',false); $order =& $application->recallObject('ord'); - + $order_id = $application->GetVar('order_id'); if ($order_id) { $order->Load($order_id); } - + $gw_data = $order->getGatewayData($application->GetVar('payment_type_id')); $application->registerClass( $gw_data['ClassName'], GW_CLASS_PATH.'/'.$gw_data['ClassFile'] ); $gateway_object =& $application->recallObject( $gw_data['ClassName'] ); Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14569) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 14582) @@ -1,6 +1,6 @@ Array ('Core' => '5.1.2-B2'), '5.1.2-RC1' => Array ('Core' => '5.1.2-RC1'), '5.1.2' => Array ('Core' => '5.1.2'), + '5.1.3-B1' => Array ('Core' => '5.1.3-B1'), + '5.1.3-B2' => Array ('Core' => '5.1.3-B2'), + '5.1.3-RC1' => Array ('Core' => '5.1.3-RC1'), + '5.1.3-RC2' => Array ('Core' => '5.1.3-RC2'), + '5.1.3' => Array ('Core' => '5.1.3'), ); } Index: branches/5.2.x/units/discounts/discounts_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/discounts/discounts_config.php (.../discounts_config.php) (revision 14258) +++ branches/5.2.x/units/discounts/discounts_config.php (.../discounts_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'DiscountId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter', 'width' => 150, ), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 90, ), - 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 90, ), - 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ), + 'DiscountId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array( 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Start' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'End' => Array( 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + '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, ), ), ), ), Index: branches/5.2.x/units/affiliates/affiliates_tag_processor.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 14258) +++ branches/5.2.x/units/affiliates/affiliates_tag_processor.php (.../affiliates_tag_processor.php) (revision 14582) @@ -1,6 +1,6 @@ GetDBField('AffiliateCode'); $params['prefix'] = '_FRONT_END_'; $params['index_file'] = 'index.php'; - $params['no_pass'] = 1; // don't work $params['__SSL__'] = 0; $params['__NO_SID__'] = 1; // don't work $link = $this->Application->ProcessParsedTag('m', 'Link', $params); - // remove env manually (because no_pass parameter don't work) - return preg_replace('/(.*)\/index.php\?env=(.*)&(.*)/', '\\1/index.php?\\3', $link); + // remove env manually + return preg_replace('/(.*)\/index.php\?env=(.*?)&(.*)/', '\\1/index.php?\\3', $link); } /** @@ -50,16 +49,15 @@ // return $this->GetAffiliateLink($params); - $params['no_pass'] = 1; // don't work $params['index_file'] = 'index.php'; $params['affiliate'] = $object->GetDBField('AffiliateCode'); $params['__SSL__'] = 0; $params['__NO_SID__'] = 1; // don't work $link = $this->Application->ProcessParsedTag('m', 'Link', $params); - // remove env manually (because no_pass parameter don't work) - return preg_replace('/(.*)\/index.php\?env=(.*)&(.*)/', '\\1/index.php?\\3', $link); + // remove env manually + return preg_replace('/(.*)\/index.php\?env=(.*?)&(.*)/', '\\1/index.php?\\3', $link); } /** Index: branches/5.2.x/install/install_schema.sql =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/install/install_schema.sql (.../install_schema.sql) (revision 14258) +++ branches/5.2.x/install/install_schema.sql (.../install_schema.sql) (revision 14582) @@ -626,7 +626,7 @@ AffiliatePlanId int(11) NOT NULL default '0', FromAmount decimal(10,4) NOT NULL default '0.0000', ToAmount decimal(10,4) NOT NULL default '0.0000', - Percent decimal(3,2) NOT NULL default '0.00', + Percent decimal(10,2) NOT NULL default '0.00', PRIMARY KEY (AffiliateBracketId), KEY AffiliatePlanId (AffiliatePlanId) ); Index: branches/5.2.x/units/order_items/order_items_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/order_items/order_items_config.php (.../order_items_config.php) (revision 14258) +++ branches/5.2.x/units/order_items/order_items_config.php (.../order_items_config.php) (revision 14582) @@ -1,6 +1,6 @@ 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 ('title' => 'la_col_Price', 'data_block' => 'grid_price_td', 'filter_block' => 'grid_float_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'), 'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'), @@ -163,7 +163,7 @@ '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 ('title' => 'la_col_Price', 'filter_block' => 'grid_float_range_filter'), + 'Price' => Array ('filter_block' => 'grid_float_range_filter'), 'ExtendedPrice' => Array ('title' => 'la_col_ExtendedPrice', 'filter_block' => 'grid_float_range_filter'), 'ReturnType' => Array ('title' => 'la_col_ReturnType', 'data_block' => 'grid_options_td', 'filter_block' => 'grid_options_filter'), Index: branches/5.2.x/units/payment_type/payment_type_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 14258) +++ branches/5.2.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), + 'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50), 'Name' => Array ( 'title' => 'la_col_PaymentTypeName', 'data_block' => 'payment_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200), - 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200), + 'Description' => Array ('filter_block' => 'grid_like_filter', 'width' => 200), 'BuiltIn' => Array ( 'title' => 'la_col_BuiltIn', 'filter_block' => 'grid_options_filter', 'width' => 100), - 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 100), ), ), ), Index: branches/5.2.x/units/shipping_costs/shipping_costs_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/shipping_costs/shipping_costs_config.php (.../shipping_costs_config.php) (revision 14258) +++ branches/5.2.x/units/shipping_costs/shipping_costs_config.php (.../shipping_costs_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0), 'PerUnit' => Array('type' => 'double', 'formatter' => 'kFormatter', 'default' => 0), ), - - /* - 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array( - 'default' => 'icon16_item.png', - 'module' => 'core', - ), - 'Fields' => Array( - 'Name' => Array( 'width'=>150, 'title'=>'la_col_Title', 'data_block'=>'grid_checkbox_td' ), - 'CODallowed' => Array( 'width'=>100, 'title'=>'la_col_CODallowed' ) - ), - - ), - ), - */ ); \ No newline at end of file Index: branches/5.2.x/units/orders/orders_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/orders/orders_config.php (.../orders_config.php) (revision 14569) +++ branches/5.2.x/units/orders/orders_config.php (.../orders_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array ( - 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'OrderNumber' => Array ( 'title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'OrderNumber' => Array ( 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), 'OrderDate' => Array ( 'title' => 'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', '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', 'width' => 140, ), - 'PaymentType' => Array ( 'title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ), - 'TotalAmount' => Array ( 'title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ), - 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ), - 'OnHold' => Array ('title' => 'la_col_OnHold', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'PaymentType' => Array ( 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ), + 'TotalAmount' => Array ( 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ), + 'AffiliateUser' => Array ( 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ), + 'OnHold' => Array ('filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), @@ -533,17 +534,17 @@ 'module' => 'core', ), 'Fields' => Array ( - 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'OrderNumber' => Array ('title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'OrderId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'OrderNumber' => Array ('data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ), '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 ('title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'), - 'TotalAmount' => Array ('title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'), - 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'), - 'OrderIP' => Array ('title' => 'la_col_OrderIP', 'filter_block' => 'grid_like_filter'), - 'Username' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_user_like_filter'), - 'PaymentAccount' => Array ('title' => 'la_col_CreditCardNumber', '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'), + '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'), + 'PaymentAccount' => Array ('title' => 'column:la_fld_CreditCardNumber', 'filter_block' => 'grid_like_filter'), ), ), ), Index: branches/5.2.x/units/currencies/currencies_config.php =================================================================== diff -u -r14429 -r14582 --- branches/5.2.x/units/currencies/currencies_config.php (.../currencies_config.php) (revision 14429) +++ branches/5.2.x/units/currencies/currencies_config.php (.../currencies_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'CurrencyId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'ISO' => Array ( 'title' => 'la_col_ISOCode', 'data_block' => 'currency_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 90, ), - 'Translation' => Array ( 'title' => 'la_col_CurrencyName', 'use_phrases' => 1, 'filter_block' => 'grid_like_filter', 'width' => 250, ), - 'RateToPrimary' => Array ( 'title' => 'la_col_RateToPrimary', 'filter_block' => 'grid_float_range_filter', 'width' => 130, ), + '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, ), 'Modified' => Array ( 'title' => 'la_col_LastUpdated', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), - 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'Status' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), Index: branches/5.2.x/units/coupon_items/coupon_items_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/coupon_items/coupon_items_config.php (.../coupon_items_config.php) (revision 14569) +++ branches/5.2.x/units/coupon_items/coupon_items_config.php (.../coupon_items_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'OnDeleteCouponItem', ), ), - + 'QueryString' => Array( 1 => 'id', 2 => 'Page', @@ -41,22 +41,22 @@ ), 'IDField' => 'CouponItemId', - 'StatusField' => Array('Status'), + 'StatusField' => Array('Status'), 'TableName' => TABLE_PREFIX . 'ProductsCouponItems', 'ForeignKey' => 'CouponId', 'ParentTableKey' => 'CouponId', 'ParentPrefix' => 'coup', 'AutoDelete' => true, 'AutoClone' => true, - + 'ListSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN ' . TABLE_PREFIX . 'Products p ON %1$s.ItemResourceId = p.ResourceId LEFT JOIN ' . TABLE_PREFIX . 'Category c ON %1$s.ItemResourceId = c.ResourceId', ), // key - special, value - list select sql - + 'ItemSQLs' => Array( '' => 'SELECT * FROM %s', ), @@ -65,13 +65,13 @@ Array( 'prefix' => 'd', 'key' => 'DiscountId', 'ForeignKey' => 'DiscountId'), ),*/ - + 'ListSortings' => Array( '' => Array( 'Sorting' => Array('ItemName' => 'asc'), ), ), - + 'CalculatedFields' => Array( '' => Array( 'ProductId' => 'p.ProductId', @@ -120,7 +120,7 @@ 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, - 'default' => 2, + 'default' => 2, ), 'CategoryId' => Array ('type' => 'int', 'default' => 0), ), @@ -140,11 +140,11 @@ 2 => 'icon16_product_pending.png', ), 'Fields' => Array( - 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'ProductId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_item_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'ItemName' => Array( 'title'=>'la_col_ItemName', 'filter_block' => 'grid_like_filter', 'width' => 250, ), 'ItemType' => Array( 'title'=>'la_col_CouponItemType', 'filter_block' => 'grid_options_filter', 'width' => 150, ), ), ), ), - + ); \ No newline at end of file Index: branches/5.2.x/units/destinations/destinations_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/destinations/destinations_config.php (.../destinations_config.php) (revision 14258) +++ branches/5.2.x/units/destinations/destinations_config.php (.../destinations_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array('type' => 'int', 'default' => 0, ), 'DestValue' => Array('type' => 'string', 'max_len' => 255, 'default' => null, ), ), - /*'Grids' => Array( - 'Default' => Array( - 'Icons' => Array( - 'default' => 'icon16_item.gif', - 1 => 'icon16_item.gif', - 0 => 'icon16_disabled.gif' - 'module' => 'core', - ), - 'Fields' => Array( - 'Name' => Array( 'title'=>'la_col_ImageName' , 'data_block' => 'grid_checkbox_td'), - 'AltName' => Array( 'title'=>'la_col_AltName' ), - 'Url' => Array( 'title'=>'la_col_ImageUrl', 'data_block' => 'image_url_td' ), - 'Enabled' => Array( 'title'=>'la_col_ImageEnabled' ), - 'Preview' => Array( 'title'=>'la_col_Preview', 'data_block' => 'preview' ), - ), - - ), - ),*/ ); \ No newline at end of file Index: branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php (.../affiliate_payments_config.php) (revision 14569) +++ branches/5.2.x/units/affiliate_payments/affiliate_payments_config.php (.../affiliate_payments_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array( - 'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'PaymentDate' => Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'), - 'Comment' => Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50), - 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'), - 'PaymentReference' => Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50), + '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'), + '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), ), ), 'Log' => Array( @@ -140,13 +140,13 @@ 'module' => 'core', ), 'Fields' => Array( - 'AffiliatePaymentId'=> Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Username' => Array( 'title' => 'la_col_Username', 'data_block' => 'grid_userlink_td', 'filter_block' => 'grid_like_filter'), - 'PaymentDate' => Array( 'title' => 'la_col_PaymentDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'Amount' => Array( 'title' => 'la_col_Amount', 'data_block' => 'grid_currency_td', 'filter_block' => 'grid_float_range_filter'), - 'Comment' => Array( 'title' => 'la_col_Comment', 'filter_block' => 'grid_like_filter', 'first_chars' => 50), - 'PaymentTypeId' => Array( 'title' => 'la_col_PaymentType', 'filter_block' => 'grid_options_filter'), - 'PaymentReference' => Array( 'title' => 'la_col_PaymentReference', 'filter_block' => 'grid_like_filter', 'first_chars' => 50), + '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'), + '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: branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 14258) +++ branches/5.2.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array ( - 'EngineId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), - 'Name' => Array ( 'title' => 'la_col_ShippingQuoteEngineName', 'filter_block' => 'grid_like_filter', 'width' => 250, ), - 'FlatSurcharge' => Array ( 'title' => 'la_col_FlatSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ), - 'PercentSurcharge' => Array ( 'title' => 'la_col_PercentSurcharge', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ), - 'Status' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 150, ), + '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, ), + 'Status' => Array ('filter_block' => 'grid_options_filter', 'width' => 150, ), ), ), ), Index: branches/5.2.x/units/product_options/product_options_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/product_options/product_options_config.php (.../product_options_config.php) (revision 14258) +++ branches/5.2.x/units/product_options/product_options_config.php (.../product_options_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used 'Fields' => Array ( - 'ProductOptionId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'), - 'OptionType' => Array ( 'title' => 'la_col_OptionType', 'filter_block' => 'grid_options_filter'), - 'Required' => Array ( 'title' => 'la_col_Required', 'filter_block' => 'grid_options_filter'), - /*'Listable' => Array ( 'title' => 'la_col_Listable', 'filter_block' => 'grid_options_filter'),*/ + 'ProductOptionId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ( 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'), + 'OptionType' => Array ( 'filter_block' => 'grid_options_filter'), + 'Required' => Array ( 'filter_block' => 'grid_options_filter'), +// 'Listable' => Array ('filter_block' => 'grid_options_filter'), ), ), Index: branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_config.php (.../affiliate_payment_types_config.php) (revision 14258) +++ branches/5.2.x/units/affiliate_payment_types/affiliate_payment_types_config.php (.../affiliate_payment_types_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), 'Status' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, ), 'IsPrimary' => Array ( 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, ), 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), @@ -110,9 +110,9 @@ 'module' => 'core', ), 'Fields' => Array ( - 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'PaymentTypeId' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array ( 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Description' => Array ( 'filter_block' => 'grid_like_filter', 'width' => 200, ), ), ), Index: branches/5.2.x/admin_templates/orders/orders_edit_shipping.tpl =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/admin_templates/orders/orders_edit_shipping.tpl (.../orders_edit_shipping.tpl) (revision 14569) +++ branches/5.2.x/admin_templates/orders/orders_edit_shipping.tpl (.../orders_edit_shipping.tpl) (revision 14582) @@ -156,8 +156,7 @@ - - + @@ -214,25 +213,20 @@ - - - - + + + - -    ', 'OnDownloadLabel'); return false;"> - - - - + +    ', 'OnDownloadLabel'); return false;"> + + + - - - - - + + Index: branches/5.2.x/units/coupons/coupons_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/coupons/coupons_config.php (.../coupons_config.php) (revision 14569) +++ branches/5.2.x/units/coupons/coupons_config.php (.../coupons_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array( - 'CouponId' => Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ), - 'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ), - 'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ), + 'CouponId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + '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, ), + '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, ), ), ), 'Radio' => Array( @@ -169,17 +169,18 @@ 2 => 'icon16_pending.png', 'module' => 'core', ), + 'Selector' => 'radio', 'Fields' => Array( - 'CouponId' => Array ('title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Code' => Array( 'title'=>'la_col_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Expiration' => Array( 'title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'Status' => Array( 'title'=>'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ), - 'LastUsedBy' => Array('title'=>'la_col_LastUsedBy', 'filter_block' => 'grid_like_filter', 'width' => 140, ), - 'LastUsedOn' => Array('title'=>'la_col_LastUsedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'NumberOfUses' => Array('title'=>'la_col_NumberOfUses', 'filter_block' => 'grid_range_filter', 'width' => 130, ), + 'CouponId' => Array ('title'=>'column:la_fld_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array('filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Code' => Array('title'=>'column:la_fld_CouponCode', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + '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, ), + '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: branches/5.2.x/install/english.lang =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/install/english.lang (.../english.lang) (revision 14569) +++ branches/5.2.x/install/english.lang (.../english.lang) (revision 14582) @@ -1,4 +1,4 @@ - + QWNjb3VudA== @@ -82,127 +82,48 @@ Q09E Q09EIEZsYXQgU3VyY2hhcmdl Q09EIFBlcmNlbnQgU3VyY2hhcmdl - QWNjZXNzIER1cmF0aW9u - QWNjZXNzIER1cmF0aW9uIFVuaXQ= - QWRkZWQgT24= - QWZmaWxpYXRlIFVzZXI= - QW1vdW50 - QXZhaWwu - QmFzZSBGZWU= - QmlsbGluZyBDb3VudHJ5 QnVpbHQtSW4= - Q09EIEFsbG93ZWQ= - Q29kZQ== - Q09EIEZsYXQgU3VyZWNoYXJnZQ== Q09EIGZsYXQgc3VyZWNoYXJnZQ== - Q09EIFBlcmNlbnQgU3VyY2hhcmdl Q29tYmluYXRpb24= - Q29tbWVudA== QWZmaWxsaWF0ZSBDb21taXNzaW9u - Q29zdA== - Q291cG9uIENvZGU= Q291cG9uIEl0ZW0gVHlwZQ== - Q3JlZGl0IENhcmQgTnVtYmVy - Q3VycmVuY3k= - TmFtZQ== - U3ltYm9s - U3ltYm9sIFBvc2l0aW9u Q3VzdG9tZXIgTmFtZQ== - RGlzcGxheSBvbiBGcm9udC1FbmQ= RmlsZW5hbWU= UHJvZHVjdCBOYW1l - RW5k RW5kZWQgT24= - RXhwaXJhdGlvbg== RXh0LiBQcmljZQ== - RmxhdCBTdXJjaGFyZ2U= - RnJvbSBBbW91bnQ= RnJvbSBVc2Vy R01W - R3JvdXA= - SVAgQWRkcmVzcw== - UHJvbW8= TmFtZQ== RGlzY291bnQgSXRlbSBUeXBl TGFzdCBVcGRhdGVk - TGFzdCBVc2VkIEJ5 - TGFzdCBVc2VkIE9u - TGlzdGFibGU= - TGlzdGluZyBRdHk= - TWFudWZhY3R1cmVy TmFtZQ== TWFya2V0cGxhY2U= - TWF4IFF0eQ== - TWluIFF0eQ== - TmVnb3RpYXRlZA== - TnVtYmVyIE9mIFVzZXM= - T24gSG9sZA== - T24gU2FsZQ== - T3B0aW9uIFR5cGU= RGF0ZQ== - SVAgQWRkcmVzcw== - TnVtYmVy T3JkZXIgVG90YWw= - UGF5bWVudCBEYXRl - UGF5bWVudCBSZWZlcmVuY2U= - UGF5bWVudCBUeXBl TmFtZQ== UGVyY2VudA== - UGVyY2VudCBTdXJjaGFyZ2U= UGxhbiBOYW1l - UGxhbiBUeXBl - UG9pbnRz - UHJpY2U= UHJvY2Vzc2luZw== UHJvZHVjdA== QmFja09yZGVyIERhdGU= Q3JlYXRlZCBPbg== TmFtZQ== UHJvZHVjdCBOYW1lIChJRCk= U0tV - VHlwZQ== V2VpZ2h0 UHJvZml0 - UXR5 - QmFja29yZGVyZWQ= - UXR5IEluIFN0b2Nr - UXR5SW5TdG9ja01pbg== - UXR5IE9uIE9yZGVy - UXR5IFJlc2VydmVk UXR5Lg== QXZhaWwu UmVzZXJ2ZWQ= - UmF0ZSBUbyBQcmltYXJ5 - UmVnaXN0ZXJlZCBPbg== - UmVtYWluaW5nIEFtb3VudA== - UmVxdWlyZWQ= UmV0LiBBbW91bnQ= UmV0LiBEYXRl UmV0LiBUeXBl U2hpcHBpbmc= - U2hpcHBpbmcgQ291bnRyeQ== RnJvbSBMb2NhdGlvbg== - TmFtZQ== - TmFtZQ== - VHlwZQ== - U2hpcHBpbmcgWm9uZSBOYW1l U2l6ZQ== - U0tV - U2hpcHBpbmcgU3BlZWQ= - U3RhcnQ= U3RhcnRlZCBPbg== VGF4 - QXBwbHkgdG8gUHJvY2Vzc2luZw== - QXBwbHkgdG8gU2hpcHBpbmc= - VGF4IFZhbHVl - VGF4IFpvbmUgTmFtZQ== - VG8gQW1vdW50 - VG90YWwgQW1vdW50 - TGltaXQ= - VVJM - V2VpZ2h0 - Wm9uZSBOYW1l - Wm9uZSBUeXBl Q29tYmluZWQ= KGxlYXZlIGJsYW5rIGZvciB1bmxpbWl0ZWQp QW55 @@ -260,14 +181,14 @@ RmlqaSBEb2xsYXI= RmFsa2xhbmQgSXNsYW5kcyBQb3VuZA== RmxhdA== - QWNjZXNzIER1cmF0aW9u + QWNjZXNzIER1cmF0aW9u QWNjZXNzIER1cmF0aW9uIFR5cGU= - QWNjZXNzIER1cmF0aW9uIFVuaXQ= + QWNjZXNzIER1cmF0aW9uIFVuaXQ= QWNjZXNzIEVuZA== QWNjZXNzIEdyb3Vw QWNjZXNzIFN0YXJ0 QWNjdW11bGF0ZWQgQW1vdW50 - QWRkZWQgT24= + QWRkZWQgT24= QWRkcmVzcyBMaW5lIDE= QWRkcmVzcyBMaW5lIDI= QWRtaW4gQ29tbWVudA== @@ -277,23 +198,23 @@ QWZmaWxpYXRlIExpbms= QWZmaWxpYXRlIFBsYW4= UGF5bWVudA== - QWZmaWxpYXRlIFVzZXI= + QWZmaWxpYXRlIFVzZXI= U2VsZWN0ZWQ= - QW1vdW50 + QW1vdW50 QW1vdW50IFRvIFBheQ== QXNzaWduZWQgQ291cG9u QXV0aG9yaXphdGlvbiBSZXN1bHQ= - QXZhaWxhYmxl + QXZhaWxhYmxl QXZhaWxhYmxlIFVzZXIgR3JvdXBz QXZhaWxhYmxl QmFja09yZGVy QmFja29yZGVyIGF2YWlsYWJpbGl0eSBkYXRl - QmFzZSBGZWU= + QmFzZSBGZWU= QmlsbGluZyBBZGRyZXNzIExpbmUgMQ== QmlsbGluZyBBZGRyZXNzIExpbmUgMg== QmlsbGluZyBDaXR5 QmlsbGluZyBDb21wYW55 - QmlsbGluZyBDb3VudHJ5 + QmlsbGluZyBDb3VudHJ5 QmlsbGluZyBFbWFpbA== QmlsbGluZyBGYXg= QmlsbGluZyBQaG9uZQ== @@ -303,35 +224,35 @@ QmxvY2sgU2hpcHBpbmcgQWRkcmVzcyBFZGl0aW5n Q2FwdHVyZSBSZXN1bHQ= Q2hhcmdlIG9uIE5leHQgQXBwcm92ZQ== - Q09EIEFsbG93ZWQ= - Q29kZQ== - Q09EIEZsYXQgU3VyY2hhcmdl - Q09EIFBlcmNlbnQgU3VyY2hhcmdl - Q29tbWVudA== - Q29zdA== + Q09EIEFsbG93ZWQ= + Q29kZQ== + Q09EIEZsYXQgU3VyY2hhcmdl + Q09EIFBlcmNlbnQgU3VyY2hhcmdl + Q29tbWVudA== + Q29zdA== Q29zdCBUeXBl - Q291cG9uIENvZGU= - Q3JlZGl0IENhcmQgTnVtYmVy + Q291cG9uIENvZGU= + Q3JlZGl0IENhcmQgTnVtYmVy Q3VycmVuY2llcw== - Q3VycmVuY3k= - TmFtZQ== - U3ltYm9s - U3ltYm9sIFBvc2l0aW9u + Q3VycmVuY3k= + TmFtZQ== + U3ltYm9s + U3ltYm9sIFBvc2l0aW9u UHJvZHVjdCBJdGVtIFRlbXBsYXRl RGF0ZQ== RGVsaXZlcnkgTWV0aG9k RXhjZXJwdA== RGlzY291bnQ= - RGlzcGxheSBvbiBGcm9udC1FbmQ= + RGlzcGxheSBvbiBGcm9udC1FbmQ= RW1wdHkgQ2VsbHMgQXJl - RW5kIERhdGU= - RXhwaXJhdGlvbg== + RW5kIERhdGU= + RXhwaXJhdGlvbg== RmVhdHVyZWQ= Rmlyc3QgRGF5 - RmxhdCBTdXJjaGFyZ2U= + RmxhdCBTdXJjaGFyZ2U= TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw== RnJvbQ== - RnJvbSBBbW91bnQ= + RnJvbSBBbW91bnQ= RnJvbSBkYXRlL3RpbWU= R2F0ZXdheQ== R2lmdCBDZXJ0aWZpY2F0ZSBhbW91bnQ= @@ -343,70 +264,70 @@ SW5zdXJhbmNlIENvc3Q= SW5zdXJhbmNlIFR5cGU= RW5hYmxlZA== - VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc= + VXNlIGFzIEZyZWUgUHJvbW8gU2hpcHBpbmc= UmVjdXJyaW5nIEJpbGxpbmc= SXRlbXMgU29sZA== TGFzdCBQYXltZW50IERhdGU= - TGFzdCBVc2VkIEJ5 - TGFzdCBVc2VkIE9u - TGlzdGFibGU= + TGFzdCBVc2VkIEJ5 + TGFzdCBVc2VkIE9u + TGlzdGFibGU= TWFuYWdlIE9wdGlvbnMgQ29tYmluYXRpb25z TWFuYWdlIFNoaXBwaW5nIFR5cGVz - TWFudWZhY3R1cmVy - TWF4IFF0eQ== + TWFudWZhY3R1cmVy + TWF4IFF0eQ== TWluaW1hbCBQYXltZW50IEFtb3VudA== - TWluIFF0eQ== + TWluIFF0eQ== TVNSUA== - TmVnb3RpYXRlZA== + TmVnb3RpYXRlZA== TmV4dCBDaGFyZ2UgRGF0ZQ== - TnVtYmVyIE9mIFVzZXM= - T24gSG9sZA== - UHJvZHVjdCBvbiBTYWxl + TnVtYmVyIE9mIFVzZXM= + T24gSG9sZA== + UHJvZHVjdCBvbiBTYWxl T3B0aW9uIFByaWNl T3B0aW9ucyBTZWxlY3Rpb24gTW9kZQ== - T3B0aW9uIFR5cGU= + T3B0aW9uIFR5cGU= T3B0aW9uIFZhbHVl T3B0aW9uIFZhbHVlcw== T3JkZXIgSUQ= - SVAgQWRkcmVzcw== - TnVtYmVy + SVAgQWRkcmVzcw== + TnVtYmVy T3JpZ2luYWw= T3JpZ2luYWwgQW1vdW50 UGF5bWVudCBBY2NvdW50 Q2FyZCBUeXBl Q2FyZCBFeHBpcmF0aW9u Q1ZWMg== - UGF5bWVudCBEYXRl + UGF5bWVudCBEYXRl UGF5bWVudCBEYXRlL0V4cGlyYXRpb24= UGF5bWVudCBJbnRlcnZhbA== TmFtZSBvbiB0aGUgQ2FyZA== - UGF5bWVudCBSZWZlcmVuY2U= - UGF5bWVudCBUeXBl + UGF5bWVudCBSZWZlcmVuY2U= + UGF5bWVudCBUeXBl QXZhaWxhYmxlIEN1cnJlbmNpZXM= UGF5bWVudCBUeXBlIElk UGF5bWVudCBUeXBlcw== - UGVyY2VudCBTdXJjaGFyZ2U= + UGVyY2VudCBTdXJjaGFyZ2U= UGVyaW9k QWxsb3cgUGxhY2VkIE9yZGVycyBFZGl0aW5n - UGxhbiBUeXBl - UG9pbnRz - UHJpY2U= + UGxhbiBUeXBl + UG9pbnRz + UHJpY2U= UHJpY2UgTW9kaWZpZXIgVHlwZQ== UHJvY2Vzc2luZyBGZWU= TWluaW11bSBxdWFudGl0eSBmb3IgRnJlZSBTaGlwcGluZw== - UHJvZHVjdCBUeXBl + UHJvZHVjdCBUeXBl TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw== TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A= TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA== - UXR5IEJhY2tPcmRlcmVk - UXR5IEluIFN0b2Nr - TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ= - UXR5IE9uIE9yZGVy - UXR5IFJlc2VydmVk + UXR5IEJhY2tPcmRlcmVk + UXR5IEluIFN0b2Nr + TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ= + UXR5IE9uIE9yZGVy + UXR5IFJlc2VydmVk UXR5IFNvbGQ= - UmF0ZSBUbyBQcmltYXJ5 - UmVnaXN0ZXJlZCBPbg== - UmVtYWluaW5nIEFtb3VudA== + UmF0ZSBUbyBQcmltYXJ5 + UmVnaXN0ZXJlZCBPbg== + UmVtYWluaW5nIEFtb3VudA== UmVwb3J0IFR5cGU= U2Vjb25kIERheQ== U2VsZWN0ZWQgVXNlciBHcm91cHM= @@ -418,50 +339,50 @@ U2hpcHBpbmcgQ29tcGFueQ== U2hpcHBpbmcgQ29udHJvbA== U2hpcHBpbmcgQ29zdA== - U2hpcHBpbmcgQ291bnRyeQ== + U2hpcHBpbmcgQ291bnRyeQ== U2hpcHBpbmcgQ3VzdG9tZXIgQWNjb3VudA== U2hpcHBpbmcgRGF0ZS9UaW1l U2hpcHBpbmcgRW1haWw= U2hpcHBpbmcgRmF4 QWxsb3dlZCBTaGlwcGluZyBUeXBlcw== - TmFtZQ== + TmFtZQ== U2hpcHBpbmcgT3B0aW9u U2hpcHBpbmcgT3B0aW9ucw== U2hpcHBpbmcgUGhvbmU= - TmFtZQ== + TmFtZQ== U2hpcHBpbmcgU3RhdGU= U2hpcHBpbmcgVG8= U2hpcHBpbmcgVHJhY2tpbmcvUmVmZXJlbmNl - U2hpcHBpbmcgVHlwZQ== + U2hpcHBpbmcgVHlwZQ== U2hpcHBpbmcgVHlwZSBJRA== U2hpcHBpbmcgVHlwZXM= U2hpcHBpbmcgWmlwY29kZQ== - U2hpcHBpbmcgWm9uZSBOYW1l - U0tV - U3BlZWQgQ29kZQ== + U2hpcHBpbmcgWm9uZSBOYW1l + U0tV + U3BlZWQgQ29kZQ== U1NOL1RheCBJZC9WQVQgTnVtYmVy - U3RhcnQgRGF0ZQ== + U3RhcnQgRGF0ZQ== U3VidG90YWw= - QXBwbHkgdG8gUHJvY2Vzc2luZw== - QXBwbHkgdG8gU2hpcHBpbmc= - VGF4IFZhbHVl - TmFtZSBvZiBUYXggWm9uZQ== + QXBwbHkgdG8gUHJvY2Vzc2luZw== + QXBwbHkgdG8gU2hpcHBpbmc= + VGF4IFZhbHVl + TmFtZSBvZiBUYXggWm9uZQ== VGhpcmQgRGF5 VGltZQ== - VG8gQW1vdW50 + VG8gQW1vdW50 VG8gZGF0ZS90aW1l VG9wIFNlbGxlcg== - VG90YWwgQW1vdW50 + VG90YWwgQW1vdW50 VG90YWwgUmV0dXJucw== VG90YWwgU2F2aW5ncw== - TGluaXQ= + TGluaXQ= VXNlciBDb21tZW50 U2FsZXMgVGF4L1ZBVA== VmVyaWZpY2F0aW9uIFJlc3VsdA== - V2VpZ2h0 + V2VpZ2h0 V2VpZ2h0IE1vZGlmaWVyIFR5cGU= - Wm9uZSBOYW1l - VHlwZQ== + Wm9uZSBOYW1l + VHlwZQ== VHlwZQ== Rm9udCBDb2xvcg== RnJlZSBTaGlwcGluZw== Index: branches/5.2.x/install/install_data.sql =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14569) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 14582) @@ -60,7 +60,7 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Manufacturers', '10', 'In-Commerce', 'in-commerce:output', 'la_Text_Manufacturers', 'la_Perpage_Manufacturers', 'text', NULL, NULL, 30.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Perpage_Manufacturers_Short', '3', 'In-Commerce', 'in-commerce:output', 'la_Text_Manufacturers', 'la_Perpage_Manufacturers_Short', 'text', NULL, NULL, 30.02, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_CategoryTemplate', '/in-commerce/designs/section', 'In-Commerce', 'in-commerce:output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 40.01, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_ItemTemplate', 'in-commerce/designs/detail', 'In-Commerce', 'in-commerce:output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_ItemTemplate', 'in-commerce/products/product_detail', 'In-Commerce', 'in-commerce:output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_MaxImageCount', '5', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 50.01, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_ThumbnailImageWidth', '120', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 50.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'p_ThumbnailImageHeight', '120', 'In-Commerce', 'in-commerce:output', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 50.03, 0, 0, NULL); @@ -470,4 +470,4 @@ INSERT INTO ImportScripts VALUES (DEFAULT, 'Products from CSV file [In-Commerce]', '', 'p', 'In-Commerce', '', 'CSV', '1'); -INSERT INTO Modules VALUES ('In-Commerce', 'modules/in-commerce/', 'p', DEFAULT, 1, 4, 'in-commerce/', 2, NULL); +INSERT INTO Modules VALUES ('In-Commerce', 'modules/in-commerce/', 'p', DEFAULT, 1, 4, 'in-commerce/', 2, NULL, NULL); Index: branches/5.2.x/admin_templates/shipping/shipping_brackets.tpl =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/admin_templates/shipping/shipping_brackets.tpl (.../shipping_brackets.tpl) (revision 14258) +++ branches/5.2.x/admin_templates/shipping/shipping_brackets.tpl (.../shipping_brackets.tpl) (revision 14582) @@ -254,8 +254,8 @@
- - + +
Index: branches/5.2.x/units/gift_certificates/gift_certificates_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/gift_certificates/gift_certificates_config.php (.../gift_certificates_config.php) (revision 14258) +++ branches/5.2.x/units/gift_certificates/gift_certificates_config.php (.../gift_certificates_config.php) (revision 14582) @@ -1,6 +1,6 @@ 3.3, // ., because this section replaces parent in tree 'type' => stTAB, ), - ), + ), 'ListSQLs' => Array ('' => 'SELECT %1$s.* %2$s FROM %1$s',), 'ItemSQLs' => Array ('' => 'SELECT * FROM %1$s',), @@ -126,12 +126,12 @@ 'module' => 'core', ), 'Fields' => Array ( - 'GiftCertificateId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Code' => Array ('title' => 'la_col_Code', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'Debit' => Array ('title' => 'la_col_RemainingAmount', 'filter_block' => 'grid_float_range_filter', 'width' => 160, ), - 'Amount' => Array ('title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter', 'width' => 100, ), - 'Expiration' => Array ('title'=>'la_col_Expiration', 'filter_block' => 'grid_date_range_filter', 'width' => 145, ), + '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, ), + 'Expiration' => Array ('filter_block' => 'grid_date_range_filter', 'width' => 145, ), ), ), ), Index: branches/5.2.x/units/downloads/downloads_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/downloads/downloads_config.php (.../downloads_config.php) (revision 14258) +++ branches/5.2.x/units/downloads/downloads_config.php (.../downloads_config.php) (revision 14582) @@ -1,6 +1,6 @@ 'core', ), 'Fields' => Array( - 'DownloadId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Username' => Array( 'title'=>'la_col_Username', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'DownloadId' => Array( 'title'=>'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Username' => Array( 'filter_block' => 'grid_like_filter', 'width' => 100, ), 'ProductName' => Array( 'title'=>'la_col_DownloadedProductName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'Filename' => Array( 'title'=>'la_col_DownloadedFileName', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'IPAddress' => Array( 'title'=>'la_col_IPAddress', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'IPAddress' => Array( 'filter_block' => 'grid_like_filter', 'width' => 150, ), 'StartedOn' => Array( 'title'=>'la_col_StartedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), ), ), Index: branches/5.2.x/admin_templates/shipping/shipping_custom_list.tpl =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/admin_templates/shipping/shipping_custom_list.tpl (.../shipping_custom_list.tpl) (revision 14258) +++ branches/5.2.x/admin_templates/shipping/shipping_custom_list.tpl (.../shipping_custom_list.tpl) (revision 14582) @@ -27,7 +27,7 @@ function clone_items() { - submit_event('s','onMassClone'); + submit_event('s','OnMassClone'); } a_toolbar.AddButton( new ToolBarButton('clone', '', clone_items) ); Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14569) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 14582) @@ -208,4 +208,18 @@ # ===== v 5.1.2-RC1 ===== UPDATE Phrase SET Module = 'Core' WHERE PhraseKey = 'LA_FLD_ISOCODE' OR PhraseKey = 'LA_COL_ISOCODE'; -# ===== v 5.1.2 ===== \ No newline at end of file +# ===== v 5.1.2 ===== + +# ===== v 5.1.3-B1 ===== +ALTER TABLE AffiliatePlansBrackets CHANGE Percent Percent DECIMAL (10,2) NOT NULL DEFAULT '0.00'; + +# ===== v 5.1.3-B2 ===== + +# ===== v 5.1.3-RC1 ===== +UPDATE ConfigurationValues +SET VariableValue = 'in-commerce/products/product_detail' +WHERE VariableName = 'p_ItemTemplate' AND VariableValue = 'in-commerce/designs/detail'; + +# ===== v 5.1.3-RC2 ===== + +# ===== v 5.1.3 ===== \ No newline at end of file Index: branches/5.2.x/units/zones/zones_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/zones/zones_config.php (.../zones_config.php) (revision 14258) +++ branches/5.2.x/units/zones/zones_config.php (.../zones_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array ( 'default' => Array ( 'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'), - 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'), - ), + 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'), + ), 'zones_edit' => Array ( 'prefixes' => Array ('z'), 'format' => "#z_status# - '#z_titlefield#'"), ), 'TableName' => TABLE_PREFIX . 'ShippingZones', @@ -59,7 +59,7 @@ 'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'Name' => Array ( 'type' => 'string', 'max_len' => 100, - 'required' => 1, 'default' => '', 'not_null' => 1, + 'required' => 1, 'default' => '', 'not_null' => 1, 'error_msgs' => Array ('required' => 'Please fill in'), ), 'Type' => Array ( @@ -69,7 +69,7 @@ 1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP' - ), + ), 'not_null' => 1, 'default' => 1, ), 'CODallowed' => Array ( @@ -89,10 +89,10 @@ 'module' => 'core', ), 'Fields' => Array ( - 'ZoneID' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), - 'Name' => Array ( 'title' => 'la_col_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ), - 'Type' => Array ( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'CODallowed' => Array ( 'title' => 'la_col_CODallowed', 'filter_block' => 'grid_options_filter', 'width' => 120, ) + 'ZoneID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), + 'Name' => Array ( 'title' => 'column:la_fld_ShipZoneName', 'filter_block' => 'grid_like_filter', 'width' => 250, ), + 'Type' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'CODallowed' => Array ( 'filter_block' => 'grid_options_filter', 'width' => 120, ) ), ), ), Index: branches/5.2.x/units/pricing/pricing_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 14569) +++ branches/5.2.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 14582) @@ -1,6 +1,6 @@ 1, 'default' => 0, ), 'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1), - + /* TODO implement these fields in business logic 'AccessRebillDate' => Array ( 'type'=> 'int', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default' => 0, @@ -123,30 +123,13 @@ ), 'Grids' => Array ( - /* - 'Default' => Array ( - 'Icons' => Array ( - 'default' => 'icon16_item.png', - 'module' => 'core', - ), - 'Fields' => Array ( - 'MinQty' => Array ( 'title'=> 'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'MaxQty' => Array ( 'title'=> 'la_col_MaxQty', 'filter_block' => 'grid_range_filter'), - 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_range_filter'), - 'Points' => Array ( 'title'=> 'la_col_Points', 'filter_block' => 'grid_range_filter'), - 'Cost' => Array ( 'title'=> 'la_col_Cost', 'filter_block' => 'grid_range_filter'), - 'Negotiated' => Array ( 'title'=> 'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'), - ), - - ), - */ 'Access' => Array ( 'Icons' => Array ('default'=> 'icon16_pricing.gif', '0'=> 'icon16_pricing.gif', '1'=> 'icon16_pricing_primary.gif'), 'Fields' => Array ( - 'AccessDuration' => Array ( 'title'=> 'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'AccessUnit' => Array ( 'title'=> 'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), - 'Description' => Array ( 'title'=> 'la_col_Description', 'filter_block' => 'grid_like_filter'), - 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_float_range_filter'), + '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'), ), ), Index: branches/5.2.x/units/gateways/gw_classes/google_checkout.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 14258) +++ branches/5.2.x/units/gateways/gw_classes/google_checkout.php (.../google_checkout.php) (revision 14582) @@ -1,6 +1,6 @@ Application->isDebugMode()) { - $fp = fopen(FULL_PATH.'/xml_request.html', 'a'); - fwrite($fp, '--- '.adodb_date('Y-m-d H:i:s').' ---'."\n".$xml_data); - fclose($fp); + if ( $this->Application->isDebugMode() ) { + $this->toLog($xml_data, 'xml_request.html'); } return $xml_data; @@ -235,16 +233,27 @@ echo $xml_responce; - if ($this->Application->isDebugMode()) { - $fp = fopen(FULL_PATH.'/xml_responce.html', 'a'); - fwrite($fp, '--- '.adodb_date('Y-m-d H:i:s').' ---'."\n".$xml_responce."\n"); - fclose($fp); + if ( $this->Application->isDebugMode() ) { + $this->toLog($xml_responce, 'xml_responce.html'); } return $order_approvable ? 1 : 0; } /** + * Writes XML requests and responces to a file + * + * @param string $xml_data + * @param string $xml_file + */ + function toLog($xml_data, $xml_file) + { + $fp = fopen( (defined('RESTRICTED') ? RESTRICTED : FULL_PATH) . '/' . $xml_file, 'a' ); + fwrite($fp, '--- ' . adodb_date('Y-m-d H:i:s') . ' ---' . "\n" . $xml_data); + fclose($fp); + } + + /** * Processes notification * * @param kXMLNode $root_node Index: branches/5.2.x/units/orders/orders_event_handler.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 14569) +++ branches/5.2.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 14582) @@ -1,6 +1,6 @@ Application->getUnitOption('pr', 'TableName'); $pricing_idfield = $this->Application->getUnitOption('pr', 'IDField'); - + /* TODO check on implementation $sql = 'SELECT AccessDuration, AccessUnit, DurationType, AccessExpiration FROM %s WHERE %s = %s'; */ @@ -936,7 +936,7 @@ /* TODO check on implementation (code from customization healtheconomics.org) $item_data['DurationType'] = $pricing_info['DurationType']; - $item_data['AccessExpiration'] = $pricing_info['AccessExpiration']; + $item_data['AccessExpiration'] = $pricing_info['AccessExpiration']; */ $item_data['Duration'] = $pricing_info['AccessDuration'] * $unit_secs[ $pricing_info['AccessUnit'] ]; @@ -1112,8 +1112,7 @@ $object =& $event->getObject( Array('skip_autoload' => true) ); /* @var $object kDBItem */ - $object->SetDBField('Number', $this->getNextOrderNumber($event)); - $object->SetDBField('SubNumber', 0); + $this->setNextOrderNumber($event); $object->SetDBField('Status', ORDER_STATUS_INCOMPLETE); $object->SetDBField('VisitId', $this->Application->RecallVar('visit_id') ); @@ -1289,9 +1288,9 @@ parent::OnPreCreate($event); $object =& $event->getObject(); - $new_number = $this->getNextOrderNumber($event); - $object->SetDBField('Number', $new_number); - $object->SetDBField('SubNumber', 0); + + $this->setNextOrderNumber($event); + $object->SetDBField('OrderIP', $_SERVER['REMOTE_ADDR']); $order_type = $this->getTypeBySpecial( $this->Application->GetVar('order_type') ); $object->SetDBField('Status', $order_type); @@ -1311,9 +1310,7 @@ $object->SetDBField('OriginalAmount', 0); // needed in this case ? } else { - $new_number = $this->getNextOrderNumber($event); - $object->SetDBField('Number', $new_number); - $object->SetDBField('SubNumber', 0); + $this->setNextOrderNumber($event); $object->SetDBField('OriginalAmount', 0); } $object->SetDBField('OrderDate', adodb_mktime()); @@ -1813,12 +1810,12 @@ /* @var $quote_engine_collector ShippingQuoteCollector */ $shipping_info = unserialize($shipping_info); - $shipping_quote_engine = $quote_engine_collector->GetClassByType($shipping_info, 1); + $sqe_class_name = $quote_engine_collector->GetClassByType($shipping_info, 1); } // try to create usps order - if (($object->GetDBField('ShippingType') == 0) && ($shipping_quote_engine !== false)) { - $shipping_quote_engine =& $this->Application->recallObject($shipping_quote_engine); + if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false)) { + $shipping_quote_engine =& $this->Application->recallObject($sqe_class_name); /* @var $shipping_quote_engine ShippingQuoteEngine */ $ret = $shipping_quote_engine->MakeOrder($object); @@ -1883,16 +1880,31 @@ } /** - * Get next free order number + * Set next available order number * * @param kEvent $event */ - function getNextOrderNumber(&$event) + function setNextOrderNumber(&$event) { $object =& $event->getObject(); + /* @var $object OrdersItem */ + $sql = 'SELECT MAX(Number) FROM ' . $this->Application->GetLiveName($object->TableName); - return max($this->Conn->GetOne($sql) + 1, $this->Application->ConfigValue('Comm_Next_Order_Number')); + $next_order_number = $this->Conn->GetOne($sql) + 1; + + $next_order_number = max($next_order_number, $this->Application->ConfigValue('Comm_Next_Order_Number')); + $this->Application->SetConfigValue('Comm_Next_Order_Number', $next_order_number + 1); + + $object->SetDBField('Number', $next_order_number); + $object->SetDBField('SubNumber', 0); + + // set virtual field too + $number_format = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_P'); + $sub_number_format = (int)$this->Application->ConfigValue('Comm_Order_Number_Format_S'); + $order_number = sprintf('%0' . $number_format . 'd', $next_order_number) . '-' . str_repeat('0', $sub_number_format); + + $object->SetDBField('OrderNumber', $order_number); } /** @@ -2837,14 +2849,14 @@ foreach ($shipping_ids as $package => $id) { // try to validate $shipping_types[$package] = $last_shippings[$package][$id]; - $shipping_quote_engine = $quote_engine_collector->GetClassByType($shipping_types, $package); + $sqe_class_name = $quote_engine_collector->GetClassByType($shipping_types, $package); - if (($object->GetDBField('ShippingType') == 0) && ($shipping_quote_engine !== false) && in_array($template, $shipping_templates)) { - $shipping_quote_engine =& $this->Application->recallObject($shipping_quote_engine); + if (($object->GetDBField('ShippingType') == 0) && ($sqe_class_name !== false) && in_array($template, $shipping_templates)) { + $shipping_quote_engine =& $this->Application->recallObject($sqe_class_name); /* @var $shipping_quote_engine ShippingQuoteEngine */ // USPS related part - // TODO: remove USPS condition from here + // TODO: remove USPS condition from here // set first of found shippings just to check if any errors are returned $current_usps_shipping_types = unserialize($this->Application->RecallVar('current_usps_shipping_types')); $object->SetDBField('ShippingInfo', serialize( Array($package => $current_usps_shipping_types[$id])) ); Index: branches/5.2.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (.../affiliate_plans_brackets.tpl) (revision 14258) +++ branches/5.2.x/admin_templates/affiliate_plans/affiliate_plans_brackets.tpl (.../affiliate_plans_brackets.tpl) (revision 14582) @@ -162,8 +162,8 @@ - - + + Index: branches/5.2.x/units/addresses/addresses_config.php =================================================================== diff -u -r14258 -r14582 --- branches/5.2.x/units/addresses/addresses_config.php (.../addresses_config.php) (revision 14258) +++ branches/5.2.x/units/addresses/addresses_config.php (.../addresses_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array('type'=>'string', 'default' => ''), ), - 'Grids' => Array(), - ); \ No newline at end of file Index: branches/5.2.x/units/manufacturers/manufacturers_config.php =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 14569) +++ branches/5.2.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 14582) @@ -1,6 +1,6 @@ Array ( 'default' => Array ( 'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'), - 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'), + 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'), ), 'manuf_list' => Array ( 'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!", @@ -120,10 +120,10 @@ 'module' => 'core', ), 'Fields' => Array ( - 'ManufacturerId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'ManufacturerId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), 'Name' => Array ('title' => 'la_col_ManufacturerName', 'filter_block' => 'grid_like_filter', 'width' => 200, ), 'IsPopular' => Array ('title' => 'la_col_IsPopular', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'URL' => Array ('title' => 'la_col_URL', 'filter_block' => 'grid_like_filter', 'width' => 250, ), + 'URL' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ), ), ), ), Index: branches/5.2.x/admin_templates/products/products_pricing_grid.tpl =================================================================== diff -u -r14569 -r14582 --- branches/5.2.x/admin_templates/products/products_pricing_grid.tpl (.../products_pricing_grid.tpl) (revision 14569) +++ branches/5.2.x/admin_templates/products/products_pricing_grid.tpl (.../products_pricing_grid.tpl) (revision 14582) @@ -89,17 +89,17 @@
- - - - + + + + - + - +