diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/InnVoiceOrderController.cs b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/InnVoiceOrderController.cs
index 84ad995..9c994a4 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/InnVoiceOrderController.cs
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Controllers/InnVoiceOrderController.cs
@@ -120,23 +120,41 @@ namespace Nop.Plugin.Misc.FruitBankPlugin.Areas.Admin.Controllers
                 }
 
                 // Add order items
-                var orderItems = await _orderService.GetOrderItemsAsync(order.Id);
+                //var orderItems = await _orderService.GetOrderItemsAsync(order.Id);
+                var orderItems = await _dbContext.OrderItemDtos.GetAllByOrderId(order.Id, true).ToListAsync();
+                Console.WriteLine($"Order Items Count: {orderItems.Count}");
                 foreach (var item in orderItems)
                 {
                     //var productDTO = await _productService.GetProductByIdAsync(item.ProductId);
                     var product = _dbContext.ProductDtos.GetById(item.ProductId);
                     //string unit = product != null && product.IsMeasurable ? "kg" : "kt";                    
-                    
-                    orderRequest.AddItem(new InnVoiceOrderItem
+                    if(item.IsMeasurable) {                         // in case of measurable products, quantity is in fact weight stored in item.EnteredQuantity
+                        orderRequest.AddItem(new InnVoiceOrderItem
+                        {
+                            TetelNev = product?.Name ?? "Product",
+                            AfaSzoveg = "27%", // Configure VAT rate as needed
+                            Brutto = true,
+                            EgysegAr = item.UnitPriceInclTax,
+                            Mennyiseg = Convert.ToDecimal(item.NetWeight),
+                            MennyisegEgyseg = "kg",
+                            CikkSzam = ""
+                        });
+                       
+                    }
+                    else
                     {
-                        TetelNev = product?.Name ?? "Product",
-                        AfaSzoveg = "27%", // Configure VAT rate as needed
-                        Brutto = true,
-                        EgysegAr = item.UnitPriceInclTax,
-                        Mennyiseg = item.Quantity,
-                        MennyisegEgyseg = "kt",
-                        CikkSzam = ""
-                    });
+                        orderRequest.AddItem(new InnVoiceOrderItem
+                        {
+                            TetelNev = product?.Name ?? "Product",
+                            AfaSzoveg = "27%", // Configure VAT rate as needed
+                            Brutto = true,
+                            EgysegAr = item.UnitPriceInclTax,
+                            Mennyiseg = item.Quantity,
+                            MennyisegEgyseg = "kt",
+                            CikkSzam = ""
+                        });
+                    }
+                       
                 }
 
                 // Create order via API
diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
index 90a6ca6..3a583bd 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Order/_CustomOrderDetails.Products.cshtml
@@ -4,271 +4,278 @@
 @using Nop.Core.Domain.Catalog;
 
 <script>
-	function calculateTotalGlobal(itemId, maxQuantity) {
-		//var isMeasurable = $('#pvIsMeasurable'+itemId).is(':checked');
+    function calculateTotalGlobal(itemId, maxQuantity) {
+        //var isMeasurable = $('#pvIsMeasurable'+itemId).is(':checked');
 
-		var isMeasurable = $('#pvIsMeasurable'+itemId).val().toLowerCase() === 'true';
+        var isMeasurable = $('#pvIsMeasurable'+itemId).val().toLowerCase() === 'true';
 
-		console.log(itemId);
-		console.log(isMeasurable);
-		console.log(maxQuantity);
-		console.log($('#pvNetWeight'+itemId).val());
+        console.log(itemId);
+        console.log(isMeasurable);
+        console.log(maxQuantity);
+        console.log($('#pvNetWeight'+itemId).val());
 
-		var netWeight = parseFloat($('#pvNetWeight'+itemId).val()) || 0;
+        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;
+        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 < 1) {
-			if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 1;
-			$('#pvQuantity' + itemId).val(quantity);
-		}
+        if (quantity > maxQuantity || quantity < 1) {
+            if (quantity > maxQuantity) quantity = maxQuantity; else quantity = 1;
+            $('#pvQuantity' + itemId).val(quantity);
+        }
 
-		if (unitPriceInclTax < 0) {
-			unitPriceInclTax = 0;
-			$('#pvUnitPriceInclTax' + itemId).val(unitPriceInclTax);
-		}
+        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;
+        // 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));
-	}
+        // 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, maxQuantity) {
-		// 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, maxQuantity);
-		});
-	}
+    // Function to setup event listeners for automatic calculation
+    function setupAutoCalculationGlobal(itemId, maxQuantity) {
+        // 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, maxQuantity);
+        });
+    }
 
-	function toggleOrderItemEditGlobal(editMode, itemId) {
-		if (editMode) {
-			$('#pnlEditPvUnitPrice'+itemId).showElement();
-			$('#pnlEditPvQuantity'+itemId).showElement();
-			$('#pnlEditPvDiscount'+itemId).showElement();
-			$('#pnlEditPvPrice'+itemId).showElement();
-			$('#btnSaveOrderItem'+itemId).showElement();
-			$('#btnCancelOrderItem'+itemId).showElement();
+    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);
+            $('#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();
+            $('#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);
+            $('#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();
-		}
-	}
+            $('#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.ItemExtendeds)
-			{
-				<script>
-					$(function() {
-						toggleOrderItemEditGlobal(false, @(item.Id));
-						setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity));
-					});
-				</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>
+    <div class="form-group row">
+        <div class="col-md-12" style="overflow-x: auto;">
+            @{
+                if (Model.ItemExtendeds != null)
+                {
+                    foreach (var item in Model.ItemExtendeds)
+                    {
+                        <script>
+                            $(function() {
+                                toggleOrderItemEditGlobal(false, @(item.Id));
+                                setupAutoCalculationGlobal(@(item.Id), @(item.ProductStockQuantity + item.ProductIncomingQuantity + item.Quantity));
+                            });
+                        </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("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.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">
+                        <th>
+                            @T("Admin.Orders.Products.Total")
+                        </th>
+                        @if (!Model.IsLoggedInAsVendor)
+                        {
+                            <th>
+                                @T("Admin.Common.Edit")
+                            </th>
+                        }
+                    </tr>
+                </thead>
+                <tbody>
+                    @{
+                        if (Model.ItemExtendeds != null)
+                        {
+                            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>
+                                        <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">
+                                            }
+                                            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>
@@ -277,44 +284,44 @@
                                         </div>
                                     </div>
  *@                                </div>
-							</td>
+                                    </td>
 
-							<td style="width: 10%;" 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 + item.Quantity)" min="1"
-												   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) 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 + item.Quantity)" min="1"
+                                                           value="@item.Quantity" id="pvQuantity@(item.Id)" class="form-control input-sm" />
+                                                </div>
+                                            </div>
+                                        </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: 80px;" class="text-center">
+                                        <div>
+                                            <span>@($"{item.ProductStockQuantity} kt.")</span><span>@($"{(item.ProductIncomingQuantity > 0 ? " (+" + item.ProductIncomingQuantity + ")" : string.Empty)}")</span>
+                                        </div>
+                                    </td>
 
-							<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: 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: 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">
+                                    @* <td style="width: 15%;" class="text-center">
                                 @if (Model.AllowCustomersToSelectTaxDisplayType)
                                 {
                                     <div>@Html.Raw(item.DiscountInclTax)</div>
@@ -357,41 +364,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>
@@ -399,56 +406,59 @@
                                             <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: 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>
+                                        </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="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>
-	}
+                                            <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>
\ No newline at end of file
diff --git a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
index c0c274b..131142f 100644
--- a/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
+++ b/Nop.Plugin.Misc.AIPlugin/Areas/Admin/Views/Product/List.cshtml
@@ -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>
 														{