Eric Fernandez / foca-crear-nota-pedido

Download as
Browse Code »

Commit 2f52e0f2bbc71e08387c3cbdd2dada9f9fc0d700

Authored by Eric Fernandez
2 parents d6ceaf88b8 6e29f73b8d
Exists in master

Merge branch 'master' into 'master' 

Master (pmarco)

See merge request modulos-npm/foca-crear-nota-pedido!29
Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 2f52e0f
... ... @@ -8,12 +8,12 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
8 8 $scope.botonera = [
9 9 {texto: 'Vendedor', accion: function() {$scope.seleccionarVendedor();}},
10 10 {texto: 'Cliente', accion: function() {$scope.seleccionarCliente();}},
  11 + {texto: 'Proveedor', accion: function() {}},
11 12 {texto: 'Moneda', accion: function() {$scope.abrirModalMoneda();}},
12 13 {
13 14 texto: 'Precios y condiciones',
14 15 accion: function() {$scope.abrirModalListaPrecio();}},
15 16 {texto: 'Flete', accion: function() {$scope.abrirModalFlete();}},
16   - {texto: 'Totales', accion: function() {}},
17 17 {texto: '', accion: function() {}},
18 18 {texto: '', accion: function() {}}
19 19 ];
src/views/nota-pedido.html
Diff comments   View file @ 2f52e0f
... ... @@ -5,13 +5,13 @@
5 5 <div class="row p-1 panel-informativo">
6 6 <div class="col-12">
7 7 <div class="row">
8   - <div class="col-3">
9   - {{ now | date:'dd/MM/yyyy HH:mm'}}
  8 + <div class="col-5">
  9 + <div class="h4">NOTA DE PEDIDO</div>
10 10 </div>
11   - <div class="col-6 text-center">
12   - <div class="h2">NOTA DE PEDIDO</div>
  11 + <div class="col-3">Nº {{puntoVenta}}-{{comprobante}}</div>
  12 + <div class="col-4 text-right">
  13 + Fecha: {{ now | date:'dd/MM/yyyy HH:mm'}}
13 14 </div>
14   - <div class="col-3 text-right">Nº {{puntoVenta}}-{{comprobante}}</div>
15 15 </div>
16 16 <div class="row">
17 17 <div class="col-auto" ng-repeat="cab in cabecera">
... ... @@ -166,7 +166,14 @@
166 166 <td class="table-celda-total text-right" colspan="1">
167 167 <h3>{{getTotal() | currency: '$'}}</h3>
168 168 </td>
169   - <td colspan="2"></td>
  169 + <td colspan="2" class="text-right">
  170 + <button
  171 + type="button"
  172 + class="btn btn-default btn-sm"
  173 + >
  174 + Totales
  175 + </button>
  176 + </td>
170 177 </tr>
171 178 </tfoot>
172 179 </table>