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

Jump to bottom

standardize price field location && update panel casing #2996

Merged
merged 5 commits into from
Oct 3, 2017
Merged

standardize price field location && update panel casing #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc08f0a
swap price / compare at price location on variant options
kieckhafer Oct 2, 2017
2938da6
update panel title casing
kieckhafer Oct 2, 2017
365ac6e
update casing
kieckhafer Oct 2, 2017
40cd831
app.auto translation
kieckhafer Oct 2, 2017
035ceb0
Merge branch 'marketplace' into ek-priceFieldLocation
spencern Oct 2, 2017
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
4 changes: 0 additions & 4 deletions imports/plugins/included/default-theme/client/styles/panels.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
}
}

.panel-heading {
text-transform: capitalize;
}

.flex-item > .panel {
margin-bottom: 0;
min-height: 220px;
Expand Down
2 changes: 1 addition & 1 deletion imports/plugins/included/product-variant/components/variantEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class VariantEdit extends Component {
name={"variantOptions"}
>
<Components.CardHeader
i18nKeyTitle="productDetailEdit.variantsDetails"
i18nKeyTitle="productDetailEdit.variantsOptions"
title="Variant Options"
>
<Components.Button
Expand Down
24 changes: 12 additions & 12 deletions imports/plugins/included/product-variant/components/variantForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,15 @@ class VariantForm extends Component {
<div className="row">
<div className="col-sm-6">
<Components.TextField
i18nKeyLabel="productVariant.compareAtPrice"
i18nKeyLabel="productVariant.price"
i18nKeyPlaceholder={formatPriceString("0.00")}
placeholder={formatPriceString("0.00")}
label="Compare At Price"
name="compareAtPrice"
ref="compareAtPriceInput"
value={this.variant.compareAtPrice}
label="Price"
name="price"
ref="priceInput"
value={this.variant.price}
style={this.props.greyDisabledFields(this.variant)}
disabled={this.props.hasChildVariants(this.variant)}
onBlur={this.handleFieldBlur}
onChange={this.handleFieldChange}
onReturnKeyDown={this.handleFieldBlur}
Expand All @@ -384,15 +386,13 @@ class VariantForm extends Component {
</div>
<div className="col-sm-6">
<Components.TextField
i18nKeyLabel="productVariant.price"
i18nKeyLabel="productVariant.compareAtPrice"
i18nKeyPlaceholder={formatPriceString("0.00")}
placeholder={formatPriceString("0.00")}
label="Price"
name="price"
ref="priceInput"
value={this.variant.price}
style={this.props.greyDisabledFields(this.variant)}
disabled={this.props.hasChildVariants(this.variant)}
label="Compare At Price"
name="compareAtPrice"
ref="compareAtPriceInput"
value={this.variant.compareAtPrice}
onBlur={this.handleFieldBlur}
onChange={this.handleFieldChange}
onReturnKeyDown={this.handleFieldBlur}
Expand Down
4 changes: 3 additions & 1 deletion private/data/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
}
},
"app": {
"auto": "Auto",
"save": "Save",
"saveAndContinue": "Save and continue",
"cancel": "Cancel",
Expand Down Expand Up @@ -105,7 +106,8 @@
"makeVisible": "Make visible",
"hideProduct": "Hide product",
"productIsVisible": "Product is visible",
"productIsNotVisible": "Product is not visible"
"productIsNotVisible": "Product is not visible",
"variantOptions": "Variant options"
},
"productVariant": {
"addVariantOptions": "Add options to enable 'Add to Cart' button",
Expand Down
2 changes: 1 addition & 1 deletion server/methods/catalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ Meteor.methods({

if (!newVariant) {
Object.assign(assembledVariant, {
title: product.title + " - Untitled Option",
title: product.title + " - Untitled option",
price: 0.00
});
}
Expand Down