Commit 6296f93777ffd6f3b2524b42052f415e95dd1d17

Authored by Eric Fernandez
Exists in master and in 1 other branch develop

Merge remote-tracking branch 'upstream/master'

img/seguimientoHojaRuta.png

11.8 KB

img/seguimientoNotaPedido.png

12 KB

1 { 1 {
2 "name": "wrapper-demo", 2 "name": "wrapper-demo",
3 "version": "0.0.1", 3 "version": "0.0.1",
4 "description": "", 4 "description": "",
5 "main": "main.js", 5 "main": "main.js",
6 "scripts": { 6 "scripts": {
7 "initdev": "npm install gulp --global && npm install && npm install -g jshint", 7 "initdev": "npm install gulp --global && npm install && npm install -g jshint",
8 "gulp-pre-commit": "gulp pre-commit", 8 "gulp-pre-commit": "gulp pre-commit",
9 "compile": "gulp uglify && gulp sass", 9 "compile": "gulp uglify && gulp sass",
10 "postinstall": "npm install foca-abm-plazo-pago foca-abm-precios-condiciones foca-abm-sectores foca-abm-vehiculo foca-admin-seguimiento foca-botonera-principal foca-busqueda-cliente foca-configuracion foca-crear-cobranza foca-crear-hoja-ruta foca-crear-nota-pedido foca-crear-remito foca-directivas foca-filtros foca-hoja-ruta foca-login foca-modal foca-modal-banco foca-modal-busqueda-productos foca-modal-cheque foca-modal-chofer foca-modal-cobrador foca-modal-cotizacion foca-modal-detalle-hoja-ruta foca-modal-domicilio foca-modal-efectivo foca-modal-factura foca-modal-flete foca-modal-localidad foca-modal-moneda foca-modal-nota-pedido foca-modal-precio-condiciones foca-modal-proveedor foca-modal-provincia foca-modal-remito foca-modal-tarifa-flete foca-modal-transportista foca-modal-vehiculo foca-modal-vendedores foca-nombre-empresa foca-seguimiento foca-teclado",
11 "actualizar": "git pull origin master", 10 "actualizar": "git pull origin master",
12 "install-dev": "gulp pre-install && npm install && gulp post-install" 11 "install-dev": "gulp pre-install && npm install && gulp post-install"
13 }, 12 },
14 "pre-commit": [ 13 "pre-commit": [
15 "gulp-pre-commit" 14 "gulp-pre-commit"
16 ], 15 ],
17 "repository": { 16 "repository": {
18 "type": "git", 17 "type": "git",
19 "url": "ssh://git@debonline.dyndns.org:npm/wrapper-demo.git" 18 "url": "ssh://git@debonline.dyndns.org:npm/wrapper-demo.git"
20 }, 19 },
21 "author": "Foca Software", 20 "author": "Foca Software",
22 "license": "ISC", 21 "license": "ISC",
23 "dependencies": { 22 "dependencies": {
24 "angular": "^1.7.5", 23 "angular": "^1.7.5",
25 "angular-cookies": "^1.7.5", 24 "angular-cookies": "^1.7.5",
26 "angular-i18n": "^1.7.5", 25 "angular-i18n": "^1.7.5",
27 "angular-ladda": "^0.4.3", 26 "angular-ladda": "^0.4.3",
28 "angular-route": "^1.7.5", 27 "angular-route": "^1.7.5",
29 "angular-sanitize": "^1.7.5", 28 "angular-sanitize": "^1.7.5",
30 "angular-ui-swiper": "^2.3.8", 29 "angular-ui-swiper": "^2.3.8",
31 "bootstrap": "^4.1.3", 30 "bootstrap": "^4.1.3",
32 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git", 31 "foca-abm-plazo-pago": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-plazo-pago.git",
33 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git", 32 "foca-abm-precios-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-precios-condiciones.git",
34 "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git", 33 "foca-abm-sectores": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-sectores.git",
35 "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git", 34 "foca-abm-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-vehiculo.git",
36 "foca-admin-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-admin-seguimiento.git", 35 "foca-admin-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-admin-seguimiento.git",
37 "foca-botonera-principal": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-principal.git", 36 "foca-botonera-principal": "git+ssh://git@debonline.dyndns.org:npm/foca-botonera-principal.git",
38 "foca-busqueda-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-busqueda-cliente.git", 37 "foca-busqueda-cliente": "git+ssh://git@debonline.dyndns.org:npm/foca-busqueda-cliente.git",
39 "foca-configuracion": "git+ssh://git@debonline.dyndns.org:npm/foca-configuracion.git", 38 "foca-configuracion": "git+ssh://git@debonline.dyndns.org:npm/foca-configuracion.git",
40 "foca-crear-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-cobranza.git", 39 "foca-crear-cobranza": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-cobranza.git",
41 "foca-crear-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-hoja-ruta.git", 40 "foca-crear-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-hoja-ruta.git",
42 "foca-crear-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-nota-pedido.git", 41 "foca-crear-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-nota-pedido.git",
43 "foca-crear-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-remito.git", 42 "foca-crear-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-crear-remito.git",
44 "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git", 43 "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git",
45 "foca-filtros": "git+ssh://git@debonline.dyndns.org:npm/foca-filtros.git", 44 "foca-filtros": "git+ssh://git@debonline.dyndns.org:npm/foca-filtros.git",
46 "foca-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-hoja-ruta.git", 45 "foca-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-hoja-ruta.git",
47 "foca-login": "git+ssh://git@debonline.dyndns.org:npm/foca-login.git", 46 "foca-login": "git+ssh://git@debonline.dyndns.org:npm/foca-login.git",
48 "foca-modal": "git+ssh://git@debonline.dyndns.org:npm/foca-modal.git", 47 "foca-modal": "git+ssh://git@debonline.dyndns.org:npm/foca-modal.git",
49 "foca-modal-banco": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-banco.git", 48 "foca-modal-banco": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-banco.git",
50 "foca-modal-busqueda-productos": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-busqueda-productos.git", 49 "foca-modal-busqueda-productos": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-busqueda-productos.git",
51 "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git", 50 "foca-modal-cheque": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cheque.git",
52 "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git", 51 "foca-modal-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-chofer.git",
53 "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git", 52 "foca-modal-cobrador": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cobrador.git",
54 "foca-modal-cobranza": "git+http://git.focasoftware.com/npm/foca-modal-cobranza.git", 53 "foca-modal-cobranza": "git+http://git.focasoftware.com/npm/foca-modal-cobranza.git",
55 "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git", 54 "foca-modal-cotizacion": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-cotizacion.git",
56 "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git", 55 "foca-modal-detalle-hoja-ruta": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-detalle-hoja-ruta.git",
57 "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git", 56 "foca-modal-domicilio": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-domicilio.git",
58 "foca-modal-efectivo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-efectivo.git", 57 "foca-modal-efectivo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-efectivo.git",
59 "foca-modal-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura.git", 58 "foca-modal-factura": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-factura.git",
60 "foca-modal-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-flete.git", 59 "foca-modal-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-flete.git",
61 "foca-modal-localidad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localidad.git", 60 "foca-modal-localidad": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-localidad.git",
62 "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git", 61 "foca-modal-moneda": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-moneda.git",
63 "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git", 62 "foca-modal-nota-pedido": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-nota-pedido.git",
64 "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git", 63 "foca-modal-precio-condiciones": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-precio-condiciones.git",
65 "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git", 64 "foca-modal-proveedor": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-proveedor.git",
66 "foca-modal-provincia": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-provincia.git", 65 "foca-modal-provincia": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-provincia.git",
67 "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git", 66 "foca-modal-remito": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-remito.git",
68 "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git", 67 "foca-modal-tarifa-flete": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-tarifa-flete.git",
69 "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git", 68 "foca-modal-transportista": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-transportista.git",
70 "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git", 69 "foca-modal-vehiculo": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vehiculo.git",
71 "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git", 70 "foca-modal-vendedores": "git+ssh://git@debonline.dyndns.org:npm/foca-modal-vendedores.git",
72 "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git", 71 "foca-nombre-empresa": "git+ssh://git@debonline.dyndns.org:npm/foca-nombre-empresa.git",
73 "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git", 72 "foca-seguimiento": "git+ssh://git@debonline.dyndns.org:npm/foca-seguimiento.git",
74 "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git", 73 "foca-teclado": "git+ssh://git@debonline.dyndns.org:npm/foca-teclado.git",
75 "font-awesome": "^4.7.0", 74 "font-awesome": "^4.7.0",
76 "gulp-angular-templatecache": "^2.2.1", 75 "gulp-angular-templatecache": "^2.2.1",
77 "gulp-htmlmin": "^5.0.1", 76 "gulp-htmlmin": "^5.0.1",
78 "gulp-uglify": "^3.0.1", 77 "gulp-uglify": "^3.0.1",
79 "gulp-uglify-es": "^1.0.4", 78 "gulp-uglify-es": "^1.0.4",
80 "jquery": "^3.3.1", 79 "jquery": "^3.3.1",
81 "ladda": "1.0.6", 80 "ladda": "1.0.6",
82 "leaflet": "1.3.4", 81 "leaflet": "1.3.4",
83 "ngstorage": "^0.3.11", 82 "ngstorage": "^0.3.11",
84 "node-sass": "^4.10.0", 83 "node-sass": "^4.10.0",
85 "uglify": "^0.1.5", 84 "uglify": "^0.1.5",
86 "ui-bootstrap4": "^3.0.5" 85 "ui-bootstrap4": "^3.0.5"
87 }, 86 },
88 "devDependencies": { 87 "devDependencies": {
89 "electron": "^3.0.2", 88 "electron": "^3.0.2",
90 "gulp": "^3.9.1", 89 "gulp": "^3.9.1",
91 "gulp-clean": "^0.4.0", 90 "gulp-clean": "^0.4.0",
92 "gulp-concat": "^2.6.1", 91 "gulp-concat": "^2.6.1",
93 "gulp-connect": "^5.6.1", 92 "gulp-connect": "^5.6.1",
94 "gulp-jshint": "^2.1.0", 93 "gulp-jshint": "^2.1.0",
95 "gulp-rename": "^1.4.0", 94 "gulp-rename": "^1.4.0",
96 "gulp-replace": "^1.0.0", 95 "gulp-replace": "^1.0.0",
97 "gulp-sass": "^4.0.1", 96 "gulp-sass": "^4.0.1",
98 "gulp-uglify": "^1.0.4", 97 "gulp-uglify": "^1.0.4",
99 "gulp-watch": "^5.0.1", 98 "gulp-watch": "^5.0.1",
100 "jasmine-core": "^3.2.1", 99 "jasmine-core": "^3.2.1",
101 "jshint": "^2.9.6", 100 "jshint": "^2.9.6",
102 "pre-commit": "^1.2.2", 101 "pre-commit": "^1.2.2",
103 "pump": "^3.0.0" 102 "pump": "^3.0.0"
104 } 103 }
105 } 104 }
106 105
src/sass/_botonera-principal.scss
1 .botonera-principal { 1 .botonera-principal {
2 menuitem { 2 menuitem {
3 display: inline-block; 3 display: inline-block;
4 height: 130px; 4 height: 130px;
5 text-align: center; 5 text-align: center;
6 width: 180px; 6 width: 180px;
7 @media (max-width: 576px) { 7 @media (max-width: 576px) {
8 width: 100%; 8 width: 100%;
9 } 9 }
10 } 10 }
11 button { 11 button {
12 background-image: url('../img/botonera.png'); 12 background-image: url('../img/botonera.png');
13 border-radius: 12px; 13 border-radius: 12px;
14 border-width: 0; 14 border-width: 0;
15 height: 90px; 15 height: 90px;
16 position: relative; 16 position: relative;
17 width: 90px; 17 width: 90px;
18 span { 18 span {
19 left: 0; 19 left: 0;
20 position: absolute; 20 position: absolute;
21 text-align: center; 21 text-align: center;
22 top: 90px; 22 top: 90px;
23 width: 100%; 23 width: 100%;
24 font-size: 12px; 24 font-size: 12px;
25 color: #777777; 25 color: #777777;
26 } 26 }
27 } 27 }
28 &-menu { 28 &-menu {
29 padding-left: 90px; 29 padding-left: 90px;
30 @media (max-width: 576px) { 30 @media (max-width: 576px) {
31 padding: 0; 31 padding: 0;
32 } 32 }
33 } 33 }
34 &-logo { 34 &-logo {
35 width: 80%; 35 width: 80%;
36 opacity: .8; 36 opacity: .8;
37 @media (max-width: 576px) { 37 @media (max-width: 576px) {
38 width: 100%; 38 width: 100%;
39 } 39 }
40 } 40 }
41 &-vacio { 41 &-vacio {
42 & button { 42 & button {
43 background-position: -4380px 0; 43 background-position: -4380px 0;
44 &:hover { 44 &:hover {
45 background-position: -4380px -90px; 45 background-position: -4380px -90px;
46 } 46 }
47 } 47 }
48 } 48 }
49 &-abrir-turno { 49 &-abrir-turno {
50 & button { 50 & button {
51 background-position: 0 0; 51 background-position: 0 0;
52 &:hover { 52 &:hover {
53 background-position: 0 -90px; 53 background-position: 0 -90px;
54 } 54 }
55 } 55 }
56 } 56 }
57 &-cerrar-turno { 57 &-cerrar-turno {
58 & button { 58 & button {
59 background-position: -90px 0; 59 background-position: -90px 0;
60 &:hover { 60 &:hover {
61 background-position: -90px -90px; 61 background-position: -90px -90px;
62 } 62 }
63 } 63 }
64 } 64 }
65 &-caja { 65 &-caja {
66 & button { 66 & button {
67 background-position: -180px 0; 67 background-position: -180px 0;
68 &:hover { 68 &:hover {
69 background-position: -180px -90px; 69 background-position: -180px -90px;
70 } 70 }
71 } 71 }
72 } 72 }
73 &-facturador { 73 &-facturador {
74 & button { 74 & button {
75 background-position: -270px 0px; 75 background-position: -270px 0px;
76 &:hover { 76 &:hover {
77 background-position: -270px -90px; 77 background-position: -270px -90px;
78 } 78 }
79 } 79 }
80 } 80 }
81 &-nota-pedido { 81 &-nota-pedido {
82 & button { 82 & button {
83 background-position: -1250px 0px; 83 background-position: -1250px 0px;
84 &:hover { 84 &:hover {
85 background-position: -1250px -90px; 85 background-position: -1250px -90px;
86 } 86 }
87 } 87 }
88 } 88 }
89 &-remito { 89 &-remito {
90 & button { 90 & button {
91 background-position: -4560px 0px; 91 background-position: -4560px 0px;
92 &:hover { 92 &:hover {
93 background-position: -4560px -90px; 93 background-position: -4560px -90px;
94 } 94 }
95 } 95 }
96 } 96 }
97 &-hoja-ruta { 97 &-hoja-ruta {
98 & button { 98 & button {
99 background-position: -4650px 0px; 99 background-position: -4650px 0px;
100 &:hover { 100 &:hover {
101 background-position: -4650px -90px; 101 background-position: -4650px -90px;
102 } 102 }
103 } 103 }
104 } 104 }
105 &-hoja-ruta-transportista {
106 & button {
107 background-image: url('../img/hojaRutaVolante.png');
108 background-size: 90px 90px;
109 &:hover {
110 background-color: rgb(250,250,250);
111 }
112 }
113 }
105 &-seguimiento { 114 &-seguimiento {
106 & button { 115 & button {
107 background-position: -4470px 0px; 116 background-image: url('../img/seguimientoNotaPedido.png');
117 background-size: 90px 90px;
118 background-position: 15px 10px;
108 &:hover { 119 &:hover {
109 background-position: -4470px -90px; 120 background-color: rgb(250,250,250);
110 } 121 }
111 } 122 }
112 } 123 }
113 &-seguimiento-hoja-ruta { 124 &-seguimiento-hoja-ruta {
114 & button { 125 & button {
115 background-image: url('../img/hojaRutaVolante.png'); 126 background-image: url('../img/seguimientoHojaRuta.png');
116 background-size: 90px 90px; 127 background-size: 90px 90px;
128 background-position: 15px 10px;
129 &:hover {
130 background-color: rgb(250,250,250);
131 }
117 } 132 }
118 } 133 }
119 &-cobranzas { 134 &-cobranzas {
120 & button { 135 & button {
121 background-position: -1880 0px; 136 background-position: -1880 0px;
122 &:hover { 137 &:hover {
123 background-position: -1880 -90px; 138 background-position: -1880 -90px;
124 } 139 }
125 } 140 }
126 } 141 }
127 &-seguimiento-cobranzas { 142 &-seguimiento-cobranzas {
128 & button { 143 & button {
129 background-image: url('../img/seguimientoCobranza.png'); 144 background-image: url('../img/seguimientoCobranza.png');
130 background-size: 90px 90px; 145 background-size: 90px 90px;
146 background-position: 15px 10px;
147 &:hover {
148 background-color: rgb(250,250,250);
149 }
131 } 150 }
132 } 151 }
133 &-vehiculo { 152 &-vehiculo {
134 & button { 153 & button {
135 background-position: -4560px 0px; 154 background-position: -4560px 0px;
136 &:hover { 155 &:hover {
137 background-position: -4560px -90px; 156 background-position: -4560px -90px;
138 } 157 }
139 } 158 }
140 } 159 }
141 &-precio-condicion { 160 &-precio-condicion {
142 & button { 161 & button {
143 background-position: -4560px 0px; 162 background-position: -4560px 0px;
144 &:hover { 163 &:hover {
145 background-position: -4560px -90px; 164 background-position: -4560px -90px;
146 } 165 }
147 } 166 }
148 } 167 }
149 .swiper-pagination { 168 .swiper-pagination {
150 bottom: 0px !important; 169 bottom: 0px !important;
151 } 170 }
152 171
153 .swiper-button-next { 172 .swiper-button-next {
154 background-image: url('../img/derecha.png'); 173 background-image: url('../img/derecha.png');
155 } 174 }
156 175
157 .swiper-button-prev { 176 .swiper-button-prev {
158 background-image: url('../img/izquierda.png'); 177 background-image: url('../img/izquierda.png');
159 } 178 }
160 } 179 }
161 180