From b58219b85691b5b2f14e7d6a6648e5cf87a2c874 Mon Sep 17 00:00:00 2001 From: gerard Date: Thu, 19 Jul 2018 10:44:57 +0200 Subject: [PATCH] Bug #419 Refactorizar vn-fetched-tags para que sea independiente de sale --- client/ticket/src/component/index.html | 2 +- client/ticket/src/data/step-two/index.html | 2 +- client/ticket/src/fetched-tags/index.html | 4 ++-- client/ticket/src/fetched-tags/index.js | 3 ++- client/ticket/src/sale-checked/index.html | 2 +- client/ticket/src/sale-tracking/index.html | 2 +- client/ticket/src/sale/index.html | 4 ++-- client/ticket/src/summary/index.html | 2 +- client/ticket/src/volume/index.html | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/client/ticket/src/component/index.html b/client/ticket/src/component/index.html index 67af10bd9..f524355f9 100644 --- a/client/ticket/src/component/index.html +++ b/client/ticket/src/component/index.html @@ -40,7 +40,7 @@ ng-click="$ctrl.showDescriptor($event, sale.itemFk)">{{::sale.itemFk}} + }}"> {{::sale.quantity}} diff --git a/client/ticket/src/data/step-two/index.html b/client/ticket/src/data/step-two/index.html index bbe5a56a9..2da46cbc8 100644 --- a/client/ticket/src/data/step-two/index.html +++ b/client/ticket/src/data/step-two/index.html @@ -16,7 +16,7 @@ {{("000000"+sale.itemFk).slice(-6)}} - + {{::sale.quantity}} {{::sale.price | currency: '€': 2}} {{::sale.component.newPrice | currency: '€': 2}} diff --git a/client/ticket/src/fetched-tags/index.html b/client/ticket/src/fetched-tags/index.html index 7b6515d7c..6ee471ab8 100644 --- a/client/ticket/src/fetched-tags/index.html +++ b/client/ticket/src/fetched-tags/index.html @@ -1,9 +1,9 @@ - {{::$ctrl.sale.concept}} + {{::$ctrl.concept}}
{{::fetchedTag.value}}
diff --git a/client/ticket/src/fetched-tags/index.js b/client/ticket/src/fetched-tags/index.js index 7e9455060..3b2b43866 100644 --- a/client/ticket/src/fetched-tags/index.js +++ b/client/ticket/src/fetched-tags/index.js @@ -4,6 +4,7 @@ import './style.scss'; ngModule.component('vnFetchedTags', { template: require('./index.html'), bindings: { - sale: '<' + concept: '<', + tags: '<' } }); diff --git a/client/ticket/src/sale-checked/index.html b/client/ticket/src/sale-checked/index.html index f43232e1b..6a9aa9517 100644 --- a/client/ticket/src/sale-checked/index.html +++ b/client/ticket/src/sale-checked/index.html @@ -31,7 +31,7 @@ ng-click="$ctrl.showDescriptor($event, sale.itemFk)"> {{::sale.itemFk}} - + {{::sale.quantity}} diff --git a/client/ticket/src/sale-tracking/index.html b/client/ticket/src/sale-tracking/index.html index 04e14f350..51aa81be8 100644 --- a/client/ticket/src/sale-tracking/index.html +++ b/client/ticket/src/sale-tracking/index.html @@ -36,7 +36,7 @@ {{::sale.itemFk}} - + {{::sale.quantity}} {{::sale.originalQuantity}} - Item + Item Id Description Quantity @@ -91,7 +91,7 @@ pointer number> {{::sale.itemFk}} - + {{sale.quantity}} {{("000000"+sale.itemFk).slice(-6)}} - + {{::sale.quantity}} {{::sale.price | currency:'€':2}} {{::sale.discount}} % diff --git a/client/ticket/src/volume/index.html b/client/ticket/src/volume/index.html index adb5db2c1..4d5b25550 100644 --- a/client/ticket/src/volume/index.html +++ b/client/ticket/src/volume/index.html @@ -34,7 +34,7 @@ ng-click="$ctrl.showDescriptor($event, sale.itemFk)"> {{::sale.itemFk}} - + {{::sale.quantity}} {{::sale.volume.m3 | number:3}}