Index: branches/5.1.x/units/payment_type/payment_type_config.php =================================================================== diff -u -N -r13156 -r13549 --- branches/5.1.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 13156) +++ branches/5.1.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ('pt' => '!la_title_NewPaymentType!'), ), - 'payment_type_list'=>Array ( 'prefixes' => Array ('pt_List'), + 'payment_type_list' =>Array ( 'prefixes' => Array ('pt_List'), 'format' => "!la_title_PaymentTypes!", ), - 'payment_type_edit'=>Array ( 'prefixes' => Array ('pt'), + 'payment_type_edit' =>Array ( 'prefixes' => Array ('pt'), 'new_titlefield' => Array ('pt' => '!la_title_NewPaymentType!'), 'format' => "#pt_status# '#pt_titlefield#' - !la_title_General!", ), @@ -84,7 +84,7 @@ Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER), ), 'Filters' => Array ( - 'show_active' => Array ('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), @@ -108,24 +108,47 @@ ) ), 'Fields' => Array ( - 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required'=>true, 'max_len' => 100), - 'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), - 'Instructions' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'AdminComments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null' => 1), - 'Priority' => Array ('type' => 'int', 'not_null' => true, 'default' => 0), - 'IsPrimary' => Array ('type' => 'int', 'not_null' => true, 'default' => 0), - 'BuiltIn' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_BuiltIn', 0 => 'la_UserDefined' ), 'default' => 0, 'not_null' => 1 ), - 'GatewayId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Gateways', 'option_key_field' => 'GatewayId', 'option_title_field' => 'Name', 'default' => 1, 'not_null' => 1), - 'PlacedOrdersEdit' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'), - 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), - ), -/* 'VirtualFields' => Array ( - 'Qty' => 1, - ),*/ - + 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' =>true, 'max_len' => 100), + 'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => null), + 'Instructions' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), + 'AdminComments' => 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, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'BuiltIn' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_BuiltIn', 0 => 'la_UserDefined' ), 'default' => 0, 'not_null' => 1 ), + 'GatewayId' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Gateways', + 'option_key_field' => 'GatewayId', + 'option_title_field' => 'Name', + 'default' => 1, 'not_null' => 1, + ), + 'PlacedOrdersEdit' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.00'), + 'PortalGroups' => Array ('type' => 'string', 'default' => null), + ), + /* + 'VirtualFields' => Array ( + 'Qty' => 1, + ), + */ 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array (