Commit aae6047799d8ca4db9240065fe3a7ef96673d4b7
1 parent
0598143049
Exists in
master
Agregado metodo para consultar los plazos con el id del cliente.
Showing
3 changed files
with
117 additions
and
96 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -9,14 +9,15 @@ angular.module('focaModalPrecioCondicion') |
| 9 | 9 | 'focaModalService', |
| 10 | 10 | 'focaModalPrecioCondicionService', |
| 11 | 11 | 'idListaPrecio', |
| 12 | + 'idCliente', | |
| 12 | 13 | function ( |
| 13 | 14 | $timeout, $filter, $scope, $uibModal, $uibModalInstance, |
| 14 | - focaModalService, focaModalPrecioCondicionService, idListaPrecio | |
| 15 | + focaModalService, focaModalPrecioCondicionService, idListaPrecio, idCliente | |
| 15 | 16 | ) { |
| 16 | 17 | $scope.plazos = [{ dias: 0 }]; |
| 17 | 18 | $scope.editingPlazo = false; |
| 18 | 19 | $scope.openModalListaDePrecios = false; |
| 19 | - $scope.chosenClientList = true; | |
| 20 | + $scope.associatedList = true; | |
| 20 | 21 | $scope.listaDePreciosAlternativa = null; |
| 21 | 22 | |
| 22 | 23 | onInit(); |
| ... | ... | @@ -27,7 +28,14 @@ angular.module('focaModalPrecioCondicion') |
| 27 | 28 | .then(function (res) { |
| 28 | 29 | console.log("Lista de precios", res); |
| 29 | 30 | $scope.listaDePreciosAsociada = res.data[0]; |
| 30 | - }); | |
| 31 | + }) | |
| 32 | + .catch(function (e) { console.log(e) }); | |
| 33 | + focaModalPrecioCondicionService.getPlazosByIdCliente(idCliente) | |
| 34 | + .then(function (res) { | |
| 35 | + console.log(res); | |
| 36 | + $scope.plazos = res.data; | |
| 37 | + }) | |
| 38 | + .catch(function (e) { console.log(e) }); | |
| 31 | 39 | } |
| 32 | 40 | |
| 33 | 41 | //#region Metodos para la lista de precios |
| ... | ... | @@ -51,7 +59,7 @@ angular.module('focaModalPrecioCondicion') |
| 51 | 59 | } |
| 52 | 60 | ], |
| 53 | 61 | }).then(function (res) { |
| 54 | - $scope.chosenClientList = false; | |
| 62 | + $scope.associatedList = false; | |
| 55 | 63 | $scope.listaDePreciosAlternativa = res; |
| 56 | 64 | console.log(res); |
| 57 | 65 | }).catch(function (e) { |
| ... | ... | @@ -60,7 +68,7 @@ angular.module('focaModalPrecioCondicion') |
| 60 | 68 | }); |
| 61 | 69 | }; |
| 62 | 70 | $scope.selectListaDePrecios = function (listaDePrecios) { |
| 63 | - $scope.chosenClientList = true; | |
| 71 | + $scope.associatedList = true; | |
| 64 | 72 | }; |
| 65 | 73 | $scope.verListaProductos = function (id) { |
| 66 | 74 | var modalInstance = $uibModal.open( |
| ... | ... | @@ -88,6 +96,9 @@ angular.module('focaModalPrecioCondicion') |
| 88 | 96 | $scope.closeModalPrecioCondicion = function () { |
| 89 | 97 | $uibModalInstance.dismiss('cancel'); |
| 90 | 98 | }; |
| 99 | + $scope.guardarPrecioCondicion = function () { | |
| 100 | + $uibModalInstance.close(!$scope.associatedList ? $scope.listaDePreciosAsociada : $scope.listaDePreciosAlternativa); | |
| 101 | + } | |
| 91 | 102 | //#endregion |
| 92 | 103 | |
| 93 | 104 | //#region Metodos para los plazos |
src/js/service.js
| ... | ... | @@ -20,6 +20,9 @@ angular.module('focaModalPrecioCondicion') |
| 20 | 20 | }, |
| 21 | 21 | getAllListaPrecio: function () { |
| 22 | 22 | return $http.get(API_ENDPOINT.URL + '/lista-precio'); |
| 23 | + }, | |
| 24 | + getPlazosByIdCliente: function (id) { | |
| 25 | + return $http.get(API_ENDPOINT.URL + '/plazo-pago/cliente/' + id); | |
| 23 | 26 | } |
| 24 | 27 | }; |
| 25 | 28 | } |
src/views/modal-precio-condicion.html
| 1 | -<div> | |
| 2 | - <div class="modal-header py-1"> | |
| 3 | - <div class="row w-100"> | |
| 4 | - <div class="col-lg-6"> | |
| 5 | - <h5 class="modal-title my-1">Precio-Condiciรณn</h5> | |
| 6 | - </div> | |
| 1 | +<div class="modal-header py-1"> | |
| 2 | + <div class="row w-100"> | |
| 3 | + <div class="col-lg-6"> | |
| 4 | + <h5 class="modal-title my-1">Precio-Condiciรณn</h5> | |
| 7 | 5 | </div> |
| 8 | 6 | </div> |
| 9 | - <div class="modal-body" id="modal-body"> | |
| 10 | - <div ng-show="!ingreso"> | |
| 11 | - <div class="row" ng-show="listaDePreciosAsociada.length == 0"> | |
| 12 | - <div class="col"> | |
| 13 | - No se encontraron resultados. | |
| 14 | - </div> | |
| 7 | +</div> | |
| 8 | +<div class="modal-body" id="modal-body"> | |
| 9 | + <div ng-show="!ingreso"> | |
| 10 | + <div class="row" ng-show="listaDePreciosAsociada.length == 0"> | |
| 11 | + <div class="col"> | |
| 12 | + No se encontraron resultados. | |
| 15 | 13 | </div> |
| 16 | - <div class="row px-2"> | |
| 17 | - <div class="col-lg-6"> | |
| 18 | - <div class="row border-top py-2"> | |
| 19 | - <div class="col-lg-9 col-9">Lista asociada al cliente</div> | |
| 20 | - <div class="col-lg-3 col-3 text-center"> | |
| 21 | - <button | |
| 22 | - ng-class="{'btn-primary': chosenClientList, 'btn-default': !chosenClientList}" | |
| 23 | - class="btn btn-sm p-1" | |
| 24 | - ng-click="selectListaDePrecios(listaDePreciosAsociada)"> | |
| 25 | - <span class="fa fa-circle-thin"></span> | |
| 26 | - </button> | |
| 27 | - </div> | |
| 14 | + </div> | |
| 15 | + <div class="row px-2"> | |
| 16 | + <div class="col-lg-6"> | |
| 17 | + <div class="row border-top py-2"> | |
| 18 | + <div class="col-lg-9 col-9">Lista asociada al cliente</div> | |
| 19 | + <div class="col-lg-3 col-3 text-center"> | |
| 20 | + <button | |
| 21 | + ng-class="{'btn-primary': associatedList, 'btn-default': !associatedList}" | |
| 22 | + class="btn btn-sm p-1" | |
| 23 | + ng-click="selectListaDePrecios(listaDePreciosAsociada)"> | |
| 24 | + <span class="fa fa-circle-thin"></span> | |
| 25 | + </button> | |
| 28 | 26 | </div> |
| 29 | - <div class="row align-items-center pb-2"> | |
| 30 | - <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAsociada.ID"></div> | |
| 31 | - <div class="col-lg-7 col-7" ng-bind="listaDePreciosAsociada.DES"></div> | |
| 32 | - <div class="col-lg-3 col-3 text-center"> | |
| 33 | - <button ng-click="verListaProductos(listaDePreciosAsociada.ID)" class="btn btn-sm p-1"> | |
| 34 | - <span class="fa fa-eye"></span> | |
| 35 | - </button> | |
| 36 | - </div> | |
| 27 | + </div> | |
| 28 | + <div class="row align-items-center pb-2"> | |
| 29 | + <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAsociada.ID"></div> | |
| 30 | + <div class="col-lg-7 col-7" ng-bind="listaDePreciosAsociada.DES"></div> | |
| 31 | + <div class="col-lg-3 col-3 text-center"> | |
| 32 | + <button ng-click="verListaProductos(listaDePreciosAsociada.ID)" class="btn btn-sm p-1"> | |
| 33 | + <span class="fa fa-eye"></span> | |
| 34 | + </button> | |
| 37 | 35 | </div> |
| 38 | - <div class="row border-top py-2"> | |
| 39 | - <div class="col-lg-9 col-9">Trabajar con otra lista</div> | |
| 40 | - <div class="col-lg-3 col-3 text-center"> | |
| 41 | - <button | |
| 42 | - ng-class="{'btn-primary': !chosenClientList, 'btn-default': chosenClientList}" | |
| 43 | - class="btn btn-sm btn-default p-1" | |
| 44 | - ng-click="openListaDePrecios()"> | |
| 45 | - <span class="fa fa-circle-thin"></span> | |
| 46 | - </button> | |
| 47 | - </div> | |
| 36 | + </div> | |
| 37 | + <div class="row border-top py-2"> | |
| 38 | + <div class="col-lg-9 col-9">Trabajar con otra lista</div> | |
| 39 | + <div class="col-lg-3 col-3 text-center"> | |
| 40 | + <button | |
| 41 | + ng-class="{'btn-primary': !associatedList, 'btn-default': associatedList}" | |
| 42 | + class="btn btn-sm btn-default p-1" | |
| 43 | + ng-click="openListaDePrecios()"> | |
| 44 | + <span class="fa fa-circle-thin"></span> | |
| 45 | + </button> | |
| 48 | 46 | </div> |
| 49 | - <div ng-show="listaDePreciosAlternativa != null" class="row align-items-center pb-1"> | |
| 50 | - <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAlternativa.ID"></div> | |
| 51 | - <div class="col-lg-7 col-7" ng-bind="listaDePreciosAlternativa.DES"></div> | |
| 52 | - <div class="col-lg-3 col-3 text-center"> | |
| 53 | - <button ng-click="verListaProductos(listaDePreciosAlternativa.ID)" class="btn btn-sm p-1"> | |
| 54 | - <span class="fa fa-eye"></span> | |
| 55 | - </button> | |
| 56 | - </div> | |
| 47 | + </div> | |
| 48 | + <div ng-show="listaDePreciosAlternativa != null" class="row align-items-center pb-1"> | |
| 49 | + <div class="col-lg-2 col-2 text-center" ng-bind="listaDePreciosAlternativa.ID"></div> | |
| 50 | + <div class="col-lg-7 col-7" ng-bind="listaDePreciosAlternativa.DES"></div> | |
| 51 | + <div class="col-lg-3 col-3 text-center"> | |
| 52 | + <button ng-click="verListaProductos(listaDePreciosAlternativa.ID)" class="btn btn-sm p-1"> | |
| 53 | + <span class="fa fa-eye"></span> | |
| 54 | + </button> | |
| 57 | 55 | </div> |
| 58 | 56 | </div> |
| 59 | - <div class="col"> | |
| 60 | - <div class="row border-bottom py-1"> | |
| 61 | - <div class="col text-center font-weight-bold">Plazos</div> | |
| 57 | + </div> | |
| 58 | + <div class="col"> | |
| 59 | + <div class="row border-bottom py-1"> | |
| 60 | + <div class="col text-center font-weight-bold">Plazos</div> | |
| 61 | + </div> | |
| 62 | + <div ng-if="!editingPlazo" class="row align-items-center justify-content-end py-2"> | |
| 63 | + <div | |
| 64 | + class="col-lg-9 col-9 text-center" | |
| 65 | + ng-repeat="plazo in plazos"> | |
| 66 | + {{plazo.dias}}, | |
| 62 | 67 | </div> |
| 63 | - <div ng-if="!editingPlazo" class="row align-items-center justify-content-end py-2"> | |
| 64 | - <div class="col-lg-9 col-9 text-center">300, 254, 215, 265, 300, 300</div> | |
| 65 | - <div class="col-lg-3 col-3"> | |
| 66 | - <button class="btn btn-sm text-center" ng-click="editPlazo()"> | |
| 67 | - <span class="fa fa-pencil"></span> | |
| 68 | - </button> | |
| 69 | - </div> | |
| 68 | + <div class="col-lg-9 col-9 text-center" ng-if="plazos.length == 0"> | |
| 69 | + No hay plazos cargados. | |
| 70 | 70 | </div> |
| 71 | - <div ng-if="editingPlazo" class="row align-items-center justify-content-end py-2"> | |
| 72 | - <div class="col-2 col-sm-2 px-2" ng-repeat="plazo in plazos" ng-show="plazos.length > 0"> | |
| 73 | - <input | |
| 74 | - type="text" | |
| 75 | - class="form-control form-control-sm text-center" | |
| 76 | - ng-model="plazo.dias" | |
| 77 | - limite-numeros-max="3" | |
| 78 | - ng-keyup="validateMinMax(plazo, 0, 365)" | |
| 79 | - select-on-click | |
| 80 | - teclado-virtual | |
| 81 | - foca-tipo-input | |
| 82 | - solo-positivos> | |
| 83 | - </div> | |
| 84 | - <div class="col-lg-2 col-2 text-center"> | |
| 85 | - <button | |
| 86 | - class="btn btn-outline-debo" | |
| 87 | - ng-click="addMorePlazos()" | |
| 88 | - ng-disabled="plazos.length == 4"> | |
| 89 | - <span class="fa fa-plus"></span> | |
| 90 | - </button> | |
| 91 | - </div> | |
| 92 | - <div class="col-lg-2 col-2 text-center"> | |
| 93 | - <button class="btn btn-primary"> | |
| 94 | - <span class="fa fa-save"></span> | |
| 95 | - </button> | |
| 96 | - </div> | |
| 71 | + <div class="col-lg-3 col-3"> | |
| 72 | + <button class="btn btn-sm text-center" ng-click="editPlazo()"> | |
| 73 | + <span ng-class="{'fa-pencil': plazos.length > 0, 'fa-plus': plazos.length == 0}" class="fa"></span> | |
| 74 | + </button> | |
| 75 | + </div> | |
| 76 | + </div> | |
| 77 | + <div ng-if="editingPlazo" class="row align-items-center justify-content-end py-2"> | |
| 78 | + <div class="col-2 col-sm-2 px-2" ng-repeat="plazo in plazos" ng-show="plazos.length > 0"> | |
| 79 | + <input | |
| 80 | + type="text" | |
| 81 | + class="form-control form-control-sm text-center" | |
| 82 | + ng-model="plazo.dias" | |
| 83 | + limite-numeros-max="3" | |
| 84 | + ng-keyup="validateMinMax(plazo, 0, 365)" | |
| 85 | + select-on-click | |
| 86 | + teclado-virtual | |
| 87 | + foca-tipo-input | |
| 88 | + solo-positivos> | |
| 89 | + </div> | |
| 90 | + <div class="col-lg-2 col-2 text-center"> | |
| 91 | + <button | |
| 92 | + class="btn btn-outline-debo" | |
| 93 | + ng-click="addMorePlazos()" | |
| 94 | + ng-disabled="plazos.length == 4"> | |
| 95 | + <span class="fa fa-plus"></span> | |
| 96 | + </button> | |
| 97 | + </div> | |
| 98 | + <div class="col-lg-2 col-2 text-center"> | |
| 99 | + <button class="btn btn-primary"> | |
| 100 | + <span class="fa fa-save"></span> | |
| 101 | + </button> | |
| 97 | 102 | </div> |
| 98 | 103 | </div> |
| 99 | 104 | </div> |
| 100 | 105 | </div> |
| 101 | 106 | </div> |
| 102 | - <div class="modal-footer py-2"> | |
| 103 | - <button class="btn btn-sm btn-secondary" type="button" ng-click="closeModalPrecioCondicion()">Cerrar | |
| 104 | - </button> | |
| 105 | - </div> | |
| 106 | -</div> | |
| 107 | 107 | \ No newline at end of file |
| 108 | +</div> | |
| 109 | +<div class="modal-footer py-2"> | |
| 110 | + <button class="btn btn-sm btn-secondary" type="button" ng-click="closeModalPrecioCondicion()">Cerrar | |
| 111 | + </button> | |
| 112 | + <button class="btn btn-sm btn-primary" type="button" ng-click="guardarPrecioCondicion()">Guardar | |
| 113 | + </button> | |
| 114 | +</div> |