dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// BugFix : Adding warehouse on order edition

Browse Source
This commit is contained in:
mDeflotte
2011-12-14 16:19:05 +00:00
parent 1a4c91ce5b
commit e0ff6f4697
9 changed files with 135 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/orders/_new_product.tpl
+4
View File
@@ -5,6 +5,10 @@
<div id="add_product_product_attribute_area" style="margin-top: 5px;display: none;">
{l s='Combinations:'} <select name="add_product[product_attribute_id]" id="add_product_product_attribute_id"></select>
</div>
<div id="add_product_product_warehouse_area" style="margin-top: 5px; display: none;">
{l s='Warehouse:'} <select id="add_product_warehouse" name="add_product_warehouse">
</select>
</div>
</td>
<td style="display:none;">
{if $currency->sign % 2}{$currency->sign}{/if}<input type="text" name="add_product[product_price_tax_excl]" id="add_product_product_price_tax_excl" value="" size="4" disabled="disabled" /> {if !($currency->sign % 2)}{$currency->sign}{/if} {l s='tax excl.'}<br />
admin-dev/themes/template/orders/form.tpl
+32 -12
View File
@@ -175,7 +175,7 @@
updateQty(product[0], product[1], $(this).val() - cart_quantity[$(this).attr('rel')]);
}
});
$('.increaseqty_product,.decreaseqty_product').live('click', function(e) {
$('.increaseqty_product, .decreaseqty_product').live('click', function(e) {
e.preventDefault();
var product = $(this).attr('rel').split('_');
var sign = '';
@@ -183,10 +183,18 @@
sign = '-';
updateQty(product[0], product[1], sign+1);
});
$('#id_product').live('keydown', function(e) {
$(this).click();
return true;
});
$('#id_product, .id_product_attribute').live('change', function(e) {
e.preventDefault();
displayQtyInStock(this.id);
});
$('#id_product, .id_product_attribute').live('keydown', function(e) {
$(this).change();
return true;
});
$('.product_unit_price').live('change', function(e) {
e.preventDefault();
var product = $(this).attr('rel').split('_');
@@ -233,10 +241,13 @@
function displayQtyInStock(id)
{
if (id == 'id_product')
$('#qty_in_stock').html($('#id_product option:selected').attr('rel'));
var id_product = $('#id_product').val();
if ($('#ipa_' + id_product + ' option').length)
var id_product_attribute = $('#ipa_' + id_product).val();
else
$('#qty_in_stock').html($('#ipa_'+$('#id_product option:selected').val()+' option:selected').attr('rel'));
var id_product_attribute = 0;
$('#qty_in_stock').html(stock[id_product][id_product_attribute]);
}
function duplicateOrder(id_order)
@@ -460,6 +471,8 @@
{
var products_found = '';
var attributes_html = '';
stock = {};
if(res.found)
{
$('#products_err').hide();
@@ -469,12 +482,19 @@
$.each(res.products, function() {
products_found += '<option '+(this.combinations.length > 0 ? 'rel="'+this.qty_in_stock+'"' : '')+' value="'+this.id_product+'">'+this.name+(this.combinations.length == 0 ? ' - '+this.formatted_price : '')+'</option>';
attributes_html += '<select class="id_product_attribute" id="ipa_'+this.id_product+'" style="display:none;">';
var id_product = this.id_product;
$.each(this.combinations, function() {
attributes_html += '<option rel="'+this.qty_in_stock+'" '+(this.default_on == 1 ? 'selected="selected"' : '')+' value="'+this.id_product_attribute+'">'+this.attributes+' - '+this.formatted_price+'</option>';
});
stock[this.id_product] = this.stock;
attributes_html += '</select>';
});
products_found += '</select>';
$('#products_found #product_list').html(products_found);
$('#products_found #attributes_list').html(attributes_html);
displayProductAttributes();
@@ -771,14 +791,14 @@
<input type="hidden" value="" id="id_cart" name="id_cart" />
<input type="text" id="product" value="" /></p>
<div id="products_found">
<div id="product_list">
</div>
<div id="attributes_list">
</div>
<p><label for="qty">{l s='Quantity:'}</label><input type="text" name="qty" id="qty"/>&nbsp;<b>{l s='In stock:'}</b>&nbsp;<span id="qty_in_stock"></span></p>
<div class="margin-form">
<p><input type="submit" onclick="addProduct();return false;" class="button" id="submitAddProduct" value="{l s='Add to cart'}"/></p>
</div>
<div id="product_list">
</div>
<div id="attributes_list">
</div>
<p><label for="qty">{l s='Quantity:'}</label><input type="text" name="qty" id="qty"/>&nbsp;<b>{l s='In stock:'}</b>&nbsp;<span id="qty_in_stock"></span></p>
<div class="margin-form">
<p><input type="submit" onclick="addProduct();return false;" class="button" id="submitAddProduct" value="{l s='Add to cart'}"/></p>
</div>
</div>
</div>
<div id="products_err" class="warn" style="display:none;"></div>
admin-dev/themes/template/orders/view.tpl
+3
View File
@@ -507,6 +507,9 @@
<form style="width: 98%" action="{$currentIndex}&vieworder&token={$smarty.get.token}" method="post" onsubmit="return orderDeleteProduct('{l s='Cannot return this product'}', '{l s='Quantity to cancel is greater than quantity available'}');">
<input type="hidden" name="id_order" value="{$order->id}" />
<fieldset style="width: 100%; ">
<div style="display: none">
<input type="hidden" value="{$order->getWarehouseList()|implode}" id="warehouse_list" />
</div>
<legend><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Products'}</legend>
<div style="float:left;width: 100%;">
{if $can_edit}