Commit d321dc8747c1bfbc9dcf6bae66f6fdd625cdde94
1 parent
b6c8728a66
Exists in
master
upstream
Showing
9 changed files
with
74 additions
and
7 deletions
Show diff stats
gulpfile.js
... | ... | @@ -11,7 +11,7 @@ const watch = require('gulp-watch'); |
11 | 11 | |
12 | 12 | var paths = { |
13 | 13 | srcHTML : 'src/views/*.html', |
14 | - srcJS : 'src/**/*.js', | |
14 | + srcJS : 'src/js/*.js', | |
15 | 15 | dist : 'dist/', |
16 | 16 | distHTML : 'dist/views/' |
17 | 17 | }; |
... | ... | @@ -73,8 +73,8 @@ gulp.task('webserver', function() { |
73 | 73 | }); |
74 | 74 | |
75 | 75 | gulp.task('watch', function() { |
76 | - gulp.watch(archivosJS, ['uglify']); | |
77 | - gulp.watch('css/scss/*.scss', ['sass']); | |
76 | + gulp.watch([paths.srcJS], ['uglify']); | |
77 | + gulp.watch('src/sass/*.scss', ['sass']); | |
78 | 78 | }) |
79 | 79 | |
80 | 80 | gulp.task('reload'), function() { |
index.html
... | ... | @@ -18,6 +18,7 @@ |
18 | 18 | <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script> |
19 | 19 | <script src="./node_modules/angular-on-screen-keyboard/dist/angular-on-screen-keyboard.min.js"></script> |
20 | 20 | <script src="./node_modules/angular-sanitize/angular-sanitize.min.js"></script> |
21 | + <script src="./node_modules/angular-i18n/angular-locale_es-ar.js"></script> | |
21 | 22 | |
22 | 23 | <script src="../foca-directivas/tmp/foca-directivas.js"></script> |
23 | 24 | <script src="./node_modules/foca-botonera-principal/dist/foca-botonera-principal.min.js"></script> |
... | ... | @@ -31,8 +32,8 @@ |
31 | 32 | <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script> |
32 | 33 | <script src="./node_modules/foca-modal-flete/dist/foca-modal-flete.min.js"></script> |
33 | 34 | <script src="./node_modules/foca-modal-moneda/dist/foca-modal-moneda.min.js"></script> |
34 | - <script src="./node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script> | |
35 | - <script src="../foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script> | |
35 | + <script src="./node_modules/foca-modal-precio-condiciones/dist/foca-modal-precio-condiciones.min.js"></script> | |
36 | + <script src="./node_modules/foca-modal-proveedor/dist/foca-modal-proveedor.min.js"></script> | |
36 | 37 | <script src="./node_modules/foca-modal-vendedores/dist/foca-modal-vendedores.min.js"></script> |
37 | 38 | <script src="./node_modules/foca-busqueda-cliente/dist/foca-busqueda-cliente.min.js"></script> |
38 | 39 | <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script> |
package.json
... | ... | @@ -22,6 +22,7 @@ |
22 | 22 | "dependencies": { |
23 | 23 | "angular": "^1.7.5", |
24 | 24 | "angular-cookies": "^1.7.5", |
25 | + "angular-i18n": "^1.7.5", | |
25 | 26 | "angular-on-screen-keyboard": "git+https://github.com/ericf97/angular-on-screen-keyboard.git", |
26 | 27 | "angular-route": "^1.7.5", |
27 | 28 | "angular-sanitize": "^1.7.5", |
... | ... | @@ -39,8 +40,8 @@ |
39 | 40 | "foca-modal-domicilio": "git+https://debo.suite.repo/modulos-npm/foca-modal-domicilio.git", |
40 | 41 | "foca-modal-flete": "git+https://debo.suite.repo/modulos-npm/foca-modal-flete.git", |
41 | 42 | "foca-modal-moneda": "git+https://debo.suite.repo/modulos-npm/foca-modal-moneda.git", |
42 | - "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git", | |
43 | 43 | "foca-modal-precio-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-modal-precio-condiciones.git", |
44 | + "foca-modal-proveedor": "git+https://debo.suite.repo/modulos-npm/foca-modal-proveedor.git", | |
44 | 45 | "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git", |
45 | 46 | "foca-teclado": "git+https://debo.suite.repo/modulos-npm/foca-teclado.git", |
46 | 47 | "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git", |
src/js/app.js
src/sass/_botonera-lateral.scss
src/sass/_botonera-secundaria.scss
src/sass/_contenedor.scss
src/sass/_tabla-articulos.scss
... | ... | @@ -0,0 +1,47 @@ |
1 | +.tabla-articulo { | |
2 | + max-height: 420px; | |
3 | + display: -moz-groupbox; | |
4 | + width: 100%; | |
5 | + display: block; | |
6 | + | |
7 | + tr { | |
8 | + width: 100%; | |
9 | + display: inline-table; | |
10 | + table-layout: fixed; | |
11 | + } | |
12 | + | |
13 | + tbody { | |
14 | + overflow-y: auto; | |
15 | + max-height: 280px; | |
16 | + width: 100%; | |
17 | + display: block; | |
18 | + } | |
19 | + | |
20 | + &-numero { | |
21 | + width: 25px; | |
22 | + } | |
23 | + | |
24 | + &-codigo { | |
25 | + width: 70px; | |
26 | + } | |
27 | + | |
28 | + &-descripcion { | |
29 | + width: 250px; | |
30 | + } | |
31 | + | |
32 | + &-cantidad { | |
33 | + width: 100px; | |
34 | + } | |
35 | + | |
36 | + &-precio { | |
37 | + width: 130px; | |
38 | + } | |
39 | + | |
40 | + &-subtotal { | |
41 | + width: 130px; | |
42 | + } | |
43 | + | |
44 | + &-boton { | |
45 | + width: 52px; | |
46 | + } | |
47 | +} |
src/sass/general.scss
1 | 1 | @import 'bootstrap'; |
2 | 2 | @import 'botonera'; |
3 | +@import 'botonera-lateral'; | |
3 | 4 | @import 'botonera-principal'; |
4 | 5 | @import 'botonera-secundaria'; |
5 | 6 | @import 'contenedor'; |
... | ... | @@ -8,3 +9,4 @@ |
8 | 9 | @import 'panel-informativo'; |
9 | 10 | @import 'tabla'; |
10 | 11 | @import 'teclado'; |
12 | +@import 'tabla-articulos'; |