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

Added shopify config info at menu footer(#2q9mut9) #220

Merged
merged 8 commits into from
Sep 1, 2022
Merged

Added shopify config info at menu footer(#2q9mut9) #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1adb3ed
Added shopify config info at menu footer(#2q9mut9)
disha1202 Aug 17, 2022
eebadcb
Merge branch '#2q9mut9' of https://github.com/disha1202/job-manager i…
disha1202 Aug 17, 2022
6c43bf4
Fixed: spacing and indentation issue(#2q9mut9)
disha1202 Aug 17, 2022
781186e
Updated: icon for shopify config(#2q9mut9)
disha1202 Aug 18, 2022
9e034b1
Updated the UI of menu footer(#2q9mut9)
disha1202 Aug 30, 2022
0160a77
Fixed: Extra white space in job configuration component if job descri…
disha1202 Aug 30, 2022
60e6f0d
Merge branch 'main' of https://github.com/hotwax/job-manager into #2q…
disha1202 Sep 1, 2022
d61bf04
Updated code to display shopifyConfigName instead of shopifyCongigId(…
disha1202 Sep 1, 2022
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
4 changes: 2 additions & 2 deletions src/components/JobConfiguration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ion-list>

<ion-item lines="none">
<ion-item v-if="currentJob.description" lines="none">
<ion-label class="ion-text-wrap">
<p>{{ currentJob.description }}</p>
</ion-label>
Expand Down Expand Up @@ -404,7 +404,7 @@ export default defineComponent({

<style scoped>
ion-list {
margin: var(--spacer-base) 0;
margin: 0 0 var(--spacer-base);
}

.actions > ion-button {
Expand Down
4 changes: 3 additions & 1 deletion src/components/Menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<ion-label class="ion-text-wrap">
<p class="overline">{{ instanceUrl }}</p>
{{ eComStore.storeName }}
<p>{{ currentShopifyConfig.shopifyConfigName }}</p>
</ion-label>
<ion-note slot="end">{{ userProfile?.userTimeZone }}</ion-note>
</ion-item>
Expand Down Expand Up @@ -83,7 +84,8 @@ export default defineComponent({
currentFacility: 'user/getCurrentFacility',
eComStore: 'user/getCurrentEComStore',
instanceUrl: 'user/getInstanceUrl',
userProfile: 'user/getUserProfile'
userProfile: 'user/getUserProfile',
currentShopifyConfig: 'user/getCurrentShopifyConfig'
})
},
watch:{
Expand Down
7 changes: 4 additions & 3 deletions src/views/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</ion-item>
<!-- Select shopify config -->
<ion-item>
<ion-icon :icon="globeOutline" slot="start" />
<ion-icon :icon="basketOutline" slot="start" />
<ion-label>{{ $t("Shopify Config") }}</ion-label>
<ion-select interface="popover" :value="currentShopifyConfig?.shopifyConfigId" @ionChange="setShopifyConfig($event)">
<ion-select-option v-for="shopifyConfig in shopifyConfigs" :key="shopifyConfig.shopifyConfigId" :value="shopifyConfig.shopifyConfigId" >{{ shopifyConfig.shopifyConfigName }}</ion-select-option>
Expand Down Expand Up @@ -50,7 +50,7 @@
<script lang="ts">
import { IonButton, IonContent, IonHeader,IonIcon, IonItem, IonLabel, IonMenuButton, IonPage, IonSelect, IonSelectOption, IonTitle, IonToolbar, modalController } from '@ionic/vue';
import { defineComponent } from 'vue';
import { codeWorkingOutline, ellipsisVertical, globeOutline, personCircleOutline, storefrontOutline, timeOutline} from 'ionicons/icons'
import { codeWorkingOutline, ellipsisVertical, globeOutline, personCircleOutline, storefrontOutline, timeOutline, basketOutline} from 'ionicons/icons'
import { mapGetters, useStore } from 'vuex';
import { useRouter } from 'vue-router';
import TimeZoneModal from '@/views/TimezoneModal.vue';
Expand Down Expand Up @@ -121,7 +121,8 @@ export default defineComponent({
storefrontOutline,
store,
timeOutline,
router
router,
basketOutline
}
}
});
Expand Down