IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-04-05 00:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes after renamings

Browse Source
This commit is contained in:
clauspeterhuebner 2025-04-25 21:09:08 +02:00
parent 5de301105e
commit 3beafd29b2
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/LinkInformations/RedeemCommunitySelection.vue
View File

@ -3,7 +3,7 @@
:link-data="linkData" :link-data="linkData"
:redeem-code="redeemCode" :redeem-code="redeemCode"
:is-contribution-link="isContributionLink" :is-contribution-link="isContributionLink"
:is-disbursement-link="isDisbursementLink" :is-redeem-jwt-link="isRedeemJwtLink"
class="redeem-community-selection" class="redeem-community-selection"
> >
<BCard bg-variant="muted" text-variant="dark" border-variant="info"> <BCard bg-variant="muted" text-variant="dark" border-variant="info">
@ -11,16 +11,16 @@
<h1 v-if="!isContributionLink && linkData.amount !== ''"> <h1 v-if="!isContributionLink && linkData.amount !== ''">
<BCol class="mb-4" cols="12"> <BCol class="mb-4" cols="12">
<BRow> <BRow>
<BCol v-if="!isDisbursementLink"> <BCol v-if="!isRedeemJwtLink">
{{ $t('gdd_per_link.recipientCommunitySelection') }} {{ $t('gdd_per_link.recipientCommunitySelection') }}
</BCol> </BCol>
<BCol v-else>{{ $t('gdd_per_link.recipientCommunityFix') }}</BCol> <BCol v-else>{{ $t('gdd_per_link.recipientCommunityFix') }}</BCol>
</BRow> </BRow>
<h3> <h3>
<BRow> <BRow>
<BCol v-if="!isDisbursementLink" class="fw-bold"> <BCol v-if="!isRedeemJwtLink" class="fw-bold">
<community-switch <community-switch
:disabled="isDisbursementLink" :disabled="isRedeemJwtLink"
:model-value="currentRecipientCommunity" :model-value="currentRecipientCommunity"
@update:model-value="setRecipientCommunity" @update:model-value="setRecipientCommunity"
/> />
@ -56,7 +56,7 @@ const props = defineProps({
linkData: { type: Object, required: true }, linkData: { type: Object, required: true },
redeemCode: { type: String, required: true }, redeemCode: { type: String, required: true },
isContributionLink: { type: Boolean, default: false }, isContributionLink: { type: Boolean, default: false },
isDisbursementLink: { type: Boolean, default: false }, isRedeemJwtLink: { type: Boolean, default: false },
recipientCommunity: { recipientCommunity: {
type: Object, type: Object,
required: false, required: false,

4
frontend/src/components/LinkInformations/RedeemInformation.vue
View File

@ -6,7 +6,7 @@
{{ CONFIG.COMMUNITY_NAME }} {{ CONFIG.COMMUNITY_NAME }}
{{ $t('contribution-link.thanksYouWith') }} {{ $filters.GDD(linkData.amount) }} {{ $t('contribution-link.thanksYouWith') }} {{ $filters.GDD(linkData.amount) }}
</h1> </h1>
<h3 v-if="isDisbursementLink && linkData.amount !== ''"> <h3 v-if="isRedeemJwtLink && linkData.amount !== ''">
{{ '"' + linkData.senderCommunity.name + '.' + linkData.senderUser.firstName + '"' }} {{ '"' + linkData.senderCommunity.name + '.' + linkData.senderUser.firstName + '"' }}
{{ $t('transaction-link.send_you') }} {{ $filters.GDD(linkData.amount) }} {{ $t('transaction-link.send_you') }} {{ $filters.GDD(linkData.amount) }}
</h3> </h3>
@ -22,7 +22,7 @@ export default {
props: { props: {
linkData: { type: Object, required: true }, linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false }, isContributionLink: { type: Boolean, default: false },
isDisbursementLink: { type: Boolean, default: false }, isRedeemJwtLink: { type: Boolean, default: false },
}, },
data() { data() {
return { return {

4
frontend/src/components/LinkInformations/RedeemValid.vue
View File

@ -3,7 +3,7 @@
<redeem-information <redeem-information
:link-data="linkData" :link-data="linkData"
:is-contribution-link="isContributionLink" :is-contribution-link="isContributionLink"
:is-disbursement-link="isDisbursementLink" :is-redeem-jwt-link="isRedeemJwtLink"
:valid-link="validLink" :valid-link="validLink"
/> />
<BCard> <BCard>
@ -31,7 +31,7 @@ export default {
props: { props: {
linkData: { type: Object, required: true }, linkData: { type: Object, required: true },
isContributionLink: { type: Boolean, default: false }, isContributionLink: { type: Boolean, default: false },
isDisbursementLink: { type: Boolean, default: false }, isRedeemJwtLink: { type: Boolean, default: false },
validLink: { type: Boolean, default: false }, validLink: { type: Boolean, default: false },
}, },
} }

12
frontend/src/pages/TransactionLink.vue
View File

@ -8,7 +8,7 @@
:link-data="linkData" :link-data="linkData"
:redeem-code="redeemCode" :redeem-code="redeemCode"
:is-contribution-link="isContributionLink" :is-contribution-link="isContributionLink"
:is-disbursement-link="isDisbursementLink" :is-redeem-jwt-link="isRedeemJwtLink"
/> />
</template> </template>
@ -20,7 +20,7 @@
<redeem-valid <redeem-valid
:link-data="linkData" :link-data="linkData"
:is-contribution-link="isContributionLink" :is-contribution-link="isContributionLink"
:is-disbursement-link="isDisbursementLink" :is-redeem-jwt-link="isRedeemJwtLink"
:valid-link="validLink" :valid-link="validLink"
@mutation-link="mutationLink" @mutation-link="mutationLink"
/> />
@ -89,8 +89,8 @@ const isContributionLink = computed(() => {
return params.code?.search(/^CL-/) === 0 return params.code?.search(/^CL-/) === 0
}) })
const isDisbursementLink = computed(() => { const isRedeemJwtLink = computed(() => {
if (result.value?.queryTransactionLink?.__typename === 'DisbursementLink') { if (result.value?.queryTransactionLink?.__typename === 'RedeemJwtLink') {
return true return true
} }
return false return false
@ -130,10 +130,10 @@ const itemType = computed(() => {
return 'REDEEM_SELECT_COMMUNITY' return 'REDEEM_SELECT_COMMUNITY'
} }
if ( if (
(!isDisbursementLink.value && (!isRedeemJwtLink.value &&
linkData.value.recipientUser && linkData.value.recipientUser &&
store.state.gradidoID === linkData.value.recipientUser.gradidoID) || store.state.gradidoID === linkData.value.recipientUser.gradidoID) ||
(isDisbursementLink.value && (isRedeemJwtLink.value &&
linkData.value.senderUser.gradidoID === linkData.value.recipientUser.gradidoID) linkData.value.senderUser.gradidoID === linkData.value.recipientUser.gradidoID)
) { ) {
console.log('TransactionLink.itemType... SELF_CREATOR') console.log('TransactionLink.itemType... SELF_CREATOR')