Quadra_Cybermut - Version 2.0.4

Version Notes

Changelog:

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 Magento Core Team
Extension Quadra_Cybermut
Version 2.0.4
Comparing to
See all releases


Code changes from version 2.0.3 to 2.0.4

Files changed (29) hide show
  1. app/code/community/Quadra/Cybermut/Block/Error.php +1 -1
  2. app/code/community/Quadra/Cybermut/Block/Form.php +1 -1
  3. app/code/community/Quadra/Cybermut/Block/Redirect.php +1 -1
  4. app/code/community/Quadra/Cybermut/Helper/Data.php +1 -1
  5. app/code/community/Quadra/Cybermut/Model/Api/Debug.php +1 -1
  6. app/code/community/Quadra/Cybermut/Model/Config/Data/Cybermut.php +1 -1
  7. app/code/community/Quadra/Cybermut/Model/Mysql4/Api/Debug.php +1 -1
  8. app/code/community/Quadra/Cybermut/Model/Mysql4/Api/Debug/Collection.php +1 -1
  9. app/code/community/Quadra/Cybermut/Model/Mysql4/Setup.php +1 -1
  10. app/code/community/Quadra/Cybermut/Model/Observer.php +1 -1
  11. app/code/community/Quadra/Cybermut/Model/Payment.php +40 -1
  12. app/code/community/Quadra/Cybermut/Model/Source/Bank.php +1 -1
  13. app/code/community/Quadra/Cybermut/Model/Source/Language.php +1 -1
  14. app/code/community/Quadra/Cybermut/Model/System/Config/Backend/Keyencrypted.php +1 -1
  15. app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status.php +1 -1
  16. app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Accepted.php +1 -1
  17. app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Canceled.php +7 -2
  18. app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/New.php +1 -1
  19. app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/Refused.php +3 -4
  20. app/code/community/Quadra/Cybermut/Model/System/Config/Source/Version.php +1 -1
  21. app/code/community/Quadra/Cybermut/controllers/PaymentController.php +5 -4
  22. app/code/community/Quadra/Cybermut/etc/config.xml +2 -2
  23. app/code/community/Quadra/Cybermut/etc/system.xml +1 -1
  24. app/code/community/Quadra/Cybermut/sql/cybermut_setup/mysql4-install-0.1.0.php +3 -1
  25. app/design/frontend/default/default/layout/cybermut.xml +2 -1
  26. app/design/frontend/default/default/template/cybermut/error.phtml +1 -1
  27. app/design/frontend/default/default/template/cybermut/form.phtml +18 -1
  28. app/etc/modules/Quadra_Cybermut.xml +1 -1
  29. package.xml +7 -4
app/code/community/Quadra/Cybermut/Block/Error.php CHANGED
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
@@ -243,6 +243,45 @@ class Quadra_Cybermut_Model_Payment extends Mage_Payment_Model_Method_Abstract
243
 
244
  $fields['MAC'] = $this->_getMAC($fields);
245
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
246
  return $fields;
247
  }
248
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
243
 
244
  $fields['MAC'] = $this->_getMAC($fields);
245
 
246
+ $fields = $this->getSplitCheckoutFormFields($fields);
247
+
248
+ return $fields;
249
+ }
250
+
251
+ /**
252
+ * Return Split Checkout Form Fields for request to Cybermut
253
+ *
254
+ * @return array Array of hidden form fields
255
+ */
256
+ public function getSplitCheckoutFormFields($fields)
257
+ {
258
+ if ($this->getConfigData('several_times_payment')) {
259
+ $nbTerms = $this->getQuote()->getPayment()->getNbrech();
260
+
261
+ if ($nbTerms > 1) {
262
+ $amount = $this->getAmount();
263
+
264
+ $fields['nbrech'] = $nbTerms;
265
+
266
+ $terms = array(
267
+ 'montantech1' => round($amount/$nbTerms, 2),
268
+ 'dateech1' => date('d/m/Y'));
269
+
270
+ for ($i=2; $i<$nbTerms+1; $i++) {
271
+ $terms['montantech'.$i] = $terms['montantech1'];
272
+ $dateech = '+ '.($i-1).' month';
273
+ $terms['dateech'.$i] = date('d/m/Y', strtotime($dateech));
274
+ }
275
+
276
+ if ($terms['montantech1']*$nbTerms != $amount) {
277
+ $result = $terms['montantech1']*($nbTerms-1);
278
+ $terms['montantech1'] = $amount-$result;
279
+ }
280
+
281
+ $fields = array_merge($fields, $terms);
282
+ }
283
+ }
284
+
285
  return $fields;
286
  }
287
 
app/code/community/Quadra/Cybermut/Model/Source/Bank.php CHANGED
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,10 +11,15 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
18
- class Quadra_Cybermut_Model_System_Config_Source_Order_Status_Canceled extends Quadra_Cybermut_Model_System_Config_Source_Order_Status_Refused
19
  {
 
 
 
 
 
20
  }
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
18
+ class Quadra_Cybermut_Model_System_Config_Source_Order_Status_Canceled extends Quadra_Cybermut_Model_System_Config_Source_Order_Status
19
  {
20
+ // set null to enable all possible
21
+ protected $_stateStatuses = array(
22
+ Mage_Sales_Model_Order::STATE_HOLDED,
23
+ Mage_Sales_Model_Order::STATE_CANCELED
24
+ );
25
  }
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Order/Status/New.php CHANGED
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
@@ -19,8 +19,7 @@ class Quadra_Cybermut_Model_System_Config_Source_Order_Status_Refused extends Qu
19
  {
20
  // set null to enable all possible
21
  protected $_stateStatuses = array(
22
- Mage_Sales_Model_Order::STATE_NEW,
23
- Mage_Sales_Model_Order::STATE_PROCESSING,
24
- Mage_Sales_Model_Order::STATE_HOLDED
25
  );
26
  }
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
19
  {
20
  // set null to enable all possible
21
  protected $_stateStatuses = array(
22
+ Mage_Sales_Model_Order::STATE_HOLDED,
23
+ Mage_Sales_Model_Order::STATE_CANCELED
 
24
  );
25
  }
app/code/community/Quadra/Cybermut/Model/System/Config/Source/Version.php CHANGED
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
@@ -189,7 +189,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
189
  );
190
  } else if ($status == Mage_Sales_Model_Order::STATE_COMPLETE) {
191
  $order->setState(
192
- Mage_Sales_Model_Order::STATE_COMPLETE, $status, $message
193
  );
194
  } else {
195
  $order->addStatusToHistory(
@@ -252,7 +252,8 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
252
  $order->addStatusToHistory(
253
  $order->getStatus(), Mage::helper('cybermut')->__('Returned MAC is invalid. Order cancelled.')
254
  );
255
- $order->cancel();
 
256
  $order->save();
257
  }
258
  $model->generateErrorResponse();
@@ -395,7 +396,7 @@ class Quadra_Cybermut_PaymentController extends Mage_Core_Controller_Front_Actio
395
 
396
  if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
397
  $order->hold();
398
- } else if ($status == Mage_Sales_Model_Order::STATE_CANCELED) {
399
  $order->cancel();
400
  }
401
 
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
189
  );
190
  } else if ($status == Mage_Sales_Model_Order::STATE_COMPLETE) {
191
  $order->setState(
192
+ Mage_Sales_Model_Order::STATE_COMPLETE, $status, $message, null, false
193
  );
194
  } else {
195
  $order->addStatusToHistory(
252
  $order->addStatusToHistory(
253
  $order->getStatus(), Mage::helper('cybermut')->__('Returned MAC is invalid. Order cancelled.')
254
  );
255
+ if ($order->canCancel())
256
+ $order->cancel();
257
  $order->save();
258
  }
259
  $model->generateErrorResponse();
396
 
397
  if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
398
  $order->hold();
399
+ } else if ($status == Mage_Sales_Model_Order::STATE_CANCELED && $order->canCancel()) {
400
  $order->cancel();
401
  }
402
 
app/code/community/Quadra/Cybermut/etc/config.xml CHANGED
@@ -12,14 +12,14 @@
12
  *
13
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
14
  * @copyright 1997-2012 Quadra Informatique
15
- * @version Release: $Revision: 2.0.3 $
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.3</version>
23
  </Quadra_Cybermut>
24
  </modules>
25
  <global>
12
  *
13
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
14
  * @copyright 1997-2012 Quadra Informatique
15
+ * @version Release: $Revision: 2.0.4 $
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.4</version>
23
  </Quadra_Cybermut>
24
  </modules>
25
  <global>
app/code/community/Quadra/Cybermut/etc/system.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.3 $
16
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
17
  */
18
  -->
12
  *
13
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
14
  * @copyright 1997-2012 Quadra Informatique
15
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
@@ -21,6 +21,7 @@ $installer = $this;
21
  $installer->startSetup();
22
 
23
  $installer->run("
 
24
  CREATE TABLE `{$this->getTable('cybermut_api_debug')}` (
25
  `debug_id` int(10) unsigned NOT NULL auto_increment,
26
  `debug_at` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
@@ -29,6 +30,7 @@ CREATE TABLE `{$this->getTable('cybermut_api_debug')}` (
29
  PRIMARY KEY (`debug_id`),
30
  KEY `debug_at` (`debug_at`)
31
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
32
  ");
33
 
34
  $installer->endSetup();
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
 
21
  $installer->startSetup();
22
 
23
  $installer->run("
24
+
25
  CREATE TABLE `{$this->getTable('cybermut_api_debug')}` (
26
  `debug_id` int(10) unsigned NOT NULL auto_increment,
27
  `debug_at` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
30
  PRIMARY KEY (`debug_id`),
31
  KEY `debug_at` (`debug_at`)
32
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
33
+
34
  ");
35
 
36
  $installer->endSetup();
app/design/frontend/default/default/layout/cybermut.xml CHANGED
@@ -12,10 +12,11 @@
12
  *
13
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
14
  * @copyright 1997-2012 Quadra Informatique
15
- * @version Release: $Revision: 2.0.3 $
16
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
17
  */
18
  -->
 
19
  <layout version="0.1.0">
20
  <!--
21
  Cybermut Failure Response Page
12
  *
13
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
14
  * @copyright 1997-2012 Quadra Informatique
15
+ * @version Release: $Revision: 2.0.4 $
16
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
17
  */
18
  -->
19
+
20
  <layout version="0.1.0">
21
  <!--
22
  Cybermut Failure Response Page
app/design/frontend/default/default/template/cybermut/error.phtml CHANGED
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
  ?>
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
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
@@ -11,7 +11,7 @@
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
- * @version Release: $Revision: 2.0.3 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
  ?>
@@ -24,6 +24,23 @@
24
  <fieldset class="form-list">
25
  <?php $_code = $this->getMethodCode() ?>
26
  <ul id="payment_form_<?php echo $_code ?>" style="display:none">
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
27
  <li>
28
  <?php echo $this->__('You will be redirected to Cybermut website when you place an order.') ?>
29
  </li>
11
  *
12
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
13
  * @copyright 1997-2012 Quadra Informatique
14
+ * @version Release: $Revision: 2.0.4 $
15
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
16
  */
17
  ?>
24
  <fieldset class="form-list">
25
  <?php $_code = $this->getMethodCode() ?>
26
  <ul id="payment_form_<?php echo $_code ?>" style="display:none">
27
+ <?php if (Mage::getStoreConfig('payment/cybermut_payment/several_times_payment')): ?>
28
+ <li class="control">
29
+ <input type="checkbox" name="cybermut[several_implements]" id="cybermut:several_implements" value="<?php echo Mage::getStoreConfig('payment/cybermut_payment/terms') ?>" title="<?php echo $this->__('Payment %s times', Mage::getStoreConfig('payment/cybermut_payment/terms')) ?>" class="checkbox" onclick="setNbrech()" />
30
+ <label for="cybermut:several_implements"><?php echo $this->__('Payment %s times', Mage::getStoreConfig('payment/cybermut_payment/terms')) ?></label>
31
+ <input type="hidden" id="payment:nbrech" name="payment[nbrech]" value="1" />
32
+ </li>
33
+ <script type="text/javascript">
34
+ //<![CDATA[
35
+ function setNbrech() {
36
+ if ($('cybermut:several_implements').checked)
37
+ $('payment:nbrech').value = $('cybermut:several_implements').value;
38
+ else
39
+ $('payment:nbrech').value = 1;
40
+ }
41
+ //]]>
42
+ </script>
43
+ <?php endif; ?>
44
  <li>
45
  <?php echo $this->__('You will be redirected to Cybermut website when you place an order.') ?>
46
  </li>
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.3 $
16
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
17
  */
18
  -->
12
  *
13
  * @author Quadra Informatique <ecommerce@quadra-informatique.fr>
14
  * @copyright 1997-2012 Quadra Informatique
15
+ * @version Release: $Revision: 2.0.4 $
16
  * @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
17
  */
18
  -->
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Quadra_Cybermut</name>
4
- <version>2.0.3</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,6 +12,9 @@ CyberMUT Paiement / Paiement CIC integration</summary>
12
  Compatible with CM-CIC versions 1.2 and 3.0.</description>
13
  <notes>Changelog:&#xD;
14
  &#xD;
 
 
 
15
  2.0.3:&#xD;
16
  - Bug fixed with multishipping&#xD;
17
  &#xD;
@@ -28,9 +31,9 @@ Compatible with CM-CIC versions 1.2 and 3.0.</description>
28
  - Bug fixed with magento 1.4&#xD;
29
  - Beta version</notes>
30
  <authors><author><name>Quadra Informatique</name><user>auto-converted</user><email>ecommerce@quadra-informatique.fr</email></author></authors>
31
- <date>2012-01-06</date>
32
- <time>14:50:24</time>
33
- <contents><target name="magecommunity"><dir name="Quadra"><dir name="Cybermut"><dir name="Block"><file name="Error.php" hash="690a2eee7294ae39bfab3c5b7f9bf468"/><file name="Form.php" hash="2ce7158342b8fee906bffd6a8cbb96ef"/><file name="Redirect.php" hash="ad5b9a9daa7ef5b67628f5cfea9786b1"/></dir><dir name="Helper"><file name="Data.php" hash="78483f68522573417e303a0327f63700"/></dir><dir name="Model"><dir name="Api"><file name="Debug.php" hash="8fd44f5a73218b42f787fe1ddb21b494"/></dir><dir name="Config"><dir name="Data"><file name="Cybermut.php" hash="66c0ee0e797ea778bd9e3057125655f8"/></dir></dir><dir name="Mysql4"><dir name="Api"><dir name="Debug"><file name="Collection.php" hash="5531ba9c8c7ee7a9112ffb6c0ec3356a"/></dir><file name="Debug.php" hash="32aa30005233ce377e44963c1db188c6"/></dir><file name="Setup.php" hash="d0a3884fd92a5f37937915089bfe011a"/></dir><dir name="Source"><file name="Bank.php" hash="2301288abe0a9005c8ad765495db0425"/><file name="Language.php" hash="18de7e82705860c3e2bca37275bc7683"/><file name="Terms.php" hash="feae42d506c387c9372a38955240476a"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Keyencrypted.php" hash="d2b57f9a7398eff3c8e28e47f4cf12ed"/></dir><dir name="Source"><dir name="Order"><dir name="Status"><file name="Accepted.php" hash="727489341e1676927a784f0edb4aad5f"/><file name="Canceled.php" hash="548f0c887c3cee9d8cb8860ca5f5ba51"/><file name="New.php" hash="b5c4cb6eb3a378e5c77ba44fcc3ecc52"/><file name="Refused.php" hash="aba0f5b392f5ab7b10e72fe2df8a48f1"/></dir><file name="Status.php" hash="864584fe5171abfb1611a4f86d54c088"/></dir><file name="Version.php" hash="e025866542240b8b855f0463d382a756"/></dir></dir></dir><file name="Observer.php" hash="c2ea62e94f028a246f361d7aae3f6408"/><file name="Payment.php" hash="5e7c251da83f2d0f5a78a798e1e1e75a"/></dir><dir name="controllers"><file name="PaymentController.php" hash="98e3c07f3472f6bdf3e905731f561cfd"/></dir><dir name="etc"><file name="config.xml" hash="4f69948a40bbda099f3d321bd047f4f5"/><file name="system.xml" hash="251dba31ca4b0f79d477fa462ab0e4fb"/></dir><dir name="sql"><dir name="cybermut_setup"><file name="mysql4-install-0.1.0.php" hash="625ba1aad9ec491f0fe673f754905e8e"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="c46adb971914a353762d9f8e67e88388"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Quadra_Cybermut.xml" hash="3232ec03da3ec2696837662c48e1076f"/></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="1887232b2bacca2982d2ef67d34a94fc"/><file name="form.phtml" hash="f0da89f5b7243209e7d4a8cbeb03224d"/></dir></dir><dir name="layout"><file name="cybermut.xml" hash="5c5cdcfabd50707c28517fa79dfc6659"/></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>
34
  <compatible/>
35
  <dependencies><required><package><name>Quadra_Extensions</name><channel>community</channel><min>1.0.0</min><max></max></package></required></dependencies>
36
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Quadra_Cybermut</name>
4
+ <version>2.0.4</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:&#xD;
14
  &#xD;
15
+ 2.0.4:&#xD;
16
+ - Add cancel status in the configuration&#xD;
17
+ &#xD;
18
  2.0.3:&#xD;
19
  - Bug fixed with multishipping&#xD;
20
  &#xD;
31
  - Bug fixed with magento 1.4&#xD;
32
  - Beta version</notes>
33
  <authors><author><name>Quadra Informatique</name><user>auto-converted</user><email>ecommerce@quadra-informatique.fr</email></author></authors>
34
+ <date>2012-03-05</date>
35
+ <time>12:44:20</time>
36
+ <contents><target name="magecommunity"><dir name="Quadra"><dir name="Cybermut"><dir name="Block"><file name="Error.php" hash="8da67e661b22c5a5f4cf684d78d3311d"/><file name="Form.php" hash="07eeb5cc9f9aad1942035269613e7c71"/><file name="Redirect.php" hash="01c07a972159ea377187769eed69deed"/></dir><dir name="Helper"><file name="Data.php" hash="f35d56e743a5fcb1f171eb3dd6e95dd3"/></dir><dir name="Model"><dir name="Api"><file name="Debug.php" hash="905e032da8d5dbcd24e5aafc1a56aedd"/></dir><dir name="Config"><dir name="Data"><file name="Cybermut.php" hash="37352bcdcf1ad0be1a0240bb0de346da"/></dir></dir><dir name="Mysql4"><dir name="Api"><dir name="Debug"><file name="Collection.php" hash="c995e00e26f01f5aa1a3597a12aa01f2"/></dir><file name="Debug.php" hash="98114d4b17d575d9d04438227c5935f2"/></dir><file name="Setup.php" hash="84b0508c7a951db73542ed2e93260174"/></dir><dir name="Source"><file name="Bank.php" hash="c22669d19a083ab965c7a625a1f7eb06"/><file name="Language.php" hash="5bd0a190ab6a3f4e59f031d63707548a"/><file name="Terms.php" hash="feae42d506c387c9372a38955240476a"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Keyencrypted.php" hash="23536977953b7134cd3c9fb8b11af3bc"/></dir><dir name="Source"><dir name="Order"><dir name="Status"><file name="Accepted.php" hash="60690f4e27964000ce86fc8f6bc14a9f"/><file name="Canceled.php" hash="469105b4ac3a1e333a517c18cb1b87a2"/><file name="New.php" hash="e7fded977ccea9cbb8171da112d708b2"/><file name="Refused.php" hash="1d7c6c54d4205d41f4c64bda59b32454"/></dir><file name="Status.php" hash="c0b7cc96e23ac1a4e5182f70c86f951d"/></dir><file name="Version.php" hash="179c24c1130f5982cfa16c4e91b961e9"/></dir></dir></dir><file name="Observer.php" hash="32f583b88ea718155e3525e08d09b44b"/><file name="Payment.php" hash="b2fda321254f9ac02875e8f8e3d0c3cd"/></dir><dir name="controllers"><file name="PaymentController.php" hash="b6b6f63e01916e5fbb4ce481e4a40484"/></dir><dir name="etc"><file name="config.xml" hash="6d08578760d64a38e8424f7f4cb0613f"/><file name="system.xml" hash="ca7b3ac965547484e5e299bf2b3e6e12"/></dir><dir name="sql"><dir name="cybermut_setup"><file name="mysql4-install-0.1.0.php" hash="2701af3f68b30436da9b4093408975c2"/><file name="mysql4-upgrade-1.0.1-1.0.2.php" hash="c46adb971914a353762d9f8e67e88388"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Quadra_Cybermut.xml" hash="9a7b55c6f69f0226c217b235a94956df"/></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="f7474440c8379f800d274811727bd43b"/><file name="form.phtml" hash="7590eb7ef3a1d60a7d31bc18dc5dc477"/></dir></dir><dir name="layout"><file name="cybermut.xml" hash="7e1a7455952d9c265611d5b5936b2c67"/></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>
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>