verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge pull request 'added isDelivered, isReceived and removed travel descriptor' (#672) from 2955-entry_summary_show_receved_sent into dev
gitea/salix/pipeline/head This commit looks good Details 

Reviewed-on: #672
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
This commit is contained in:
Joan Sanchez 2021-06-23 12:15:13 +00:00
parent adbef4f1cf 029b2f2fdd
commit 0267220e1f
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/entry/back/methods/entry/getEntry.js
View File

@ -38,7 +38,7 @@ module.exports = Self => {
{ {
relation: 'travel', relation: 'travel',
scope: { scope: {
fields: ['id', 'name', 'shipped', 'landed', 'agencyFk', 'warehouseOutFk', 'warehouseInFk'], fields: ['id', 'name', 'shipped', 'landed', 'agencyFk', 'warehouseOutFk', 'warehouseInFk', 'isReceived', 'isDelivered'],
include: [ include: [
{ {
relation: 'agency', relation: 'agency',

21
modules/entry/front/summary/index.html
View File

@ -34,12 +34,8 @@
</vn-label-value> </vn-label-value>
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-label-value label="Agency"> <vn-label-value label="Agency"
<span value="{{$ctrl.entryData.travel.agency.name}}">
ng-click="travelDescriptor.show($event, $ctrl.entry.travel.agencyFk)"
class="link">
{{$ctrl.entryData.travel.agency.name}}
</span>
</vn-label-value> </vn-label-value>
<vn-label-value label="Shipped" <vn-label-value label="Shipped"
value="{{$ctrl.entryData.travel.shipped | date: 'dd/MM/yyyy'}}"> value="{{$ctrl.entryData.travel.shipped | date: 'dd/MM/yyyy'}}">
@ -47,12 +43,22 @@
<vn-label-value label="Warehouse Out" <vn-label-value label="Warehouse Out"
value="{{$ctrl.entryData.travel.warehouseOut.name}}"> value="{{$ctrl.entryData.travel.warehouseOut.name}}">
</vn-label-value> </vn-label-value>
<vn-check
label="Delivered"
ng-model="$ctrl.entryData.travel.isDelivered"
disabled="true">
</vn-check>
<vn-label-value label="Landed" <vn-label-value label="Landed"
value="{{$ctrl.entryData.travel.landed | date: 'dd/MM/yyyy'}}"> value="{{$ctrl.entryData.travel.landed | date: 'dd/MM/yyyy'}}">
</vn-label-value> </vn-label-value>
<vn-label-value label="Warehouse In" <vn-label-value label="Warehouse In"
value="{{$ctrl.entryData.travel.warehouseIn.name}}"> value="{{$ctrl.entryData.travel.warehouseIn.name}}">
</vn-label-value> </vn-label-value>
<vn-check
label="Received"
ng-model="$ctrl.entryData.travel.isReceived"
disabled="true">
</vn-check>
</vn-one> </vn-one>
<vn-one> <vn-one>
<vn-vertical> <vn-vertical>
@ -174,7 +180,4 @@
vn-id="item-descriptor" vn-id="item-descriptor"
warehouse-fk="$ctrl.vnConfig.warehouseFk"> warehouse-fk="$ctrl.vnConfig.warehouseFk">
</vn-item-descriptor-popover> </vn-item-descriptor-popover>
<vn-travel-descriptor-popover
vn-id="travel-descriptor">
</vn-travel-descriptor-popover>