From dd22309e7c685864a60602b02017771a2e2f4eb0 Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 2 Aug 2018 15:31:01 +0200
Subject: [PATCH 1/6] Bug #576 Cambiar los bindings del textfield

---
 .../src/components/textfield/textfield.js     | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/client/core/src/components/textfield/textfield.js b/client/core/src/components/textfield/textfield.js
index 81385268a..bee5f1d08 100644
--- a/client/core/src/components/textfield/textfield.js
+++ b/client/core/src/components/textfield/textfield.js
@@ -22,34 +22,18 @@ export default class Textfield extends Input {
                 this.rightIcons = tClone[0];
             }, null, 'rightIcons');
         }
+
         this.input.addEventListener('keyup', e => {
             if (e.key == "Escape") {
-                this._cancel();
+                this.input.blur();
             }
         });
-        this.input.addEventListener('focus', () => this.saveOldValue());
-        this.input.addEventListener('keyup', e => {
-            if (e.key == "Enter") {
-                this._accept();
+        this.input.addEventListener('change', e => {
+            if (this.onChange) {
+                this.onChange();
             }
         });
     }
-    _accept() {
-        if (this.accept) {
-            this.input.blur();
-            this.accept();
-        }
-    }
-    _cancel() {
-        this.input.blur();
-        this.input.value = this.oldValue;
-        this.value = this.input.value;
-        this.$.$apply();
-
-        if (this.cancel) {
-            this.cancel();
-        }
-    }
     saveOldValue() {
         this.oldValue = this.input.value;
     }
@@ -111,8 +95,7 @@ ngModule.component('vnTextfield', {
         rule: '@?',
         type: '@?',
         vnTabIndex: '@?',
-        accept: '&',
-        cancel: '&',
-        unclearable: '<?'
+        unclearable: '<?',
+        onChange: '&'
     }
 });

From 84462be55a9618b36079c696147606a4c47b774f Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 2 Aug 2018 15:33:24 +0200
Subject: [PATCH 2/6] revert Bug #575 ng-click se llama en los vn-button
 deshabilitados

---
 client/core/src/components/button/button.html |  2 +-
 client/core/src/components/button/button.js   |  3 +--
 client/ticket/src/sale/index.html             | 13 +++++++++----
 client/ticket/src/sale/index.js               | 16 +++++++++-------
 client/ticket/src/sale/locale/es.yml          |  1 -
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/client/core/src/components/button/button.html b/client/core/src/components/button/button.html
index 27800f1a7..4770714ae 100644
--- a/client/core/src/components/button/button.html
+++ b/client/core/src/components/button/button.html
@@ -1,4 +1,4 @@
-<button type="{{::$ctrl.type}}" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored" ng-click="$ctrl.onClick()">
+<button type="{{::$ctrl.type}}" class="mdl-button mdl-js-button mdl-button--raised mdl-button--colored">
     <span translate>{{$ctrl.label}}</span>
     <vn-icon 
         icon="{{::$ctrl.icon}}"
diff --git a/client/core/src/components/button/button.js b/client/core/src/components/button/button.js
index 1bbf01bd5..9b8495f51 100644
--- a/client/core/src/components/button/button.js
+++ b/client/core/src/components/button/button.js
@@ -16,8 +16,7 @@ ngModule.component('vnButton', {
     bindings: {
         label: '@?',
         disabled: '<?',
-        icon: '@?',
-        onClick: '&'
+        icon: '@?'
     }
 });
 
diff --git a/client/ticket/src/sale/index.html b/client/ticket/src/sale/index.html
index 5fcc79b20..8354443bb 100644
--- a/client/ticket/src/sale/index.html
+++ b/client/ticket/src/sale/index.html
@@ -5,6 +5,11 @@
     data="sales" on-data-change="$ctrl.onDataChange()">
 </vn-crud-model>
 
+<vn-watcher
+    vn-id="watcher"
+    data="sales">
+</vn-watcher>
+
 <vn-vertical>
     <vn-card pad-large>
         <vn-vertical>
@@ -13,7 +18,7 @@
                 <vn-button 
                     disabled="!$ctrl.isEditable" 
                     label="Ok" 
-                    on-click="$ctrl.onStateOkClick()">
+                    ng-click="$ctrl.onStateOkClick()">
                 </vn-button>
                 <vn-icon-menu 
                     disabled="!$ctrl.isEditable"
@@ -32,14 +37,14 @@
                 </vn-icon-menu>
                 <vn-button 
                     disabled="!$ctrl.isChecked || !$ctrl.isEditable"
-                    on-click="$ctrl.showRemoveLinesDialog()" 
+                    ng-click="$ctrl.showRemoveLinesDialog()" 
                     vn-tooltip="Remove lines" 
                     tooltip-position="up"
                     icon="delete">
                 </vn-button>
                 <vn-button 
                     disabled="!$ctrl.isChecked || !$ctrl.isEditable"
-                    on-click="$ctrl.showTransferPopover($event);" 
+                    ng-click="$ctrl.showTransferPopover($event);" 
                     vn-tooltip="Transfer lines" 
                     tooltip-position="right"
                     icon="call_split">
@@ -96,7 +101,7 @@
                         <vn-td ng-if="$ctrl.isEditable" number>
                             <vn-textfield
                                 model="sale.quantity"
-                                accept="$ctrl.updateQuantity(sale.id, sale.quantity)"
+                                on-change="$ctrl.updateQuantity(sale.id, sale.quantity)"
                                 type="text">
                             </vn-textfield>
                         </vn-td>
diff --git a/client/ticket/src/sale/index.js b/client/ticket/src/sale/index.js
index 67ba0b934..1c95188fd 100644
--- a/client/ticket/src/sale/index.js
+++ b/client/ticket/src/sale/index.js
@@ -5,7 +5,7 @@ class Controller {
     constructor($scope, $state, $http, vnApp, $translate) {
         this.$scope = $scope;
         this.vnApp = vnApp;
-        this.translate = $translate;
+        this.$translate = $translate;
         this.$state = $state;
         this.$stateParams = $state.params;
         this.$http = $http;
@@ -116,7 +116,7 @@ class Controller {
         let params = {ticketFk: this.$state.params.id, stateFk: value};
         this.$http.post(`/ticket/api/TicketTrackings/changeState`, params).then(() => {
             this.card.reload();
-            this.vnApp.showSuccess(this.translate.instant('Data saved!'));
+            this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
         });
     }
 
@@ -129,12 +129,14 @@ class Controller {
         let params = {ticketFk: this.$state.params.id, weekDay: day};
         this.$http.patch(`/ticket/api/TicketWeeklies`, params).then(() => {
             this.$scope.addTurn.hide();
-            this.vnApp.showSuccess(this.translate.instant('Data saved!'));
+            this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
         });
     }
 
     // Delete Ticket
     showDeleteTicketDialog() {
+        if (!this.isEditable)
+            return;
         this.$scope.deleteConfirmation.show();
     }
 
@@ -143,7 +145,7 @@ class Controller {
             let params = {id: this.$state.params.id};
             this.$http.post(`/ticket/api/Tickets/deleted`, params).then(() => {
                 this.$state.go('ticket.index');
-                this.vnApp.showSuccess(this.translate.instant('Ticket deleted'));
+                this.vnApp.showSuccess(this.$translate.instant('Ticket deleted'));
             });
         }
     }
@@ -265,7 +267,7 @@ class Controller {
             this.$http.post(`/ticket/api/Sales/updatePrice`, {id: this.edit.id, price: this.editedPrice, ticketFk: this.ticket.id}).then(() => {
                 this.sale.price = this.edit.price;
                 this.$scope.model.refresh();
-                this.vnApp.showSuccess(this.translate.instant('Data saved!'));
+                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
             });
         }
         this.$scope.editPricePopover.hide();
@@ -303,9 +305,9 @@ class Controller {
 
     updateQuantity(id, quantity) {
         this.$http.post(`/ticket/api/Sales/${id}/updateQuantity`, {quantity: parseInt(quantity)}).then(() => {
-            this.vnApp.showSuccess(this.translate.instant('Data saved!'));
+            this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+            this.$scope.model.refresh();
         });
-        this.$scope.model.refresh();
     }
 
 /**
diff --git a/client/ticket/src/sale/locale/es.yml b/client/ticket/src/sale/locale/es.yml
index afd814d9c..bbaf8d031 100644
--- a/client/ticket/src/sale/locale/es.yml
+++ b/client/ticket/src/sale/locale/es.yml
@@ -11,7 +11,6 @@ New ticket: Nuevo ticket
 Edit price: Editar precio
 You are going to delete lines of the ticket: Vas a borrar lineas del ticket
 Continue anyway?: ¿Estás seguro?
-The new quantity should be smaller than the old one: La nueva cantidad debe de ser menor que la anterior
 You have to allow pop-ups in your web browser to use this functionality: 
   Debes permitir los pop-pups en tu navegador para que esta herramienta funcione correctamente
 Disc: Dto 

From 16dfaf89439cb3d2de74833e52f878579fadce32 Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 2 Aug 2018 15:33:50 +0200
Subject: [PATCH 3/6] added pointer to link class

---
 client/salix/src/styles/misc.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/salix/src/styles/misc.scss b/client/salix/src/styles/misc.scss
index 1af528e2d..f7aed13fc 100644
--- a/client/salix/src/styles/misc.scss
+++ b/client/salix/src/styles/misc.scss
@@ -19,6 +19,7 @@ input[type=reset]::-moz-focus-inner
 }
 .link{
     text-decoration: underline;
+    cursor: pointer;
     &:hover{
         color: $main-01!important;
     }

From 17b70192af4952da9fbcaef0bb3d03deb8bf595c Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 2 Aug 2018 15:34:48 +0200
Subject: [PATCH 4/6] Bug #576 Cambiar los bindings del textfield

---
 client/ticket/src/sale/editDiscount.html |  2 +-
 client/ticket/src/sale/editDiscount.js   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/ticket/src/sale/editDiscount.html b/client/ticket/src/sale/editDiscount.html
index 45dce2f8f..e193444be 100644
--- a/client/ticket/src/sale/editDiscount.html
+++ b/client/ticket/src/sale/editDiscount.html
@@ -6,7 +6,7 @@
         label="Discount"
         model="$ctrl.newDiscount"
         type="text"
-        accept="$ctrl.updateDiscount()">
+        on-change="$ctrl.updateDiscount()">
         <t-right-icons>
             <span class="filter">%</span>
         </t-right-icons>
diff --git a/client/ticket/src/sale/editDiscount.js b/client/ticket/src/sale/editDiscount.js
index bdb4f76d6..9f41230e9 100644
--- a/client/ticket/src/sale/editDiscount.js
+++ b/client/ticket/src/sale/editDiscount.js
@@ -6,7 +6,7 @@ class Controller {
         this.$http = $http;
         this.$state = $state;
         this.vnApp = vnApp;
-        this.translate = $translate;
+        this.$translate = $translate;
     }
 
     set edit(value) {
@@ -37,7 +37,7 @@ class Controller {
         let editLines = [];
         let modified = false;
         for (let i = 0; i < this.edit.length; i++) {
-            if (this.newDiscount != this.edit[0].discount || this.bulk) {
+            if (this.newDiscount != this.edit[0].discount || this.bulk || !this.newDiscount) {
                 editLines.push({id: this.edit[i].id, discount: this.newDiscount, ticketFk: this.$state.params.id});
                 modified = true;
             }
@@ -45,14 +45,14 @@ class Controller {
         if (modified) {
             this.$http.post(`/ticket/api/Sales/updateDiscount`, {editLines}).then(() => {
                 this.hide();
-                this.vnApp.showSuccess(this.translate.instant('Data saved!'));
+                this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
                 this.clear();
                 modified = false;
             }).catch(e => {
-                this.vnApp.showError(this.translate.instant(e.data.error.message));
+                this.vnApp.showError(e.data.error.message);
             });
         } else {
-            this.vnApp.showError(this.translate.instant('There is no changes to save'));
+            this.vnApp.showError(this.$translate.instant('There is no changes to save'));
         }
     }
 

From 19e72c86cf17dd748bc53dad0af5e9035165991c Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 2 Aug 2018 15:35:48 +0200
Subject: [PATCH 5/6] added translations

---
 services/loopback/common/locale/es.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/loopback/common/locale/es.json b/services/loopback/common/locale/es.json
index bd4fea805..e0a4fdd49 100644
--- a/services/loopback/common/locale/es.json
+++ b/services/loopback/common/locale/es.json
@@ -35,5 +35,8 @@
 	"The grade must be an integer greater than or equal to zero": "El grade debe ser un entero mayor o igual a cero",
 	"Sample type cannot be blank": "El tipo de plantilla no puede quedar en blanco",
 	"Description cannot be blank": "Se debe rellenar el campo de texto",
-	"You don't have enough privileges to change the state of this ticket": "No tienes permisos para cambiar el estado de este ticket"
+	"You don't have enough privileges to change the state of this ticket": "No tienes permisos para cambiar el estado de este ticket",
+	"The new quantity should be smaller than the old one": "La nueva cantidad debe de ser menor que la anterior",
+	"The value should not be greater than 100%": "El valor no debe de ser mayor de 100%",
+	"The value should be a number": "El valor debe ser un numero"
 }
\ No newline at end of file

From 2fa91ef59db5454a86693400877871c52b1cad23 Mon Sep 17 00:00:00 2001
From: gerard <gerard@verdnatura.es>
Date: Thu, 2 Aug 2018 15:39:32 +0200
Subject: [PATCH 6/6] getVAT now doesn't make a call when it can't

---
 client/ticket/src/sale/index.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/ticket/src/sale/index.js b/client/ticket/src/sale/index.js
index 1c95188fd..35dc6aeb5 100644
--- a/client/ticket/src/sale/index.js
+++ b/client/ticket/src/sale/index.js
@@ -64,10 +64,12 @@ class Controller {
     }
 
     getVAT() {
-        this.$http.get(`/ticket/api/Tickets/${this.ticket.id}/getVAT`).then(res => {
-            this.VAT = res.data || 0;
-            this.total = this.subTotal + this.VAT;
-        });
+        if (this.ticket || this.ticket.id) {
+            this.$http.get(`/ticket/api/Tickets/${this.ticket.id}/getVAT`).then(res => {
+                this.VAT = res.data || 0;
+                this.total = this.subTotal + this.VAT;
+            });
+        }
     }
 
     get isEditable() {