Mauricio Cattafi / foca-modal-resumen-cuenta

Commit 2a7d3bc419b8544d462a153ffe733a2badd8f51c

Authored by Eric Fernandez 2019-06-25 15:56:11 -0300

Merge branch 'master' into 'develop'

Master(mpuebla)

See merge request !8

Showing 3 changed files Show diff stats

package.json

Diff comments View file @ 2a7d3bc

 {
     "name": "foca-modal-resumen-cuenta",
     "version": "0.0.1",
     "description": "Modal para resumen de cuenta en cobranzas",
     "main": "index.js",
     "scripts": {
+        "refresh" : "gulp uglify && cp tmp/foca-modal-resumen-cuenta.js ../wrapper-demo/node_modules/foca-modal-resumen-cuenta/dist/foca-modal-resumen-cuenta.min.js",
         "test": "echo \"Error: no test specified\" && exit 1",
         "gulp-pre-commit": "gulp pre-commit",
         "compile": "gulp uglify",
         "postinstall": "npm run compile && gulp clean-post-install",
         "install-dev": "npm install --ignore-scripts"
     },
     "pre-commit": [
         "gulp-pre-commit"
     ],
     "repository": {
         "type": "git",
         "url": "http://git.focasoftware.com/npm/foca-modal-resumen-cuenta"
     },
     "author": "Foca Software",
     "license": "ISC",
     "peerDependencies": {
         "angular": "^1.7.4",
         "bootstrap": "^4.1.3",
         "font-awesome": "^4.7.0",
         "ui-bootstrap4": "^3.0.4",
         "gulp": "^3.9.1",
         "gulp-angular-templatecache": "^2.2.1",
         "gulp-concat": "^2.6.1",
         "gulp-connect": "^5.6.1",
         "gulp-htmlmin": "^5.0.1",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "^1.0.0",
         "gulp-uglify": "^3.0.1",
         "jquery": "^3.3.1",
         "pump": "^3.0.0",
         "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git"
     },
     "devDependencies": {
         "angular": "1.7.5",
         "angular-ladda": "0.4.3",
         "bootstrap": "4.1.3",
         "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
         "font-awesome": "4.7.0",
         "gulp": "3.9.1",
         "gulp-angular-templatecache": "2.2.5",
         "gulp-clean": "0.4.0",
         "gulp-concat": "2.6.1",
         "gulp-connect": "5.6.1",
         "gulp-htmlmin": "5.0.1",
         "gulp-jshint": "2.1.0",
         "gulp-rename": "1.4.0",
         "gulp-replace": "1.0.0",
         "gulp-uglify": "3.0.1",
         "jasmine-core": "3.3.0",
         "jquery": "3.3.1",
         "jshint": "2.9.6",
         "ladda": "1.0.6",
         "pre-commit": "1.2.2",
         "pump": "3.0.0",
         "ui-bootstrap4": "3.0.5"
     }
 }

src/js/controller.js

Diff comments View file @ 2a7d3bc

 angular.module('focaModalResumenCuenta')
     .controller('focaModalResumenCuentaController', [
         '$timeout',
         '$filter',
         '$scope',
         '$uibModalInstance',
         'focaModalResumenCuentaService',
         'cliente',
         '$uibModal',
         'focaModalService',
-        function($timeout, $filter, $scope, $uibModalInstance,
+        function ($timeout, $filter, $scope, $uibModalInstance,
             focaModalResumenCuentaService, cliente, $uibModal, focaModalService) {
             var fecha = new Date();
             $scope.generado = false;
             $scope.fechaDesde = new Date(fecha.setMonth(fecha.getMonth() - 1));
             $scope.currentPageFacturas = [];
             $scope.currentPage = 1;
             $scope.numPerPage = 10;
             $scope.selectedFactura = -1;
-            $scope.generar = function() {
+            $scope.generar = function () {
                 focaModalResumenCuentaService
                     .getResumenCuenta(cliente.COD, $scope.fechaDesde)
-                    .then(function(res) {
+                    .then(function (res) {
-                        res.data.facturas = calcularSaldos(res.data.facturas);
+                        res.data.facturas = res.data.facturas.filter(function(factura){
+                            return factura.TCO !== "RC" && factura.TCO !== "RE"
+                        })
+                        res.data.facturas = calcularSaldos(res.data.facturas);
                         $scope.generado = true;
                         $scope.results = res.data;
                         $scope.results.fechaDesde = $scope.fechaDesde;
                         $scope.search();
                     });
             };
-            $scope.cancel = function() {
+            $scope.cancel = function () {
                 if ($scope.generado) {
                     $scope.generado = false;
                 } else {
                     $uibModalInstance.dismiss('cancel');
                 }
             };
-            $scope.enviarMail = function(factura) {
+            $scope.enviarMail = function (factura) {
                 focaModalService.mail(
                     {
                         titulo: 'Enviar comprobante',
                         descarga: {
                             nombre: factura.numeroFactura + '.pdf',
                             url: '/mail/comprobante/descargar',
                         },
                         envio: {
                             mailCliente: cliente.MAIL,
                             url: '/mail/comprobante'
                         },
                         options: {
                             factura: factura
                         }
                     }
                 );
             };
-            $scope.enviarResumen = function() {
+            $scope.enviarResumen = function () {
                 focaModalService.mail(
                     {
                         titulo: 'Enviar resumen de cuenta',
                         descarga: {
                             nombre: 'resumen-de-cuenta.pdf',
                             url: '/mail/resumen-cuenta/descargar',
                         },
                         envio: {
                             mailCliente: cliente.MAIL,
                             url: '/mail/resumen-cuenta',
                         },
                         options: {
                             resumen: $scope.results
                         }
                     }
                 );
             };
-            $scope.verFactura = function(factura) {
+            $scope.verFactura = function (factura) {
-                    var modalInstance = $uibModal.open(
+                var modalInstance = $uibModal.open(
                     {
                         ariaLabelledBy: 'Detalle de factura',
                         templateUrl: 'foca-modal-factura-detalle.html',
                         controller: 'focaModalFacturaDetalleController',
                         size: 'md',
                         resolve: {
                             factura: factura
                         }
                     }
                 );
                 modalInstance.result.then();
             };
-            $scope.search = function() {
+            $scope.search = function () {
                 if ($scope.results.facturas.length) {
                     $scope.lastPage = Math.ceil(
                         $scope.results.facturas.length / $scope.numPerPage
                     );
                     $scope.resetPage();
                 }
             };
-            $scope.resetPage = function() {
+            $scope.resetPage = function () {
                 $scope.currentPage = 1;
                 $scope.selectPage(1);
             };
-            $scope.selectPage = function(page) {
+            $scope.selectPage = function (page) {
                 var start = (page - 1) * $scope.numPerPage;
                 var end = start + $scope.numPerPage;
                 $scope.paginas = [];
                 $scope.paginas = calcularPages(page);
                 $scope.currentPageFacturas = $scope.results.facturas.slice(start, end);
                 $scope.currentPage = page;
             };
             function calcularPages(paginaActual) {
                 var paginas = [];
                 paginas.push(paginaActual);
                 if (paginaActual - 1 > 1) {
                     paginas.unshift(paginaActual - 1);
                     if (paginaActual - 2 > 1) {
                         paginas.unshift(paginaActual - 2);
                     }
                 }
                 if (paginaActual + 1 < $scope.lastPage) {
                     paginas.push(paginaActual + 1);
                     if (paginaActual + 2 < $scope.lastPage) {
                         paginas.push(paginaActual + 2);
                     }
                 }
                 if (paginaActual !== 1) {
                     paginas.unshift(1);
                 }
                 if (paginaActual !== $scope.lastPage) {
                     paginas.push($scope.lastPage);
                 }
                 return paginas;
             }
             function calcularSaldos(facturas) {
                 var saldo = 0;
-                facturas.forEach(function(factura) {
+                facturas.forEach(function (factura) {
                     if (factura.TCO === 'CI' ||
                         factura.TCO === 'FT' ||
-                        factura.TCO === 'ND'){
+                        factura.TCO === 'ND') {
                         factura.IPA = factura.IPA * -1;
                     } else {
                         factura.IPA = factura.IPA;
                     }
                     saldo += factura.IPA;
                     factura.saldo = saldo;
                     factura.saldo_show = Math.abs(saldo);
                     factura.IPA_SHOW = Math.abs(factura.IPA);
                 });
                 return facturas;
             }
         }]
     );

src/views/modal-resumen-cuenta.html

Diff comments View file @ 2a7d3bc

 <div class="modal-header py-1">
     <div class="row w-100">
         <div class="col-lg-6">
             <h5 class="modal-title my-1">Resumen de cuenta</h5>
         </div>
         <div class="col-lg-6 text-right" ng-show="generado">
             <h6 class="modal-title my-1">Saldo hasta la fecha: {{results.saldo | number: 2}}</h6>
         </div>
     </div>
 </div>
 <div class="modal-body" id="modal-body">
     <div class="input-group row"
         ng-hide="generado">
         <small class="col-md-2 col-4 text-left my-1">Fecha Desde</small>
-        <div class="col-md-4 col-8 input-group mb-2">
+        <div class="col-md-4 col-8 input-group mb-3">
             <div class="input-group-prepend">
-                <div class="input-group-text form-control-sm">
+                <button
+                    type="button"
+                    ng-click="datepickerOpen = true"
+                    class="input-group-text">
                     <i class="fa fa-calendar"></i>
-                </div>
+                </button>
             </div>
             <input
                 class="form-control form-control-sm"
                 id="inlineFormInputGroup"
                 ladda="searchLoading"
                 type="text"
                 ng-model="fechaDesde"
                 ng-required="true"
                 uib-datepicker-popup="dd/MM/yyyy"
                 show-button-bar="false"
                 is-open="datepickerOpen"
                 on-open-focus="false"
                 ng-focus="datepickerOpen = true"
             />
         </div>
     </div>
     <table class="table table-striped table-sm" ng-show="generado">
         <thead>
             <tr>
                 <th>Comprobante</th>
                 <th>Vencimiento</th>
                 <th class="text-right">Importe</th>
                 <th class="text-right">Saldo</th>
                 <th class="text-right"></th>
                 <th class="text-right"></th>
             </tr>
         </thead>
         <tbody>
             <tr class="selectable"
                 ng-repeat="(key, factura) in currentPageFacturas">
                 <td>{{factura.numeroFactura}} {{factura.FECHA_COMPROBANTE | date : 'dd/MM/yyyy' : 'GMT'}}</td>
                 <td>{{(factura.TCO == 'FT') ? factura.NCU + ' - ' : ''}}{{factura.FEV | date : 'dd/MM/yyyy' : 'GMT'}}</td>
                 <td class="text-right">
                     {{ factura.IPA_SHOW | number:2 }}
                     <span ng-class="{'invisible': factura.IPA >= 0}">-</span>
                 </td>
                 <td class="text-right">
                     {{ factura.saldo_show | number:2 }}
                     <span ng-class="{'invisible': factura.saldo >= 0}">-</span>
                 </td>
                 <td>
                     <button
                         class="btn p-1"
                         ng-click="verFactura(factura)"
                         title="Ver comprobante"
                     >
                         <i class="fa fa-eye" aria-hidden="true"></i>
                     </button>
                 </td>
                 <td>
                     <button
                         class="btn p-1"
                         ng-click="enviarMail(factura)"
                         title="Enviar comprobante por mail"
                     >
                         <i class="fa fa-envelope-o" aria-hidden="true"></i>
                     </button>
                 </td>
             </tr>
         </tbody>
     </table>
 </div>
 <div class="modal-footer py-1">
     <nav ng-show="currentPageFacturas.length" class="mr-auto">
         <ul class="pagination pagination-sm justify-content mb-0">
             <li class="page-item" ng-class="{'disabled': currentPage == 1}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
                     <span aria-hidden="true">&laquo;</span>
                     <span class="sr-only">Anterior</span>
                 </a>
             </li>
             <li
                 class="page-item"
                 ng-repeat="pagina in paginas"
                 ng-class="{'active': pagina == currentPage}"
             >
                 <a
                     class="page-link"
                     href="javascript:void();"
                     ng-click="selectPage(pagina)"
                     ng-bind="pagina"
                 ></a>
             </li>
             <li class="page-item" ng-class="{'disabled': currentPage == lastPage}">
                 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)">
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Siguiente</span>
                 </a>
             </li>
         </ul>
     </nav>
-    <button class="btn btn-sm btn-secondary my-1" type="button" ng-click="generar()" ng-hide="generado">Generar</button>
+    <button class="btn btn-sm btn-primary my-1" type="button" ng-click="generar()" ng-hide="generado">Generar</button>
     <button class="btn btn-sm btn-primary my-1" type="button" ng-click="enviarResumen()" ng-show="generado">Enviar</button>
     <button class="btn btn-sm btn-secondary my-1" type="button" ng-click="cancel()">Cancelar</button>
 </div>