Version Notes
Official commit
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Fianet_Sac |
| Version | 1.1.2 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.1 to 1.1.2
- app/code/community/Fianet/Sac/Block/Adminhtml/Payment/Configuration.php +1 -1
- app/code/community/Fianet/Sac/Block/Adminhtml/Payment/Edit/Form.php +1 -1
- app/code/community/Fianet/Sac/Helper/Data.php +1 -1
- app/code/community/Fianet/Sac/Helper/Order.php +48 -34
- app/code/community/Fianet/Sac/Model/Action.php +97 -74
- app/code/community/Fianet/Sac/Model/Fianet/Order/Info/Sac.php +1 -1
- app/code/community/Fianet/Sac/Model/Fianet/Order/Sac.php +10 -8
- app/code/community/Fianet/Sac/Model/Mysql4/Payment/Association.php +1 -1
- app/code/community/Fianet/Sac/Model/Mysql4/Payment/Association/Collection.php +1 -1
- app/code/community/Fianet/Sac/Model/Observer.php +8 -2
- app/code/community/Fianet/Sac/Model/Payment/Association.php +1 -1
- app/code/community/Fianet/Sac/Model/Product.php +1 -1
- app/code/community/Fianet/Sac/Model/Source/Statut.php +1 -1
- app/code/community/Fianet/Sac/Model/Source/Type.php +1 -1
- app/code/community/Fianet/Sac/controllers/Adminhtml/PaymentController.php +1 -1
- app/code/community/Fianet/Sac/etc/adminhtml.xml +1 -1
- app/code/community/Fianet/Sac/etc/config.xml +2 -2
- app/code/community/Fianet/Sac/etc/system.xml +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-install-0.0.1.php +2 -2
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.1-0.0.2.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.10-0.0.11.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.11-0.0.12.php +2 -2
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.12-0.0.13.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.13-1.0.0.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.2-0.0.3.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.3-0.0.4.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.4-0.0.5.php +1 -1
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-1.0.0-1.0.1.php +2 -2
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-1.0.3-1.0.4.php +2 -2
- app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-1.0.5-1.1.0.php +2 -2
- app/design/adminhtml/default/default/layout/sac.xml +1 -1
- app/etc/modules/Fianet_Sac.xml +2 -2
- package.xml +4 -4
app/code/community/Fianet/Sac/Block/Adminhtml/Payment/Configuration.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Block_Adminhtml_Payment_Configuration extends Mage_Adminhtml_Block_Widget_Form_Container {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Block_Adminhtml_Payment_Configuration extends Mage_Adminhtml_Block_Widget_Form_Container {
|
app/code/community/Fianet/Sac/Block/Adminhtml/Payment/Edit/Form.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Block_Adminhtml_Payment_Edit_Form extends Mage_Adminhtml_Block_Widget_Form {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Block_Adminhtml_Payment_Edit_Form extends Mage_Adminhtml_Block_Widget_Form {
|
app/code/community/Fianet/Sac/Helper/Data.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Helper_Data extends Mage_Core_Helper_Abstract {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Helper_Data extends Mage_Core_Helper_Abstract {
|
app/code/community/Fianet/Sac/Helper/Order.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
@@ -68,9 +68,11 @@ class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
| 68 |
$this->_tables[] = $orderGrid;
|
| 69 |
}
|
| 70 |
|
| 71 |
-
public function canSendOrder($order, $orderId = 0, $isMissingOrder = false) {
|
|
|
|
|
|
|
| 72 |
//Récupération des Status définis dans les paramétrages du module
|
| 73 |
-
$myarray = Mage::getStoreConfig('sac/sacconfg/procasso',
|
| 74 |
if ($myarray)
|
| 75 |
$modeArray = explode(',', $myarray);
|
| 76 |
else
|
|
@@ -86,20 +88,20 @@ class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
| 86 |
if ($order->getStatus() != '') {
|
| 87 |
//Si le type de paiement est Franfinance, alors on vérifie l'activation de "activefranfinance", sinon de "active"
|
| 88 |
if (($order->getPayment()->getMethod() == "atos3xweb_web" || $order->getPayment()->getMethod() == "atos3s_sprint")) {
|
| 89 |
-
if (Mage::getStoreConfig('sac/sacconfg/activefranfinance') == 0) {
|
| 90 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: Franfinance mode disabled, order #%s not sent.', $order->getIncrementId()));
|
| 91 |
return false;
|
| 92 |
}
|
| 93 |
-
if (Mage::getStoreConfig('sac/sacconfg/idfranfinance') == "") {
|
| 94 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: Franfinance Certissim ID not specified, order #%s not sent.', $order->getIncrementId()));
|
| 95 |
return false;
|
| 96 |
}
|
| 97 |
} else {
|
| 98 |
-
if (Mage::getStoreConfig('sac/sacconfg/active') == 0) {
|
| 99 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: module disabled, order #%s not sent.', $order->getIncrementId()));
|
| 100 |
return false;
|
| 101 |
}
|
| 102 |
-
if (Mage::getStoreConfig('sac/sacconfg/siteid') == "") {
|
| 103 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: SiteID not specified, order #%s not sent.', $order->getIncrementId()));
|
| 104 |
return false;
|
| 105 |
}
|
|
@@ -124,7 +126,7 @@ class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
| 124 |
}
|
| 125 |
|
| 126 |
//Pas d'envoi si la commande a été passée avant le délai indiqué dans le module
|
| 127 |
-
$time = Mage::getStoreConfig('sac/sacconfg/timecontrol');
|
| 128 |
//Si mauvais format, aucune vérification
|
| 129 |
if(isset($time) && is_numeric($time)){
|
| 130 |
//récupération de la date max à comparer et mise au format Date
|
|
@@ -165,22 +167,24 @@ class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
| 165 |
public function processResponse($responses, $orderIds = array()) {
|
| 166 |
$nb = 0;
|
| 167 |
$this->_initConnections();
|
| 168 |
-
|
| 169 |
// On indique que la commande a été envoyée
|
| 170 |
foreach ($orderIds as $orderId) {
|
| 171 |
$order = Mage::getModel('sales/order')->load($orderId);
|
|
|
|
| 172 |
|
| 173 |
-
|
| 174 |
-
|
| 175 |
-
|
| 176 |
-
|
| 177 |
-
|
| 178 |
-
|
| 179 |
-
|
| 180 |
-
foreach ($results as $result) {
|
| 181 |
-
$storeId = $result['store_id'];
|
| 182 |
-
}
|
| 183 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 184 |
$mode = Mage::getStoreConfig('sac/sacconfg/mode', $storeId);
|
| 185 |
if ($mode == null && $storeId > 0)
|
| 186 |
$mode = Mage::getStoreConfig('sac/sacconfg/mode', '0');
|
|
@@ -190,18 +194,23 @@ class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
| 190 |
} else {
|
| 191 |
$mode = 'TEST';
|
| 192 |
}
|
| 193 |
-
|
| 194 |
$franfinancePayment = ($order->getPayment()->getMethod() == "atos3xweb_web" || $order->getPayment()->getMethod() == "atos3s_sprint") ? 1 : 0;
|
| 195 |
-
|
| 196 |
-
|
| 197 |
-
|
| 198 |
-
|
| 199 |
-
|
| 200 |
-
|
| 201 |
-
$
|
| 202 |
-
|
| 203 |
-
|
| 204 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 205 |
}
|
| 206 |
|
| 207 |
// On traite les réponses
|
|
@@ -209,10 +218,15 @@ class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
|
| 209 |
if ($response['etat'] == 'error' || $response['etat'] == 'encours') {
|
| 210 |
// Mise à jour par SQL sinon boucle infinie
|
| 211 |
foreach ($this->_tables as $table) {
|
| 212 |
-
|
| 213 |
-
|
| 214 |
-
|
| 215 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 216 |
}
|
| 217 |
|
| 218 |
$nb++;
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Helper_Order extends Mage_Core_Helper_Abstract {
|
| 68 |
$this->_tables[] = $orderGrid;
|
| 69 |
}
|
| 70 |
|
| 71 |
+
public function canSendOrder($order, $orderId = 0, $isMissingOrder = false) {
|
| 72 |
+
$storeId = $order->getStore()->getId();
|
| 73 |
+
|
| 74 |
//Récupération des Status définis dans les paramétrages du module
|
| 75 |
+
$myarray = Mage::getStoreConfig('sac/sacconfg/procasso', $storeId);
|
| 76 |
if ($myarray)
|
| 77 |
$modeArray = explode(',', $myarray);
|
| 78 |
else
|
| 88 |
if ($order->getStatus() != '') {
|
| 89 |
//Si le type de paiement est Franfinance, alors on vérifie l'activation de "activefranfinance", sinon de "active"
|
| 90 |
if (($order->getPayment()->getMethod() == "atos3xweb_web" || $order->getPayment()->getMethod() == "atos3s_sprint")) {
|
| 91 |
+
if (Mage::getStoreConfig('sac/sacconfg/activefranfinance', $storeId) == 0) {
|
| 92 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: Franfinance mode disabled, order #%s not sent.', $order->getIncrementId()));
|
| 93 |
return false;
|
| 94 |
}
|
| 95 |
+
if (Mage::getStoreConfig('sac/sacconfg/idfranfinance', $storeId) == "") {
|
| 96 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: Franfinance Certissim ID not specified, order #%s not sent.', $order->getIncrementId()));
|
| 97 |
return false;
|
| 98 |
}
|
| 99 |
} else {
|
| 100 |
+
if (Mage::getStoreConfig('sac/sacconfg/active', $storeId) == 0) {
|
| 101 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: module disabled, order #%s not sent.', $order->getIncrementId()));
|
| 102 |
return false;
|
| 103 |
}
|
| 104 |
+
if (Mage::getStoreConfig('sac/sacconfg/siteid', $storeId) == "") {
|
| 105 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: SiteID not specified, order #%s not sent.', $order->getIncrementId()));
|
| 106 |
return false;
|
| 107 |
}
|
| 126 |
}
|
| 127 |
|
| 128 |
//Pas d'envoi si la commande a été passée avant le délai indiqué dans le module
|
| 129 |
+
$time = Mage::getStoreConfig('sac/sacconfg/timecontrol', $storeId);
|
| 130 |
//Si mauvais format, aucune vérification
|
| 131 |
if(isset($time) && is_numeric($time)){
|
| 132 |
//récupération de la date max à comparer et mise au format Date
|
| 167 |
public function processResponse($responses, $orderIds = array()) {
|
| 168 |
$nb = 0;
|
| 169 |
$this->_initConnections();
|
| 170 |
+
|
| 171 |
// On indique que la commande a été envoyée
|
| 172 |
foreach ($orderIds as $orderId) {
|
| 173 |
$order = Mage::getModel('sales/order')->load($orderId);
|
| 174 |
+
$table = $this->_resource->getTableName('sales/order');
|
| 175 |
|
| 176 |
+
$select = $this->_readConnection->select()
|
| 177 |
+
->from($table, array('store_id'))
|
| 178 |
+
->where('entity_id =?', $orderId)
|
| 179 |
+
->limit(1);
|
| 180 |
+
|
| 181 |
+
$row = $this->_readConnection->fetchRow($select);
|
|
|
|
|
|
|
|
|
|
|
|
|
| 182 |
|
| 183 |
+
if (count($row) == 0)
|
| 184 |
+
continue; // Pas de résultat trouvé
|
| 185 |
+
|
| 186 |
+
$storeId = $row['store_id'];
|
| 187 |
+
|
| 188 |
$mode = Mage::getStoreConfig('sac/sacconfg/mode', $storeId);
|
| 189 |
if ($mode == null && $storeId > 0)
|
| 190 |
$mode = Mage::getStoreConfig('sac/sacconfg/mode', '0');
|
| 194 |
} else {
|
| 195 |
$mode = 'TEST';
|
| 196 |
}
|
| 197 |
+
|
| 198 |
$franfinancePayment = ($order->getPayment()->getMethod() == "atos3xweb_web" || $order->getPayment()->getMethod() == "atos3s_sprint") ? 1 : 0;
|
| 199 |
+
|
| 200 |
+
// Mise à jour par SQL sinon boucle infinie
|
| 201 |
+
foreach($this->_tables as $table) {
|
| 202 |
+
$this->_writeConnection->beginTransaction();
|
| 203 |
+
|
| 204 |
+
$__fields = array();
|
| 205 |
+
$__fields['fianet_sac_sent'] = 1;
|
| 206 |
+
$__fields['fianet_sac_mode'] = $mode;
|
| 207 |
+
$__fields['fianet_sac_franfinance'] = $franfinancePayment;
|
| 208 |
+
$__where = $this->_writeConnection->quoteInto('entity_id =?',$orderId);
|
| 209 |
+
|
| 210 |
+
$this->_writeConnection->update($table, $__fields, $__where);
|
| 211 |
+
|
| 212 |
+
$this->_writeConnection->commit();
|
| 213 |
+
}
|
| 214 |
}
|
| 215 |
|
| 216 |
// On traite les réponses
|
| 218 |
if ($response['etat'] == 'error' || $response['etat'] == 'encours') {
|
| 219 |
// Mise à jour par SQL sinon boucle infinie
|
| 220 |
foreach ($this->_tables as $table) {
|
| 221 |
+
$this->_writeConnection->beginTransaction();
|
| 222 |
+
|
| 223 |
+
$__fields = array();
|
| 224 |
+
$__fields['fianet_sac_evaluation'] = $response['etat'];
|
| 225 |
+
$__where = $this->_writeConnection->quoteInto('increment_id =?', $response['refid']);
|
| 226 |
+
|
| 227 |
+
$this->_writeConnection->update($table, $__fields, $__where);
|
| 228 |
+
|
| 229 |
+
$this->_writeConnection->commit();
|
| 230 |
}
|
| 231 |
|
| 232 |
$nb++;
|
app/code/community/Fianet/Sac/Model/Action.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Action {
|
|
@@ -72,14 +72,19 @@ class Fianet_Sac_Model_Action {
|
|
| 72 |
$sender->addOrder($SacOrder);
|
| 73 |
$response = $sender->send();
|
| 74 |
Mage::helper('sac/order')->processResponse($response, array($order->getId()));
|
| 75 |
-
|
| 76 |
// On indique que cette commande ne dois plus être envoyée
|
| 77 |
-
// Mise à jour par SQL sinon boucle infinie
|
| 78 |
$table = self::$_resource->getTableName('sales/order');
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 83 |
|
| 84 |
$nb++;
|
| 85 |
} catch (Exception $e) {
|
|
@@ -92,7 +97,7 @@ class Fianet_Sac_Model_Action {
|
|
| 92 |
public static function getEvaluation($orderIds = array()) {
|
| 93 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: attempt to retrieve evaluation...'));
|
| 94 |
$nb = 0;
|
| 95 |
-
|
| 96 |
$collection = Mage::getResourceModel('sales/order_collection')
|
| 97 |
->addAttributeToSelect('increment_id')
|
| 98 |
->addAttributeToSelect('store_id')
|
|
@@ -114,8 +119,9 @@ class Fianet_Sac_Model_Action {
|
|
| 114 |
// Uniquement les commandes sélectionnées quand évaluation lancée depuis le back-office
|
| 115 |
if (is_array($orderIds) && (count($orderIds) > 0))
|
| 116 |
$collection->addAttributeToFilter('entity_id', array('in' => $orderIds));
|
| 117 |
-
|
| 118 |
$collection->load();
|
|
|
|
| 119 |
$order_list = array();
|
| 120 |
foreach ($collection as $order) {
|
| 121 |
$fromstoreid = $order->getStoreId();
|
|
@@ -137,51 +143,61 @@ class Fianet_Sac_Model_Action {
|
|
| 137 |
$order_list[$siteid]['mode'] = $order->getFianetSacMode();
|
| 138 |
$order_list[$siteid]['orders'][] = $order->getIncrementId();
|
| 139 |
}
|
| 140 |
-
|
| 141 |
// Récupération des évaluations des commandes
|
| 142 |
$evaluations = Mage::getModel('fianet/fianet_sender')->getEvaluations($order_list);
|
|
|
|
| 143 |
self::_initConnections();
|
| 144 |
-
|
| 145 |
foreach ($evaluations as $evaluation) {
|
| 146 |
$eval = (isset($evaluation['eval'])) ? $evaluation['eval'] : $evaluation['info'];
|
|
|
|
| 147 |
if (isset($eval)) {
|
| 148 |
-
$maj_value = false;
|
| 149 |
foreach (self::$_tables as $table) {
|
| 150 |
// On vérifie si le statutCoEx ou l'évaluation a évolué, sinon on ne fait rien
|
| 151 |
-
|
| 152 |
-
|
| 153 |
-
|
| 154 |
-
|
| 155 |
-
|
| 156 |
-
|
| 157 |
-
|
|
|
|
| 158 |
|
| 159 |
//Si statutCoEx ou évaluation de l'appel est différent de celui en BDD
|
| 160 |
if (isset($evaluation['statutcoex']) && (($statutCoEx != $evaluation['statutcoex']) || ($eval != $evaluationOrder))) {
|
| 161 |
-
|
| 162 |
-
|
|
|
|
|
|
|
|
|
|
| 163 |
|
| 164 |
// uniquement pour la table sales_flat_order
|
| 165 |
-
if
|
| 166 |
-
if
|
| 167 |
-
|
| 168 |
-
|
| 169 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 170 |
|
| 171 |
if ($sendAgain == '0') {
|
| 172 |
-
// indique qu'il
|
| 173 |
-
$
|
| 174 |
}
|
| 175 |
}
|
| 176 |
}
|
| 177 |
-
|
|
|
|
| 178 |
|
| 179 |
// On met à jour les commandes
|
| 180 |
try {
|
| 181 |
-
$maj_value = true;
|
| 182 |
-
self::$_writeConnection->
|
| 183 |
-
|
| 184 |
-
catch
|
| 185 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: %s.', $e->getMessage()));
|
| 186 |
}
|
| 187 |
}
|
|
@@ -219,53 +235,60 @@ class Fianet_Sac_Model_Action {
|
|
| 219 |
|
| 220 |
foreach ($reevaluations as $reevaluation) {
|
| 221 |
if (isset($reevaluation['eval'])) {
|
| 222 |
-
// Mise à jour par SQL sinon boucle infinie
|
| 223 |
-
foreach (self::$_tables as $table) {
|
| 224 |
-
$queryW = "UPDATE `{$table}`";
|
| 225 |
-
$queryW .= " SET `fianet_sac_reevaluation` = '{$reevaluation['eval']}'";
|
| 226 |
-
$queryW .= " WHERE `increment_id` = '{$reevaluation['refid']}';";
|
| 227 |
-
self::$_writeConnection->query($queryW);
|
| 228 |
-
}
|
| 229 |
-
|
| 230 |
$order = Mage::getModel('sales/order')->loadByIncrementId($reevaluation['refid']);
|
| 231 |
|
| 232 |
-
|
| 233 |
-
|
| 234 |
-
|
| 235 |
-
|
| 236 |
-
|
| 237 |
-
|
| 238 |
-
|
| 239 |
-
|
| 240 |
-
|
| 241 |
-
|
| 242 |
-
|
| 243 |
-
|
| 244 |
-
case('100'):
|
| 245 |
-
$icon = 'rond_vert.gif';
|
| 246 |
-
break;
|
| 247 |
-
case('-1'):
|
| 248 |
-
$icon = 'rond_vertclair.gif';
|
| 249 |
-
break;
|
| 250 |
-
case('0'):
|
| 251 |
-
$icon = 'rond_rouge.gif';
|
| 252 |
-
break;
|
| 253 |
-
default:
|
| 254 |
-
$icon = 'fianet_SAC_icon.gif';
|
| 255 |
-
break;
|
| 256 |
}
|
|
|
|
|
|
|
| 257 |
|
| 258 |
-
|
| 259 |
-
|
| 260 |
-
|
| 261 |
-
|
| 262 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 263 |
|
| 264 |
-
|
| 265 |
-
Mage::getModel('fianet/log')->Log(Mage::helper('fianet')->__('Certissim: %s.', $e->getMessage()));
|
| 266 |
}
|
| 267 |
-
|
| 268 |
-
$nb++;
|
| 269 |
}
|
| 270 |
}
|
| 271 |
}
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Action {
|
| 72 |
$sender->addOrder($SacOrder);
|
| 73 |
$response = $sender->send();
|
| 74 |
Mage::helper('sac/order')->processResponse($response, array($order->getId()));
|
| 75 |
+
|
| 76 |
// On indique que cette commande ne dois plus être envoyée
|
|
|
|
| 77 |
$table = self::$_resource->getTableName('sales/order');
|
| 78 |
+
|
| 79 |
+
self::$_writeConnection->beginTransaction();
|
| 80 |
+
|
| 81 |
+
$__fields = array();
|
| 82 |
+
$__fields['fianet_sac_had_to_send_again'] = '-1';
|
| 83 |
+
$__where = self::$_writeConnection->quoteInto('entity_id =?',$orderId);
|
| 84 |
+
|
| 85 |
+
self::$_writeConnection->update($table, $__fields, $__where);
|
| 86 |
+
|
| 87 |
+
self::$_writeConnection->commit();
|
| 88 |
|
| 89 |
$nb++;
|
| 90 |
} catch (Exception $e) {
|
| 97 |
public static function getEvaluation($orderIds = array()) {
|
| 98 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: attempt to retrieve evaluation...'));
|
| 99 |
$nb = 0;
|
| 100 |
+
|
| 101 |
$collection = Mage::getResourceModel('sales/order_collection')
|
| 102 |
->addAttributeToSelect('increment_id')
|
| 103 |
->addAttributeToSelect('store_id')
|
| 119 |
// Uniquement les commandes sélectionnées quand évaluation lancée depuis le back-office
|
| 120 |
if (is_array($orderIds) && (count($orderIds) > 0))
|
| 121 |
$collection->addAttributeToFilter('entity_id', array('in' => $orderIds));
|
| 122 |
+
|
| 123 |
$collection->load();
|
| 124 |
+
|
| 125 |
$order_list = array();
|
| 126 |
foreach ($collection as $order) {
|
| 127 |
$fromstoreid = $order->getStoreId();
|
| 143 |
$order_list[$siteid]['mode'] = $order->getFianetSacMode();
|
| 144 |
$order_list[$siteid]['orders'][] = $order->getIncrementId();
|
| 145 |
}
|
| 146 |
+
|
| 147 |
// Récupération des évaluations des commandes
|
| 148 |
$evaluations = Mage::getModel('fianet/fianet_sender')->getEvaluations($order_list);
|
| 149 |
+
|
| 150 |
self::_initConnections();
|
|
|
|
| 151 |
foreach ($evaluations as $evaluation) {
|
| 152 |
$eval = (isset($evaluation['eval'])) ? $evaluation['eval'] : $evaluation['info'];
|
| 153 |
+
|
| 154 |
if (isset($eval)) {
|
| 155 |
+
$maj_value = false;
|
| 156 |
foreach (self::$_tables as $table) {
|
| 157 |
// On vérifie si le statutCoEx ou l'évaluation a évolué, sinon on ne fait rien
|
| 158 |
+
$select = self::$_readConnection->select()
|
| 159 |
+
->from($table, array('fianet_sac_evaluation', 'fianet_sac_statutcoex'))
|
| 160 |
+
->where('increment_id =?', $evaluation['refid'])
|
| 161 |
+
->limit(1);
|
| 162 |
+
|
| 163 |
+
$row = self::$_readConnection->fetchRow($select);
|
| 164 |
+
$evaluationOrder = $row['fianet_sac_evaluation'];
|
| 165 |
+
$statutCoEx = $row['fianet_sac_statutcoex'];
|
| 166 |
|
| 167 |
//Si statutCoEx ou évaluation de l'appel est différent de celui en BDD
|
| 168 |
if (isset($evaluation['statutcoex']) && (($statutCoEx != $evaluation['statutcoex']) || ($eval != $evaluationOrder))) {
|
| 169 |
+
self::$_writeConnection->beginTransaction();
|
| 170 |
+
|
| 171 |
+
$__fields = array();
|
| 172 |
+
$__fields['fianet_sac_evaluation'] = $eval;
|
| 173 |
+
$__fields['fianet_sac_statutcoex'] = $evaluation['statutcoex'];
|
| 174 |
|
| 175 |
// uniquement pour la table sales_flat_order
|
| 176 |
+
if(self::$_resource->getTableName('sales/order') == $table) {
|
| 177 |
+
if($eval == 'absente') {
|
| 178 |
+
$selectSendAgain = self::$_readConnection->select()
|
| 179 |
+
->from($table, array('fianet_sac_had_to_send_again'))
|
| 180 |
+
->where('increment_id =?', $evaluation['refid'])
|
| 181 |
+
->limit(1);
|
| 182 |
+
|
| 183 |
+
$row = self::$_readConnection->fetchRow($selectSendAgain);
|
| 184 |
+
$sendAgain = $row['fianet_sac_had_to_send_again'];
|
| 185 |
|
| 186 |
if ($sendAgain == '0') {
|
| 187 |
+
// indique qu'il faudra renvoyer la commande
|
| 188 |
+
$__fields['fianet_sac_had_to_send_again'] = '1';
|
| 189 |
}
|
| 190 |
}
|
| 191 |
}
|
| 192 |
+
|
| 193 |
+
$__where = self::$_writeConnection->quoteInto('increment_id =?',$evaluation['refid']);
|
| 194 |
|
| 195 |
// On met à jour les commandes
|
| 196 |
try {
|
| 197 |
+
$maj_value = true;
|
| 198 |
+
self::$_writeConnection->update($table, $__fields, $__where);
|
| 199 |
+
self::$_writeConnection->commit();
|
| 200 |
+
} catch(Exception $e) {
|
| 201 |
Mage::getModel('fianet/log')->log(Mage::helper('fianet')->__('Certissim: %s.', $e->getMessage()));
|
| 202 |
}
|
| 203 |
}
|
| 235 |
|
| 236 |
foreach ($reevaluations as $reevaluation) {
|
| 237 |
if (isset($reevaluation['eval'])) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 238 |
$order = Mage::getModel('sales/order')->loadByIncrementId($reevaluation['refid']);
|
| 239 |
|
| 240 |
+
// Si la commande n'est pas dans l'état CANCELED ou COMPLETE dans le BO
|
| 241 |
+
if(Mage_Sales_Model_Order::STATE_CANCELED !== $order->getState() && Mage_Sales_Model_Order::STATE_COMPLETE !== $order->getState()) {
|
| 242 |
+
foreach (self::$_tables as $table) {
|
| 243 |
+
self::$_writeConnection->beginTransaction();
|
| 244 |
+
|
| 245 |
+
$__fields = array();
|
| 246 |
+
$__fields['fianet_sac_reevaluation'] = $reevaluation['eval'];
|
| 247 |
+
$__where = self::$_writeConnection->quoteInto('increment_id =?',$reevaluation['refid']);
|
| 248 |
+
|
| 249 |
+
self::$_writeConnection->update($table, $__fields, $__where);
|
| 250 |
+
|
| 251 |
+
self::$_writeConnection->commit();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 252 |
}
|
| 253 |
+
|
| 254 |
+
Mage::getModel('fianet/log')->Log(Mage::helper('fianet')->__('Certissim: order %s updated to eval %s.', $reevaluation['refid'], $reevaluation['eval']));
|
| 255 |
|
| 256 |
+
try {
|
| 257 |
+
$notification = Mage::getModel('adminnotification/inbox');
|
| 258 |
+
$notification->setseverity(Mage_AdminNotification_Model_Inbox::SEVERITY_MINOR);
|
| 259 |
+
$notification->setTitle(Mage::helper('fianet')->__('Certissim: order %s has been reevaluated.', $reevaluation['refid']));
|
| 260 |
+
$notification->setDate_added(date('Y-m-d H:i:s'));
|
| 261 |
+
|
| 262 |
+
switch ($reevaluation['eval']) {
|
| 263 |
+
case ('error') :
|
| 264 |
+
$icon = 'attention.gif';
|
| 265 |
+
break;
|
| 266 |
+
case('100'):
|
| 267 |
+
$icon = 'rond_vert.gif';
|
| 268 |
+
break;
|
| 269 |
+
case('-1'):
|
| 270 |
+
$icon = 'rond_vertclair.gif';
|
| 271 |
+
break;
|
| 272 |
+
case('0'):
|
| 273 |
+
$icon = 'rond_rouge.gif';
|
| 274 |
+
break;
|
| 275 |
+
default:
|
| 276 |
+
$icon = 'fianet_SAC_icon.gif';
|
| 277 |
+
break;
|
| 278 |
+
}
|
| 279 |
+
|
| 280 |
+
$img = '<a href="' . self::getUrlBO($order) . '" target="_BLANK"><img src="' . Mage::getDesign()->getSkinUrl('images/fianet/' . $icon) . '"><a>';
|
| 281 |
+
$message = Mage::helper('fianet')->__('Certissim: the order %s has now evaluation %s.', $reevaluation['refid'], $img);
|
| 282 |
+
|
| 283 |
+
$notification->setDescription($message);
|
| 284 |
+
$notification->save();
|
| 285 |
+
|
| 286 |
+
} catch (Exception $e) {
|
| 287 |
+
Mage::getModel('fianet/log')->Log(Mage::helper('fianet')->__('Certissim: %s.', $e->getMessage()));
|
| 288 |
+
}
|
| 289 |
|
| 290 |
+
$nb++;
|
|
|
|
| 291 |
}
|
|
|
|
|
|
|
| 292 |
}
|
| 293 |
}
|
| 294 |
}
|
app/code/community/Fianet/Sac/Model/Fianet/Order/Info/Sac.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Fianet_Order_Info_Sac {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Fianet_Order_Info_Sac {
|
app/code/community/Fianet/Sac/Model/Fianet/Order/Sac.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Fianet_Order_Sac {
|
|
@@ -122,17 +122,19 @@ class Fianet_Sac_Model_Fianet_Order_Sac {
|
|
| 122 |
$tab_orders = array();
|
| 123 |
$orders_total = 0;$i = 0;
|
| 124 |
foreach ($orders as $_order) {
|
|
|
|
| 125 |
$tab_orders[$i] = $_order;
|
| 126 |
$orders_total = $orders_total + floatval($_order->getTotalInvoiced());
|
| 127 |
-
$i++;
|
| 128 |
}
|
| 129 |
|
| 130 |
-
$
|
| 131 |
-
|
| 132 |
-
|
| 133 |
-
|
| 134 |
-
|
| 135 |
-
|
|
|
|
|
|
|
| 136 |
|
| 137 |
//Utilisateur livraison
|
| 138 |
if (trim($billing_address->getCompany()) != '') {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Fianet_Order_Sac {
|
| 122 |
$tab_orders = array();
|
| 123 |
$orders_total = 0;$i = 0;
|
| 124 |
foreach ($orders as $_order) {
|
| 125 |
+
$i++;
|
| 126 |
$tab_orders[$i] = $_order;
|
| 127 |
$orders_total = $orders_total + floatval($_order->getTotalInvoiced());
|
|
|
|
| 128 |
}
|
| 129 |
|
| 130 |
+
if(!empty($tab_orders)) {
|
| 131 |
+
$siteconso = Mage::getModel('fianet/fianet_order_user_siteconso');
|
| 132 |
+
$siteconso->nb = count($orders);
|
| 133 |
+
$siteconso->ca = number_format($orders_total, 2, '.', '');
|
| 134 |
+
$siteconso->datepremcmd = $tab_orders[$i]->getCreatedAt();
|
| 135 |
+
$siteconso->datederncmd = $tab_orders[1]->getCreatedAt();
|
| 136 |
+
$sacOrder->billing_user->siteconso = $siteconso;
|
| 137 |
+
}
|
| 138 |
|
| 139 |
//Utilisateur livraison
|
| 140 |
if (trim($billing_address->getCompany()) != '') {
|
app/code/community/Fianet/Sac/Model/Mysql4/Payment/Association.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Mysql4_Payment_Association extends Fianet_Core_Model_Mysql4_Abstract {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Mysql4_Payment_Association extends Fianet_Core_Model_Mysql4_Abstract {
|
app/code/community/Fianet/Sac/Model/Mysql4/Payment/Association/Collection.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Mysql4_Payment_Association_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Mysql4_Payment_Association_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
|
app/code/community/Fianet/Sac/Model/Observer.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Observer {
|
|
@@ -23,7 +23,7 @@ class Fianet_Sac_Model_Observer {
|
|
| 23 |
return $this;
|
| 24 |
}
|
| 25 |
$order = Mage::getModel('sales/order')->load((int) $object->getEntityId());
|
| 26 |
-
|
| 27 |
if (!Mage::helper('sac/order')->canSendOrder($order, (int) $object->getEntityId())) {
|
| 28 |
return $this;
|
| 29 |
}
|
|
@@ -54,6 +54,12 @@ class Fianet_Sac_Model_Observer {
|
|
| 54 |
|
| 55 |
public function instancyAuthManager($observer) {
|
| 56 |
try {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 57 |
// Vérification d'activation de la fonctionnalité
|
| 58 |
$isActive = (Mage::getStoreConfig('sac/sacconfg/activeauthmanager', $order->scope_id) === null) ? false : Mage::getStoreConfig('sac/sacconfg/activeauthmanager', $order->scope_id);
|
| 59 |
if ($isActive == true) {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Observer {
|
| 23 |
return $this;
|
| 24 |
}
|
| 25 |
$order = Mage::getModel('sales/order')->load((int) $object->getEntityId());
|
| 26 |
+
|
| 27 |
if (!Mage::helper('sac/order')->canSendOrder($order, (int) $object->getEntityId())) {
|
| 28 |
return $this;
|
| 29 |
}
|
| 54 |
|
| 55 |
public function instancyAuthManager($observer) {
|
| 56 |
try {
|
| 57 |
+
$object = $observer->getEvent()->getDataObject();
|
| 58 |
+
if (!$object) {
|
| 59 |
+
return $this;
|
| 60 |
+
}
|
| 61 |
+
$order = Mage::getModel('sales/order')->load((int) $object->getEntityId());
|
| 62 |
+
|
| 63 |
// Vérification d'activation de la fonctionnalité
|
| 64 |
$isActive = (Mage::getStoreConfig('sac/sacconfg/activeauthmanager', $order->scope_id) === null) ? false : Mage::getStoreConfig('sac/sacconfg/activeauthmanager', $order->scope_id);
|
| 65 |
if ($isActive == true) {
|
app/code/community/Fianet/Sac/Model/Payment/Association.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Payment_Association extends Mage_Core_Model_Abstract {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Payment_Association extends Mage_Core_Model_Abstract {
|
app/code/community/Fianet/Sac/Model/Product.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Product extends Fianet_Core_Model_Product {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Product extends Fianet_Core_Model_Product {
|
app/code/community/Fianet/Sac/Model/Source/Statut.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Source_Statut {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Source_Statut {
|
app/code/community/Fianet/Sac/Model/Source/Type.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Source_Type {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Model_Source_Type {
|
app/code/community/Fianet/Sac/controllers/Adminhtml/PaymentController.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Adminhtml_PaymentController extends Mage_Adminhtml_Controller_Action {
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
class Fianet_Sac_Adminhtml_PaymentController extends Mage_Adminhtml_Controller_Action {
|
app/code/community/Fianet/Sac/etc/adminhtml.xml
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
app/code/community/Fianet/Sac/etc/config.xml
CHANGED
|
@@ -12,14 +12,14 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Fianet_Sac>
|
| 22 |
-
<version>1.1.
|
| 23 |
</Fianet_Sac>
|
| 24 |
</modules>
|
| 25 |
<admin>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 19 |
<config>
|
| 20 |
<modules>
|
| 21 |
<Fianet_Sac>
|
| 22 |
+
<version>1.1.2</version>
|
| 23 |
</Fianet_Sac>
|
| 24 |
</modules>
|
| 25 |
<admin>
|
app/code/community/Fianet/Sac/etc/system.xml
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-install-0.0.1.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
|
@@ -35,7 +35,7 @@ $installer->addAttribute('order', 'fianet_sac_mode', array('type' => 'varchar',
|
|
| 35 |
$installer->addAttribute('order', 'fianet_sac_evaluation', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 36 |
$installer->addAttribute('order', 'fianet_sac_reevaluation', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 37 |
|
| 38 |
-
if (
|
| 39 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_evaluation', 'varchar(255) default NULL');
|
| 40 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_mode', 'varchar(255) default NULL');
|
| 41 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_reevaluation', 'varchar(255) default NULL');
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 35 |
$installer->addAttribute('order', 'fianet_sac_evaluation', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 36 |
$installer->addAttribute('order', 'fianet_sac_reevaluation', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 37 |
|
| 38 |
+
if ((Mage::getEdition() == "Community" && version_compare(Mage::getVersion(), "1.4.0.1", '>')) || (Mage::getEdition() == "Enterprise" && version_compare(Mage::getVersion(), "1.8.0.0", '>'))) {
|
| 39 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_evaluation', 'varchar(255) default NULL');
|
| 40 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_mode', 'varchar(255) default NULL');
|
| 41 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_reevaluation', 'varchar(255) default NULL');
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.1-0.0.2.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.10-0.0.11.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.11-0.0.12.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
|
@@ -28,7 +28,7 @@ $paypalMethods = array(
|
|
| 28 |
Mage_Paypal_Model_Config::METHOD_WPP_PE_EXPRESS,
|
| 29 |
Mage_Paypal_Model_Config::METHOD_PAYFLOWPRO);
|
| 30 |
|
| 31 |
-
if (Mage::
|
| 32 |
$paypalMethods[] = Mage_Paypal_Model_Config::METHOD_PAYFLOWLINK;
|
| 33 |
$paypalMethods[] = Mage_Paypal_Model_Config::METHOD_HOSTEDPRO;
|
| 34 |
}
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 28 |
Mage_Paypal_Model_Config::METHOD_WPP_PE_EXPRESS,
|
| 29 |
Mage_Paypal_Model_Config::METHOD_PAYFLOWPRO);
|
| 30 |
|
| 31 |
+
if ((Mage::getEdition() == "Community" && version_compare(Mage::getVersion(), "1.4.0.1", '>')) || (Mage::getEdition() == "Enterprise" && version_compare(Mage::getVersion(), "1.8.0.0", '>'))) {
|
| 32 |
$paypalMethods[] = Mage_Paypal_Model_Config::METHOD_PAYFLOWLINK;
|
| 33 |
$paypalMethods[] = Mage_Paypal_Model_Config::METHOD_HOSTEDPRO;
|
| 34 |
}
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.12-0.0.13.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.13-1.0.0.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.2-0.0.3.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.3-0.0.4.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-0.0.4-0.0.5.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-1.0.0-1.0.1.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
|
@@ -21,7 +21,7 @@ $installer = $this;
|
|
| 21 |
$installer->startSetup();
|
| 22 |
$installer->addAttribute('order', 'fianet_sac_classement_id', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 23 |
|
| 24 |
-
if (
|
| 25 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_classement_id', 'varchar(255) default NULL');
|
| 26 |
}
|
| 27 |
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 21 |
$installer->startSetup();
|
| 22 |
$installer->addAttribute('order', 'fianet_sac_classement_id', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 23 |
|
| 24 |
+
if ((Mage::getEdition() == "Community" && version_compare(Mage::getVersion(), "1.4.0.1", '>')) || (Mage::getEdition() == "Enterprise" && version_compare(Mage::getVersion(), "1.8.0.0", '>'))) {
|
| 25 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_classement_id', 'varchar(255) default NULL');
|
| 26 |
}
|
| 27 |
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-1.0.3-1.0.4.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
|
@@ -23,7 +23,7 @@ $installer->startSetup();
|
|
| 23 |
$installer->removeAttribute('order','fianet_sac_classement_id');
|
| 24 |
$installer->addAttribute('order', 'fianet_sac_statutcoex', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 25 |
|
| 26 |
-
if (
|
| 27 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_statutcoex', 'varchar(255) default NULL');
|
| 28 |
$installer->getConnection()->dropColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_classement_id');
|
| 29 |
}
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 23 |
$installer->removeAttribute('order','fianet_sac_classement_id');
|
| 24 |
$installer->addAttribute('order', 'fianet_sac_statutcoex', array('type' => 'varchar', 'visible' => false, 'required' => false));
|
| 25 |
|
| 26 |
+
if ((Mage::getEdition() == "Community" && version_compare(Mage::getVersion(), "1.4.0.1", '>')) || (Mage::getEdition() == "Enterprise" && version_compare(Mage::getVersion(), "1.8.0.0", '>'))) {
|
| 27 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_statutcoex', 'varchar(255) default NULL');
|
| 28 |
$installer->getConnection()->dropColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_classement_id');
|
| 29 |
}
|
app/code/community/Fianet/Sac/sql/sac_setup/mysql4-upgrade-1.0.5-1.1.0.php
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
|
@@ -22,7 +22,7 @@ $installer->startSetup();
|
|
| 22 |
//ajout de la colonne fianet_sac_franfinance suite � l'�volution du produit Certissim
|
| 23 |
$installer->addAttribute('order', 'fianet_sac_franfinance', array('type' => 'int', 'visible' => false, 'required' => false, 'default_value' => 0));
|
| 24 |
|
| 25 |
-
if (
|
| 26 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_franfinance', 'int(11) default 0');
|
| 27 |
}
|
| 28 |
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
?>
|
| 22 |
//ajout de la colonne fianet_sac_franfinance suite � l'�volution du produit Certissim
|
| 23 |
$installer->addAttribute('order', 'fianet_sac_franfinance', array('type' => 'int', 'visible' => false, 'required' => false, 'default_value' => 0));
|
| 24 |
|
| 25 |
+
if ((Mage::getEdition() == "Community" && version_compare(Mage::getVersion(), "1.4.0.1", '>')) || (Mage::getEdition() == "Enterprise" && version_compare(Mage::getVersion(), "1.8.0.0", '>'))) {
|
| 26 |
$installer->getConnection()->addColumn($installer->getTable('sales_flat_order_grid'), 'fianet_sac_franfinance', 'int(11) default 0');
|
| 27 |
}
|
| 28 |
|
app/design/adminhtml/default/default/layout/sac.xml
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
app/etc/modules/Fianet_Sac.xml
CHANGED
|
@@ -12,7 +12,7 @@
|
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
-
* @version Release: $Revision: 1.1.
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
|
@@ -24,7 +24,7 @@
|
|
| 24 |
<depends>
|
| 25 |
<Fianet_Core />
|
| 26 |
</depends>
|
| 27 |
-
<version>1.1.
|
| 28 |
</Fianet_Sac>
|
| 29 |
</modules>
|
| 30 |
</config>
|
| 12 |
*
|
| 13 |
* @author FIA-NET <support-boutique@fia-net.com>
|
| 14 |
* @copyright 2000-2014 FIA-NET
|
| 15 |
+
* @version Release: $Revision: 1.1.2 $
|
| 16 |
* @license http://www.opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
|
| 17 |
*/
|
| 18 |
-->
|
| 24 |
<depends>
|
| 25 |
<Fianet_Core />
|
| 26 |
</depends>
|
| 27 |
+
<version>1.1.2</version>
|
| 28 |
</Fianet_Sac>
|
| 29 |
</modules>
|
| 30 |
</config>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fianet_Sac</name>
|
| 4 |
-
<version>1.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/OSL-3.0">Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -10,9 +10,9 @@
|
|
| 10 |
<description>Anti-Fraud System</description>
|
| 11 |
<notes>Official commit</notes>
|
| 12 |
<authors><author><name>FIA-NET</name><user>auto-converted</user><email>support-boutique@fia-net.com</email></author></authors>
|
| 13 |
-
<date>2014-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magecommunity"><dir name="Fianet"><dir name="Sac"><dir name="Block"><dir name="Adminhtml"><dir name="Payment"><dir name="Edit"><file name="Form.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><package><name>Fianet_Core</name><channel>community</channel><min>1.0.6</min><max></max></package></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Fianet_Sac</name>
|
| 4 |
+
<version>1.1.2</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.opensource.org/licenses/OSL-3.0">Open Software License (OSL 3.0)</license>
|
| 7 |
<channel>community</channel>
|
| 10 |
<description>Anti-Fraud System</description>
|
| 11 |
<notes>Official commit</notes>
|
| 12 |
<authors><author><name>FIA-NET</name><user>auto-converted</user><email>support-boutique@fia-net.com</email></author></authors>
|
| 13 |
+
<date>2014-11-18</date>
|
| 14 |
+
<time>14:17:10</time>
|
| 15 |
+
<contents><target name="magecommunity"><dir name="Fianet"><dir name="Sac"><dir name="Block"><dir name="Adminhtml"><dir name="Payment"><dir name="Edit"><file name="Form.php" hash="0896e70992d8f497fa522720e9ecff31"/></dir><file name="Configuration.php" hash="f666c439402dc0865181ef2c80056186"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="9c029b25f9dec0c42db6972e616e15b0"/><file name="Order.php" hash="32ce9832ca3f15e8e794e3f221ae2d94"/></dir><dir name="Model"><dir name="Fianet"><dir name="Order"><dir name="Info"><file name="Sac.php" hash="176fce6779bdb5c78da05acd06c023c5"/></dir><file name="Sac.php" hash="e3195c49615d9afcd238a8d4f58ed778"/></dir></dir><dir name="Mysql4"><dir name="Payment"><dir name="Association"><file name="Collection.php" hash="ab34ef6f5ac3db06b1e3597e0369db53"/></dir><file name="Association.php" hash="d2a0a3657dac3ac618dfd057f5865428"/></dir></dir><dir name="Payment"><file name="Association.php" hash="87354658b4628a21460c49f5a94d8bb8"/></dir><dir name="Source"><file name="Statut.php" hash="398c8041ec3811ffc05b2c00584c976c"/><file name="Type.php" hash="70ae378b88911584001d6ab216fe7ded"/></dir><file name="Action.php" hash="64b4367dd5159aa99503dd1958d2fd6f"/><file name="Observer.php" hash="9621fa1ee1a2cc87960c006185fbb361"/><file name="Product.php" hash="53c42e7667e8422cd71b982ce2588b23"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="PaymentController.php" hash="09ae4051677cf0474208124962e88c71"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="73d5ca081286b151a5810cf152c895b5"/><file name="config.xml" hash="3eac6d0ebf691144b2bd9911059ecdc6"/><file name="system.xml" hash="eda0f6c27523960f0c5c3af42efbe430"/></dir><dir name="sql"><dir name="sac_setup"><file name="mysql4-install-0.0.1.php" hash="866f7ecc292235a91f7da896a51330d2"/><file name="mysql4-upgrade-0.0.1-0.0.2.php" hash="4a7978a0e4a3f557c144984c51a32364"/><file name="mysql4-upgrade-0.0.10-0.0.11.php" hash="d8f2c0fe576f9e95f676675b7d697c7d"/><file name="mysql4-upgrade-0.0.11-0.0.12.php" hash="e10c3e488a44f649673c2380ef47efd1"/><file name="mysql4-upgrade-0.0.12-0.0.13.php" hash="0c527740281c4486ff3cd1d2da80d3f7"/><file name="mysql4-upgrade-0.0.13-1.0.0.php" hash="4a44c2e206f83cdd7b1804a36d54659e"/><file name="mysql4-upgrade-0.0.2-0.0.3.php" hash="9aae615f9f2060f32f3cb492467ef072"/><file name="mysql4-upgrade-0.0.3-0.0.4.php" hash="bb9ea949d23d3c5b34e70afa0e58484a"/><file name="mysql4-upgrade-0.0.4-0.0.5.php" hash="c1e61ea29571ac166e77dd37234e00b0"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="dee4c7e62b774aef6f141ab99dc2f3b8"/><file name="mysql4-upgrade-1.0.3-1.0.4.php" hash="c8448539cf3d1dcc00f5187b450e04a7"/><file name="mysql4-upgrade-1.0.5-1.1.0.php" hash="550558194d0bfb9a21b2501256ce4863"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="sac.xml" hash="74a81e09ed3b46cc372f26f5f68b75a3"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fianet_Sac.xml" hash="36e68a4cbba7b5b100ad89ebaf79c3bf"/></dir></target><target name="magelocale"><dir name="fr_FR"><file name="Fianet_Sac.csv" hash="8ebf1f8269a1b76cafe842411cd0e795"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fianet"><file name="attention.gif" hash="d85cab75ed2cba677829db26b1f0a6c2"/><file name="fianet_SAC_icon.gif" hash="be9ce72c9a2bd81611a9e82537a8e15a"/><file name="rond_rouge.gif" hash="c605401e88cd234a31691dc9e4a38b05"/><file name="rond_vert.gif" hash="ce704184ee159f7008f81af51a747e71"/><file name="rond_vertclair.gif" hash="b0310ca593cd539b88463d720df3cd60"/><file name="rond_orange.gif" hash="b97b309b0b0dc155ee07b0198209d21e"/></dir></dir></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><package><name>Fianet_Core</name><channel>community</channel><min>1.0.6</min><max></max></package></required></dependencies>
|
| 18 |
</package>
|
