Skip to content

Commit 4bf6efb

Browse files
committed
Theming: ajaxified associated products
1 parent c7256e0 commit 4bf6efb

File tree

5 files changed

+28
-30
lines changed

5 files changed

+28
-30
lines changed

src/Presentation/SmartStore.Web/Controllers/CatalogHelper.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ public ProductDetailsModel PrepareProductDetailsPageModel(
197197
HasSampleDownload = product.IsDownload && product.HasSampleDownload,
198198
IsCurrentCustomerRegistered = _services.WorkContext.CurrentCustomer.IsRegistered(),
199199
IsAssociatedProduct = isAssociatedProduct,
200-
CompareEnabled = _catalogSettings.CompareProductsEnabled && (product.VisibleIndividually || !isAssociatedProduct),
201-
TellAFriendEnabled = _catalogSettings.EmailAFriendEnabled && (product.VisibleIndividually || !isAssociatedProduct),
202-
AskQuestionEnabled = _catalogSettings.AskQuestionEnabled && (product.VisibleIndividually || !isAssociatedProduct)
200+
CompareEnabled = !isAssociatedProduct && _catalogSettings.CompareProductsEnabled,
201+
TellAFriendEnabled = !isAssociatedProduct && _catalogSettings.EmailAFriendEnabled,
202+
AskQuestionEnabled = !isAssociatedProduct && _catalogSettings.AskQuestionEnabled
203203
};
204204

205205
// Social share code
@@ -1075,8 +1075,7 @@ public ProductDetailsModel PrepareProductDetailModel(
10751075
model.AddToCart.DisableBuyButton = product.DisableBuyButton || !_services.Permissions.Authorize(StandardPermissionProvider.EnableShoppingCart);
10761076
model.AddToCart.DisableWishlistButton = product.DisableWishlistButton
10771077
|| !_services.Permissions.Authorize(StandardPermissionProvider.EnableWishlist)
1078-
|| product.ProductType == ProductType.GroupedProduct
1079-
|| (product.ParentGroupedProductId > 0 && !product.VisibleIndividually);
1078+
|| product.ProductType == ProductType.GroupedProduct;
10801079

10811080
if (!displayPrices)
10821081
{

src/Presentation/SmartStore.Web/Themes/Alpha/Scripts/public.product.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
this.createGallery(opts.galleryStartIndex);
2020

21-
2221
// Update product data and gallery
2322
$(el).find(':input').change(function (e) {
2423
var ctx = $(this).closest('.update-container');
@@ -42,7 +41,6 @@
4241
}
4342
});
4443
}
45-
4644
}
4745
});
4846
});

src/Presentation/SmartStore.Web/Views/Product/Partials/Product.AssociatedProduct.cshtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
<div class="pd-variant-picture img-center-container">
1919
@if (Model.DetailsPictureModel.DefaultPictureModel.ImageUrl.HasValue())
2020
{
21-
<img src="@Model.DetailsPictureModel.DefaultPictureModel.ImageUrl"
21+
<img class="pd-dyn-thumb"
22+
src="@Model.DetailsPictureModel.DefaultPictureModel.ImageUrl"
2223
alt="@Model.DetailsPictureModel.AlternateText"
2324
title="@Model.DetailsPictureModel.DefaultPictureModel.Title" />
2425
}

src/Presentation/SmartStore.Web/Views/Product/Partials/Product.Bundle.Items.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<div class="pd-bundle-item-top row no-space">
2323
@if (item.DetailsPictureModel.DefaultPictureModel.ImageUrl.HasValue() && !item.BundleItem.HideThumbnail)
2424
{
25-
<div class="pd-bundle-item-image col-xs pd-dyn-thumb" style="min-width: @(item.ThumbDimensions)px; max-width: @(item.ThumbDimensions)px;">
25+
<div class="pd-bundle-item-image col-xs" style="min-width: @(item.ThumbDimensions)px; max-width: @(item.ThumbDimensions)px;">
2626
<img src="@item.DetailsPictureModel.DefaultPictureModel.ImageUrl"
27-
class="img-fluid"
27+
class="img-fluid pd-dyn-thumb"
2828
alt="@item.DetailsPictureModel.AlternateText"
2929
title="@item.DetailsPictureModel.DefaultPictureModel.Title" />
3030
</div>

src/Presentation/SmartStore.Web/Views/Product/Product.cshtml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,29 @@
137137
}
138138
</aside>
139139
</section>
140-
}
141-
</div>
142140

143-
@if (Model.ProductType == ProductType.GroupedProduct)
144-
{
145-
<section class="pd-section pd-section-variants">
146-
@if (Model.AssociatedProducts.Count == 0)
141+
if (Model.ProductType == ProductType.GroupedProduct)
147142
{
148-
<div class="pd-no-associated-products alert alert-warning">
149-
@T("Products.NoAssociatedProducts")
150-
</div>
151-
}
152-
else
153-
{
154-
foreach (var product in Model.AssociatedProducts)
155-
{
156-
var dataDictProduct = new ViewDataDictionary();
157-
dataDictProduct.TemplateInfo.HtmlFieldPrefix = string.Format("product_{0}", product.Id);
158-
Html.RenderPartial("Product.AssociatedProduct", product, dataDictProduct);
159-
}
143+
<section class="pd-section pd-section-variants">
144+
@if (Model.AssociatedProducts.Count == 0)
145+
{
146+
<div class="pd-no-associated-products alert alert-warning">
147+
@T("Products.NoAssociatedProducts")
148+
</div>
149+
}
150+
else
151+
{
152+
foreach (var product in Model.AssociatedProducts)
153+
{
154+
var dataDictProduct = new ViewDataDictionary();
155+
dataDictProduct.TemplateInfo.HtmlFieldPrefix = string.Format("product_{0}", product.Id);
156+
Html.RenderPartial("Product.AssociatedProduct", product, dataDictProduct);
157+
}
158+
}
159+
</section>
160160
}
161-
</section>
162-
}
161+
}
162+
</div>
163163

164164
<!-- Bottom Content: Full Description, Specification, Review etc. -->
165165
<section class="pd-section pd-section-bottom">

0 commit comments

Comments
 (0)