Index: branches/5.2.x/units/shipping/shipping_config.php =================================================================== diff -u -N -r14717 -r16385 --- branches/5.2.x/units/shipping/shipping_config.php (.../shipping_config.php) (revision 14717) +++ branches/5.2.x/units/shipping/shipping_config.php (.../shipping_config.php) (revision 16385) @@ -1,6 +1,6 @@ 's', - 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), - 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'ShippingEventHandler', 'file' => 'shipping_event_handler.php', 'build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'ShippingTagProcessor', 'file' => 'shipping_tag_processor.php', 'build_event' => 'OnBuild'), - 'AutoLoad' => true, - 'AggregateTags' => Array ( - Array ( - 'AggregateTo' => 'ord', - 'AggregatedTagName' => 'PrintShippingTypes', - 'LocalTagName' => 'Order_PrintShippingTypes', - ), - ), - 'Hooks' => Array ( - Array ( - 'Mode' => hBEFORE, - 'Conditional' => true, - 'HookToPrefix' => 'sc', - 'HookToSpecial' => '', - 'HookToEvent' => Array ( 'OnPropagate', 'OnClearAll' ), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnPreSave', - ), - ), - 'QueryString' => Array ( - 1 => 'id', - 2 => 'Page', - 3 => 'PerPage', - 4 => 'event', - 5 => 'mode', - ), - 'IDField' => 'ShippingID', - 'StatusField' => Array ('Status'), - 'TitleField' => 'Name', +$config = Array ( + 'Prefix' => 's', + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ShippingEventHandler', 'file' => 'shipping_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ShippingTagProcessor', 'file' => 'shipping_tag_processor.php', 'build_event' => 'OnBuild'), - 'TitlePresets' => Array ( - 'default' => Array ( - 'new_status_labels' => Array ('s' => '!la_title_AddingShippingType!'), - 'edit_status_labels' => Array ('s' => '!la_title_EditingShippingType!'), - 'new_titlefield' => Array ('s' => '!la_title_NewShippingType!'), - ), - 'shipping_list' => Array ( - 'prefixes' => Array ('s_List'), - 'format' => "!la_title_ShippingTypes!", - ), - 'shipping_type_edit' => Array ( - 'prefixes' => Array ('s'), - 'format' => "#s_status# '#s_titlefield#' - !la_title_General!", - ), - 'zones' => Array ( - 'prefixes' => Array ('s'), - 'format' => "#s_status# '#s_titlefield#' - !la_title_Zones!", - ), - 'zones_edit' => Array ( - 'prefixes' => Array ('z'), - 'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'), - 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'), - 'format' => "#z_status# '#z_titlefield#'", - ), - 'brackets' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Brackets!",), - 'costs' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Costs!",), - 'groups' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Groups!",), - 'select_modifier' => Array ('prefixes' => Array ('s'), 'format' => "!la_title_ApplyModifier!",), - ), + 'AutoLoad' => true, - 'EditTabPresets' => Array ( - 'Default' => Array ( - 'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/shipping/shipping_edit', 'priority' => 1), - 'zones' => Array ('title' => 'la_tab_ShippingZones', 't' => 'in-commerce/shipping/shipping_zones', 'priority' => 2), - 'brackets' => Array ('title' => 'la_tab_Brackets', 't' => 'in-commerce/shipping/shipping_brackets', 'priority' => 3), - 'costs' => Array ('title' => 'la_tab_Costs', 't' => 'in-commerce/shipping/shipping_costs', 'priority' => 4), - 'groups' => Array ('title' => 'la_tab_UserGroups', 't' => 'in-commerce/shipping/shipping_type_groups', 'priority' => 5), - ), - ), + 'AggregateTags' => Array ( + Array ( + 'AggregateTo' => 'ord', + 'AggregatedTagName' => 'PrintShippingTypes', + 'LocalTagName' => 'Order_PrintShippingTypes', + ), + ), - 'PermSection' => Array ('main' => 'in-commerce:shipping'), + 'Hooks' => Array ( + Array ( + 'Mode' => hBEFORE, + 'Conditional' => true, + 'HookToPrefix' => 'sc', + 'HookToSpecial' => '', + 'HookToEvent' => Array ( 'OnPropagate', 'OnClearAll' ), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnPreSave', + ), + ), - 'Sections' => Array ( - 'in-commerce:shipping_folder' => Array ( - 'parent' => 'in-commerce:setting_folder', - 'icon' => 'conf_shipping', - 'use_parent_header' => 1, - 'label' => 'la_tab_Shipping', - 'permissions' => Array (), - 'priority' => 4, - 'type' => stTREE, - ), + 'QueryString' => Array ( + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', + ), - 'in-commerce:shipping' => Array ( - 'parent' => 'in-commerce:shipping_folder', - 'icon' => 'conf_shipping', - 'label' => 'la_tab_CustomShippingTypes', - 'url' => Array ('t' => 'in-commerce/shipping/shipping_custom_list', 'pass' => 'm'), - 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'), - 'priority' => 4.1, - 'type' => stTAB, - ), - ), + 'IDField' => 'ShippingID', + 'StatusField' => Array ('Status'), + 'TitleField' => 'Name', - 'TableName' => TABLE_PREFIX.'ShippingType', + 'TitlePresets' => Array ( + 'default' => Array ( + 'new_status_labels' => Array ('s' => '!la_title_AddingShippingType!'), + 'edit_status_labels' => Array ('s' => '!la_title_EditingShippingType!'), + 'new_titlefield' => Array ('s' => '!la_title_NewShippingType!'), + ), + 'shipping_list' => Array ( + 'prefixes' => Array ('s_List'), + 'format' => "!la_title_ShippingTypes!", + ), + 'shipping_type_edit' => Array ( + 'prefixes' => Array ('s'), + 'format' => "#s_status# '#s_titlefield#' - !la_title_General!", + ), + 'zones' => Array ( + 'prefixes' => Array ('s'), + 'format' => "#s_status# '#s_titlefield#' - !la_title_Zones!", + ), + 'zones_edit' => Array ( + 'prefixes' => Array ('z'), + 'new_status_labels' => Array ('z' => '!la_title_AddingShippingZone!'), + 'edit_status_labels' => Array ('z' => '!la_title_EditingShippingZone!'), + 'format' => "#z_status# '#z_titlefield#'", + ), + 'brackets' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Brackets!",), + 'costs' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Costs!",), + 'groups' => Array ('prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_Groups!",), + 'select_modifier' => Array ('prefixes' => Array ('s'), 'format' => "!la_title_ApplyModifier!",), + ), - 'SubItems' => Array ('z', 'br'), + 'EditTabPresets' => Array ( + 'Default' => Array ( + 'general' => Array ('title' => 'la_tab_General', 't' => 'in-commerce/shipping/shipping_edit', 'priority' => 1), + 'zones' => Array ('title' => 'la_tab_ShippingZones', 't' => 'in-commerce/shipping/shipping_zones', 'priority' => 2), + 'brackets' => Array ('title' => 'la_tab_Brackets', 't' => 'in-commerce/shipping/shipping_brackets', 'priority' => 3), + 'costs' => Array ('title' => 'la_tab_Costs', 't' => 'in-commerce/shipping/shipping_costs', 'priority' => 4), + 'groups' => Array ('title' => 'la_tab_UserGroups', 't' => 'in-commerce/shipping/shipping_type_groups', 'priority' => 5), + ), + ), - 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), - // key - special, value - list select sql - 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), + 'PermSection' => Array ('main' => 'in-commerce:shipping'), - 'ListSortings' => Array ( - '' => Array ( - 'Sorting' => Array ('Name' => 'asc'), - ) - ), + 'Sections' => Array ( + 'in-commerce:shipping_folder' => Array ( + 'parent' => 'in-commerce:setting_folder', + 'icon' => 'conf_shipping', + 'use_parent_header' => 1, + 'label' => 'la_tab_Shipping', + 'permissions' => Array (), + 'priority' => 4, + 'type' => stTREE, + ), - 'Fields' => Array ( - 'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')), - 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')), - 'SpeedCode' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' => 25), - 'LocationFrom' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( - 1 => 'Riga', - 2 => 'Salaspils', - 3 => 'Chicago', - 4 => 'Dublin' - ), - 'not_null' => 1, 'default' => 1 - ), - 'Type' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, - 'options' => Array (1 => 'la_ByWeight', 2 => 'la_ByItem', 3 => 'la_ByAmount', 4 => 'la_Handling'), - 'not_null' => 1, 'default' => 1), - 'BaseFee' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), - 'CODFlatSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), - 'CODPercentSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), - 'Status' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled', 2 => 'la_SelectedOnly' ), 'use_phrases' => 1, - 'default' => 1, 'not_null' => 1, - ), - 'CostType' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Flat', 2 => 'la_PerUnit', 3 => 'la_Combined' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ), - 'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ), - 'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => 1 ), - 'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => 1 ), - 'PortalGroups' => Array ('type' => 'string', 'default' => null), - 'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0), - 'IsFreePromoShipping' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, - 'default' => 0, 'not_null' => 1, - ), - 'InsuranceFee' => Array ('type' => 'float', 'default' => null), - 'InsuranceType' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', - 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 2 - ), - ), + 'in-commerce:shipping' => Array ( + 'parent' => 'in-commerce:shipping_folder', + 'icon' => 'conf_shipping', + 'label' => 'la_tab_CustomShippingTypes', + 'url' => Array ('t' => 'in-commerce/shipping/shipping_custom_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline'), + 'priority' => 4.1, + 'type' => stTAB, + ), + ), - 'Grids' => Array ( - 'Default' => Array ( - 'Icons' => Array ( - 'default' => 'icon16_item.png', - 0 => 'icon16_disabled.png', - 1 => 'icon16_item.png', - 'module' => 'core', - ), - 'Fields' => Array ( - 'ShippingID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), - '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_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_range_filter'), - ), + 'TableName' => TABLE_PREFIX.'ShippingType', - ), - ), - ); \ No newline at end of file + 'SubItems' => Array ('z', 'br'), + + 'ListSQLs' => Array ( + '' => ' SELECT * + FROM %s' + ), + + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + ) + ), + + 'Fields' => Array ( + 'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')), + 'SpeedCode' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' => 25), + 'LocationFrom' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( + 1 => 'Riga', + 2 => 'Salaspils', + 3 => 'Chicago', + 4 => 'Dublin' + ), + 'not_null' => 1, 'default' => 1 + ), + 'Type' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, + 'options' => Array (1 => 'la_ByWeight', 2 => 'la_ByItem', 3 => 'la_ByAmount', 4 => 'la_Handling'), + 'not_null' => 1, 'default' => 1), + 'BaseFee' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), + 'CODFlatSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), + 'CODPercentSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled', 2 => 'la_SelectedOnly' ), 'use_phrases' => 1, + 'default' => 1, 'not_null' => 1, + ), + 'CostType' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Flat', 2 => 'la_PerUnit', 3 => 'la_Combined' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ), + 'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ), + 'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => 1 ), + 'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => 1 ), + 'PortalGroups' => Array ('type' => 'string', 'default' => null), + 'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0), + 'IsFreePromoShipping' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'InsuranceFee' => Array ('type' => 'float', 'default' => null), + 'InsuranceType' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 2 + ), + ), + + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ( + 'default' => 'icon16_item.png', + 0 => 'icon16_disabled.png', + 1 => 'icon16_item.png', + 'module' => 'core', + ), + 'Fields' => Array ( + 'ShippingID' => Array ( 'title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 50, ), + '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_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_range_filter'), + ), + ), + ), +); \ No newline at end of file