Version Notes
Stable version, Second release
Download this release
Release Info
Developer | Paybox |
Extension | Paybox_epayment |
Version | 2.0.1 |
Comparing to | |
See all releases |
Code changes from version 2.0.0.3 to 2.0.1
app/code/community/Paybox/Epayment/Model/Payment/Abstract.php
CHANGED
@@ -789,11 +789,6 @@ abstract class Paybox_Epayment_Model_Payment_Abstract extends Mage_Payment_Model
|
|
789 |
// Status and message
|
790 |
$current = $order->getState();
|
791 |
$message = $this->__($message);
|
792 |
-
if (in_array($current, $allowedStates)) {
|
793 |
-
$order->setState($state, $status, $message);
|
794 |
-
} else {
|
795 |
-
$order->addStatusHistoryComment($message);
|
796 |
-
}
|
797 |
|
798 |
// Create transaction
|
799 |
$type = $withCapture ?
|
@@ -812,9 +807,18 @@ abstract class Paybox_Epayment_Model_Payment_Abstract extends Mage_Payment_Model
|
|
812 |
$payment->setPbxepCapture(serialize($data));
|
813 |
$this->_createInvoice($order, $txn);
|
814 |
}
|
815 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
816 |
$this->logDebug(sprintf('Order %s: %s', $order->getIncrementId(), $message));
|
817 |
|
|
|
|
|
818 |
// Client notification if needed
|
819 |
$order->sendNewOrderEmail();
|
820 |
}
|
789 |
// Status and message
|
790 |
$current = $order->getState();
|
791 |
$message = $this->__($message);
|
|
|
|
|
|
|
|
|
|
|
792 |
|
793 |
// Create transaction
|
794 |
$type = $withCapture ?
|
807 |
$payment->setPbxepCapture(serialize($data));
|
808 |
$this->_createInvoice($order, $txn);
|
809 |
}
|
810 |
+
|
811 |
+
// Set status
|
812 |
+
if (in_array($current, $allowedStates)) {
|
813 |
+
$order->setState($state, $status, $message);
|
814 |
+
$this->logDebug(sprintf('Order %s: Change status to %s', $order->getIncrementId(), $status));
|
815 |
+
} else {
|
816 |
+
$order->addStatusHistoryComment($message);
|
817 |
+
}
|
818 |
$this->logDebug(sprintf('Order %s: %s', $order->getIncrementId(), $message));
|
819 |
|
820 |
+
$order->save();
|
821 |
+
|
822 |
// Client notification if needed
|
823 |
$order->sendNewOrderEmail();
|
824 |
}
|
app/code/community/Paybox/Epayment/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Paybox_Epayment>
|
5 |
-
<version>2.0.
|
6 |
</Paybox_Epayment>
|
7 |
</modules>
|
8 |
<frontend>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Paybox_Epayment>
|
5 |
+
<version>2.0.1</version>
|
6 |
</Paybox_Epayment>
|
7 |
</modules>
|
8 |
<frontend>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Paybox_epayment</name>
|
4 |
-
<version>2.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
@@ -13,11 +13,11 @@ Une fonction de remboursement partiel ou total d’une commande.
|
|
13 |
Des outils anti-fraude à la carte : 3D Secure, Filtres sur nationalités Carte / IP, alerte paiements multiples.
|
14 |
La possibilité de prise de paiement par téléphone
|
15 |
Un accès Back Office Paybox avec des fonctions de reporting : suivi transactions temps réel et export de journaux d’encaissement</description>
|
16 |
-
<notes>Stable version</notes>
|
17 |
<authors><author><name>Paybox</name><user>paybox</user><email>magento@paybox.com</email></author></authors>
|
18 |
-
<date>2014-11-
|
19 |
-
<time>
|
20 |
-
<contents><target name="magecommunity"><dir name="Paybox"><dir name="Epayment"><dir name="Block"><dir name="Admin"><dir name="Field"><file name="Checkboxes.php" hash="f10a43c88ce173c1a81fc92ef295d01e"/><file name="Select.php" hash="47048afb9d19029bed51e128614bbab9"/></dir><file name="Info.php" hash="b3c111361975299f954637aa9fb61a42"/><dir name="Kwixo"><file name="Shipping.php" hash="26dbd51618d76aba0668a80e67c80024"/></dir><file name="Presentation.php" hash="749f2cc04ed63c456ffdc1f2d10c6097"/></dir><dir name="Checkout"><file name="Payment.php" hash="099e835531c95a8cd07996a7b8c7cd39"/></dir><file name="Info.php" hash="1595639a592fdeff77362da834d6ae55"/><file name="Redirect.php" hash="456be09c18292eb5b7dfdf861d8eb30f"/></dir><dir name="Helper"><file name="Data.php" hash="63aee310d956379973b0f6873bef95d7"/><file name="Mobile.php" hash="ed502b97b0798bdd72b045efa9ff6c64"/></dir><dir name="Model"><dir name="Admin"><dir name="Cards"><file name="Abstract.php" hash="0dd5c4d19e85e704c215850817b7868c"/><file name="Cb.php" hash="40ee3c428b9a3287b46f349c19a09384"/><file name="Financial.php" hash="1842828d4dbf9d105bbef6ce34c6762a"/><file name="Paybuttons.php" hash="c0cac798dd7f116c78237782de7fb5ba"/><file name="Prepaid.php" hash="c3b16410c3226c778ed98aad41846371"/><file name="Private.php" hash="478a27fa055fad28ae8d8dcbb0414105"/><file name="Threetime.php" hash="9832b41bb7728e536ab39da54d81ce52"/></dir><file name="Environment.php" hash="fb16443891a22661f43576cdbc4d6793"/><dir name="Fianet"><file name="Categories.php" hash="67910c9587cd14a31c8f7b5698057786"/><file name="DeliverySpeeds.php" hash="96e7cf8ad7f90efcd7c9f7afd695d779"/><file name="ShippingTypes.php" hash="88eef7865f4296bb424f821f2f06ddf7"/></dir><dir name="Order"><dir name="Status"><file name="Autocapture.php" hash="cd5501b431651e3cedd62c98baa2f255"/><file name="Canceled.php" hash="a82ebe85febab87dd6b5b7f73a0983e7"/><file name="Holded.php" hash="369b3baa50b8eccaf4158feca1a74f4e"/><file name="New.php" hash="26595474b91e26ab611475e9652f7017"/><file name="Pending.php" hash="898905e3d6e756de151dad29451e80d0"/><file name="Pendingpayment.php" hash="ae889edbbbad44078ebc1cd2944271d6"/><file name="Processing.php" hash="d3b4baf5eac6f131db0dc07ed70ffc07"/></dir></dir><dir name="Payment"><file name="Action.php" hash="618fb1d04f4085ddf1e466e40a138e1d"/><file name="Actionpaypal.php" hash="17a0b172218b60902f956ae6ac00248c"/><file name="Delays.php" hash="38151dc35efee312bad036862912cb32"/><file name="Same.php" hash="0f1737a05d5431ab1f4dd3d9146c2514"/><file name="Use3ds.php" hash="9b02555cbce8f70c779224fb73722a1b"/></dir><file name="Subscription.php" hash="fc9d80675690c7a69748178bf3aa8072"/></dir><file name="Config.php" hash="863768ce4610cd7fd54a41a3b865dd72"/><file name="Context.php" hash="0a25db2efb1e508d217371f757ce3698"/><file name="Iso4217Currency.php" hash="56df63960effa512f2ebcfe4f6f4f88f"/><file name="Kwixo.php" hash="b0a55d50f0fb4ac016a9e9949a496bb2"/><dir name="Observer"><file name="AdminCreateOrder.php" hash="80d7d9fa006b836a7545c978d698e24a"/></dir><file name="Observer.php" hash="6171bf08addbf7999bff9e34a8013def"/><file name="Paybox.php" hash="5f743d36c320dae3424cf70b51bc5ff1"/><dir name="Payment"><file name="Abstract.php" hash="
|
21 |
<compatible/>
|
22 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>openssl</name><min></min><max></max></extension></required></dependencies>
|
23 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Paybox_epayment</name>
|
4 |
+
<version>2.0.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL 3.0)</license>
|
7 |
<channel>community</channel>
|
13 |
Des outils anti-fraude à la carte : 3D Secure, Filtres sur nationalités Carte / IP, alerte paiements multiples.
|
14 |
La possibilité de prise de paiement par téléphone
|
15 |
Un accès Back Office Paybox avec des fonctions de reporting : suivi transactions temps réel et export de journaux d’encaissement</description>
|
16 |
+
<notes>Stable version, Second release</notes>
|
17 |
<authors><author><name>Paybox</name><user>paybox</user><email>magento@paybox.com</email></author></authors>
|
18 |
+
<date>2014-11-26</date>
|
19 |
+
<time>11:14:45</time>
|
20 |
+
<contents><target name="magecommunity"><dir name="Paybox"><dir name="Epayment"><dir name="Block"><dir name="Admin"><dir name="Field"><file name="Checkboxes.php" hash="f10a43c88ce173c1a81fc92ef295d01e"/><file name="Select.php" hash="47048afb9d19029bed51e128614bbab9"/></dir><file name="Info.php" hash="b3c111361975299f954637aa9fb61a42"/><dir name="Kwixo"><file name="Shipping.php" hash="26dbd51618d76aba0668a80e67c80024"/></dir><file name="Presentation.php" hash="749f2cc04ed63c456ffdc1f2d10c6097"/></dir><dir name="Checkout"><file name="Payment.php" hash="099e835531c95a8cd07996a7b8c7cd39"/></dir><file name="Info.php" hash="1595639a592fdeff77362da834d6ae55"/><file name="Redirect.php" hash="456be09c18292eb5b7dfdf861d8eb30f"/></dir><dir name="Helper"><file name="Data.php" hash="63aee310d956379973b0f6873bef95d7"/><file name="Mobile.php" hash="ed502b97b0798bdd72b045efa9ff6c64"/></dir><dir name="Model"><dir name="Admin"><dir name="Cards"><file name="Abstract.php" hash="0dd5c4d19e85e704c215850817b7868c"/><file name="Cb.php" hash="40ee3c428b9a3287b46f349c19a09384"/><file name="Financial.php" hash="1842828d4dbf9d105bbef6ce34c6762a"/><file name="Paybuttons.php" hash="c0cac798dd7f116c78237782de7fb5ba"/><file name="Prepaid.php" hash="c3b16410c3226c778ed98aad41846371"/><file name="Private.php" hash="478a27fa055fad28ae8d8dcbb0414105"/><file name="Threetime.php" hash="9832b41bb7728e536ab39da54d81ce52"/></dir><file name="Environment.php" hash="fb16443891a22661f43576cdbc4d6793"/><dir name="Fianet"><file name="Categories.php" hash="67910c9587cd14a31c8f7b5698057786"/><file name="DeliverySpeeds.php" hash="96e7cf8ad7f90efcd7c9f7afd695d779"/><file name="ShippingTypes.php" hash="88eef7865f4296bb424f821f2f06ddf7"/></dir><dir name="Order"><dir name="Status"><file name="Autocapture.php" hash="cd5501b431651e3cedd62c98baa2f255"/><file name="Canceled.php" hash="a82ebe85febab87dd6b5b7f73a0983e7"/><file name="Holded.php" hash="369b3baa50b8eccaf4158feca1a74f4e"/><file name="New.php" hash="26595474b91e26ab611475e9652f7017"/><file name="Pending.php" hash="898905e3d6e756de151dad29451e80d0"/><file name="Pendingpayment.php" hash="ae889edbbbad44078ebc1cd2944271d6"/><file name="Processing.php" hash="d3b4baf5eac6f131db0dc07ed70ffc07"/></dir></dir><dir name="Payment"><file name="Action.php" hash="618fb1d04f4085ddf1e466e40a138e1d"/><file name="Actionpaypal.php" hash="17a0b172218b60902f956ae6ac00248c"/><file name="Delays.php" hash="38151dc35efee312bad036862912cb32"/><file name="Same.php" hash="0f1737a05d5431ab1f4dd3d9146c2514"/><file name="Use3ds.php" hash="9b02555cbce8f70c779224fb73722a1b"/></dir><file name="Subscription.php" hash="fc9d80675690c7a69748178bf3aa8072"/></dir><file name="Config.php" hash="863768ce4610cd7fd54a41a3b865dd72"/><file name="Context.php" hash="0a25db2efb1e508d217371f757ce3698"/><file name="Iso4217Currency.php" hash="56df63960effa512f2ebcfe4f6f4f88f"/><file name="Kwixo.php" hash="b0a55d50f0fb4ac016a9e9949a496bb2"/><dir name="Observer"><file name="AdminCreateOrder.php" hash="80d7d9fa006b836a7545c978d698e24a"/></dir><file name="Observer.php" hash="6171bf08addbf7999bff9e34a8013def"/><file name="Paybox.php" hash="5f743d36c320dae3424cf70b51bc5ff1"/><dir name="Payment"><file name="Abstract.php" hash="12959f7b091b620db946e17ab2e08a62"/><file name="Bcmc.php" hash="19f45f87cbe5fff394d0354e8af1191b"/><file name="Cb.php" hash="73edf4938a64722fe3ecbc43bfcff230"/><file name="Financial.php" hash="c1902902df246faa3e97a27ac3c1b3af"/><dir name="Kwixo"><file name="Credit.php" hash="b9d759bcebfbe61751cda45ae1c1443b"/><file name="Onexrnp.php" hash="abc51c0459bf1c08c9230ab261aebe5e"/><file name="Standard.php" hash="76f24bc9223646c8be8de7750ce7d603"/></dir><file name="Maestro.php" hash="be7cc8cac0002e15c320b8dac77b3893"/><file name="Paybuttons.php" hash="9f3c102def1dabc10d8ebcdc77ab1489"/><file name="Paypal.php" hash="5e00be9ff34a323f3742d01f8da5aaad"/><file name="Prepaid.php" hash="82b2be70957d9d1664d8a47cb0befa32"/><file name="Private.php" hash="d0421a3ecf113f49800ff79bd23c4334"/><file name="Threetime.php" hash="c389c6292aa726fefd970e161188b62d"/></dir><dir name="Resource"><file name="Setup.php" hash="2f210fe03445e185e2044f62f6fb9f7b"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="PbxepController.php" hash="e81b789b06d6c6fc490cf59d36b5806c"/></dir><file name="PaymentController.php" hash="f52d1090e7ce09fe8231906d766727b0"/></dir><dir name="etc"><file name="adminhtml.xml" hash="479ca80d7b7b7e649e000b25c5b0f9ed"/><file name="config.xml" hash="36a8c74ed58d6b1738d0b6e038aa2490"/><file name="pubkey.pem" hash="d534e7a4f811f41497b614d0e83979a4"/><file name="system.xml" hash="dae2e4648274b5d8937f28e47379ee7f"/></dir><dir name="sql"><dir name="pbxep_setup"><file name="mysql4-install-0.1.0.php" hash="e115180663f53e53f777a1f21e5b63d0"/><file name="mysql4-upgrade-0.1.0-0.3.0.php" hash="164d76bf68c900e751086e6efa76ac7e"/><file name="mysql4-upgrade-0.8.3.3-0.8.4.php" hash="3e4f6e85b212f768427f9cf4ae6b4ecb"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="pbxep.xml" hash="d36bae8489b1f81a932bfadd93d59c5e"/></dir><dir name="template"><dir name="pbxep"><dir name="info"><file name="default.phtml" hash="1a3e9f8f9b5a04d2e0f8201493700d50"/></dir><dir name="presentation"><file name="en.phtml" hash="b7b1e314614cf326c6e2b6eba1540682"/><file name="fr.phtml" hash="b7392fc37b393166115db01bb3f1d62f"/></dir></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="pbxep.xml" hash="d70470f6bca63a5b9706a494340cb717"/></dir><dir name="template"><dir name="pbxep"><file name="checkout-payment.phtml" hash="a694f4686f13d1a8da79a63d5ac363fb"/><dir name="info"><file name="default.phtml" hash="5ae6adf25f30e161936fcf2dbc20bafb"/></dir><file name="redirect.phtml" hash="15e16ea3d91f2b851ce977250b99fe96"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Paybox_Epayment.xml" hash="d7b945fe6506ead3570a06979580a12e"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="images"><dir name="pbxep"><file name="1euro.45.png" hash="e3b636313158afb8c2f9af5f428be779"/><file name="amex.45.png" hash="ea2ab18feb39ffddd2bff4335d1c258a"/><file name="aurore.45.png" hash="69008cca86472e625a085594251a6cf2"/><file name="bcmc.45.png" hash="d6d01eea67100cf157557f2174cc68c4"/><file name="buyster.45.png" hash="544917376c4743bdef5a9daa2401d2a7"/><file name="cashticket.45.png" hash="460882095aae2fd81c4151b1259421f0"/><file name="cb.45.png" hash="3e3b08f1c078cbf1103ceb097a526a4f"/><file name="cofinoga.45.png" hash="fe526fe56555a860937d6b4813fdcde6"/><file name="diners.45.png" hash="af58b260b52260e64f184a72d73dd3d3"/><file name="ecartebleue.45.png" hash="96a42041c74aa41d0d6dabe25065d9cc"/><file name="ideal.45.png" hash="affbc207d2588593aa641713d618c8d8"/><file name="jcb.45.png" hash="d4ef8e26b0f1dd216992fc5ae9838dbf"/><file name="kadeos.45.png" hash="d97a5d875efbaa4ce076088cab51195d"/><file name="leetchi.45.png" hash="a0bfae2c382aa5a5a65c6fe5b4a7e26b"/><file name="maestro.png" hash="83dfc84b3600447999eae742dfcb3fdb"/><file name="mastercard.45.png" hash="9061669d6bd53da477d7e9cffd9bc546"/><file name="paybutting.45.png" hash="e108629fd76ba2ba6e830530197a9022"/><file name="paypal.45.png" hash="9245237b802bb7d6b8ce8e085a2dd7aa"/><file name="paysafecard.45.png" hash="63c48cbde81ee1b0aa73fa90ceba7695"/><file name="visa.45.png" hash="05b965f45c9b207582efdb04553b58ee"/><file name="wexpay.45.png" hash="ef1ecbd23625784f9292bec537c76e52"/></dir></dir><dir name="css"><dir name="pbxep"><file name="styles.css" hash="317c1a8247b0696c22adbfacaa860f02"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="paybox"><file name="1euro.45.png" hash="e3b636313158afb8c2f9af5f428be779"/><file name="amex.45.png" hash="ea2ab18feb39ffddd2bff4335d1c258a"/><file name="aurore.45.png" hash="69008cca86472e625a085594251a6cf2"/><file name="bcmc.45.png" hash="d6d01eea67100cf157557f2174cc68c4"/><file name="buyster.45.png" hash="544917376c4743bdef5a9daa2401d2a7"/><file name="cashticket.45.png" hash="460882095aae2fd81c4151b1259421f0"/><file name="cb.45.png" hash="3e3b08f1c078cbf1103ceb097a526a4f"/><file name="checkmark-blue.png" hash="373a777f58c70b502f372c5d5f9fdaa4"/><file name="checkmark.gif" hash="d59def45c447c149eec190e24d7bbc19"/><file name="cofinoga.45.png" hash="fe526fe56555a860937d6b4813fdcde6"/><file name="diners.45.png" hash="af58b260b52260e64f184a72d73dd3d3"/><file name="ecartebleue.45.png" hash="96a42041c74aa41d0d6dabe25065d9cc"/><file name="ideal.45.png" hash="affbc207d2588593aa641713d618c8d8"/><file name="jcb.45.png" hash="d4ef8e26b0f1dd216992fc5ae9838dbf"/><file name="kadeos.45.png" hash="d97a5d875efbaa4ce076088cab51195d"/><file name="leetchi.45.png" hash="a0bfae2c382aa5a5a65c6fe5b4a7e26b"/><file name="maestro.png" hash="83dfc84b3600447999eae742dfcb3fdb"/><file name="mastercard.45.png" hash="9061669d6bd53da477d7e9cffd9bc546"/><file name="multicanal.png" hash="9e5e255d1104b4041dee47010a109597"/><file name="paybox-lg.png" hash="7a817215b8ce0bd83e0645425a2e7d6c"/><file name="paybutting.45.png" hash="e108629fd76ba2ba6e830530197a9022"/><file name="paypal.45.png" hash="9245237b802bb7d6b8ce8e085a2dd7aa"/><file name="paysafecard.45.png" hash="63c48cbde81ee1b0aa73fa90ceba7695"/><file name="visa.45.png" hash="3bdae7643b5eea3bc6f9f23b2caafde7"/><file name="wexpay.45.png" hash="ef1ecbd23625784f9292bec537c76e52"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Paybox_Epayment.csv" hash="e36141694279ba224df3c3a7c4175eaa"/></dir></target></contents>
|
21 |
<compatible/>
|
22 |
<dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php><extension><name>openssl</name><min></min><max></max></extension></required></dependencies>
|
23 |
</package>
|