roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-02-22 19:56:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

payment type select

Browse source
This commit is contained in:
ragu 2022-08-01 15:13:43 +02:00
parent af6b806c39
commit c67234d2de
10 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copri4/main/src/Mod/APIfunc.pm
View file

@ -1975,6 +1975,7 @@ sub bikes_available(){
$return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars";
$return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0"; $return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0";
$return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible"; $return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible";
$return->{$id}->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view
if($record->{$id}->{int19}){ if($record->{$id}->{int19}){
$current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19}); $current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19});
$return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $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_bars} = "$current_bars";
$return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0"; $return->{$id}->{bike_type}->{battery}->{charge_current_percent} = "0";
$return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible"; $return->{$id}->{bike_type}->{battery}->{backend_accessible} = "$backend_accessible";
$return->{$id}->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view
if($record->{$id}->{int19}){ if($record->{$id}->{int19}){
$current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19}); $current_bars = $bw->battery_bars($max_bars,$record->{$id}->{int19});
$return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{$id}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars";

4
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -67,7 +67,7 @@ my $response = {
apiserver => "$apiserver", apiserver => "$apiserver",
response => "$respreq", response => "$respreq",
uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}", uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}",
copri_version => "4.1.12.5", copri_version => "4.1.22.6",
user_id => "", user_id => "",
authcookie => "", authcookie => "",
new_authcoo => "0", new_authcoo => "0",
@ -81,7 +81,7 @@ my $response = {
impress_html => "site/impress_1.html", impress_html => "site/impress_1.html",
tariff_info_html => "site/tariff_info.html", tariff_info_html => "site/tariff_info.html",
bike_info_html => "site/bike_info_sharee_1.html", bike_info_html => "site/bike_info_sharee_1.html",
lang => "DE", lang => "de",
last_used_operator => { last_used_operator => {
operator_name => "sharee.bike | TeilRad GmbH", operator_name => "sharee.bike | TeilRad GmbH",
operator_color => "#009699", operator_color => "#009699",

1
copri4/main/src/Mod/APIsigclient.pm
View file

@ -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_bars} = "$current_bars";
$response_out->{$bike}->{bike_type}->{battery}->{charge_current_percent} = "0"; $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}->{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})){ if(looks_like_number($resp->{energy_level})){
$current_bars = $bw->battery_bars($max_bars,$resp->{energy_level}); $current_bars = $bw->battery_bars($max_bars,$resp->{energy_level});
$response_out->{$bike}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $response_out->{$bike}->{bike_type}->{battery}->{charge_current_bars} = "$current_bars";

2
copri4/main/src/Mod/DBtank.pm
View file

@ -1393,7 +1393,7 @@ sub insert_pos(){
my $set2 = "owner=$owner" if($owner); my $set2 = "owner=$owner" if($owner);
$set2 .= ",int10='$status'" if($status); $set2 .= ",int10='$status'" if($status);
$set2 .= ",mtime='now()'"; $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(); my $rows2 = $sth2->execute();
} }

6
copri4/main/src/Mod/Payment.pm
View file

@ -712,15 +712,15 @@ sub payone_capture(){
$ctt = $dbt->fetch_record($dbh,$pref); $ctt = $dbt->fetch_record($dbh,$pref);
#SEPA capture #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); $self->captureSEPA_main($varenv,$ctadr,$ctt,$owner);
} }
#CC capture #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); $self->captureCC_main($varenv,$ctadr,$ctt,$owner);
} }
else{ 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 #wkhtml

10
copri4/main/src/Mod/Prelogic.pm
View file

@ -661,10 +661,10 @@ sub preinit(){
#after delete preauth after 0€ capture sets new TXID and increment reference #after delete preauth after 0€ capture sets new TXID and increment reference
$ctt->{payone_reset} = $R::payone_reset; $ctt->{payone_reset} = $R::payone_reset;
$ctt->{int01} = 0; $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}); 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}); my $payoneret = $payone->captureCC_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
} }
} }
@ -684,15 +684,15 @@ sub preinit(){
#if($ctt->{int14})#TODO doupleclick #if($ctt->{int14})#TODO doupleclick
if($state !~ /Zahlungseingang/){ if($state !~ /Zahlungseingang/){
#SEPA capture #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}); my $payoneret = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
} }
#CC capture #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}); my $payoneret = $payone->captureCC_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
} }
else{ 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}; $update_ctt->{txt23} = "$now_dt $return_text\n" . $ctt->{txt23};
$dbt->update_record($dbh,$update_ctt,$ctt); $dbt->update_record($dbh,$update_ctt,$ctt);
return "failure::$return_text"; return "failure::$return_text";

1
copri4/main/src/Mod/Pricing.pm
View file

@ -318,6 +318,7 @@ sub fetch_rentalfeed {
$return->{bike_type}->{battery}->{charge_max_bars} = "$max_bars"; $return->{bike_type}->{battery}->{charge_max_bars} = "$max_bars";
$return->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{bike_type}->{battery}->{charge_current_bars} = "$current_bars";
$return->{bike_type}->{battery}->{charge_current_percent} = "0"; $return->{bike_type}->{battery}->{charge_current_percent} = "0";
$return->{bike_type}->{battery}->{hidden} = "0";#1=hide charge view
if($ctpos->{int19}){ if($ctpos->{int19}){
$current_bars = $bw->battery_bars($max_bars,$ctpos->{int19}); $current_bars = $bw->battery_bars($max_bars,$ctpos->{int19});
$return->{bike_type}->{battery}->{charge_current_bars} = "$current_bars"; $return->{bike_type}->{battery}->{charge_current_bars} = "$current_bars";

4
copri4/main/src/Tpl/Address3.pm
View file

@ -275,8 +275,8 @@ EOF
my $pay_sequence = " | sequencenr: $ctt->{int18}" if($ctt->{int18}); my $pay_sequence = " | sequencenr: $ctt->{int18}" if($ctt->{int18});
my @_paymentstate = split(/\|/,$varenv{Zahlungsweise}); my @_paymentstate = split(/\|/,$varenv{Zahlungsweise});
my $kind_of_payment = "fehlt"; my $kind_of_payment = "fehlt";
$kind_of_payment = "$_paymentstate[0]" if($ctt->{int03} == 1); $kind_of_payment = "$_paymentstate[0]" if($ctadr->{int03} == 1);
$kind_of_payment = "$_paymentstate[1]" if($ctt->{int03} == 2); $kind_of_payment = "$_paymentstate[1]" if($ctadr->{int03} == 2);
print $q->Tr(),"\n"; print $q->Tr(),"\n";
print $q->td({-class=>'tdescr'},"Payone Zahlungsart"),"\n"; print $q->td({-class=>'tdescr'},"Payone Zahlungsart"),"\n";
print $q->td({-class=>'tdval'},"$kind_of_payment"),"\n"; print $q->td({-class=>'tdval'},"$kind_of_payment"),"\n";

2
copri4/main/src/Tpl/TransPositionen.pm
View file

@ -543,7 +543,7 @@ EOF
}else{ }else{
undef $_paymentstate[1]; 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; my $send_invoice_checkbox = 1;

2
copri4/shareeapp-operator/src/Lib/Mlogic.pm
View file

@ -45,7 +45,7 @@ sub tpl(){
#my $api_test = "sharee_fr01"; my $bike="FR1538"; #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="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_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_wue"; my $bike="WUE5525";
#my $api_test = "sharee_sx"; my $bike="S3X1001"; #my $api_test = "sharee_sx"; my $bike="S3X1001";
#my $api_test = "sharee_ren"; my $bike="REN2"; #my $api_test = "sharee_ren"; my $bike="REN2";