diff --git a/community_server/src/Model/Transactions/TransactionTransfer.php b/community_server/src/Model/Transactions/TransactionTransfer.php
index 26e41f0ad..3156e2cae 100644
--- a/community_server/src/Model/Transactions/TransactionTransfer.php
+++ b/community_server/src/Model/Transactions/TransactionTransfer.php
@@ -99,12 +99,12 @@ class TransactionTransfer extends TransactionBase {
->where(['public_key' => $senderPublic])
->contain(['StateBalances' => ['fields' => ['amount', 'state_user_id']]])->first();
if(!$user) {
- $this->addError($functionName, 'couldn\'t find sender ' . $i .' in db' );
+ $this->addError($functionName, 'couldn\'t find sender in db' );
return false;
}
//var_dump($user);
if(intval($user->state_balances[0]->amount) < intval($amount)) {
- $this->addError($functionName, 'sender ' . $i . ' hasn\t enough GDD');
+ $this->addError($functionName, 'sender hasn\t enough GDD');
return false;
}
@@ -116,7 +116,7 @@ class TransactionTransfer extends TransactionBase {
// check if receiver exist
$receiver_user = $stateUsersTable->find('all')->select(['id'])->where(['public_key' => $receiver_public_key])->first();
if(!$receiver_user) {
- $this->addError($functionName, 'couldn\'t find receiver ' . $i .' in db' );
+ $this->addError($functionName, 'couldn\'t find receiver in db' );
return false;
}
if($amount < 0) {
diff --git a/frontend/src/apis/communityAPI.js b/frontend/src/apis/communityAPI.js
index 589794635..d2e71439c 100644
--- a/frontend/src/apis/communityAPI.js
+++ b/frontend/src/apis/communityAPI.js
@@ -35,8 +35,10 @@ const communityAPI = {
balance: async (session_id) => {
return apiGet(CONFIG.COMMUNITY_API_URL + 'getBalance/' + session_id)
},
- transactions: async (session_id) => {
- return apiGet(CONFIG.COMMUNITY_API_URL + 'listTransactions/1/25/ASC/' + session_id)
+ transactions: async (session_id, firstPage = 1, items = 25, order = 'DESC') => {
+ return apiGet(
+ `${CONFIG.COMMUNITY_API_URL}listTransactions/${firstPage}/${items}/${order}/${session_id}`,
+ )
},
/*create: async (session_id, email, amount, memo, target_date = new Date() ) => {
const payload = {
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 363b8fbc6..b297bfc81 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -21,6 +21,7 @@
"form": {
"attention": "Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.",
"cancel":"Abbrechen",
+ "reset": "Zurücksetzen",
"close":"schließen",
"receiver":"Empfänger",
"sender":"Absender",
@@ -45,6 +46,9 @@
"thx":"Danke,",
"send_success":"deine Transaktion wurde erfolgreich ausgeführt"
},
+ "error": {
+ "error":"Fehler"
+ },
"transaction":{
"show_all":"Alle {count} Transaktionen ansehen",
"nullTransactions":"Du hast noch keine Transaktionen auf deinem Konto.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 6f9a790d9..4c489c69f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -21,6 +21,7 @@
"form": {
"attention": "Achtung! Bitte überprüfe alle deine Eingaben sehr genau. Du bist alleine Verantwortlich für deine Entscheidungen. Versendete Gradidos können nicht wieder zurück geholt werden.",
"cancel":"Cancel",
+ "reset": "Reset",
"close":"Close",
"receiver":"Receiver",
"sender":"Sender",
@@ -45,6 +46,9 @@
"thx":"Thank you,",
"send_success":"your transaction was successfully completed"
},
+ "error": {
+ "error":"Error"
+ },
"transaction":{
"show_part": "The last {count} transactions",
"nullTransactions":"You don't have any transactions on your account yet.",
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 5da4d8386..9aef55915 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -1,11 +1,9 @@
-