Commit 116fa8f4245f9363a0b8b4ad1b332936c381da48
1 parent
49538eae3a
Exists in
master
Delete editarArticulo
Showing
1 changed file
with
0 additions
and
10 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -975,17 +975,7 @@ angular.module('focaCrearRemito').controller('remitoController', |
| 975 | 975 | |
| 976 | 976 | $scope.editarArticulo = function (key, articulo, tmpCantidad, tmpPrecio) { |
| 977 | 977 | if (key === 13) { |
| 978 | -<<<<<<< HEAD | |
| 979 | - var valorAEditar = bandera === 'precio' ? articulo.precio : articulo.cantidad; | |
| 980 | - var tempValor = bandera === 'precio' ? articulo.tmpPrecio | |
| 981 | - : articulo.tmpCantidad; | |
| 982 | - if (tempValor === undefined) { | |
| 983 | - return; | |
| 984 | - } | |
| 985 | - if (tempValor === '') { | |
| 986 | -======= | |
| 987 | 978 | if (!articulo.cantidad || !articulo.precio || !tmpCantidad || !tmpPrecio) { |
| 988 | ->>>>>>> parent of 60be8ea... Arreglo alerta al editar campos del producto | |
| 989 | 979 | focaModalService.alert('Los valores deben ser al menos 1'); |
| 990 | 980 | return; |
| 991 | 981 | } else if (tmpCantidad === "0" || tmpPrecio === "0") { |