From 35bebc1f056e9a6e045d1a79e102ccd1f3a320de Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Tue, 17 Sep 2024 14:50:38 +0530 Subject: [PATCH 1/7] Implemented: Added rejections page (#715). --- src/authorization/Actions.ts | 3 +- src/authorization/Rules.ts | 3 +- src/components/Menu.vue | 12 +- src/router/index.ts | 10 + src/services/RejectionService.ts | 22 ++ src/store/RootState.ts | 4 +- src/store/index.ts | 4 +- src/store/modules/rejection/RejectionState.ts | 13 + src/store/modules/rejection/actions.ts | 220 ++++++++++++ src/store/modules/rejection/getters.ts | 16 + src/store/modules/rejection/index.ts | 28 ++ src/store/modules/rejection/mutation-types.ts | 4 + src/store/modules/rejection/mutations.ts | 16 + src/views/Rejections.vue | 325 ++++++++++++++++++ 14 files changed, 675 insertions(+), 5 deletions(-) create mode 100644 src/services/RejectionService.ts create mode 100644 src/store/modules/rejection/RejectionState.ts create mode 100644 src/store/modules/rejection/actions.ts create mode 100644 src/store/modules/rejection/getters.ts create mode 100644 src/store/modules/rejection/index.ts create mode 100644 src/store/modules/rejection/mutation-types.ts create mode 100644 src/store/modules/rejection/mutations.ts create mode 100644 src/views/Rejections.vue diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts index 505ac678..eefcc5f8 100644 --- a/src/authorization/Actions.ts +++ b/src/authorization/Actions.ts @@ -14,5 +14,6 @@ export default { "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE": "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE", "APP_COLLATERAL_REJECTION_CONFIG_UPDATE": "APP_COLLATERAL_REJECTION_CONFIG_UPDATE", "APP_UPDT_FULFILL_FORCE_SCAN_CONFIG": "APP_UPDT_FULFILL_FORCE_SCAN_CONFIG", - "APP_ORGANIZATION_HEADER_VIEW": "APP_ORGANIZATION_HEADER_VIEW" + "APP_ORGANIZATION_HEADER_VIEW": "APP_ORGANIZATION_HEADER_VIEW", + "APP_REJECTIONS_VIEW": "APP_REJECTIONS_VIEW" } \ No newline at end of file diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts index 314d60d4..7bbb8272 100644 --- a/src/authorization/Rules.ts +++ b/src/authorization/Rules.ts @@ -23,5 +23,6 @@ export default { "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE": "COMMON_ADMIN", "APP_COLLATERAL_REJECTION_CONFIG_UPDATE": "COMMON_ADMIN", "APP_UPDT_FULFILL_FORCE_SCAN_CONFIG": "COMMON_ADMIN", - "APP_ORGANIZATION_HEADER_VIEW": "SFA_ADMIN OR CARRIER_SETUP_VIEW OR FF_ORDER_LOOKUP_VIEW" + "APP_ORGANIZATION_HEADER_VIEW": "SFA_ADMIN OR CARRIER_SETUP_VIEW OR FF_ORDER_LOOKUP_VIEW", + "APP_REJECTIONS_VIEW": "SFA_ADMIN" } as any \ No newline at end of file diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 78f8d032..e6475670 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -46,7 +46,7 @@ import { } from "@ionic/vue"; import { computed, defineComponent } from "vue"; import { mapGetters } from "vuex"; -import { arrowBackOutline, mailUnreadOutline, mailOpenOutline, checkmarkDoneOutline, settingsOutline, swapVerticalOutline } from "ionicons/icons"; +import { arrowBackOutline, backspaceOutline, mailUnreadOutline, mailOpenOutline, checkmarkDoneOutline, settingsOutline, swapVerticalOutline } from "ionicons/icons"; import { useStore } from "@/store"; import { useRouter } from "vue-router"; import { hasPermission } from "@/authorization"; @@ -113,6 +113,15 @@ export default defineComponent({ permissionId: "APP_COMPLETED_ORDERS_VIEW" } }, + { + title: "Rejections", + url: "/rejections", + iosIcon: backspaceOutline, + mdIcon: backspaceOutline, + meta: { + permissionId: "APP_REJECTIONS_VIEW" + } + }, { title: "Transfer Orders", url: "/transfer-orders", @@ -178,6 +187,7 @@ export default defineComponent({ return { appPages, + backspaceOutline, checkmarkDoneOutline, hasPermission, arrowBackOutline, diff --git a/src/router/index.ts b/src/router/index.ts index edc99c51..532b72e6 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -34,6 +34,7 @@ import { useAuthStore, DxpLogin } from '@hotwax/dxp-components' import { loader } from '@/utils/user'; import OrderLookup from '@/views/OrderLookup.vue'; import OrderLookupDetail from '@/views/OrderLookupDetail.vue'; +import Rejections from '@/views/Rejections.vue'; const authGuard = async (to: any, from: any, next: any) => { const authStore = useAuthStore() @@ -242,6 +243,15 @@ const routes: Array = [ name: "Notifications", component: Notifications, beforeEnter: authGuard, + }, + { + path: "/rejections", + name: "Rejections", + component: Rejections, + beforeEnter: authGuard, + meta: { + permissionId: "APP_REJECTIONS_VIEW" + } } ] diff --git a/src/services/RejectionService.ts b/src/services/RejectionService.ts new file mode 100644 index 00000000..d7bf5468 --- /dev/null +++ b/src/services/RejectionService.ts @@ -0,0 +1,22 @@ +import { api} from '@/adapter'; + +const fetchRejectionStats = async (query: any): Promise => { + return api({ + url: "solr-query", + method: "post", + data: query + }); +} + +const fetchRejctedOrders = async (query: any): Promise => { + return api({ + url: "solr-query", + method: "post", + data: query + }); +} + + export const RejectionService = { + fetchRejctedOrders, + fetchRejectionStats + } \ No newline at end of file diff --git a/src/store/RootState.ts b/src/store/RootState.ts index 590d41f3..23f7190e 100644 --- a/src/store/RootState.ts +++ b/src/store/RootState.ts @@ -2,6 +2,7 @@ import OrderState from "./modules/order/OrderState"; import UtilState from "./modules/util/UtilState"; import TransferOrderState from "./modules/transferorder/TransferOrderState"; import CarrierState from "./modules/carrier/CarrierState" +import RejectionState from "./modules/rejection/RejectionState" export default interface RootState { @@ -10,5 +11,6 @@ export default interface RootState { util: UtilState; order: OrderState; transferOrder: TransferOrderState, - carrier: CarrierState + carrier: CarrierState, + rejectionState: RejectionState } \ No newline at end of file diff --git a/src/store/index.ts b/src/store/index.ts index d0ced25b..83a81246 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -13,6 +13,7 @@ import stockModule from "./modules/stock" import carrierModule from "./modules/carrier" import { setPermissions } from '@/authorization' import orderLookupModule from "./modules/orderLookup" +import rejectionModule from "./modules/rejection" // TODO check how to register it from the components only @@ -44,7 +45,8 @@ const store = createStore({ 'util': utilModule, 'stock': stockModule, 'transferorder': transferOrderModule, - 'carrier': carrierModule + 'carrier': carrierModule, + 'rejection': rejectionModule }, }) diff --git a/src/store/modules/rejection/RejectionState.ts b/src/store/modules/rejection/RejectionState.ts new file mode 100644 index 00000000..7144fb8f --- /dev/null +++ b/src/store/modules/rejection/RejectionState.ts @@ -0,0 +1,13 @@ +export default interface OrderState { + rejectedItems: any, + usedReasons: any, + rejectedOrders: { + list: any, + total: number, + query: { + viewIndex: number, + viewSize: any, + queryString: string + } + } + } \ No newline at end of file diff --git a/src/store/modules/rejection/actions.ts b/src/store/modules/rejection/actions.ts new file mode 100644 index 00000000..ae208420 --- /dev/null +++ b/src/store/modules/rejection/actions.ts @@ -0,0 +1,220 @@ +import { ActionTree } from 'vuex' +import RootState from '@/store/RootState' +import RejectionState from './RejectionState' +import { RejectionService } from '@/services/RejectionService' +import { hasError } from '@/adapter' +import * as types from './mutation-types' +import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper' +import { UtilService } from '@/services/UtilService' +import logger from '@/logger' + +const actions: ActionTree = { + async fetchRejectionStats({ commit, dispatch, state }, payload) { + let rejectionReasons = [] as any, rejectedItems= [] as any + + let rejectionPeriodFilter = "[NOW-24HOURS TO NOW]" + if (payload.rejectionPeriodId && payload.rejectionPeriodId === 'LAST_SEVEN_DAYS') { + rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" + } + const query = prepareOrderQuery({ + docType: "FULFILLMENT_REJECTION", + queryFields: 'orderId_s', + viewSize: '0', // passed viewSize as 0 to not fetch any data + sort: 'rejectedAt_dt desc', + groupBy: 'orderId_s', + filters: { + rejectedAt_dt: {value: rejectionPeriodFilter}, + rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, + }, + facet: { + "rejectionReasonIdFacet":{ + "field":"rejectionReasonId_txt_en", + "mincount":1, + "limit":-1, + "sort":"index", + "type":"terms", + }, + "prodductIdFacet":{ + "field":"productId_s", + "mincount":1, + "limit":-1, + "sort":"index", + "type":"terms", + } + } + }) + query.coreName = "logInsights" + + + try { + const resp = await RejectionService.fetchRejectionStats(query); + if (!hasError(resp)) { + const usedReasons = resp.data.facets.rejectionReasonIdFacet.buckets + rejectedItems = resp.data.facets.prodductIdFacet.buckets + if (rejectedItems) { + const productIds = rejectedItems.map((rejectedItem: any) => rejectedItem.val) + await this.dispatch('product/fetchProducts', { productIds }) + } + + if (usedReasons) { + const reasonIds = usedReasons.map((usedReason: any) => usedReason.val) + const payload = { + "inputFields": { + "enumId": reasonIds, + "enumId_op": "in" + }, + "fieldList": ["description", "enumId", "enumName", "enumTypeId", "sequenceNum"], + "distinct": "Y", + "entityName": "EnumTypeChildAndEnum", + "viewSize": reasonIds.length, //There won't we rejection reasons more than 20, hence fetching detail for all the reasons at once + "orderBy": "sequenceNum" + } + const resp = await UtilService.fetchRejectReasons(payload) + + if (!hasError(resp) && resp.data.count > 0) { + const reasonCountDetail = usedReasons.reduce((reasonDetail: any, reason: any) => { + reasonDetail[reason.val.trim().toUpperCase()] = reason; + return reasonDetail; + }, {}); + rejectionReasons = resp.data.docs + rejectionReasons.map((rejectionReason: any) => { + rejectionReason.count = reasonCountDetail[rejectionReason.enumId]?.count + }) + } else { + throw resp.data + } + } + } else { + throw resp.data; + } + } catch(err) { + logger.error('Failed to fetch rejection stats.', err) + } + commit(types.REJECTION_REJECTED_ITEMS_UPDATED, rejectedItems) + commit(types.REJECTION_USED_REASONS_UPDATED, rejectionReasons) + }, + + async fetchRejectedOrders({ commit, dispatch, state }, payload) { + let orders = [] as any, total = 0 + + let rejectionPeriodFilter = "[NOW-24HOURS TO NOW]" + if (payload.rejectionPeriodId && payload.rejectionPeriodId === 'LAST_SEVEN_DAYS') { + rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" + } + const rejectedOrderQuery = JSON.parse(JSON.stringify(state.rejectedOrders.query)) + const query = prepareOrderQuery({ + docType: "FULFILLMENT_REJECTION", + queryString: rejectedOrderQuery.queryString, + queryFields: 'orderId_s', + viewIndex: rejectedOrderQuery.viewIndex, + viewSize: rejectedOrderQuery.viewSize, + sort: 'rejectedAt_dt desc', + groupBy: 'orderId_s', + filters: { + rejectedAt_dt: {value: rejectionPeriodFilter}, + rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, + } + }) + query.coreName = "logInsights" + + + try { + const resp = await RejectionService.fetchRejctedOrders(query); + if (!hasError(resp)) { + total = resp.data.grouped.picklistBinId.ngroups + orders = resp.data.grouped.picklistBinId.groups + + orders = orders.map((order: any) => { + const orderItem = order.doclist.docs[0]; + return { + customerId: orderItem.customerId, + customerName: orderItem.customerName, + orderId: orderItem.orderId, + orderDate: orderItem.orderDate, + orderName: orderItem.orderName, + groupValue: order.groupValue, + items: order.doclist.docs, + shipmentMethodTypeId: orderItem.shipmentMethodTypeId, + shipmentMethodTypeDesc: orderItem.shipmentMethodTypeDesc, + } + }) + } else { + throw resp.data; + } + } catch(err) { + logger.error('Failed to fetch rejected orders.', err) + } + rejectedOrderQuery.viewSize = orders.length + commit(types.ORDER_REJECTED_QUERY_UPDATED, { ...rejectedOrderQuery }) + commit(types.ORDER_REJECTED_UPDATED, {orders, total}) + }, + + async fetchRejectedOrdersDetail ({ commit, dispatch, state }, payload = {}) { + let resp; + let orders = JSON.parse(JSON.stringify(state.rejectedOrders.list)); + + try { + const params = { + ...payload, + viewSize: , + sort: 'orderDate asc', + groupBy: 'orderId', + filters: { + productStoreId: { value: productIds } + } + } + + const orderQueryPayload = prepareOrderQuery(params) + + resp = await OrderService.findInProgressOrders(orderQueryPayload); + if (resp.status === 200 && !hasError(resp) && resp.data.grouped?.picklistBinId.matches > 0) { + total = resp.data.grouped.picklistBinId.ngroups + orders = resp.data.grouped.picklistBinId.groups + + // TODO get only product visible + await this.dispatch('product/getProductInformation', { orders }) + + orders = orders.map((order: any) => { + const orderItem = order.doclist.docs[0]; + return { + category: 'in-progress', + customerId: orderItem.customerId, + customerName: orderItem.customerName, + orderId: orderItem.orderId, + orderDate: orderItem.orderDate, + orderName: orderItem.orderName, + groupValue: order.groupValue, + picklistBinId: orderItem.picklistBinId, + picklistId: orderItem.picklistId, + items: removeKitComponents({items: order.doclist.docs}), + shipGroupSeqId: orderItem.shipGroupSeqId, + shipmentMethodTypeId: orderItem.shipmentMethodTypeId, + shipmentMethodTypeDesc: orderItem.shipmentMethodTypeDesc, + shippingInstructions: orderItem.shippingInstructions + } + }) + } else { + throw resp.data + } + } catch (err) { + logger.error('No inProgress orders found', err) + } + + inProgressQuery.viewSize = orders.length + + commit(types.ORDER_INPROGRESS_QUERY_UPDATED, { ...inProgressQuery }) + commit(types.ORDER_INPROGRESS_UPDATED, {orders, total}) + + // fetching the additional information like shipmentRoute, carrierParty information + // If no orders then no need to fetch any additional information + if(orders.length){ + dispatch('fetchInProgressOrdersAdditionalInformation'); + } + + emitter.emit('dismissLoader'); + return resp; + }, + +} + +export default actions; \ No newline at end of file diff --git a/src/store/modules/rejection/getters.ts b/src/store/modules/rejection/getters.ts new file mode 100644 index 00000000..defe364f --- /dev/null +++ b/src/store/modules/rejection/getters.ts @@ -0,0 +1,16 @@ +import { GetterTree } from "vuex"; +import RejectionState from "./RejectionState"; +import RootState from "../../RootState"; + +const getters: GetterTree = { + getRejectedItems (state) { + return state.rejectedItems; + }, + getUsedReasons (state) { + return state.usedReasons; + }, + getRejectedOrders (state) { + return state.rejectedOrders; + } +}; +export default getters; \ No newline at end of file diff --git a/src/store/modules/rejection/index.ts b/src/store/modules/rejection/index.ts new file mode 100644 index 00000000..aa44ff62 --- /dev/null +++ b/src/store/modules/rejection/index.ts @@ -0,0 +1,28 @@ +import actions from './actions' +import getters from './getters' +import mutations from './mutations' +import { Module } from 'vuex' +import RejectionState from './RejectionState' +import RootState from '../../RootState' + +const orderModule: Module = { + namespaced: true, + state: { + rejectedItems: [], + usedReasons: [], + rejectedOrders: { + list: [], + total: 0, + query: { + viewIndex: 0, + viewSize: process.env.VUE_APP_VIEW_SIZE, + queryString: '' + } + } + }, + getters, + actions, + mutations +} + +export default orderModule; \ No newline at end of file diff --git a/src/store/modules/rejection/mutation-types.ts b/src/store/modules/rejection/mutation-types.ts new file mode 100644 index 00000000..556d6d9c --- /dev/null +++ b/src/store/modules/rejection/mutation-types.ts @@ -0,0 +1,4 @@ +export const SN_REJECTION = 'rejection' +export const REJECTION_REJECTED_ITEMS_UPDATED = SN_REJECTION + '/REJECTED_ITEMS_UPDATED' +export const REJECTION_USED_REASONS_UPDATED = SN_REJECTION + '/USED_REASONS_UPDATED' +export const REJECTION_REJECTED_ORDERS_UPDATED = SN_REJECTION + '/REJECTION_REJECTED_ORDERS_UPDATED' diff --git a/src/store/modules/rejection/mutations.ts b/src/store/modules/rejection/mutations.ts new file mode 100644 index 00000000..01d0320a --- /dev/null +++ b/src/store/modules/rejection/mutations.ts @@ -0,0 +1,16 @@ +import { MutationTree } from 'vuex' +import RejectionState from './RejectionState' +import * as types from './mutation-types' + +const mutations: MutationTree = { + [types.REJECTION_REJECTED_ITEMS_UPDATED] (state, payload) { + state.rejectedItems = payload; + }, + [types.REJECTION_USED_REASONS_UPDATED] (state, payload) { + state.usedReasons = payload; + }, + [types.REJECTION_REJECTED_ORDERS_UPDATED] (state, payload) { + state.rejectedOrders = payload; + }, +} +export default mutations; \ No newline at end of file diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue new file mode 100644 index 00000000..a0986397 --- /dev/null +++ b/src/views/Rejections.vue @@ -0,0 +1,325 @@ + + + + + \ No newline at end of file From 230b5676c609a13fdd3c8282b74afebfba7286f0 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Fri, 20 Sep 2024 19:11:35 +0530 Subject: [PATCH 2/7] Improved: Rejections page rendering logic and UI (#715). --- src/services/RejectionService.ts | 11 +- src/store/modules/rejection/RejectionState.ts | 3 +- src/store/modules/rejection/actions.ts | 174 +++++++++--------- src/store/modules/rejection/index.ts | 7 +- src/store/modules/rejection/mutation-types.ts | 3 +- src/store/modules/rejection/mutations.ts | 8 +- src/utils/solrHelper.ts | 6 +- src/views/Rejections.vue | 126 ++++++++----- 8 files changed, 195 insertions(+), 143 deletions(-) diff --git a/src/services/RejectionService.ts b/src/services/RejectionService.ts index d7bf5468..edb16f61 100644 --- a/src/services/RejectionService.ts +++ b/src/services/RejectionService.ts @@ -16,7 +16,16 @@ const fetchRejctedOrders = async (query: any): Promise => { }); } +const findRejectedOrdersDetail = async (query: any): Promise => { + return api({ + url: "solr-query", + method: "post", + data: query + }); +} + export const RejectionService = { fetchRejctedOrders, - fetchRejectionStats + findRejectedOrdersDetail, + fetchRejectionStats, } \ No newline at end of file diff --git a/src/store/modules/rejection/RejectionState.ts b/src/store/modules/rejection/RejectionState.ts index 7144fb8f..1c674ba8 100644 --- a/src/store/modules/rejection/RejectionState.ts +++ b/src/store/modules/rejection/RejectionState.ts @@ -7,7 +7,8 @@ export default interface OrderState { query: { viewIndex: number, viewSize: any, - queryString: string + queryString: string, + rejectionPeriodId: string } } } \ No newline at end of file diff --git a/src/store/modules/rejection/actions.ts b/src/store/modules/rejection/actions.ts index ae208420..e753f5a2 100644 --- a/src/store/modules/rejection/actions.ts +++ b/src/store/modules/rejection/actions.ts @@ -4,7 +4,7 @@ import RejectionState from './RejectionState' import { RejectionService } from '@/services/RejectionService' import { hasError } from '@/adapter' import * as types from './mutation-types' -import { escapeSolrSpecialChars, prepareOrderQuery } from '@/utils/solrHelper' +import { escapeSolrSpecialChars, prepareSolrQuery } from '@/utils/solrHelper' import { UtilService } from '@/services/UtilService' import logger from '@/logger' @@ -16,12 +16,11 @@ const actions: ActionTree = { if (payload.rejectionPeriodId && payload.rejectionPeriodId === 'LAST_SEVEN_DAYS') { rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" } - const query = prepareOrderQuery({ + const query = prepareSolrQuery({ + coreName: "logInsights", docType: "FULFILLMENT_REJECTION", - queryFields: 'orderId_s', + sort: "orderId_s desc", viewSize: '0', // passed viewSize as 0 to not fetch any data - sort: 'rejectedAt_dt desc', - groupBy: 'orderId_s', filters: { rejectedAt_dt: {value: rejectionPeriodFilter}, rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, @@ -43,8 +42,6 @@ const actions: ActionTree = { } } }) - query.coreName = "logInsights" - try { const resp = await RejectionService.fetchRejectionStats(query); @@ -95,126 +92,133 @@ const actions: ActionTree = { }, async fetchRejectedOrders({ commit, dispatch, state }, payload) { - let orders = [] as any, total = 0 - + let orders = [] as any, orderList = [] as any, total = 0 + const rejectedOrderQuery = JSON.parse(JSON.stringify(state.rejectedOrders.query)) + let rejectionPeriodFilter = "[NOW-24HOURS TO NOW]" - if (payload.rejectionPeriodId && payload.rejectionPeriodId === 'LAST_SEVEN_DAYS') { + if (rejectedOrderQuery.rejectionPeriodId === 'LAST_SEVEN_DAYS') { rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" } - const rejectedOrderQuery = JSON.parse(JSON.stringify(state.rejectedOrders.query)) - const query = prepareOrderQuery({ + + const query = prepareSolrQuery({ + coreName: "logInsights", docType: "FULFILLMENT_REJECTION", queryString: rejectedOrderQuery.queryString, - queryFields: 'orderId_s', + queryFields: 'orderId_s itemDescription_txt_en productId_s rejectedFrom_txt_en rejectedBy_txt_en rejectionReasonId_txt_en rejectionReasonDesc_txt_en', viewIndex: rejectedOrderQuery.viewIndex, viewSize: rejectedOrderQuery.viewSize, sort: 'rejectedAt_dt desc', + isGroupingRequired: true, groupBy: 'orderId_s', filters: { rejectedAt_dt: {value: rejectionPeriodFilter}, rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, } }) - query.coreName = "logInsights" - try { const resp = await RejectionService.fetchRejctedOrders(query); if (!hasError(resp)) { - total = resp.data.grouped.picklistBinId.ngroups - orders = resp.data.grouped.picklistBinId.groups + total = resp.data.grouped.orderId_s.ngroups + orders = resp.data.grouped.orderId_s.groups orders = orders.map((order: any) => { - const orderItem = order.doclist.docs[0]; + const orderItemDocs = order.doclist.docs.map((doc: any) => { + return { + orderId: doc.orderId_s, + orderItemSeqId: doc.orderItemSeqId_s, + itemDescription: doc.itemDescription_txt_en, + productId: doc.productId_s, + availableToPromise: doc.availableToPromise_d, + rejectedFrom: order.rejectedFrom_txt_en, + rejectedBy: doc.rejectedBy_txt_en, + rejectedAt: doc.rejectedAt_dt, + rejectionReasonId: doc.rejectionReasonId_txt_en, + rejectionReasonDesc: doc.rejectionReasonDesc_txt_en, + brokeredAt: doc.brokeredAt_dt, + brokeredBy: doc.brokeredBy_txt_en, + }; + }); + + const orderItem = orderItemDocs[0]; return { - customerId: orderItem.customerId, - customerName: orderItem.customerName, orderId: orderItem.orderId, - orderDate: orderItem.orderDate, - orderName: orderItem.orderName, - groupValue: order.groupValue, - items: order.doclist.docs, - shipmentMethodTypeId: orderItem.shipmentMethodTypeId, - shipmentMethodTypeDesc: orderItem.shipmentMethodTypeDesc, - } - }) - } else { - throw resp.data; - } - } catch(err) { - logger.error('Failed to fetch rejected orders.', err) + items: orderItemDocs, + }; + }); + + if (rejectedOrderQuery.viewIndex && rejectedOrderQuery.viewIndex > 0) orderList = JSON.parse(JSON.stringify(state.rejectedOrders.list)).concat(orders) + } else { + throw resp.data; + } + } catch(err) { + logger.error('Failed to fetch rejected orders.', err) + } + commit(types.REJECTION_ORDERS_UPDATED, { list: orderList.length > 0 ? orderList : orders, total}) + dispatch("fetchRejectedOrdersDetail", { orderIds: orders.map((order:any) => order.orderId)}) +}, + + async fetchRejectedOrdersDetail ({ commit, dispatch, state }, payload) { + let resp, orders = []; + const rejectedOrders = JSON.parse(JSON.stringify(state.rejectedOrders.list)); + const total = JSON.parse(JSON.stringify(state.rejectedOrders.total)); + const orderIds = payload.orderIds + if (!orderIds.length) { + return } - rejectedOrderQuery.viewSize = orders.length - commit(types.ORDER_REJECTED_QUERY_UPDATED, { ...rejectedOrderQuery }) - commit(types.ORDER_REJECTED_UPDATED, {orders, total}) - }, - - async fetchRejectedOrdersDetail ({ commit, dispatch, state }, payload = {}) { - let resp; - let orders = JSON.parse(JSON.stringify(state.rejectedOrders.list)); try { const params = { - ...payload, - viewSize: , + docType: "ORDER", + viewIndex: 0, + viewSize: orderIds.length, sort: 'orderDate asc', + fieldsToSelect: "orderId customerId customerName orderDate orderName reservedDatetime shipmentMethodTypeId shipmentMethodTypeDesc", + isGroupingRequired: true, groupBy: 'orderId', + groupLimit: 1, filters: { - productStoreId: { value: productIds } + orderId: { value: orderIds} } } - const orderQueryPayload = prepareOrderQuery(params) - - resp = await OrderService.findInProgressOrders(orderQueryPayload); - if (resp.status === 200 && !hasError(resp) && resp.data.grouped?.picklistBinId.matches > 0) { - total = resp.data.grouped.picklistBinId.ngroups - orders = resp.data.grouped.picklistBinId.groups - - // TODO get only product visible - await this.dispatch('product/getProductInformation', { orders }) - - orders = orders.map((order: any) => { - const orderItem = order.doclist.docs[0]; - return { - category: 'in-progress', - customerId: orderItem.customerId, - customerName: orderItem.customerName, - orderId: orderItem.orderId, - orderDate: orderItem.orderDate, - orderName: orderItem.orderName, - groupValue: order.groupValue, - picklistBinId: orderItem.picklistBinId, - picklistId: orderItem.picklistId, - items: removeKitComponents({items: order.doclist.docs}), - shipGroupSeqId: orderItem.shipGroupSeqId, - shipmentMethodTypeId: orderItem.shipmentMethodTypeId, - shipmentMethodTypeDesc: orderItem.shipmentMethodTypeDesc, - shippingInstructions: orderItem.shippingInstructions + const orderQueryPayload = prepareSolrQuery(params) + + resp = await RejectionService.findRejectedOrdersDetail(orderQueryPayload); + if (resp.status === 200 && !hasError(resp) && resp.data.grouped?.orderId.matches > 0) { + orders = resp.data.grouped.orderId.groups + const orderDetails = orders.reduce((orderDetail: any, order: any) => { + orderDetail[order.doclist.docs[0].orderId] = order.doclist.docs[0]; //we are fetching only one item for order detail + return orderDetail; + }, {}); + + rejectedOrders.map((rejectedOrder: any) => { + if (orderIds.includes(rejectedOrder.orderId)) { + const detail = orderDetails[rejectedOrder.orderId] + rejectedOrder.customerId = detail.customerId + rejectedOrder.customerName = detail.customerName + rejectedOrder.orderDate = detail.orderDate + rejectedOrder.orderName = detail.orderName + rejectedOrder.reservedDatetime = detail.reservedDatetime + rejectedOrder.shipmentMethodTypeId = detail.shipmentMethodTypeId + rejectedOrder.shipmentMethodTypeDesc = detail.shipmentMethodTypeDesc } }) + } else { throw resp.data } } catch (err) { - logger.error('No inProgress orders found', err) + logger.error('No rejected orders found', err) } - - inProgressQuery.viewSize = orders.length - - commit(types.ORDER_INPROGRESS_QUERY_UPDATED, { ...inProgressQuery }) - commit(types.ORDER_INPROGRESS_UPDATED, {orders, total}) - - // fetching the additional information like shipmentRoute, carrierParty information - // If no orders then no need to fetch any additional information - if(orders.length){ - dispatch('fetchInProgressOrdersAdditionalInformation'); - } - - emitter.emit('dismissLoader'); + commit(types.REJECTION_ORDERS_UPDATED, { list: rejectedOrders, total}) return resp; }, + async updateRejectedOrderQuery({ commit, dispatch }, payload) { + commit(types.REJECTION_ORDER_QUERY_UPDATED, payload) + await dispatch('fetchRejectedOrders'); + }, } export default actions; \ No newline at end of file diff --git a/src/store/modules/rejection/index.ts b/src/store/modules/rejection/index.ts index aa44ff62..d37f5907 100644 --- a/src/store/modules/rejection/index.ts +++ b/src/store/modules/rejection/index.ts @@ -5,7 +5,7 @@ import { Module } from 'vuex' import RejectionState from './RejectionState' import RootState from '../../RootState' -const orderModule: Module = { +const rejectionModule: Module = { namespaced: true, state: { rejectedItems: [], @@ -16,7 +16,8 @@ const orderModule: Module = { query: { viewIndex: 0, viewSize: process.env.VUE_APP_VIEW_SIZE, - queryString: '' + queryString: '', + rejectionPeriodId: 'LAST_TWENTY_FOUR_HOURS' } } }, @@ -25,4 +26,4 @@ const orderModule: Module = { mutations } -export default orderModule; \ No newline at end of file +export default rejectionModule; \ No newline at end of file diff --git a/src/store/modules/rejection/mutation-types.ts b/src/store/modules/rejection/mutation-types.ts index 556d6d9c..62809251 100644 --- a/src/store/modules/rejection/mutation-types.ts +++ b/src/store/modules/rejection/mutation-types.ts @@ -1,4 +1,5 @@ export const SN_REJECTION = 'rejection' export const REJECTION_REJECTED_ITEMS_UPDATED = SN_REJECTION + '/REJECTED_ITEMS_UPDATED' export const REJECTION_USED_REASONS_UPDATED = SN_REJECTION + '/USED_REASONS_UPDATED' -export const REJECTION_REJECTED_ORDERS_UPDATED = SN_REJECTION + '/REJECTION_REJECTED_ORDERS_UPDATED' +export const REJECTION_ORDERS_UPDATED = SN_REJECTION + '/ORDERS_UPDATED' +export const REJECTION_ORDER_QUERY_UPDATED = SN_REJECTION + '/ORDER_QUERY_UPDATED' diff --git a/src/store/modules/rejection/mutations.ts b/src/store/modules/rejection/mutations.ts index 01d0320a..1f3937d7 100644 --- a/src/store/modules/rejection/mutations.ts +++ b/src/store/modules/rejection/mutations.ts @@ -9,8 +9,12 @@ const mutations: MutationTree = { [types.REJECTION_USED_REASONS_UPDATED] (state, payload) { state.usedReasons = payload; }, - [types.REJECTION_REJECTED_ORDERS_UPDATED] (state, payload) { - state.rejectedOrders = payload; + [types.REJECTION_ORDERS_UPDATED] (state, payload) { + state.rejectedOrders.list = payload.list; + state.rejectedOrders.total = payload.total; }, + [types.REJECTION_ORDER_QUERY_UPDATED](state, payload) { + state.rejectedOrders.query = payload + } } export default mutations; \ No newline at end of file diff --git a/src/utils/solrHelper.ts b/src/utils/solrHelper.ts index f33470ff..8106f22f 100644 --- a/src/utils/solrHelper.ts +++ b/src/utils/solrHelper.ts @@ -57,7 +57,7 @@ const prepareSolrQuery = (params: any) => { groupParams = { "group": true, "group.field": params.groupBy ? params.groupBy : "orderId", - "group.limit": 1000, + "group.limit": params.groupLimit ? params.groupLimit : 1000, "group.ngroups": true, } } @@ -85,6 +85,10 @@ const prepareSolrQuery = (params: any) => { payload.json.params['defType'] = "edismax" } + if (params.fieldsToSelect) { + payload.json.params['fl'] = params.fieldsToSelect + } + // checking that if the params has filters, and then adding the filter values in the payload filter // for each key present in the params filters if (params.filters) { diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue index a0986397..fe189bc7 100644 --- a/src/views/Rejections.vue +++ b/src/views/Rejections.vue @@ -11,11 +11,11 @@ - {{ "4" }} + {{ rejectedOrders.total }} - + {{ rejectionPeriod.description }} @@ -24,51 +24,61 @@ {{ translate('Most rejected items') }} - + {{ translate('View All') }} - - - - - -

{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.val)) }}

- {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.val)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.val)) : item.val }} - - {{ item.count }} - + +
+

{{ translate("No items found.") }}

+
{{ translate('Most used reasons') }} - + {{ translate('View All') }} - - - {{ reason.description }} -

{{ reason.enumTypeId }}

- - {{ reason.count }} - + +
+

{{ translate("No reasons found.") }}

+
-
- - - {{ translate("13 rejections") }} +
+ + + {{ rejectedOrders.total }} {{translate("rejections") }} + {{ translate("Download rejections") }}
-
@@ -81,7 +91,7 @@
- {{ order.orderName }} + {{ order.orderId }}
@@ -93,7 +103,7 @@
-
+
@@ -102,30 +112,29 @@

{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}

{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : item.productName }} - {{ translate("Kit") }}
- + - {{ "2024/01/01 23:10:10"}} + {{ formatUtcDate(item.rejectedAt, 'dd MMMM yyyy t a ZZZZ')}}

{{ translate('rejected time') }}
- - - {{ "100"}} + + + {{ item.availableToPromise}}

{{ translate('ATP') }}
- + - {{ "Not in stock"}} + {{ item.rejectionReasonDesc }}

{{ translate('rejection reason') }}

 @@ -133,7 +142,7 @@
- {{ order.orderName }} + {{ item.rejectedBy }}
@@ -142,14 +151,12 @@ -
diff --git a/src/components/RejectedOrdersFilters.vue b/src/components/RejectedOrdersFilters.vue new file mode 100644 index 00000000..9e33d5ff --- /dev/null +++ b/src/components/RejectedOrdersFilters.vue @@ -0,0 +1,118 @@ + + + \ No newline at end of file diff --git a/src/components/UsedReasonsModal.vue b/src/components/UsedReasonsModal.vue new file mode 100644 index 00000000..da787ea3 --- /dev/null +++ b/src/components/UsedReasonsModal.vue @@ -0,0 +1,86 @@ + + + + \ No newline at end of file diff --git a/src/store/modules/rejection/RejectionState.ts b/src/store/modules/rejection/RejectionState.ts index 1c674ba8..f478c579 100644 --- a/src/store/modules/rejection/RejectionState.ts +++ b/src/store/modules/rejection/RejectionState.ts @@ -1,6 +1,9 @@ export default interface OrderState { - rejectedItems: any, - usedReasons: any, + stats:{ + total: number, + rejectedItems: any, + usedReasons: any, + }, rejectedOrders: { list: any, total: number, @@ -8,7 +11,8 @@ export default interface OrderState { viewIndex: number, viewSize: any, queryString: string, - rejectionPeriodId: string + rejectionPeriodId: string, + rejectionReasons: any } } } \ No newline at end of file diff --git a/src/store/modules/rejection/actions.ts b/src/store/modules/rejection/actions.ts index e753f5a2..d9e61a77 100644 --- a/src/store/modules/rejection/actions.ts +++ b/src/store/modules/rejection/actions.ts @@ -9,11 +9,13 @@ import { UtilService } from '@/services/UtilService' import logger from '@/logger' const actions: ActionTree = { - async fetchRejectionStats({ commit, dispatch, state }, payload) { - let rejectionReasons = [] as any, rejectedItems= [] as any + async fetchRejectionStats({ commit, state }) { + let rejectionReasons = [] as any, rejectedItems = [] as any, total = 0 + const rejectedOrderQuery = JSON.parse(JSON.stringify(state.rejectedOrders.query)) + let rejectionPeriodFilter = "[NOW-24HOURS TO NOW]" - if (payload.rejectionPeriodId && payload.rejectionPeriodId === 'LAST_SEVEN_DAYS') { + if (rejectedOrderQuery.rejectionPeriodId === 'LAST_SEVEN_DAYS') { rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" } const query = prepareSolrQuery({ @@ -26,6 +28,7 @@ const actions: ActionTree = { rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, }, facet: { + "total":"unique(orderId_s)", "rejectionReasonIdFacet":{ "field":"rejectionReasonId_txt_en", "mincount":1, @@ -46,6 +49,7 @@ const actions: ActionTree = { try { const resp = await RejectionService.fetchRejectionStats(query); if (!hasError(resp)) { + total = resp.data.facets.total const usedReasons = resp.data.facets.rejectionReasonIdFacet.buckets rejectedItems = resp.data.facets.prodductIdFacet.buckets if (rejectedItems) { @@ -87,8 +91,7 @@ const actions: ActionTree = { } catch(err) { logger.error('Failed to fetch rejection stats.', err) } - commit(types.REJECTION_REJECTED_ITEMS_UPDATED, rejectedItems) - commit(types.REJECTION_USED_REASONS_UPDATED, rejectionReasons) + commit(types.REJECTION_STATS_UPDATED, { rejectedItems, rejectionReasons, total}) }, async fetchRejectedOrders({ commit, dispatch, state }, payload) { @@ -112,6 +115,7 @@ const actions: ActionTree = { groupBy: 'orderId_s', filters: { rejectedAt_dt: {value: rejectionPeriodFilter}, + rejectionReasonId_txt_en: {value: rejectedOrderQuery.rejectionReasons}, rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, } }) @@ -154,8 +158,11 @@ const actions: ActionTree = { } catch(err) { logger.error('Failed to fetch rejected orders.', err) } + console.log("=======orderList===", orderList); commit(types.REJECTION_ORDERS_UPDATED, { list: orderList.length > 0 ? orderList : orders, total}) - dispatch("fetchRejectedOrdersDetail", { orderIds: orders.map((order:any) => order.orderId)}) + if () { + dispatch("fetchRejectedOrdersDetail", { orderIds: orders.map((order:any) => order.orderId)}) + } }, async fetchRejectedOrdersDetail ({ commit, dispatch, state }, payload) { @@ -217,8 +224,10 @@ const actions: ActionTree = { async updateRejectedOrderQuery({ commit, dispatch }, payload) { commit(types.REJECTION_ORDER_QUERY_UPDATED, payload) - await dispatch('fetchRejectedOrders'); }, + async clearRejectedOrdersFilters ({ commit }) { + commit(types.REJECTION_ORDER_QUERY_CLEARED, ) + } } export default actions; \ No newline at end of file diff --git a/src/store/modules/rejection/getters.ts b/src/store/modules/rejection/getters.ts index defe364f..45c35489 100644 --- a/src/store/modules/rejection/getters.ts +++ b/src/store/modules/rejection/getters.ts @@ -4,10 +4,13 @@ import RootState from "../../RootState"; const getters: GetterTree = { getRejectedItems (state) { - return state.rejectedItems; + return state.stats.rejectedItems; }, getUsedReasons (state) { - return state.usedReasons; + return state.stats.usedReasons; + }, + getRejectedStats (state) { + return state.stats; }, getRejectedOrders (state) { return state.rejectedOrders; diff --git a/src/store/modules/rejection/index.ts b/src/store/modules/rejection/index.ts index d37f5907..5d2f65fc 100644 --- a/src/store/modules/rejection/index.ts +++ b/src/store/modules/rejection/index.ts @@ -8,8 +8,11 @@ import RootState from '../../RootState' const rejectionModule: Module = { namespaced: true, state: { - rejectedItems: [], - usedReasons: [], + stats:{ + total: 0, + rejectedItems: [], + usedReasons: [], + }, rejectedOrders: { list: [], total: 0, @@ -17,7 +20,8 @@ const rejectionModule: Module = { viewIndex: 0, viewSize: process.env.VUE_APP_VIEW_SIZE, queryString: '', - rejectionPeriodId: 'LAST_TWENTY_FOUR_HOURS' + rejectionPeriodId: 'LAST_TWENTY_FOUR_HOURS', + rejectionReasons: [] } } }, diff --git a/src/store/modules/rejection/mutation-types.ts b/src/store/modules/rejection/mutation-types.ts index 62809251..bb4e797a 100644 --- a/src/store/modules/rejection/mutation-types.ts +++ b/src/store/modules/rejection/mutation-types.ts @@ -1,5 +1,5 @@ export const SN_REJECTION = 'rejection' -export const REJECTION_REJECTED_ITEMS_UPDATED = SN_REJECTION + '/REJECTED_ITEMS_UPDATED' -export const REJECTION_USED_REASONS_UPDATED = SN_REJECTION + '/USED_REASONS_UPDATED' +export const REJECTION_STATS_UPDATED = SN_REJECTION + '/STATS_UPDATED' export const REJECTION_ORDERS_UPDATED = SN_REJECTION + '/ORDERS_UPDATED' export const REJECTION_ORDER_QUERY_UPDATED = SN_REJECTION + '/ORDER_QUERY_UPDATED' +export const REJECTION_ORDER_QUERY_CLEARED = SN_REJECTION + '/ORDER_QUERY_CLEARED' diff --git a/src/store/modules/rejection/mutations.ts b/src/store/modules/rejection/mutations.ts index 1f3937d7..8d95e5c7 100644 --- a/src/store/modules/rejection/mutations.ts +++ b/src/store/modules/rejection/mutations.ts @@ -3,11 +3,8 @@ import RejectionState from './RejectionState' import * as types from './mutation-types' const mutations: MutationTree = { - [types.REJECTION_REJECTED_ITEMS_UPDATED] (state, payload) { - state.rejectedItems = payload; - }, - [types.REJECTION_USED_REASONS_UPDATED] (state, payload) { - state.usedReasons = payload; + [types.REJECTION_STATS_UPDATED] (state, payload) { + state.stats = payload }, [types.REJECTION_ORDERS_UPDATED] (state, payload) { state.rejectedOrders.list = payload.list; @@ -15,6 +12,15 @@ const mutations: MutationTree = { }, [types.REJECTION_ORDER_QUERY_UPDATED](state, payload) { state.rejectedOrders.query = payload - } + }, + [types.REJECTION_ORDER_QUERY_CLEARED](state) { + state.rejectedOrders.query = { + viewIndex: 0, + viewSize: process.env.VUE_APP_VIEW_SIZE, + queryString: '', + rejectionPeriodId: 'LAST_TWENTY_FOUR_HOURS', + rejectionReasons: [] + } + }, } export default mutations; \ No newline at end of file diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue index fe189bc7..272d5858 100644 --- a/src/views/Rejections.vue +++ b/src/views/Rejections.vue @@ -1,12 +1,20 @@ + + + }, + setup() { + const productIdentificationStore = useProductIdentificationStore(); + let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref) + + return { + closeOutline, + pricetag, + productIdentificationPref, + productIdentificationStore, + getProductIdentificationValue, + translate + }; + }, +}); + \ No newline at end of file diff --git a/src/store/modules/rejection/actions.ts b/src/store/modules/rejection/actions.ts index d9e61a77..dfd6d697 100644 --- a/src/store/modules/rejection/actions.ts +++ b/src/store/modules/rejection/actions.ts @@ -10,7 +10,7 @@ import logger from '@/logger' const actions: ActionTree = { async fetchRejectionStats({ commit, state }) { - let rejectionReasons = [] as any, rejectedItems = [] as any, total = 0 + let usedRejectionReasons = [] as any, rejectedItems = [] as any, total = 0 const rejectedOrderQuery = JSON.parse(JSON.stringify(state.rejectedOrders.query)) @@ -49,7 +49,7 @@ const actions: ActionTree = { try { const resp = await RejectionService.fetchRejectionStats(query); if (!hasError(resp)) { - total = resp.data.facets.total + total = resp.data.facets.total ? resp.data.facets.total : 0 const usedReasons = resp.data.facets.rejectionReasonIdFacet.buckets rejectedItems = resp.data.facets.prodductIdFacet.buckets if (rejectedItems) { @@ -77,8 +77,8 @@ const actions: ActionTree = { reasonDetail[reason.val.trim().toUpperCase()] = reason; return reasonDetail; }, {}); - rejectionReasons = resp.data.docs - rejectionReasons.map((rejectionReason: any) => { + usedRejectionReasons = resp.data.docs + usedRejectionReasons.map((rejectionReason: any) => { rejectionReason.count = reasonCountDetail[rejectionReason.enumId]?.count }) } else { @@ -91,16 +91,29 @@ const actions: ActionTree = { } catch(err) { logger.error('Failed to fetch rejection stats.', err) } - commit(types.REJECTION_STATS_UPDATED, { rejectedItems, rejectionReasons, total}) + commit(types.REJECTION_STATS_UPDATED, { rejectedItems, usedReasons: usedRejectionReasons, total }) }, async fetchRejectedOrders({ commit, dispatch, state }, payload) { let orders = [] as any, orderList = [] as any, total = 0 const rejectedOrderQuery = JSON.parse(JSON.stringify(state.rejectedOrders.query)) - let rejectionPeriodFilter = "[NOW-24HOURS TO NOW]" - if (rejectedOrderQuery.rejectionPeriodId === 'LAST_SEVEN_DAYS') { - rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" + + + const filters = { + rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, + } as any + + //when user search the rejected results are not bound to time duration + if (!rejectedOrderQuery.queryString) { + let rejectionPeriodFilter = "[NOW-24HOURS TO NOW]" + if (rejectedOrderQuery.rejectionPeriodId === 'LAST_SEVEN_DAYS') { + rejectionPeriodFilter = "[NOW-7DAYS TO NOW]" + } + filters.rejectedAt_dt = {value: rejectionPeriodFilter} + } + if (rejectedOrderQuery.rejectionReasons.length) { + filters.rejectionReasonId_txt_en = {value: rejectedOrderQuery.rejectionReasons} } const query = prepareSolrQuery({ @@ -113,11 +126,7 @@ const actions: ActionTree = { sort: 'rejectedAt_dt desc', isGroupingRequired: true, groupBy: 'orderId_s', - filters: { - rejectedAt_dt: {value: rejectionPeriodFilter}, - rejectionReasonId_txt_en: {value: rejectedOrderQuery.rejectionReasons}, - rejectedFrom_txt_en: { value: escapeSolrSpecialChars(this.state.user.currentFacility.facilityId) }, - } + filters }) try { @@ -152,18 +161,17 @@ const actions: ActionTree = { }); if (rejectedOrderQuery.viewIndex && rejectedOrderQuery.viewIndex > 0) orderList = JSON.parse(JSON.stringify(state.rejectedOrders.list)).concat(orders) - } else { - throw resp.data; + } else { + throw resp.data; + } + } catch(err) { + logger.error('Failed to fetch rejected orders.', err) } - } catch(err) { - logger.error('Failed to fetch rejected orders.', err) - } - console.log("=======orderList===", orderList); - commit(types.REJECTION_ORDERS_UPDATED, { list: orderList.length > 0 ? orderList : orders, total}) - if () { - dispatch("fetchRejectedOrdersDetail", { orderIds: orders.map((order:any) => order.orderId)}) - } -}, + commit(types.REJECTION_ORDERS_UPDATED, { list: orderList.length > 0 ? orderList : orders, total}) + if (orderList) { + dispatch("fetchRejectedOrdersDetail", { orderIds: orders.map((order:any) => order.orderId)}) + } + }, async fetchRejectedOrdersDetail ({ commit, dispatch, state }, payload) { let resp, orders = []; @@ -180,7 +188,7 @@ const actions: ActionTree = { viewIndex: 0, viewSize: orderIds.length, sort: 'orderDate asc', - fieldsToSelect: "orderId customerId customerName orderDate orderName reservedDatetime shipmentMethodTypeId shipmentMethodTypeDesc", + fieldsToSelect: "orderId customerPartyId customerPartyName orderDate orderName reservedDatetime shipmentMethodTypeId shipmentMethod", isGroupingRequired: true, groupBy: 'orderId', groupLimit: 1, @@ -202,13 +210,13 @@ const actions: ActionTree = { rejectedOrders.map((rejectedOrder: any) => { if (orderIds.includes(rejectedOrder.orderId)) { const detail = orderDetails[rejectedOrder.orderId] - rejectedOrder.customerId = detail.customerId - rejectedOrder.customerName = detail.customerName + rejectedOrder.customerId = detail.customerPartyId + rejectedOrder.customerName = detail.customerPartyName rejectedOrder.orderDate = detail.orderDate rejectedOrder.orderName = detail.orderName rejectedOrder.reservedDatetime = detail.reservedDatetime rejectedOrder.shipmentMethodTypeId = detail.shipmentMethodTypeId - rejectedOrder.shipmentMethodTypeDesc = detail.shipmentMethodTypeDesc + rejectedOrder.shipmentMethod = detail.shipmentMethod } }) @@ -224,6 +232,8 @@ const actions: ActionTree = { async updateRejectedOrderQuery({ commit, dispatch }, payload) { commit(types.REJECTION_ORDER_QUERY_UPDATED, payload) + await dispatch('fetchRejectionStats') + await dispatch('fetchRejectedOrders'); }, async clearRejectedOrdersFilters ({ commit }) { commit(types.REJECTION_ORDER_QUERY_CLEARED, ) diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue index 272d5858..30acfe74 100644 --- a/src/views/Rejections.vue +++ b/src/views/Rejections.vue @@ -1,173 +1,214 @@ +
+ + {{ order.shipmentMethod }} +

{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}

+ +
+
+
+
+
+ + + + + +

{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}

+ {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : item.productName }} + + +
+
+ + + {{ formatUtcDate(item.rejectedAt, 'dd MMMM yyyy t a ZZZZ')}} +

{{ translate('rejected time') }}

+ + +
+
+ + + {{ item.availableToPromise}} +

{{ translate('ATP') }}

+ + +
+
+ + + {{ item.rejectionReasonDesc }} +

{{ translate('rejection reason') }}

+ + +
+
+ + + {{ item.rejectedBy }} + +
+
+
+ + + + + + + - - \ No newline at end of file From 83a2aef805383d3563cafaa6eaa63981d5a5367b Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Thu, 26 Sep 2024 15:36:55 +0530 Subject: [PATCH 5/7] Improved: Added uiLabels (#715). --- src/components/RejectedItemsModal.vue | 4 +++- src/components/UsedReasonsModal.vue | 4 +++- src/locales/en.json | 13 +++++++++++++ src/locales/es.json | 13 +++++++++++++ src/locales/ja.json | 13 +++++++++++++ src/views/Rejections.vue | 4 ++-- 6 files changed, 47 insertions(+), 4 deletions(-) diff --git a/src/components/RejectedItemsModal.vue b/src/components/RejectedItemsModal.vue index 92e2af98..95dd3495 100644 --- a/src/components/RejectedItemsModal.vue +++ b/src/components/RejectedItemsModal.vue @@ -23,7 +23,7 @@
-

{{ translate("No items found.") }}

+

{{ translate("No data found") }}

@@ -37,6 +37,7 @@ import { IonIcon, IonItem, IonLabel, + IonList, IonNote, IonTitle, IonThumbnail, @@ -59,6 +60,7 @@ export default defineComponent({ IonIcon, IonItem, IonLabel, + IonList, IonNote, IonTitle, IonThumbnail, diff --git a/src/components/UsedReasonsModal.vue b/src/components/UsedReasonsModal.vue index 8275eed1..db66d98e 100644 --- a/src/components/UsedReasonsModal.vue +++ b/src/components/UsedReasonsModal.vue @@ -20,7 +20,7 @@
-

{{ translate("No reasons found.") }}

+

{{ translate("No data found") }}

@@ -34,6 +34,7 @@ import { IonIcon, IonItem, IonLabel, + IonList, IonNote, IonTitle, IonToolbar, @@ -54,6 +55,7 @@ export default defineComponent({ IonIcon, IonItem, IonLabel, + IonList, IonNote, IonTitle, IonToolbar diff --git a/src/locales/en.json b/src/locales/en.json index 6b7bfd53..f8abb69f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -39,6 +39,7 @@ "Are you sure you want to update box selection?": "Are you sure you want to update box selection?", "Assign Pickers": "Assign Pickers", "A tracking URL not configured for": "A tracking URL not configured for {carrierName}", + "ATP": "ATP", "Auto reject related items": "Auto reject related items", "Back to Launchpad": "Back to Launchpad", "Billing Address 1": "Billing Address 1", @@ -130,6 +131,8 @@ "Discard shipment": "Discard shipment", "Download packed orders": "Download packed orders", "Download": "Download", + "Download rejections": "Download rejections", + "Duration": "Duration", "eCom Store": "eCom Store", "ECom inventory status updated successfully": "ECom inventory status updated successfully", "Edit": "Edit", @@ -285,6 +288,8 @@ "methods": "methods", "Mismatch": "Mismatch", "Missing shipping label": "Missing shipping label", + "Most rejected items": "Most rejected items", + "Most used reasons": "Most used reasons", "Municipio": "Municipio", "Name": "Name", "Next day": "Next day", @@ -412,6 +417,7 @@ "QOH": "QOH", "Qty": "Qty", "Quantity": "Quantity", + "Reason": "Reason", "Reason:": "Reason:", "Ready for pickup": "Ready for pickup", "Ready to pack": "Ready to pack", @@ -425,6 +431,7 @@ "Reject in progress orders.": "Reject { ordersCount } in progress orders.", "Reject open orders.": "Reject { ordersCount } open orders.", "Reject order": "Reject order", + "Rejected items": "Rejected items", "Rejecting has been started. All in progress orders will be rejected shortly.": "Rejecting has been started. All in progress orders will be rejected shortly.", "Rejecting has been started. All outstanding orders will be rejected shortly.": "Rejecting has been started. All outstanding orders will be rejected shortly.", "Rejection reason created successfully.": "Rejection reason created successfully.", @@ -433,6 +440,10 @@ "Rejection reasons": "Rejection reasons", "Rejection reasons order has been change. Click save button to update them.": "Rejection reasons order has been change. Click save button to update them.", "Rejection reason name is required.": "Rejection reason name is required.", + "Rejections": "Rejections", + "rejected time": "rejected time", + "rejections": "rejections", + "rejection reason": "rejection reason", "Regenerate Shipping Label": "Regenerate Shipping Label", "Remove from carrier": "Remove from carrier", "Remove reason": "Remove reason", @@ -604,6 +615,7 @@ "Update time zone": "Update time zone", "Updating facility": "Updating facility", "Upload": "Upload", + "Used reasons": "Used reasons", "User is not associated with any facilities.": "User is not associated with any facilities.", "User is not associated with any product stores.": "User is not associated with any product stores.", "Username": "Username", @@ -612,6 +624,7 @@ "Variance type is required.": "Variance type is required.", "Variance type updated successfully.": "Variance type updated successfully.", "Version: ": "Version: {appVersion}", + "View All": "View All", "View details": "View details", "View Saved Mappings": "View Saved Mappings", "Void": "Void", diff --git a/src/locales/es.json b/src/locales/es.json index a3d23fa0..dc8bf2ab 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -39,6 +39,7 @@ "Are you sure you want to update box selection?": "¿Está seguro de que desea actualizar la selección del cuadro?", "Assign Pickers": "Asignar Recolectores", "A tracking URL not configured for": "A tracking URL not configured for {carrierName}", + "ATP": "ATP", "Auto reject related items": "Auto reject related items", "Back to Launchpad": "Volver a Launchpad", "Billing Address 1": "Dirección de Facturación 1", @@ -128,6 +129,8 @@ "Discard shipment": "Discard shipment", "Download packed orders": "Descargar pedidos empaquetados", "Download": "Descargar", + "Download rejections" : "Download rejections", + "Duration": "Duration", "eCom Store": "Tienda eCom", "ECom inventory status updated successfully": "Estado del inventario de comercio electrónico actualizado con éxito", "Edit": "Edit", @@ -281,6 +284,8 @@ "methods": "methods", "Mismatch": "Inconsistencia", "Missing shipping label": "Falta la etiqueta de envío", + "Most rejected items": "Most rejected items", + "Most used reasons": "Most used reasons", "Municipio": "Municipio", "Name": "Name", "Next day": "Día siguiente", @@ -409,6 +414,7 @@ "QOH": "QOH", "Qty": "Qty", "Quantity": "Cantidad", + "Reason": "Reason", "Reason:": "Razón:", "Ready for pickup": "Listo para recojer", "Ready to pack": "Listo para empacar", @@ -423,6 +429,7 @@ "Reject open orders.": "Rechazar { ordersCount } pedidos abiertos.", "Reject order": "Rechazar pedido", "Rejected": "Rechazado", + "Rejected items": "Rejected items", "Rejecting has been started. All in progress orders will be rejected shortly.": "Se ha iniciado el proceso de rechazo. Todos los pedidos en curso se rechazarán en breve.", "Rejecting has been started. All outstanding orders will be rejected shortly.": "Se ha iniciado el proceso de rechazo. Todos los pedidos pendientes se rechazarán en breve.", "Rejection reason created successfully.": "Rejection reason created successfully.", @@ -431,6 +438,10 @@ "Rejection reasons": "Rejection reasons", "Rejection reasons order has been change. Click save button to update them.": "Rejection reasons order has been change. Click save button to update them.", "Rejection reason name is required.": "Rejection reason name is required.", + "Rejections": "Rejections", + "rejected time": "rejected time", + "rejections": "rejections", + "rejection reason": "rejection reason", "Regenerate Shipping Label": "Volver a generar etiqueta de envío", "Remove from carrier": "Remove from carrier", "Remove reason": "Remove reason", @@ -601,6 +612,7 @@ "Update time zone": "Actualizar zona horaria", "Updating facility": "Updating facility", "Upload": "Cargar", + "Used reasons": "Used reasons", "User is not associated with any facilities.": "El usuario no está asociado con ninguna instalación.", "User is not associated with any product stores.": "El usuario no está asociado con ninguna tienda de productos.", "Username": "Nombre de Usuario", @@ -608,6 +620,7 @@ "Variance type": "Variance type", "Variance type is required.": "Variance type is required.", "Variance type updated successfully.": "Variance type updated successfully.", + "View All": "View All", "View details": "Ver detalles", "View Saved Mappings": "Ver mapeos guardados", "Void": "Void", diff --git a/src/locales/ja.json b/src/locales/ja.json index 714147ee..9e29bf4d 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -39,6 +39,7 @@ "Are you sure you want to update box selection?": "ボックスの選択を更新してもよろしいですか？", "Assign Pickers": "ピッカーを割り当てる", "A tracking URL not configured for": "A tracking URL not configured for {carrierName}", + "ATP": "ATP", "Auto reject related items": "Auto reject related items", "Back to Launchpad": "ランチパッドに戻る", "Billing Address 1": "請求先住所 1", @@ -130,6 +131,8 @@ "Discard shipment": "出荷を破棄", "Download packed orders": "梱包済み注文をダウンロード", "Download": "ダウンロード", + "Download rejections": "Download rejections", + "Duration": "Duration", "eCom Store": "ECストア", "ECom inventory status updated successfully": "EC在庫ステータスが正常に更新されました", "Edit": "編集", @@ -284,6 +287,8 @@ "methods": "方法", "Mismatch": "不一致", "Missing shipping label": "配送ラベルがありません", + "Most rejected items": "Most rejected items", + "Most used reasons": "Most used reasons", "Municipio": "ムニシピオ", "Name": "名前", "Next day": "翌日", @@ -410,6 +415,7 @@ "QOH": "QOH", "Qty": "数量", "Quantity": "数量", + "Reason": "Reason", "Reason:": "理由:", "Ready for pickup": "受け取り準備完了", "Ready to pack": "梱包準備完了", @@ -422,6 +428,7 @@ "Reject in progress orders.": "進行中の{ordersCount}件の注文を拒否。", "Reject open orders.": "オープンの{ordersCount}件の注文を拒否。", "Reject order": "注文を拒否", + "Rejected items": "Rejected items", "Rejecting has been started. All in progress orders will be rejected shortly.": "拒否が開始されました。進行中のすべての注文はまもなく拒否されます。", "Rejecting has been started. All outstanding orders will be rejected shortly.": "拒否が開始されました。未処理のすべての注文はまもなく拒否されます。", "Rejection reason created successfully.": "拒否理由が正常に作成されました。", @@ -430,6 +437,10 @@ "Rejection reasons": "拒否理由", "Rejection reasons order has been change. Click save button to update them.": "拒否理由の順序が変更されました。更新するには保存ボタンをクリックしてください。", "Rejection reason name is required.": "拒否理由の名前が必要です。", + "Rejections": "Rejections", + "rejected time": "rejected time", + "rejections": "rejections", + "rejection reason": "rejection reason", "Regenerate Shipping Label": "配送ラベルを再生成", "Remove from carrier": "キャリアから削除", "Remove reason": "理由を削除", @@ -600,6 +611,7 @@ "Update mapping": "マッピングを更新", "Update time zone": "タイムゾーンを更新", "Upload": "アップロード", + "Used reasons": "Used reasons", "User is not associated with any facilities.": "ユーザーは施設に関連付けられていません。", "User is not associated with any product stores.": "ユーザーは製品ストアに関連付けられていません。", "Username": "ユーザー名", @@ -608,6 +620,7 @@ "Variance type is required.": "変動タイプが必要です。", "Variance type updated successfully.": "変動タイプが正常に更新されました。", "Version: ": "バージョン: {appVersion}", + "View All": "View All", "View details": "詳細を表示", "View Saved Mappings": "保存されたマッピングを表示", "Void": "Void", diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue index 30acfe74..c3c81d7b 100644 --- a/src/views/Rejections.vue +++ b/src/views/Rejections.vue @@ -50,7 +50,7 @@
-

{{ translate("No items found.") }}

+

{{ translate("No data found") }}

@@ -72,7 +72,7 @@
-

{{ translate("No reasons found.") }}

+

{{ translate("No data found") }}
From 5b7713d3cdc2d8d379d4e2b326d043ad5300b3d2 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Tue, 1 Oct 2024 11:42:42 +0530 Subject: [PATCH 6/7] Fixed: corrected scroll pagination (#715). --- src/views/Rejections.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue index c3c81d7b..4c20b900 100644 --- a/src/views/Rejections.vue +++ b/src/views/Rejections.vue @@ -264,7 +264,7 @@ export default defineComponent({ } }, isRejectedOrdersScrollable() { - return ((this.rejectedOrders.query?.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any)) < this.rejectedOrders.query?.viewSize; + return this.rejectedOrders.list?.length > 0 && this.rejectedOrders.list?.length < this.rejectedOrders.total }, async initialiseRejectedOrderQuery() { const rejectedOrdersQuery = JSON.parse(JSON.stringify(this.rejectedOrders.query)) @@ -301,6 +301,7 @@ export default defineComponent({ return rejectedReasonsModal.present(); }, async downloadRejections() { + const allRejectedItems = this.rejectedOrders.list.map((order:any) => order.items).flat(); const fileName = `RejectedOrders-${this.currentFacility.facilityId}-${DateTime.now().toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS)}.csv` From 54baca1aef55cae0d6014ab90cae8d52b34ebfa0 Mon Sep 17 00:00:00 2001 From: Ravi Lodhi Date: Tue, 1 Oct 2024 18:47:00 +0530 Subject: [PATCH 7/7] Improved: Added a modal to select the fields and to download the rejected orders (#715). --- .../DownloadRejectedOrdersModal.vue | 314 ++++++++++++++++++ src/locales/en.json | 16 +- src/locales/es.json | 16 +- src/locales/ja.json | 16 +- src/utils/index.ts | 19 +- src/views/Rejections.vue | 15 +- 6 files changed, 383 insertions(+), 13 deletions(-) create mode 100644 src/components/DownloadRejectedOrdersModal.vue diff --git a/src/components/DownloadRejectedOrdersModal.vue b/src/components/DownloadRejectedOrdersModal.vue new file mode 100644 index 00000000..3ea8f213 --- /dev/null +++ b/src/components/DownloadRejectedOrdersModal.vue @@ -0,0 +1,314 @@ + + + diff --git a/src/locales/en.json b/src/locales/en.json index f8abb69f..ddd77402 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -41,6 +41,7 @@ "A tracking URL not configured for": "A tracking URL not configured for {carrierName}", "ATP": "ATP", "Auto reject related items": "Auto reject related items", + "Available to promise": "Available to promise", "Back to Launchpad": "Back to Launchpad", "Billing Address 1": "Billing Address 1", "Billing Address 2": "Billing Address 2", @@ -53,6 +54,8 @@ "Box added successfully": "Box added successfully", "Boxes": "Boxes", "Brand": "Brand", + "Brokered at": "Brokered at", + "Brokered by": "Brokered by", "Browser TimeZone": "Browser TimeZone", "Browser time zone": "Browser time zone", "Built: ": "Built: {builtDateTime}", @@ -129,9 +132,10 @@ "Disallow collateral rejections": "Disallow collateral rejections", "Discard": "Discard", "Discard shipment": "Discard shipment", - "Download packed orders": "Download packed orders", "Download": "Download", + "Download packed orders": "Download packed orders", "Download rejections": "Download rejections", + "Download results": "Download results", "Duration": "Duration", "eCom Store": "eCom Store", "ECom inventory status updated successfully": "ECom inventory status updated successfully", @@ -254,6 +258,7 @@ "items picked": "items picked", "items selected": " items selected", "Item count": "Item count", + "Item description": "Item description", "Import": "Import", "Import Orders": "Import Orders", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.", @@ -352,6 +357,7 @@ "Order ID": "Order ID", "Order Identifications": "Order Identifications", "Order Invoicing Status": "Order Invoicing Status", + "Order item sequence ID": "Order item sequence ID", "Order Lookup": "Order Lookup", "Order Name": "Order Name", "Order packed successfully": "Order packed successfully", @@ -405,6 +411,7 @@ "POS Channel": "POS Channel", "Price": "Price", "Primary": "Primary", + "Primary product ID": "Primary product ID", "Print Customer Letter": "Print Customer Letter", "Print Picklist": "Print Picklist", "Print supplementary documents with the shipment for package identification.": "Print supplementary documents with the shipment for package identification.", @@ -431,10 +438,15 @@ "Reject in progress orders.": "Reject { ordersCount } in progress orders.", "Reject open orders.": "Reject { ordersCount } open orders.", "Reject order": "Reject order", + "Rejected at": "Rejected at", + "Rejected by": "Rejected by", + "Rejected from": "Rejected from", "Rejected items": "Rejected items", "Rejecting has been started. All in progress orders will be rejected shortly.": "Rejecting has been started. All in progress orders will be rejected shortly.", "Rejecting has been started. All outstanding orders will be rejected shortly.": "Rejecting has been started. All outstanding orders will be rejected shortly.", + "Rejection reason ID" : "Rejection reason ID", "Rejection reason created successfully.": "Rejection reason created successfully.", + "Rejection reason description": "Rejection reason description", "Rejection reason removed successfully.": "Rejection reason removed successfully.", "Rejection reason updated successfully.": "Rejection reason updated successfully.", "Rejection reasons": "Rejection reasons", @@ -477,10 +489,12 @@ "Search orders": "Search orders", "Search time zones": "Search time zones", "Secondary": "Secondary", + "Secondary product ID": "Secondary product ID", "Select": "Select", "Select all": "Select all", "Select orderId and tracking code to continue": "Select orderId and tracking code to continue", "Select box": "Select box", + "Select fields": "Select fields", "Select issue": "Select issue", "Select an issue": "Select an issue", "Select CSV": "Select CSV", diff --git a/src/locales/es.json b/src/locales/es.json index dc8bf2ab..0860f596 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -41,6 +41,7 @@ "A tracking URL not configured for": "A tracking URL not configured for {carrierName}", "ATP": "ATP", "Auto reject related items": "Auto reject related items", + "Available to promise": "Available to promise", "Back to Launchpad": "Volver a Launchpad", "Billing Address 1": "Dirección de Facturación 1", "Billing Address 2": "Dirección de Facturación 2", @@ -53,6 +54,8 @@ "Box added successfully": "Caja agregada exitosamente", "Boxes": "Cajas", "Brand": "Formato", + "Brokered at": "Brokered at", + "Brokered by": "Brokered by", "Browser TimeZone": "Browser TimeZone", "Browser time zone": "Browser time zone", "Cancel": "Cancelar", @@ -127,9 +130,10 @@ "Disallow collateral rejections": "Disallow collateral rejections", "Discard": "Discard", "Discard shipment": "Discard shipment", - "Download packed orders": "Descargar pedidos empaquetados", "Download": "Descargar", + "Download packed orders": "Descargar pedidos empaquetados", "Download rejections" : "Download rejections", + "Download results": "Download results", "Duration": "Duration", "eCom Store": "Tienda eCom", "ECom inventory status updated successfully": "Estado del inventario de comercio electrónico actualizado con éxito", @@ -250,6 +254,7 @@ "items picked": "artículos elegidos", "items selected": "artículos seleccionados", "Item Count": "Recuento de artículos", + "Item description": "Item description", "Import": "Importar", "Import Orders": "Importar Ordenes", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Importa los detalles de los pedidos enviados desde un sistema externo basado en códigos de seguimiento. Los pedidos que tienen códigos de seguimiento se enviarán automáticamente al final del día.", @@ -349,6 +354,7 @@ "Order Identifications": "Identificaciones de pedidos", "Order ID": "ID del Pedido", "Order Invoicing Status": "Order Invoicing Status", + "Order item sequence ID": "Order item sequence ID", "Order Lookup": "Búsqueda de pedidos", "Order Name": "ID de pedido", "Order packed successfully": "Pedido empacado exitosamente", @@ -402,6 +408,7 @@ "POS Channel": "Canal POS", "Price": "Precio", "Primary": "Primary", + "Primary product ID": "Primary product ID", "Print Customer Letter": "Imprimir Carta al Cliente", "Print Picklist": "Imprimir Lista de Selección", "Print supplementary documents with the shipment for package identification.": "Imprime documentos adicionales con el envío para la identificación del paquete.", @@ -429,10 +436,15 @@ "Reject open orders.": "Rechazar { ordersCount } pedidos abiertos.", "Reject order": "Rechazar pedido", "Rejected": "Rechazado", + "Rejected at": "Rejected at", + "Rejected by": "Rejected by", + "Rejected from": "Rejected from", "Rejected items": "Rejected items", "Rejecting has been started. All in progress orders will be rejected shortly.": "Se ha iniciado el proceso de rechazo. Todos los pedidos en curso se rechazarán en breve.", "Rejecting has been started. All outstanding orders will be rejected shortly.": "Se ha iniciado el proceso de rechazo. Todos los pedidos pendientes se rechazarán en breve.", + "Rejection reason ID": "Rejection reason ID", "Rejection reason created successfully.": "Rejection reason created successfully.", + "Rejection reason description": "Rejection reason description", "Rejection reason removed successfully.": "Rejection reason removed successfully.", "Rejection reason updated successfully.": "Rejection reason updated successfully.", "Rejection reasons": "Rejection reasons", @@ -474,10 +486,12 @@ "Search": "Buscar", "Search time zones": "Buscar zonas horarias", "Secondary": "Secondary", + "Secondary product ID": "Secondary product ID", "Select": "Seleccionar", "Select all": "Seleccionar todos", "Select orderId and tracking code to continue": "Select orderId and tracking code to continue", "Select box": "Seleccionar caja", + "Select fields": "Select fields", "Select issue": "Seleccionar problema", "Select an issue": "Selecciona un problema", "Select CSV": "Seleccionar CSV", diff --git a/src/locales/ja.json b/src/locales/ja.json index 9e29bf4d..c95f468c 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -41,6 +41,7 @@ "A tracking URL not configured for": "A tracking URL not configured for {carrierName}", "ATP": "ATP", "Auto reject related items": "Auto reject related items", + "Available to promise": "Available to promise", "Back to Launchpad": "ランチパッドに戻る", "Billing Address 1": "請求先住所 1", "Billing Address 2": "請求先住所 2", @@ -53,6 +54,8 @@ "Box added successfully": "ボックスが正常に追加されました", "Boxes": "ボックス", "Brand": "ブランド", + "Brokered at": "Brokered at", + "Brokered by": "Brokered by", "Browser TimeZone": "ブラウザのタイムゾーン", "Browser time zone": "ブラウザのタイムゾーン", "Built: ": "ビルド日時: {builtDateTime}", @@ -129,9 +132,10 @@ "Disallow collateral rejections": "Disallow collateral rejections", "Discard": "破棄", "Discard shipment": "出荷を破棄", - "Download packed orders": "梱包済み注文をダウンロード", "Download": "ダウンロード", + "Download packed orders": "梱包済み注文をダウンロード", "Download rejections": "Download rejections", + "Download results": "Download results", "Duration": "Duration", "eCom Store": "ECストア", "ECom inventory status updated successfully": "EC在庫ステータスが正常に更新されました", @@ -254,6 +258,7 @@ "items picked": "選ばれた項目", "items selected": "選ばれた項目", "Item count": "項目数", + "Item description": "Item description", "Import": "インポート", "Import Orders": "注文をインポート", "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "追跡コードに基づいて外部システムから出荷済み注文の詳細をインポートします。追跡コードのある注文は、日末に自動的に出荷されます。", @@ -350,6 +355,7 @@ "Order ID": "注文ID", "Order Identifications": "注文識別", "Order Invoicing Status": "Order Invoicing Status", + "Order item sequence ID": "Order item sequence ID", "Order Lookup": "注文検索", "Order Name": "注文名", "Order packed successfully": "注文が正常に梱包されました", @@ -403,6 +409,7 @@ "POS Channel": "POSチャネル", "Price": "価格", "Primary": "主要", + "Primary product ID": "Primary product ID", "Print Customer Letter": "顧客の手紙を印刷", "Print Picklist": "ピックリストを印刷", "Print supplementary documents with the shipment for package identification.": "パッケージの識別のために、出荷時に補助書類を印刷します。", @@ -428,10 +435,15 @@ "Reject in progress orders.": "進行中の{ordersCount}件の注文を拒否。", "Reject open orders.": "オープンの{ordersCount}件の注文を拒否。", "Reject order": "注文を拒否", + "Rejected at": "Rejected at", + "Rejected by": "Rejected by", + "Rejected from": "Rejected from", "Rejected items": "Rejected items", "Rejecting has been started. All in progress orders will be rejected shortly.": "拒否が開始されました。進行中のすべての注文はまもなく拒否されます。", "Rejecting has been started. All outstanding orders will be rejected shortly.": "拒否が開始されました。未処理のすべての注文はまもなく拒否されます。", + "Rejection reason ID": "Rejection reason ID", "Rejection reason created successfully.": "拒否理由が正常に作成されました。", + "Rejection reason description": "Rejection reason description", "Rejection reason removed successfully.": "拒否理由が正常に削除されました。", "Rejection reason updated successfully.": "拒否理由が正常に更新されました。", "Rejection reasons": "拒否理由", @@ -474,10 +486,12 @@ "Search orders": "注文を検索", "Search time zones": "タイムゾーンを検索", "Secondary": "セカンダリー", + "Secondary product ID": "Secondary product ID", "Select": "選択", "Select all": "すべて選択", "Select all the fields to continue": "続行するためにすべてのフィールドを選択", "Select box": "ボックスを選択", + "Select fields": "Select fields", "Select issue": "問題を選択", "Select an issue": "問題を選択", "Select CSV": "CSVを選択", diff --git a/src/utils/index.ts b/src/utils/index.ts index 2d8b2fb1..2a647b5f 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -207,5 +207,22 @@ const getColorByDesc = (desc: string) => ({ "default": "medium" } as any)[desc] +const dateOrdinalSuffix = { + 1: 'st', + 21: 'st', + 31: 'st', + 2: 'nd', + 22: 'nd', + 3: 'rd', + 23: 'rd' +} as any -export { copyToClipboard, formatCurrency, formatDate, formatPhoneNumber, formatUtcDate, generateInternalId, getColorByDesc, getFeature, getIdentificationId, handleDateTimeInput, isValidDeliveryDays, isValidCarrierCode, isPdf, showToast, sortItems, hasError, parseCsv, jsonToCsv } +function getDateWithOrdinalSuffix(time: any) { + if (!time) return "-"; + const dateTime = DateTime.fromMillis(time); + const suffix = dateOrdinalSuffix[dateTime.day] || "th" + return `${dateTime.day}${suffix} ${dateTime.toFormat("MMM yyyy")}`; +} + + +export { copyToClipboard, formatCurrency, formatDate, formatPhoneNumber, formatUtcDate, generateInternalId, getColorByDesc, getDateWithOrdinalSuffix, getFeature, getIdentificationId, handleDateTimeInput, isValidDeliveryDays, isValidCarrierCode, isPdf, showToast, sortItems, hasError, parseCsv, jsonToCsv } diff --git a/src/views/Rejections.vue b/src/views/Rejections.vue index 4c20b900..502c47ec 100644 --- a/src/views/Rejections.vue +++ b/src/views/Rejections.vue @@ -198,7 +198,7 @@ import { formatUtcDate, jsonToCsv } from '@/utils'; import RejectedItemsModal from '@/components/RejectedItemsModal.vue'; import UsedReasonsModal from '@/components/UsedReasonsModal.vue'; import RejectedOrdersFilters from '@/components/RejectedOrdersFilters.vue' -import { DateTime } from 'luxon'; +import DownloadRejectedOrdersModal from "@/components/DownloadRejectedOrdersModal.vue"; export default defineComponent({ name: 'Rejections', @@ -301,14 +301,11 @@ export default defineComponent({ return rejectedReasonsModal.present(); }, async downloadRejections() { - - const allRejectedItems = this.rejectedOrders.list.map((order:any) => order.items).flat(); - const fileName = `RejectedOrders-${this.currentFacility.facilityId}-${DateTime.now().toLocaleString(DateTime.DATETIME_MED_WITH_SECONDS)}.csv` - - const userStore = useUserStore() - const locale = userStore.getLocale - - await jsonToCsv(allRejectedItems, { download: true, name: fileName, encode: locale === 'ja-JP' ? { default: 'shift-jis' } : {} }) + const downloadRejectedOrdersModal = await modalController.create({ + component: DownloadRejectedOrdersModal, + showBackdrop: false, + }); + await downloadRejectedOrdersModal.present(); }, async updateRejectionPeriod(rejectionPeriodId: string) { const rejectedOrdersQuery = JSON.parse(JSON.stringify(this.rejectedOrders.query))