Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop

This commit is contained in:
Christophe Latour 2017-07-28 12:37:42 +02:00
commit cbc755b897

View File

@ -191,6 +191,7 @@ class AdminOrders extends AdminTab
$supplierDemand->id_order_detail = $id_order_detail;
$supplierDemand->qty = $qty;
$supplierDemand->id_state = 1;
$supplierDemand->solution = 0;
$supplierDemand->comment = Tools::getValue('demand_comment');
if($supplierDemand->save()){
SupplierDemand::addHistoryStatic($supplierDemand->id,1);
@ -1714,9 +1715,11 @@ class AdminOrders extends AdminTab
foreach ($supplierDemands as $demand) {
$alreadyDemand[] = $demand['id_order_detail'];
$demandStates = SupplierDemand::$states;
$demandProduct = SupplierDemand::getProductStatic((int)$demand['id_supplier_demand']);
echo '('.Tools::displayDate($demand['date_upd'], $cookie->id_lang).') :
<b><a href="index.php?tab=AdminAntSupplierDemand&id='.$demand['id_supplier_demand'].'&updateSupplierDemand=1&token='.Tools::getAdminToken('AdminAntSupplierDemand'.(int)(Tab::getIdFromClassName('AdminAntSupplierDemand')).(int)($cookie->id_employee)).'">'.$this->l('#').sprintf('%06d', $demand['id_supplier_demand']).'</a></b> -
'.$demandStates[$demand['id_state']]['name'].'<br />';
'.$demandStates[$demand['id_state']]['name'].'<br />
<b>'.$demandProduct['product_name'].'</b><br /><br />';
}
}
echo '<br /><br />