Compare commits
3 Commits
f3ac82acb2
...
31f411d319
| Author | SHA1 | Date |
|---|---|---|
 Loretta
|
31f411d319 | |
|
Loretta
|
9285da4c02 | |
|
Loretta
|
6d2e7df65f |
|
|
@ -3,265 +3,272 @@
|
|||
@using Nop.Core.Domain.Tax;
|
||||
@using Nop.Core.Domain.Catalog;
|
||||
|
||||
<script>
|
||||
function calculateTotalGlobal(itemId, maxQuantity) {
|
||||
//var isMeasurable = $('#pvIsMeasurable'+itemId).is(':checked');
|
||||
|
||||
var isMeasurable = $('#pvIsMeasurable'+itemId).val().toLowerCase() === 'true';
|
||||
console.log(isMeasurable);
|
||||
console.log($('#pvIsMeasurable'+itemId));
|
||||
console.log($('#pvIsMeasurable'+itemId).val());
|
||||
console.log($('#pvIsMeasurable'+itemId).val().toLowerCase());
|
||||
console.log($('#pvNetWeight'+itemId).val());
|
||||
|
||||
var netWeight = parseFloat($('#pvNetWeight'+itemId).val()) || 0;
|
||||
|
||||
var unitPriceInclTax = parseFloat($('#pvUnitPriceInclTax'+itemId).val()) || 0;
|
||||
var unitPriceExclTax = parseFloat($('#pvUnitPriceExclTax'+itemId).val()) || 0;
|
||||
var quantity = parseInt($('#pvQuantity'+itemId).val()) || 0;
|
||||
var discountInclTax = parseFloat($('#pvDiscountInclTax'+itemId).val()) || 0;
|
||||
var discountExclTax = parseFloat($('#pvDiscountExclTax'+itemId).val()) || 0;
|
||||
|
||||
if (quantity > maxQuantity || quantity < 0) {
|
||||
if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 0;
|
||||
$('#pvQuantity' + itemId).val(quantity);
|
||||
}
|
||||
|
||||
if (unitPriceInclTax < 0) {
|
||||
unitPriceInclTax = 0;
|
||||
$('#pvUnitPriceInclTax' + itemId).val(unitPriceInclTax);
|
||||
}
|
||||
|
||||
// Calculate totals
|
||||
var totalInclTax = (unitPriceInclTax * (isMeasurable ? netWeight : quantity)) - discountInclTax;
|
||||
var totalExclTax = (unitPriceExclTax * (isMeasurable ? netWeight : quantity)) - discountExclTax;
|
||||
|
||||
// Update total price fields
|
||||
$('#pvPriceInclTax'+itemId).val(totalInclTax.toFixed(0));
|
||||
$('#pvPriceExclTax'+itemId).val(totalExclTax.toFixed(0));
|
||||
}
|
||||
|
||||
// Function to setup event listeners for automatic calculation
|
||||
function setupAutoCalculationGlobal(itemId) {
|
||||
// Attach change and input events to all relevant fields
|
||||
$('#pvUnitPriceInclTax'+itemId+', #pvUnitPriceExclTax'+itemId+', #pvQuantity'+itemId+', #pvDiscountInclTax'+itemId+', #pvDiscountExclTax'+itemId).on('input change', function() {
|
||||
calculateTotalGlobal(itemId);
|
||||
});
|
||||
}
|
||||
|
||||
function toggleOrderItemEditGlobal(editMode, itemId) {
|
||||
if (editMode) {
|
||||
$('#pnlEditPvUnitPrice'+itemId).showElement();
|
||||
$('#pnlEditPvQuantity'+itemId).showElement();
|
||||
$('#pnlEditPvDiscount'+itemId).showElement();
|
||||
$('#pnlEditPvPrice'+itemId).showElement();
|
||||
$('#btnSaveOrderItem'+itemId).showElement();
|
||||
$('#btnCancelOrderItem'+itemId).showElement();
|
||||
|
||||
$('#pvUnitPriceInclTax'+itemId).prop("disabled", false);
|
||||
$('#pvUnitPriceExclTax'+itemId).prop("disabled", false);
|
||||
$('#pvQuantity'+itemId).prop("disabled", false);
|
||||
$('#pvDiscountInclTax'+itemId).prop("disabled", true);
|
||||
$('#pvDiscountExclTax'+itemId).prop("disabled", true);
|
||||
$('#pvPriceInclTax'+itemId).prop("disabled", true);
|
||||
$('#pvPriceExclTax'+itemId).prop("disabled", true);
|
||||
|
||||
$('#btnEditOrderItem'+itemId).hideElement();
|
||||
$('#btnDeleteOrderItem'+itemId).hideElement();
|
||||
} else {
|
||||
$('#pnlEditPvUnitPrice'+itemId).hideElement();
|
||||
$('#pnlEditPvQuantity'+itemId).hideElement();
|
||||
$('#pnlEditPvDiscount'+itemId).hideElement();
|
||||
$('#pnlEditPvPrice'+itemId).hideElement();
|
||||
$('#btnSaveOrderItem'+itemId).hideElement();
|
||||
$('#btnCancelOrderItem'+itemId).hideElement();
|
||||
|
||||
$('#pvUnitPriceInclTax'+itemId).prop("disabled", true);
|
||||
$('#pvUnitPriceExclTax'+itemId).prop("disabled", true);
|
||||
$('#pvQuantity'+itemId).prop("disabled", true);
|
||||
$('#pvDiscountInclTax'+itemId).prop("disabled", true);
|
||||
$('#pvDiscountExclTax'+itemId).prop("disabled", true);
|
||||
$('#pvPriceInclTax'+itemId).prop("disabled", true);
|
||||
$('#pvPriceExclTax'+itemId).prop("disabled", true);
|
||||
|
||||
$('#btnEditOrderItem'+itemId).showElement();
|
||||
$('#btnDeleteOrderItem'+itemId).showElement();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="card-body">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-12" style="overflow-x: auto;">
|
||||
@foreach (var item in Model.Items)
|
||||
{
|
||||
<script>
|
||||
$(function() {
|
||||
toggleOrderItemEdit@(item.Id)(false);
|
||||
// Attach event listeners for automatic calculation
|
||||
setupAutoCalculation@(item.Id)();
|
||||
});
|
||||
</script>
|
||||
<div class="form-group row">
|
||||
<div class="col-md-12" style="overflow-x: auto;">
|
||||
@foreach (var item in Model.ItemExtendeds)
|
||||
{
|
||||
<script>
|
||||
$(function() {
|
||||
toggleOrderItemEditGlobal(false, @(item.Id));
|
||||
setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity));
|
||||
});
|
||||
</script>
|
||||
}
|
||||
|
||||
<script>
|
||||
// Function to automatically calculate and update total price
|
||||
function calculateTotal@(item.Id)() {
|
||||
// Get values
|
||||
|
||||
@* var isMeasurable = ($('#pvIsMeasurable@(item.Id)').val()).toLowerCase() === "true"; *@
|
||||
|
||||
var isMeasurable = $($('#pvIsMeasurable@(item.Id)')).is(':checked');
|
||||
console.log(isMeasurable);
|
||||
console.log(($('#pvIsMeasurable@(item.Id)')));
|
||||
console.log(($('#pvIsMeasurable@(item.Id)').val()));
|
||||
console.log(($('#pvIsMeasurable@(item.Id)').val()).toLowerCase());
|
||||
|
||||
|
||||
var netWeight = parseFloat($('#pvNetWeight@(item.Id)').val()) || 0;
|
||||
|
||||
var unitPriceInclTax = parseFloat($('#pvUnitPriceInclTax@(item.Id)').val()) || 0;
|
||||
var unitPriceExclTax = parseFloat($('#pvUnitPriceExclTax@(item.Id)').val()) || 0;
|
||||
var quantity = parseFloat($('#pvQuantity@(item.Id)').val()) || 0;
|
||||
var discountInclTax = parseFloat($('#pvDiscountInclTax@(item.Id)').val()) || 0;
|
||||
var discountExclTax = parseFloat($('#pvDiscountExclTax@(item.Id)').val()) || 0;
|
||||
|
||||
// Calculate totals
|
||||
var totalInclTax = (unitPriceInclTax * (isMeasurable ? netWeight : quantity)) - discountInclTax;
|
||||
var totalExclTax = (unitPriceExclTax * (isMeasurable ? netWeight : quantity)) - discountExclTax;
|
||||
|
||||
// Update total price fields
|
||||
$('#pvPriceInclTax@(item.Id)').val(totalInclTax.toFixed(0));
|
||||
$('#pvPriceExclTax@(item.Id)').val(totalExclTax.toFixed(0));
|
||||
}
|
||||
|
||||
// Function to setup event listeners for automatic calculation
|
||||
function setupAutoCalculation@(item.Id)() {
|
||||
// Attach change and input events to all relevant fields
|
||||
$('#pvUnitPriceInclTax@(item.Id), #pvUnitPriceExclTax@(item.Id), #pvQuantity@(item.Id), #pvDiscountInclTax@(item.Id), #pvDiscountExclTax@(item.Id)').on('input change', function() {
|
||||
calculateTotal@(item.Id)();
|
||||
});
|
||||
}
|
||||
|
||||
function toggleOrderItemEdit@(item.Id)(editMode) {
|
||||
if (editMode) {
|
||||
$('#pnlEditPvUnitPrice@(item.Id)').showElement();
|
||||
$('#pnlEditPvQuantity@(item.Id)').showElement();
|
||||
$('#pnlEditPvDiscount@(item.Id)').showElement();
|
||||
$('#pnlEditPvPrice@(item.Id)').showElement();
|
||||
$('#btnSaveOrderItem@(item.Id)').showElement();
|
||||
$('#btnCancelOrderItem@(item.Id)').showElement();
|
||||
|
||||
$('#pvUnitPriceInclTax@(item.Id)').prop("disabled", false);
|
||||
$('#pvUnitPriceExclTax@(item.Id)').prop("disabled", false);
|
||||
$('#pvQuantity@(item.Id)').prop("disabled", false);
|
||||
$('#pvDiscountInclTax@(item.Id)').prop("disabled", false);
|
||||
$('#pvDiscountExclTax@(item.Id)').prop("disabled", false);
|
||||
$('#pvPriceInclTax@(item.Id)').prop("disabled", false);
|
||||
$('#pvPriceExclTax@(item.Id)').prop("disabled", false);
|
||||
|
||||
$('#btnEditOrderItem@(item.Id)').hideElement();
|
||||
$('#btnDeleteOrderItem@(item.Id)').hideElement();
|
||||
} else {
|
||||
$('#pnlEditPvUnitPrice@(item.Id)').hideElement();
|
||||
$('#pnlEditPvQuantity@(item.Id)').hideElement();
|
||||
$('#pnlEditPvDiscount@(item.Id)').hideElement();
|
||||
$('#pnlEditPvPrice@(item.Id)').hideElement();
|
||||
$('#btnSaveOrderItem@(item.Id)').hideElement();
|
||||
$('#btnCancelOrderItem@(item.Id)').hideElement();
|
||||
|
||||
$('#pvUnitPriceInclTax@(item.Id)').prop("disabled", true);
|
||||
$('#pvUnitPriceExclTax@(item.Id)').prop("disabled", true);
|
||||
$('#pvQuantity@(item.Id)').prop("disabled", true);
|
||||
$('#pvDiscountInclTax@(item.Id)').prop("disabled", true);
|
||||
$('#pvDiscountExclTax@(item.Id)').prop("disabled", true);
|
||||
$('#pvPriceInclTax@(item.Id)').prop("disabled", true);
|
||||
$('#pvPriceExclTax@(item.Id)').prop("disabled", true);
|
||||
|
||||
$('#btnEditOrderItem@(item.Id)').showElement();
|
||||
$('#btnDeleteOrderItem@(item.Id)').showElement();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
}
|
||||
|
||||
<table class="table table-hover table-bordered">
|
||||
<col />
|
||||
<col />
|
||||
@if (Model.HasDownloadableProducts)
|
||||
{
|
||||
<col />
|
||||
}
|
||||
<col />
|
||||
<col />
|
||||
<col />
|
||||
<col />
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<col />
|
||||
}
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Picture")
|
||||
</th>
|
||||
<th>
|
||||
@T("Admin.Orders.Products.ProductName")
|
||||
</th>
|
||||
@if (Model.HasDownloadableProducts)
|
||||
{
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Download")
|
||||
</th>
|
||||
}
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Price")
|
||||
</th>
|
||||
<th>
|
||||
@T("FruitBank.IsMeasurable")
|
||||
</th>
|
||||
<th>
|
||||
@T("FruitBank.StockQuantity")
|
||||
</th>
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Quantity")
|
||||
</th>
|
||||
<th>
|
||||
@T("FruitBank.NetWeight")
|
||||
</th>
|
||||
@* <th>
|
||||
<table class="table table-hover table-bordered">
|
||||
<col />
|
||||
<col />
|
||||
@if (Model.HasDownloadableProducts)
|
||||
{
|
||||
<col />
|
||||
}
|
||||
<col />
|
||||
<col />
|
||||
<col />
|
||||
<col />
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<col />
|
||||
}
|
||||
<thead>
|
||||
<tr>
|
||||
@* <th>
|
||||
@T("Admin.Orders.Products.Picture")
|
||||
</th>
|
||||
*@ <th>
|
||||
@T("Admin.Orders.Products.ProductName")
|
||||
</th>
|
||||
@if (Model.HasDownloadableProducts)
|
||||
{
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Download")
|
||||
</th>
|
||||
}
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Price")
|
||||
</th>
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Quantity")
|
||||
</th>
|
||||
<th>
|
||||
@T("FruitBank.StockQuantity")
|
||||
</th>
|
||||
<th>
|
||||
@T("FruitBank.NetWeight")
|
||||
</th>
|
||||
<th>
|
||||
@T("FruitBank.IsMeasurable")
|
||||
</th>
|
||||
@* <th>
|
||||
@T("Admin.Orders.Products.Discount")
|
||||
</th> *@
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Total")
|
||||
</th>
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<th>
|
||||
@T("Admin.Common.Edit")
|
||||
</th>
|
||||
}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var item in Model.ItemExtendeds)
|
||||
{
|
||||
<tr>
|
||||
<td class="text-center preview">
|
||||
<img src="@item.PictureThumbnailUrl" alt="" title="" />
|
||||
</td>
|
||||
<td style="width: 25%;" class="text-left">
|
||||
<em><a asp-controller="Product" asp-action="Edit" asp-route-id="@item.ProductId">@item.ProductName</a></em>
|
||||
@if (!string.IsNullOrEmpty(item.AttributeInfo))
|
||||
{
|
||||
<p>
|
||||
@Html.Raw(item.AttributeInfo)
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.RecurringInfo))
|
||||
{
|
||||
<p>
|
||||
@Html.Raw(item.RecurringInfo)
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.RentalInfo))
|
||||
{
|
||||
<p>
|
||||
@Html.Raw(item.RentalInfo)
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.Sku))
|
||||
{
|
||||
<p>
|
||||
<strong>@T("Admin.Orders.Products.SKU")</strong><text>:</text>
|
||||
@item.Sku
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.VendorName))
|
||||
{
|
||||
<p>
|
||||
<strong>@T("Admin.Orders.Products.Vendor")</strong><text>:</text>
|
||||
@item.VendorName
|
||||
</p>
|
||||
}
|
||||
@if (item.ReturnRequests.Count > 0)
|
||||
{
|
||||
<p>
|
||||
@T("Admin.Orders.Products.ReturnRequests")<text>:</text>
|
||||
@for (var i = 0; i < item.ReturnRequests.Count; i++)
|
||||
{
|
||||
var returnRequest = item.ReturnRequests[i];
|
||||
<a asp-controller="ReturnRequest" asp-action="Edit" asp-route-id="@returnRequest.Id">@returnRequest.CustomNumber</a>
|
||||
if (i != item.ReturnRequests.Count - 1)
|
||||
{
|
||||
<text>, </text>
|
||||
}
|
||||
}
|
||||
</p>
|
||||
}
|
||||
</td>
|
||||
@if (Model.HasDownloadableProducts)
|
||||
{
|
||||
<td style="width: 15%;" class="text-center">
|
||||
@if (item.IsDownload)
|
||||
{
|
||||
<a asp-controller="Download" asp-action="DownloadFile" asp-route-orderItemId="@item.Id">
|
||||
@T("Admin.Orders.Products.Download.Download")
|
||||
</a>
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@T("Admin.Orders.Products.Download.NotAvailable")
|
||||
}
|
||||
</td>
|
||||
}
|
||||
<td style="width: 15%;" class="text-center">
|
||||
@if (Model.AllowCustomersToSelectTaxDisplayType)
|
||||
{
|
||||
<div>@Html.Raw(item.UnitPriceInclTax)</div>
|
||||
<div>@Html.Raw(item.UnitPriceExclTax)</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (Model.TaxDisplayType)
|
||||
{
|
||||
case TaxDisplayType.ExcludingTax:
|
||||
{
|
||||
@Html.Raw(item.UnitPriceExclTax)
|
||||
}
|
||||
break;
|
||||
case TaxDisplayType.IncludingTax:
|
||||
{
|
||||
@Html.Raw(item.UnitPriceInclTax)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
<div id="pnlEditPvUnitPrice@(item.Id)">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-5">
|
||||
@T("Admin.Orders.Products.Edit.InclTax")
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<input name="pvUnitPriceInclTax@(item.Id)" type="text" value="@item.UnitPriceInclTaxValue" id="pvUnitPriceInclTax@(item.Id)" class="form-control input-sm" />
|
||||
</div>
|
||||
</div>
|
||||
@* <div class="form-group row">
|
||||
<th>
|
||||
@T("Admin.Orders.Products.Total")
|
||||
</th>
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<th>
|
||||
@T("Admin.Common.Edit")
|
||||
</th>
|
||||
}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var item in Model.ItemExtendeds)
|
||||
{
|
||||
<tr>
|
||||
@* <td class="text-center preview">
|
||||
<img src="@item.PictureThumbnailUrl" alt="" title="" />
|
||||
</td>
|
||||
*@ <td style="width: 25%;" class="text-left">
|
||||
<em><a asp-controller="Product" asp-action="Edit" asp-route-id="@item.ProductId">@item.ProductName</a></em>
|
||||
@if (!string.IsNullOrEmpty(item.AttributeInfo))
|
||||
{
|
||||
<p>
|
||||
@Html.Raw(item.AttributeInfo)
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.RecurringInfo))
|
||||
{
|
||||
<p>
|
||||
@Html.Raw(item.RecurringInfo)
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.RentalInfo))
|
||||
{
|
||||
<p>
|
||||
@Html.Raw(item.RentalInfo)
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.Sku))
|
||||
{
|
||||
<p>
|
||||
<strong>@T("Admin.Orders.Products.SKU")</strong><text>:</text>
|
||||
@item.Sku
|
||||
</p>
|
||||
}
|
||||
@if (!string.IsNullOrEmpty(item.VendorName))
|
||||
{
|
||||
<p>
|
||||
<strong>@T("Admin.Orders.Products.Vendor")</strong><text>:</text>
|
||||
@item.VendorName
|
||||
</p>
|
||||
}
|
||||
@if (item.ReturnRequests.Count > 0)
|
||||
{
|
||||
<p>
|
||||
@T("Admin.Orders.Products.ReturnRequests")<text>:</text>
|
||||
@for (var i = 0; i < item.ReturnRequests.Count; i++)
|
||||
{
|
||||
var returnRequest = item.ReturnRequests[i];
|
||||
<a asp-controller="ReturnRequest" asp-action="Edit" asp-route-id="@returnRequest.Id">@returnRequest.CustomNumber</a>
|
||||
if (i != item.ReturnRequests.Count - 1)
|
||||
{
|
||||
<text>, </text>
|
||||
}
|
||||
}
|
||||
</p>
|
||||
}
|
||||
</td>
|
||||
@if (Model.HasDownloadableProducts)
|
||||
{
|
||||
<td style="width: 15%;" class="text-center">
|
||||
@if (item.IsDownload)
|
||||
{
|
||||
<a asp-controller="Download" asp-action="DownloadFile" asp-route-orderItemId="@item.Id">
|
||||
@T("Admin.Orders.Products.Download.Download")
|
||||
</a>
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@T("Admin.Orders.Products.Download.NotAvailable")
|
||||
}
|
||||
</td>
|
||||
}
|
||||
<td style="width: 13%;" class="text-center">
|
||||
@if (Model.AllowCustomersToSelectTaxDisplayType)
|
||||
{
|
||||
<div>@Html.Raw(item.UnitPriceInclTax)</div>
|
||||
<div>@Html.Raw(item.UnitPriceExclTax)</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (Model.TaxDisplayType)
|
||||
{
|
||||
case TaxDisplayType.ExcludingTax:
|
||||
{
|
||||
@Html.Raw(item.UnitPriceExclTax)
|
||||
}
|
||||
break;
|
||||
case TaxDisplayType.IncludingTax:
|
||||
{
|
||||
@Html.Raw(item.UnitPriceInclTax)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
<div id="pnlEditPvUnitPrice@(item.Id)">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-5">
|
||||
@T("Admin.Orders.Products.Edit.InclTax")
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<input name="pvUnitPriceInclTax@(item.Id)" type="text" value="@(item.UnitPriceInclTaxValue)" id="pvUnitPriceInclTax@(item.Id)"
|
||||
class="form-control input-sm" />
|
||||
</div>
|
||||
</div>
|
||||
@* <div class="form-group row">
|
||||
<div class="col-md-5">
|
||||
@T("Admin.Orders.Products.Edit.ExclTax")
|
||||
</div>
|
||||
|
|
@ -270,34 +277,44 @@
|
|||
</div>
|
||||
</div>
|
||||
*@ </div>
|
||||
</td>
|
||||
|
||||
<td style="width: 80px;" class="text-center">
|
||||
<div><input type="checkbox" name="pvIsMeasurable@(item.Id)" id="pvIsMeasurable@(item.Id)" @(item.IsMeasurable ? " checked" : "") disabled /></div>
|
||||
</td>
|
||||
</td>
|
||||
|
||||
<td style="width: 80px;" class="text-center">
|
||||
<div>@($"{item.ProductStockQuantity}{(item.ProductIncomingQuantity > 0 ? " (+"+item.ProductIncomingQuantity + ")" : string.Empty)}")</div>
|
||||
</td>
|
||||
<td style="width: 8%;" class="text-center">
|
||||
<div>@(item.Quantity) kt.</div>
|
||||
<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)" min="0"
|
||||
value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<td style="width: 10%;" class="text-center">
|
||||
<div>@item.Quantity</div>
|
||||
<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)" min="0"
|
||||
value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<td style="width: 80px;" class="text-center">
|
||||
@* <div name="pvNetWeight@(item.Id)" id="pvNetWeight@(item.Id)">@item.NetWeight</div> *@
|
||||
<div><input name="pvNetWeight@(item.Id)" id="pvNetWeight@(item.Id)" value='@item.NetWeight' disabled /></div>
|
||||
</td>
|
||||
<td style="width: 80px;" class="text-center">
|
||||
<div>
|
||||
<span>@($"{item.ProductStockQuantity} kt.")</span><span>@($"{(item.ProductIncomingQuantity > 0 ? " (+" + item.ProductIncomingQuantity + ")" : string.Empty)}")</span>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@* <td style="width: 15%;" class="text-center">
|
||||
<td style="width: 100px;" class="text-center">
|
||||
<span>@(item.NetWeight) kg.</span>
|
||||
<input type="hidden" name="pvNetWeight@(item.Id)" id="pvNetWeight@(item.Id)" value="@(item.NetWeight)" disabled />
|
||||
</td>
|
||||
|
||||
<td style="width: 80px;" class="text-center">
|
||||
@if(item.IsMeasurable)
|
||||
{
|
||||
<span class="badge badge-warning" disabled>Yes</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="badge badge-secondary" disabled>No</span>
|
||||
}
|
||||
<input type="hidden" name="pvIsMeasurable@(item.Id)" id="pvIsMeasurable@(item.Id)" value="@(item.IsMeasurable.ToString())" disabled />
|
||||
</td>
|
||||
|
||||
@* <td style="width: 15%;" class="text-center">
|
||||
@if (Model.AllowCustomersToSelectTaxDisplayType)
|
||||
{
|
||||
<div>@Html.Raw(item.DiscountInclTax)</div>
|
||||
|
|
@ -340,40 +357,41 @@
|
|||
</div>
|
||||
</div>
|
||||
</td> *@
|
||||
<td style="width: 15%;" class="text-center;">
|
||||
@if (Model.AllowCustomersToSelectTaxDisplayType)
|
||||
{
|
||||
<div>@Html.Raw(item.SubTotalInclTax)</div>
|
||||
<div>@Html.Raw(item.SubTotalExclTax)</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (Model.TaxDisplayType)
|
||||
{
|
||||
case TaxDisplayType.ExcludingTax:
|
||||
{
|
||||
@Html.Raw(item.SubTotalExclTax)
|
||||
}
|
||||
break;
|
||||
case TaxDisplayType.IncludingTax:
|
||||
{
|
||||
@Html.Raw(item.SubTotalInclTax)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
<div id="pnlEditPvPrice@(item.Id)">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-5">
|
||||
@T("Admin.Orders.Products.Edit.InclTax")
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<input name="pvPriceInclTax@(item.Id)" disabled type="text" value="@item.SubTotalInclTaxValue" id="pvPriceInclTax@(item.Id)" class="form-control input-sm" />
|
||||
</div>
|
||||
</div>
|
||||
@* <div class="form-group row">
|
||||
<td style="width: 15%;" class="text-center;">
|
||||
@if (Model.AllowCustomersToSelectTaxDisplayType)
|
||||
{
|
||||
<div>@Html.Raw(item.SubTotalInclTax)</div>
|
||||
<div>@Html.Raw(item.SubTotalExclTax)</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
switch (Model.TaxDisplayType)
|
||||
{
|
||||
case TaxDisplayType.ExcludingTax:
|
||||
{
|
||||
@Html.Raw(item.SubTotalExclTax)
|
||||
}
|
||||
break;
|
||||
case TaxDisplayType.IncludingTax:
|
||||
{
|
||||
@Html.Raw(item.SubTotalInclTax)
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
<div id="pnlEditPvPrice@(item.Id)">
|
||||
<div class="form-group row">
|
||||
<div class="col-md-5">
|
||||
@T("Admin.Orders.Products.Edit.InclTax")
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<input name="pvPriceInclTax@(item.Id)" disabled type="text" value="@item.SubTotalInclTaxValue" id="pvPriceInclTax@(item.Id)"
|
||||
class="form-control input-sm" />
|
||||
</div>
|
||||
</div>
|
||||
@* <div class="form-group row">
|
||||
<div class="col-md-5">
|
||||
@T("Admin.Orders.Products.Edit.ExclTax")
|
||||
</div>
|
||||
|
|
@ -381,56 +399,56 @@
|
|||
<input name="pvPriceExclTax@(item.Id)" disabled type="text" value="@item.SubTotalExclTaxValue" id="pvPriceExclTax@(item.Id)" class="form-control input-sm" />
|
||||
</div>
|
||||
</div>*@
|
||||
</div>
|
||||
</td>
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<td style="width: 15%;" class="text-center">
|
||||
<button type="submit" class="btn btn-default" name="btnEditOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(true);return false;" id="btnEditOrderItem@(item.Id)">
|
||||
<i class="fas fa-pencil"></i>
|
||||
@T("Admin.Common.Edit")
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<td style="width: 17%;" class="text-center">
|
||||
<button type="submit" class="btn btn-default" name="btnEditOrderItem@(item.Id)" onclick="toggleOrderItemEditGlobal(true, @(item.Id));return false;" id="btnEditOrderItem@(item.Id)">
|
||||
<i class="fas fa-pencil"></i>
|
||||
@T("Admin.Common.Edit")
|
||||
</button>
|
||||
|
||||
<button type="submit" class="btn btn-default" name="btnDeleteOrderItem@(item.Id)" id="btnDeleteOrderItem@(item.Id)">
|
||||
<i class="far fa-trash-can"></i>
|
||||
@T("Admin.Common.Delete")
|
||||
</button>
|
||||
<nop-action-confirmation asp-button-id="@("btnDeleteOrderItem" + item.Id)" />
|
||||
<button type="submit" class="btn btn-default" name="btnDeleteOrderItem@(item.Id)" id="btnDeleteOrderItem@(item.Id)">
|
||||
<i class="far fa-trash-can"></i>
|
||||
@T("Admin.Common.Delete")
|
||||
</button>
|
||||
<nop-action-confirmation asp-button-id="@("btnDeleteOrderItem" + item.Id)" />
|
||||
|
||||
<button type="submit" class="btn btn-default" name="btnSaveOrderItem@(item.Id)" id="btnSaveOrderItem@(item.Id)">
|
||||
<i class="far fa-floppy-disk"></i>
|
||||
@T("Admin.Common.Save")
|
||||
</button>
|
||||
<nop-action-confirmation asp-button-id="@("btnSaveOrderItem" + item.Id)" />
|
||||
<button type="submit" class="btn btn-default" name="btnSaveOrderItem@(item.Id)" id="btnSaveOrderItem@(item.Id)">
|
||||
<i class="far fa-floppy-disk"></i>
|
||||
@T("Admin.Common.Save")
|
||||
</button>
|
||||
<nop-action-confirmation asp-button-id="@("btnSaveOrderItem" + item.Id)" />
|
||||
|
||||
<button type="submit" class="btn btn-default" name="btnCancelOrderItem@(item.Id)" onclick="toggleOrderItemEdit@(item.Id)(false);return false;" id="btnCancelOrderItem@(item.Id)">
|
||||
<i class="fas fa-times"></i>
|
||||
@T("Admin.Common.Cancel")
|
||||
</button>
|
||||
</td>
|
||||
}
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@if (!string.IsNullOrEmpty(Model.CheckoutAttributeInfo) && !Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<div class="form-group row">
|
||||
<div class="col-md-12">
|
||||
@Html.Raw(Model.CheckoutAttributeInfo)
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<div class="form-group row">
|
||||
<div class="col-md-12">
|
||||
<button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick="javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new { orderId = Model.Id }))'); return false;" class="btn btn-primary">
|
||||
@T("Admin.Orders.Products.AddNew")
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
<button type="submit" class="btn btn-default" name="btnCancelOrderItem@(item.Id)" onclick="toggleOrderItemEditGlobal(false,@(item.Id));return false;" id="btnCancelOrderItem@(item.Id)">
|
||||
<i class="fas fa-times"></i>
|
||||
@T("Admin.Common.Cancel")
|
||||
</button>
|
||||
</td>
|
||||
}
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@if (!string.IsNullOrEmpty(Model.CheckoutAttributeInfo) && !Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<div class="form-group row">
|
||||
<div class="col-md-12">
|
||||
@Html.Raw(Model.CheckoutAttributeInfo)
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@if (!Model.IsLoggedInAsVendor)
|
||||
{
|
||||
<div class="form-group row">
|
||||
<div class="col-md-12">
|
||||
<button type="submit" id="btnAddNewProduct" name="btnAddNewProduct" onclick="javascript:setLocation('@(Url.Action("AddProductToOrder", "Order", new { orderId = Model.Id }))'); return false;" class="btn btn-primary">
|
||||
@T("Admin.Orders.Products.AddNew")
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
|
@ -178,7 +178,7 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Factories
|
|||
orderModelExtended.IsMeasured = orderDto.IsMeasured;
|
||||
orderModelExtended.IsMeasurable = orderDto.IsMeasurable;
|
||||
orderModelExtended.DateOfReceipt = orderDto.DateOfReceipt;
|
||||
orderModelExtended.OrderTotal = !orderDto.IsComplete && orderDto.IsMeasurable ? "Kalkuláció alatt..." : orderModelExtended.OrderTotal;
|
||||
orderModelExtended.OrderTotal = !orderDto.IsComplete && orderDto.IsMeasurable ? "kalkuláció alatt..." : orderModelExtended.OrderTotal;
|
||||
orderModelExtended.CustomerCompany = orderDto.Customer.Company;
|
||||
}
|
||||
|
||||
|
|
@ -210,6 +210,7 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Factories
|
|||
orderItemModelExtended.NetWeight = (decimal)orderItemDto.NetWeight;
|
||||
orderItemModelExtended.ProductStockQuantity = orderItemDto.ProductDto!.StockQuantity;
|
||||
orderItemModelExtended.ProductIncomingQuantity = orderItemDto.ProductDto.IncomingQuantity;
|
||||
//orderItemModelExtended.SubTotalInclTax = !orderDto.IsComplete && orderItemDto.IsMeasurable ? "kalkuláció alatt..." : orderItemModelExtended.SubTotalInclTax;
|
||||
|
||||
orderModelExtended.ItemExtendeds ??= new List<OrderItemModelExtended>();
|
||||
orderModelExtended.ItemExtendeds.Add(orderItemModelExtended);
|
||||
|
|
|
|||
Loading…
Reference in New Issue