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

Merge branch 'ticket-simplemulti_logistic' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-20 15:32:28 +02:00
commit 6dfa3c18b1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/logistics/AdminLogistics.php
View File

@ -324,6 +324,9 @@ class AdminLogistics extends AdminTab {
$this->_html .= '<p class="error">'.$this->l('Please enter a weight and select at least one product').'</p><br />';
}
}
} elseif(Tools::isSubmit('submitMod') && ($id_order = (int) Tools::getValue('id_order')) && (int) $cookie->profile == 1) {
$product_ids = Tools::getValue('product_ids');
echo "<pre>";var_dump($id_order,$product_ids);echo "</pre>";die();
}
}
@ -557,6 +560,7 @@ class AdminLogistics extends AdminTab {
<th class="width2" style="display: none;">'.$this->l('Supplier reference').'</th>\
<th class="width2" title="'.$this->l('Bought / Refunded / Sent').'">'.$this->l('Quantities').'</th>\
<th class="width2">'.$this->l('Quantity to ship').'</th>\
<th class="width2">'.$this->l('Att').'</th>\
<th class="width2"><span style="margin-right: 65px;">'.$this->l('Quantity shipped').'</span></th>\
</tr>\
</thead>\
@ -571,6 +575,7 @@ class AdminLogistics extends AdminTab {
<td class="right" style="display: none;">\' + (loaded.products[i].product_supplier_reference? loaded.products[i].product_supplier_reference: \'\') + \'</td>\
<td class="center"><span style="opacity: .4">\' + loaded.products[i].product_quantity + \' / \' + (loaded.products[i].product_quantity_refunded > 0? loaded.products[i].product_quantity_refunded: loaded.products[i].product_quantity_return) + \' / \' + loaded.products[i].product_quantity_sent + \'</span></td>\
<td class=" center toship\' + (loaded.products[i].product_quantity - loaded.products[i].product_quantity_return - loaded.products[i].product_quantity_sent == 0? \' red\': \'\') + \'"><strong>\' + Math.max($.inArray(loaded.products[i].product_id, locked_products) != -1? \'0\': (loaded.products[i].product_quantity - (loaded.products[i].product_quantity_refunded > 0? loaded.products[i].product_quantity_refunded: loaded.products[i].product_quantity_return) - loaded.products[i].product_quantity_sent), 0) + \'</strong></td>\
<td class="center"><input type="checkbox" name="product_ids[]" value="\' + loaded.products[i].product_id + \'" /></td>
<td class="shipped">\';
if (loaded.products[i].id_shipping != 2
@ -588,6 +593,12 @@ class AdminLogistics extends AdminTab {
content += \'\
</tbody>\
<tfoot>\
<tr>\
<td colspan="7" style="text-align: center;"><input type="submit" class="button" name="submitMod" value="'.$this->l('MOD').'"/></td>\
<td></td>\
</tr>\
</tfoot>\
</table>\';
if(loaded.logs.length > 0) {