From f330c77cc6bd3306ae0f08dfa1ee9c1ff3dd1b91 Mon Sep 17 00:00:00 2001 From: Joan Date: Thu, 6 Sep 2018 08:04:43 +0200 Subject: [PATCH] added span to descriptor-popover links #637 --- client/item/src/diary/index.html | 24 +++++++++++++++------- client/order/src/line/index.html | 8 +++++--- client/order/src/volume/index.html | 9 +++++--- client/ticket/src/component/index.html | 10 ++++++--- client/ticket/src/expedition/index.html | 12 ++++++----- client/ticket/src/sale-checked/index.html | 10 +++++---- client/ticket/src/sale-tracking/index.html | 10 +++++---- client/ticket/src/sale/index.html | 9 +++++--- client/ticket/src/summary/index.html | 22 ++++++++++++-------- client/ticket/src/volume/index.html | 10 +++++---- 10 files changed, 79 insertions(+), 45 deletions(-) diff --git a/client/item/src/diary/index.html b/client/item/src/diary/index.html index b077710973..3669026780 100644 --- a/client/item/src/diary/index.html +++ b/client/item/src/diary/index.html @@ -37,17 +37,27 @@ {{::sale.date | date:'dd/MM/yyyy HH:mm' }} - - {{::sale.origin | dashIfEmpty}} + + + {{::sale.origin | dashIfEmpty}} + + {{::sale.stateName | dashIfEmpty}} {{::sale.reference | dashIfEmpty}} - - {{sale.name | dashIfEmpty}} + + + {{sale.name | dashIfEmpty}} + + {{::sale.in | dashIfEmpty}} {{::sale.out | dashIfEmpty}} - {{::sale.balance | dashIfEmpty}} + + + {{::sale.balance | dashIfEmpty}} + + diff --git a/client/order/src/line/index.html b/client/order/src/line/index.html index d195cca781..3657b9c3c9 100644 --- a/client/order/src/line/index.html +++ b/client/order/src/line/index.html @@ -41,9 +41,11 @@ zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{::row.item.image}}" on-error-src/> - - {{("000000"+row.itemFk).slice(-6)}} + + + {{("000000"+row.itemFk).slice(-6)}} + {{row.warehouse.name}} diff --git a/client/order/src/volume/index.html b/client/order/src/volume/index.html index 26738e17e1..73be7062c1 100644 --- a/client/order/src/volume/index.html +++ b/client/order/src/volume/index.html @@ -32,9 +32,12 @@ - - {{::row.itemFk}} + + + {{::row.itemFk}} + {{::row.quantity}} diff --git a/client/ticket/src/component/index.html b/client/ticket/src/component/index.html index 57c7ccee2d..13aef9362c 100644 --- a/client/ticket/src/component/index.html +++ b/client/ticket/src/component/index.html @@ -42,9 +42,13 @@ {{("000000"+sale.itemFk).slice(-6)}} + }}" number> + + {{("000000"+sale.itemFk).slice(-6)}} + + diff --git a/client/ticket/src/expedition/index.html b/client/ticket/src/expedition/index.html index 31a3f581cb..1552c06a0e 100644 --- a/client/ticket/src/expedition/index.html +++ b/client/ticket/src/expedition/index.html @@ -26,17 +26,19 @@ - + delete - - {{("000000"+expedition.itemFk).slice(-6)}} + + + {{("000000"+expedition.itemFk).slice(-6)}} + {{::expedition.item.name}} {{::expedition.box.name}} diff --git a/client/ticket/src/sale-checked/index.html b/client/ticket/src/sale-checked/index.html index ef070d6e17..1dde0152c7 100644 --- a/client/ticket/src/sale-checked/index.html +++ b/client/ticket/src/sale-checked/index.html @@ -27,10 +27,12 @@ disabled="true"> - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/client/ticket/src/sale-tracking/index.html b/client/ticket/src/sale-tracking/index.html index 9a2e26b73d..13ecc543c9 100644 --- a/client/ticket/src/sale-tracking/index.html +++ b/client/ticket/src/sale-tracking/index.html @@ -33,10 +33,12 @@ ng-if="sale.quantity != sale.originalQuantity" vn-tooltip="The quantity do not match"> - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html index 65b533e5ec..b3c756766f 100644 --- a/client/ticket/src/sale/index.html +++ b/client/ticket/src/sale/index.html @@ -84,9 +84,12 @@ zoom-image="//verdnatura.es/vn-image-data/catalog/1600x900/{{::sale.image}}" on-error-src/> - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{sale.quantity}} diff --git a/client/ticket/src/summary/index.html b/client/ticket/src/summary/index.html index 871ad30d07..8d1bbc1cc7 100644 --- a/client/ticket/src/summary/index.html +++ b/client/ticket/src/summary/index.html @@ -67,16 +67,20 @@ - - + + + - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}} diff --git a/client/ticket/src/volume/index.html b/client/ticket/src/volume/index.html index 1869ef0e1a..83da50ce74 100644 --- a/client/ticket/src/volume/index.html +++ b/client/ticket/src/volume/index.html @@ -32,10 +32,12 @@ - - {{("000000"+sale.itemFk).slice(-6)}} + + + {{("000000"+sale.itemFk).slice(-6)}} + {{::sale.quantity}}