Merge branch 'master' into 'develop'

Master See merge request !17

Merge branch 'master' into 'develop'
Master See merge request !17
Eric Fernandez
2 parents 717f20b916 75c5fa64e7
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -64,8 +64,12 @@ angular.module(&#39;focaModalPrecioCondicion&#39;)
                                     }
                                 ],
                             }).then(function (res) {
-                                $scope.associatedList = false;
-                                $scope.listaDePreciosAlternativa = res;
+                                focaModalService.confirm('¿Desea cambiar la lista de precios?').then(function (data){
+                                    if (data) {
+                                        $scope.associatedList = false;
+                                        $scope.listaDePreciosAlternativa = res;
+                                    }
+                                });
                             }).catch(function (e) {
                                 console.error(e);
                             });
...	...	@@ -64,8 +64,12 @@ angular.module('focaModalPrecioCondicion')
64	64	}
65	65	],
66	66	}).then(function (res) {
67		- $scope.associatedList = false;
68		- $scope.listaDePreciosAlternativa = res;
	67	+ focaModalService.confirm('¿Desea cambiar la lista de precios?').then(function (data){
	68	+ if (data) {
	69	+ $scope.associatedList = false;
	70	+ $scope.listaDePreciosAlternativa = res;
	71	+ }
	72	+ });
69	73	}).catch(function (e) {
70	74	console.error(e);
71	75	});