Nicolás Guarnieri / foca-abm-vendedor-cobrador

Commit 75f41d3ad3f2ddd6ff3a8f522e7d75f9684ce7fd

Authored by Eric Fernandez 2019-01-28 09:49:30 -0300

Exists in master

Merge branch 'master' into 'master'

Master

See merge request !7

Showing 2 changed files Show diff stats

src/js/controller.js

Diff comments View file @ 75f41d3

 angular.module('focaAbmVendedorCobrador')
     .controller('focaAbmVendedoresCobradoresController', [
         '$scope', 'focaAbmVendedorCobradorService', '$location', '$filter',
         'focaBotoneraLateralService', 'focaModalService',
         function($scope, focaAbmVendedorCobradorService, $location, $filter,
             focaBotoneraLateralService, focaModalService) {
             $scope.now = new Date();
             $scope.vendedoresCobradores = [];
             $scope.filters = '';
             $scope.numPerPage = 10;
             $scope.currentPageVendedoresCobradores = [];
             $scope.vendedoresCobradores = [];
             //SETEO BOTONERA LATERAL
             focaBotoneraLateralService.showSalir(true);
             focaBotoneraLateralService.showPausar(false);
             focaBotoneraLateralService.showCancelar(false);
             focaBotoneraLateralService.showGuardar(false);
             $scope.editar = function(id) {
                 $location.path('/vendedor-cobrador/' + id);
             };
             $scope.eliminar = function(vendedorCobrador) {
                 var tipo = vendedorCobrador.ES_COBRADOR ? 'cobrador' : 'vendedor';
                 focaModalService.confirm('¿Está seguro que desea borrar el ' + tipo +
                     ' ' + vendedorCobrador.NomVen + '?')
                     .then(function(data) {
                         if(data) {
                             focaAbmVendedorCobradorService
                             .eliminarVendedorCobrador(vendedorCobrador.CodVen)
                             .then(function() {
                                 $scope.search(13);
                             });
                         }
                 });
             };
             $scope.selectPage = function(page) {
                 var start = (page - 1) * $scope.numPerPage;
                 var end = start + $scope.numPerPage;
                 $scope.paginas = [];
                 $scope.paginas = calcularPages(page);
                 $scope.currentPageVendedoresCobradores =
                     $scope.vendedoresCobradores.slice(start, end);
                 $scope.currentPage = page;
             };
             $scope.resetPage = function() {
                 $scope.currentPage = 1;
                 $scope.selectPage(1);
             };
             $scope.search = function(key) {
                 if(key !== 13) return;
                 focaAbmVendedorCobradorService
                     .getVendedoresCobradores($scope.filters)
                     .then(function(res) {
                         $scope.vendedoresCobradores = res.data;
                         $scope.lastPage = Math.ceil(
                             $scope.vendedoresCobradores.length / $scope.numPerPage
                         );
                         $scope.resetPage();
                     });
             };
             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 primera() {
                 $scope.selectedClientes = 0;
             }
             function anterior() {
                 if ($scope.selectedClientes === 0 && $scope.currentPage > 1) {
                     retrocederPagina();
                 } else {
                     $scope.selectedClientes--;
                 }
             }
             function siguiente() {
                 if ($scope.selectedClientes < $scope.currentPageVendedoresCobradores.length - 1 ) {
                     $scope.selectedClientes++;
                 } else {
                         avanzarPagina();
                 }
             }
             function retrocederPagina() {
                 if ($scope.currentPage > 1) {
                     $scope.selectPage($scope.currentPage - 1);
                     $scope.selectedClientes = $scope.numPerPage - 1;
                 }
             }
             function avanzarPagina() {
                 if ($scope.currentPage < $scope.lastPage) {
                     $scope.selectPage($scope.currentPage + 1);
                     $scope.selectedClientes = 0;
                 }
             }
         }
     ])
     .controller('focaAbmVendedorCobradorController', [
         '$scope', 'focaAbmVendedorCobradorService', '$routeParams', 'focaBotoneraLateralService',
         '$timeout', '$uibModal', '$location', 'focaModalService',
         function($scope, focaAbmVendedorCobradorService, $routeParams, focaBotoneraLateralService,
             $timeout, $uibModal, $location, focaModalService) {
             $scope.now = new Date();
             $scope.focused = 0;
             $scope.vendedorCobrador = {
                 CodVen: 0,
                 ES_COBRADOR: false,
                 DNI: ' ',
                 ClaVen: '',
                 ComVen: '0.00',
+                comisionCobrador: '0.00',
                 provincia: {
                     NOMBRE: ''
                 },
                 localidad: {
                     NOMBRE: ' '
                 }
             };
             $scope.options = [
                 {
                     label: 'Vendedor',
-                    value: null
+                    value: 1
                 },
                 {
                     label: 'Cobrador',
-                    value: true
+                    value: 2
+                },
+                {
+                    label: 'Vendedor y cobrador',
+                    value: 3
                 }
             ];
             //SETEO BOTONERA LATERAL
             $timeout(function() {
                 focaBotoneraLateralService.showSalir(false);
                 focaBotoneraLateralService.showPausar(true);
                 focaBotoneraLateralService.showCancelar(false);
                 focaBotoneraLateralService.showGuardar(true, $scope.guardar);
                 focaBotoneraLateralService.addCustomButton('Salir', $scope.cancelar);
             });
             focaAbmVendedorCobradorService
                 .getVendedorCobradorById($routeParams.id)
                 .then(function(res) {
                     if(res.data){
                         $scope.vendedorCobrador = res.data;
                         delete $scope.vendedorCobrador.FCVEN;
                         delete $scope.vendedorCobrador.FEC;
                     }
                 });
             $scope.guardar = function() {
                 if($scope.vendedorCobrador.ClaVen !== $scope.vendedorCobrador.ClaVen2) {
                     focaModalService.alert('Las contraseñas deben coincidir');
                         return;
                 }
                 $scope.vendedorCobrador.PciVen = $scope.vendedorCobrador.provincia.ID;
                 $scope.vendedorCobrador.LocVen = $scope.vendedorCobrador.localidad.ID;
                 delete $scope.vendedorCobrador.provincia;
                 delete $scope.vendedorCobrador.localidad;
                 delete $scope.vendedorCobrador.ClaVen2;
+                if($scope.vendedorCobrador.rol == 1) {
+                    delete $scope.vendedorCobrador.comisionCobrador;
+                }else if($scope.vendedorCobrador.rol == 2) {
+                    delete $scope.vendedorCobrador.ComVen;
+                }
                 focaAbmVendedorCobradorService
                     .guardarVendedorCobrador($scope.vendedorCobrador)
                     .then(function() {
                         $location.path('/vendedor-cobrador');
                     });
             };
             $scope.seleccionarProvincia = function(key) {
                 if(key === 13) {
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Búsqueda de provincias',
                             templateUrl: 'modal-provincias.html',
                             controller: 'focaModalProvinciaController',
                             size: 'md',
                             resolve: {
                                 filters: function() {
                                     return $scope.vendedorCobrador.provincia.NOMBRE;
                                 }
                             }
                         }
                     );
                     modalInstance.result.then(function(provincia) {
                         $scope.vendedorCobrador.provincia = provincia;
                         $timeout(function() {
                             $scope.focused = 5;
                         });
                     }, function() {
                         //TODO: función llamada cuando cancela el modal
                     });
                 }
             };
             $scope.seleccionarLocalidad = function(key) {
                 if(!$scope.vendedorCobrador.provincia.ID) {
                     focaModalService.alert('Seleccione una provincia');
                     return;
                 }
                 if(key === 13) {
                     var modalInstance = $uibModal.open(
                         {
                             ariaLabelledBy: 'Búsqueda de localidades',
                             templateUrl: 'modal-localidades.html',
                             controller: 'focaModalLocalidadController',
                             size: 'md',
                             resolve: {
                                 filters: {
                                     idProvincia: $scope.vendedorCobrador.provincia.ID,
                                     busqueda: $scope.vendedorCobrador.localidad.NOMBRE
                                 }
                             }
                         }
                     );
                     modalInstance.result.then(function(localidad) {
                         $scope.vendedorCobrador.localidad = localidad;
                         $timeout(function() {
                             $scope.focused = 6;
                         });
                     }, function() {
                         //TODO: función llamada cuando cancela el modal
                     });
                 }
             };
             $scope.cancelar = function() {
                 $location.path('/vendedor-cobrador');
             };
             $scope.next = function(key) {
                 if(key === 13) $scope.focused++;
             };
         }
     ]);

src/views/foca-abm-vendedor-cobrador-item.html

Diff comments View file @ 75f41d3

 <div class="row">
     <foca-cabecera-facturador
     titulo="'Vendedores / Cobradores'"
     fecha="now"
     class="mb-0 col-lg-12"
     ></foca-cabecera-facturador>
 </div>
 <div class="row">
     <div class="col-12 col-md-10 p-0 mt-4 border border-white rounded">
         <form name="formVendedorCobrador" class="px-3" autocomplete="off">
             <div class="row mt-3">
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Tipo</label>
                     <div class="col-md-8 pl-0">
                         <select
                             class="form-control form-control-sm"
-                            ng-model="vendedorCobrador.ES_COBRADOR"
+                            ng-model="vendedorCobrador.rol"
                             ng-options="option.value as option.label for option in options"
                             foca-focus="focused == 0"
                             ng-focus="focused = 0">
                         </select>
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Nombre</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             type="text"
                             teclado-virtual
                             ng-model="vendedorCobrador.NomVen"
                             foca-focus="focused == 1"
                             ng-focus="focused = 1"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                             uppercase-only
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Domicilio</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             type="text"
                             teclado-virtual
                             ng-model="vendedorCobrador.DomVen"
                             ng-required="true"
                             foca-focus="focused == 2"
                             ng-focus="focused = 2"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                             uppercase-only
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Código postal</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             foca-tipo-input
                             teclado-virtual
                             ng-model="vendedorCobrador.CPoVen"
                             ng-required="true"
                             foca-focus="focused == 3"
                             ng-focus="focused = 3"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                             string-to-number
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Provincia</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             type="text"
                             class="form-control form-control-sm"
                             ng-model="vendedorCobrador.provincia.NOMBRE"
                             ng-keypress="seleccionarProvincia($event.keyCode)"
                             ng-required="true"
                             foca-focus="focused == 4"
                             ng-focus="focused = 4"
                             teclado-virtual
                         />
                         <div class="input-group-append">
                             <button
                                 ladda="searchLoading"
                                 class="btn btn-outline-secondary form-control-sm"
                                 type="button"
                                 ng-click="seleccionarProvincia(13)"
                             >
                                 <i class="fa fa-search" aria-hidden="true"></i>
                             </button>
                         </div>
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Localidad</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             type="text"
                             class="form-control form-control-sm"
                             ng-model="vendedorCobrador.localidad.NOMBRE"
                             ng-keypress="seleccionarLocalidad($event.keyCode)"
                             ng-required="true"
                             foca-focus="focused == 5"
                             ng-focus="focused = 5"
                             teclado-virtual
                             autocomplete="off"
                         />
                         <div class="input-group-append">
                             <button
                                 ladda="searchLoading"
                                 class="btn btn-outline-secondary form-control-sm"
                                 type="button"
                                 ng-click="seleccionarLocalidad(13)"
                             >
                                 <i class="fa fa-search" aria-hidden="true"></i>
                             </button>
                         </div>
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Teléfono</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             foca-tipo-input
                             teclado-virtual
                             ng-model="vendedorCobrador.TelVen"
                             ng-required="true"
                             foca-focus="focused == 6"
                             ng-focus="focused = 6"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                             string-to-number
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">DNI</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             foca-tipo-input
                             teclado-virtual
                             ng-model="vendedorCobrador.DNI"
                             ng-required="true"
                             foca-focus="focused == 7"
                             ng-focus="focused = 7"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                             string-to-number
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Nueva contraseña</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             type="password"
                             teclado-virtual
                             ng-model="vendedorCobrador.ClaVen"
                             ng-required="true"
                             foca-focus="focused == 8"
                             ng-focus="focused = 8"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                         />
                     </div>
                 </div>
                 <div class="form-group d-flex mb-2 col-md-6">
                     <label class="col-form-label col-md-4">Repita contraseña</label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             type="password"
                             teclado-virtual
                             ng-model="vendedorCobrador.ClaVen2"
                             ng-required="true"
                             foca-focus="focused == 9"
                             ng-focus="focused = 9"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                         />
                     </div>
                 </div>
-                <div class="form-group d-flex mb-2 col-md-6">
+                <div class="form-group d-flex mb-2 col-md-6"
-                    <label class="col-form-label col-md-4">Porcentaje de comisión</label>
+                    ng-show="vendedorCobrador.rol == 1 || vendedorCobrador.rol == 3">
+                    <label class="col-form-label col-md-4">Porcentaje de comisión <span ng-show="vendedorCobrador.rol == 3">vendedor</span></label>
                     <div class="input-group col-md-8 pl-0">
                         <input
                             class="form-control form-control-sm"
                             foca-tipo-input
                             teclado-virtual
                             ng-model="vendedorCobrador.ComVen"
                             ng-required="true"
                             foca-focus="focused == 10"
                             ng-focus="focused = 10"
                             ng-keypress="next($event.keyCode)"
                             autocomplete="off"
                             string-to-number
                         />
                     </div>
                 </div>
+                <div class="form-group d-flex mb-2 col-md-6"
+                    ng-show="vendedorCobrador.rol == 2 || vendedorCobrador.rol == 3">
+                    <label class="col-form-label col-md-4">Porcentaje de comisión <span ng-show="vendedorCobrador.rol == 3">cobrador</span></label>
+                    <div class="input-group col-md-8 pl-0">
+                        <input
+                            class="form-control form-control-sm"
+                            foca-tipo-input
+                            teclado-virtual
+                            ng-model="vendedorCobrador.comisionCobrador"
+                            ng-required="true"
+                            foca-focus="focused == 10"
+                            ng-focus="focused = 10"
+                            ng-keypress="next($event.keyCode)"
+                            autocomplete="off"
+                            string-to-number
+                        />
+                    </div>
+                </div>
             </div>
         </form>
     </div>
 </div>