Fixed: misalignment of Kit tag and inventory number (#658) #666
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -407,6 +407,15 @@ img { | |||||
| min-width: 9ch; | ||||||
| } | ||||||
|
|
||||||
| .kit-label { | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| display: flex; | ||||||
| align-items: center; | ||||||
dt2patel marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
|
|
||||||
| .kit-label > ion-badge { | ||||||
|
|
||||||
| margin-left: 8px; | ||||||
| } | ||||||
|
|
||||||
| @media (min-width: 991px) { | ||||||
| /* shipment card desktop layout start */ | ||||||
| ion-searchbar.searchbar { | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,8 +79,10 @@ | |
| </ion-thumbnail> | ||
| <ion-label> | ||
| <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p> | ||
| <div class="kit-label"> | ||
| {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : getProduct(item.productId).productName }} | ||
| <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge> | ||
| </div> | ||
| <p>{{ getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')}}</p> | ||
| </ion-label> | ||
| </ion-item> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,8 +95,10 @@ | |
| </ion-thumbnail> | ||
| <ion-label> | ||
| <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p> | ||
| <div class="kit-label"> | ||
| {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : item.productName }} | ||
| <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge> | ||
| </div> | ||
| <p>{{ getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')}}</p> | ||
| </ion-label> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,8 +73,10 @@ | |
| </ion-thumbnail> | ||
| <ion-label> | ||
| <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p> | ||
| <div class="kit-label"> | ||
| {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : getProduct(item.productId).productName }} | ||
| <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge> | ||
| </div> | ||
| <p>{{ getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')}}</p> | ||
| </ion-label> | ||
| </ion-item> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,8 +81,10 @@ | |
| </ion-thumbnail> | ||
| <ion-label> | ||
| <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p> | ||
| <div class="kit-label"> | ||
| {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : getProduct(item.productId).productName }} | ||
| <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge> | ||
| </div> | ||
| <p>{{ getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')}}</p> | ||
| </ion-label> | ||
| </ion-item> | ||
|
|
@@ -115,7 +117,7 @@ | |
| <!-- TODO: add a spinner if the api takes too long to fetch the stock --> | ||
| <!--Adding checks to avoid any operations if order has missing info, mostly when after packing Solr is not updaing immediately--> | ||
| <div class="product-metadata"> | ||
| <ion-note v-if="getProductStock(item.productId).quantityOnHandTotal" class="ion-padding-end">{{ getProductStock(item.productId).quantityOnHandTotal }} {{ translate('pieces in stock') }}</ion-note> | ||
| <ion-button :disabled="order.hasMissingInfo" color="medium" fill="clear" v-else size="small" @click="fetchProductStock(item.productId)"> | ||
| {{ translate('Check stock') }} | ||
| <ion-icon slot="end" :icon="cubeOutline"/> | ||
|
|
@@ -127,8 +129,8 @@ | |
| </ion-button> | ||
| <ion-button v-if="isKit(item)" fill="clear" color="medium" size="small" @click.stop="fetchKitComponent(item)"> | ||
| {{ translate('Components') }} | ||
| <ion-icon v-if="item.showKitComponents" color="medium" slot="end" :icon="chevronUpOutline"/> | ||
| <ion-icon v-else color="medium" slot="end" :icon="listOutline"/> | ||
| </ion-button> | ||
| <ion-button :disabled="order.hasMissingInfo" v-if="item.productTypeId === 'GIFT_CARD'" fill="clear" color="medium" size="small" @click="openGiftCardActivationModal(item)"> | ||
| {{ translate('Gift card') }} | ||
|
|
@@ -144,7 +146,10 @@ | |
| </ion-thumbnail> | ||
| <ion-label> | ||
| <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(productComponent.productIdTo)) }}</p> | ||
| <div class="kit-label"> | ||
| {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(productComponent.productIdTo)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(productComponent.productIdTo)) : productComponent.productIdTo }} | ||
| <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge> | ||
| </div> | ||
| <p>{{ getFeature(getProduct(productComponent.productIdTo).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(productComponent.productIdTo).featureHierarchy, '1/SIZE/')}}</p> | ||
| </ion-label> | ||
| <ion-checkbox v-if="item.rejectReason || isEntierOrderRejectionEnabled(order)" :checked="item.rejectedComponents?.includes(productComponent.productIdTo)" @ionChange="rejectKitComponent(order, item, productComponent.productIdTo)" /> | ||
|
|
@@ -332,8 +337,10 @@ | |
| </ion-thumbnail> | ||
| <ion-label> | ||
| <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p> | ||
| <div class="kit-label"> | ||
| {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : getProduct(item.productId).productName }} | ||
| <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge> | ||
| </div> | ||
| </ion-label> | ||
|
|
||
| <div class="other-shipment-actions"> | ||
|
|
@@ -1897,6 +1904,12 @@ ion-segment > ion-segment-button > ion-skeleton-text, ion-item > ion-skeleton-te | |
| align-items: center; | ||
| } | ||
|
|
||
| .product-metadata { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: end; | ||
| } | ||
|
|
||
| .shipgroup-details { | ||
| display: grid; | ||
| grid-template-columns: repeat(auto-fill, minmax(343px, 1fr)); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.