Version Notes
Added Ogone support
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Secuvad_Official |
| Version | 1.2.4 |
| Comparing to | |
| See all releases | |
Code changes from version 1.2.3 to 1.2.4
- app/code/community/Secuvad/Core/Block/Orders/Grid.php +36 -6
- app/code/community/Secuvad/Core/Model/Orders.php +6 -0
- app/code/community/Secuvad/Core/controllers/ApiController.php +33 -76
- app/code/community/Secuvad/Core/controllers/CybermutController.php +205 -0
- app/code/community/Secuvad/Core/etc/config.xml +5 -1
- app/code/community/Secuvad/Core/sql/secuvad_setup/mysql4-upgrade-1.2.3-1.2.4.php +3 -0
- package.xml +7 -8
app/code/community/Secuvad/Core/Block/Orders/Grid.php
CHANGED
|
@@ -25,7 +25,27 @@ class Secuvad_Core_Block_Orders_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
| 25 |
|
| 26 |
protected function _prepareCollection()
|
| 27 |
{
|
| 28 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 29 |
$this->setCollection($collection);
|
| 30 |
return parent::_prepareCollection();
|
| 31 |
}
|
|
@@ -58,10 +78,21 @@ class Secuvad_Core_Block_Orders_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
| 58 |
'width' => '100px',
|
| 59 |
));
|
| 60 |
|
| 61 |
-
$
|
| 62 |
-
|
| 63 |
-
|
| 64 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 65 |
/*
|
| 66 |
$this->addColumn('shipping_name', array(
|
| 67 |
'header' => Mage::helper('sales')->__('Ship to Name'),
|
|
@@ -132,7 +163,6 @@ class Secuvad_Core_Block_Orders_Grid extends Mage_Adminhtml_Block_Widget_Grid
|
|
| 132 |
"EN ATTENTE" => Mage::helper('secuvad')->__('Being checked'),
|
| 133 |
"VALIDE" => Mage::helper('secuvad')->__('Valid'),
|
| 134 |
"INVALIDE" => Mage::helper('secuvad')->__('Invalid'));
|
| 135 |
-
|
| 136 |
$this->addColumn('secuvad_status', array(
|
| 137 |
'header' => Mage::helper('secuvad')->__('SECUVAD'),
|
| 138 |
'index' => 'secuvad_status',
|
| 25 |
|
| 26 |
protected function _prepareCollection()
|
| 27 |
{
|
| 28 |
+
$numbered_version = substr(str_replace(".", "", Mage::getVersion()), 0, 3);
|
| 29 |
+
if ($numbered_version <= 140)
|
| 30 |
+
{
|
| 31 |
+
$collection = Mage::getResourceModel($this->_getCollectionClass())
|
| 32 |
+
->addAttributeToSelect('*')
|
| 33 |
+
->joinAttribute('billing_firstname', 'order_address/firstname', 'billing_address_id', null, 'left')
|
| 34 |
+
->joinAttribute('billing_lastname', 'order_address/lastname', 'billing_address_id', null, 'left')
|
| 35 |
+
->joinAttribute('shipping_firstname', 'order_address/firstname', 'shipping_address_id', null, 'left')
|
| 36 |
+
->joinAttribute('shipping_lastname', 'order_address/lastname', 'shipping_address_id', null, 'left')
|
| 37 |
+
->addExpressionAttributeToSelect('billing_name',
|
| 38 |
+
'CONCAT({{billing_firstname}}, " ", {{billing_lastname}})',
|
| 39 |
+
array('billing_firstname', 'billing_lastname'))
|
| 40 |
+
->addExpressionAttributeToSelect('shipping_name',
|
| 41 |
+
'CONCAT({{shipping_firstname}}, " ", {{shipping_lastname}})',
|
| 42 |
+
array('shipping_firstname', 'shipping_lastname'));
|
| 43 |
+
}
|
| 44 |
+
else
|
| 45 |
+
{
|
| 46 |
+
$collection = Mage::getResourceModel($this->_getCollectionClass());
|
| 47 |
+
}
|
| 48 |
+
|
| 49 |
$this->setCollection($collection);
|
| 50 |
return parent::_prepareCollection();
|
| 51 |
}
|
| 78 |
'width' => '100px',
|
| 79 |
));
|
| 80 |
|
| 81 |
+
$numbered_version = substr(str_replace(".", "", Mage::getVersion()), 0, 3);
|
| 82 |
+
if ($numbered_version <= 140)
|
| 83 |
+
{
|
| 84 |
+
$this->addColumn('billing_name', array(
|
| 85 |
+
'header' => Mage::helper('sales')->__('Bill to Name'),
|
| 86 |
+
'index' => 'billing_name',
|
| 87 |
+
));
|
| 88 |
+
}
|
| 89 |
+
else
|
| 90 |
+
{
|
| 91 |
+
$this->addColumn('billing_name', array(
|
| 92 |
+
'header' => Mage::helper('sales')->__('Bill to Name'),
|
| 93 |
+
'index' => 'customer_lastname',
|
| 94 |
+
));
|
| 95 |
+
}
|
| 96 |
/*
|
| 97 |
$this->addColumn('shipping_name', array(
|
| 98 |
'header' => Mage::helper('sales')->__('Ship to Name'),
|
| 163 |
"EN ATTENTE" => Mage::helper('secuvad')->__('Being checked'),
|
| 164 |
"VALIDE" => Mage::helper('secuvad')->__('Valid'),
|
| 165 |
"INVALIDE" => Mage::helper('secuvad')->__('Invalid'));
|
|
|
|
| 166 |
$this->addColumn('secuvad_status', array(
|
| 167 |
'header' => Mage::helper('secuvad')->__('SECUVAD'),
|
| 168 |
'index' => 'secuvad_status',
|
app/code/community/Secuvad/Core/Model/Orders.php
CHANGED
|
@@ -188,11 +188,17 @@ class Secuvad_Core_Model_Orders
|
|
| 188 |
$payment['method'] = Mage::getModel('secuvad/payment_association')->load($pmethod)->secuvad_payment_code;
|
| 189 |
|
| 190 |
$cc_number = '';
|
|
|
|
| 191 |
if(isset($order['secuvad_cc_number']))
|
| 192 |
{
|
| 193 |
$cc_number = $order['secuvad_cc_number'];
|
| 194 |
}
|
| 195 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 196 |
$flux_xml .= "\t<paiement>\n";
|
| 197 |
$flux_xml .= "\t\t<paiementtype>\n";
|
| 198 |
if($payment['method'] == "cheque")
|
| 188 |
$payment['method'] = Mage::getModel('secuvad/payment_association')->load($pmethod)->secuvad_payment_code;
|
| 189 |
|
| 190 |
$cc_number = '';
|
| 191 |
+
$cc_expdate = '';
|
| 192 |
if(isset($order['secuvad_cc_number']))
|
| 193 |
{
|
| 194 |
$cc_number = $order['secuvad_cc_number'];
|
| 195 |
}
|
| 196 |
|
| 197 |
+
if(isset($order['secuvad_date_val']))
|
| 198 |
+
{
|
| 199 |
+
$cc_expdate = $order['secuvad_date_val'];
|
| 200 |
+
}
|
| 201 |
+
|
| 202 |
$flux_xml .= "\t<paiement>\n";
|
| 203 |
$flux_xml .= "\t\t<paiementtype>\n";
|
| 204 |
if($payment['method'] == "cheque")
|
app/code/community/Secuvad/Core/controllers/ApiController.php
CHANGED
|
@@ -1,77 +1,34 @@
|
|
| 1 |
-
<?php
|
| 2 |
-
|
| 3 |
-
|
| 4 |
-
|
| 5 |
-
|
| 6 |
-
|
| 7 |
-
|
| 8 |
-
|
| 9 |
-
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
|
| 14 |
-
|
| 15 |
-
|
| 16 |
-
|
| 17 |
-
|
| 18 |
-
|
| 19 |
-
|
| 20 |
-
|
| 21 |
-
|
| 22 |
-
|
| 23 |
-
|
| 24 |
-
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
| 37 |
-
/* Mise à jour des données bancaires lors d'un paiment avec le module Ogone*/
|
| 38 |
-
public function automaticAction()
|
| 39 |
-
{
|
| 40 |
-
$model = $this->getStandard();
|
| 41 |
-
|
| 42 |
-
if (!$this->getRequest()->isPost('DATA'))
|
| 43 |
-
{
|
| 44 |
-
$this->_redirect('');
|
| 45 |
-
return;
|
| 46 |
-
}
|
| 47 |
-
|
| 48 |
-
if ($this->getConfig()->getCheckByIpAddress())
|
| 49 |
-
{
|
| 50 |
-
if (!in_array($model->getApiParameters()->getIpAddress(), $this->getConfig()->getAuthorizedIps()))
|
| 51 |
-
{
|
| 52 |
-
Mage::log($model->getApiParameters()->getIpAddress() . ' tries to connect to our server' . "\n", null, 'atos');
|
| 53 |
-
return;
|
| 54 |
-
}
|
| 55 |
-
}
|
| 56 |
-
|
| 57 |
-
$response = $model->getApiResponse()->doResponse($_POST['DATA'], array('bin_response' => $model->getBinResponse() ) );
|
| 58 |
-
|
| 59 |
-
$order = Mage::getModel('sales/order')->loadByIncrementId($response['order_id']);
|
| 60 |
-
|
| 61 |
-
//Enregistrement des données cc
|
| 62 |
-
$order_payment = $order->getPayment();
|
| 63 |
-
if($response['bank_response_code'] == '00' &&$response['response_code'] == '00')
|
| 64 |
-
{
|
| 65 |
-
ereg("^([0-9]{4})[^0-9]?([0-9]{2})$",$response['card_number'], $tab);
|
| 66 |
-
$num = $tab[1]." #### #### ##".$tab[2];
|
| 67 |
-
$order_payment->setData('secuvad_cc_number', $num);
|
| 68 |
-
$order_payment->save();
|
| 69 |
-
}
|
| 70 |
-
|
| 71 |
-
|
| 72 |
-
parent::automaticAction();
|
| 73 |
-
}
|
| 74 |
-
|
| 75 |
-
|
| 76 |
-
|
| 77 |
}
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
require_once 'Mage/Ogone/controllers/ApiController.php';
|
| 4 |
+
|
| 5 |
+
class Secuvad_Core_ApiController extends Mage_Ogone_ApiController
|
| 6 |
+
{
|
| 7 |
+
/**
|
| 8 |
+
* Process success action by accept url
|
| 9 |
+
*/
|
| 10 |
+
protected function _acceptProcess()
|
| 11 |
+
{
|
| 12 |
+
$params = $this->getRequest()->getParams();
|
| 13 |
+
$mm = substr($params['ED'], 0, 2);
|
| 14 |
+
$yyyy = "20".substr($params['ED'], 2, 2);
|
| 15 |
+
$date_val = "$mm/$yyyy";
|
| 16 |
+
if (isset($params['BIN']))
|
| 17 |
+
$num = substr($params['BIN'], 0, 4) . " " . substr($params['BIN'], 4, 2);
|
| 18 |
+
else $num = "#### ##";
|
| 19 |
+
|
| 20 |
+
$num .= "## #### ".substr($params['CARDNO'], -4);
|
| 21 |
+
|
| 22 |
+
$order = $this->_getOrder();
|
| 23 |
+
$order_payment = $order->getPayment();
|
| 24 |
+
$order_payment->setData('secuvad_cc_number', $num);
|
| 25 |
+
$order_payment->setData('secuvad_date_val', $date_val);
|
| 26 |
+
$order_payment->save();
|
| 27 |
+
|
| 28 |
+
$order->setData('secuvad_cc_number', $num);
|
| 29 |
+
$order->setData('secuvad_date_val', $date_val);
|
| 30 |
+
$order->save();
|
| 31 |
+
|
| 32 |
+
parent::_acceptProcess();
|
| 33 |
+
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
}
|
app/code/community/Secuvad/Core/controllers/CybermutController.php
ADDED
|
@@ -0,0 +1,205 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
require_once 'Mage/Cybermut/controllers/PaymentController.php';
|
| 4 |
+
|
| 5 |
+
class Secuvad_Core_CybermutController extends Mage_Cybermut_PaymentController
|
| 6 |
+
{
|
| 7 |
+
/**
|
| 8 |
+
* Cybermut response router
|
| 9 |
+
*
|
| 10 |
+
* @param none
|
| 11 |
+
* @return void
|
| 12 |
+
*/
|
| 13 |
+
public function notifyAction()
|
| 14 |
+
{
|
| 15 |
+
$model = Mage::getModel('cybermut/payment');
|
| 16 |
+
|
| 17 |
+
if ($this->getRequest()->isPost()) {
|
| 18 |
+
$postData = $this->getRequest()->getPost();
|
| 19 |
+
$method = 'post';
|
| 20 |
+
|
| 21 |
+
} else if ($this->getRequest()->isGet()) {
|
| 22 |
+
$postData = $this->getRequest()->getQuery();
|
| 23 |
+
$method = 'get';
|
| 24 |
+
|
| 25 |
+
} else {
|
| 26 |
+
$model->generateErrorResponse();
|
| 27 |
+
}
|
| 28 |
+
|
| 29 |
+
if ($model->getConfigData('debug_flag')) {
|
| 30 |
+
Mage::getModel('cybermut/api_debug')
|
| 31 |
+
->setResponseBody(print_r($postData ,1))
|
| 32 |
+
->save();
|
| 33 |
+
}
|
| 34 |
+
|
| 35 |
+
$returnedMAC = $postData['MAC'];
|
| 36 |
+
$correctMAC = $model->getResponseMAC($postData);
|
| 37 |
+
|
| 38 |
+
$order = Mage::getModel('sales/order')
|
| 39 |
+
->loadByIncrementId($postData['reference']);
|
| 40 |
+
|
| 41 |
+
if (!$order->getId()) {
|
| 42 |
+
$model->generateErrorResponse();
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
if ($returnedMAC == $correctMAC) {
|
| 46 |
+
if ($model->isSuccessfulPayment($postData['code-retour'])) {
|
| 47 |
+
|
| 48 |
+
// Déblocage de la commande si nécessaire
|
| 49 |
+
if ($order->getState() == Mage_Sales_Model_Order::STATE_HOLDED) {
|
| 50 |
+
$order->unhold();
|
| 51 |
+
}
|
| 52 |
+
|
| 53 |
+
if (!$status = $model->getConfigData('order_status_payment_accepted')) {
|
| 54 |
+
$status = $order->getStatus();
|
| 55 |
+
}
|
| 56 |
+
|
| 57 |
+
/*$order->addStatusToHistory(
|
| 58 |
+
$status,
|
| 59 |
+
$model->getSuccessfulPaymentMessage($postData),
|
| 60 |
+
true
|
| 61 |
+
);
|
| 62 |
+
|
| 63 |
+
if ($model->getConfigData('order_status_payment_accepted') == 'processing') {
|
| 64 |
+
$order->setState(Mage_Sales_Model_Order::STATE_PROCESSING, false);
|
| 65 |
+
}*/
|
| 66 |
+
|
| 67 |
+
$message = $model->getSuccessfulPaymentMessage($postData);
|
| 68 |
+
|
| 69 |
+
if ($status == Mage_Sales_Model_Order::STATE_PROCESSING) {
|
| 70 |
+
$order->setState(
|
| 71 |
+
Mage_Sales_Model_Order::STATE_PROCESSING,
|
| 72 |
+
$status,
|
| 73 |
+
$message
|
| 74 |
+
);
|
| 75 |
+
} else if ($status == Mage_Sales_Model_Order::STATE_COMPLETE) {
|
| 76 |
+
$order->setState(
|
| 77 |
+
Mage_Sales_Model_Order::STATE_COMPLETE,
|
| 78 |
+
$status,
|
| 79 |
+
$message
|
| 80 |
+
);
|
| 81 |
+
} else {
|
| 82 |
+
$order->addStatusToHistory(
|
| 83 |
+
$status,
|
| 84 |
+
$message,
|
| 85 |
+
true
|
| 86 |
+
);
|
| 87 |
+
}
|
| 88 |
+
|
| 89 |
+
$order->sendNewOrderEmail();
|
| 90 |
+
$order->setEmailSent(true);
|
| 91 |
+
|
| 92 |
+
//Enregistrement des données cc
|
| 93 |
+
$num = substr($postData['bincb'], 0, 4) . " " . substr($postData['bincb'], 4, 2) . "## #### ####";
|
| 94 |
+
$order->setData('secuvad_cc_number', $num);
|
| 95 |
+
$order->save();
|
| 96 |
+
|
| 97 |
+
$this->saveInvoice($order);
|
| 98 |
+
|
| 99 |
+
} else {
|
| 100 |
+
/*$order->addStatusToHistory(
|
| 101 |
+
$model->getConfigData('order_status_payment_refused'),
|
| 102 |
+
$model->getRefusedPaymentMessage($postData)
|
| 103 |
+
);
|
| 104 |
+
|
| 105 |
+
if ($model->getConfigData('order_status_payment_refused') == Mage_Sales_Model_Order::STATE_CANCELED) {
|
| 106 |
+
$order->cancel();
|
| 107 |
+
}*/
|
| 108 |
+
|
| 109 |
+
$messageError = $model->getRefusedPaymentMessage($postData);
|
| 110 |
+
|
| 111 |
+
if ($order->getState() == Mage_Sales_Model_Order::STATE_HOLDED) {
|
| 112 |
+
$order->unhold();
|
| 113 |
+
}
|
| 114 |
+
|
| 115 |
+
if (!$status = $model->getConfigData('order_status_payment_refused')) {
|
| 116 |
+
$status = $order->getStatus();
|
| 117 |
+
}
|
| 118 |
+
|
| 119 |
+
$order->addStatusToHistory(
|
| 120 |
+
$status,
|
| 121 |
+
$messageError
|
| 122 |
+
);
|
| 123 |
+
|
| 124 |
+
if ($status == Mage_Sales_Model_Order::STATE_HOLDED && $order->canHold()) {
|
| 125 |
+
$order->hold();
|
| 126 |
+
}
|
| 127 |
+
}
|
| 128 |
+
|
| 129 |
+
$order->save();
|
| 130 |
+
if ($method == 'post') {
|
| 131 |
+
$model->generateSuccessResponse();
|
| 132 |
+
} else if ($method == 'get') {
|
| 133 |
+
return;
|
| 134 |
+
}
|
| 135 |
+
|
| 136 |
+
} else {
|
| 137 |
+
$order->addStatusToHistory(
|
| 138 |
+
$order->getStatus(),
|
| 139 |
+
Mage::helper('cybermut')->__('Returned MAC is invalid. Order cancelled.')
|
| 140 |
+
);
|
| 141 |
+
$order->cancel();
|
| 142 |
+
$order->save();
|
| 143 |
+
$model->generateErrorResponse();
|
| 144 |
+
}
|
| 145 |
+
}
|
| 146 |
+
|
| 147 |
+
/**
|
| 148 |
+
* Save invoice for order
|
| 149 |
+
*
|
| 150 |
+
* @param Mage_Sales_Model_Order $order
|
| 151 |
+
* @return boolean Can save invoice or not
|
| 152 |
+
*/
|
| 153 |
+
protected function saveInvoice(Mage_Sales_Model_Order $order)
|
| 154 |
+
{
|
| 155 |
+
if ($order->canInvoice()) {
|
| 156 |
+
|
| 157 |
+
$version = Mage::getVersion();
|
| 158 |
+
$version = substr($version, 0, 5);
|
| 159 |
+
$version = str_replace('.', '', $version);
|
| 160 |
+
while (strlen($version) < 3) {
|
| 161 |
+
$version .= "0";
|
| 162 |
+
}
|
| 163 |
+
|
| 164 |
+
if (((int)$version) < 111) {
|
| 165 |
+
$convertor = Mage::getModel('sales/convert_order');
|
| 166 |
+
$invoice = $convertor->toInvoice($order);
|
| 167 |
+
foreach ($order->getAllItems() as $orderItem) {
|
| 168 |
+
if (!$orderItem->getQtyToInvoice()) {
|
| 169 |
+
continue;
|
| 170 |
+
}
|
| 171 |
+
$item = $convertor->itemToInvoiceItem($orderItem);
|
| 172 |
+
$item->setQty($orderItem->getQtyToInvoice());
|
| 173 |
+
$invoice->addItem($item);
|
| 174 |
+
}
|
| 175 |
+
$invoice->collectTotals();
|
| 176 |
+
|
| 177 |
+
} else {
|
| 178 |
+
$invoice = $order->prepareInvoice();
|
| 179 |
+
}
|
| 180 |
+
|
| 181 |
+
$invoice->register()->capture();
|
| 182 |
+
Mage::getModel('core/resource_transaction')
|
| 183 |
+
->addObject($invoice)
|
| 184 |
+
->addObject($invoice->getOrder())
|
| 185 |
+
->save();
|
| 186 |
+
return true;
|
| 187 |
+
}
|
| 188 |
+
|
| 189 |
+
// If invoicing is not allowed : send Secuvad XML flow
|
| 190 |
+
// Envoi du flux à Secuvad
|
| 191 |
+
if(Mage::getModel('secuvad/functions')->check_associations())
|
| 192 |
+
{
|
| 193 |
+
Mage::getModel('secuvad/logs')->Log("Transaction ".$order->getRealOrderId()." non transmise à SECUVAD car les associations ne sont pas complètes");
|
| 194 |
+
return($this);
|
| 195 |
+
}
|
| 196 |
+
|
| 197 |
+
//Envoi de la transaction
|
| 198 |
+
$orders_id[0] = $order->getId();
|
| 199 |
+
$flux = Mage::getModel('secuvad/orders')->get_flux_xml($orders_id);
|
| 200 |
+
$response = Mage::getModel('secuvad/functions')->send($flux,'bulk_transactions',$order->getStore()->getWebsite()->getId());
|
| 201 |
+
$order->save(Mage::getModel('secuvad/functions')->single_response($order, $response));
|
| 202 |
+
|
| 203 |
+
return false;
|
| 204 |
+
}
|
| 205 |
+
}
|
app/code/community/Secuvad/Core/etc/config.xml
CHANGED
|
@@ -2,7 +2,7 @@
|
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Secuvad_Core>
|
| 5 |
-
<version>1.2.
|
| 6 |
</Secuvad_Core>
|
| 7 |
</modules>
|
| 8 |
<admin>
|
|
@@ -113,6 +113,10 @@
|
|
| 113 |
<from><![CDATA[#^/paybox/system/#]]></from>
|
| 114 |
<to>/core/paybox/</to>
|
| 115 |
</secuvad_core_paybox>
|
|
|
|
|
|
|
|
|
|
|
|
|
| 116 |
</rewrite>
|
| 117 |
|
| 118 |
|
| 2 |
<config>
|
| 3 |
<modules>
|
| 4 |
<Secuvad_Core>
|
| 5 |
+
<version>1.2.4</version>
|
| 6 |
</Secuvad_Core>
|
| 7 |
</modules>
|
| 8 |
<admin>
|
| 113 |
<from><![CDATA[#^/paybox/system/#]]></from>
|
| 114 |
<to>/core/paybox/</to>
|
| 115 |
</secuvad_core_paybox>
|
| 116 |
+
<secuvad_core_cybermut>
|
| 117 |
+
<from><![CDATA[#^/cybermut/payment/#]]></from>
|
| 118 |
+
<to>/core/cybermut/</to>
|
| 119 |
+
</secuvad_core_cybermut>
|
| 120 |
</rewrite>
|
| 121 |
|
| 122 |
|
app/code/community/Secuvad/Core/sql/secuvad_setup/mysql4-upgrade-1.2.3-1.2.4.php
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
|
| 3 |
+
$installer = $this;
|
package.xml
CHANGED
|
@@ -1,21 +1,20 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Secuvad_Official</name>
|
| 4 |
-
<version>1.2.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>gpl</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
-
<summary>Détection de commandes frauduleuses, garantie impayés et recouvrement d
|
| 10 |
<description>Ce module soumet vos commandes automatiquement à Secuvad pour évaluation ; une commande peut être VALIDE ou INVALIDE (potentiellement frauduleuse), libre au commerçant de la livrer ou non.
|
| 11 |
|
| 12 |
-
Le module permet également de soumettre les commandes impayées (généralement pour contestation du porteur de la carte de paiement) et d
|
| 13 |
-
<notes>Added
|
| 14 |
-
Added Paybox support.</notes>
|
| 15 |
<authors><author><name>SECUVAD</name><user>auto-converted</user><email>magento@secuvad.com</email></author></authors>
|
| 16 |
-
<date>2011-
|
| 17 |
-
<time>
|
| 18 |
-
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="secuvad"><file name="attention.gif" hash="21ff0e6ba24381e63789116139180cf0"/><file name="checkclient.gif" hash="9401025d89a0377aa3d844e7f8686165"/><file name="encours.gif" hash="d0ae3817653558109a8e86bc0019105b"/><file name="erreur.gif" hash="4f24dfdde996f4aad5fbc89232a5bece"/><file name="green.gif" hash="0db2c4f24c0f0c3f7958a05181af897a"/><file name="logo secuvad.gif" hash="41a5fb1c927dfcd42bf421a57f3a9a60"/><file name="not_send.gif" hash="1aaa96fc1319e16a85b3841c840f2721"/><file name="not_sent.gif" hash="eec242544fc4dde4cf5b3038bb2c05b1"/><file name="wait.gif" hash="a45c8b57a8c1b7d07ab1bf37afdbc1e9"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="secuvad.xml" hash="63fa23f485989a6a0c19be6741556132"/></dir><dir name="template"><dir name="secuvad"><file name="categoriestree.phtml" hash="7188384f3e2e97259f7e0f6b6f93861f"/><file name="category.phtml" hash="a283dbbe1778c67031834bca9c0fe481"/><file name="categorytreeformcontenair.phtml" hash="1b818bb058d5513d28a47b9a6535a205"/><file name="payment.phtml" hash="b295dbd8d20241871df61201ea92be85"/><file name="record.phtml" hash="321ae6785aeaa48935f6169f620ad7a9"/><file name="shipping.phtml" hash="e3716a26475ba04e4317a235b9c0ba30"/><file name="support.phtml" hash="ebb063392ab049483bcc2a3a7895aa5a"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Secuvad.csv" hash="4e204d9143c8f406bc374825dab586d2"/></dir></target><target name="mageetc"><dir name="modules"><file name="Secuvad_Core.xml" hash="899d1b84d64cade01ea8de99afc1ebd2"/></dir></target><target name="magecommunity"><dir name="Secuvad"><dir name="Core"><dir name="Block"><dir name="Category"><dir name="Typeproduct"><dir name="Edit"><file name="Form.php" hash="486db76ab65b0c7f482f2f2d27e6965e"/></dir><file name="Edit.php" hash="cf01f54e65e58d7346c3fe354a25f219"/></dir></dir><dir name="Logs"><file name="Grid.php" hash="785df5f8695cf8f7b20720cc93588ab4"/></dir><dir name="Orders"><dir name="View"><dir name="Tab"><file name="Secuvad.php" hash="a3a2f6e71601328ddd80ee0661912c09"/></dir></dir><file name="Grid.php" hash="
|
| 19 |
<compatible/>
|
| 20 |
<dependencies/>
|
| 21 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Secuvad_Official</name>
|
| 4 |
+
<version>1.2.4</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>gpl</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
+
<summary>Détection de commandes frauduleuses, garantie impayés et recouvrement d&apos;impayés.</summary>
|
| 10 |
<description>Ce module soumet vos commandes automatiquement à Secuvad pour évaluation ; une commande peut être VALIDE ou INVALIDE (potentiellement frauduleuse), libre au commerçant de la livrer ou non.
|
| 11 |
|
| 12 |
+
Le module permet également de soumettre les commandes impayées (généralement pour contestation du porteur de la carte de paiement) et d&apos;en demander le recouvrement par Secuvad.</description>
|
| 13 |
+
<notes>Added Ogone support</notes>
|
|
|
|
| 14 |
<authors><author><name>SECUVAD</name><user>auto-converted</user><email>magento@secuvad.com</email></author></authors>
|
| 15 |
+
<date>2011-02-15</date>
|
| 16 |
+
<time>10:05:31</time>
|
| 17 |
+
<contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="secuvad"><file name="attention.gif" hash="21ff0e6ba24381e63789116139180cf0"/><file name="checkclient.gif" hash="9401025d89a0377aa3d844e7f8686165"/><file name="encours.gif" hash="d0ae3817653558109a8e86bc0019105b"/><file name="erreur.gif" hash="4f24dfdde996f4aad5fbc89232a5bece"/><file name="green.gif" hash="0db2c4f24c0f0c3f7958a05181af897a"/><file name="logo secuvad.gif" hash="41a5fb1c927dfcd42bf421a57f3a9a60"/><file name="not_send.gif" hash="1aaa96fc1319e16a85b3841c840f2721"/><file name="not_sent.gif" hash="eec242544fc4dde4cf5b3038bb2c05b1"/><file name="wait.gif" hash="a45c8b57a8c1b7d07ab1bf37afdbc1e9"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="secuvad.xml" hash="63fa23f485989a6a0c19be6741556132"/></dir><dir name="template"><dir name="secuvad"><file name="categoriestree.phtml" hash="7188384f3e2e97259f7e0f6b6f93861f"/><file name="category.phtml" hash="a283dbbe1778c67031834bca9c0fe481"/><file name="categorytreeformcontenair.phtml" hash="1b818bb058d5513d28a47b9a6535a205"/><file name="payment.phtml" hash="b295dbd8d20241871df61201ea92be85"/><file name="record.phtml" hash="321ae6785aeaa48935f6169f620ad7a9"/><file name="shipping.phtml" hash="e3716a26475ba04e4317a235b9c0ba30"/><file name="support.phtml" hash="ebb063392ab049483bcc2a3a7895aa5a"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Secuvad.csv" hash="4e204d9143c8f406bc374825dab586d2"/></dir></target><target name="mageetc"><dir name="modules"><file name="Secuvad_Core.xml" hash="899d1b84d64cade01ea8de99afc1ebd2"/></dir></target><target name="magecommunity"><dir name="Secuvad"><dir name="Core"><dir name="Block"><dir name="Category"><dir name="Typeproduct"><dir name="Edit"><file name="Form.php" hash="486db76ab65b0c7f482f2f2d27e6965e"/></dir><file name="Edit.php" hash="cf01f54e65e58d7346c3fe354a25f219"/></dir></dir><dir name="Logs"><file name="Grid.php" hash="785df5f8695cf8f7b20720cc93588ab4"/></dir><dir name="Orders"><dir name="View"><dir name="Tab"><file name="Secuvad.php" hash="a3a2f6e71601328ddd80ee0661912c09"/></dir></dir><file name="Grid.php" hash="af202e181a2e24f1d7be7e76dfd15c21"/></dir><dir name="Tree"><file name="Abstract.php" hash="3013e48bc03951232a2ffc5fecaa5f4f"/><file name="TypeProduct.php" hash="8b35e222b83fdc759454653f499b931c"/></dir><dir name="Widget"><dir name="Grid"><dir name="Column"><dir name="Renderer"><file name="Fraud.php" hash="563db9a00222318ba4dd556783504899"/><file name="Secuvad.php" hash="3d7ce70c2d8c2ae591bae50d7f416ac1"/></dir></dir></dir></dir><file name="Logs.php" hash="b7b65a4571dd5a3359e883fef6677b43"/><file name="Orders.php" hash="e664584ca0a84245ef9c0d43ece34519"/><file name="Secuvad.php" hash="289ce5411d6a7f468499b2c230ca44ae"/></dir><dir name="Controller"><dir name="Tree"><file name="Abstract.php" hash="ff617e4b343adb4c7bb227a9bc285e1f"/><file name="TypeProduct.php" hash="38fcdf70c6f93256de69f3dfc1a5eda2"/></dir></dir><dir name="controllers"><dir name="Category"><file name="TypeproductController.php" hash="e761c91ff641fa1327191c4421f278e9"/></dir><file name="ApiController.php" hash="e5b00f4463839d17b9f4143f800e6705"/><file name="CategoryController.php" hash="7b04cce25577707fe52ce0a889110ffc"/><file name="CybermutController.php" hash="ed13571de3323e8fd70c1594010581f2"/><file name="LogsController.php" hash="2b79c7ed62f901d9f7ab5655b11240dd"/><file name="OrdersController.php" hash="a98e52657ad5332528513a3be477e0fa"/><file name="PayboxController.php" hash="f4b48685ede8a5f4617fefaf85bae8bc"/><file name="PaymentController.php" hash="0abee9a954b9c055f69d1289858efb20"/><file name="RecordController.php" hash="c637bfd016d95b87a1b51882bb0f18b1"/><file name="ShippingController.php" hash="fb0cd11e310d87f6ae9fe93acac88f91"/><file name="SpplusController.php" hash="62e86b0b2c981c58f7fe5098de9079c1"/><file name="StandardController.php" hash="90f9759ac2ccf9dbfe197f2a147d704b"/><file name="SupportController.php" hash="35aca7138042e6e20e3b57454526c2cb"/></dir><dir name="etc"><file name="api.xml" hash="87641156c9945f4eee0b805c5a48e992"/><file name="config.xml" hash="963f50376944bc2492e7d614b309c77b"/></dir><dir name="Helper"><file name="Data.php" hash="fd430008d4d055968fd141aef9d35fae"/></dir><dir name="Model"><dir name="Api"><file name="Resource.php" hash="2b699b206d89e21866b7785e726d64fd"/></dir><dir name="Category"><file name="Association.php" hash="4f7307b4534da5d2c1953f1669418fc2"/><file name="Category.php" hash="4e0ac35e3cc30de29ef5613207cf0b07"/><file name="CategoryConfig.php" hash="1541e8c0a80feda93ac1c8b02bdb7407"/></dir><dir name="Configuration"><file name="Config.php" hash="ddec0ccd6cfcb8f71ce3ee6e433607d4"/></dir><dir name="Mysql4"><dir name="Category"><dir name="Association"><file name="Collection.php" hash="04060fc7d2c250efe44f8c8bcc8b6333"/></dir><dir name="Category"><file name="Collection.php" hash="31b712992b4a36af5a0ed64d4fc7b80c"/></dir><file name="Association.php" hash="5c8dfd1736cf0ec1e34ae05d86a517a0"/><file name="Category.php" hash="5d36c0f0f442b90352ea7082b7488972"/></dir><dir name="Configuration"><dir name="Config"><file name="Collection.php" hash="21472d7c12890f37785e181e0b669303"/></dir><file name="Config.php" hash="5b33de688a7c1073bd2936210c02fd5d"/></dir><dir name="Logs"><file name="Collection.php" hash="bccf0306b184a8919a87a1cfbc9c19e4"/></dir><dir name="Orders"><file name="Collection.php" hash="fdc3206681cd8516c639bfca864ccafc"/></dir><dir name="Payment"><dir name="Association"><file name="Collection.php" hash="7b83f01b0fc6b224064c108b464a09c3"/></dir><dir name="Payment"><file name="Collection.php" hash="038f2890fd62ba5873099ae89b1a761c"/></dir><file name="Association.php" hash="73e7a5eae0bcb23cd95c50c53cbe4a63"/><file name="Payment.php" hash="022649b3eebbf071202daa65fd97b066"/></dir><dir name="Shipping"><dir name="Association"><file name="Collection.php" hash="f3039a1dc4da9bbcabd4e6a5672db2af"/></dir><dir name="Transport"><file name="Collection.php" hash="e31e73ad8b505f946da07632fecd775c"/></dir><dir name="TransportDelay"><file name="Collection.php" hash="e62e389e2b41ac58bc8d2c28dd5fe6e3"/></dir><file name="Association.php" hash="e6c2a03d6c42c79ee9db6f29e8a22e21"/><file name="Transport.php" hash="c491f085e009ccf9681c14f0778a6753"/><file name="TransportDelay.php" hash="e02ffd3b28bb0931db2448a7c818d559"/></dir><file name="Abstract.php" hash="a823b320cd8c51b748e064b9119ab2e8"/><file name="Logs.php" hash="244942612504f433a0b7f2d242bd88a0"/><file name="Orders.php" hash="ecc48f6be218aedfe4be4bbb03e4af77"/><file name="Setup.php" hash="460c10e5c6a477f0308e2540537f3aac"/></dir><dir name="Paybox"><file name="System.php" hash="4098e42585d3d6ce72089b73d59f57ff"/></dir><dir name="Payment"><file name="Association.php" hash="11e21d2e02b3b3d55400be41c69c3414"/><file name="Payment.php" hash="64d20a9588fb08bc524ddb059c18830a"/><file name="PaymentConfig.php" hash="4e56f43bfb4a602aa044e0e4d1516171"/></dir><dir name="Sales"><dir name="Invoice"><file name="Observer.php" hash="22f094e29c3ed81a89f1de0690b962d0"/></dir></dir><dir name="Shipping"><file name="Association.php" hash="3d51ead13bc06f91772db3df7243c5f8"/><file name="ShippingConfig.php" hash="e6f72e9221bb1d156ec48024d918f4ac"/><file name="Transport.php" hash="fc307af682fce5cc3745243fd8eced1f"/><file name="TransportDelay.php" hash="ffd1266d57e47830307c8edc9364f3b2"/></dir><file name="Api.php" hash="9ce1d63ab7b12a52e8438be04c30ddd4"/><file name="Fraud.php" hash="bc8712c607d425ae265c329266b3245a"/><file name="Functions.php" hash="e12eb2caa2b88bdf754e816b66c5059a"/><file name="Logs.php" hash="a838d991cb8e00d1e5ae247289c94010"/><file name="Orders.php" hash="a79459a1ecca1f2c24c4647a4568382d"/><file name="Record.php" hash="2c963bc4b256318ce2c75d93ac964fc2"/><file name="Support.php" hash="1b71d9453efde0812a20a8401a1e110c"/><file name="System.php" hash="c22c4915a5cad328c3e907d42688dce0"/></dir><dir name="sql"><dir name="secuvad_setup"><file name="mysql4-install-1.2.0.php" hash="2ac15b314729dc0df319d270cfb61f78"/><file name="mysql4-uninstall-1.2.0.php" hash="40af4201373892cfad73a1f1c9517772"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="3ea69d93ace824cd0198a5d456753284"/><file name="mysql4-upgrade-1.2.2-1.2.3.php" hash="3ea69d93ace824cd0198a5d456753284"/><file name="mysql4-upgrade-1.2.3-1.2.4.php" hash="3ea69d93ace824cd0198a5d456753284"/></dir></dir><file name="Default.php" hash="7b0b8cd94b771547f0fff9bbabf80d20"/></dir></dir></target></contents>
|
| 18 |
<compatible/>
|
| 19 |
<dependencies/>
|
| 20 |
</package>
|
