comprobante remito

Eric
1 parent 39f02c6899
Showing 3 changed files with 11 additions and 7 deletions Show diff stats
gulpfile.js
src/js/controller.js
src/views/remito.html
@@ -23,7 +23,7 @@ var paths = {
  
 gulp.task('uglify', gulpSequence('clean', ['templates', 'uglify-spec'], 'uglify-app'));
  
-gulp.task('templates', ['clean'], function() {
+gulp.task('templates', function() {
     return pump(
         [
             gulp.src(paths.srcViews),
@@ -322,8 +322,7 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                         if ($scope.remito.id === 0) {
  
                             $scope.remito.id = data.data.id;
-                            $scope.puntoVenta = data.data.sucursal;
-                            $scope.numeroRemito = data.data.numero;
+                            $scope.remito.numeroRemito = data.data.numero;
  
                             remitoBusinessService.addArticulos($scope.remito.articulosRemito,
                                 $scope.remito.id, $scope.remito.cotizacion.COTIZACION);
@@ -338,10 +337,14 @@ angular.module(&#39;focaCrearRemito&#39;) .controller(&#39;remitoController&#39;,
                                 crearRemitoService.crearPlazosParaRemito(json);
                             }
                         }
-                        abrirModalMail(data.data.id, $scope.remito.cliente, $filter('comprobante')([
-                            data.data.sucursal,
-                            data.data.numero
-                        ]));
+
+                        abrirModalMail($scope.remito.id,
+                            $scope.remito.cliente,
+                            $filter('comprobante')([
+                                $scope.puntoVenta,
+                                $scope.remito.numeroRemito
+                            ])
+                        );
  
                         init();
  
@@ -6,6 +6,7 @@
         class="mb-0 col-lg-12"
         busqueda="seleccionarRemito"
         ></foca-cabecera-facturador>
+        <marquee behavior="scroll" bgcolor="orange" scrolldelay="100" scrollamount="100">HTML scrolling text...html Lorem ipsum dolor sit amet consectetur, adipisicing elit. Repellendus, optio explicabo enim adipisci iste vitae. Beatae hic doloremque enim iste, qui vero, quod facilis odio et nisi autem debitis! Accusamus. </marquee>
     <div class="col-lg-12">
         <div class="row mt-4">
             <div class="col-12 col-md-10 col-lg-10 border border-light rounded">
...	...	@@ -23,7 +23,7 @@ var paths = {
23	23
24	24	gulp.task('uglify', gulpSequence('clean', ['templates', 'uglify-spec'], 'uglify-app'));
25	25
26		-gulp.task('templates', ['clean'], function() {
	26	+gulp.task('templates', function() {
27	27	return pump(
28	28	[
29	29	gulp.src(paths.srcViews),
...	...	@@ -322,8 +322,7 @@ angular.module('focaCrearRemito') .controller('remitoController',
322	322	if ($scope.remito.id === 0) {
323	323
324	324	$scope.remito.id = data.data.id;
325		- $scope.puntoVenta = data.data.sucursal;
326		- $scope.numeroRemito = data.data.numero;
	325	+ $scope.remito.numeroRemito = data.data.numero;
327	326
328	327	remitoBusinessService.addArticulos($scope.remito.articulosRemito,
329	328	$scope.remito.id, $scope.remito.cotizacion.COTIZACION);
...	...	@@ -338,10 +337,14 @@ angular.module('focaCrearRemito') .controller('remitoController',
338	337	crearRemitoService.crearPlazosParaRemito(json);
339	338	}
340	339	}
341		- abrirModalMail(data.data.id, $scope.remito.cliente, $filter('comprobante')([
342		- data.data.sucursal,
343		- data.data.numero
344		- ]));
	340	+
	341	+ abrirModalMail($scope.remito.id,
	342	+ $scope.remito.cliente,
	343	+ $filter('comprobante')([
	344	+ $scope.puntoVenta,
	345	+ $scope.remito.numeroRemito
	346	+ ])
	347	+ );
345	348
346	349	init();
347	350
...	...	@@ -6,6 +6,7 @@
6	6	class="mb-0 col-lg-12"
7	7	busqueda="seleccionarRemito"
8	8	></foca-cabecera-facturador>
	9	+ <marquee behavior="scroll" bgcolor="orange" scrolldelay="100" scrollamount="100">HTML scrolling text...html Lorem ipsum dolor sit amet consectetur, adipisicing elit. Repellendus, optio explicabo enim adipisci iste vitae. Beatae hic doloremque enim iste, qui vero, quod facilis odio et nisi autem debitis! Accusamus. </marquee>
9	10	<div class="col-lg-12">
10	11	<div class="row mt-4">
11	12	<div class="col-12 col-md-10 col-lg-10 border border-light rounded">