Merge branch 'main' of https://github.com/hotwax/facilities into faci…

…lities/#68

.eslintrc.js

@@ -24,10 +24,7 @@ module.exports = {
       files: [
         '**/__tests__/*.{j,t}s?(x)',
         '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
-      env: {
-        jest: true
-      }
+      ]
     }
   ]
 }

package.json

@@ -40,28 +40,23 @@
   "devDependencies": {
     "@capacitor/cli": "^2.4.7",
     "@intlify/vue-i18n-loader": "^2.1.0",
-    "@types/jest": "^27.5.0",
     "@types/luxon": "^2.0.9",
     "@typescript-eslint/eslint-plugin": "~5.26.0",
     "@typescript-eslint/parser": "~5.26.0",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-e2e-cypress": "~4.5.0",
+    "@vue/cli-plugin-babel": "~5.0.8",
+    "@vue/cli-plugin-e2e-cypress": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-pwa": "^4.5.16",
-    "@vue/cli-plugin-router": "~4.5.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
-    "@vue/cli-plugin-unit-jest": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-pwa": "^5.0.8",
+    "@vue/cli-plugin-router": "~5.0.8",
+    "@vue/cli-plugin-typescript": "~5.0.8",
+    "@vue/cli-service": "~5.0.8",
     "@vue/compiler-sfc": "^3.0.0-0",
     "@vue/eslint-config-typescript": "^9.1.0",
     "@vue/test-utils": "^2.0.0-0",
-    "@vue/vue3-jest": "^28.0.0",
     "cypress": "^8.3.0",
     "eslint": "^7.32.0",
     "eslint-plugin-vue": "^8.0.3",
-    "jest": "^28.1.0",
     "papaparse": "^5.3.1",
-    "ts-jest": "^28.0.8",
     "typescript": "~4.7.4",
     "vue-cli-plugin-i18n": "^1.0.1"
   }

src/components/AddOperatingHoursModal.vue

@@ -16,7 +16,7 @@
           <ion-item slot="header">
             <ion-radio :value="calendar.calendarId" slot="start" />
             <ion-label class="ion-text-wrap">
-              {{ calendar.description }}
+              {{ calendar.description ? calendar.description : calendar.calendarId }}
             </ion-label>
           </ion-item>
           <div class="ion-padding" slot="content">

src/components/CustomScheduleModal.vue

@@ -210,7 +210,7 @@ export default defineComponent({
       }
 
       if(!Object.keys(payload).length) {
-        showToast(translate("Please check all the selected start time and end time entries."))
+        showToast(translate("Please check start time and end time entries. End time cannot be less than start time."))
         return;
       }
 

src/locales/en.json

@@ -188,7 +188,7 @@
   "Party Id": "Party Id",
   "Party successfully removed from facility.": "Party successfully removed from facility.",
   "Pending allocation": "Pending allocation",
-  "Please check all the selected start time and end time entries.": "Please check all the selected start time and end time entries.",
+  "Please check start time and end time entries. End time cannot be less than start time.": "Please check start time and end time entries. End time cannot be less than start time.",
   "Please update atleast one party role.": "Please update atleast one party role.",
   "Password": "Password",
   "party id": "party id",
@@ -272,6 +272,7 @@
   "Unlimited orders": "Unlimited orders",
   "Unlink": "Unlink",
   "Update days to ship": "Update days to ship",
+  "Updated default days to ship": "Updated default days to ship",
   "Username": "Username",
   "Username is required.": "Username is required.",
   "Uses native fulfillment app": "Uses native fulfillment app",

src/views/CreateFacility.vue

@@ -13,7 +13,7 @@
             <ion-card-title>{{ translate('Setup Store') }}</ion-card-title>
           </ion-card-header>
           <ion-list>
-            <ion-item lines="none">
+            <ion-item>
               <ion-label>{{ translate("Type") }}</ion-label>
               <ion-select interface="popover" v-model="selectedFacilityTypeId">
                 <ion-select-option :value="facilityTypeId" :key="facilityTypeId" v-for="(type, facilityTypeId) in facilityTypesByParentTypeId">

src/views/FacilityDetails.vue

@@ -87,7 +87,7 @@
             </ion-card-content>
             <ion-radio-group v-model="selectedCalendarId">
               <ion-item v-for="(calendar, index) in calendars.slice(0,3)" :key="index" lines="none">
-                <ion-label class="ion-text-wrap">{{ calendar.description }}</ion-label>
+                <ion-label class="ion-text-wrap">{{ calendar.description ? calendar.description : calendar.calendarId }}</ion-label>
                 <ion-radio slot="end" :value="calendar.calendarId"/>
               </ion-item>
             </ion-radio-group>

src/views/FacilityManagement.vue

@@ -115,10 +115,12 @@ ion-item > h1 {
 main {
   display: grid;
   place-content: center;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 343px));
   height: calc(100vh - 56px);
   gap: var(--spacer-lg);
   padding: var(--spacer-lg);
+  max-width: 1000px;
+  margin: auto;
 }
 
 ion-card-header {

tsconfig.json

@@ -13,8 +13,7 @@
     "resolveJsonModule": true,
     "baseUrl": ".",
     "types": [
-      "webpack-env",
-      "jest"
+      "webpack-env"
     ],
     "paths": {
       "@/*": [