Adam
/
Mango.Nop.Plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Adam:f73c434ca8ff003819b1d1a4a6695705527528a5
Branches Tags
Adam:main
Adam:FruitBank_v0.0.8.0
Adam:4.80
Adam:4.70
..
compare: Adam:dfec11584c5f452dd7c3b164368b88f14a08c5a9
Branches Tags
Adam:FruitBank_v0.0.8.0
Adam:4.80
Adam:4.70
Adam:main

No commits in common. "f73c434ca8ff003819b1d1a4a6695705527528a5" and "dfec11584c5f452dd7c3b164368b88f14a08c5a9" have entirely different histories.
f73c434ca8 ... dfec11584c

2 changed files with 358 additions and 368 deletions
Show Stats Expand all files Collapse all files

24
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
View File

@ -22,8 +22,8 @@
var discountInclTax = parseFloat($('#pvDiscountInclTax'+itemId).val()) || 0;
var discountExclTax = parseFloat($('#pvDiscountExclTax'+itemId).val()) || 0;
if (quantity > maxQuantity || quantity < 1) {
if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 1;
if (quantity > maxQuantity || quantity < 0) {
if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 0;
$('#pvQuantity' + itemId).val(quantity);
}
@ -93,20 +93,16 @@
<div class="card-body">
<div class="form-group row">
<div class="col-md-12" style="overflow-x: auto;">
@{
if (Model.ItemExtendeds != null)
{
foreach (var item in Model.ItemExtendeds)
@foreach (var item in Model.ItemExtendeds)
{
<script>
$(function() {
toggleOrderItemEditGlobal(false, @(item.Id));
setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity));
setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity));
});
</script>
}
}
}
<table class="table table-hover table-bordered">
<col />
<col />
@ -166,10 +162,7 @@
</tr>
</thead>
<tbody>
@{
if (Model.ItemExtendeds != null)
{
foreach (var item in Model.ItemExtendeds)
@foreach (var item in Model.ItemExtendeds)
{
<tr>
@* <td class="text-center preview">
@ -291,7 +284,7 @@
<div id="pnlEditPvQuantity@(item.Id)">
<div class="form-group row">
<div class="col-md-8 offset-md-2">
<input name="pvQuantity@(item.Id)" type="number" max="@(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity)" min="1"
<input name="pvQuantity@(item.Id)" type="number" max="@(item.ProductStockQuantity + item.ProductIncomingQuantity)" min="0"
value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
</div>
</div>
@ -436,9 +429,6 @@
}
</tr>
}
}
}
</tbody>
</table>
</div>

4
Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
View File

@ -219,8 +219,8 @@
UrlRead = new DataUrl("ProductList", "CustomProduct", null),
SearchButtonId = "search-products",
Length = Model.PageSize,
// Ordering = true,
// ServerSide = false,
Ordering = true,
ServerSide = false,
LengthMenu = Model.AvailablePageSizes,
Filters = new List<FilterParameter>
{