Version Notes
Changelog:
2.0.5:
- Fixe bug with complete state order
2.0.4:
- Add cancel status in the configuration
2.0.3:
- Bug fixed with multishipping
2.0.2:
- Some fields in the configuration of the module are now configurable in store view
- The field "empty cart" was added
2.0.1:
- Stable version
2.0.0:
- Magento 1.5 compatibility
- Multishipping compatibility
- Bug fixed with magento 1.4
- Beta version
Download this release
Release Info
| Developer | Quadra Informatique |
| Extension | Quadra_Cybermut |
| Version | 2.0.5 |
| Comparing to | |
| See all releases | |
Code changes from version 2.0.4 to 2.0.5
- app/code/community/Quadra/Cybermut/Block/Error.php +2 -2
- app/code/community/Quadra/Cybermut/Block/Form.php +2 -2
- app/code/community/Quadra/Cybermut/Block/Redirect.php +2 -2
- app/code/community/Quadra/Cybermut/Helper/Data.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Api/Debug.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Config/Data/Cybermut.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Mysql4/Api/Debug.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Mysql4/Api/Debug/Collection.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Mysql4/Setup.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Observer.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Payment.php +7 -2
- app/code/community/Quadra/Cybermut/Model/Source/Bank.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Source/Language.php +2 -2
- app/code/community/Quadra/Cybermut/Model/Source/Terms.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Backend/Keyencrypted.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Accepted.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Canceled.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/New.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Refused.php +2 -2
- app/code/community/Quadra/Cybermut/Model/System/Config/Source/Version.php +2 -2
- app/code/community/Quadra/Cybermut/controllers/PaymentController.php +48 -75
- app/code/community/Quadra/Cybermut/etc/config.xml +3 -3
- app/code/community/Quadra/Cybermut/etc/system.xml +2 -2
- app/code/community/Quadra/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php +2 -2
- app/code/community/Quadra/Cybermut/sql/cybermut_setup/mysql4-upgrade-1.0.1-1.0.2.php +2 -2
- app/design/frontend/default/default/layout/cybermut.xml +2 -2
- app/design/frontend/default/default/template/cybermut/error.phtml +2 -2
- app/design/frontend/default/default/template/cybermut/form.phtml +2 -2
- app/etc/modules/Quadra_Cybermut.xml +2 -2
- package.xml +9 -6
app/code/community/Quadra/Cybermut/Block/Error.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Block/Form.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Block/Redirect.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Helper/Data.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Api/Debug.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Config/Data/Cybermut.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Mysql4/Api/Debug.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Mysql4/Api/Debug/Collection.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Mysql4/Setup.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Observer.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Payment.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
|
@@ -278,6 +278,11 @@ class Quadra_Cybermut_Model_Payment extends Mage_Payment_Model_Method_Abstract
|
|
| 278 |
$terms['montantech1'] = $amount-$result;
|
| 279 |
}
|
| 280 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 281 |
$fields = array_merge($fields, $terms);
|
| 282 |
}
|
| 283 |
}
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 278 |
$terms['montantech1'] = $amount-$result;
|
| 279 |
}
|
| 280 |
|
| 281 |
+
$order = $this->getOrder();
|
| 282 |
+
for ($i=1; $i<$nbTerms+1; $i++) {
|
| 283 |
+
$terms['montantech'.$i] = sprintf('%.2f', $terms['montantech'.$i]) . $order->getBaseCurrencyCode();
|
| 284 |
+
}
|
| 285 |
+
|
| 286 |
$fields = array_merge($fields, $terms);
|
| 287 |
}
|
| 288 |
}
|
app/code/community/Quadra/Cybermut/Model/Source/Bank.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Source/Language.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/Source/Terms.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Backend/Keyencrypted.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Accepted.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Canceled.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/New.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Refused.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Version.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/controllers/PaymentController.php
CHANGED
|
@@ -1,4 +1,5 @@
|
|
| 1 |
<?php
|
|
|
|
| 2 |
/*
|
| 3 |
* 1997-2012 Quadra Informatique
|
| 4 |
*
|
|
@@ -10,13 +11,12 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 18 |
-
class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Action
|
| 19 |
-
{
|
| 20 |
|
| 21 |
protected $_cybermutResponse = null;
|
| 22 |
protected $_realOrderIds;
|
|
@@ -27,8 +27,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 27 |
*
|
| 28 |
* @return Mage_Sales_Model_Quote
|
| 29 |
*/
|
| 30 |
-
public function getQuote()
|
| 31 |
-
{
|
| 32 |
if (!$this->_quote) {
|
| 33 |
$session = Mage::getSingleton('checkout/session');
|
| 34 |
$this->_quote = Mage::getModel('sales/quote')->load($session->getCybermutPaymentQuoteId());
|
|
@@ -49,12 +48,11 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 49 |
*
|
| 50 |
* @return array
|
| 51 |
*/
|
| 52 |
-
public function getRealOrderIds()
|
| 53 |
-
{
|
| 54 |
if (!$this->_realOrderIds) {
|
| 55 |
if ($this->_cybermutResponse) {
|
| 56 |
$this->_realOrderIds = explode(',', $this->_cybermutResponse['reference']);
|
| 57 |
-
} elseif($realOrderIds = Mage::getSingleton('checkout/session')->getCybermutRealOrderIds()) {
|
| 58 |
$this->_realOrderIds = explode(',', $realOrderIds);
|
| 59 |
} else {
|
| 60 |
return array();
|
|
@@ -69,8 +67,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 69 |
* @param array $response
|
| 70 |
* @return object $this
|
| 71 |
*/
|
| 72 |
-
protected function setCybermutResponse($response)
|
| 73 |
-
{
|
| 74 |
if (count($response)) {
|
| 75 |
$this->_cybermutResponse = $response;
|
| 76 |
}
|
|
@@ -81,8 +78,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 81 |
* When a customer chooses Cybermut on Checkout/Payment page
|
| 82 |
*
|
| 83 |
*/
|
| 84 |
-
public function redirectAction()
|
| 85 |
-
{
|
| 86 |
$session = Mage::getSingleton('checkout/session');
|
| 87 |
$session->setCybermutPaymentQuoteId($session->getLastQuoteId());
|
| 88 |
|
|
@@ -104,16 +100,17 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 104 |
}
|
| 105 |
|
| 106 |
$order->addStatusToHistory(
|
| 107 |
-
$order->getStatus(),
|
|
|
|
| 108 |
);
|
| 109 |
$order->save();
|
| 110 |
}
|
| 111 |
|
| 112 |
$this->getResponse()
|
| 113 |
-
|
| 114 |
-
|
| 115 |
-
|
| 116 |
-
|
| 117 |
|
| 118 |
$session->unsQuoteId();
|
| 119 |
}
|
|
@@ -124,8 +121,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 124 |
* @param none
|
| 125 |
* @return void
|
| 126 |
*/
|
| 127 |
-
public function notifyAction()
|
| 128 |
-
{
|
| 129 |
$model = Mage::getModel('cybermut/payment');
|
| 130 |
|
| 131 |
if ($this->getRequest()->isPost()) {
|
|
@@ -171,53 +167,37 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 171 |
$status = $order->getStatus();
|
| 172 |
}
|
| 173 |
|
| 174 |
-
/* $order->addStatusToHistory(
|
| 175 |
-
$status,
|
| 176 |
-
$model->getSuccessfulPaymentMessage($postData),
|
| 177 |
-
true
|
| 178 |
-
);
|
| 179 |
-
|
| 180 |
-
if ($model->getConfigData('order_status_payment_accepted') == 'processing') {
|
| 181 |
-
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, false);
|
| 182 |
-
} */
|
| 183 |
-
|
| 184 |
$message = $model->getSuccessfulPaymentMessage($postData);
|
| 185 |
|
| 186 |
if ($status == Mage_Sales_Model_Order::STATE_PROCESSING) {
|
| 187 |
-
$
|
| 188 |
-
|
| 189 |
-
|
|
|
|
| 190 |
} else if ($status == Mage_Sales_Model_Order::STATE_COMPLETE) {
|
| 191 |
-
$
|
| 192 |
-
|
| 193 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 194 |
} else {
|
| 195 |
-
$
|
| 196 |
-
$
|
| 197 |
-
|
|
|
|
| 198 |
}
|
| 199 |
|
| 200 |
if (!$order->getEmailSent()) {
|
| 201 |
$order->sendNewOrderEmail();
|
| 202 |
}
|
| 203 |
|
| 204 |
-
if ($model->getConfigData('invoice_create')) {
|
| 205 |
-
$this->saveInvoice($order);
|
| 206 |
-
}
|
| 207 |
-
|
| 208 |
$order->save();
|
| 209 |
}
|
| 210 |
} else {
|
| 211 |
foreach ($this->getRealOrderIds() as $realOrderId) {
|
| 212 |
$order = Mage::getModel('sales/order')->loadByIncrementId($realOrderId);
|
| 213 |
-
/* $order->addStatusToHistory(
|
| 214 |
-
$model->getConfigData('order_status_payment_refused'),
|
| 215 |
-
$model->getRefusedPaymentMessage($postData)
|
| 216 |
-
);
|
| 217 |
-
|
| 218 |
-
if ($model->getConfigData('order_status_payment_refused') == Mage_Sales_Model_Order::STATE_CANCELED) {
|
| 219 |
-
$order->cancel();
|
| 220 |
-
} */
|
| 221 |
|
| 222 |
$messageError = $model->getRefusedPaymentMessage($postData);
|
| 223 |
|
|
@@ -230,7 +210,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 230 |
}
|
| 231 |
|
| 232 |
$order->addStatusToHistory(
|
| 233 |
-
|
| 234 |
);
|
| 235 |
|
| 236 |
if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
|
|
@@ -250,7 +230,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 250 |
foreach ($this->getRealOrderIds() as $realOrderId) {
|
| 251 |
$order = Mage::getModel('sales/order')->loadByIncrementId($realOrderId);
|
| 252 |
$order->addStatusToHistory(
|
| 253 |
-
|
| 254 |
);
|
| 255 |
if ($order->canCancel())
|
| 256 |
$order->cancel();
|
|
@@ -266,8 +246,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 266 |
* @param Mage_Sales_Model_Order $order
|
| 267 |
* @return boolean Can save invoice or not
|
| 268 |
*/
|
| 269 |
-
protected function saveInvoice(Mage_Sales_Model_Order $order)
|
| 270 |
-
{
|
| 271 |
if ($order->canInvoice()) {
|
| 272 |
|
| 273 |
$version = Mage::getVersion();
|
|
@@ -310,8 +289,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 310 |
* @param none
|
| 311 |
* @return void
|
| 312 |
*/
|
| 313 |
-
public function successAction()
|
| 314 |
-
{
|
| 315 |
$session = Mage::getSingleton('checkout/session');
|
| 316 |
$session->setQuoteId($session->getCybermutPaymentQuoteId());
|
| 317 |
$session->unsCybermutPaymentQuoteId();
|
|
@@ -331,7 +309,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 331 |
}
|
| 332 |
|
| 333 |
$order->addStatusToHistory(
|
| 334 |
-
|
| 335 |
);
|
| 336 |
|
| 337 |
$order->save();
|
|
@@ -342,9 +320,9 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 342 |
|
| 343 |
if ($this->getQuote()->getIsMultiShipping()) {
|
| 344 |
Mage::getSingleton('checkout/type_multishipping')
|
| 345 |
-
|
| 346 |
-
|
| 347 |
-
|
| 348 |
|
| 349 |
Mage::getSingleton('core/session')->setOrderIds($orderIds);
|
| 350 |
Mage::getSingleton('checkout/session')->setIsMultishipping(true);
|
|
@@ -359,8 +337,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 359 |
* @param none
|
| 360 |
* @return void
|
| 361 |
*/
|
| 362 |
-
public function errorAction()
|
| 363 |
-
{
|
| 364 |
$session = Mage::getSingleton('checkout/session');
|
| 365 |
$model = Mage::getModel('cybermut/payment');
|
| 366 |
|
|
@@ -391,7 +368,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 391 |
}
|
| 392 |
|
| 393 |
$order->addStatusToHistory(
|
| 394 |
-
|
| 395 |
);
|
| 396 |
|
| 397 |
if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
|
|
@@ -411,8 +388,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 411 |
$this->_redirect($this->_getErrorRedirect());
|
| 412 |
}
|
| 413 |
|
| 414 |
-
protected function _reorder()
|
| 415 |
-
{
|
| 416 |
$cart = Mage::getSingleton('checkout/cart');
|
| 417 |
$cartTruncated = false;
|
| 418 |
/* @var $cart Mage_Checkout_Model_Cart */
|
|
@@ -425,16 +401,14 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 425 |
foreach ($items as $item) {
|
| 426 |
try {
|
| 427 |
$cart->addOrderItem($item);
|
| 428 |
-
} catch (Mage_Core_Exception $e){
|
| 429 |
if (Mage::getSingleton('checkout/session')->getUseNotice(true)) {
|
| 430 |
Mage::getSingleton('checkout/session')->addNotice($e->getMessage());
|
| 431 |
-
}
|
| 432 |
-
else {
|
| 433 |
Mage::getSingleton('checkout/session')->addError($e->getMessage());
|
| 434 |
}
|
| 435 |
} catch (Exception $e) {
|
| 436 |
-
Mage::getSingleton('checkout/session')->addException($e,
|
| 437 |
-
Mage::helper('checkout')->__('Cannot add the item to shopping cart.')
|
| 438 |
);
|
| 439 |
}
|
| 440 |
}
|
|
@@ -444,20 +418,19 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
|
|
| 444 |
$cart->save();
|
| 445 |
}
|
| 446 |
|
| 447 |
-
protected function _getSuccessRedirect()
|
| 448 |
-
{
|
| 449 |
if ($this->getQuote()->getIsMultiShipping())
|
| 450 |
return 'checkout/multishipping/success';
|
| 451 |
else
|
| 452 |
return 'checkout/onepage/success';
|
| 453 |
}
|
| 454 |
|
| 455 |
-
protected function _getErrorRedirect()
|
| 456 |
-
{
|
| 457 |
if ($this->getQuote()->getIsMultiShipping()) {
|
| 458 |
return 'checkout/cart';
|
| 459 |
} else {
|
| 460 |
return 'checkout/onepage/failure';
|
| 461 |
}
|
| 462 |
}
|
|
|
|
| 463 |
}
|
| 1 |
<?php
|
| 2 |
+
|
| 3 |
/*
|
| 4 |
* 1997-2012 Quadra Informatique
|
| 5 |
*
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 15 |
+
* @version Release: $Revision: 2.0.5 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
|
| 19 |
+
class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Action {
|
|
|
|
| 20 |
|
| 21 |
protected $_cybermutResponse = null;
|
| 22 |
protected $_realOrderIds;
|
| 27 |
*
|
| 28 |
* @return Mage_Sales_Model_Quote
|
| 29 |
*/
|
| 30 |
+
public function getQuote() {
|
|
|
|
| 31 |
if (!$this->_quote) {
|
| 32 |
$session = Mage::getSingleton('checkout/session');
|
| 33 |
$this->_quote = Mage::getModel('sales/quote')->load($session->getCybermutPaymentQuoteId());
|
| 48 |
*
|
| 49 |
* @return array
|
| 50 |
*/
|
| 51 |
+
public function getRealOrderIds() {
|
|
|
|
| 52 |
if (!$this->_realOrderIds) {
|
| 53 |
if ($this->_cybermutResponse) {
|
| 54 |
$this->_realOrderIds = explode(',', $this->_cybermutResponse['reference']);
|
| 55 |
+
} elseif ($realOrderIds = Mage::getSingleton('checkout/session')->getCybermutRealOrderIds()) {
|
| 56 |
$this->_realOrderIds = explode(',', $realOrderIds);
|
| 57 |
} else {
|
| 58 |
return array();
|
| 67 |
* @param array $response
|
| 68 |
* @return object $this
|
| 69 |
*/
|
| 70 |
+
protected function setCybermutResponse($response) {
|
|
|
|
| 71 |
if (count($response)) {
|
| 72 |
$this->_cybermutResponse = $response;
|
| 73 |
}
|
| 78 |
* When a customer chooses Cybermut on Checkout/Payment page
|
| 79 |
*
|
| 80 |
*/
|
| 81 |
+
public function redirectAction() {
|
|
|
|
| 82 |
$session = Mage::getSingleton('checkout/session');
|
| 83 |
$session->setCybermutPaymentQuoteId($session->getLastQuoteId());
|
| 84 |
|
| 100 |
}
|
| 101 |
|
| 102 |
$order->addStatusToHistory(
|
| 103 |
+
$order->getStatus(),
|
| 104 |
+
Mage::helper('cybermut')->__('Customer was redirected to Cybermut')
|
| 105 |
);
|
| 106 |
$order->save();
|
| 107 |
}
|
| 108 |
|
| 109 |
$this->getResponse()
|
| 110 |
+
->setBody($this->getLayout()
|
| 111 |
+
->createBlock('cybermut/redirect')
|
| 112 |
+
->setOrder($order)
|
| 113 |
+
->toHtml());
|
| 114 |
|
| 115 |
$session->unsQuoteId();
|
| 116 |
}
|
| 121 |
* @param none
|
| 122 |
* @return void
|
| 123 |
*/
|
| 124 |
+
public function notifyAction() {
|
|
|
|
| 125 |
$model = Mage::getModel('cybermut/payment');
|
| 126 |
|
| 127 |
if ($this->getRequest()->isPost()) {
|
| 167 |
$status = $order->getStatus();
|
| 168 |
}
|
| 169 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 170 |
$message = $model->getSuccessfulPaymentMessage($postData);
|
| 171 |
|
| 172 |
if ($status == Mage_Sales_Model_Order::STATE_PROCESSING) {
|
| 173 |
+
if ($model->getConfigData('invoice_create')) {
|
| 174 |
+
$this->saveInvoice($order);
|
| 175 |
+
}
|
| 176 |
+
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, $status, $message);
|
| 177 |
} else if ($status == Mage_Sales_Model_Order::STATE_COMPLETE) {
|
| 178 |
+
$this->saveInvoice($order);
|
| 179 |
+
if($order->canShip()) {
|
| 180 |
+
$itemQty = $order->getItemsCollection()->count();
|
| 181 |
+
$shipment = Mage::getModel('sales/service_order', $order)->prepareShipment($itemQty);
|
| 182 |
+
$shipment = new Mage_Sales_Model_Order_Shipment_Api();
|
| 183 |
+
$shipment->create($order->getIncrementId());
|
| 184 |
+
}
|
| 185 |
} else {
|
| 186 |
+
if ($model->getConfigData('invoice_create')) {
|
| 187 |
+
$this->saveInvoice($order);
|
| 188 |
+
}
|
| 189 |
+
$order->addStatusToHistory($status, $message, true);
|
| 190 |
}
|
| 191 |
|
| 192 |
if (!$order->getEmailSent()) {
|
| 193 |
$order->sendNewOrderEmail();
|
| 194 |
}
|
| 195 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 196 |
$order->save();
|
| 197 |
}
|
| 198 |
} else {
|
| 199 |
foreach ($this->getRealOrderIds() as $realOrderId) {
|
| 200 |
$order = Mage::getModel('sales/order')->loadByIncrementId($realOrderId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 201 |
|
| 202 |
$messageError = $model->getRefusedPaymentMessage($postData);
|
| 203 |
|
| 210 |
}
|
| 211 |
|
| 212 |
$order->addStatusToHistory(
|
| 213 |
+
$status, $messageError
|
| 214 |
);
|
| 215 |
|
| 216 |
if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
|
| 230 |
foreach ($this->getRealOrderIds() as $realOrderId) {
|
| 231 |
$order = Mage::getModel('sales/order')->loadByIncrementId($realOrderId);
|
| 232 |
$order->addStatusToHistory(
|
| 233 |
+
$order->getStatus(), Mage::helper('cybermut')->__('Returned MAC is invalid. Order cancelled.')
|
| 234 |
);
|
| 235 |
if ($order->canCancel())
|
| 236 |
$order->cancel();
|
| 246 |
* @param Mage_Sales_Model_Order $order
|
| 247 |
* @return boolean Can save invoice or not
|
| 248 |
*/
|
| 249 |
+
protected function saveInvoice(Mage_Sales_Model_Order $order) {
|
|
|
|
| 250 |
if ($order->canInvoice()) {
|
| 251 |
|
| 252 |
$version = Mage::getVersion();
|
| 289 |
* @param none
|
| 290 |
* @return void
|
| 291 |
*/
|
| 292 |
+
public function successAction() {
|
|
|
|
| 293 |
$session = Mage::getSingleton('checkout/session');
|
| 294 |
$session->setQuoteId($session->getCybermutPaymentQuoteId());
|
| 295 |
$session->unsCybermutPaymentQuoteId();
|
| 309 |
}
|
| 310 |
|
| 311 |
$order->addStatusToHistory(
|
| 312 |
+
$order->getStatus(), Mage::helper('cybermut')->__('Customer successfully returned from Cybermut')
|
| 313 |
);
|
| 314 |
|
| 315 |
$order->save();
|
| 320 |
|
| 321 |
if ($this->getQuote()->getIsMultiShipping()) {
|
| 322 |
Mage::getSingleton('checkout/type_multishipping')
|
| 323 |
+
->getCheckoutSession()
|
| 324 |
+
->setDisplaySuccess(true)
|
| 325 |
+
->setPayboxResponseCode('success');
|
| 326 |
|
| 327 |
Mage::getSingleton('core/session')->setOrderIds($orderIds);
|
| 328 |
Mage::getSingleton('checkout/session')->setIsMultishipping(true);
|
| 337 |
* @param none
|
| 338 |
* @return void
|
| 339 |
*/
|
| 340 |
+
public function errorAction() {
|
|
|
|
| 341 |
$session = Mage::getSingleton('checkout/session');
|
| 342 |
$model = Mage::getModel('cybermut/payment');
|
| 343 |
|
| 368 |
}
|
| 369 |
|
| 370 |
$order->addStatusToHistory(
|
| 371 |
+
$status, $this->__('Order was canceled by customer')
|
| 372 |
);
|
| 373 |
|
| 374 |
if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
|
| 388 |
$this->_redirect($this->_getErrorRedirect());
|
| 389 |
}
|
| 390 |
|
| 391 |
+
protected function _reorder() {
|
|
|
|
| 392 |
$cart = Mage::getSingleton('checkout/cart');
|
| 393 |
$cartTruncated = false;
|
| 394 |
/* @var $cart Mage_Checkout_Model_Cart */
|
| 401 |
foreach ($items as $item) {
|
| 402 |
try {
|
| 403 |
$cart->addOrderItem($item);
|
| 404 |
+
} catch (Mage_Core_Exception $e) {
|
| 405 |
if (Mage::getSingleton('checkout/session')->getUseNotice(true)) {
|
| 406 |
Mage::getSingleton('checkout/session')->addNotice($e->getMessage());
|
| 407 |
+
} else {
|
|
|
|
| 408 |
Mage::getSingleton('checkout/session')->addError($e->getMessage());
|
| 409 |
}
|
| 410 |
} catch (Exception $e) {
|
| 411 |
+
Mage::getSingleton('checkout/session')->addException($e, Mage::helper('checkout')->__('Cannot add the item to shopping cart.')
|
|
|
|
| 412 |
);
|
| 413 |
}
|
| 414 |
}
|
| 418 |
$cart->save();
|
| 419 |
}
|
| 420 |
|
| 421 |
+
protected function _getSuccessRedirect() {
|
|
|
|
| 422 |
if ($this->getQuote()->getIsMultiShipping())
|
| 423 |
return 'checkout/multishipping/success';
|
| 424 |
else
|
| 425 |
return 'checkout/onepage/success';
|
| 426 |
}
|
| 427 |
|
| 428 |
+
protected function _getErrorRedirect() {
|
|
|
|
| 429 |
if ($this->getQuote()->getIsMultiShipping()) {
|
| 430 |
return 'checkout/cart';
|
| 431 |
} else {
|
| 432 |
return 'checkout/onepage/failure';
|
| 433 |
}
|
| 434 |
}
|
| 435 |
+
|
| 436 |
}
|
app/code/community/Quadra/Cybermut/etc/config.xml
CHANGED
|
@@ -11,15 +11,15 @@
|
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
-
* @copyright 1997-
|
| 15 |
-
* @version Release: $Revision: 2.0.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Quadra_Cybermut>
|
| 22 |
-
<version>2.0.
|
| 23 |
</Quadra_Cybermut>
|
| 24 |
</modules>
|
| 25 |
<global>
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 15 |
+
* @version Release: $Revision: 2.0.5 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Quadra_Cybermut>
|
| 22 |
+
<version>2.0.5</version>
|
| 23 |
</Quadra_Cybermut>
|
| 24 |
</modules>
|
| 25 |
<global>
|
app/code/community/Quadra/Cybermut/etc/system.xml
CHANGED
|
@@ -11,8 +11,8 @@
|
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
-
* @copyright 1997-
|
| 15 |
-
* @version Release: $Revision: 2.0.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 15 |
+
* @version Release: $Revision: 2.0.5 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
app/code/community/Quadra/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/code/community/Quadra/Cybermut/sql/cybermut_setup/mysql4-upgrade-1.0.1-1.0.2.php
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
|
app/design/frontend/default/default/layout/cybermut.xml
CHANGED
|
@@ -11,8 +11,8 @@
|
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
-
* @copyright 1997-
|
| 15 |
-
* @version Release: $Revision: 2.0.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 11 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 15 |
+
* @version Release: $Revision: 2.0.5 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
app/design/frontend/default/default/template/cybermut/error.phtml
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
?>
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
?>
|
app/design/frontend/default/default/template/cybermut/form.phtml
CHANGED
|
@@ -10,8 +10,8 @@
|
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
-
* @copyright 1997-
|
| 14 |
-
* @version Release: $Revision: 2.0.
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
?>
|
| 10 |
* to ecommerce@quadra-informatique.fr so we can send you a copy immediately.
|
| 11 |
*
|
| 12 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 13 |
+
* @copyright 1997-2013 Quadra Informatique
|
| 14 |
+
* @version Release: $Revision: 2.0.5 $
|
| 15 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 16 |
*/
|
| 17 |
?>
|
app/etc/modules/Quadra_Cybermut.xml
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
* @copyright 1997-2012 Quadra Informatique
|
| 15 |
-
* @version Release: $Revision: 2.0.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
|
@@ -27,4 +27,4 @@
|
|
| 27 |
</depends>
|
| 28 |
</Quadra_Cybermut>
|
| 29 |
</modules>
|
| 30 |
-
</config>
|
| 12 |
*
|
| 13 |
* @author Quadra Informatique <ecommerce@quadra-informatique.fr>
|
| 14 |
* @copyright 1997-2012 Quadra Informatique
|
| 15 |
+
* @version Release: $Revision: 2.0.5 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 27 |
</depends>
|
| 28 |
</Quadra_Cybermut>
|
| 29 |
</modules>
|
| 30 |
+
</config>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Quadra_Cybermut</name>
|
| 4 |
-
<version>2.0.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -12,6 +12,9 @@ CyberMUT Paiement / Paiement CIC integration</summary>
|
|
| 12 |
Compatible with CM-CIC versions 1.2 and 3.0.</description>
|
| 13 |
<notes>Changelog:
|
| 14 |

|
|
|
|
|
|
|
|
|
|
| 15 |
2.0.4:
|
| 16 |
- Add cancel status in the configuration
|
| 17 |

|
|
@@ -30,10 +33,10 @@ Compatible with CM-CIC versions 1.2 and 3.0.</description>
|
|
| 30 |
- Multishipping compatibility
|
| 31 |
- Bug fixed with magento 1.4
|
| 32 |
- Beta version</notes>
|
| 33 |
-
<authors><author><name>Quadra Informatique</name><user>
|
| 34 |
-
<date>
|
| 35 |
-
<time>
|
| 36 |
-
<contents><target name="magecommunity"><dir name="Quadra"><dir name="Cybermut"><dir name="Block"><file name="Error.php" hash="
|
| 37 |
<compatible/>
|
| 38 |
-
<dependencies><required><package><name>Quadra_Extensions</name><channel>community</channel><min>1.0.0</min><max></max></package></required></dependencies>
|
| 39 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Quadra_Cybermut</name>
|
| 4 |
+
<version>2.0.5</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
| 7 |
<channel>community</channel>
|
| 12 |
Compatible with CM-CIC versions 1.2 and 3.0.</description>
|
| 13 |
<notes>Changelog:
|
| 14 |

|
| 15 |
+
2.0.5:
|
| 16 |
+
- Fixe bug with complete state order
|
| 17 |
+

|
| 18 |
2.0.4:
|
| 19 |
- Add cancel status in the configuration
|
| 20 |

|
| 33 |
- Multishipping compatibility
|
| 34 |
- Bug fixed with magento 1.4
|
| 35 |
- Beta version</notes>
|
| 36 |
+
<authors><author><name>Quadra Informatique</name><user>quadrainfo</user><email>ecommerce@quadra-informatique.fr</email></author></authors>
|
| 37 |
+
<date>2013-06-20</date>
|
| 38 |
+
<time>14:52:00</time>
|
| 39 |
+
<contents><target name="magecommunity"><dir name="Quadra"><dir name="Cybermut"><dir name="Block"><file name="Error.php" hash="92109cf747af23d45f00415908a28a13"/><file name="Form.php" hash="3a395d152b794a4c82b0e005c3563d37"/><file name="Redirect.php" hash="759fbad7784882eb9c0c44e3d2654b21"/></dir><dir name="Helper"><file name="Data.php" hash="6062666a01ed888e28c6bfbc071e9d08"/></dir><dir name="Model"><dir name="Api"><file name="Debug.php" hash="93c1c358312598fce43d4b0ee2a937f1"/></dir><dir name="Config"><dir name="Data"><file name="Cybermut.php" hash="bddba2a6bc0e11add6612cc8dd2fbc11"/></dir></dir><dir name="Mysql4"><dir name="Api"><dir name="Debug"><file name="Collection.php" hash="a182c91875b96b9c43dbc73113bd4022"/></dir><file name="Debug.php" hash="565fcfa6bfed5a02b3a8a489646b65ea"/></dir><file name="Setup.php" hash="785285fde39d7f94097bf8755291327d"/></dir><file name="Observer.php" hash="f8c5d4710687395081496ccb2ddd5bea"/><file name="Payment.php" hash="286ba43e8d6a8749c1b682b94d24ffa4"/><dir name="Source"><file name="Bank.php" hash="ec374eccebed4894c1268c8ab858895e"/><file name="Language.php" hash="c2774e3426d38028c425f63390e929ef"/><file name="Terms.php" hash="6c1f8ac4bdf0d242b826c6a5c8a8c5bf"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Keyencrypted.php" hash="4143bd43ff885f2e5947bf6f249e0394"/></dir><dir name="Source"><dir name="Order"><dir name="Status"><file name="Accepted.php" hash="efab260c0ec7a7cdcd90ec65dcd89ef4"/><file name="Canceled.php" hash="783268c5415ed4aa3bef737997645aa3"/><file name="New.php" hash="774e89fe25768da3c766ffd405ab8ee1"/><file name="Refused.php" hash="0a98720988eee152f8ede312e2975c2e"/></dir><file name="Status.php" hash="7825aad5f8725da55572bb81909ff19b"/></dir><file name="Version.php" hash="38fccfc5ab5103d51b07dd728271c127"/></dir></dir></dir></dir><dir name="controllers"><file name="PaymentController.php" hash="fd9a2081af49b92f15f628619af06130"/></dir><dir name="etc"><file name="config.xml" hash="55a3f7cc5d263a5b0bc4526afef7ad8f"/><file name="system.xml" hash="635dd1c931b6cca2a1f3475ce2ef46be"/></dir><dir name="sql"><dir name="cybermut_setup"><file name="mysql4-install-0.1.0.php" hash="42017efe65b72a69d74a558ec2d41e85"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="7167a5dacf06e34c7f17702daab66267"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Quadra_Cybermut.xml" hash="1de9ed19ba67893ef62165b2e3d6d322"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="cybermut"><file name="error.phtml" hash="81ac01839115622d8b47a2e17519132b"/><file name="form.phtml" hash="d5ec0f1948a6c218dc6a39d6fe143120"/></dir></dir><dir name="layout"><file name="cybermut.xml" hash="7548d32985e7452658b2aabd3d9576df"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Quadra_Cybermut.csv" hash="447ff1cd9ee16019041ba52459de32f8"/></dir></target><target name="mageskin"><dir name="frontend"><dir name="default"><dir name="default"><dir name="images"><dir name="media"><dir name="cybermut"><file name="cb.gif" hash="297387b1588bc880bd9d9abe00db73c5"/><file name="master.gif" hash="1fd622c6300f37711c983074be1fdae5"/><file name="visa.gif" hash="d2b7afda7cfdf78ae63b0c71f99beac8"/></dir></dir></dir></dir></dir></dir></target></contents>
|
| 40 |
<compatible/>
|
| 41 |
+
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Quadra_Extensions</name><channel>community</channel><min>1.0.0</min><max></max></package></required></dependencies>
|
| 42 |
</package>
|
