Merge pull request 'fixes #4930 Añadir Zona en la info del cliente, en las reclamaciones' (!1226) from 4930-add-zone into dev
gitea/salix/pipeline/head This commit looks good Details

Reviewed-on: #1226
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Alexandre Riera 2023-01-17 12:01:35 +00:00
commit 5473b2ca2e
4 changed files with 21 additions and 12 deletions

View File

@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [Artículo](Datos Básicos) Añadido campo Unidades/Caja - [Artículo](Datos Básicos) Añadido campo Unidades/Caja
### Changed ### Changed
- [Reclamaciones](Descriptor) Cambiado el campo Agencia por Zona
- [Tickets](Líneas preparadas) Actualizada sección para que sea más visual - [Tickets](Líneas preparadas) Actualizada sección para que sea más visual
### Fixed ### Fixed

View File

@ -80203,3 +80203,4 @@ USE `vncontrol`;
-- Dump completed on 2022-11-21 7:57:28 -- Dump completed on 2022-11-21 7:57:28

View File

@ -19,9 +19,9 @@ class Controller extends ModuleCard {
}, { }, {
relation: 'ticket', relation: 'ticket',
scope: { scope: {
fields: ['agencyModeFk'], fields: ['zoneFk'],
include: { include: {
relation: 'agencyMode' relation: 'zone'
} }
} }
}, { }, {

View File

@ -27,16 +27,16 @@
<slot-body> <slot-body>
<div class="attributes"> <div class="attributes">
<vn-label-value <vn-label-value
label="State" label="State"
value="{{$ctrl.claim.claimState.description}}"> value="{{$ctrl.claim.claimState.description}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Created" label="Created"
value="{{$ctrl.claim.created | date: 'dd/MM/yyyy HH:mm'}}"> value="{{$ctrl.claim.created | date: 'dd/MM/yyyy HH:mm'}}">
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Salesperson"> label="Salesperson">
<span <span
ng-click="workerDescriptor.show($event, $ctrl.claim.client.salesPersonFk)" ng-click="workerDescriptor.show($event, $ctrl.claim.client.salesPersonFk)"
class="link"> class="link">
{{$ctrl.claim.client.salesPersonUser.name}} {{$ctrl.claim.client.salesPersonUser.name}}
@ -44,19 +44,23 @@
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Attended by"> label="Attended by">
<span <span
ng-click="workerDescriptor.show($event, $ctrl.claim.worker.userFk)" ng-click="workerDescriptor.show($event, $ctrl.claim.worker.userFk)"
class="link"> class="link">
{{$ctrl.claim.worker.user.name}} {{$ctrl.claim.worker.user.name}}
</span> </span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Agency" label="Zone">
value="{{$ctrl.claim.ticket.agencyMode.name}}"> <span
ng-click="zoneDescriptor.show($event, $ctrl.claim.ticket.zoneFk)"
class="link">
{{$ctrl.claim.ticket.zoneFk}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value <vn-label-value
label="Ticket"> label="Ticket">
<span <span
ng-click="ticketDescriptor.show($event, $ctrl.claim.ticketFk)" ng-click="ticketDescriptor.show($event, $ctrl.claim.ticketFk)"
class="link"> class="link">
{{$ctrl.claim.ticketFk}} {{$ctrl.claim.ticketFk}}
@ -94,12 +98,15 @@
question="Delete claim" question="Delete claim"
message="Are you sure you want to delete this claim?"> message="Are you sure you want to delete this claim?">
</vn-confirm> </vn-confirm>
<vn-worker-descriptor-popover <vn-worker-descriptor-popover
vn-id="workerDescriptor"> vn-id="workerDescriptor">
</vn-worker-descriptor-popover> </vn-worker-descriptor-popover>
<vn-ticket-descriptor-popover <vn-ticket-descriptor-popover
vn-id="ticketDescriptor"> vn-id="ticketDescriptor">
</vn-ticket-descriptor-popover> </vn-ticket-descriptor-popover>
<vn-popup vn-id="summary"> <vn-popup vn-id="summary">
<vn-claim-summary claim="$ctrl.claim"></vn-claim-summary> <vn-claim-summary claim="$ctrl.claim"></vn-claim-summary>
</vn-popup> </vn-popup>
<vn-zone-descriptor-popover
vn-id="zoneDescriptor">
</vn-zone-descriptor-popover>