diff --git a/quasar.config.js b/quasar.config.js
index d04c43cf8..828633cf6 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -86,7 +86,6 @@ module.exports = configure(function (ctx) {
type: 'http',
},
port: 8080,
- open: true, // opens browser window automatically
proxy: {
'/api': {
target: 'http://0.0.0.0:3000',
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index d352d7f78..e5c5676f7 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -17,7 +17,7 @@ function onToggleDrawer() {
-
+
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
new file mode 100644
index 000000000..34575cfb4
--- /dev/null
+++ b/src/components/ui/CardDescriptor.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+ {{ $props.description }}
+ {{ $props.description }}
+
+
+ #{{ data.id }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/composables/__tests__/useModule.spec.js b/src/composables/__tests__/useNavigation.spec.js
similarity index 94%
rename from src/composables/__tests__/useModule.spec.js
rename to src/composables/__tests__/useNavigation.spec.js
index d706612cd..e633d46c4 100644
--- a/src/composables/__tests__/useModule.spec.js
+++ b/src/composables/__tests__/useNavigation.spec.js
@@ -32,7 +32,8 @@ describe('useNavigation', () => {
name: 'CustomerCreate',
title: 'createCustomer',
icon: 'vn:addperson',
- stateName: 'CustomerCreate'
+ stateName: 'CustomerCreate',
+ roles: ['developer']
}];
const secondMenuItem = navigation.modules.value[1]
diff --git a/src/css/app.scss b/src/css/app.scss
index 81037be75..3b40d40a2 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -1,2 +1,11 @@
// app global css in SCSS form
@import './icons.scss';
+
+.link {
+ color: $primary;
+ cursor: pointer
+}
+
+.link:hover {
+ color: $orange-4;
+}
\ No newline at end of file
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 0b2cb4451..857df8d89 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -257,12 +257,13 @@ export default {
smartCard: {
noData: 'No data to display',
openCard: 'View card',
- openSummary: 'Open summary'
+ openSummary: 'Open summary',
+ viewDescription: 'View description'
},
- card: {
+ cardDescriptor: {
mainList: 'Main list',
summary: 'Summary',
- moreOptions: 'More options',
+ moreOptions: 'More options'
}
},
};
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3c240c138..57ed01b0d 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -256,9 +256,10 @@ export default {
smartCard: {
noData: 'Sin datos que mostrar',
openCard: 'Ver ficha',
- openSummary: 'Abrir detalles'
+ openSummary: 'Abrir detalles',
+ viewDescription: 'Ver descripción'
},
- card: {
+ cardDescriptor: {
mainList: 'Listado principal',
summary: 'Resumen',
moreOptions: 'Más opciones',
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 29b3b4ee7..d85469571 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,151 +1,16 @@
-
-
-
-
-
-
- {{ claim.client.name }}
- {{ claim.client.name }}
-
-
-
- {{ t('claim.card.claimId') }}
- #{{ claim.id }}
-
-
- {{ t('claim.card.created') }}
- {{ toDate(claim.created) }}
-
-
-
-
- {{ t('claim.card.assignedTo') }}
- {{ claim.worker.user.name }}
-
-
- {{ t('claim.card.state') }}
-
-
- {{ claim.claimState.description }}
-
-
-
-
-
-
- {{ t('claim.card.ticketId') }}
- {{ claim.ticketFk }}
-
-
-
-
-
- {{ t('claim.card.customerSummary') }}
-
-
- {{ t('claim.card.claimedTicket') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
new file mode 100644
index 000000000..2200c8c23
--- /dev/null
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -0,0 +1,114 @@
+
+
+
+
+
+
+
+
+ {{ t('claim.card.created') }}
+ {{ toDate(claim.created) }}
+
+
+ {{ t('claim.card.state') }}
+
+
+ {{ claim.claimState.description }}
+
+
+
+
+
+
+ {{ t('claim.card.ticketId') }}
+
+ {{ claim.ticketFk }}
+
+
+
+
+
+
+ {{ t('claim.card.assignedTo') }}
+ {{ claim.worker.user.name }}
+
+
+
+
+
+
+ {{ t('claim.card.customerSummary') }}
+
+
+ {{ t('claim.card.claimedTicket') }}
+
+
+
+
+
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 2f9f28e49..b02137f22 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -12,13 +12,13 @@ const route = useRoute();
const { t } = useI18n();
const $props = defineProps({
- claimId: {
+ id: {
type: Number,
default: 0,
},
});
-const entityId = computed(() => $props.claimId || route.params.id);
+const entityId = computed(() => $props.id || route.params.id);
const claim = ref(null);
const salesClaimed = ref(null);
diff --git a/src/pages/Claim/Card/ClaimSummaryDialog.vue b/src/pages/Claim/Card/ClaimSummaryDialog.vue
new file mode 100644
index 000000000..e0b4d22c1
--- /dev/null
+++ b/src/pages/Claim/Card/ClaimSummaryDialog.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 57ea94137..93c656d38 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -1,12 +1,14 @@
@@ -55,7 +55,12 @@ function showPreview(id) {
- {{ row.name }}
+
+ {{ row.client.name }}
+
+
+
+
#{{ row.id }}
@@ -109,16 +114,19 @@ function showPreview(id) {
{{ t('components.smartCard.openCard') }}
-
+
{{ t('components.smartCard.openSummary') }}
+
+ {{ t('components.smartCard.viewDescription') }}
+
+
+
+
-
-
-
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index f1e05bcb4..e78602aae 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,152 +1,16 @@
-
-
-
-
-
-
- {{ customer.name }}
- {{ customer.name }}
-
-
-
- {{ t('customer.card.customerId') }}
- #{{ customer.id }}
-
-
- {{ t('customer.card.salesPerson') }}
- {{ customer.salesPersonUser.name }}
-
-
-
-
- {{ t('customer.card.credit') }}
- {{ toCurrency(customer.credit) }}
-
-
- {{ t('customer.card.securedCredit') }}
- {{ toCurrency(customer.creditInsurance) }}
-
-
-
-
- {{ t('customer.card.payMethod') }}
- {{ customer.payMethod.name }}
-
-
- {{ t('customer.card.debt') }}
- {{ toCurrency(customer.debt) }}
-
-
-
-
-
- {{ t('customer.card.isDisabled') }}
-
-
- {{ t('customer.card.isFrozen') }}
-
-
- {{ t('customer.card.hasDebt') }}
-
-
- {{ t('customer.card.notChecked') }}
-
-
- {{ t('customer.card.noWebAccess') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
@@ -179,26 +43,3 @@ async function fetch() {
-
-
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
new file mode 100644
index 000000000..62804d43a
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
+
+
+
+ {{ t('customer.card.salesPerson') }}
+ {{ customer.salesPersonUser.name }}
+
+
+
+
+ {{ t('customer.card.credit') }}
+ {{ toCurrency(customer.credit) }}
+
+
+ {{ t('customer.card.securedCredit') }}
+ {{ toCurrency(customer.creditInsurance) }}
+
+
+
+
+ {{ t('customer.card.payMethod') }}
+ {{ customer.payMethod.name }}
+
+
+ {{ t('customer.card.debt') }}
+ {{ toCurrency(customer.debt) }}
+
+
+
+
+
+ {{ t('customer.card.isDisabled') }}
+
+
+ {{ t('customer.card.isFrozen') }}
+
+
+ {{ t('customer.card.hasDebt') }}
+
+
+ {{ t('customer.card.notChecked') }}
+
+
+ {{ t('customer.card.noWebAccess') }}
+
+
+
+
+
+
diff --git a/src/pages/Customer/Card/CustomerDescriptorPopover.vue b/src/pages/Customer/Card/CustomerDescriptorPopover.vue
new file mode 100644
index 000000000..78d1c5801
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerDescriptorPopover.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index dd06bd52d..7151b291e 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -12,13 +12,13 @@ const route = useRoute();
const { t } = useI18n();
const $props = defineProps({
- customerId: {
+ id: {
type: Number,
default: 0,
},
});
-const entityId = computed(() => $props.customerId || route.params.id);
+const entityId = computed(() => $props.id || route.params.id);
const customer = ref(null);
function fetch() {
diff --git a/src/pages/Customer/Card/CustomerSummaryDialog.vue b/src/pages/Customer/Card/CustomerSummaryDialog.vue
new file mode 100644
index 000000000..84ecaf084
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerSummaryDialog.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 1cba2f7b0..342eda587 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -1,26 +1,25 @@
@@ -73,7 +72,7 @@ function showPreview(id) {
{{ t('components.smartCard.openCard') }}
-
+
{{ t('components.smartCard.openSummary') }}
-
-
-
-
-
-
- {{ ticket.nickname }}
- {{ ticket.nickname }}
-
-
-
- {{ t('ticket.card.ticketId') }}
- #{{ ticket.id }}
-
-
- {{ t('ticket.card.state') }}
-
- {{ ticket.ticketState.state.name }}
-
-
-
-
-
- {{ t('ticket.card.customerId') }}
- {{ ticket.clientFk }}
-
-
- {{ t('ticket.card.salesPerson') }}
- {{ ticket.client.salesPersonUser.name }}
-
-
-
-
- {{ t('ticket.card.agency') }}
- {{ ticket.agencyMode.name }}
-
-
- {{ t('ticket.card.shipped') }}
- {{ toDate(ticket.shipped) }}
-
-
-
-
- {{ t('ticket.card.warehouse') }}
- {{ ticket.warehouse.name }}
-
-
-
-
-
-
- {{ t('ticket.card.customerCard') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
new file mode 100644
index 000000000..ce875d1cd
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+ {{ t('ticket.card.ticketId') }}
+ #{{ ticket.id }}
+
+
+ {{ t('ticket.card.state') }}
+
+ {{ ticket.ticketState.state.name }}
+
+
+
+
+
+ {{ t('ticket.card.customerId') }}
+
+ {{ ticket.clientFk }}
+
+
+
+
+
+
+ {{ t('ticket.card.salesPerson') }}
+ {{ ticket.client.salesPersonUser.name }}
+
+
+
+
+ {{ t('ticket.card.warehouse') }}
+ {{ ticket.warehouse.name }}
+
+
+ {{ t('ticket.card.shipped') }}
+ {{ toDate(ticket.shipped) }}
+
+
+
+
+ {{ t('ticket.card.agency') }}
+ {{ ticket.agencyMode.name }}
+
+
+
+
+
+
+ {{ t('ticket.card.customerCard') }}
+
+
+
+
+
diff --git a/src/pages/Ticket/Card/TicketDescriptorPopover.vue b/src/pages/Ticket/Card/TicketDescriptorPopover.vue
new file mode 100644
index 000000000..891ffb3a8
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketDescriptorPopover.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+