From 46daea051153112fcb2b1290004e42fd5849c10a Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 18 Jul 2024 14:19:34 +0200 Subject: [PATCH] Enable cembra/byjuno payment --- env_secrets/caprover_vbv-develop.env | Bin 1410 -> 1410 bytes server/vbv_lernwelt/core/constants.py | 1 + .../vbv_lernwelt/core/create_default_users.py | 19 ++++++++++++++++++ server/vbv_lernwelt/shop/services.py | 6 ++---- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/env_secrets/caprover_vbv-develop.env b/env_secrets/caprover_vbv-develop.env index c633f417bff7fbf9e1da651afdf0215ac04467d3..5432d3c8d0f3325116f2c115d5b3e00b05d3e2f7 100644 GIT binary patch literal 1410 zcmV-|1%3JeM@dveQdv+`0R5m0PB9m#27BrtQzTx)WmcPXSslete|WanHJO_H|4~_O zP^cLG*XtL4OC~z@$5m_&IGL&h_JQJ|gH+5hQSp4{>H?-RSNu(A%LMc|^)u)D& zqoMe#h&R6`nYgW1niNZQJRV!nlGJJM71d4a zXb5fj0W&mrii@$Dr zb6~$Ch`Cn`pm{iLtmmv{cu9*`reNXYG0EPEm>5}eK2Jx!xd-52RUe}Z{XQJ;rN>r~ zQTuqp<1^BI105)RWpaFZn1K(pE4kPlby`GZL5+BR5HnnU8lO_ok{Hz>+V||0fO%&> zUTzCfno(qE>jU{9E`Lqi4WZjF-*@pgQQlH2*r>PZRedmIMZ09JE%OVhuP`f z9(|?;L{^b-XRf`qCIYFZze%{^2W&(Mp#mub)onH8O#d{_r-3NY+RWFWVHCV2fbg3B z)v$P*s2Bz3EaT`je|}Py(UWG)=0tl=$KTk}n~-5=lr(V3!gFD|T@OLQoY#?+@5px+ zcV2^PdKzL=TJ#>u{aaMN2S&|{kdKeyJ7M~ufHh8^AnKB|jS*DCDPLi<&FsYaRh@S~ zzbM3%GT4NC7#wuTUf+nuWoFAO%iOBfPou;>b_tOj>nBsX6}Q}PN%-*<=T!5Fez2>A zw|xDViOuevU9QfXWEV0qcOKn2R?;&S-|3^2tv&0H#uBTB@bM)Ri=A8FMH(+HRE6*f?OQWX8su^Ien`@qnd_dom`|@eKUW(Q$#e&BT z#De4lBb$-MEwE)l9U!rIU0>zkK$LoZUulYSL!ZT8*JM##eJNbm;78K|~f zbB>Z`XP`R`>Sry?a1a*IAEugrmH`9IZIS&zP}DXhzGNu67xQ>!Do?$tiz^ICk-nh} z2Oo(KyVR(yT*ysaU>N#&P^6;*_#1ww}``u5gjWb7s%&EwLsry38dxw5(Wo2x?h4oy3 z&M+{+21EE%bNplpX5mto&aIU&7gB2cEC5LNl)jY^=~4hooIYAOM;UY&L3$bkOxgx& QEL5k|q77$mx!byyB&9#T9{>OV literal 1410 zcmV-|1%3JeM@dveQdv+`0H6*;YgY}<6t)6kQ+BGQ30$%8=Z&H;LwH8|#dM(Qy-L0^4mFL{A z{NOuVz~v=y&_o7Y2`$$o!*}E<`7vnJ!af<$q!0r!FoM@Q#HAMc7Y&puEGvnhUK!Di z&>2kCU#QHjSZ*)RWr}W_-ndPAs6A9{B-bqRRv1_d$1ci^n2h{)voEKLu@-BPHHgj= zIcR*n@Gc5NE4JXOuR{(7cA#3$7&WCYHL|4UuzX<%h`hCe2C#wII#_HxS`rIm{T59> zQIqlroBTHL_d;@R67in5rPfhH=hP||Vx0)R2jyK6QaJis6y(d`{|zqSK?^wz$tQpk z*Ln%bPVBy0MRsqd^E^AV;>Ck45A054(u2={U!U*eAim-{{i!8P^4r$k9zGo;=txaC zbk8H+VA`T(h%-(QoxunK%<5euAlxhd*RHby45xd8Na&=o8V&bp6Ie=13`(wG--U3U z%6uo>T?8;FCcrtkuL_SoNb^C`C11abt?$R$rxb5)Z%Rx0~jI)abor+2+mP?$a0$`>QlwukUn(cQ5@4 zxGGGP^*jr0%RhNrwF3ULY8pz?Q3q1)+YjQav-_RqC|zkG_*1ZK0! z%8dr2?!i9*Zra&A(nkG8Ab&+uW>B>f)4;am&HjfY%OFi;A@(`zq*q>dDN#sP<(&CR`F@$$&20 z3@e~YOhE1In9IS{w8!hest|~(A;56ZAbq9}ujdpnJ6S~TH=OS(d=FmzF;6B`ls!I# z87_xkLl;Ui7k4~2DddBU2}V}r2i#fO@-L56NJ;dWt>3`M1?zebcvO@Uj1a(k2ygSC zIVrx#$;S>X`*z9m+}Xei1Igz|#i!eA`!`r6|8)RF2YG?nE)HXHvZT+b> zk6{cxE^)~X#Al4Ih%`RZf3P=8sEjg+Xu+1po@o8eSVb)V)I6n$9O2`_ZG5ED;ZXFH)nK+YnTHlca;&1`% z0jxg<@ZXhY zUpx6u^|SdDbcl|L(}T!Zq|99VcAqN4frV+d6ES4u3j7*nR)2AN1ohgj>um4M;K-H0d!IS0W+DTr QcJP3A1@w{)_wTYYEKec0#Q*>R diff --git a/server/vbv_lernwelt/core/constants.py b/server/vbv_lernwelt/core/constants.py index 75f24848..e36702b8 100644 --- a/server/vbv_lernwelt/core/constants.py +++ b/server/vbv_lernwelt/core/constants.py @@ -28,6 +28,7 @@ TEST_MENTOR1_USER_ID = "d1f5f5a9-5b0a-4e1a-9e1a-9e9b5b5e1b1b" TEST_STUDENT1_VV_USER_ID = "5ff59857-8de5-415e-a387-4449f9a0337a" TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID = "7e8ebf0b-e6e2-4022-88f4-6e663ba0a9db" TEST_USER_EMPTY_ID = "daecbabe-4ab9-4edf-a71f-4119042ccb02" +TEST_USER_DATATRANS_HANNA_ID = "6bec1a0d-f852-47aa-a4de-072df6e07ad1" TEST_COURSE_SESSION_BERN_ID = -1 TEST_COURSE_SESSION_ZURICH_ID = -2 diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py index 17acd036..a384c13e 100644 --- a/server/vbv_lernwelt/core/create_default_users.py +++ b/server/vbv_lernwelt/core/create_default_users.py @@ -20,6 +20,7 @@ from vbv_lernwelt.core.constants import ( TEST_SUPERVISOR1_USER_ID, TEST_TRAINER1_USER_ID, TEST_TRAINER2_USER_ID, + TEST_USER_DATATRANS_HANNA_ID, TEST_USER_EMPTY_ID, ) from vbv_lernwelt.core.models import User @@ -202,6 +203,24 @@ def create_default_users(default_password="test", set_avatar=False): language="de", ) + hanna, _ = User.objects.get_or_create( + id=TEST_USER_DATATRANS_HANNA_ID, + ) + hanna.username = "datatrans.hanna.vbv@example.com" + hanna.email = "datatrans.hanna.vbv@example.com" + hanna.language = "de" + hanna.first_name = "Hanna" + hanna.last_name = "Vbv" + hanna.street = "Bahnstrasse" + hanna.street_number = "2" + hanna.postal_code = "8603" + hanna.city = "Schwerzenbach" + hanna.country_id = "CH" + hanna.birth_date = "1970-01-01" + hanna.phone_number = "+41792018586" + hanna.password = make_password("test") + hanna.save() + for user_data in default_users: _create_student_user(**user_data) diff --git a/server/vbv_lernwelt/shop/services.py b/server/vbv_lernwelt/shop/services.py index f5998d38..a9561d0e 100644 --- a/server/vbv_lernwelt/shop/services.py +++ b/server/vbv_lernwelt/shop/services.py @@ -7,7 +7,6 @@ import structlog from django.conf import settings from vbv_lernwelt.core.admin import User -from vbv_lernwelt.shop.const import VV_PRODUCT_NUMBER from vbv_lernwelt.shop.datatrans.datatrans_api_client import DatatransApiClient from vbv_lernwelt.shop.models import CheckoutState @@ -101,9 +100,8 @@ def init_datatrans_transaction( }, } - # FIXME: test with working cembra byjuno invoice customer? - # if with_cembra_byjuno_invoice: - # payload["paymentMethods"] = ["INT"] + if with_cembra_byjuno_invoice: + payload["paymentMethods"] = ["INT"] if datatrans_customer_data: payload["customer"] = datatrans_customer_data if datatrans_int_data: