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: added the support for the mobile view in Rejection Reasons and Carrier & Shipment methods (#244) #679

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
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
5 changes: 3 additions & 2 deletions src/components/ShipmentMethods.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ion-chip>
<ion-note class="config-label">{{ translate('carrier code') }}</ion-note>
</div>
<div class="tablet">
<div class="shipment-status">
<ion-checkbox :checked="shipmentMethod.isChecked" @click="updateCarrierShipmentMethodAssociation($event, shipmentMethod)" />
</div>
<ion-button fill="clear" color="medium" @click="openShipmentMethodActionsPopover($event, shipmentMethod)">
Expand Down Expand Up @@ -267,11 +267,12 @@
<style scoped>
.list-item {
--columns-desktop: 5;
--columns-mobile: 3;
}
.list-item:hover {
cursor: default;
}
.tablet {
.shipment-status {
display: block;
text-align: center;
}
Expand Down
6 changes: 1 addition & 5 deletions src/views/CarrierDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<ion-toggle :checked="shipmentMethod.isTrackingRequired" :disabled="!shipmentMethod.isChecked" @ionChange="updateTrackingRequired($event, shipmentMethod)"/>
<ion-note class="config-label">{{ translate("require tracking code") }}</ion-note>
</div>
<div class="tablet">
<div>
<ion-checkbox :checked="shipmentMethod.isChecked" @click="updateProductStoreShipmentMethodAssociation($event, shipmentMethod, productStore)" />
</div>
</div>
Expand Down Expand Up @@ -487,10 +487,6 @@
.list-item:hover {
cursor: default;
}
.tablet {
display: block;
text-align: center;
}
.config-label {
display: block;
text-align: center;
Expand Down
3 changes: 3 additions & 0 deletions src/views/Carriers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<ion-page>
<ion-header :translucent="true">
<ion-toolbar>
<ion-menu-button menu="start" slot="start" />
<ion-title>{{ translate('Carriers') }}</ion-title>
</ion-toolbar>
</ion-header>
Expand Down Expand Up @@ -44,6 +45,7 @@
IonItem,
IonLabel,
IonList,
IonMenuButton,
IonNote,
IonPage,
IonTitle,
Expand All @@ -67,6 +69,7 @@
IonItem,
IonLabel,
IonList,
IonMenuButton,
IonNote,
IonPage,
IonTitle,
Expand Down
10 changes: 8 additions & 2 deletions src/views/RejectionReasons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<ion-page>
<ion-header :translucent="true">
<ion-toolbar>
<ion-menu-button menu="start" slot="start" />
<ion-title @click="saveReasonsOrder()">{{ translate("Rejection reasons") }}</ion-title>
</ion-toolbar>
</ion-header>
Expand All @@ -19,14 +20,16 @@
</ion-label>
</ion-item>

<div class="tablet">
<div class="deskptop-only">
<ion-chip outline @click="openVarianceTypeActionsPopover($event, reason)">
<ion-label>{{ reason.enumTypeId }}</ion-label>
<ion-icon :icon="caretDownOutline" />
</ion-chip>
</div>

<ion-reorder />
<div class="desktop-only">
<ion-reorder />
</div>

<ion-button fill="clear" color="medium" @click="openRejectionReasonActionsPopover($event, reason)">
<ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
Expand Down Expand Up @@ -59,6 +62,7 @@ import {
IonIcon,
IonItem,
IonLabel,
IonMenuButton,
IonPage,
IonReorder,
IonReorderGroup,
Expand Down Expand Up @@ -90,6 +94,7 @@ export default defineComponent({
IonIcon,
IonItem,
IonLabel,
IonMenuButton,
IonPage,
IonReorder,
IonReorderGroup,
Expand Down Expand Up @@ -259,6 +264,7 @@ export default defineComponent({
<style scoped>
.list-item {
--columns-desktop: 4;
--columns-tablet: 2;
}

.list-item:hover {
Expand Down
Loading