From c67234d2de0d208a49393a854eab14d52091178c Mon Sep 17 00:00:00 2001 From: ragu Date: Mon, 1 Aug 2022 15:13:43 +0200 Subject: [PATCH] payment type select --- copri4/main/src/Mod/APIfunc.pm | 2 ++ copri4/main/src/Mod/APIjsonserver.pm | 4 ++-- copri4/main/src/Mod/APIsigclient.pm | 1 + copri4/main/src/Mod/DBtank.pm | 2 +- copri4/main/src/Mod/Payment.pm | 6 +++--- copri4/main/src/Mod/Prelogic.pm | 10 +++++----- copri4/main/src/Mod/Pricing.pm | 1 + copri4/main/src/Tpl/Address3.pm | 4 ++-- copri4/main/src/Tpl/TransPositionen.pm | 2 +- copri4/shareeapp-operator/src/Lib/Mlogic.pm | 2 +- 10 files changed, 19 insertions(+), 15 deletions(-) diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 6cb9781..4c4f0b3 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -1975,6 +1975,7 @@ sub bikes_available(){ $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0"; $return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible"; + $return->{$id}->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view if($record->{$id}->{int19}){ $current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19}); $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; @@ -2141,6 +2142,7 @@ sub bikes_all(){ $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0"; $return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible"; + $return->{$id}->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view if($record->{$id}->{int19}){ $current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19}); $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm index c63a3cd..a2dd647 100755 --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -67,7 +67,7 @@ my $response = { apiserver => "$apiserver", response => "$respreq", uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}", - copri_version => "4.1.12.5", + copri_version => "4.1.22.6", user_id => "", authcookie => "", new_authcoo => "0", @@ -81,7 +81,7 @@ my $response = { impress_html => "site/impress_1.html", tariff_info_html => "site/tariff_info.html", bike_info_html => "site/bike_info_sharee_1.html", - lang => "DE", + lang => "de", last_used_operator => { operator_name => "sharee.bike | TeilRad GmbH", operator_color => "#009699", diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm index e0d17d3..b945639 100755 --- a/copri4/main/src/Mod/APIsigclient.pm +++ b/copri4/main/src/Mod/APIsigclient.pm @@ -210,6 +210,7 @@ sub sig_available { $response_out->{$bike}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $response_out->{$bike}->{bike_type}->{battery}->{charge_current_percent} = "0"; $response_out->{$bike}->{bike_type}->{battery}->{backend_accessible} = "1";#got it from backend + $response_out->{$bike}->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view if(looks_like_number($resp->{energy_level})){ $current_bars = $bw->battery_bars($max_bars,$resp->{energy_level}); $response_out->{$bike}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm index ff2dd8d..eabc249 100755 --- a/copri4/main/src/Mod/DBtank.pm +++ b/copri4/main/src/Mod/DBtank.pm @@ -1393,7 +1393,7 @@ sub insert_pos(){ my $set2 = "owner=$owner" if($owner); $set2 .= ",int10='$status'" if($status); $set2 .= ",mtime='now()'"; - my $sth2 = $dbh->prepare("UPDATE content SET $set2 where barcode='$ct->{barcode}'"); + my $sth2 = $dbh->prepare("UPDATE content SET $set2 where c_id='$ct->{c_id}'"); my $rows2 = $sth2->execute(); } diff --git a/copri4/main/src/Mod/Payment.pm b/copri4/main/src/Mod/Payment.pm index 125b587..8e7b8cd 100755 --- a/copri4/main/src/Mod/Payment.pm +++ b/copri4/main/src/Mod/Payment.pm @@ -712,15 +712,15 @@ sub payone_capture(){ $ctt = $dbt->fetch_record($dbh,$pref); #SEPA capture - if($ctt->{int03} == 1 && $ctt->{txt16} && $ctt->{state} =~ /SEPA/){#SEPA + if($ctadr->{int03} == 1 && $ctt->{txt16} && $ctt->{state} =~ /SEPA/){#SEPA $self->captureSEPA_main($varenv,$ctadr,$ctt,$owner); } #CC capture - elsif($ctt->{int03} == 2 && $ctt->{txt16} && $ctt->{state} =~ /Kreditkarte/){#CC + elsif($ctadr->{int03} == 2 && $ctt->{txt16} && $ctt->{state} =~ /Kreditkarte/){#CC $self->captureCC_main($varenv,$ctadr,$ctt,$owner); } else{ - $return_text = "Payment.pm can not get TXID ($ctadr->{int03} && $ctadr->{ct_name} && !$ctt->{txt16})\n"; + $return_text = "Payment.pm can not get TXID ($ctadr->{int03} && $ctadr->{ct_name} && TXID:$ctt->{txt16})\n"; } #wkhtml diff --git a/copri4/main/src/Mod/Prelogic.pm b/copri4/main/src/Mod/Prelogic.pm index 3f2424c..52f04e8 100755 --- a/copri4/main/src/Mod/Prelogic.pm +++ b/copri4/main/src/Mod/Prelogic.pm @@ -661,10 +661,10 @@ sub preinit(){ #after delete preauth after 0€ capture sets new TXID and increment reference $ctt->{payone_reset} = $R::payone_reset; $ctt->{int01} = 0; - if($ctt->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA 0 + if($ctadr->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA 0 my $payoneret = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id}); } - if($ctt->{int03} == 2 && $ctt->{txt16} && $R::state =~ /Kreditkarte/){#CC 0 + if($ctadr->{int03} == 2 && $ctt->{txt16} && $R::state =~ /Kreditkarte/){#CC 0 my $payoneret = $payone->captureCC_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id}); } } @@ -684,15 +684,15 @@ sub preinit(){ #if($ctt->{int14})#TODO doupleclick if($state !~ /Zahlungseingang/){ #SEPA capture - if($ctt->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA + if($ctadr->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA my $payoneret = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id}); } #CC capture - elsif($ctt->{int03} == 2 && $ctt->{txt16} && $R::state =~ /Kreditkarte/){#CC + elsif($ctadr->{int03} == 2 && $ctt->{txt16} && $R::state =~ /Kreditkarte/){#CC my $payoneret = $payone->captureCC_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id}); } else{ - my $return_text = "payone capture fails, errorcode ($ctt->{int03} && $ctt->{txt16} && $R::state)."; + my $return_text = "payone capture fails, errorcode ($ctadr->{int03} && TXID:$ctt->{txt16} && $R::state)."; $update_ctt->{txt23} = "$now_dt $return_text\n" . $ctt->{txt23}; $dbt->update_record($dbh,$update_ctt,$ctt); return "failure::$return_text"; diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm index 79d2926..ac9dda9 100755 --- a/copri4/main/src/Mod/Pricing.pm +++ b/copri4/main/src/Mod/Pricing.pm @@ -318,6 +318,7 @@ sub fetch_rentalfeed { $return->{bike_type}->{battery}->{charge_max_bars} = "$max_bars"; $return->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{bike_type}->{battery}->{charge_current_percent} = "0"; + $return->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view if($ctpos->{int19}){ $current_bars = $bw->battery_bars($max_bars,$ctpos->{int19}); $return->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm index cc3706b..7ed39aa 100755 --- a/copri4/main/src/Tpl/Address3.pm +++ b/copri4/main/src/Tpl/Address3.pm @@ -275,8 +275,8 @@ EOF my $pay_sequence = " | sequencenr: $ctt->{int18}" if($ctt->{int18}); my @_paymentstate = split(/\|/,$varenv{Zahlungsweise}); my $kind_of_payment = "fehlt"; - $kind_of_payment = "$_paymentstate[0]" if($ctt->{int03} == 1); - $kind_of_payment = "$_paymentstate[1]" if($ctt->{int03} == 2); + $kind_of_payment = "$_paymentstate[0]" if($ctadr->{int03} == 1); + $kind_of_payment = "$_paymentstate[1]" if($ctadr->{int03} == 2); print $q->Tr(),"\n"; print $q->td({-class=>'tdescr'},"Payone Zahlungsart"),"\n"; print $q->td({-class=>'tdval'},"$kind_of_payment"),"\n"; diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm index 679c3a9..3c4fdd4 100755 --- a/copri4/main/src/Tpl/TransPositionen.pm +++ b/copri4/main/src/Tpl/TransPositionen.pm @@ -543,7 +543,7 @@ EOF }else{ undef $_paymentstate[1]; } - $kind_of_payment = "$ctt->{state}" if($ctt->{state}); + $kind_of_payment = "$ctt->{state}" if($ctt->{state} && $ctt->{int01}); my $send_invoice_checkbox = 1; diff --git a/copri4/shareeapp-operator/src/Lib/Mlogic.pm b/copri4/shareeapp-operator/src/Lib/Mlogic.pm index 33edc99..c0531ed 100755 --- a/copri4/shareeapp-operator/src/Lib/Mlogic.pm +++ b/copri4/shareeapp-operator/src/Lib/Mlogic.pm @@ -45,7 +45,7 @@ sub tpl(){ #my $api_test = "sharee_fr01"; my $bike="FR1538"; #my $api_test = "sharee_fr01"; my $bike="FR1005";#E-Lastenrad (bike_group=300101, bike_node=300102) #my $api_test = "sharee_fr01"; my $bike="FR4781";#Tracking and BVB test - my $api_test = "sharee_kn"; my $bike="KN205"; + my $api_test = "sharee_kn"; my $bike="KN1011"; #my $api_test = "sharee_wue"; my $bike="WUE5525"; #my $api_test = "sharee_sx"; my $bike="S3X1001"; #my $api_test = "sharee_ren"; my $bike="REN2";