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.

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

Improved: dxp-component package to latest release #250

Merged
merged 3 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
89 changes: 7 additions & 82 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@casl/ability": "^6.0.0",
"@hotwax/app-version-info": "^1.0.0",
"@hotwax/apps-theme": "^1.2.6",
"@hotwax/dxp-components": "^1.8.0",
"@hotwax/dxp-components": "^1.12.1",
"@hotwax/oms-api": "^1.10.0",
"@ionic/core": "^7.6.0",
"@ionic/vue": "^7.6.0",
Expand Down
7 changes: 4 additions & 3 deletions src/components/ProductListItem.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<template>
<ion-item button @click="viewProduct()" detail="true" lines="none">
<ion-thumbnail slot="start">
<ShopifyImg :src="product.mainImageUrl" size="small" />
<DxpShopifyImg :src="product.mainImageUrl" size="small" />
</ion-thumbnail>

<ion-label>
<p>{{ getProductIdentificationValue(productIdentificationPref.secondaryId, product) }}</p>
<h3>{{ getProductIdentificationValue(productIdentificationPref.primaryId, product) ? getProductIdentificationValue(productIdentificationPref.primaryId, product) : product.productName }}</h3>
Expand All @@ -20,15 +21,15 @@ import {
} from '@ionic/vue'
import { useRouter } from 'vue-router'
import { useStore } from 'vuex';
import { getProductIdentificationValue, ShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';
import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from '@hotwax/dxp-components';

export default defineComponent({
name: "ProductListItem",
components: {
IonItem,
IonThumbnail,
IonLabel,
ShopifyImg
DxpShopifyImg
},
props: ["product"],
methods: {
Expand Down
2 changes: 2 additions & 0 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@
"OMS instance": "OMS instance",
"Password": "Password",
"Please contact the administrator.": "Please contact the administrator.",
"Primary": "Primary",
"Quantity": "Quantity",
"Quantity on hand": "Quantity on hand",
"Remove": "Remove",
"Save":"Save",
"Scan": "Scan",
"Search": "Search",
"Search time zones": "Search time zones",
"Secondary": "Secondary",
"Select facility": "Select facility",
"Select time zone": "Select time zone",
"Set facility": "Set facility",
Expand Down
4 changes: 2 additions & 2 deletions src/views/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<h1>{{ $t('OMS') }}</h1>
</div>
<section>
<OmsInstanceNavigator />
<DxpOmsInstanceNavigator />

<ion-card>
<ion-card-header>
Expand All @@ -61,7 +61,7 @@
<p class="overline">{{ "Built: " + getDateTime(appInfo.builtTime) }}</p>
</div>
<section>
<ProductIdentifier />
<DxpProductIdentifier />

<ion-card>
<ion-card-header>
Expand Down
6 changes: 3 additions & 3 deletions src/views/Upload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ion-card v-for="product in uploadProducts" :key="product.productId">
<ion-item lines="none">
<ion-thumbnail slot="start">
<ShopifyImg :src="product.mainImageUrl" size="small"/>
<DxpShopifyImg :src="product.mainImageUrl" size="small"/>
</ion-thumbnail>
<ion-label @click="viewProduct(product)">
<p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, product) }}</p>
Expand Down Expand Up @@ -70,7 +70,7 @@ import { computed, defineComponent } from 'vue';
import { colorPaletteOutline, resize, cloudUploadOutline } from 'ionicons/icons';
import { mapGetters, useStore } from 'vuex';
import { useRouter } from 'vue-router';
import { getProductIdentificationValue, ShopifyImg , useProductIdentificationStore } from '@hotwax/dxp-components';
import { getProductIdentificationValue, DxpShopifyImg , useProductIdentificationStore } from '@hotwax/dxp-components';
import { Actions, hasPermission } from '@/authorization';
import { showToast } from '@/utils';

Expand All @@ -92,7 +92,7 @@ export default defineComponent({
IonThumbnail,
IonTitle,
IonToolbar,
ShopifyImg
DxpShopifyImg
},
computed: {
...mapGetters({
Expand Down
6 changes: 3 additions & 3 deletions src/views/count.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ion-content>
<div class="product-image">
<ShopifyImg :src="product.mainImageUrl"/>
<DxpShopifyImg :src="product.mainImageUrl"/>
</div>

<div class="product-info">
Expand Down Expand Up @@ -130,7 +130,7 @@
import { hasError, showToast } from "@/utils";
import { translate } from "@/i18n";
import { useRouter } from "vue-router";
import { getProductIdentificationValue, ShopifyImg, useProductIdentificationStore } from "@hotwax/dxp-components";
import { getProductIdentificationValue, DxpShopifyImg, useProductIdentificationStore } from "@hotwax/dxp-components";
import { UtilService } from "@/services/UtilService";
import { ProductService } from '@/services/ProductService';
import { StockService } from '@/services/StockService';
Expand All @@ -157,7 +157,7 @@
IonSelectOption,
IonTitle,
IonToolbar,
ShopifyImg
DxpShopifyImg
},
computed: {
...mapGetters({
Expand Down
Loading