+
- Item ID
- Item
+ Item ID
+ Description
Warehouse
P.P.U.
P.P.P.
@@ -40,7 +40,7 @@
-
+
-
-
-
-
-
+
+ {{price.name}}
+
+ {{price.subName}}
+
+
+
Id
Grouping
Packing
- Description
+ Description
Stems
Size
Niche
@@ -50,12 +50,15 @@
{{::item.grouping | dashIfEmpty}}
{{::item.packing | dashIfEmpty}}
-
+
+ {{::item.name}}
+
+ {{::item.subName}}
+
+ item="item"
+ tabindex="-1">
{{::item.stems}}
diff --git a/modules/item/front/index/style.scss b/modules/item/front/index/style.scss
index c3d65349e..b0b94c19d 100644
--- a/modules/item/front/index/style.scss
+++ b/modules/item/front/index/style.scss
@@ -21,9 +21,6 @@ vn-item-product {
vn-label-value:first-of-type section{
margin-top: 9px;
}
- vn-fetched-tags vn-horizontal{
- margin-top: 14px;
- }
}
vn-table {
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html
index 51702e16e..957b59cfe 100644
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@@ -21,7 +21,7 @@
Id
Description
Warehouse
- Shipped
+ Shipped
Quantity
Price
Amount
@@ -42,16 +42,19 @@
{{::row.itemFk | zeroFill:6}}
-
+
+ {{::row.item.name}}
+
+ {{::row.item.subName}}
+
+ tabindex="-1">
- {{::row.warehouse.name}}
- {{::row.shipped | date: 'dd/MM/yyyy'}}
+ {{::row.warehouse.name}}
+ {{::row.shipped | date: 'dd/MM/yyyy'}}
{{::row.quantity}}
{{::row.price | currency: 'EUR':2}}
diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html
index 6a19b12e3..3f20467d5 100644
--- a/modules/order/front/summary/index.html
+++ b/modules/order/front/summary/index.html
@@ -98,12 +98,15 @@
{{::row.itemFk | zeroFill:6}}
-
+
+ {{::row.item.name}}
+
+ {{::row.item.subName}}
+
+ tabindex="-1">
{{::row.quantity}}
diff --git a/modules/order/front/volume/index.html b/modules/order/front/volume/index.html
index f15e4897b..078ac9280 100644
--- a/modules/order/front/volume/index.html
+++ b/modules/order/front/volume/index.html
@@ -24,31 +24,34 @@
- Item
+ Item
Description
- Quantity
- m³ per quantity
+ Quantity
+ m³ per quantity
-
+
{{::row.itemFk}}
-
+
+ {{::row.item.name}}
+
+ {{::row.item.subName}}
+
+ tabindex="-1">
- {{::row.quantity}}
- {{::row.volume | number:3}}
+ {{::row.quantity}}
+ {{::row.volume | number:3}}
diff --git a/modules/route/back/methods/route/specs/updateVolume.spec.js b/modules/route/back/methods/route/specs/updateVolume.spec.js
index 162be92b2..e50a2ba00 100644
--- a/modules/route/back/methods/route/specs/updateVolume.spec.js
+++ b/modules/route/back/methods/route/specs/updateVolume.spec.js
@@ -1,8 +1,7 @@
const app = require('vn-loopback/server/server');
const LoopBackContext = require('loopback-context');
-// #2735 route updateVolume() returns inconsistent values
-xdescribe('route updateVolume()', () => {
+describe('route updateVolume()', () => {
const routeId = 1;
const userId = 50;
const activeCtx = {
@@ -19,7 +18,6 @@ xdescribe('route updateVolume()', () => {
expect(route.m3).toEqual(1.8);
const ticket = await app.models.Ticket.findById(14);
-
await ticket.updateAttributes({routeFk: routeId});
await app.models.Route.updateVolume(ctx, routeId);
@@ -30,7 +28,8 @@ xdescribe('route updateVolume()', () => {
const logs = await app.models.RouteLog.find({fields: ['id', 'newInstance']});
const m3Log = logs.filter(log => {
- return log.newInstance.m3 === updatedRoute.m3;
+ if (log.newInstance)
+ return log.newInstance.m3 === updatedRoute.m3;
});
const logIdToDestroy = m3Log[0].id;
diff --git a/modules/supplier/front/consumption/index.html b/modules/supplier/front/consumption/index.html
index a0df60ea9..9e65fc34f 100644
--- a/modules/supplier/front/consumption/index.html
+++ b/modules/supplier/front/consumption/index.html
@@ -37,7 +37,7 @@
Entry
- {{::entry.id}}
+ {{::entry.id}}
Date
{{::entry.shipped | date: 'dd/MM/yyyy'}}
Reference
@@ -51,10 +51,15 @@
{{::buy.itemName}}
-
+
+
+
+ {{::buy.subName}}
+
+ item="::buy"
+ tabindex="-1">
{{::buy.quantity | dashIfEmpty}}
diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html
index fe0667c49..5bea7bd47 100644
--- a/modules/ticket/front/basic-data/step-two/index.html
+++ b/modules/ticket/front/basic-data/step-two/index.html
@@ -18,11 +18,15 @@
{{("000000"+sale.itemFk).slice(-6)}}
-
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+ tabindex="-1">
{{::sale.quantity}}
diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html
index f47521e4d..ac109c334 100644
--- a/modules/ticket/front/component/index.html
+++ b/modules/ticket/front/component/index.html
@@ -29,12 +29,15 @@
{{sale.itemFk | zeroFill:6}}
-
+ |
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+ tabindex="-1">
|
diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html
index 78ed6dfdc..8c65c1a0a 100644
--- a/modules/ticket/front/sale-checked/index.html
+++ b/modules/ticket/front/sale-checked/index.html
@@ -34,12 +34,15 @@
{{::sale.itemFk | zeroFill:6}}
-
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+ tabindex="-1">
{{::sale.quantity}}
diff --git a/modules/ticket/front/sale-tracking/index.html b/modules/ticket/front/sale-tracking/index.html
index 100021f13..4e80b3565 100644
--- a/modules/ticket/front/sale-tracking/index.html
+++ b/modules/ticket/front/sale-tracking/index.html
@@ -8,7 +8,7 @@
auto-load="true">
-
+
@@ -39,12 +39,15 @@
{{sale.itemFk | zeroFill:6}}
-
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+ tabindex="-1">
{{::sale.quantity}}
diff --git a/modules/ticket/front/sale/index.html b/modules/ticket/front/sale/index.html
index ed3cbc02b..d7dfa802c 100644
--- a/modules/ticket/front/sale/index.html
+++ b/modules/ticket/front/sale/index.html
@@ -58,8 +58,8 @@
- Id
- Quantity
+ Id
+ Quantity
Item
Price
Disc
@@ -97,7 +97,7 @@
zoom-image="{{::$root.imagePath('catalog', '1600x900', sale.itemFk)}}"
on-error-src/>
-
+
{{sale.itemFk}}
@@ -117,7 +117,7 @@
-
+
{{sale.quantity}}
-
+
+ {{sale.concept}}
+
+ {{::sale.subName}}
+
+ tabindex="-1">
diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss
index ea7c65385..a55487978 100644
--- a/modules/ticket/front/sale/style.scss
+++ b/modules/ticket/front/sale/style.scss
@@ -23,6 +23,25 @@ vn-ticket-sale {
margin: 3px;
}
}
+ vn-td-editable[vn-fetched-tags] {
+ & text {
+ max-width: 430px;
+ min-width: 150px;
+ & vn-one {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ font-size: 0.75rem;
+ }
+
+ & vn-one:nth-child(2) h3 {
+ color: $color-font-secondary;
+ text-transform: uppercase;
+ line-height: initial;
+ font-size: 0.75rem
+ }
+ }
+ }
+
vn-dialog.edit {
@extend .edit-popover;
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index dcd4470e4..c29735a1b 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -149,12 +149,15 @@
{{::sale.quantity}}
-
-
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
+ tabindex="-1">
{{::sale.price | currency: 'EUR':2}}
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index 3378b70a1..eb2a07d26 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -42,12 +42,16 @@
{{sale.itemFk | zeroFill:6}}
-
-
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
+ tabindex="-1">
+
{{::sale.quantity}}
{{::sale.saleVolume.volume | number:3}}
|