IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'community_15_04_2021' of github.com:gradido/gradido into community_15_04_2021

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2021-04-21 10:41:22 +00:00
commit d19496ddca
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
community_server/src/Controller/AppRequestsController.php
View File

@ -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);
}
}

4
frontend/.env.dist
View File

@ -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/
COMMUNITY_API_URL=http://localhost/api/
VUE_PATH=/vue

4
frontend/src/apis/communityAPI.js
View File

@ -33,11 +33,11 @@ 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(
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() ) => {