Merge pull request #436 from amansinghbais/#433

Implemented: migrated bopis settings from user preference to product store settings, and added permission over them (#433)

.env.example

@@ -16,3 +16,4 @@ VUE_APP_NOTIF_APP_ID=BOPIS
 VUE_APP_NOTIF_ENUM_TYPE_ID=NOTIF_BOPIS
 VUE_APP_FIREBASE_CONFIG={"apiKey": "","authDomain": "","databaseURL": "","projectId": "","storageBucket": "","messagingSenderId": "","appId": ""}
 VUE_APP_FIREBASE_VAPID_KEY=""
+VUE_APP_PRODUCT_STORE_SETTING_ENUMS={"ENABLE_TRACKING": {"enumId": "ENABLE_TRACKING","enumName": "Enable tracking","enumTypeId": "PROD_STR_STNG","description": "Enable tracking in BOPIS app"}, "PRINT_PACKING_SLIPS": {"enumId": "PRINT_PACKING_SLIPS","enumName": "Generate packing slips","enumTypeId": "PROD_STR_STNG","description": "Generate packing slips in BOPIS app"}, "PRINT_PICKLISTS": {"enumId": "wPRINT_PICKLISTS","enumName": "Print picklists","enumTypeId": "PROD_STR_STNG","description": "Print picklists in BOPIS app"}, "SHOW_SHIPPING_ORDERS": {"enumId": "SHOW_SHIPPING_ORDERS","enumName": "Show shipping orders","enumTypeId": "PROD_STR_STNG","description": "Show shipping orders in BOPIS app"}}

package.json

@@ -17,7 +17,7 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.15.3",
+    "@hotwax/dxp-components": "^1.15.4",
     "@hotwax/oms-api": "^1.14.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",

src/adapter/index.ts

@@ -6,15 +6,13 @@ import {
   getNotificationUserPrefTypeIds,
   getProductIdentificationPref,
   getUserFacilities,
-  getUserPreference,
   hasError,
   initialise,
   logout,
   removeClientRegistrationToken,
   resetConfig,
   setProductIdentificationPref,
   setUserLocale,
-  setUserPreference,
   storeClientRegistrationToken,
   subscribeTopic,
   unsubscribeTopic,
@@ -32,15 +30,13 @@ export {
   getNotificationUserPrefTypeIds,
   getProductIdentificationPref,
   getUserFacilities,
-  getUserPreference,
   hasError,
   initialise,
   logout,
   removeClientRegistrationToken,
   resetConfig,
   setProductIdentificationPref,
   setUserLocale,
-  setUserPreference,
   storeClientRegistrationToken,
   subscribeTopic,
   unsubscribeTopic,

src/authorization/Actions.ts

@@ -3,4 +3,10 @@ export default {
   'APP_REJECT_ORDER': 'APP_REJECT_ORDER',
   'APP_RF_CONFIG_UPDATE': 'APP_RF_CONFIG_UPDATE',
   'APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE': 'APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE',
+  'APP_PRODUCT_IDENTIFIER_UPDATE': 'APP_PRODUCT_IDENTIFIER_UPDATE',
+  'APP_ENABLE_TRACKING_PREF_UPDATE': 'APP_ENABLE_TRACKING_PREF_UPDATE',
+  'APP_PRINT_PICKLIST_PREF_UPDATE': 'APP_PRINT_PICKLIST_PREF_UPDATE',
+  'APP_PRINT_PACKING_SLIP_PREF_UPDATE': 'APP_PRINT_PACKING_SLIP_PREF_UPDATE',
+  'APP_SHOW_SHIPPING_ORD_PREF_UPDATE': 'APP_SHOW_SHIPPING_ORD_PREF_UPDATE',
+  'APP_COMMERCE_VIEW': 'APP_COMMERCE_VIEW'
 }

src/authorization/Rules.ts

@@ -8,5 +8,11 @@ export default {
     "APP_RF_CONFIG_UPDATE": "COMMON_ADMIN",
     "APP_PARTIAL_ORDER_REJECTION_CONFIG_UPDATE": "COMMON_ADMIN",
     "APP_STOREFULFILLMENT_ADMIN": "STOREFULFILLMENT_ADMIN",
+    "APP_PRODUCT_IDENTIFIER_UPDATE": "COMMON_ADMIN",
+    "APP_ENABLE_TRACKING_PREF_UPDATE": "COMMON_ADMIN",
+    "APP_PRINT_PICKLIST_PREF_UPDATE": "COMMON_ADMIN",
+    "APP_PRINT_PACKING_SLIP_PREF_UPDATE": "COMMON_ADMIN",
+    "APP_SHOW_SHIPPING_ORD_PREF_UPDATE": "COMMON_ADMIN",
+    "APP_COMMERCE_VIEW": "COMMERCEUSER_VIEW",
     "BOPIS_APP_VIEW": "BOPIS_APP_VIEW"
 } as any 

src/locales/en.json

@@ -45,6 +45,7 @@
   "Failed to load packing slip": "Failed to load packing slip",
   "Failed to update configuration": "Failed to update configuration",
   "Failed to print shipping label and packing slip": "Failed to print shipping label and packing slip",
+  "Failed to update product store setting.": "Failed to update product store setting.",
   "First name": "First name",
   "Generate packing slips": "Generate packing slips",
   "Generate shipping documents": "Generate shipping documents",

src/locales/es.json

@@ -43,6 +43,7 @@
   "Failed to load packing slip": "Error al cargar el documento de embalaje",
   "Failed to update configuration": "No se pudo actualizar la configuración",
   "Failed to print shipping label and packing slip": "Error al imprimir la etiqueta de envío y la hoja de embalaje",
+  "Failed to update product store setting.": "Failed to update product store setting.",
   "First name": "Nombre",
   "Generate packing slips": "Generar documentos de embalaje",
   "Generate shipping documents": "Generar documentos de envío",

src/locales/ja.json

@@ -43,6 +43,7 @@
   "Failed to load packing slip": "納品書の読み込みに失敗しました",
   "Failed to update configuration": "設定の更新に失敗しました",
   "Failed to print shipping label and packing slip": "出荷ラベルと納品書の印刷に失敗しました。",
+  "Failed to update product store setting.":"Failed to update product store setting.",
   "First name": "名",
   "Generate packing slips": "内容明細票の作成",
   "Generate shipping documents": "出荷書類を生成する",

src/main.ts

@@ -28,7 +28,7 @@ import "@hotwax/apps-theme";
 
 import store from './store'
 
-import permissionPlugin from '@/authorization';
+import permissionPlugin, { Actions, hasPermission } from '@/authorization';
 import permissionRules from '@/authorization/Rules';
 import permissionActions from '@/authorization/Actions';
 
@@ -54,6 +54,7 @@ const app = createApp(App)
     actions: permissionActions
   })
   .use(dxpComponents, {
+    Actions,
     addNotification,
     appLoginUrl: process.env.VUE_APP_LOGIN_URL as string,
     appFirebaseConfig: JSON.parse(process.env.VUE_APP_FIREBASE_CONFIG),
@@ -70,6 +71,7 @@ const app = createApp(App)
     setUserLocale,
     storeClientRegistrationToken,
     getAvailableTimeZones,
+    hasPermission,
     setUserTimeZone
   });
 

src/services/UtilService.ts

@@ -1,4 +1,5 @@
 import { api } from '@/adapter';
+import { hasError } from '@/adapter';
 
 const fetchRejectReasons = async (query: any): Promise<any> => {
   return api({
@@ -57,12 +58,74 @@ const fetchReservedQuantity = async (query: any): Promise <any>  => {
   });
 }
 
+const getProductStoreSettings = async (payload: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "post",
+    data: payload
+  });
+}
+
+const createProductStoreSetting = async (payload: any): Promise<any> => {
+  return api({
+    url: "service/createProductStoreSetting",
+    method: "post",
+    data: payload
+  });
+}
+
+const updateProductStoreSetting = async (payload: any): Promise<any> => {
+  return api({
+    url: "service/updateProductStoreSetting",
+    method: "post",
+    data: payload
+  });
+}
+
+const createEnumeration = async (payload: any): Promise<any> => {
+  return api({
+    url: "/service/createEnumeration",
+    method: "post",
+    data: payload
+  })
+}
+
+const isEnumExists = async (enumId: string): Promise<any> => {
+  try {
+    const resp = await api({
+      url: 'performFind',
+      method: 'POST',
+      data: {
+        entityName: "Enumeration",
+        inputFields: {
+          enumId
+        },
+        viewSize: 1,
+        fieldList: ["enumId"],
+        noConditionFind: 'Y'
+      }
+    }) as any
+
+    if (!hasError(resp) && resp.data.docs.length) {
+      return true
+    }
+    return false
+  } catch (err) {
+    return false
+  }
+}
+
 export const UtilService = {
+  createEnumeration,
+  createProductStoreSetting,
   fetchFacilityTypeInformation,
   fetchPartyInformation,
   fetchPaymentMethodTypeDesc,
   fetchRejectReasons,
   fetchStatusDesc,
+  getProductStoreSettings,
+  isEnumExists,
   resetPicker,
+  updateProductStoreSetting,
   fetchReservedQuantity
 }

src/store/modules/user/UserState.ts

@@ -3,7 +3,6 @@ export default interface UserState {
     current: any;
     currentFacility: object;
     instanceUrl: string;
-    preference: any;
     permissions: any;
     currentEComStore: any;
     partialOrderRejectionConfig: any
@@ -12,4 +11,5 @@ export default interface UserState {
     firebaseDeviceId: string;
     hasUnreadNotifications: boolean;
     allNotificationPrefs: any;
+    bopisProductStoreSettings: any;
 }