Nicolás Guarnieri / foca-crear-nota-pedido

Download as
Browse Code »

Commit 8fafa96188a9bcc40e356d530a2f58918ab0c202

Authored by Eric Fernandez
2 parents e5a95f5401 f1196a7b34
Exists in master

Merge branch 'master' into 'master' 

Master(efernandez)

See merge request modulos-npm/foca-crear-nota-pedido!90
Showing 2 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ 8fafa96
... ... @@ -215,7 +215,8 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
215 215 $scope.comprobante = rellenar(res.data.numeroNotaPedido, 8);
216 216 },
217 217 function(err) {
218   - focaModalService.alert('La terminal no esta configurada correctamente');
  218 + focaModalService.alert(
  219 + 'La terminal no esta configurada correctamente');
219 220 console.info(err);
220 221 }
221 222 );
... ... @@ -339,8 +340,8 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
339 340 // funcion ejecutada cuando se cancela el modal
340 341 }
341 342 );
342   - }
343   -
  343 + };
  344 +
344 345 $scope.seleccionarArticulo = function() {
345 346 if ($scope.idLista === undefined) {
346 347 focaModalService.alert(
... ... @@ -356,7 +357,7 @@ angular.module('focaCrearNotaPedido') .controller('notaPedidoCtrl',
356 357 parametroProducto: {
357 358 idLista: $scope.idLista,
358 359 cotizacion: $scope.notaPedido.cotizacion.VENDEDOR,
359   - simbolo: $scope.notaPedido.moneda.simbolo
  360 + simbolo: $scope.notaPedido.moneda.SIMBOLO
360 361 }
361 362 },
362 363 size: 'lg'
src/views/nota-pedido.html
Diff comments   View file @ 8fafa96
... ... @@ -172,12 +172,14 @@
172 172 class="selectable"
173 173 ng-click="idLista == -1 && cambioEdit(articulo, 'precio')"
174 174 ng-hide="articulo.editPrecio"
175   - ng-bind="articulo.precio | currency: notaPedido.moneda.simbolo : 4">
  175 + ng-bind="articulo.precio |
  176 + currency: notaPedido.moneda.SIMBOLO : 4">
176 177 </i>
177 178 </td>
178 179 <td
179 180 class="col text-right"
180   - ng-bind="(articulo.precio * articulo.cantidad) | currency: notaPedido.moneda.simbolo">
  181 + ng-bind="(articulo.precio * articulo.cantidad) |
  182 + currency: notaPedido.moneda.SIMBOLO">
181 183 </td>
182 184 <td class="text-center">
183 185 <button
... ... @@ -232,7 +234,8 @@
232 234 <td class="col text-right">
233 235 <input
234 236 class="form-control"
235   - ng-value="articuloACargar.precio | currency: notaPedido.moneda.simbolo : 4"
  237 + ng-value="articuloACargar.precio |
  238 + currency: notaPedido.moneda.SIMBOLO : 4"
236 239 ng-show="idLista != -1"
237 240 readonly
238 241 >
... ... @@ -251,7 +254,7 @@
251 254 <td class="col text-right">
252 255 <input
253 256 class="form-control"
254   - ng-value="getSubTotal() | currency: notaPedido.moneda.simbolo"
  257 + ng-value="getSubTotal() | currency: notaPedido.moneda.SIMBOLO"
255 258 readonly
256 259 ></td>
257 260 <td class="text-center align-middle">
... ... @@ -282,7 +285,7 @@
282 285 <h3>Total:</h3>
283 286 </td>
284 287 <td class="table-celda-total text-right no-border-top" colspan="1">
285   - <h3>{{getTotal() | currency: notaPedido.moneda.simbolo}}</h3>
  288 + <h3>{{getTotal() | currency: notaPedido.moneda.SIMBOLO}}</h3>
286 289 </td>
287 290 <td class="text-right no-border-top">
288 291 <button
... ... @@ -344,11 +347,15 @@
344 347 <span ng-bind="'x' + articulo.cantidad"></span>
345 348 </div>
346 349 <div class="col-3 px-1 text-right">
347   - <span ng-bind="articulo.precio | currency: notaPedido.moneda.simbolo : 4"></span>
  350 + <span
  351 + ng-bind="articulo.precio |
  352 + currency: notaPedido.moneda.SIMBOLO : 4"
  353 + ></span>
348 354 </div>
349 355 <div class="col px-1 text-right">
350 356 <span
351   - ng-bind="(articulo.precio * articulo.cantidad) | currency: notaPedido.moneda.simbolo"
  357 + ng-bind="(articulo.precio * articulo.cantidad) |
  358 + currency: notaPedido.moneda.SIMBOLO"
352 359 >
353 360 </span>
354 361 </div>
... ... @@ -396,11 +403,13 @@
396 403 >
397 404 </div>
398 405 <div class="col-3 px-1 text-right">
399   - <span ng-bind="articuloACargar.precio | currency: notaPedido.moneda.simbolo : 4"></span>
  406 + <span ng-bind="articuloACargar.precio |
  407 + currency: notaPedido.moneda.SIMBOLO : 4"></span>
400 408 </div>
401 409 <div class="col px-1 text-right">
402 410 <span
403   - ng-bind="getSubTotal() | currency: notaPedido.moneda.simbolo"
  411 + ng-bind="getSubTotal() |
  412 + currency: notaPedido.moneda.SIMBOLO"
404 413 >
405 414 </span>
406 415 </div>
... ... @@ -458,7 +467,7 @@
458 467 <h3>Total:</h3>
459 468 </td>
460 469 <td class="table-celda-total text-right no-border-top">
461   - <h3>{{getTotal() | currency: notaPedido.moneda.simbolo}}</h3>
  470 + <h3>{{getTotal() | currency: notaPedido.moneda.SIMBOLO}}</h3>
462 471 </td>
463 472 </tr>
464 473 </tfoot>