Config modules Etransactions

config/config_defaults.inc.php

@@ -161,6 +161,9 @@ if (!defined('PAYMENT_DATE_BEGIN_SYNC'))
 // Modules de paiement Prestashop Etransactions/Up2Pay
 if (!defined('P_PAYMENT_ETRANSACTIONS'))
 	define('P_PAYMENT_ETRANSACTIONS', false);
+// Modules de paiement Dolibarr MBI Etransactions/Up2Pay
+if (!defined('D_PAYMENT_ETRANSACTIONS'))
+	define('D_PAYMENT_ETRANSACTIONS', false);
 // Modules de paiement Prestashop Express Checkout
 if (!defined('P_PAYMENT_CHECKOUT'))
 	define('P_PAYMENT_CHECKOUT', false);

src/sync/order/common.inc.php

@@ -87,15 +87,18 @@ function p_data($otype, $oid)
 	// Details & tax
 	$data['order_detail'] = DB::p_get_rows('order_detail', ['id_order'=>$oid]);
 	//$data['order_detail_tax'] = DB::p_get_rows('order_detail_tax', ['id_order_detail'=>$oid]);
-	if (PRODUCT_LOT)
+	if (PRODUCT_LOT) {
 		$data['products_dlc_dluo_orders'] = DB::p_get_rows('products_dlc_dluo_orders', ['id_order'=>$oid]);
+	}
 
 	// Carrier
 	$data['order_carrier'] = DB::p_get_rows('order_carrier', ['id_order'=>$oid]);
 
 	// Payment
-	$data['etransactions_order'] = DB::p_get_row('etransactions_order', ['id_order'=>$oid]);
-	
+	if (P_PAYMENT_ETRANSACTIONS) {
+		$data['etransactions_order'] = DB::p_get_row('etransactions_order', ['id_order'=>$oid]);
+	}
+
 	// customer
 	$data['customer'] = DB::p_get_row('customer', ['id_customer'=>$data['orders']['id_customer']]);
 	if (empty($data['customer'])) {

src/sync/payment/common.inc.php

@@ -40,9 +40,11 @@ public function d_data($otype, $oid)
 	$data['paiement_object'] = DB::d_get_rows('paiement_object', ['fk_paiement'=>$oid]);
 	
 	// Reçu de paiement etransactions cb
-	$data['mbi_etransactions_return'] = DB::d_get_row('mbi_etransactions_return', ['fk_paiement'=>$oid]);
-	if (!empty($data['mbi_etransactions_return']))
-		$data['mbi_etransactions_hash'] = DB::d_get_row('mbi_etransactions_hash', ['rowid'=>$data['mbi_etransactions_return']['fk_mbi_etransactions']]);
+	if (D_PAYMENT_ETRANSACTIONS) {
+		$data['mbi_etransactions_return'] = DB::d_get_row('mbi_etransactions_return', ['fk_paiement'=>$oid]);
+		if (!empty($data['mbi_etransactions_return']))
+			$data['mbi_etransactions_hash'] = DB::d_get_row('mbi_etransactions_hash', ['rowid'=>$data['mbi_etransactions_return']['fk_mbi_etransactions']]);
+	}
 
 	return $data;
 }