Commit f2d49ad0090e2514e11237fb65fbcedd10224e0b

Authored by Eric Fernandez
Exists in master

Merge branch 'master' into 'master'

Master (pmarco)

See merge request Wrappers/wrapper-demo!2
... ... @@ -14,6 +14,7 @@
14 14 <script src="./node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
15 15 <script src="./node_modules/angular/angular.min.js"></script>
16 16 <script src="./node_modules/angular-route/angular-route.min.js"></script>
  17 + <script src="./node_modules/angular-cookies/angular-cookies.min.js"></script>
17 18 <script src="./node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
18 19  
19 20 <script src="./node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
... ... @@ -23,6 +24,7 @@
23 24 <script src="./node_modules/foca-abm-precios-condiciones/dist/foca-abm-precios-condiciones.min.js"></script>
24 25 <script src="./node_modules/foca-abm-sectores/dist/foca-abm-sectores.min.js"></script>
25 26 <script src="./node_modules/foca-crear-nota-pedido/dist/foca-crear-nota-pedido.min.js"></script>
  27 + <script src="./node_modules/foca-login/dist/foca-login.min.js"></script>
26 28 <script src="./node_modules/foca-modal/dist/foca-modal.min.js"></script>
27 29 <script src="./node_modules/foca-modal-busqueda-productos/dist/foca-busqueda-productos.min.js"></script>
28 30 <script src="./node_modules/foca-modal-petroleras/dist/foca-modal-petroleras.min.js"></script>
... ... @@ -15,32 +15,34 @@
15 15 ],
16 16 "repository": {
17 17 "type": "git",
18   - "url": "https://192.168.0.11/Wrappers/wrapper-demo.git"
  18 + "url": "https://debo.suite.repo/Wrappers/wrapper-demo.git"
19 19 },
20 20 "author": "Foca Software",
21 21 "license": "ISC",
22 22 "dependencies": {
23   - "angular": "^1.7.4",
24   - "angular-route": "1.7.3",
25   - "bootstrap": "4.1.3",
26   - "foca-abm-plazo-pago": "git+https://192.168.0.11/modulos-npm/foca-abm-plazo-pago.git",
27   - "foca-abm-precios-condiciones": "git+https://192.168.0.11/modulos-npm/foca-abm-precios-condiciones.git",
28   - "foca-abm-sectores": "git+https://192.168.0.11/modulos-npm/foca-abm-sectores",
29   - "foca-botonera-horizontal": "git+https://192.168.0.11/modulos-npm/foca-botonera-horizontal.git",
30   - "foca-busqueda-cliente": "git+https://192.168.0.11/modulos-npm/foca-busqueda-cliente.git",
31   - "foca-crear-nota-pedido": "git+https://192.168.0.11/modulos-npm/foca-crear-nota-pedido.git",
32   - "foca-directivas": "git+https://192.168.0.11/modulos-npm/foca-directivas.git",
33   - "foca-modal": "git+https://192.168.0.11/modulos-npm/foca-modal",
34   - "foca-modal-busqueda-productos": "git+https://192.168.0.11/nguarnieri/foca-modal-busqueda-productos",
35   - "foca-modal-petroleras": "git+https://192.168.0.11/modulos-npm/foca-modal-petroleras.git",
36   - "foca-modal-vendedores": "git+https://192.168.0.11/modulos-npm/foca-modal-vendedores.git",
37   - "foca-turno-apertura": "git+https://192.168.0.11/modulos-npm/foca-turno-apertura.git",
38   - "font-awesome": "4.7.0",
  23 + "angular": "^1.7.5",
  24 + "angular-cookies": "^1.7.5",
  25 + "angular-route": "^1.7.5",
  26 + "bootstrap": "^4.1.3",
  27 + "foca-abm-plazo-pago": "git+https://debo.suite.repo/modulos-npm/foca-abm-plazo-pago.git",
  28 + "foca-abm-precios-condiciones": "git+https://debo.suite.repo/modulos-npm/foca-abm-precios-condiciones.git",
  29 + "foca-abm-sectores": "git+https://debo.suite.repo/modulos-npm/foca-abm-sectores",
  30 + "foca-botonera-horizontal": "git+https://debo.suite.repo/modulos-npm/foca-botonera-horizontal.git",
  31 + "foca-busqueda-cliente": "git+https://debo.suite.repo/modulos-npm/foca-busqueda-cliente.git",
  32 + "foca-crear-nota-pedido": "git+https://debo.suite.repo/modulos-npm/foca-crear-nota-pedido.git",
  33 + "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
  34 + "foca-login": "git+https://debo.suite.repo/modulos-npm/foca-login.git",
  35 + "foca-modal": "git+https://debo.suite.repo/modulos-npm/foca-modal",
  36 + "foca-modal-busqueda-productos": "git+https://debo.suite.repo/nguarnieri/foca-modal-busqueda-productos",
  37 + "foca-modal-petroleras": "git+https://debo.suite.repo/modulos-npm/foca-modal-petroleras.git",
  38 + "foca-modal-vendedores": "git+https://debo.suite.repo/modulos-npm/foca-modal-vendedores.git",
  39 + "foca-turno-apertura": "git+https://debo.suite.repo/modulos-npm/foca-turno-apertura.git",
  40 + "font-awesome": "^4.7.0",
39 41 "gulp-angular-templatecache": "^2.2.1",
40 42 "gulp-htmlmin": "^5.0.1",
41 43 "gulp-uglify": "^3.0.1",
42   - "jquery": "3.3.1",
43   - "node-sass": "4.9.4",
  44 + "jquery": "^3.3.1",
  45 + "node-sass": "^4.9.4",
44 46 "uglify": "^0.1.5",
45 47 "ui-bootstrap4": "^3.0.5"
46 48 },
1 1 angular.module('appWrapperDemo', [
  2 + 'ngCookies',
2 3 'ngRoute',
3 4 'ui.bootstrap',
4 5 'focaBotoneraHorizontal',
... ... @@ -8,5 +9,6 @@ angular.module(&#39;appWrapperDemo&#39;, [
8 9 'focaAbmSectores',
9 10 'focaBusquedaCliente',
10 11 'focaCrearNotaPedido',
  12 + 'focaLogin',
11 13 'focaModal'
12 14 ]);