|
|
@@ -2037,7 +2037,7 @@ class BBus extends DolibarrApi
|
|
|
f.datec,
|
|
|
f.multicurrency_code,
|
|
|
pa.libelle,
|
|
|
- pai.note AS transaction_id,
|
|
|
+ fe.payment_transaction_id::TEXT AS transaction_id,
|
|
|
fdet.fk_product AS product_id,
|
|
|
pr.label AS product_label,
|
|
|
pr.ref AS product_ref,
|
|
|
@@ -2071,11 +2071,6 @@ class BBus extends DolibarrApi
|
|
|
if ($db->num_rows($data > 0)) {
|
|
|
|
|
|
while ($row = $db->fetch_object($data)) {
|
|
|
- $tmpArray = (array) $row;
|
|
|
- if ($tmpArray['transaction_id'] != '') {
|
|
|
- $jsonArray = json_decode($tmpArray['transaction_id']);
|
|
|
- $row->transaction_id = $jsonArray->card_transaction_id;
|
|
|
- }
|
|
|
$row->bundle_id = $row->bundle_id == '' ? $row->product_id : $row->bundle_id;
|
|
|
$row->bundle_label = $row->bundle_label == '' ? $row->product_label : $row->bundle_label;
|
|
|
$row->bundle_ref = $row->bundle_ref == '' ? $row->product_ref : $row->bundle_ref;
|
