Merge branch 'main' into hotwax#246

.env.example

@@ -7,6 +7,6 @@ VUE_APP_PERMISSION_ID=
 VUE_APP_ALIAS={}
 VUE_APP_MAPPING_TYPES={"PO": "PO_MAPPING_PREF","RSTINV": "INV_MAPPING_PREF"}
 VUE_APP_MAPPING_PO={"orderId": { "label": "Order ID", "required": true }, "productSku": { "label": "Shopify product SKU", "required": true },"orderDate": { "label": "Arrival date", "required": true }, "quantity": { "label": "Ordered quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }}
-VUE_APP_MAPPING_RSTINV={"productSku": { "label": "Product SKU", "required": true }, "quantity": { "label": "Quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }, "locationSeqId": { "label": "Facility Location", "required": true }}
+VUE_APP_MAPPING_RSTINV={"productIdentification": { "label": "Product Identification", "required": true }, "quantity": { "label": "Quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }}
 VUE_APP_DEFAULT_LOG_LEVEL="error"
 VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "import",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "private": true,
   "description": "Import App",
   "scripts": {

src/components/CreateMappingModal.vue

@@ -18,9 +18,19 @@
     <div>
       <ion-list>
         <ion-item :key="field" v-for="(fieldValues, field) in getFields()">
-          <ion-select :label="$t(fieldValues.label)" interface="popover" :placeholder="$t('Select')" v-model="fieldMapping[field]">
-            <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
-          </ion-select>
+          <template v-if="field === 'productIdentification'">
+            <ion-select interface="popover" :placeholder = "$t('Select')" slot="start" v-model="identificationTypeId">
+              <ion-select-option :key="goodIdentificationType.goodIdentificationTypeId" v-for="goodIdentificationType in goodIdentificationTypes">{{ goodIdentificationType.description }}</ion-select-option>
+            </ion-select>
+            <ion-select interface="popover" v-if="content.length" :placeholder = "$t('Select')" slot="end" v-model="fieldMapping['productIdentification']">
+              <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
+            </ion-select>
+          </template>
+          <template v-else>
+            <ion-select :label="$t(fieldValues.label)" interface="popover" :placeholder = "$t('Select')" v-model="fieldMapping[field]">
+              <ion-select-option :key="index" v-for="(prop, index) in fileColumns">{{ prop }}</ion-select-option>
+            </ion-select>
+          </template>
         </ion-item>
       </ion-list>
     </div>
@@ -78,17 +88,20 @@ export default defineComponent({
     return {
       mappingName: "",
       fieldMapping: {} as any,
-      fileColumns: [] as any
+      fileColumns: [] as any,
+      identificationTypeId: 'SHOPIFY_PROD_SKU'
     }
   },
   props: ["content", "seletedFieldMapping", "mappingType"],
   mounted() {
     this.fieldMapping = { ...this.seletedFieldMapping }
     this.fileColumns = Object.keys(this.content[0]);
+    this.store.dispatch('util/fetchGoodIdentificationTypes');
   },
   computed: {
     ...mapGetters({
-      fieldMappings: 'user/getFieldMappings'
+      fieldMappings: 'user/getFieldMappings',
+      goodIdentificationTypes: 'util/getGoodIdentificationTypes'
     })
   },
   methods: {