Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use the paymentStatus translation key to display the right payment status #772

Merged
merged 9 commits into from
Oct 31, 2024
Merged

feat: use the paymentStatus translation key to display the right payment status #772

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5dc25b3
feat: use the paymentStatus translation key to display the right paym…
N-Feist Oct 31, 2024
d90d3b7
Update apps/web/lang/de.json
maxiroellplenty Oct 31, 2024
69235c1
fix: changelog and dependencies
N-Feist Oct 31, 2024
76085d0
no message
N-Feist Oct 31, 2024
4c68c2c
Merge branch 'main' into feat/right-output-on-paymentStatus-order-con…
N-Feist Oct 31, 2024
226ff46
fix: corrected the changelogs
N-Feist Oct 31, 2024
2847a4b
merged branch 'main' into 'feat/right-output-on-paymentStatus-order-c…
N-Feist Oct 31, 2024
d90e367
fix: revert changes in yarn.lock
N-Feist Oct 31, 2024
f612fc5
fix: now running update:sdk again
N-Feist Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/components/OrderPaymentSummary/OrderPaymentSummary.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p>{{ orderGetters.getPaymentMethodName(order) }}</p>

<h2 class="font-medium text-base mt-4">{{ $t('account.ordersAndReturns.paymentSummary.paymentStatus') }}</h2>
<p data-testid="order-payment-status">{{ orderGetters.getPaymentStatus(order) }}</p>
<p data-testid="order-payment-status">{{ $t(orderGetters.getPaymentStatusKey(order)) }}</p>
</template>

<script setup lang="ts">
Expand Down
8 changes: 8 additions & 0 deletions apps/web/lang/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"orderConfirmationPaymentStatus": {
"unpaid": "nicht bezahlt",
maxiroellplenty marked this conversation as resolved.
Show resolved Hide resolved
"fullyPaid": "Bezahlt",
"overpaid": "Überzahlt",
"partlyPaid": "Teilweise bezahlt",
"prepaid": "Im Voraus bezahlt",
"unknown": "Fehler beim abrufen des Zahlungsstatus"
},
"CookieBar": {
"Accept All": "Alles akzeptieren",
"Accept Selection": "Auswahl akzeptieren",
Expand Down
8 changes: 8 additions & 0 deletions apps/web/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"orderConfirmationPaymentStatus": {
"unpaid": "Not paid",
"fullyPaid": "Paid",
"overpaid": "Overpaid",
"partlyPaid": "Partially paid",
"prepaid": "Prepaid",
"unknown": "Error retrieving payment status"
},
"CookieBar": {
"Accept All": "Accept All",
"Accept Selection": "Accept Selection",
Expand Down
Loading