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

Merge branch 'ticket-returnprocess-final' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-08-17 15:53:22 +02:00
commit a5375c2a3d
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adm/tabs/AdminOrders.php
View File

@ -1196,9 +1196,14 @@ class AdminOrders extends AdminTab
FROM '._DB_PREFIX_.'lapostews_return lpr
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = lpr.`id_order_detail`)
WHERE od.`id_order` ='. $order->id;
$sql4 = 'SELECT mrp.`shipping_number`, mrp.`date_add`
FROM '._DB_PREFIX_.'mondialrelay_parcel mrp
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = mrp.`id_order_detail`)
WHERE od.`id_order` ='. $order->id;
$numbers = Db::getInstance()->ExecuteS($sql);
$numbers2 = Db::getInstance()->ExecuteS($sql2);
$numbers3 = Db::getInstance()->ExecuteS($sql3);
$numbers4 = Db::getInstance()->ExecuteS($sql4);
echo '
<fieldset style="width:400px">';
if(count($numbers) > 0){
@ -1219,6 +1224,12 @@ class AdminOrders extends AdminTab
echo '<p><b>Numéro de suivi </b> : '. $number['shipping_number'] .' ajouté le '. $date->format('d m Y') .'</p>';
}
}
if(count($numbers4) > 0){
foreach ($numbers4 as $key => $number) {
$date = new DateTime($number['date_add']);
echo '<p><b>Numéro de suivi </b> : '. $number['shipping_number'] .' ajouté le '. $date->format('d m Y') .'</p>';
}
}
echo '<legend><img src="../img/admin/delivery.gif" /> '.$this->l('Shipping information').'</legend>
'.$this->l('Total weight:').' <b>'.number_format($order->getTotalWeight(), 3).' '.Configuration::get('PS_WEIGHT_UNIT').'</b><br />
'.$this->l('Carrier:').' <b>'.($carrier->name == '0' ? Configuration::get('PS_SHOP_NAME') : $carrier->name).'</b><br />

24
modules/ant_returnprocess/AdminAntReturnprocess.php
View File

@ -940,6 +940,13 @@ class AdminAntReturnprocess extends AdminTab
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = ppp.`id_order_detail`)
WHERE od.`id_order` ='. (int)$order->id
);
$shipping_numbers3 = Db::getInstance()->ExecuteS('
SELECT DISTINCT mrp.`shipping_number`, mrp.`date_add`
FROM `'._DB_PREFIX_.'mondialrelay_parcel` mrp
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON (od.`id_order_detail` = mrp.`id_order_detail`)
WHERE od.`id_order` ='. (int)$order->id
);
$discounts = $order->getDiscounts();
$query_thread = Db::getInstance()->getValue('
SELECT `id_customer_thread`
FROM `'._DB_PREFIX_.'customer_thread`
@ -1297,6 +1304,12 @@ class AdminAntReturnprocess extends AdminTab
$html .= '<li><strong>'. $number['shipping_number'] .'</strong> ajouté le '. $date->format('d/m/Y') .'</li>';
}
}
if(count($shipping_numbers3) > 0){
foreach ($shipping_numbers3 as $key => $number) {
$date = new DateTime($number['date_add']);
$html .= '<li><strong>'. $number['shipping_number'] .'</strong> ajouté le '. $date->format('d/m/Y') .'</li>';
}
}
if(count($parcel_sent) > 0){
foreach ($parcel_sent as $key => $number) {
$date = new DateTime($number['date_add']);
@ -1385,6 +1398,17 @@ class AdminAntReturnprocess extends AdminTab
</tr>';
}
}
if (sizeof($discounts))
{
foreach ($discounts as $discount){
$html .= '
<tr>
<td colspans="5" style="vertical-align:middle;color:#444;" align="left">'.$discount['name'].'</td>
<td style=" width:70px;vertical-align:middle;color:#444;" align="center">'.($discount['value'] != 0.00 ? '- ' : '').Tools::displayPrice($discount['value'], $currency, false).'</td>
<td width="70" style="vertical-align:middle;color:#444;"></td>
</tr>';
}
}
$html .= '</tbody>
</table>
<p class="col-md-12" style="font-size:11px; margin:0 0 10px 0;"><i>* Le chiffre de gauche correspond à la quantité remboursée pré-envoi et celui de droite post-envoi</i></p>