Merge branch 'master' into 'master'

Master See merge request !29

Merge branch 'master' into 'master'
Master See merge request !29
Eric Fernandez
2 parents 3ab6474d18 34f5492b57
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -231,7 +231,15 @@ angular.module(&#39;focaCrearNotaPedido&#39;) .controller(&#39;notaPedidoCtrl&#39;,
                         templateUrl: 'foca-modal-nota-pedido.html',
                         controller: 'focaModalNotaPedidoController',
                         size: 'lg',
-                        resolve: {usadoPor: function() {return 'notaPedido';}}
+                        resolve: {
+                            usadoPor: function() {return 'notaPedido';},
+                            idVendedor: function() {
+                                if(APP === 'distribuidor')
+                                    return $scope.notaPedido.vendedor.CodVen;
+                                else
+                                    return null;
+                            }
+                        }
                     }
                 );
                 modalInstance.result.then(
...	...	@@ -231,7 +231,15 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
231	231	templateUrl: 'foca-modal-nota-pedido.html',
232	232	controller: 'focaModalNotaPedidoController',
233	233	size: 'lg',
234		- resolve: {usadoPor: function() {return 'notaPedido';}}
	234	+ resolve: {
	235	+ usadoPor: function() {return 'notaPedido';},
	236	+ idVendedor: function() {
	237	+ if(APP === 'distribuidor')
	238	+ return $scope.notaPedido.vendedor.CodVen;
	239	+ else
	240	+ return null;
	241	+ }
	242	+ }
235	243	}
236	244	);
237	245	modalInstance.result.then(