Allow override of version diff for master views
and misc. other tweaks
This commit is contained in:
parent
ec8a8d5ddc
commit
f70772fabc
3 changed files with 13 additions and 7 deletions
|
@ -574,7 +574,7 @@
|
|||
</b-field>
|
||||
|
||||
<b-field label="Unit Size">
|
||||
<span>{{ productSize }}</span>
|
||||
<span>{{ productSize || '' }}</span>
|
||||
</b-field>
|
||||
|
||||
<b-field label="Case Size">
|
||||
|
@ -734,7 +734,7 @@
|
|||
<b-field grouped>
|
||||
<b-field label="Product" horizontal>
|
||||
<span :class="productIsKnown ? null : 'has-text-success'">
|
||||
{{ productIsKnown ? productDisplay : pendingProduct.brand_name + ' ' + pendingProduct.description + ' ' + pendingProduct.size }}
|
||||
{{ productIsKnown ? productDisplay : (pendingProduct.brand_name || '') + ' ' + (pendingProduct.description || '') + ' ' + (pendingProduct.size || '') }}
|
||||
</span>
|
||||
</b-field>
|
||||
</b-field>
|
||||
|
@ -761,7 +761,7 @@
|
|||
:class="productPriceNeedsConfirmation ? 'has-background-warning' : ''"
|
||||
% endif
|
||||
>
|
||||
{{ productIsKnown ? productUnitPriceDisplay : '$' + pendingProduct.regular_price_amount }}
|
||||
{{ productIsKnown ? productUnitPriceDisplay : (pendingProduct.regular_price_amount ? '$' + pendingProduct.regular_price_amount : '') }}
|
||||
</span>
|
||||
</b-field>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue