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: fetch completed picklist payload to fetch picklist with status PICKLIST_PICKED #192

Merged
merged 2 commits into from
Feb 8, 2024
Merged

Improved: fetch completed picklist payload to fetch picklist with status PICKLIST_PICKED #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bf0631
Improved: fetch completed picklist payload to fetch picklist with sta…
amansinghbais Feb 8, 2024
f434aa1
Improved: checks and conditions for picked status as same as complete…
amansinghbais Feb 8, 2024
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: 1 addition & 1 deletion src/components/Picklist-detail-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<p>{{ $t("Color") }} : {{ $filters.getFeatures(getProduct(picklistItem.productId).featureHierarchy, '1/COLOR/') }}</p>
<p>{{ $t("Size") }} : {{ $filters.getFeatures(getProduct(picklistItem.productId).featureHierarchy, '1/SIZE/') }}</p>
</ion-label>
<ion-checkbox v-if="picklistItem.statusId !== 'PICKLIST_COMPLETED'" :modelValue="picklistItem.isChecked" slot="end" />
<ion-checkbox v-if="picklistItem.statusId !== 'PICKLIST_COMPLETED' && picklistItem.statusId !== 'PICKLIST_PICKED'" :modelValue="picklistItem.isChecked" slot="end" />
</ion-item>
</template>

Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/picklist/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
let resp;
const params = {
"inputFields": {
"statusId": "PICKLIST_COMPLETED",
"statusId": ["PICKLIST_COMPLETED", "PICKLIST_PICKED"],
ymaheshwari1 marked this conversation as resolved.
Show resolved Hide resolved
"statusId_op": "in",
"facilityId": this.state.user.currentFacility.facilityId,
},
"orderBy": "picklistDate DESC",
Expand Down Expand Up @@ -138,7 +139,7 @@
/**
* Complete Picklist
*/
async completePicklist ({ commit }, payload) {

Check warning on line 142 in src/store/modules/picklist/actions.ts

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x) 

'commit' is defined but never used

Check warning on line 142 in src/store/modules/picklist/actions.ts

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x) 

'commit' is defined but never used
let resp;

try {
Expand Down
4 changes: 2 additions & 2 deletions src/views/Picklist-Detail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<ion-back-button default-href="/" slot="start" />
<ion-title>{{ id }}</ion-title>
<ion-buttons slot="end">
<ion-button @click="selectAll" v-if="picklist.statusId !== 'PICKLIST_COMPLETED'">{{ $t ("Select all") }}</ion-button>
<ion-button @click="selectAll" v-if="picklist.statusId !== 'PICKLIST_COMPLETED' && picklist.statusId !== 'PICKLIST_PICKED'">{{ $t ("Select all") }}</ion-button>
<ion-menu-button>
<ion-icon :icon="swapVerticalOutline" />
</ion-menu-button>
Expand All @@ -46,7 +46,7 @@
</ion-list>
</ion-content>

<ion-footer v-if="picklist.statusId !== 'PICKLIST_COMPLETED'">
<ion-footer v-if="picklist.statusId !== 'PICKLIST_COMPLETED' && picklist.statusId !== 'PICKLIST_PICKED'">
<ion-toolbar>
<ion-buttons class="footer-buttons">
<ion-button class="action-button" fill="outline" color="secondary" @click="scanCode()">
Expand Down
Loading