Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved: app to upgrade ionic to v7.6.0(#246) #247

Merged
merged 17 commits into from
Mar 18, 2024
Merged

Improved: app to upgrade ionic to v7.6.0(#246) #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5b881b4
Improved: app to upgrade ionic to v7.6.0(#246)
ymaheshwari1 Dec 28, 2023
50ae9e8
Improved: apps theme version to latest release 1.2.6(#246)
ymaheshwari1 Dec 28, 2023
a96aa69
Improved: usage of ion-radio as per changes in ionic7(#246)
ymaheshwari1 Dec 28, 2023
ab96569
Improved: usage of ion-input as per changes in ionic7(#246)
ymaheshwari1 Dec 28, 2023
69606a3
Improved: usage of ion-select as per the changes in ionic7(#246)
ymaheshwari1 Dec 29, 2023
2553d6d
Improved: usage of error and helper text in ion-input(#246)
ymaheshwari1 Dec 29, 2023
e83749d
Added: comment in the configure date time modal(#246)
ymaheshwari1 Dec 29, 2023
65ac801
Improved: styling for list header on review pages(#246)
ymaheshwari1 Dec 29, 2023
94bf74d
Improved: usage of ion-checkbox as per the changes in ionic7(#246)
ymaheshwari1 Dec 29, 2023
be51789
Merge branch 'main' into #246
ymaheshwari1 Feb 26, 2024
ceaa603
Improved: dxp package version to latest release(#246)
ymaheshwari1 Feb 26, 2024
4168b6b
Fixed: usage of dxp components(#246)
ymaheshwari1 Feb 26, 2024
2bc7358
Improved: UI to pass hidden-label when label is not present(#246)
ymaheshwari1 Feb 26, 2024
0047a28
Removed: slot from ion-radio in timezone modal(#246)
ymaheshwari1 Feb 26, 2024
03fe834
Merge branch 'main' into #246
ymaheshwari1 Mar 15, 2024
6769c66
Improved: UI as per the changes in ionic7(#246)
ymaheshwari1 Mar 18, 2024
883a772
Merge branch 'main' into #246
ymaheshwari1 Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 54 additions & 59 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"@capacitor/core": "^2.4.7",
"@casl/ability": "^6.0.0",
"@hotwax/app-version-info": "^1.0.0",
"@hotwax/apps-theme": "^1.1.0",
"@hotwax/apps-theme": "^1.2.6",
"@hotwax/dxp-components": "^1.12.1",
"@hotwax/oms-api": "^1.13.0",
"@ionic/core": "6.7.5",
"@ionic/vue": "6.7.5",
"@ionic/vue-router": "6.7.5",
"@ionic/core": "^7.6.0",
"@ionic/vue": "^7.6.0",
"@ionic/vue-router": "~7.6.0",
"boon-js": "^2.0.3",
"@types/file-saver": "^2.0.4",
"@types/papaparse": "^5.3.1",
Expand Down
14 changes: 4 additions & 10 deletions src/components/BulkAdjustmentModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,22 @@
<ion-content>
<ion-list>
<ion-item lines="full">
<ion-label>{{ $t("Buffer days") }}</ion-label>
<ion-input v-model="bufferDays" type="number" :placeholder = "$t('Lead time')" min="1" />
<ion-input :label="$t('Buffer days')" v-model="bufferDays" type="number" :placeholder="$t('Lead time')" min="1" />
</ion-item>

<ion-item lines="full">
<ion-label>{{ $t("Order buffer") }}</ion-label>
<ion-input v-model="orderBuffer" type="number" :placeholder = "$t('Safety stock')" min="1" />
<ion-input :label="$t('Order buffer')" v-model="orderBuffer" type="number" :placeholder="$t('Safety stock')" min="1" />
</ion-item>

<ion-item>
<ion-label>{{ $t("Catalog") }}</ion-label>
<ion-select interface="popover" v-model="isNewProduct">
<ion-select :label="$t('Catalog')" interface="popover" v-model="isNewProduct">
<ion-select-option value="N">{{ $t("Backorder") }}</ion-select-option>
<ion-select-option value="Y">{{ $t("Preorder") }}</ion-select-option>
</ion-select>
</ion-item>

<ion-item>
<ion-label>{{ $t("Facility") }}</ion-label>
<ion-select interface="popover" v-model="facilityId">
<ion-select :label="$t('Facility')" interface="popover" v-model="facilityId">
<ion-select-option v-for="facility in facilities" :key="facility.facilityId" :value="facility.facilityId">{{ facility.facilityName }}</ion-select-option>
</ion-select>
</ion-item>
Expand All @@ -56,7 +52,6 @@ import {
IonItem,
IonIcon,
IonInput,
IonLabel,
IonList,
IonSelect,
IonSelectOption,
Expand All @@ -83,7 +78,6 @@ export default defineComponent({
IonIcon,
IonItem,
IonInput,
IonLabel,
IonList,
IonSelect,
IonSelectOption,
Expand Down
12 changes: 4 additions & 8 deletions src/components/CreateMappingModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,23 @@
</ion-header>

<ion-item>
<ion-label>{{ $t("Mapping name") }}</ion-label>
<ion-input :placeholder="$t('Field mapping name')" v-model="mappingName" />
<ion-input :label="$t('Mapping name')" :placeholder="$t('Field mapping name')" v-model="mappingName" />
</ion-item>

<ion-content class="ion-padding">
<div>
<ion-list>
<ion-item :key="field" v-for="(fieldValues, field) in getFields()">
<template v-if="field === 'productIdentification'">
<ion-select interface="popover" :placeholder = "$t('Select')" slot="start" v-model="identificationTypeId">
<ion-select aria-label="identification-type-id" interface="popover" :placeholder = "$t('Select')" 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 aria-label="identification-type-value" 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-label>{{ $t(fieldValues.label) }}</ion-label>
<ion-select interface="popover" :placeholder = "$t('Select')" v-model="fieldMapping[field]">
<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>
Expand All @@ -56,7 +54,6 @@ import {
IonInput,
IonTitle,
IonToolbar,
IonLabel,
IonItem,
IonList,
IonSelect,
Expand Down Expand Up @@ -84,7 +81,6 @@ export default defineComponent({
IonSelectOption,
IonTitle,
IonToolbar,
IonLabel,
IonItem,
IonList
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/DateTimeParseErrorModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ion-item>

<ion-item>
<ion-input clear-input='true' v-model="dateTimeFormat" :value="dateTimeFormat" />
<ion-input :clear-input='true' v-model="dateTimeFormat" :value="dateTimeFormat" />
</ion-item>

<ion-item>
Expand Down
10 changes: 2 additions & 8 deletions src/components/MappingConfiguration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<template>
<section>
<ion-item>
<ion-label>{{ $t("Mapping name") }}</ion-label>
<ion-input v-model="currentMapping.name" />
<ion-input :label="$t('Mapping name')" v-model="currentMapping.name" />
</ion-item>

<ion-list>

<ion-item :key="field" v-for="(fieldValues, field) in getFields()">
<ion-label>{{ $t(fieldValues.label) }}</ion-label>
<ion-input v-model="currentMapping.value[field]" />
<ion-input :label="$t(fieldValues.label)" v-model="currentMapping.value[field]" />
</ion-item>

</ion-list>

<div class="ion-padding-top actions desktop-only">
Expand Down Expand Up @@ -46,7 +42,6 @@ import {
IonButton,
IonIcon,
IonInput,
IonLabel,
IonItem,
IonList
} from "@ionic/vue";
Expand All @@ -62,7 +57,6 @@ export default defineComponent({
IonButton,
IonIcon,
IonInput,
IonLabel,
IonItem,
IonList
},
Expand Down
10 changes: 5 additions & 5 deletions src/components/MissingFacilitiesModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<ion-content>
<ion-list>
<ion-item v-for="(items, facilityId) in itemsByFacilityId" :key="facilityId" lines="full">
<ion-label>
{{ facilityId }}
<p>{{ items?.length }} {{ $t("line items") }}</p>
</ion-label>
<ion-select interface="popover" slot="end" :placeholder="$t('Map facility')" @ionChange="updateFacility($event, facilityId)">
<ion-select interface="popover" :placeholder="$t('Map facility')" @ionChange="updateFacility($event, facilityId)">
<ion-label slot="label">
{{ facilityId }}
<p>{{ items?.length }} {{ $t("line items") }}</p>
</ion-label>
<ion-select-option v-for="facility in facilities" :key="facility.facilityId" :value="facility.facilityId">{{ facility.facilityName }}</ion-select-option>
</ion-select>
</ion-item>
Expand Down
Loading
Loading