diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index 878002e01..c3aaca1b1 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -97,7 +97,6 @@ vn-table { min-width: 0; } &[vn-fetched-tags] { - width: 235px; min-width: 155px; & > vn-one { overflow: hidden; diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html index a93aec4ea..8a71599e1 100644 --- a/modules/client/front/summary/index.html +++ b/modules/client/front/summary/index.html @@ -292,7 +292,7 @@ Id - Client + Nickname Packages Date State @@ -325,7 +325,7 @@ {{::ticket.refFk}} diff --git a/modules/client/front/summary/index.js b/modules/client/front/summary/index.js index 842588475..8a927e205 100644 --- a/modules/client/front/summary/index.js +++ b/modules/client/front/summary/index.js @@ -7,15 +7,23 @@ class Controller extends Summary { super($element, $); this.ticketFilter = { - include: { - relation: 'ticketState', - scope: { - fields: ['stateFk', 'code', 'alertLevel'], - include: { - relation: 'state' + include: [ + { + relation: 'ticketState', + scope: { + fields: ['stateFk', 'code', 'alertLevel'], + include: { + relation: 'state' + } + } + }, + { + relation: 'invoiceOut', + scope: { + fields: ['id'] } } - } + ] }; } diff --git a/modules/monitor/front/index/tickets/index.html b/modules/monitor/front/index/tickets/index.html index cb7b4f235..6f985d0a6 100644 --- a/modules/monitor/front/index/tickets/index.html +++ b/modules/monitor/front/index/tickets/index.html @@ -33,7 +33,7 @@ - + Client Salesperson Date @@ -50,7 +50,7 @@ - + - Available - Id + Available + Id Quantity - Item + Item Price Disc Amount @@ -112,14 +112,14 @@ zoom-image="{{::$root.imagePath('catalog', '1600x900', sale.itemFk)}}" on-error-src/> - + {{::sale.available}} - + {{sale.itemFk}} @@ -149,7 +149,7 @@ - + {{sale.concept}} diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss index a55487978..5e89314d6 100644 --- a/modules/ticket/front/sale/style.scss +++ b/modules/ticket/front/sale/style.scss @@ -30,7 +30,6 @@ vn-ticket-sale { & vn-one { overflow: hidden; text-overflow: ellipsis; - font-size: 0.75rem; } & vn-one:nth-child(2) h3 { @@ -72,7 +71,7 @@ vn-ticket-sale { padding: 0!important; } } - #ticketId { + vn-autocomplete { min-width: 150px } } diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 502476ca2..8dd43eac4 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -126,6 +126,7 @@ Price Discount Amount + Packing @@ -190,6 +191,9 @@ {{::sale.price | currency: 'EUR':2}} {{::sale.discount}} % {{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}} + + {{::sale.item.itemPackingTypeFk | dashIfEmpty}} +