Compare commits
3 Commits
dfec11584c
...
f73c434ca8
| Author | SHA1 | Date |
|---|---|---|
|
|
f73c434ca8 | |
|
|
b12d1d3b81 | |
|
|
41bb80fc26 |
|
|
@ -22,8 +22,8 @@
|
||||||
var discountInclTax = parseFloat($('#pvDiscountInclTax'+itemId).val()) || 0;
|
var discountInclTax = parseFloat($('#pvDiscountInclTax'+itemId).val()) || 0;
|
||||||
var discountExclTax = parseFloat($('#pvDiscountExclTax'+itemId).val()) || 0;
|
var discountExclTax = parseFloat($('#pvDiscountExclTax'+itemId).val()) || 0;
|
||||||
|
|
||||||
if (quantity > maxQuantity || quantity < 0) {
|
if (quantity > maxQuantity || quantity < 1) {
|
||||||
if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 0;
|
if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 1;
|
||||||
$('#pvQuantity' + itemId).val(quantity);
|
$('#pvQuantity' + itemId).val(quantity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -93,16 +93,20 @@
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-md-12" style="overflow-x: auto;">
|
<div class="col-md-12" style="overflow-x: auto;">
|
||||||
@foreach (var item in Model.ItemExtendeds)
|
@{
|
||||||
|
if (Model.ItemExtendeds != null)
|
||||||
|
{
|
||||||
|
foreach (var item in Model.ItemExtendeds)
|
||||||
{
|
{
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
toggleOrderItemEditGlobal(false, @(item.Id));
|
toggleOrderItemEditGlobal(false, @(item.Id));
|
||||||
setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity));
|
setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity));
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
<table class="table table-hover table-bordered">
|
<table class="table table-hover table-bordered">
|
||||||
<col />
|
<col />
|
||||||
<col />
|
<col />
|
||||||
|
|
@ -120,7 +124,7 @@
|
||||||
}
|
}
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@* <th>
|
@* <th>
|
||||||
@T("Admin.Orders.Products.Picture")
|
@T("Admin.Orders.Products.Picture")
|
||||||
</th>
|
</th>
|
||||||
*@ <th>
|
*@ <th>
|
||||||
|
|
@ -162,10 +166,13 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@foreach (var item in Model.ItemExtendeds)
|
@{
|
||||||
|
if (Model.ItemExtendeds != null)
|
||||||
|
{
|
||||||
|
foreach (var item in Model.ItemExtendeds)
|
||||||
{
|
{
|
||||||
<tr>
|
<tr>
|
||||||
@* <td class="text-center preview">
|
@* <td class="text-center preview">
|
||||||
<img src="@item.PictureThumbnailUrl" alt="" title="" />
|
<img src="@item.PictureThumbnailUrl" alt="" title="" />
|
||||||
</td>
|
</td>
|
||||||
*@ <td style="width: 25%;" class="text-left">
|
*@ <td style="width: 25%;" class="text-left">
|
||||||
|
|
@ -284,7 +291,7 @@
|
||||||
<div id="pnlEditPvQuantity@(item.Id)">
|
<div id="pnlEditPvQuantity@(item.Id)">
|
||||||
<div class="form-group row">
|
<div class="form-group row">
|
||||||
<div class="col-md-8 offset-md-2">
|
<div class="col-md-8 offset-md-2">
|
||||||
<input name="pvQuantity@(item.Id)" type="number" max="@(item.ProductStockQuantity + item.ProductIncomingQuantity)" min="0"
|
<input name="pvQuantity@(item.Id)" type="number" max="@(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity)" min="1"
|
||||||
value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
|
value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -303,7 +310,7 @@
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td style="width: 80px;" class="text-center">
|
<td style="width: 80px;" class="text-center">
|
||||||
@if(item.IsMeasurable)
|
@if (item.IsMeasurable)
|
||||||
{
|
{
|
||||||
<span class="badge badge-warning" disabled>Yes</span>
|
<span class="badge badge-warning" disabled>Yes</span>
|
||||||
}
|
}
|
||||||
|
|
@ -429,6 +436,9 @@
|
||||||
}
|
}
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -219,8 +219,8 @@
|
||||||
UrlRead = new DataUrl("ProductList", "CustomProduct", null),
|
UrlRead = new DataUrl("ProductList", "CustomProduct", null),
|
||||||
SearchButtonId = "search-products",
|
SearchButtonId = "search-products",
|
||||||
Length = Model.PageSize,
|
Length = Model.PageSize,
|
||||||
Ordering = true,
|
// Ordering = true,
|
||||||
ServerSide = false,
|
// ServerSide = false,
|
||||||
LengthMenu = Model.AvailablePageSizes,
|
LengthMenu = Model.AvailablePageSizes,
|
||||||
Filters = new List<FilterParameter>
|
Filters = new List<FilterParameter>
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue