Version Notes
New Payson module
Download this release
Release Info
Developer | Oscar Villegas |
Extension | Payson |
Version | 1.8.3.1 |
Comparing to | |
See all releases |
Code changes from version 1.8.3 to 1.8.3.1
app/code/community/Payson/Payson/Helper/Api.php
CHANGED
@@ -17,7 +17,7 @@ class Payson_Payson_Helper_Api {
|
|
17 |
const PAY_FORWARD_URL = '%s://%s%s.payson.%s/paySecure/';
|
18 |
const APPLICATION_ID = 'Magento';
|
19 |
const MODULE_NAME = 'Payson_AllinOne';
|
20 |
-
const MODULE_VERSION = '1.8.3';
|
21 |
const DEBUG_MODE_MAIL = 'testagent-1@payson.se';
|
22 |
const DEBUG_MODE_AGENT_ID = '4';
|
23 |
const DEBUG_MODE_MD5 = '2acab30d-fe50-426f-90d7-8c60a7eb31d4';
|
@@ -1081,7 +1081,7 @@ LIMIT
|
|
1081 |
'SELECT ipn_status, token FROM `' . $order_table . '` WHERE order_id = ? LIMIT 0,1', $order_id);
|
1082 |
if ((!$response->IsValid()) && ($payson_validator->ipn_status == NULL && $payson_validator->token == NULL)) {
|
1083 |
$sales_flat_order = 'sales_flat_order';
|
1084 |
-
if($order_id !== null){
|
1085 |
$new_order_id = Mage::getModel('sales/order')->loadByIncrementId($order_id)->getEntityId();
|
1086 |
$db->update($sales_flat_order, array('state'=>'canceled', 'status'=>'canceled'), array('entity_id = ?' => $new_order_id));
|
1087 |
}
|
17 |
const PAY_FORWARD_URL = '%s://%s%s.payson.%s/paySecure/';
|
18 |
const APPLICATION_ID = 'Magento';
|
19 |
const MODULE_NAME = 'Payson_AllinOne';
|
20 |
+
const MODULE_VERSION = '1.8.3.1';
|
21 |
const DEBUG_MODE_MAIL = 'testagent-1@payson.se';
|
22 |
const DEBUG_MODE_AGENT_ID = '4';
|
23 |
const DEBUG_MODE_MD5 = '2acab30d-fe50-426f-90d7-8c60a7eb31d4';
|
1081 |
'SELECT ipn_status, token FROM `' . $order_table . '` WHERE order_id = ? LIMIT 0,1', $order_id);
|
1082 |
if ((!$response->IsValid()) && ($payson_validator->ipn_status == NULL && $payson_validator->token == NULL)) {
|
1083 |
$sales_flat_order = 'sales_flat_order';
|
1084 |
+
if($order_id !== null&& $payson_order !== false){
|
1085 |
$new_order_id = Mage::getModel('sales/order')->loadByIncrementId($order_id)->getEntityId();
|
1086 |
$db->update($sales_flat_order, array('state'=>'canceled', 'status'=>'canceled'), array('entity_id = ?' => $new_order_id));
|
1087 |
}
|
app/code/community/Payson/Payson/Model/Standard.php
CHANGED
@@ -95,9 +95,11 @@ class Payson_Payson_Model_Standard extends Mage_Payment_Model_Method_Abstract {
|
|
95 |
* @inheritDoc
|
96 |
*/
|
97 |
public function getTitle() {
|
98 |
-
|
|
|
|
|
99 |
if ($this->_config->CanStandardPayment()) {
|
100 |
-
return sprintf(Mage::helper('payson')->__('Checkout with Payson. If invoice is choosen as payment method an %s invoice fee will be added.'));
|
101 |
} elseif ($this->_config->CanStandardPayment()) {
|
102 |
return Mage::helper('payson')->__('Checkout with Payson');
|
103 |
}
|
95 |
* @inheritDoc
|
96 |
*/
|
97 |
public function getTitle() {
|
98 |
+
$order = Mage::registry('current_order');
|
99 |
+
$invoice_fee = $order->getPaysonInvoiceFee();
|
100 |
+
$text_invoice_fee = strip_tags($invoice_fee);
|
101 |
if ($this->_config->CanStandardPayment()) {
|
102 |
+
return sprintf(Mage::helper('payson')->__('Checkout with Payson. If invoice is choosen as payment method an %s invoice fee will be added.'), ($text_invoice_fee));
|
103 |
} elseif ($this->_config->CanStandardPayment()) {
|
104 |
return Mage::helper('payson')->__('Checkout with Payson');
|
105 |
}
|
app/code/community/Payson/Payson/controllers/Adminhtml/Sales/Order/ShipmentController.php
CHANGED
@@ -17,11 +17,9 @@ class Payson_Payson_Adminhtml_Sales_Order_ShipmentController extends Mage_Adminh
|
|
17 |
$transactionSave = Mage::getModel('core/resource_transaction')
|
18 |
->addObject($invoice)
|
19 |
->addObject($invoice->getOrder());
|
20 |
-
$transactionSave->save();
|
21 |
-
|
22 |
-
|
23 |
-
parent::saveAction();
|
24 |
}
|
|
|
25 |
}
|
26 |
|
27 |
}
|
17 |
$transactionSave = Mage::getModel('core/resource_transaction')
|
18 |
->addObject($invoice)
|
19 |
->addObject($invoice->getOrder());
|
20 |
+
$transactionSave->save();
|
|
|
|
|
|
|
21 |
}
|
22 |
+
parent::saveAction();
|
23 |
}
|
24 |
|
25 |
}
|
app/locale/sv_SE/Payson_Payson.csv
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
"Checkout with Payson","Betala med Payson via kort eller bank"
|
2 |
-
"Checkout with Payson. If invoice is choosen as payment method an %s invoice fee will be added.","Betala med Payson. Om ni väljer att betala med Payson faktura då till kommer en
|
3 |
"You will be redirected to Payson's website.","Du kommer att skickas vidare till Paysons webbplats."
|
4 |
|
5 |
"Pay with Payson ","Betala med Payson."
|
1 |
"Checkout with Payson","Betala med Payson via kort eller bank"
|
2 |
+
"Checkout with Payson. If invoice is choosen as payment method an %s invoice fee will be added.","Betala med Payson. Om ni väljer att betala med Payson faktura då till kommer en fakturaavgift på %s att adderas till totalsumman"
|
3 |
"You will be redirected to Payson's website.","Du kommer att skickas vidare till Paysons webbplats."
|
4 |
|
5 |
"Pay with Payson ","Betala med Payson."
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Payson</name>
|
4 |
-
<version>1.8.3</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/bsd-license.php">BSD licence</license>
|
7 |
<channel>community</channel>
|
@@ -10,9 +10,9 @@
|
|
10 |
<description>This module integrates with Payson and allows you to charge your customers via Invoice, Card and direct bank transfers.</description>
|
11 |
<notes>New Payson module </notes>
|
12 |
<authors><author><name>Karl Brundin</name><user>PaysonAB</user><email>integration@payson.se</email></author><author><name>Oscar Villegas</name><user>PaysonAB</user><email>integration@payson.se</email></author></authors>
|
13 |
-
<date>2015-04
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Payson"><dir name="Payson"><dir name="Block"><file name="Form.php" hash="74a8967879fbb6af999f0e513bc91323"/><dir name="Invoice"><file name="Form.php" hash="88a008948e1231b135ba8a798eeb1c66"/></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="3e8566e634d68d8df9bb70f597916980"/></dir></dir><dir name="Standard"><file name="Form.php" hash="c715cbec95494a9a26d261992429dff0"/></dir></dir><dir name="Helper"><dir name="Api"><dir name="Response"><file name="Interface.php" hash="51d0ffe7eefaa12eb9b4f2551e9f4259"/><dir name="Standard"><file name="Parameters.php" hash="6965b8259867c23a5e1e682e14491eb2"/></dir><file name="Standard.php" hash="cef827896629364fee49671af879adc3"/><file name="Validate.php" hash="34fb6626af3a6ac06e987c9e10a95796"/></dir></dir><file name="Api.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php><package><name>Mage_Core_modules</name><channel>community</channel><min>1.8.0</min><max></max></package></required></dependencies>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Payson</name>
|
4 |
+
<version>1.8.3.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/bsd-license.php">BSD licence</license>
|
7 |
<channel>community</channel>
|
10 |
<description>This module integrates with Payson and allows you to charge your customers via Invoice, Card and direct bank transfers.</description>
|
11 |
<notes>New Payson module </notes>
|
12 |
<authors><author><name>Karl Brundin</name><user>PaysonAB</user><email>integration@payson.se</email></author><author><name>Oscar Villegas</name><user>PaysonAB</user><email>integration@payson.se</email></author></authors>
|
13 |
+
<date>2015-05-04</date>
|
14 |
+
<time>08:03:30</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Payson"><dir name="Payson"><dir name="Block"><file name="Form.php" hash="74a8967879fbb6af999f0e513bc91323"/><dir name="Invoice"><file name="Form.php" hash="88a008948e1231b135ba8a798eeb1c66"/></dir><dir name="Order"><dir name="Totals"><file name="Fee.php" hash="3e8566e634d68d8df9bb70f597916980"/></dir></dir><dir name="Standard"><file name="Form.php" hash="c715cbec95494a9a26d261992429dff0"/></dir></dir><dir name="Helper"><dir name="Api"><dir name="Response"><file name="Interface.php" hash="51d0ffe7eefaa12eb9b4f2551e9f4259"/><dir name="Standard"><file name="Parameters.php" hash="6965b8259867c23a5e1e682e14491eb2"/></dir><file name="Standard.php" hash="cef827896629364fee49671af879adc3"/><file name="Validate.php" hash="34fb6626af3a6ac06e987c9e10a95796"/></dir></dir><file name="Api.php" hash="0d6131bea51fc8926ff1dd71a0c06d86"/><file name="Data.php" hash="83ff59b1588c0b0ff8d2f7341589ea59"/><file name="FundingConstraint.php" hash="7acf2b5d8c045237aeff6566cd55cca1"/></dir><dir name="Model"><file name="Config.php" hash="7de7a2257df64a5e039de977edbc5492"/><dir name="Method"><file name="Abstract.php" hash="be7d3c5b1aa580761a3c1e75ce5c789b"/><file name="Invoice.php" hash="3fbaa6168d8b6b1984177b9e9fde5c01"/><file name="Standard.php" hash="136579912fb4971ebd2279d29a85afc3"/></dir><dir name="Mysql4"><file name="Setup.php" hash="3075fa047af3d56d6eac609004e6e1cc"/></dir><dir name="Order"><dir name="Creditmemo"><dir name="Total"><file name="Invoice.php" hash="19fadd6df40cd03528fb9c211c34a8bc"/></dir></dir><dir name="Invoice"><dir name="Total"><file name="Invoice.php" hash="87899d88d04362bc148eb51a0a9a076e"/></dir></dir></dir><dir name="Quote"><dir name="Address"><dir name="Total"><file name="Invoice.php" hash="44eef552e2dd3869c3181f3f939ac355"/></dir></dir></dir><file name="Standard.php" hash="233cf9d7ebe15137d98a8e1b23125a51"/><dir name="System"><dir name="Config"><dir name="Source"><file name="Paysondirectmethod.php" hash="5f0a8584217204a638d11dbf61891779"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><file name="ShipmentController.php" hash="a523637765ce23baf6dc9e1b03ca16d9"/></dir></dir></dir><file name="CheckoutController.php" hash="4565a0ab80a746ac2893890d76c2fc4c"/><file name="IpnController.php" hash="e7b092cdd0011a3a1359a084bbaf14ad"/></dir><dir name="etc"><file name="config.xml" hash="d4f126578e993c4d08d046defb81fffa"/><file name="system.xml" hash="4e98152a1448ef3cecc516cb2c9e0d97"/></dir><dir name="sql"><dir name="payson_setup"><file name="mysql4-install-0.1.0.php" hash="21cd9fd3436ba1eb2fc20eaaadb42106"/><file name="mysql4-upgrade-0.1.0-0.1.2.php" hash="5bbcb930748e3a87a220c0e9f8448a15"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="Payson.xml" hash="1ace2a646cd9a33521e7b392b6c5f3f1"/></dir><dir name="template"><dir name="Payson"><dir name="Payson"><file name="total.phtml" hash="73984e3bd27f5cd1d67550471e4e3da2"/></dir></dir></dir><dir name="Payson"><dir name="Payson"><file name="total.phtml" hash="e05160dad39cd2cbf86decc34fb8d225"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="Payson.xml" hash="22b9b9ae0cc9b1c70f79d690fbb4db41"/></dir><dir name="template"><dir name="Payson"><dir name="Payson"><file name="standard_form.phtml" hash="23c387ef94322de355e00f1a49e243d4"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Payson_Payson.xml" hash="63376624e94ec85487133c84cbe24334"/></dir></target><target name="magelocale"><dir name="sv_SE"><file name="Payson_Payson.csv" hash="26b83c864c7782dcb2a7946d3856b48d"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="Payson"><dir name="Payson"><file name="Allinone.png" hash="98f586ec9a3e706d86662796bd776685"/><file name="Allinone3.png" hash="f9a4240a702838136584dc1256104ce5"/><file name="payson.gif" hash="638d0055cbc1a4bdc32e9fa1156b722a"/><file name="payson.png" hash="308916345711a4520313c94218c5bda7"/><file name="payson_faktura.png" hash="fa218c9949c05c6f3452d9f4c541da2c"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies><required><php><min>5.3.0</min><max>6.0.0</max></php><package><name>Mage_Core_modules</name><channel>community</channel><min>1.8.0</min><max></max></package></required></dependencies>
|
18 |
</package>
|