Commit ab0f5bfabe2230160bfd22ba7ac06a3664ac0cae
Exists in
master
Merge branch 'master' into 'master'
Master (pmarco) See merge request modulos-npm/foca-crear-nota-pedido!87
Showing
2 changed files
Show diff stats
src/js/controller.js
| ... | ... | @@ -183,7 +183,9 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', |
| 183 | 183 | 'Nº: ' + $filter('comprobante')([ |
| 184 | 184 | $scope.puntoVenta, |
| 185 | 185 | $scope.comprobante |
| 186 | - ]) | |
| 186 | + ]) + '<br/>' + | |
| 187 | + 'Vendedor: ' + $scope.notaPedido.vendedor.NomVen + '<br/>' + | |
| 188 | + 'Total: ' + $filter('currency')($scope.getTotal()) | |
| 187 | 189 | ); |
| 188 | 190 | notaPedidoBusinessService.addArticulos($scope.articulosTabla, |
| 189 | 191 | data.data.id, $scope.notaPedido.cotizacion.VENDEDOR); |
| ... | ... | @@ -405,7 +407,8 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl', |
| 405 | 407 | modalInstance.result.then( |
| 406 | 408 | function(vendedor) { |
| 407 | 409 | addCabecera('Vendedor:', vendedor.NomVen); |
| 408 | - $scope.notaPedido.vendedor = vendedor; | |
| 410 | + $scope.notaPedido.vendedor.codigo = vendedor.CodVen; | |
| 411 | + $scope.notaPedido.vendedor.nombre = vendedor.NomVen; | |
| 409 | 412 | }, function() { |
| 410 | 413 | |
| 411 | 414 | } |
src/views/foca-crear-nota-pedido-ficha-cliente.html
| ... | ... | @@ -46,7 +46,7 @@ |
| 46 | 46 | <nav> |
| 47 | 47 | <ul class="pagination justify-content-end"> |
| 48 | 48 | <li class="page-item" ng-class="{'disabled': currentPage == 1}"> |
| 49 | - <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)"> | |
| 49 | + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)"> | |
| 50 | 50 | <span aria-hidden="true">«</span> |
| 51 | 51 | <span class="sr-only">Anterior</span> |
| 52 | 52 | </a> |
| ... | ... | @@ -58,13 +58,13 @@ |
| 58 | 58 | > |
| 59 | 59 | <a |
| 60 | 60 | class="page-link" |
| 61 | - href="#" | |
| 61 | + href="javascript:void();" | |
| 62 | 62 | ng-click="selectPage(pagina)" |
| 63 | 63 | ng-bind="pagina" |
| 64 | 64 | ></a> |
| 65 | 65 | </li> |
| 66 | 66 | <li class="page-item" ng-class="{'disabled': currentPage == lastPage}"> |
| 67 | - <a class="page-link" href="#" ng-click="selectPage(currentPage + 1)"> | |
| 67 | + <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage + 1)"> | |
| 68 | 68 | <span aria-hidden="true">»</span> |
| 69 | 69 | <span class="sr-only">Siguiente</span> |
| 70 | 70 | </a> |