antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-14485-phileaMultiSingle' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-11-30 12:00:38 +01:00
commit 2c41ee7ab2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/philea_magistor/AdminPhileaMagistor.php
View File

@ -207,6 +207,7 @@ class AdminPhileaMagistor extends AdminTab {
'.(int) $id_sale.',
5,
NOW(),
0,
0
)
');
@ -731,9 +732,9 @@ class AdminPhileaMagistor extends AdminTab {
$auto_sync_btn = '<a title="' . $this->l('La vente est terminée') .'" class="text-' . ($auto_sync ? 'green-light' : 'rose') . '"><span style="opacity: 0.4;font-size:21px;" class="anticon anticon-rss2"></span></a>';
}
$submit_link = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?$upload_link:$upload_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=0';
$submit_link_single = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?'':$upload_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=1';
$submit_link_mult = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?'':$upload_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=2';
$submit_link = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?$upload_link:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=0';
$submit_link_single = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?null:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=1';
$submit_link_mult = (isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?null:$base_link.'&id_sale=' . (int) $CRR['id_sale'] . '&send_to_philea=1&mode=2';
$art_reports = Db::getInstance()->executeS('
SELECT `report_data`, `report_date`, `id_sale`
@ -788,10 +789,10 @@ class AdminPhileaMagistor extends AdminTab {
$form .= '</td>
<td style="text-align: center;">
<a class="text-purple-dark '.((isset($CRR['id_shipping']) && $CRR['id_shipping']==1)?'upload_link':'').'" data-id="' . (int) $CRR['id_sale'] . '" href="'.$submit_link.'" title="'.$this->l('Envoyer à Philéa').'"><i style="font-size:18px;" class="glyphicon glyphicon-send"></i></a>
'.(!empty($submit_link_single) && !empty($submit_link_multi)
?'<a class="text-green-light " href="'.$submit_link_single.'" title="'.$this->l('Envoyer Single').'"><i style="font-size:18px;" class="glyphicon glyphicon-send"></i></a>
'.((isset($CRR['id_shipping']) && $CRR['id_shipping']==1)
? $auto_sync_btn
:'<a class="text-green-light " href="'.$submit_link_single.'" title="'.$this->l('Envoyer Single').'"><i style="font-size:18px;" class="glyphicon glyphicon-send"></i></a>
<a class="text-orange " href="'.$submit_link_multi.'" title="'.$this->l('Envoyer Multi').'"><i style="font-size:18px;" class="glyphicon glyphicon-send"></i></a>'
:$auto_sync_btn
).'
</td>
<td style="text-align: center;">