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

Improved: check for not showing the not counted segment in the hard count and showing hard count label in pending review cards (#564) #569

Merged
merged 4 commits into from
Jan 3, 2025
Merged

Improved: check for not showing the not counted segment in the hard count and showing hard count label in pending review cards (#564) #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4ebeef
Improved: check for not showing the not counted segment in the hard c…
amansinghbais Dec 30, 2024
bbf4cf6
Merge branch 'main' of https://github.com/hotwax/inventory-count into…
amansinghbais Jan 2, 2025
cca4528
Reverted: unnecessary check for not counted items filtering (#564)
amansinghbais Jan 3, 2025
8c70f37
Improved: using scannedId if importItemSeqId is not present in the pr…
amansinghbais Jan 3, 2025
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
39 changes: 27 additions & 12 deletions src/views/Count.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,19 @@
<template v-else-if="selectedSegment === 'pendingReview'">
<ion-card button v-for="count in cycleCount" :key="count.inventoryCountImportId" @click="navigateToStoreView(count)">
<ion-card-header>
<ion-card-title>
{{ count.countImportName }}
<ion-label>
<p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
</ion-label>
</ion-card-title>
<div>
<ion-card-subtitle v-if="count.countTypeEnumId === 'HARD_COUNT'">
<ion-label color="warning" class="overline">
{{ translate("HARD COUNT") }}
</ion-label>
</ion-card-subtitle>
<ion-card-title>
{{ count.countImportName }}
<ion-label>
<p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
</ion-label>
</ion-card-title>
</div>
<ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate((count.countTypeEnumId === "HARD_COUNT" && getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") === "1") ? "item counted" : "items counted") }}</ion-note>
</ion-card-header>
<ion-item>
Expand All @@ -77,12 +84,19 @@
<template v-else>
<ion-card v-for="count in cycleCount" :key="count.inventoryCountImportId" @click="navigateToStoreView(count)" button>
<ion-card-header>
<ion-card-title>
{{ count.countImportName }}
<ion-label>
<p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
</ion-label>
</ion-card-title>
<div>
<ion-card-subtitle v-if="count.countTypeEnumId === 'HARD_COUNT'">
<ion-label color="warning" class="overline">
{{ translate("HARD COUNT") }}
</ion-label>
</ion-card-subtitle>
<ion-card-title>
{{ count.countImportName }}
<ion-label>
<p>{{ getDateWithOrdinalSuffix(count.createdDate) }}</p>
</ion-label>
</ion-card-title>
</div>
<ion-note>{{ getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") }} {{ translate((count.countTypeEnumId === "HARD_COUNT" && getCycleCountStats(count.inventoryCountImportId, count.countTypeEnumId === "HARD_COUNT") === "1") ? "item counted" : "items counted") }}</ion-note>
</ion-card-header>
<div class="header">
Expand Down Expand Up @@ -140,6 +154,7 @@
import {
IonCard,
IonCardHeader,
IonCardSubtitle,
IonCardTitle,
IonContent,
IonHeader,
Expand Down
2 changes: 1 addition & 1 deletion src/views/CountDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ion-segment-button value="all">
<ion-label>{{ translate("ALL") }}</ion-label>
</ion-segment-button>
<ion-segment-button value="notCounted">
<ion-segment-button value="notCounted" v-if="cycleCount?.countTypeEnumId !== 'HARD_COUNT'">
<ion-label>{{ translate("NOT COUNTED") }}</ion-label>
</ion-segment-button>
<ion-segment-button value="counted">
Expand Down
2 changes: 1 addition & 1 deletion src/views/HardCountDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<main :class="itemsList?.length ? 'product-detail' : ''">
<template v-if="itemsList?.length">
<div class="product" @scroll="onScroll">
<div class="image ion-padding-top" v-for="item in itemsList" :key="item.importItemSeqId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="isItemAlreadyAdded(item) ? `${item.productId}-${item.importItemSeqId}` : item.scannedId" :data-isMatching="item.isMatching" :data-scanned-id="item.scannedId">
<div class="image ion-padding-top" v-for="item in itemsList" :key="item.importItemSeqId || item.scannedId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="isItemAlreadyAdded(item) ? `${item.productId}-${item.importItemSeqId}` : item.scannedId" :data-isMatching="item.isMatching" :data-scanned-id="item.scannedId">
<Image :src="getProduct(item.productId)?.mainImageUrl" />
</div>
</div>
Expand Down
Loading