Index: branches/5.1.x/units/taxes/taxes_config.php =================================================================== diff -u -N -r13156 -r13549 --- branches/5.1.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 13156) +++ branches/5.1.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'tax', - 'ItemClass' => Array ('class' => 'kDBItem','file' => '','build_event' => 'OnItemBuild'), - 'ListClass' => Array ('class' => 'kDBList','file' => '','build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'TaxesEventHandler','file' => 'taxes_event_handler.php','build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'TaxesTagProcessor','file' => 'taxes_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' => 'TaxesEventHandler', 'file' => 'taxes_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'TaxesTagProcessor', 'file' => 'taxes_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'hooks' => Array (), 'QueryString' => Array ( @@ -48,17 +48,17 @@ 'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'), 'new_titlefield' => Array ('tax' => '!la_title_NewTaxZone!'), ), - 'taxes_list'=>Array ( 'prefixes' => Array ('tax_List'), + 'taxes_list' =>Array ( 'prefixes' => Array ('tax_List'), 'format' => "!la_title_Taxes!", ), - 'taxes_edit'=>Array ( 'prefixes' => Array ('tax'), + 'taxes_edit' =>Array ( 'prefixes' => Array ('tax'), 'new_titlefield' => Array ('tax' => '!la_title_NewTax!'), 'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!", ), ), - 'PermSection' => Array ('main' =>'in-commerce:taxes'), + 'PermSection' => Array ('main' => 'in-commerce:taxes'), 'Sections' => Array ( 'in-commerce:taxes' => Array ( @@ -78,7 +78,7 @@ 'SubItems' => Array ('taxdst'), - 'ListSQLs' => Array ( ''=> 'SELECT %1$s.* %2$s FROM %s'), + 'ListSQLs' => Array ( '' => 'SELECT %1$s.* %2$s FROM %s'), // key - special, value - list select sql @@ -88,13 +88,23 @@ ) ), 'Fields' => Array ( - 'TaxZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required'=>true, 'max_len'=>100, 'error_msgs' => Array ('required' => 'Please fill in')), - 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => true, 'default' => 1), - 'TaxValue' => Array ('type' => 'double', 'not_null' => true, 'default' => 0), - 'ApplyToShipping' => Array ('type' => 'int', 'not_null' => true, 'default' => 0, 'formatter' => 'kOptionsFormatter', 'use_phrases'=>1, 'options'=>Array (0=>'la_No', 1=>'la_Yes')), - 'ApplyToProcessing' => Array ('type' => 'int', 'not_null' => true, 'default' => 0, 'formatter' => 'kOptionsFormatter', 'use_phrases'=>1, 'options'=>Array (0=>'la_No', 1=>'la_Yes')), - ), + 'TaxZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')), + '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', + 'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'ApplyToProcessing' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + ), 'Grids' => Array ( 'Default' => Array (