diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 3b1aa86..069bf52 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -1165,7 +1165,7 @@ sub booking_update(){ gps => "", latitude => "", longitude => "", - gps_age_miniutes => 60, + gps_age_minutes => 60, gps_accuracy => 0, geo_distance => 1000000, }; @@ -1565,7 +1565,7 @@ sub smartlock { $update_pos->{txt06} = $gps_data->{gps};#end pos coordinates $update_pos->{int21} = $gps_data->{gps_age_minutes}; $update_pos->{int22} = $gps_data->{gps_accuracy}; - $update_pos->{int23} = $gps_data->{geo_distance}; + $update_pos->{int23} = "null";# only computed on rental-end $booking_values->{response_state} = "OK: bike " . $q->param('bike') . " locked confirmed. "; $booking_values->{response_text} = "Abschließen von Fahrrad Nr. " . $q->param('bike') . " bestätigt. "; diff --git a/copri4/main/src/Mod/Premain.pm b/copri4/main/src/Mod/Premain.pm index e31a7b6..791874e 100755 --- a/copri4/main/src/Mod/Premain.pm +++ b/copri4/main/src/Mod/Premain.pm @@ -500,7 +500,7 @@ print ATTR "next: $next\n" if($debug); } if($table eq "contentadr" && $_ eq "txt22" && $valxx){ my $currency = "EUR"; - $currency = "CHF" if($valxx =~ /^(CH)/i); + #$currency = "CHF" if($valxx =~ /^(CH)/i); $u_rows += $db->updater("$table","c_id",$c_id,"txt22","$valxx",$users_dms->{u_id}); $u_rows += $db->updater("$table","c_id",$c_id,"txt24","$currency",$users_dms->{u_id}); } diff --git a/copri4/main/src/Mod/Printpreview.pm b/copri4/main/src/Mod/Printpreview.pm index 81651e0..501bc48 100755 --- a/copri4/main/src/Mod/Printpreview.pm +++ b/copri4/main/src/Mod/Printpreview.pm @@ -556,7 +556,7 @@ td { print $q->td({-class=>'Oline',-colspan=>6}," "),"\n"; print "\n"; - print "$payment_text\n"; + print "$payment_text\n"; print "\n"; print $q->start_table({-style=>'border:1px solid silver;', -border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'}),"\n"; @@ -604,7 +604,7 @@ td { print $q->start_table({-style=>"margin-top:0.5em;", -border=>'0', -width=>'100%',-align=>'center', -cellpadding=>'0', -cellspacing=>'0'}); #Frei-Text - my $style = "padding:0.4em;text-align:left;font-size:1em;"; + my $style = "padding:0.4em;text-align:left;font-size:0.91em;"; if($nullcount > 0){ print $q->Tr(); print $q->td({-style=>"$style",-colspan=>3},"In diesem Zeitraum gab es $nullcount kostenfreie Buchungsvorgänge."); diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm index 3c3262c..dbd2862 100755 --- a/copri4/main/src/Mod/Shareework.pm +++ b/copri4/main/src/Mod/Shareework.pm @@ -451,7 +451,7 @@ sub save_account(){ } if($_ =~ /txt22/ && $valxx){ my $currency = "EUR"; - $currency = "CHF" if($valxx =~ /^(CH)/i); + #$currency = "CHF" if($valxx =~ /^(CH)/i); $u_rows = $dbt->update_one($dbh,$update_primary,"txt24='$currency'"); } diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm index 6490102..b9ea090 100755 --- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm +++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm @@ -128,8 +128,9 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit my $ctt = $dbt->fetch_tablerecord($dbh_operator,$pref); foreach my $id (keys(%$ctt)){ $ctt->{$id}->{wwwhost} = "$operator_hash->{$sharee_operator}"; - $ctt->{$id}->{praefix} = "$sharee_operator"; - #print "$ctt->{$id}->{praefix}|"; + $ctt->{$id}->{operator} = "$sharee_operator"; + $ctt->{$id}->{basedir} = "$dbt->{copri_conf}->{basedir}/$dbt->{operator}->{$sharee_operator}->{dir_app}"; + #print "$sharee_operator|$ctt->{$id}->{wwwhost}|$ctt->{$id}->{operator}|$ctt->{$id}->{basedir}
"; } $ctt_all = { %$ctt_all, %$ctt }; @@ -471,11 +472,11 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg print "
\n"; foreach my $id (sort { $ctt_all->{$b}->{ct_name} cmp $ctt_all->{$a}->{ct_name} } keys(%$ctt_all)){ - if($ctt_all->{$id}->{ct_name} =~ /\d/ && $coo){ + if( -f "$ctt_all->{$id}->{basedir}/pdfinvoice/Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf" && $ctt_all->{$id}->{ct_name} =~ /\d/ && $coo){ $i++; my $invoice_time = $ctt_all->{$id}->{invoice_time} || $ctt_all->{$id}->{mtime}; $invoice_time = $lb->time4de($invoice_time,0); - #$varenv->{praefix} only defined in sharee + #$varenv->{operator} only defined in sharee my $webtarget = "_blank"; my $dtext = ""; if($varenv->{syshost} =~ /app/){ @@ -487,7 +488,7 @@ Nach Abschluss der Registrierung erhalten Sie sowohl auf die von Ihnen hinterleg print $q->div({-id=>'Rechnungen',-style=>'font-weight:bold;'},"Ihre Rechnungen"),"\n"; print $q->div({-style=>'padding:0.5em;'},"$dtext"),"\n"; } - print $q->div({-style=>'font-size:1em;padding:0.5em;border:0px solid #cccccc;'},$q->a({-href=>"$ctt_all->{$id}->{wwwhost}/FileOut?file=Rechnung-$ctt_all->{$id}->{praefix}-$ctt_all->{$id}->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:30px;'}), "Rechnung $ctt_all->{$id}->{ct_name}.pdf"), "   ($invoice_time)"),"\n"; + print $q->div({-style=>'font-size:1em;padding:0.5em;border:0px solid #cccccc;'},$q->a({-href=>"$ctt_all->{$id}->{wwwhost}/FileOut?file=Rechnung-$ctt_all->{$id}->{operator}-$ctt_all->{$id}->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:30px;'}), "Rechnung $ctt_all->{$id}->{ct_name}.pdf"), "   ($invoice_time)"),"\n"; } } diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm index 31201d2..a88fba6 100755 --- a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm +++ b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm @@ -143,7 +143,9 @@ sub tpl(){ $webtarget = "_self"; $dtext = "
(Der PDF download öffnet je nach System/Konfiguartion einen externen PDF-Viewer oder Webbrowser)"; } - print $q->div({-style=>'padding:10px;margin:10px 0;'},$q->a({-href=>"$varenv->{wwwhost}/FileOut?file=SEPA-Lastschriftmandat-$varenv->{praefix}-$ctadr->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;font-size:1.1em;'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:30px;'}), "SEPA-Lastschriftmandat.pdf"),"$dtext"),"\n"; + if( -f "$varenv->{basedir}/pdfinvoice/SEPA-Lastschriftmandat-$varenv->{praefix}-$ctadr->{ct_name}.pdf"){ + print $q->div({-style=>'padding:10px;margin:10px 0;'},$q->a({-href=>"$varenv->{wwwhost}/FileOut?file=SEPA-Lastschriftmandat-$varenv->{praefix}-$ctadr->{ct_name}.pdf&sessionid=$coo", -target=>"$webtarget" , -type=>'application/octet-stream', -style=>'text-decoration:underline;font-size:1.1em;'}, $q->img({-src=>"$varenv->{metahost}/glyphicons/file-any.png", -style=>'width:30px;'}), "SEPA-Lastschriftmandat.pdf"),"$dtext"),"\n"; + } }else{ print $q->div({-style=>'padding:10px;margin:10px 0;border:1px solid silver;color:#c83434;'},"Es gibt ein Problem! Das SEPA Mandat konnte nicht eingeholt werden. Bitte wenden Sie sich bei Bedarf an den unter \"Kontakt\" hinterlegten Support."),"\n"; }