From 1eac85e796eefb00c8c39aa1f74325d7dd416e2c Mon Sep 17 00:00:00 2001 From: me Date: Fri, 4 Jul 2014 13:00:01 +0800 Subject: [PATCH 1/3] Added .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..723ef36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea \ No newline at end of file From ee61c336e89b59a3c7117b87ba936312f1369ef2 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 4 Jul 2014 13:37:36 +0800 Subject: [PATCH 2/3] Refactored Products, Orders, added Reports --- gcore-angular.js | 110 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 5 deletions(-) diff --git a/gcore-angular.js b/gcore-angular.js index 68154da..88e6469 100644 --- a/gcore-angular.js +++ b/gcore-angular.js @@ -173,8 +173,59 @@ angular.module('gcore', ['ngCookies']) }); }, - - /*** Orders ***/ + + /*** Re-factored Reports ***/ + reports: { + list: function( store, type, params ) { + var url = endpoint + "/stores/" + store + "/reports/" + type; + url += self.url_params(params); + return $http.get( + url, {headers: self.get_request_headers()} + ); + }, + update: function ( store, type, params ) { + var url = endpoint + "/stores/" + store + "/reports/" + type; + url += self.url_params(params); + return $http.put( + url, + params['_json'] ? JSON.stringify(params['_json']) : JSON.stringify(params), + {headers: self.get_request_headers()} + ); + } + }, + + /*** Re-factored Orders ***/ + orders: { + list: function( id, params ) { + var url; + if (id !== null || undefined) { + url = endpoint + "/sales_orders/" + id; + } + else { + url = endpoint + "/sales_orders/"; + } + url += self.url_params(params); + return $http.get( + url, {headers: self.get_request_headers()} + ); + }, + update: function ( id, params ) { + var url; + if (id !== null || undefined) { + url = endpoint + "/sales_orders/" + id; + } + else { + url = endpoint + "/sales_orders/"; + } + return $http.put( + url, + params['_json'] ? JSON.stringify(params['_json']) : JSON.stringify(params), + {headers: self.get_request_headers()} + ); + } + }, + + /*** Orders ***/ list_orders: function(params) { @@ -226,9 +277,58 @@ angular.module('gcore', ['ngCookies']) {headers: self.get_request_headers()} ); }, - - - /*** Products ***/ + + /*** Re-Factored Products ***/ + products: { + list: function( id, params ) { + var url; + if (id !== null || undefined) { + url = endpoint + "/stores/" + params['stores'] + "/products" + id; + } + else { + url = endpoint + "/stores/" + params['stores'] + "/products"; + } + url += self.url_params(params); + return $http.get( + url, {headers: self.get_request_headers()} + ); + }, + update: function ( id, params ) { + var url; + if (id !== null || undefined) { + url = endpoint + "/stores/" + params['stores'] + "/products" + id; + } + else { + url = endpoint + "/stores/" + params['stores'] + "/products"; + } + return $http.put( + url, + params['_json'] ? JSON.stringify(params['_json']) : JSON.stringify(params), + {headers: self.get_request_headers()} + ); + }, + create: function ( params ) { + var url = endpoint + "/stores/" + params['stores'] + "/products"; + return $http.post( + url, + params['_json'] ? JSON.stringify(params['_json']) : JSON.stringify(params), + {headers: self.get_request_headers()} + ); + }, + remove: function ( id, params ) { + var url = null; + if (id !== null || undefined) { + url = endpoint + "/stores/" + params['stores'] + "/products" + id; + } + return $http.delete( + url, + params['_json'] ? JSON.stringify(params['_json']) : JSON.stringify(params), + {headers: self.get_request_headers()} + ); + } + }, + + /*** Products ***/ list_products: function(params) { From d44c9798baac1c131a97928b8290c7973a590de7 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 4 Jul 2014 13:54:57 +0800 Subject: [PATCH 3/3] Edit as of Order of Sir Ardee --- gcore-angular.js | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/gcore-angular.js b/gcore-angular.js index 88e6469..bcd6ec9 100644 --- a/gcore-angular.js +++ b/gcore-angular.js @@ -197,31 +197,21 @@ angular.module('gcore', ['ngCookies']) /*** Re-factored Orders ***/ orders: { list: function( id, params ) { - var url; + if (id !== null || undefined) { - url = endpoint + "/sales_orders/" + id; + self.list_orders(params); } else { - url = endpoint + "/sales_orders/"; + self.show_orders(id, params); } - url += self.url_params(params); - return $http.get( - url, {headers: self.get_request_headers()} - ); }, update: function ( id, params ) { - var url; if (id !== null || undefined) { - url = endpoint + "/sales_orders/" + id; + self.update_orders(id, params); } else { - url = endpoint + "/sales_orders/"; + self.mass_update_orders(params); } - return $http.put( - url, - params['_json'] ? JSON.stringify(params['_json']) : JSON.stringify(params), - {headers: self.get_request_headers()} - ); } }, @@ -284,14 +274,14 @@ angular.module('gcore', ['ngCookies']) var url; if (id !== null || undefined) { url = endpoint + "/stores/" + params['stores'] + "/products" + id; + url += self.url_params(params); + return $http.get( + url, {headers: self.get_request_headers()} + ); } else { - url = endpoint + "/stores/" + params['stores'] + "/products"; + self.list_products(params); } - url += self.url_params(params); - return $http.get( - url, {headers: self.get_request_headers()} - ); }, update: function ( id, params ) { var url;