Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to open Bulk Pricing modal from Quick View. #1483

Merged
merged 1 commit into from
May 6, 2019
Merged

Fix to open Bulk Pricing modal from Quick View. #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Draft
- Fix to open Bulk Pricing modal from Quick View. [#1483](https://github.com/bigcommerce/cornerstone/pull/1483)

## 3.4.2 (2019-04-30)
- Remove deprecated "snippet" locations [#1479](https://github.com/bigcommerce/cornerstone/pull/1479)
Expand Down
8 changes: 8 additions & 0 deletions assets/js/theme/product.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default class Product extends PageManager {
super(context);
this.url = window.location.href;
this.$reviewLink = $('[data-reveal-id="modal-review-form"]');
this.$bulkPricingLink = $('[data-reveal-id="modal-bulk-pricing"]');
}

onReady() {
Expand Down Expand Up @@ -50,11 +51,18 @@ export default class Product extends PageManager {
});

this.productReviewHandler();
this.bulkPricingHandler();
}

productReviewHandler() {
if (this.url.indexOf('#write_review') !== -1) {
this.$reviewLink.trigger('click');
}
}

bulkPricingHandler() {
if (this.url.indexOf('#bulk_pricing') !== -1) {
this.$bulkPricingLink.trigger('click');
}
}
}
6 changes: 3 additions & 3 deletions templates/components/products/bulk-discount-rates.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{{#if bulk_discount_rates.length}}
{{#if product}}<dt class="productView-info-name">{{lang 'products.bulk_pricing.title'}}</dt>{{/if}}
<dd class="productView-info-value">
<a href="{{url}}"
{{#unless is_ajax }}data-reveal-id="bulkPricingModal{{#if id}}-{{id}}-{{$index}}{{/if}}"{{/unless}}>
<a href="{{product.url}}#bulk_pricing"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes sure that the product URL is in the link, though it hasn't caused issues before. Follows the same convention as #write_review

{{#unless is_ajax }}data-reveal-id="modal-bulk-pricing"{{/unless}}>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the id identifier because this modal is only used here. Presumably this id is here in the case of collisions. Uses the modal-some-name pattern used in modal-review-form.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🍹 from a "minimum viable change" perspective, is this needed? Or did this just feel like good cleanup? I believe bulk discount rates can be rendered on PLPs with certain configurations of theme config in which case this might serve a purpose (collisions, as you mentioned)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It felt like cleanup. Reverting that change until I'm absolutely 100% sure it wouldn't affect anything.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wrong. product.url is necessary. It makes no difference on the product details page, but it's necessary where multiple products are shown, like a category page. If it's just url, the link won't actually go anywhere. It'll go to a nonexistent anchor on the same page.

{{lang 'products.bulk_pricing.view'}}
</a>
</dd>
<div id="bulkPricingModal{{#if id}}-{{id}}-{{$index}}{{/if}}" class="modal modal--small" data-reveal>
<div id="modal-bulk-pricing" class="modal modal--small" data-reveal>
<div class="modal-header">
<h2 class="modal-header-title">{{lang 'products.bulk_pricing.modal_title'}}</h2>
<a href="#" class="modal-close" aria-label="Close"><span aria-hidden="true">&#215;</span></a>
Expand Down