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

Merge branch 'ticket-updBraderie' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-25 10:44:39 +02:00
commit b7dbcbd3b0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/braderie/AdminBraderie.php
View File

@ -194,6 +194,8 @@ class AdminBraderie extends AdminTab
$("#add_button").click(function(event) {
event.preventDefault();
return false;
if ($product_id == undefined || $product_id == 0) {
$("#error").empty().append("'.$this->l('Aucun produit n\'a été trouvé. Vérifier le code EAN').'");
return false;

2
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -851,7 +851,7 @@ class AdminBulkUpdate extends AdminTab {
foreach($orders as $order) {
$products[] = $order['product_id'];
$orders_detail[] = $order['id_order_detail'];
if (!is_array($category_properties[(int)$order['product_id']])) {
if (!isset($category_properties[(int)$order['product_id']])) {
$by_sale[(int)$order['id_sale']] = array();
$privatesale = new Sale((int) $order['id_sale']);