Index: branches/5.1.x/units/reports/reports_config.php =================================================================== diff -u -N -r13156 -r13549 --- branches/5.1.x/units/reports/reports_config.php (.../reports_config.php) (revision 13156) +++ branches/5.1.x/units/reports/reports_config.php (.../reports_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'rep', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ReportsEventHandler','file'=>'reports_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ReportsTagProcessor','file'=>'reports_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array('class' => 'ReportsEventHandler', 'file' => 'reports_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array('class' => 'ReportsTagProcessor', 'file' => 'reports_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'QueryString' => Array( @@ -45,14 +45,14 @@ 'IDField' => 'CategoryId', 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('d'=>'!la_title_Adding_Discount!'), - 'edit_status_labels' => Array('d'=>'!la_title_Editing_Discount!'), - 'new_titlefield' => Array('d'=>'!la_title_New_Discount!'), + 'default' => Array( 'new_status_labels' => Array('d' => '!la_title_Adding_Discount!'), + 'edit_status_labels' => Array('d' => '!la_title_Editing_Discount!'), + 'new_titlefield' => Array('d' => '!la_title_New_Discount!'), ), - 'report_options'=>Array('format' => "!la_title_ReportOptions!"), - 'report_results'=>Array('format' => "!la_title_ReportResults!"), - 'report_chart'=>Array('format' => "!la_title_SalesReportChart!"), + 'report_options' =>Array('format' => "!la_title_ReportOptions!"), + 'report_results' =>Array('format' => "!la_title_ReportResults!"), + 'report_chart' =>Array('format' => "!la_title_SalesReportChart!"), ), 'PermSection' => Array('main' => 'in-commerce:reports'), @@ -62,7 +62,7 @@ 'parent' => 'in-commerce', 'icon' => 'in-commerce:sales_report', 'label' => 'la_tab_SaleReports', - 'url' => Array('t' => 'in-commerce/reports/reports', 'pass' => 'm,rep', 'rep_event'=>'OnNew'), + 'url' => Array('t' => 'in-commerce/reports/reports', 'pass' => 'm,rep', 'rep_event' => 'OnNew'), 'permissions' => Array('view', 'add'), 'priority' => 2, 'type' => stTREE, @@ -85,9 +85,9 @@ ) ), - 'ListSQLs' => Array( ''=>'SELECT %1$s.* %2$s FROM %1$s', + 'ListSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %1$s', + 'ItemSQLs' => Array( '' => 'SELECT * FROM %1$s', ), 'ListSortings' => Array( @@ -106,17 +106,28 @@ ), 'VirtualFields' => Array( - 'ReportType' => array('formatter'=>'kOptionsFormatter','options'=>array( + 'ReportType' => array('formatter' => 'kOptionsFormatter', 'options' =>array( 12 => 'la_Overall', 1 => 'la_ByCategory', 2 => 'la_ByUser', 5 => 'la_byProduct' - ),'use_phrases'=>1,'default'=>12 + ), + 'use_phrases' => 1, 'default' => 12, ), - 'FromDateTime' => Array('formatter'=>'kDateFormatter','default'=>'','filter_type'=>'range_from','filter_field'=>'OrderDate' ), - 'ToDateTime' => Array('formatter'=>'kDateFormatter','default'=>'','filter_type'=>'range_to','filter_field'=>'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), - 'Recursive' => array('default'=>1), - 'SkipEmpty' => array('default'=>1), + 'FromDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ), + 'ToDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), + 'Recursive' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), + 'SkipEmpty' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), 'CategoryId' => Array ('type' => 'int', 'default' => 0), ), 'Grids' => Array( @@ -126,12 +137,12 @@ 'module' => 'core', ), 'Fields' => Array( - 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter'), - 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter'), - 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter'), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), - 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter'), + 'Name' => Array( 'title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Start' => Array( 'title' => 'la_col_Start', 'filter_block' => 'grid_date_range_filter'), + 'End' => Array( 'title' => 'la_col_End', 'filter_block' => 'grid_date_range_filter'), + 'GroupId' => Array( 'title' => 'la_col_Group', 'filter_block' => 'grid_options_filter'), + 'Type' => Array( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'), + 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'), ), ),