Merge branch 'master' of github.com:gradido/gradido into 1697-refactor-thx-page

backend/package.json

@@ -14,7 +14,7 @@
     "dev": "cross-env TZ=UTC nodemon -w src --ext ts --exec ts-node -r tsconfig-paths/register src/index.ts",
     "lint": "eslint --max-warnings=0 --ext .js,.ts .",
     "test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
-    "seed": "cross-env TZ=UTC ts-node -r tsconfig-paths/register src/seeds/index.ts"
+    "seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts"
   },
   "dependencies": {
     "@types/jest": "^27.0.2",

backend/src/graphql/resolver/AdminResolver.ts

@@ -333,8 +333,7 @@ export class AdminResolver {
       decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, receivedCallDate)
       newBalance = decay.balance
     }
-    // TODO pending creations decimal
-    newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount)).toString())
+    newBalance = newBalance.add(pendingCreation.amount.toString())
 
     const transaction = new DbTransaction()
     transaction.typeId = TransactionTypeId.CREATION
@@ -516,7 +515,7 @@ function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Da
     throw new Error(`No Creation found!`)
   }
 
-  if (amount.greaterThan(creations[index])) {
+  if (amount.greaterThan(creations[index].toString())) {
     throw new Error(
       `The amount (${amount} GDD) to be created exceeds the available amount (${creations[index]} GDD) for this month.`,
     )

backend/src/seeds/graphql/mutations.ts

@@ -86,7 +86,7 @@ export const createTransactionLink = gql`
 export const createPendingCreation = gql`
   mutation (
     $email: String!
-    $amount: Float!
+    $amount: Decimal!
     $memo: String!
     $creationDate: String!
     $moderator: Int!

deployment/bare_metal/.env.dist

@@ -38,7 +38,7 @@ KLICKTIPP_PASSWORD=
 KLICKTIPP_APIKEY_DE=
 KLICKTIPP_APIKEY_EN=
 
-EMAIL=true
+EMAIL=false
 EMAIL_USERNAME=peter@lustig.de
 EMAIL_SENDER=peter@lustig.de
 EMAIL_PASSWORD=1234

frontend/src/components/ClipboardCopy.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="clipboard-copy">
-    <b-input-group size="lg" class="mb-3" prepend="Link">
+    <b-input-group v-if="canCopyLink" size="lg" class="mb-3" prepend="Link">
       <b-form-input :value="link" type="text" readonly></b-form-input>
       <b-input-group-append>
         <b-button size="sm" text="Button" variant="primary" @click="CopyLink">
@@ -11,6 +11,10 @@
         </b-button>
       </b-input-group-append>
     </b-input-group>
+    <div v-else>
+      <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
+      <div class="alert-muted h3 p-3">{{ link }}</div>
+    </div>
   </div>
 </template>
 <script>
@@ -19,6 +23,11 @@ export default {
   props: {
     link: { type: String, required: true },
   },
+  data() {
+    return {
+      canCopyLink: true,
+    }
+  },
   methods: {
     CopyLink() {
       navigator.clipboard
@@ -27,6 +36,7 @@ export default {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch(() => {
+          this.canCopyLink = false
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },

frontend/src/components/TransactionLinks/TransactionLink.vue

@@ -50,6 +50,14 @@
         </template>
       </b-card>
     </b-modal>
+    <b-modal :id="'modalPopoverCopyError' + id" ok-only hide-header-close>
+      <b-card header-tag="header" footer-tag="footer">
+        <b-card-text>
+          <div class="alert-danger p-3">{{ $t('gdd_per_link.not-copied') }}</div>
+          <div class="alert-muted h3 p-3">{{ link }}</div>
+        </b-card-text>
+      </b-card>
+    </b-modal>
   </div>
 </template>
 <script>
@@ -87,6 +95,7 @@ export default {
           this.toastSuccess(this.$t('gdd_per_link.link-copied'))
         })
         .catch(() => {
+          this.$bvModal.show('modalPopoverCopyError' + this.id)
           this.toastError(this.$t('gdd_per_link.not-copied'))
         })
     },

frontend/src/locales/de.json

@@ -116,7 +116,7 @@
     "links_sum": "Offene Links und QR-Codes",
     "no-account": "Du besitzt noch kein Gradido Konto?",
     "no-redeem": "Du darfst deinen eigenen Link nicht einlösen!",
-    "not-copied": "Konnte den Link nicht kopieren: {err}",
+    "not-copied": "Dein Gerät lässt das Kopieren leider nicht zu! Bitte kopiere den Link von Hand!",
     "redeem": "Einlösen",
     "redeem-text": "Willst du den Betrag jetzt einlösen?",
     "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.",

frontend/src/locales/en.json

@@ -116,7 +116,7 @@
     "links_sum": "Open links and QR codes",
     "no-account": "You don't have a Gradido account yet?",
     "no-redeem": "You not allowed to redeem your own link!",
-    "not-copied": "Could not copy link: {err}",
+    "not-copied": "Unfortunately, your device does not allow copying! Please copy the link by hand!",
     "redeem": "Redeem",
     "redeem-text": "Do you want to redeem the amount now?",
     "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.",