verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 92 Releases Wiki Activity

PR-CUSTOMER #186

Merged
jsegarra merged 105 commits from :PR-CUSTOMER into dev 2024-04-19 15:55:53 +00:00
Conversation 0 Commits 105 Files Changed 77 +148 -53
8 changed files with 148 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3bcd4984f5 - Show all commits

4
src/css/app.scss
View File

@ -66,6 +66,10 @@ body.body--dark {
border-radius: 8px;
}
.card-width {
width: 800px;
}
.vn-card-list {
width: 100%;
max-width: 60em;

2
src/pages/Customer/Card/CustomerCreditContracts.vue
View File

@ -129,7 +129,7 @@ const updateData = () => {
<QSeparator class="q-mx-lg" vertical />
<div class="flex">
<div class="flex items-center">
<div class="flex items-center" v-if="item?.insurances.length">
<div class="flex q-mr-xl">
<div class="q-mr-sm color-vn-label">
{{ t('Credit') }}:

94
src/pages/Customer/Card/CustomerCreditOpinion.vue
View File

@ -1,17 +1,22 @@
<script setup>
import { reactive, ref } from 'vue';
import { computed, reactive, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRoute } from 'vue-router';
import { QBtn } from 'quasar';
import { toCurrency, toDateHourMin } from 'src/filters';
import FetchData from 'components/FetchData.vue';
import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue';
import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
const { t } = useI18n();
const route = useRoute();
const informationOptions = ref([]);
const rows = ref([]);
const filter = {
include: [
@ -32,12 +37,64 @@ const initialData = reactive({
rating: null,
recommendedCredit: null,
});
const tableColumnComponents = {
since: {
component: 'span',
props: () => {},
event: () => {},
},
employee: {
component: QBtn,
props: () => ({ flat: true, color: 'blue' }),
event: () => {},
},
rating: {
component: 'span',
props: () => {},
event: () => {},
},
recommendedCredit: {
component: 'span',
props: () => {},
event: () => {},
jgallego commented 2024-02-21 07:57:53 +00:00
Outdated
Review
Copy Link

no inserta, en salix añado una clasificacion ej: 234 sin credito recomendado, lo inserta y lo muestra bajo,
en lilium da un error y no lo muestra, aun teniendo datos en la tabla insertados via salix no son mostrados en lilium

no inserta, en salix añado una clasificacion ej: 234 sin credito recomendado, lo inserta y lo muestra bajo, en lilium da un error y no lo muestra, aun teniendo datos en la tabla insertados via salix no son mostrados en lilium
cfonseca commented 2024-02-23 11:59:32 +00:00
Outdated
Review
Copy Link

Hice la prueba y me muestra este error: message: "La razón social debe ir en mayúscula", fui a la pantalla de Datos fiscales y modifique el campo de Razón social y Dirección fiscal y ya con estos cambios se pudo guardar el valor de Clasificación en la pantalla de Opinión de crédito sin problemas, por favor revisar, quedo pendiente

Hice la prueba y me muestra este error: **message: "La razón social debe ir en mayúscula"**, fui a la pantalla de **Datos fiscales** y modifique el campo de **Razón social** y **Dirección fiscal** y ya con estos cambios se pudo guardar el valor de **Clasificación** en la pantalla de **Opinión de crédito** sin problemas, por favor revisar, quedo pendiente
jsegarra commented 2024-02-26 12:59:00 +00:00
Outdated
Review
Copy Link

@cfonseca Esto es lo que vimos en la daily antes de Luciano no? Puedes confirmar? Gracias

@cfonseca Esto es lo que vimos en la daily antes de Luciano no? Puedes confirmar? Gracias
},
};
const columns = computed(() => [
{
align: 'left',
field: 'created',
format: (value) => toDateHourMin(value),
label: t('Since'),
name: 'since',
},
{
align: 'left',
field: (row) => row.worker.user.nickname,
label: t('Employee'),
name: 'employee',
},
{
align: 'left',
field: 'rating',
label: t('Rating'),
name: 'rating',
},
{
align: 'left',
field: 'recommendedCredit',
format: (value) => toCurrency(value),
label: t('Recommended credit'),
name: 'recommendedCredit',
},
]);
</script>
<template>
<FetchData
:filter="filter"
@on-fetch="(data) => (informationOptions = data)"
@on-fetch="(data) => (rows = data)"
auto-load
url="ClientInformas"
/>
@ -68,10 +125,41 @@ const initialData = reactive({
</VnRow>
</template>
</FormModel>
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 0 }"
:rows="rows"
hide-bottom
row-key="id"
v-model:selected="selected"
class="q-pa-lg"
>
<template #body-cell="props">
<QTd :props="props">
<QTr :props="props" class="cursor-pointer">
<component
:is="tableColumnComponents[props.col.name].component"
class="col-content"
v-bind="tableColumnComponents[props.col.name].props(props)"
@click="tableColumnComponents[props.col.name].event(props)"
>
{{ props.value }}
<WorkerDescriptorProxy
:id="props.row.workerFk"
v-if="props.col.name === 'employee'"
/>
</component>
</QTr>
</QTd>
</template>
</QTable>
</template>
<i18n>
es:
Rating: Clasificación
Recommended credit: Crédito recomendado
Since: Desde
Employee: Empleado
</i18n>

2
src/pages/Customer/Card/CustomerFiscalData.vue
View File

@ -83,7 +83,7 @@ function handleLocation(data, location) {
:label="t('Sage transaction type')"
:options="typesTransactions"
hide-selected
option-label="vat"
option-label="transaction"
option-value="id"
v-model="data.sageTransactionTypeFk"
>

5
src/pages/Customer/Card/CustomerSummary.vue
View File

@ -287,3 +287,8 @@ const creditWarning = computed(() => {
</template>
</CardSummary>
</template>
<i18n>
es:
Latest tickets: Últimos tickets
</i18n>

75
src/pages/Customer/Card/CustomerWebAccess.vue
View File

@ -135,42 +135,47 @@ const onSubmit = async () => {
</QBtnGroup>
</Teleport>
<QCard class="q-pa-lg">
<QCardSection>
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QCheckbox :label="t('Enable web access')" v-model="active" />
</div>
</VnRow>
<div class="full-width flex justify-center">
<QCard class="card-width q-pa-lg">
<QCardSection>
<QForm>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<QCheckbox :label="t('Enable web access')" v-model="active" />
</div>
</VnRow>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput :label="t('User')" clearable v-model="name" />
</div>
<div class="col">
<VnInput
:label="t('Recovery email')"
:rules="validate('client.email')"
clearable
type="email"
v-model="email"
>
<template #append>
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{
t(
'This email is used for user to regain access their account'
)
}}</QTooltip>
</QIcon>
</template>
</VnInput>
</div>
</VnRow>
</QForm>
</QCardSection>
</QCard>
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput :label="t('User')" clearable v-model="name" />
</div>
</VnRow>
jgallego commented 2024-02-21 07:38:38 +00:00
Outdated
Review
Copy Link

ubicar el mail bajo del usuario como en salix, solo hay 3 campos la lectura es mas facil

ubicar el mail bajo del usuario como en salix, solo hay 3 campos la lectura es mas facil
cfonseca commented 2024-02-22 10:16:29 +00:00
Outdated
Review
Copy Link

Corregido: 3bcd4984f5

Corregido: 3bcd4984f5
jsegarra commented 2024-02-26 12:52:14 +00:00
Outdated
Review
Copy Link

Lo veo OK

Lo veo OK
<VnRow class="row q-gutter-md q-mb-md">
<div class="col">
<VnInput
:label="t('Recovery email')"
:rules="validate('client.email')"
clearable
type="email"
v-model="email"
>
<template #append>
<QIcon name="info" class="cursor-pointer">
<QTooltip>{{
t(
'This email is used for user to regain access their account'
)
}}</QTooltip>
</QIcon>
</template>
</VnInput>
</div>
</VnRow>
</QForm>
</QCardSection>
</QCard>
</div>
</template>
<i18n>

6
src/pages/Customer/components/CustomerCreditContractsInsurance.vue
View File

@ -69,7 +69,7 @@ const columns = computed(() => [
url="CreditInsurances"
/>
<QPage class="column items-center q-pa-md">
<QPage class="column items-center q-pa-md" v-if="rows.length">
<QTable
:columns="columns"
:pagination="{ rowsPerPage: 12 }"
@ -93,6 +93,10 @@ const columns = computed(() => [
</template>
</QTable>
</QPage>
<h5 class="flex justify-center color-vn-label" v-else>
{{ t('globals.noResults') }}
</h5>
</template>
<i18n>

13
src/router/modules/customer.js
View File

@ -366,17 +366,6 @@ export default {
],
},
children: [
{
path: 'credit-contracts',
name: 'CustomerCreditContracts',
meta: {
title: 'creditContracts',
},
component: () =>
import(
'src/pages/Customer/Card/CustomerCreditContracts.vue'
),
},
{
path: 'credit-contracts',
name: 'CreditContractsCard',
@ -439,7 +428,7 @@ export default {
{
name: 'CustomerConsumption',
title: 'consumption',
icon: 'vn:lines',
icon: 'show_chart',
},
{
jgallego commented 2024-02-21 07:59:44 +00:00
Outdated
Review
Copy Link

en salix al abrir este menu el scroll baja para poder ver directamente las opciones desplegadas, copiar funcionamiento.

en salix al abrir este menu el scroll baja para poder ver directamente las opciones desplegadas, copiar funcionamiento.
cfonseca commented 2024-02-27 16:43:37 +00:00
Outdated
Review
Copy Link

Corregido: c767bcde7d

Corregido: c767bcde7d
name: 'CustomerMandates',