ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update price, fix uk page

This commit is contained in:
Christian Cueni 2023-12-14 13:57:42 +01:00
parent 9eee55cbbf
commit be3100ee46
5 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/pages/start/UKStartPage.vue
View File

@ -55,15 +55,12 @@ const { t } = useTranslation();
</li> </li>
</ol> </ol>
<div class="mt-4 flex space-x-2"> <div class="mt-4 flex space-x-2">
<p>{{ $t("Sprache wählen und Lehrgang starten") }}:</p> <router-link
<div> class="btn-primary"
<router-link :to="{ name: 'accountCreate', params: { courseType: 'uk' } }"
class="btn-primary" >
:to="{ name: 'accountCreate', params: { courseType: 'uk' } }" {{ $t("a.Jetzt mit Lehrgang starten") }}
> </router-link>
{{ $t("a.Jetzt mit Lehrgang starten") }}
</router-link>
</div>
</div> </div>
</div> </div>
</div> </div>

6
server/vbv_lernwelt/shop/README.md
View File

@ -4,11 +4,11 @@
In the Django shop app, create new products that should be available in the shop: In the Django shop app, create new products that should be available in the shop:
- `vv-de` Price 30000 (300_00 -> 300.00 CHF), name & description can be anything. - `vv-de` Price 32430 (324_3- -> 324.30 CHF), base 300 CHF + 8.1% MWSt., name & description can be anything.
- ONLY if `COURSE_VERSICHERUNGSVERMITTLERIN_ID` exists! - ONLY if `COURSE_VERSICHERUNGSVERMITTLERIN_ID` exists!
- `vv-fr` Price 30000 (300_00 -> 300.00 CHF), name & description can be anything. - `vv-fr` Price 32430 (324_3- -> 324.30 CHF), base 300 CHF + 8.1% MWSt., name & description can be anything.
- ONLY if `COURSE_VERSICHERUNGSVERMITTLERIN_ID_FR` exists! - ONLY if `COURSE_VERSICHERUNGSVERMITTLERIN_ID_FR` exists!
- `vv-it` Price 30000 (300_00 -> 300.00 CHF), name & description can be anything. - `vv-it` Price 32430 (324_3- -> 324.30 CHF), base 300 CHF + 8.1% MWSt., name & description can be anything.
- ONLY if `COURSE_VERSICHERUNGSVERMITTLERIN_ID_IT` exists! - ONLY if `COURSE_VERSICHERUNGSVERMITTLERIN_ID_IT` exists!
## Datatrans (Payment Provider) ## Datatrans (Payment Provider)

4
server/vbv_lernwelt/shop/tests/test_checkout_api.py
View File

@ -36,7 +36,7 @@ class CheckoutAPITestCase(APITestCase):
def setUp(self) -> None: def setUp(self) -> None:
Product.objects.create( Product.objects.create(
sku=VV_DE_PRODUCT_SKU, sku=VV_DE_PRODUCT_SKU,
price=300_00, price=324_30,
description="VV", description="VV",
name="VV", name="VV",
) )
@ -83,7 +83,7 @@ class CheckoutAPITestCase(APITestCase):
mock_init_transaction.assert_called_once_with( mock_init_transaction.assert_called_once_with(
user=self.user, user=self.user,
amount_chf_centimes=300_00, amount_chf_centimes=324_30,
redirect_url_success=f"{REDIRECT_URL}/onboarding/{VV_DE_PRODUCT_SKU}/checkout/complete", redirect_url_success=f"{REDIRECT_URL}/onboarding/{VV_DE_PRODUCT_SKU}/checkout/complete",
redirect_url_error=f"{REDIRECT_URL}/onboarding/{VV_DE_PRODUCT_SKU}/checkout/address?error", redirect_url_error=f"{REDIRECT_URL}/onboarding/{VV_DE_PRODUCT_SKU}/checkout/address?error",
redirect_url_cancel=f"{REDIRECT_URL}/", redirect_url_cancel=f"{REDIRECT_URL}/",

6
server/vbv_lernwelt/shop/tests/test_datatrans_service.py
View File

@ -38,7 +38,7 @@ class DatatransServiceTest(TestCase):
# WHEN # WHEN
transaction_id = init_transaction( transaction_id = init_transaction(
user=self.user, user=self.user,
amount_chf_centimes=300_00, amount_chf_centimes=324_30,
redirect_url_success=f"{REDIRECT_URL}/success", redirect_url_success=f"{REDIRECT_URL}/success",
redirect_url_error=f"{REDIRECT_URL}/error", redirect_url_error=f"{REDIRECT_URL}/error",
redirect_url_cancel=f"{REDIRECT_URL}/cancel", redirect_url_cancel=f"{REDIRECT_URL}/cancel",
@ -52,7 +52,7 @@ class DatatransServiceTest(TestCase):
url="https://api.sandbox.datatrans.com/v1/transactions", url="https://api.sandbox.datatrans.com/v1/transactions",
json={ json={
"autoSettle": True, "autoSettle": True,
"amount": 300_00, "amount": 324_30,
"currency": "CHF", "currency": "CHF",
"language": self.user.language, "language": self.user.language,
"refno": str(mock_uuid()), "refno": str(mock_uuid()),
@ -78,7 +78,7 @@ class DatatransServiceTest(TestCase):
with self.assertRaises(InitTransactionException): with self.assertRaises(InitTransactionException):
init_transaction( init_transaction(
user=self.user, user=self.user,
amount_chf_centimes=300_00, amount_chf_centimes=324_30,
redirect_url_success=f"/success", redirect_url_success=f"/success",
redirect_url_error=f"/error", redirect_url_error=f"/error",
redirect_url_cancel=f"/cancel", redirect_url_cancel=f"/cancel",

4
server/vbv_lernwelt/shop/tests/test_datatrans_webhook.py
View File

@ -22,7 +22,7 @@ def create_checkout_information(
user=user, user=user,
transaction_id=transaction_id, transaction_id=transaction_id,
product_sku=VV_DE_PRODUCT_SKU, product_sku=VV_DE_PRODUCT_SKU,
product_price=300_00, product_price=324_30,
state=state.value, state=state.value,
) )
@ -46,7 +46,7 @@ class DatatransWebhookTestCase(APITestCase):
self.product = Product.objects.create( self.product = Product.objects.create(
sku=VV_DE_PRODUCT_SKU, sku=VV_DE_PRODUCT_SKU,
price=300_00, price=324_30,
description="VV", description="VV",
name="VV", name="VV",
) )