Index: branches/5.2.x/install/install_schema.sql =================================================================== diff -u -N -r15244 -r15376 --- branches/5.2.x/install/install_schema.sql (.../install_schema.sql) (revision 15244) +++ branches/5.2.x/install/install_schema.sql (.../install_schema.sql) (revision 15376) @@ -251,8 +251,16 @@ CREATE TABLE PaymentTypes ( PaymentTypeId int(11) NOT NULL AUTO_INCREMENT, `Name` varchar(100) NOT NULL DEFAULT '', - Description varchar(255) DEFAULT NULL, - Instructions text, + l1_Description varchar(255) DEFAULT '', + l2_Description varchar(255) DEFAULT '', + l3_Description varchar(255) DEFAULT '', + l4_Description varchar(255) DEFAULT '', + l5_Description varchar(255) DEFAULT '', + l1_Instructions text, + l2_Instructions text, + l3_Instructions text, + l4_Instructions text, + l5_Instructions text, AdminComments text, `Status` int(11) NOT NULL DEFAULT '0', Priority int(11) NOT NULL DEFAULT '0', @@ -267,7 +275,17 @@ KEY Priority (Priority), KEY GatewayId (GatewayId), KEY BuiltIn (BuiltIn), - KEY IsPrimary (IsPrimary) + KEY IsPrimary (IsPrimary), + KEY l1_Description (l1_Description(5)), + KEY l2_Description (l2_Description(5)), + KEY l3_Description (l3_Description(5)), + KEY l4_Description (l4_Description(5)), + KEY l5_Description (l5_Description(5)), + KEY l1_Instructions (l1_Instructions(5)), + KEY l2_Instructions (l2_Instructions(5)), + KEY l3_Instructions (l3_Instructions(5)), + KEY l4_Instructions (l4_Instructions(5)), + KEY l5_Instructions (l5_Instructions(5)) ); CREATE TABLE Products ( Index: branches/5.2.x/install/upgrades.sql =================================================================== diff -u -N -r15244 -r15376 --- branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 15244) +++ branches/5.2.x/install/upgrades.sql (.../upgrades.sql) (revision 15376) @@ -274,3 +274,5 @@ UPDATE ProductOptionCombinations SET CombinationCRC = CAST((CombinationCRC & 0xFFFFFFFF) AS UNSIGNED INTEGER) WHERE CombinationCRC < 0; + +# ===== v 5.2.0-RC1 ===== Index: branches/5.2.x/units/orders/orders_config.php =================================================================== diff -u -N -r15134 -r15376 --- branches/5.2.x/units/orders/orders_config.php (.../orders_config.php) (revision 15134) +++ branches/5.2.x/units/orders/orders_config.php (.../orders_config.php) (revision 15376) @@ -1,6 +1,6 @@ Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', - 'options_sql' => 'SELECT %s + 'options_sql' => 'SELECT IF(l%2$s_Description <> "", l%2$s_Description, l%3$s_Description) AS Description, PaymentTypeId FROM ' . TABLE_PREFIX . 'PaymentTypes WHERE Status = 1 ORDER BY Priority DESC, Name ASC', Index: branches/5.2.x/units/payment_type/payment_type_config.php =================================================================== diff -u -N -r14821 -r15376 --- branches/5.2.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 14821) +++ branches/5.2.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 15376) @@ -1,6 +1,6 @@ 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), + 'Description' => Array ( + 'type' => 'string', 'max_len' => 255, + 'formatter' => 'kMultiLanguage', 'db_type' => 'varchar(255)', + 'default' => null + ), + 'Instructions' => Array ( + 'type' => 'string', + 'formatter' => 'kMultiLanguage', 'db_type' => 'text', 'using_fck' => 1, + 'default' => null + ), 'AdminComments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), 'Status' => Array ( 'type' => 'int', Index: branches/5.2.x/units/gateways/gw_classes/verisign_pflink.php =================================================================== diff -u -N -r15141 -r15376 --- branches/5.2.x/units/gateways/gw_classes/verisign_pflink.php (.../verisign_pflink.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/verisign_pflink.php (.../verisign_pflink.php) (revision 15376) @@ -1,6 +1,6 @@ parseGWResponce($_POST); + $result = $this->parseGWResponce($_POST, $gw_params); $session = $this->Application->recallObject('Session'); $session->SID = $_POST['USER2']; @@ -113,7 +113,7 @@ return $result['RESULT'] == '0' ? 1 : 0; } - function parseGWResponce($res) + function parseGWResponce($res, $gw_params) { $this->parsed_responce = $res; return $res; Index: branches/5.2.x/units/gateways/gw_classes/atosorigin.php =================================================================== diff -u -N -r15141 -r15376 --- branches/5.2.x/units/gateways/gw_classes/atosorigin.php (.../atosorigin.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/atosorigin.php (.../atosorigin.php) (revision 15376) @@ -1,6 +1,6 @@ parseGWResponce($ret); + $result = $this->parseGWResponce($ret, $gw_params); list ($sid, $auth_code) = explode(',', $result['caddie']); $session = $this->Application->recallObject('Session'); @@ -132,7 +132,7 @@ return $result['response_code'] === '00' ? 1 : 0; } - function parseGWResponce($str) + function parseGWResponce($str, $gw_params) { $response = explode ("!", $str); Index: branches/5.2.x/units/gateways/gw_classes/gw_base.php =================================================================== diff -u -N -r15141 -r15376 --- branches/5.2.x/units/gateways/gw_classes/gw_base.php (.../gw_base.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/gw_base.php (.../gw_base.php) (revision 15376) @@ -1,6 +1,6 @@ Clear(); $fields_hash = Array ( 'Name' => $data['Gateway']['Name'], - 'Description' => $data['Gateway']['Name'], + 'l' . $this->Application->GetDefaultLanguageId() . '_Description' => $data['Gateway']['Name'], 'BuiltIn' => 1, 'GatewayId' => $gw_id, ); Index: branches/5.2.x/install/install_data.sql =================================================================== diff -u -N -r15070 -r15376 --- branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 15070) +++ branches/5.2.x/install/install_data.sql (.../install_data.sql) (revision 15376) @@ -311,10 +311,10 @@ INSERT INTO ItemTypes VALUES (11, 'In-Commerce', 'p', 'Products', 'Name', 'CreatedById', NULL, NULL, '', 0, '', 'ProductsItem', 'Product'); INSERT INTO ItemTypes VALUES (13, 'In-Commerce', 'ord', 'Orders', 'OrderNumber', '', NULL, NULL, '', 0, '', 'OrdersItem', 'Order'); -INSERT INTO PaymentTypes VALUES (1, 'Credit Card (manual)', 'Credit Card', 'Please enter your credit card details.', NULL, 1, 0, 1, 1, 3, DEFAULT, DEFAULT, ',15,'); -INSERT INTO PaymentTypes VALUES (4, 'PayPal', 'PayPal', 'You will be redirected to PayPal site to make the payment after confirming your order on the next checkout step.', NULL, 0, 0, 0, 1, 4, DEFAULT, DEFAULT, ',15,'); -INSERT INTO PaymentTypes VALUES (2, 'Check/MO', 'Check or Money Order', NULL, NULL, 0, 0, 0, 1, 1, 1, DEFAULT, ',15,'); -INSERT INTO PaymentTypes VALUES (3, 'Authorize.Net', 'Credit Card', 'Please enter your Credit Card details below. Your credit card will not be charged until you confirm your purchase on the next(last) step of checkout process.', NULL, 0, 0, 0, 1, 2, DEFAULT, DEFAULT, ',15,'); +INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (1, 'Credit Card (manual)', 'Credit Card', 'Please enter your credit card details.', NULL, 1, 0, 1, 1, 3, DEFAULT, DEFAULT, ',15,'); +INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (4, 'PayPal', 'PayPal', 'You will be redirected to PayPal site to make the payment after confirming your order on the next checkout step.', NULL, 0, 0, 0, 1, 4, DEFAULT, DEFAULT, ',15,'); +INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (2, 'Check/MO', 'Check or Money Order', NULL, NULL, 0, 0, 0, 1, 1, 1, DEFAULT, ',15,'); +INSERT INTO PaymentTypes (PaymentTypeId, `Name`, l1_Description, l1_Instructions, AdminComments, `Status`, Priority, IsPrimary, BuiltIn, GatewayId, PlacedOrdersEdit, ProcessingFee, PortalGroups) VALUES (3, 'Authorize.Net', 'Credit Card', 'Please enter your Credit Card details below. Your credit card will not be charged until you confirm your purchase on the next(last) step of checkout process.', NULL, 0, 0, 0, 1, 2, DEFAULT, DEFAULT, ',15,'); INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 4, 131); INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 2, 131); Index: branches/5.2.x/admin_templates/payment_type/payment_type_edit.tpl =================================================================== diff -u -N -r14258 -r15376 --- branches/5.2.x/admin_templates/payment_type/payment_type_edit.tpl (.../payment_type_edit.tpl) (revision 14258) +++ branches/5.2.x/admin_templates/payment_type/payment_type_edit.tpl (.../payment_type_edit.tpl) (revision 15376) @@ -46,6 +46,8 @@ + + @@ -57,8 +59,8 @@ - - + + Index: branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php =================================================================== diff -u -N -r15141 -r15376 --- branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php (.../sella_guestpay.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/sella_guestpay.php (.../sella_guestpay.php) (revision 15376) @@ -1,6 +1,6 @@ Send($url); - $result = $this->parseGWResponce($ret); + $result = $this->parseGWResponce($ret, $gw_params); list ($sid, $auth_code) = explode(',', $result['CUSTOM_INFO']); $session = $this->Application->recallObject('Session'); @@ -123,7 +123,7 @@ return $result['PAY1_TRANSACTIONRESULT'] == 'OK' ? 1 : 0; } - function parseGWResponce($str) + function parseGWResponce($str, $gw_params) { if (preg_match('/#decryptstring#(.*)#\/decryptstring#/', $str, $matches)) { $separator = '*P1*'; Index: branches/5.2.x/install/upgrades.php =================================================================== diff -u -N -r15213 -r15376 --- branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 15213) +++ branches/5.2.x/install/upgrades.php (.../upgrades.php) (revision 15376) @@ -1,6 +1,6 @@ Application->getUnitOption('pt', 'TableName'); + $table_structure = $this->Conn->Query('DESCRIBE ' . $table_name, 'Field'); + + if ( isset($table_structure['Description']) ) { + $sql = 'UPDATE ' . $table_name . ' + SET Description = "" + WHERE Description IS NULL'; + $this->Conn->Query($sql); + + $sql = 'ALTER TABLE ' . $table_name . ' + CHANGE `Description` `Description` VARCHAR(255) NOT NULL DEFAULT ""'; + $this->Conn->Query($sql); + } + + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); + /* @var $ml_helper kMultiLanguageHelper */ + + $ml_helper->createFields('pt'); + + if ( isset($table_structure['Description']) ) { + $sql = 'UPDATE ' . $table_name . ' + SET + l' . $this->Application->GetDefaultLanguageId() . '_Description = Description, + l' . $this->Application->GetDefaultLanguageId() . '_Instructions = Instructions'; + $this->Conn->Query($sql); + + $sql = 'ALTER TABLE ' . $table_name . ' DROP Description, DROP Instructions'; + $this->Conn->Query($sql); + } + } } \ No newline at end of file Index: branches/5.2.x/units/gateways/gw_classes/paybox.php =================================================================== diff -u -N -r15141 -r15376 --- branches/5.2.x/units/gateways/gw_classes/paybox.php (.../paybox.php) (revision 15141) +++ branches/5.2.x/units/gateways/gw_classes/paybox.php (.../paybox.php) (revision 15376) @@ -1,6 +1,6 @@