Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Minor fix for the CSS styles
PatrykPorabikdb539b5f6d2f
diff --git a/src/Web/Grand.Web/Views/Product/_AddToCart.cshtml b/src/Web/Grand.Web/Views/Product/_AddToCart.cshtmlindex 06d96e7b8..dcf98c196 100644--- a/src/Web/Grand.Web/Views/Product/_AddToCart.cshtml+++ b/src/Web/Grand.Web/Views/Product/_AddToCart.cshtml@@ -1,5 +1,5 @@@model ProductDetailsModel.AddToCartModel-@{+@{var shoppingCartType = Model.UpdateShoppingCartItemType.HasValue ? Model.UpdateShoppingCartItemType.Value : ShoppingCartType.ShoppingCart;}@if (!String.IsNullOrEmpty(Model.UpdatedShoppingCartItemId))@@ -18,15 +18,16 @@</div></div>}-<div role="group" class="input-group product-add-to-cart flex-nowrap">@if (!Model.DisableBuyButton || Model.EnteredPrice){if (!String.IsNullOrEmpty(Model.MinimumQuantityNotification)){<div class="min-qty-notification text-danger w-100 mb-2">@Model.MinimumQuantityNotification</div>}- if (!Model.DisableBuyButton)- {+ <div role="group" class="input-group product-add-to-cart flex-nowrap">++ @if (!Model.DisableBuyButton)+ {@if (Model.AllowedQuantities.Any()){<select asp-for="EnteredQuantity" asp-items="Model.AllowedQuantities" class="custom-select form-control qty-dropdown mr-2"></select>@@ -42,7 +43,7 @@var addId = "addtocart_" + @Model.ProductId + "_EnteredQuantity";<label for="@addId" class="sr-only">@Loc["ShoppingCart.AddToCart"]</label>- <input asp-for="EnteredQuantity" class="qty-input form-control text-center" type="number" inputmode="numeric"/>+ <input asp-for="EnteredQuantity" class="qty-input form-control text-center" type="number" inputmode="numeric" />if (!String.IsNullOrEmpty(Model.MeasureUnit)){<span class="qty-unit d-flex align-items-center mr-2">@@ -52,29 +53,29 @@}{- var addToCartText = "";- if (!String.IsNullOrEmpty(Model.UpdatedShoppingCartItemId) && Model.UpdateShoppingCartItemType.HasValue && (Model.UpdateShoppingCartItemType.Value == ShoppingCartType.ShoppingCart || Model.UpdateShoppingCartItemType.Value == ShoppingCartType.OnHoldCart))- {- addToCartText = Loc["ShoppingCart.AddToCart.Update"];- }- else- {- addToCartText = Loc["ShoppingCart.AddToCart"];- if (Model.IsReservation)- {- addToCartText = Loc["ShoppingCart.Reservation"];- }- if (Model.AvailableForPreOrder)- {- addToCartText = Loc["ShoppingCart.PreOrder"];- }- if (Model.IsAuction)- {- addToCartText = Loc["ShoppingCart.BuyNow"];- }- }+ var addToCartText = "";+ if (!String.IsNullOrEmpty(Model.UpdatedShoppingCartItemId) && Model.UpdateShoppingCartItemType.HasValue && (Model.UpdateShoppingCartItemType.Value == ShoppingCartType.ShoppingCart || Model.UpdateShoppingCartItemType.Value == ShoppingCartType.OnHoldCart))+ {+ addToCartText = Loc["ShoppingCart.AddToCart.Update"];+ }+ else+ {+ addToCartText = Loc["ShoppingCart.AddToCart"];+ if (Model.IsReservation)+ {+ addToCartText = Loc["ShoppingCart.Reservation"];+ }+ if (Model.AvailableForPreOrder)+ {+ addToCartText = Loc["ShoppingCart.PreOrder"];+ }+ if (Model.IsAuction)+ {+ addToCartText = Loc["ShoppingCart.BuyNow"];+ }+ }- <script asp-location="Footer">+ <script asp-location="Footer">if (document.getElementById("@Html.IdFor(model => model.EnteredQuantity)")) {document.getElementById("@Html.IdFor(model => model.EnteredQuantity)").addEventListener("keyup", function (event) {if (event.keyCode == 13) {@@ -92,13 +93,13 @@});}- </script>- <div class="input-group-append">- <button type="button" id="[email protected]" class="btn btn-info w-100 add-to-cart-button d-inline-flex" data-productid="@Model.ProductId" onclick="AxiosCart.addproducttocart_details('@Url.RouteUrl("AddProductDetails", new { productId = Model.ProductId, shoppingCartTypeId = (int)shoppingCartType })', '#product-details-form');return false;">- <span>@addToCartText</span>- </button>- </div>+ </script>+ <div class="input-group-append">+ <button type="button" id="[email protected]" class="btn btn-info w-100 add-to-cart-button d-inline-flex" data-productid="@Model.ProductId" onclick="AxiosCart.addproducttocart_details('@Url.RouteUrl("AddProductDetails", new { productId = Model.ProductId, shoppingCartTypeId = (int)shoppingCartType })', '#product-details-form');return false;">+ <span>@addToCartText</span>+ </button>+ </div>}- }+ }+ </div>}-</div>diff --git a/src/Web/Grand.Web/Views/Shared/_AddToCartGroupQV.cshtml b/src/Web/Grand.Web/Views/Shared/_AddToCartGroupQV.cshtmlindex a5ca878ab..da953c984 100644--- a/src/Web/Grand.Web/Views/Shared/_AddToCartGroupQV.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_AddToCartGroupQV.cshtml@@ -9,12 +9,12 @@</div></div></template>-<div role="group" class="input-group product-add-to-cart flex-nowrap">- <template v-if="!variant.AddToCart.DisableBuyButton || variant.AddToCart.EnteredPrice">- <template v-if="variant.AddToCart.MinimumQuantityNotification !== null">- <div class="min-qty-notification text-danger w-100 mb-2">{{variant.AddToCart.MinimumQuantityNotification}}</div>- </template>+<template v-if="!variant.AddToCart.DisableBuyButton || variant.AddToCart.EnteredPrice">+ <template v-if="variant.AddToCart.MinimumQuantityNotification !== null">+ <div class="min-qty-notification text-danger w-100 mb-2">{{variant.AddToCart.MinimumQuantityNotification}}</div></template>+</template>+<div role="group" class="input-group product-add-to-cart flex-nowrap"><template v-if="!variant.AddToCart.DisableBuyButton"><template v-if="variant.AddToCart.AllowedQuantities.length > 0"><select :id="'addtocart_' + variant.AddToCart.ProductId + '_EnteredQuantity'" :name="'addtocart_' + variant.AddToCart.ProductId + '.EnteredQuantity'" class="custom-select form-control qty-dropdown mr-2">diff --git a/src/Web/Grand.Web/Views/Shared/_AddToCartQV.cshtml b/src/Web/Grand.Web/Views/Shared/_AddToCartQV.cshtmlindex 881d48d5e..9c068d727 100644--- a/src/Web/Grand.Web/Views/Shared/_AddToCartQV.cshtml+++ b/src/Web/Grand.Web/Views/Shared/_AddToCartQV.cshtml@@ -1,79 +1,21 @@-@{+@{var addtocart = @Url.RouteUrl("AddProductDetails");var updateitemcart = @Url.RouteUrl("UpdateItemCart");}- <template v-if="PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null">- <input type="hidden" id="shoppingCartItemId" name="shoppingCartItemId" :value="UpdatedShoppingCartItemId" />- </template>- <template v-if="PopupQuickViewVueModal.AddToCart.EnteredPrice">- <div class="customer-entered-price mb-3 d-flex w-100 flex-column">- <div class="price-input">- <label :for="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_CustomerEnteredPrice'" class="enter-price-label">@Loc["Products.EnterProductPrice"]</label>- <input :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_CustomerEnteredPrice'" :name="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '.CustomerEnteredPrice'" type="text" :value="PopupQuickViewVueModal.AddToCart.CustomerEnteredPrice" class="form-control enter-price-input" />- </div>- <div class="price-range pt-1">- {{PopupQuickViewVueModal.AddToCart.CustomerEnteredPriceRange}}- </div>+<template v-if="PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null">+ <input type="hidden" id="shoppingCartItemId" name="shoppingCartItemId" :value="UpdatedShoppingCartItemId" />+</template>+<template v-if="PopupQuickViewVueModal.AddToCart.EnteredPrice">+ <div class="customer-entered-price mb-3 d-flex w-100 flex-column">+ <div class="price-input">+ <label :for="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_CustomerEnteredPrice'" class="enter-price-label">@Loc["Products.EnterProductPrice"]</label>+ <input :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_CustomerEnteredPrice'" :name="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '.CustomerEnteredPrice'" type="text" :value="PopupQuickViewVueModal.AddToCart.CustomerEnteredPrice" class="form-control enter-price-input" />+ </div>+ <div class="price-range pt-1">+ {{PopupQuickViewVueModal.AddToCart.CustomerEnteredPriceRange}}</div>- </template>- <div role="group" class="input-group product-add-to-cart flex-nowrap">- <template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton || PopupQuickViewVueModal.AddToCart.EnteredPrice">- <template v-if="PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification !== null">- <div class="min-qty-notification text-danger w-100 mb-2">{{PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification}}</div>- </template>- </template>- <template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton">- <template v-if="PopupQuickViewVueModal.AddToCart.AllowedQuantities.length > 0">- <select :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" :name="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '.EnteredQuantity'" class="custom-select form-control qty-dropdown mr-2">- <template v-for="option in PopupQuickViewVueModal.AddToCart.AllowedQuantities">- <option :value="option.Value" :disabled="option.Disabled" :selected="option.Selected">{{option.Text}}</option>- </template>- </select>- </template>- <template v-else>- <label :for="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" class="sr-only">@Loc["ShoppingCart.AddToCart"]</label>- <input v-model.number="PopupQuickViewVueModal.AddToCart.EnteredQuantity" :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" :name="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '.EnteredQuantity'" class="qty-input form-control text-center" type="number" inputmode="numeric" />- <template v-if="PopupQuickViewVueModal.AddToCart.MeasureUnit !== ''">- <span class="qty-unit d-flex align-items-center mr-2">- {{PopupQuickViewVueModal.AddToCart.MeasureUnit}}- </span>- </template>- </template>- <div class="input-group-append w-100">- <template v-if="typeof vmwishlist !== 'undefined' && PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null">- <button :id="'add-to-wishlist-button-' + PopupQuickViewVueModal.AddToCart.ProductId" class="btn btn-info w-100 d-inline-flex main-button" title="@Loc["ShoppingCart.AddToWishlist.Update"]" :data-productid="PopupQuickViewVueModal.AddToCart.ProductId" :onclick="'AxiosCart.updateitem(`@updateitemcart`, `#product-details-form`);return false;'" v-b-tooltip.hover.bottom>- <span>- @Loc["ShoppingCart.AddToWishlist.Update"]- </span>- </button>- </template>- <template v-else>- <button type="button" :id="'add-to-cart-button-' + PopupQuickViewVueModal.AddToCart.ProductId" class="btn btn-info w-100 main-button d-inline-flex"- data-productid="PopupQuickViewVueModal.AddToCart.ProductId" :onclick="PopupQuickViewVueModal.AddToCart.UpdatedShoppingCartItemId !== null ?- 'AxiosCart.updateitem(`@updateitemcart`, `#product-details-form`);return false;' :- 'AxiosCart.addproducttocart_details(`@addtocart/' + PopupQuickViewVueModal.AddToCart.ProductId + '/1`, `#product-details-form`);return false;'">- <span>- <template v-if="PopupQuickViewVueModal.AddToCart.IsAuction">- @Loc["ShoppingCart.BuyNow"]- </template>- <template v-else-if="PopupQuickViewVueModal.AddToCart.IsReservation">- @Loc["ShoppingCart.Reservation"]- </template>- <template v-else-if="PopupQuickViewVueModal.AddToCart.AvailableForPreOrder">- @Loc["ShoppingCart.PreOrder"]- </template>- <template v-else-if="PopupQuickViewVueModal.AddToCart.UpdateShoppingCartItemType !== null">- @Loc["ShoppingCart.AddToCart.Update"]- </template>- <template v-else>- @Loc["ShoppingCart.AddToCart"]- </template>- </span>- </button>- </template>- </div>- </template></div>+</template><template v-if="PopupQuickViewVueModal.AddToCart.EnteredPrice"><div class="customer-entered-price mb-3 d-flex w-100 flex-column"><div class="price-input">@@ -85,12 +27,12 @@</div></div></template>-<div role="group" class="input-group product-add-to-cart flex-nowrap">- <template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton || PopupQuickViewVueModal.AddToCart.EnteredPrice">- <template v-if="PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification !== null">- <div class="min-qty-notification text-danger w-100 mb-2">{{PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification}}</div>- </template>+<template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton || PopupQuickViewVueModal.AddToCart.EnteredPrice">+ <template v-if="PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification !== null">+ <div class="min-qty-notification text-danger w-100 mb-2">{{PopupQuickViewVueModal.AddToCart.MinimumQuantityNotification}}</div></template>+</template>+<div role="group" class="input-group product-add-to-cart flex-nowrap"><template v-if="!PopupQuickViewVueModal.AddToCart.DisableBuyButton"><template v-if="PopupQuickViewVueModal.AddToCart.AllowedQuantities.length > 0"><select :id="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '_EnteredQuantity'" :name="'addtocart_' + PopupQuickViewVueModal.AddToCart.ProductId + '.EnteredQuantity'" class="custom-select form-control qty-dropdown mr-2">