Merge branch 'master' into 'develop'

Master(benjamin) See merge request !1

Merge branch 'master' into 'develop'
Master(benjamin) See merge request !1
Marcelo Puebla
2 parents 97ee93f75a 9cb80934c3
Showing 4 changed files Show diff stats
src/js/route.js
src/js/service.js
src/views/modal-login.html
src/views/orden-carga.html
@@ -0,0 +1,7 @@
+angular.module('focaCrearHojaRuta')
+    .config(['$routeProvider', function ($routeProvider) {
+        $routeProvider.when('/orden-carga', {
+            controller: 'focaOrdenCargaController',
+            templateUrl: 'src/views/orden-carga.html'
+        });
+    }]);
 angular.module('focaOrdenCarga')
-    .factory('focaOrdenCargaService', ['$http', 'API_ENDPOINT', function($http, API_ENDPOINT) {
-        return {
-            postLogin: function(login) {
-                return $http.post(API_ENDPOINT.URL + '/login/crear', login);
-            }
-        };
-    }]);
+    .factory('focaOrdenCargaService', ['$http', 'API_ENDPOINT',
+        function ($http, API_ENDPOINT) {
+            return {
+            };
+        }]);
...	...	@@ -0,0 +1,7 @@
	1	+angular.module('focaCrearHojaRuta')
	2	+ .config(['$routeProvider', function ($routeProvider) {
	3	+ $routeProvider.when('/orden-carga', {
	4	+ controller: 'focaOrdenCargaController',
	5	+ templateUrl: 'src/views/orden-carga.html'
	6	+ });
	7	+ }]);
1	1	angular.module('focaOrdenCarga')
2		- .factory('focaOrdenCargaService', ['$http', 'API_ENDPOINT', function($http, API_ENDPOINT) {
3		- return {
4		- postLogin: function(login) {
5		- return $http.post(API_ENDPOINT.URL + '/login/crear', login);
6		- }
7		- };
8		- }]);
	2	+ .factory('focaOrdenCargaService', ['$http', 'API_ENDPOINT',
	3	+ function ($http, API_ENDPOINT) {
	4	+ return {
	5	+ };
	6	+ }]);