verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 66 Releases Wiki Activity

Merge pull request 'feat(route_ticket): add column province and change order other columns' (#808) from 3387-route_ticket into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #808
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
Carlos Jimenez Ruiz 2021-11-29 09:49:42 +00:00
parent a19ce34aae f93da5f60d
commit a82053854a
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/route/back/methods/route/getSuggestedTickets.js
View File

@ -55,7 +55,13 @@ module.exports = Self => {
{ {
relation: 'address', relation: 'address',
scope: { scope: {
fields: ['id', 'street', 'postalCode', 'city'], fields: ['street', 'city', 'provinceFk', 'phone', 'nickname', 'postalCode'],
include: {
relation: 'province',
scope: {
fields: ['name']
}
}
} }
}, },
] ]

16
modules/route/front/tickets/index.html
View File

@ -142,10 +142,15 @@
</vn-th> </vn-th>
<vn-th number>Ticket</vn-th> <vn-th number>Ticket</vn-th>
<vn-th>Client</vn-th> <vn-th>Client</vn-th>
<vn-th number shrink>Packages</vn-th> <vn-th shrink>Province</vn-th>
<vn-th shrink>Warehouse</vn-th> <vn-th shrink>
<vn-th expand>Postcode</vn-th> <span translate>
Population
</span>
</vn-th>
<vn-th expand>PC</vn-th>
<vn-th>Address</vn-th> <vn-th>Address</vn-th>
<vn-th shrink>Warehouse</vn-th>
</vn-tr> </vn-tr>
</vn-thead> </vn-thead>
<vn-tbody> <vn-tbody>
@ -165,10 +170,11 @@
{{::ticket.nickname}} {{::ticket.nickname}}
</span> </span>
</vn-td> </vn-td>
<vn-td number shrink>{{::ticket.packages}}</vn-td> <vn-td shrink>{{::ticket.address.province.name}}</vn-td>
<vn-td expand>{{::ticket.warehouse.name}}</vn-td> <vn-td shrink>{{::ticket.address.city}}</vn-td>
<vn-td number shrink>{{::ticket.address.postalCode}}</vn-td> <vn-td number shrink>{{::ticket.address.postalCode}}</vn-td>
<vn-td expand title="{{::ticket.address.street}}">{{::ticket.address.street}}</vn-td> <vn-td expand title="{{::ticket.address.street}}">{{::ticket.address.street}}</vn-td>
<vn-td expand>{{::ticket.warehouse.name}}</vn-td>
</vn-tr> </vn-tr>
</vn-tbody> </vn-tbody>
</vn-table> </vn-table>

3
modules/route/front/tickets/locale/es.yml
View File

@ -10,4 +10,5 @@ Ticket not found: No se ha encontrado el ticket
The selected ticket is not suitable for this route: El ticket seleccionado no es apto para esta ruta The selected ticket is not suitable for this route: El ticket seleccionado no es apto para esta ruta
PC: CP PC: CP
The route's vehicle doesn't have a departing warehouse: El vehículo de la ruta no tiene un almacén de salida The route's vehicle doesn't have a departing warehouse: El vehículo de la ruta no tiene un almacén de salida
The route doesn't have a vehicle: La ruta no tiene un vehículo The route doesn't have a vehicle: La ruta no tiene un vehículo
Population: Población