Version Notes
Payline payment module
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Payline |
| Version | 1.7.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.7.0 to 1.7.1
app/code/community/Monext/Payline/Model/Datasource/Status.php
CHANGED
|
@@ -3,16 +3,26 @@ class Monext_Payline_Model_Datasource_Status extends Mage_Adminhtml_Model_System
|
|
| 3 |
{
|
| 4 |
public function toOptionArray()
|
| 5 |
{
|
| 6 |
-
$collection = Mage::getResourceModel('sales/order_status_collection')
|
| 7 |
-
->orderByLabel();
|
| 8 |
-
|
| 9 |
$options = array();
|
| 10 |
-
|
| 11 |
-
$
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 15 |
}
|
|
|
|
| 16 |
return $options;
|
| 17 |
}
|
| 18 |
}
|
| 3 |
{
|
| 4 |
public function toOptionArray()
|
| 5 |
{
|
|
|
|
|
|
|
|
|
|
| 6 |
$options = array();
|
| 7 |
+
if (class_exists('Mage_Sales_Model_Mysql4_Order_Status_Collection')) {
|
| 8 |
+
$collection = Mage::getResourceModel('sales/order_status_collection')
|
| 9 |
+
->orderByLabel();
|
| 10 |
+
foreach ($collection as $status) {
|
| 11 |
+
$options[] = array(
|
| 12 |
+
'value' => $status->getStatus(),
|
| 13 |
+
'label' => $status->getStoreLabel()
|
| 14 |
+
);
|
| 15 |
+
}
|
| 16 |
+
} else {
|
| 17 |
+
$statuses = Mage::getSingleton('sales/order_config')->getStatuses();
|
| 18 |
+
foreach ($statuses as $code=>$label) {
|
| 19 |
+
$options[] = array(
|
| 20 |
+
'value' => $code,
|
| 21 |
+
'label' => $label
|
| 22 |
+
);
|
| 23 |
+
}
|
| 24 |
}
|
| 25 |
+
|
| 26 |
return $options;
|
| 27 |
}
|
| 28 |
}
|
app/code/community/Monext/Payline/Model/Datasource/Status/Invoice.php
CHANGED
|
@@ -3,24 +3,34 @@ class Monext_Payline_Model_Datasource_Status_Invoice extends Monext_Payline_Mode
|
|
| 3 |
{
|
| 4 |
public function toOptionArray()
|
| 5 |
{
|
| 6 |
-
$collection = Mage::getResourceModel('sales/order_status_collection')
|
| 7 |
-
->orderByLabel();
|
| 8 |
-
|
| 9 |
$options = array();
|
| 10 |
$options[] = array(
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
$options[] = array(
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
$
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
}
|
|
|
|
| 24 |
return $options;
|
| 25 |
}
|
| 26 |
}
|
| 3 |
{
|
| 4 |
public function toOptionArray()
|
| 5 |
{
|
|
|
|
|
|
|
|
|
|
| 6 |
$options = array();
|
| 7 |
$options[] = array(
|
| 8 |
+
'value' => '',
|
| 9 |
+
'label' => Mage::helper('adminhtml')->__('No')
|
| 10 |
+
);
|
| 11 |
$options[] = array(
|
| 12 |
+
'value' => 'return',
|
| 13 |
+
'label' => Mage::helper('payline')->__('Back to the shop')
|
| 14 |
+
);
|
| 15 |
+
if (class_exists('Mage_Sales_Model_Mysql4_Order_Status_Collection')) {
|
| 16 |
+
$collection = Mage::getResourceModel('sales/order_status_collection')
|
| 17 |
+
->orderByLabel();
|
| 18 |
+
foreach ($collection as $status) {
|
| 19 |
+
$options[] = array(
|
| 20 |
+
'value' => $status->getStatus(),
|
| 21 |
+
'label' => Mage::helper('payline')->__("When order status is '%s'", $status->getStoreLabel())
|
| 22 |
+
);
|
| 23 |
+
}
|
| 24 |
+
} else {
|
| 25 |
+
$statuses = Mage::getSingleton('sales/order_config')->getStatuses();
|
| 26 |
+
foreach ($statuses as $code=>$label) {
|
| 27 |
+
$options[] = array(
|
| 28 |
+
'value' => $code,
|
| 29 |
+
'label' => Mage::helper('payline')->__("When order status is '%s'", $label)
|
| 30 |
+
);
|
| 31 |
+
}
|
| 32 |
}
|
| 33 |
+
|
| 34 |
return $options;
|
| 35 |
}
|
| 36 |
}
|
app/code/community/Monext/Payline/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Monext_Payline>
|
| 5 |
-
<version>1.7.
|
| 6 |
</Monext_Payline>
|
| 7 |
</modules>
|
| 8 |
<global>
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Monext_Payline>
|
| 5 |
+
<version>1.7.1</version>
|
| 6 |
</Monext_Payline>
|
| 7 |
</modules>
|
| 8 |
<global>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Payline</name>
|
| 4 |
-
<version>1.7.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.gnu.org/licenses/gpl.html">GPL</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,9 +10,9 @@
|
|
| 10 |
<description>Payline payment module</description>
|
| 11 |
<notes>Payline payment module</notes>
|
| 12 |
<authors><author><name>Payline</name><user>auto-converted</user><email>support@payline.com</email></author></authors>
|
| 13 |
-
<date>2011-11-
|
| 14 |
-
<time>09:
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Monext"><dir name="Payline"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Create"><file name="Items.php" hash="c7cd82866d8788ff32d42df8fcdc11f8"/></dir></dir></dir></dir></dir><dir name="Wallet"><file name="Checkoutbtn.php" hash="bbd8b30f2a37e83ce295295f0fe10ebf"/><file name="Details.php" hash="03cb96bd76d2265b842677b2a6825303"/><file name="Infos.php" hash="15d4731c490b2dcbc3f7b480608e9b1b"/><file name="Sidebar.php" hash="db70b60be9aa20316f91b3fa3a23a2b9"/></dir><file name="Cpt.php" hash="55e5f2694e4e1add1300af89212169f7"/><file name="Direct.php" hash="be03615ab78463ece680fc659eb5964d"/><file name="Logo.php" hash="2b7784f040f04489448fbc13b05ffe74"/><file name="Nx.php" hash="479431a721018d6277f22c4b8fb3ec5e"/><file name="Wallet.php" hash="6326c9e76c84777597f30a89d718ccb4"/></dir><dir name="Helper"><file name="Data.php" hash="2ef082b0443dac52dd3d3acdeb9293fa"/><file name="Logger.php" hash="6b7cf036fdf2e6df2cb7fa645c8912b9"/></dir><dir name="Model"><dir name="Datasource"><dir name="Cms"><file name="Block.php" hash="eee43f517c9e29e51f0ca21fdc7b74ed"/></dir><dir name="Status"><file name="Canceled.php" hash="c4e799efcb052536081339520c7b72c2"/><file name="Invoice.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Payline</name>
|
| 4 |
+
<version>1.7.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.gnu.org/licenses/gpl.html">GPL</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description>Payline payment module</description>
|
| 11 |
<notes>Payline payment module</notes>
|
| 12 |
<authors><author><name>Payline</name><user>auto-converted</user><email>support@payline.com</email></author></authors>
|
| 13 |
+
<date>2011-11-17</date>
|
| 14 |
+
<time>09:45:42</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Monext"><dir name="Payline"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Creditmemo"><dir name="Create"><file name="Items.php" hash="c7cd82866d8788ff32d42df8fcdc11f8"/></dir></dir></dir></dir></dir><dir name="Wallet"><file name="Checkoutbtn.php" hash="bbd8b30f2a37e83ce295295f0fe10ebf"/><file name="Details.php" hash="03cb96bd76d2265b842677b2a6825303"/><file name="Infos.php" hash="15d4731c490b2dcbc3f7b480608e9b1b"/><file name="Sidebar.php" hash="db70b60be9aa20316f91b3fa3a23a2b9"/></dir><file name="Cpt.php" hash="55e5f2694e4e1add1300af89212169f7"/><file name="Direct.php" hash="be03615ab78463ece680fc659eb5964d"/><file name="Logo.php" hash="2b7784f040f04489448fbc13b05ffe74"/><file name="Nx.php" hash="479431a721018d6277f22c4b8fb3ec5e"/><file name="Wallet.php" hash="6326c9e76c84777597f30a89d718ccb4"/></dir><dir name="Helper"><file name="Data.php" hash="2ef082b0443dac52dd3d3acdeb9293fa"/><file name="Logger.php" hash="6b7cf036fdf2e6df2cb7fa645c8912b9"/></dir><dir name="Model"><dir name="Datasource"><dir name="Cms"><file name="Block.php" hash="eee43f517c9e29e51f0ca21fdc7b74ed"/></dir><dir name="Status"><file name="Canceled.php" hash="c4e799efcb052536081339520c7b72c2"/><file name="Invoice.php" hash="b2cbeeaf4e78ec4545f6d45faba1922e"/></dir><file name="Actions.php" hash="2152344a8bd5fbf7dbe711c58f97356c"/><file name="Billingcycles.php" hash="bef244e6d9e744fbbc3afed9cc2050f9"/><file name="Billingoccurrences.php" hash="581ce23ec626ed71791b13c7b11fe6db"/><file name="Languages.php" hash="17053eec4880c5c5b1f233a3ca9f0bda"/><file name="Paymentactions.php" hash="6c4aae3b1b4e8b987a4da7393a3a92eb"/><file name="Securitymodes.php" hash="06c55b65e9254d96fa87595322839932"/><file name="Shippingmethods.php" hash="1c67f2af87583aae049c86cb4dcdf881"/><file name="Status.php" hash="893648bdaa413d2ec2e5243a2f63c9d8"/></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><file name="Setup.php" hash="f0cb886cd65e23ec397e651d7913ea9e"/></dir></dir></dir><file name="Cpt.php" hash="bc6c3f2a9c3f55452063ee6f7a82a14a"/><file name="Direct.php" hash="62f150ab9a341082ad11d1b126865a71"/><file name="Nx.php" hash="830433cc06e92665fd554fe0030070f0"/><file name="Observer.php" hash="0ca1531ad04b0f7d209a2348ddd2ccf4"/><file name="Wallet.php" hash="f552d7cca1212db1783dbcabd9353c3a"/></dir><dir name="PaylinePHPKit"><dir name="lib"><file name="jIniFileModifier.php" hash="f7d309bd1fb8f408528151b0555b188c"/><file name="lib_debug.php" hash="572a30ad44bd705a74c7cb9de9b1462a"/><file name="paylineSDK.php" hash="91062fcf49736a4aad7e9acf151d270d"/></dir><dir name="properties"><file name="HighDefinition.ini" hash="fa70219492ec012793a63be58d8d294c"/></dir><dir name="wsdl"><dir name="homologation"><file name="DirectPaymentAPI.wsdl" hash="9550f258f07085dd15aecb20b124cff8"/><file name="ExtendedAPI.wsdl" hash="237feb926bb6639e077c55eb398687c5"/><file name="WebPaymentAPI.wsdl" hash="43b5d744cf5fed566896f5c1f3a29ee7"/></dir><dir name="homologationHD"><file name="DirectPaymentAPI.wsdl" hash="9550f258f07085dd15aecb20b124cff8"/><file name="ExtendedAPI.wsdl" hash="237feb926bb6639e077c55eb398687c5"/><file name="WebPaymentAPI.wsdl" hash="43b5d744cf5fed566896f5c1f3a29ee7"/></dir><dir name="production"><file name="DirectPaymentAPI.wsdl" hash="cc211c23155f62f4c0cf8793309d7797"/><file name="ExtendedAPI.wsdl" hash="a5fc94375c5b462c477c867fa1325609"/><file name="WebPaymentAPI.wsdl" hash="a12edbdec8cd90679f2c993dfe950dc7"/></dir><dir name="productionHD"><file name="DirectPaymentAPI.wsdl" hash="cc211c23155f62f4c0cf8793309d7797"/><file name="ExtendedAPI.wsdl" hash="a5fc94375c5b462c477c867fa1325609"/><file name="WebPaymentAPI.wsdl" hash="a12edbdec8cd90679f2c993dfe950dc7"/></dir></dir></dir><dir name="controllers"><file name="CheckoutonepageController.php" hash="840c6e7c3fdf7980cbff81cdc4e26663"/><file name="IndexController.php" hash="7d13db079c792d497e7ba8ceaded4873"/><file name="UnloggedwalletController.php" hash="43e1b7166dc690b322bf41bf119bf8df"/><file name="WalletController.php" hash="3f93e0867db62f5fa6557e24cb2ac615"/></dir><dir name="etc"><file name="config.xml" hash="69e60436bf04be97081ea04537b3d23d"/><file name="system.xml" hash="563e7013e9592c5474546dd73d88a7ac"/></dir><dir name="sql"><dir name="payline_setup"><file name="mysql4-install-1.6.0.php" hash="ed5013f743ba36a7b2884fc432f97e16"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="payline.xml" hash="83a061dd99daa4e48c4411ea8ea28391"/></dir><dir name="template"><dir name="payline"><dir name="checkout"><dir name="onepage"><file name="shipping-method.phtml" hash="a81a9f308f15008842bfd9ba69852aa9"/></dir><file name="onepage.phtml" hash="d67f280df532ee03826fa8e7e0b991a6"/></dir><dir name="page"><file name="empty.phtml" hash="02134361869217c7445f46af028a050a"/></dir><dir name="wallet"><dir name="sidebar"><file name="form.phtml" hash="b7662b515f5195faada2736cf38b01aa"/><file name="notlogged.phtml" hash="169ccfe11034a47c74a9a78e0eac6046"/></dir><file name="checkoutbtn.phtml" hash="612617f342e05a34f6a2a618e3bf9162"/><file name="details.phtml" hash="b8d7e336b994261f66f1a9af5841661e"/><file name="form.phtml" hash="7358f21e31266c65982afb15239e659f"/><file name="manage.phtml" hash="994c98abd9b4f2f68f76eefe20c637d1"/><file name="sidebar.phtml" hash="2113b8dba864cd94b241dc7ecd6dff0a"/><file name="subscribe.phtml" hash="a737e95240e262e91ec01a02e2ce97a2"/><file name="update.phtml" hash="1b7048c9a839b0b0994beaf5e72b755c"/></dir><file name="Direct.phtml" hash="b731469e615d30fa604f143822eaa8ad"/><file name="Payline.phtml" hash="dc264172e5a6c5ae627b697208dff65d"/><file name="iframe.phtml" hash="255f2ad6c09019f7e403cff3aadb9c72"/><file name="iframeleaver.phtml" hash="b617751653aa68ada738385a3959e863"/><file name="logo.phtml" hash="c22e80c9afabaaec0a7e936b15f8a219"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Monext_Payline.xml" hash="59980c5c4127dc2a7ca46a894efeb94f"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Monext_Payline.csv" hash="9c542c5c27fe4f9d46b8fd9efeb7101b"/></dir><dir name="fr_FR"><file name="Monext_Payline.csv" hash="01fa40595bf7928ce1da5f48b326b839"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="css"><file name="payline.css" hash="47c71ad9397c496e7f54c77411c7e421"/></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
