From d29dcf2e11dd7dd8064652a5eed198ac383e7ccd Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Fri, 23 Mar 2018 16:50:11 +0100 Subject: [PATCH] #195 listar lineas de ticket componente fetched-tags --- .../src/components/icon-menu/icon-menu.html | 8 +-- .../ticket/src/fetched-tags/fetched-tags.html | 8 +++ .../ticket/src/fetched-tags/fetched-tags.js | 12 ++++ client/ticket/src/sale/sale.html | 59 ++++++++----------- client/ticket/src/ticket.js | 1 + .../02_edit_item_basic_data.spec.js | 2 +- 6 files changed, 51 insertions(+), 39 deletions(-) create mode 100644 client/ticket/src/fetched-tags/fetched-tags.html create mode 100644 client/ticket/src/fetched-tags/fetched-tags.js diff --git a/client/core/src/components/icon-menu/icon-menu.html b/client/core/src/components/icon-menu/icon-menu.html index c2d5ffeff..b3df12dd1 100644 --- a/client/core/src/components/icon-menu/icon-menu.html +++ b/client/core/src/components/icon-menu/icon-menu.html @@ -9,8 +9,8 @@ show="$ctrl.showDropDown" selected="$ctrl.selected" filter="true" - parent="$ctrl.element" - > + parent="$ctrl.element"> +
+ parent="$ctrl.element"> +
\ No newline at end of file diff --git a/client/ticket/src/fetched-tags/fetched-tags.html b/client/ticket/src/fetched-tags/fetched-tags.html new file mode 100644 index 000000000..334f89c09 --- /dev/null +++ b/client/ticket/src/fetched-tags/fetched-tags.html @@ -0,0 +1,8 @@ + + {{::$ctrl.sale.concept}} + + + {{::fetchedTag.tag.name}} {{::fetchedTag.value}} + + + \ No newline at end of file diff --git a/client/ticket/src/fetched-tags/fetched-tags.js b/client/ticket/src/fetched-tags/fetched-tags.js new file mode 100644 index 000000000..81031d764 --- /dev/null +++ b/client/ticket/src/fetched-tags/fetched-tags.js @@ -0,0 +1,12 @@ +import ngModule from '../module'; + +class Controller {} +Controller.$inject = []; + +ngModule.component('vnFetchedTags', { + template: require('./fetched-tags.html'), + controller: Controller, + bindings: { + sale: '<' + } +}); diff --git a/client/ticket/src/sale/sale.html b/client/ticket/src/sale/sale.html index 5fcee01e4..5b9374686 100644 --- a/client/ticket/src/sale/sale.html +++ b/client/ticket/src/sale/sale.html @@ -1,39 +1,30 @@ - - Sale - - - - - - - - - - - - - - - - - - - - - -
ItemDescriptionQuantityPriceDiscountAmount
{{::sale.itemFk}} - - {{::sale.concept}} - - - {{::fetchedTag.tag.name}} {{::fetchedTag.value}} - - - - {{::sale.quantity}}{{::sale.price | currency:'€':2}}{{::sale.discount}} %{{::sale.quantity * sale.price | currency:'€':2}}
-
+ + Sale + + + + + + + + + + + + + + + + + + + + + +
ItemDescriptionQuantityPriceDiscountAmount
{{::sale.itemFk}}{{::sale.quantity}}{{::sale.price | currency:'€':2}}{{::sale.discount}} %{{::sale.quantity * sale.price | currency:'€':2}}
+
diff --git a/client/ticket/src/ticket.js b/client/ticket/src/ticket.js index 78593d6f6..132502666 100644 --- a/client/ticket/src/ticket.js +++ b/client/ticket/src/ticket.js @@ -11,3 +11,4 @@ import './volume/ticket-volume'; import './package/package'; import './sale/sale'; import './tracking/tracking'; +import './fetched-tags/fetched-tags'; diff --git a/e2e/paths/item-module/02_edit_item_basic_data.spec.js b/e2e/paths/item-module/02_edit_item_basic_data.spec.js index 0947bc167..6deee3bff 100644 --- a/e2e/paths/item-module/02_edit_item_basic_data.spec.js +++ b/e2e/paths/item-module/02_edit_item_basic_data.spec.js @@ -1,7 +1,7 @@ import selectors from '../../helpers/selectors.js'; import createNightmare from '../../helpers/helpers'; -fdescribe('edit item basic data path', () => { +describe('edit item basic data path', () => { const nightmare = createNightmare(); beforeAll(() => {