diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue index 456dfe66..fbfe481d 100644 --- a/src/components/GenerateTrackingCodeModal.vue +++ b/src/components/GenerateTrackingCodeModal.vue @@ -24,7 +24,7 @@ <ion-item> <template v-if="carrierMethods && carrierMethods.length > 0"> <ion-select :disabled="!order.missingLabelImage" :label="translate('Method')" v-model="shipmentMethodTypeId" interface="popover"> - <ion-select-option v-for="method in carrierMethods" :key="method.productStoreShipMethId" :value="method.shipmentMethodTypeId">{{ translate(method.description) }}</ion-select-option> + <ion-select-option v-for="method in carrierMethods" :key="carrierMethods.partyId + method.shipmentMethodTypeId" :value="method.shipmentMethodTypeId">{{ translate(method.description) }}</ion-select-option> </ion-select> </template> <template v-else> diff --git a/src/store/modules/carrier/actions.ts b/src/store/modules/carrier/actions.ts index 137da673..2f30ab6e 100644 --- a/src/store/modules/carrier/actions.ts +++ b/src/store/modules/carrier/actions.ts @@ -367,11 +367,12 @@ const actions: ActionTree<CarrierState, RootState> = { "roleTypeId": "CARRIER", "facilityId": getCurrentFacilityId() }, - "fieldList": ["facilityId", "partyId", "firstName", "lastName", "groupName", "roleTypeId", "fromDate"], + "fieldList": ["facilityId", "partyId", "firstName", "lastName", "groupName", "roleTypeId"], "noConditionFind": "Y", "viewIndex": viewIndex, "viewSize": 250, - "filterByDate": "Y" + "filterByDate": "Y", + "distinct": "Y" } resp = await CarrierService.fetchCarrierFacilities(params) @@ -440,11 +441,12 @@ const actions: ActionTree<CarrierState, RootState> = { "shipmentMethodTypeId": "STOREPICKUP", "shipmentMethodTypeId_op": "notEqual" }, - "fieldList": ["productStoreShipMethId", "productStoreId", "partyId", "roleTypeId", "shipmentMethodTypeId", "shipmentGatewayConfigId", "isTrackingRequired", "sequenceNumber", "description", "fromDate"], + "fieldList": ["productStoreId", "partyId", "roleTypeId", "shipmentMethodTypeId", "description"], "noConditionFind": "Y", "viewIndex": viewIndex, "viewSize": 250, - "filterByDate": "Y" + "filterByDate": "Y", + "distinct": "Y" } resp = await CarrierService.fetchProductStoreShipmentMethods(params) diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue index f30d8855..d43d1a26 100644 --- a/src/views/OrderDetail.vue +++ b/src/views/OrderDetail.vue @@ -246,7 +246,7 @@ <ion-item> <template v-if="carrierMethods && carrierMethods.length > 0"> <ion-select :disabled="!order.missingLabelImage" :label="translate('Method')" v-model="shipmentMethodTypeId" interface="popover" @ionChange="updateCarrierAndShippingMethod(carrierPartyId, shipmentMethodTypeId)"> - <ion-select-option v-for="method in carrierMethods" :key="method.productStoreShipMethId" :value="method.shipmentMethodTypeId">{{ translate(method.description) }}</ion-select-option> + <ion-select-option v-for="method in carrierMethods" :key="method.partyId + method.shipmentMethodTypeId" :value="method.shipmentMethodTypeId">{{ translate(method.description) }}</ion-select-option> </ion-select> </template> <template v-else-if="!isUpdatingCarrierDetail">