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] 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