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

STRF-4173 - Ensure SKU and UPC display correctly for Variants when th… #1431

Merged
merged 1 commit into from
Jan 24, 2019
Merged

STRF-4173 - Ensure SKU and UPC display correctly for Variants when th… #1431

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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Draft

- Ensure SKU and UPC display correctly for Variants on PDP. [#1431](https://github.com/bigcommerce/cornerstone/pull/1431)

## 3.1.1 (2019-01-23)

- Downgrade Webpack to last known good version during development. [#1428](https://github.com/bigcommerce/cornerstone/pull/1428)
Expand Down
22 changes: 18 additions & 4 deletions assets/js/theme/common/product-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,14 @@ export default class ProductDetails {
$container: $('.form-field--stock', $scope),
$input: $('[data-product-stock]', $scope),
},
$sku: $('[data-product-sku]'),
$upc: $('[data-product-upc]'),
sku: {
$label: $('dt.sku-label', $scope),
$value: $('[data-product-sku]', $scope),
},
upc: {
$label: $('dt.upc-label', $scope),
$value: $('[data-product-upc]', $scope),
},
quantity: {
$text: $('.incrementTotal', $scope),
$input: $('[name=qty\\[\\]]', $scope),
Expand Down Expand Up @@ -552,12 +558,20 @@ export default class ProductDetails {

// If SKU is available
if (data.sku) {
viewModel.$sku.text(data.sku);
viewModel.sku.$value.text(data.sku);
viewModel.sku.$label.show();
} else {
viewModel.sku.$label.hide();
viewModel.sku.$value.text('');
}

// If UPC is available
if (data.upc) {
viewModel.$upc.text(data.upc);
viewModel.upc.$value.text(data.upc);
viewModel.upc.$label.show();
} else {
viewModel.upc.$label.hide();
viewModel.upc.$value.text('');
}

// if stock view is on (CP settings)
Expand Down
12 changes: 4 additions & 8 deletions templates/components/products/product-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,10 @@ <h2 class="productView-brand"{{#if schema}} itemprop="brand" itemscope itemtype=
</div>
{{product.detail_messages}}
<dl class="productView-info">
{{#if product.sku}}
<dt class="productView-info-name">{{lang 'products.sku'}}</dt>
<dd class="productView-info-value" data-product-sku>{{product.sku}}</dd>
{{/if}}
{{#if product.upc}}
<dt class="productView-info-name">{{lang 'products.upc'}}</dt>
<dd class="productView-info-value" data-product-upc>{{product.upc}}</dd>
{{/if}}
<dt class="productView-info-name sku-label"{{#unless product.sku}} style="display: none;"{{/unless}}>{{lang 'products.sku'}}</dt>
<dd class="productView-info-value" data-product-sku>{{product.sku}}</dd>
<dt class="productView-info-name upc-label"{{#unless product.upc}} style="display: none;"{{/unless}}>{{lang 'products.upc'}}</dt>
<dd class="productView-info-value" data-product-upc>{{product.upc}}</dd>
{{#if product.condition}}
<dt class="productView-info-name">{{lang 'products.condition'}}</dt>
<dd class="productView-info-value">{{product.condition}}</dd>
Expand Down