From ce7a007600ea7dffbc21ec3cdbc1e5951b487fa7 Mon Sep 17 00:00:00 2001 From: mpuebla Date: Wed, 12 Jun 2019 16:58:47 -0300 Subject: [PATCH] agregado variable articulos. --- src/js/controller.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 848c895..7b58a16 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -15,11 +15,13 @@ angular.module('focaModalDescarga') focaModalDetalleHojaRutaService, focaSeguimientoService) { //#region variables + console.log(remito); $scope.remito = {}; $scope.remito = remito; $scope.nroRecibo = 0; $scope.cisternas = remito.cisternas; $scope.nroRemito = "00" + remito.sucursal + "-000000000" + remito.numeroRemito; + $scope.articulos = []; //#endregion $scope.crearRemito = function () { @@ -90,7 +92,7 @@ angular.module('focaModalDescarga') remitoId = res.data.id descargar(remitoId); focaModalDescargasService. - addArticulos($scope.remito.articulosRemito, remitoId, 1); + addArticulos($scope.articulos, remitoId, 1); focaModalService.alert("Descarga realizada") .then(function () { $uibModalInstance.dismiss(); @@ -101,13 +103,13 @@ angular.module('focaModalDescarga') }; $scope.getTotal = function () { var total = 0; - var articulos = []; $scope.cisternas.forEach(function (cisterna) { - articulos.push(cisterna.cisternaCarga.articulo); + $scope.articulos.push(cisterna.cisternaCarga.articulo); + total += cisterna.cisternaCarga.articulo.PreVen * cisterna.cisternaCarga.descargar; }); - for (var i = 0; i < articulos.length; i++) { - total += articulos[i].PreVen * articulos[i].cantidad; - } + // for (var i = 0; i < articulos.length; i++) { + // total += articulos[i].PreVen * articulos[i].cantidad; + // } return parseFloat(total.toFixed(2)); }; function descargar(idRemito) { -- 1.9.1