From 2a8fad3a44f1dda69ed7fdcf7c325d476218a05e Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 21 Apr 2021 12:10:40 +0200 Subject: [PATCH 1/4] Update community_server/src/Controller/AppRequestsController.php make it looking better Co-authored-by: Ulf Gebhardt --- community_server/src/Controller/AppRequestsController.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/community_server/src/Controller/AppRequestsController.php b/community_server/src/Controller/AppRequestsController.php index b79b94418..37dd04d92 100644 --- a/community_server/src/Controller/AppRequestsController.php +++ b/community_server/src/Controller/AppRequestsController.php @@ -316,10 +316,7 @@ class AppRequestsController extends AppController if('success' == $gdtEntries['state'] && 'success' == $gdtEntries['data']['state']) { $gdtSum = intval($gdtEntries['data']['sum']); } else { - if($user) { - $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id']); - } else { - $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, 0); + $this->addAdminError('StateBalancesController', 'overview', $gdtEntries, $user['id'] ? $user['id'] : 0); } } @@ -355,4 +352,4 @@ class AppRequestsController extends AppController } } - \ No newline at end of file + From dc13e8dce324c47387352d165caf263523e996df Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 21 Apr 2021 12:34:04 +0200 Subject: [PATCH 2/4] Update frontend/.env.dist Co-authored-by: Ulf Gebhardt --- frontend/.env.dist | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frontend/.env.dist b/frontend/.env.dist index b616c8dc0..39edd4b4e 100644 --- a/frontend/.env.dist +++ b/frontend/.env.dist @@ -1,5 +1,3 @@ LOGIN_API_URL=http://localhost/login_api/ -COMMUNITY_API_STATE_BALANCE_URL=http://localhost/api/ -COMMUNITY_API_TRANSACTION_CREATION_URL=http://localhost/api/ -COMMUNITY_API_TRANSACTION_SEND_COINS=http://localhost/api/ -VUE_PATH=/vue \ No newline at end of file +COMMUNITY_API_URL=http://localhost/api/ +VUE_PATH=/vue From bd1f9374ac5a0164b6df1400cfdf4585286badcc Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 21 Apr 2021 12:34:30 +0200 Subject: [PATCH 3/4] Update frontend/src/apis/communityAPI.js Co-authored-by: Ulf Gebhardt --- frontend/src/apis/communityAPI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index fb8696949..cd0d3beb9 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -33,7 +33,7 @@ const apiPost = async (url, payload) => { const communityAPI = { balance: async (session_id) => { - return apiGet(CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'getBalance/' + session_id) + return apiGet(CONFIG.COMMUNITY_API_URL + 'getBalance/' + session_id) }, transactions: async (session_id) => { return apiGet( From 09a0d58f402913a4a4aa50a91ae9e8aa56550bfa Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 21 Apr 2021 12:34:40 +0200 Subject: [PATCH 4/4] Update frontend/src/apis/communityAPI.js Co-authored-by: Ulf Gebhardt --- frontend/src/apis/communityAPI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js index cd0d3beb9..c7511bda2 100644 --- a/frontend/src/apis/communityAPI.js +++ b/frontend/src/apis/communityAPI.js @@ -37,7 +37,7 @@ const communityAPI = { }, transactions: async (session_id) => { return apiGet( - CONFIG.COMMUNITY_API_STATE_BALANCE_URL + 'listTransactions/1/25/ASC/' + session_id, + CONFIG.COMMUNITY_API__URL + 'listTransactions/1/25/ASC/' + session_id, ) }, /*create: async (session_id, email, amount, memo, target_date = new Date() ) => {