Merge branch 'master' into fixes_stage1

frontend/src/components/TransactionRows/AmountAndNameRow.vue

@@ -10,9 +10,20 @@
       </b-col>
       <b-col cols="7">
         <div class="gdd-transaction-list-item-name">
-          <b-link v-if="linkedUser && linkedUser.email" @click.stop="tunnelEmail">
+          <div v-if="linkedUser && linkedUser.email">
-            {{ itemText }}
+            <b-link @click.stop="tunnelEmail">
-          </b-link>
+              {{ itemText }}
+            </b-link>
+            <span v-if="transactionLinkId">
+              {{ $t('via_link') }}
+              <b-icon
+                icon="link45deg"
+                variant="muted"
+                class="m-mb-1"
+                :title="$t('gdd_per_link.redeemed-title')"
+              />
+            </span>
+          </div>
           <span v-else>{{ itemText }}</span>
         </div>
       </b-col>
@@ -35,6 +46,11 @@ export default {
       type: String,
       required: false,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+      default: null,
+    },
   },
   methods: {
     tunnelEmail() {

frontend/src/components/Transactions/TransactionReceive.vue

@@ -13,7 +13,12 @@
 
           <b-col cols="11">
             <!-- Amount / Name || Text -->
-            <amount-and-name-row :amount="amount" :linkedUser="linkedUser" v-on="$listeners" />
+            <amount-and-name-row
+              v-on="$listeners"
+              :amount="amount"
+              :linkedUser="linkedUser"
+              :transactionLinkId="transactionLinkId"
+            />
 
             <!-- Nachricht Memo -->
             <memo-row :memo="memo" />
@@ -86,6 +91,10 @@ export default {
       type: Date,
       required: true,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+    },
   },
   data() {
     return {

frontend/src/components/Transactions/TransactionSend.vue

@@ -13,7 +13,12 @@
 
           <b-col cols="11">
             <!-- Amount / Name  -->
-            <amount-and-name-row :amount="amount" :linkedUser="linkedUser" v-on="$listeners" />
+            <amount-and-name-row
+              v-on="$listeners"
+              :amount="amount"
+              :linkedUser="linkedUser"
+              :transactionLinkId="transactionLinkId"
+            />
 
             <!-- Memo -->
             <memo-row :memo="memo" />
@@ -87,6 +92,10 @@ export default {
       type: Date,
       required: true,
     },
+    transactionLinkId: {
+      type: Number,
+      required: false,
+    },
   },
   data() {
     return {

frontend/src/graphql/queries.js

@@ -70,6 +70,7 @@ export const transactionsQuery = gql`
         linkedUser {
           email
         }
+        transactionLinkId
       }
     }
   }

frontend/src/locales/de.json

@@ -116,6 +116,7 @@
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",
     "redeemed-at": "Der Link wurde bereits am {date} eingelöst.",
+    "redeemed-title": "eingelöst",
     "to-login": "Log dich ein",
     "to-register": "Registriere ein neues Konto"
   },
@@ -249,5 +250,6 @@
   },
   "transaction-link": {
     "send_you": "sendet dir"
-  }
+  },
+  "via_link": "über einen Link"
 }

frontend/src/locales/en.json

@@ -116,6 +116,7 @@
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",
     "redeemed-at": "The link was already redeemed on {date}.",
+    "redeemed-title": "redeemed",
     "to-login": "Log in",
     "to-register": "Register a new account"
   },
@@ -249,5 +250,6 @@
   },
   "transaction-link": {
     "send_you": "wants to send you"
-  }
+  },
+  "via_link": "via Link"
 }