\n";
print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'iframe-credit-card-data'}->{txt}"),"\n";
-
print $q->div({-class=>'content2'},"$varenv->{cms}->{'iframe-creditcard-data-info'}->{txt}"),"\n";
+ if($users_sharee->{int03} == 2 && length($users_sharee->{ct_name}) >= 19 && !$users_sharee->{int18}){
+ print $q->div({-class=>'content2',-style=>"color:$red"}, "$varenv->{cms}->{'iframe-payAck-failure'}->{txt}"),"\n";
+ }
+
if($users_sharee->{int03} && $users_sharee->{int03} == 2 && length($users_sharee->{ct_name}) >= 19 && $users_sharee->{txt28} && $users_sharee->{txt28} =~ /pseudocardpan=\d{19}/ && $users_sharee->{txt28} =~ /(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2})/){
my $cc_datetime = $1 || "";
$cc_datetime = $lb->time4de($cc_datetime,"1") if($cc_datetime);
diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
index a215a7c..be232b6 100755
--- a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
+++ b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
@@ -41,6 +41,7 @@ sub tpl(){
my $bgcolor1 = "009899";#sharee
$bgcolor1 = $dbt->{website}->{$varenv->{syshost}}->{bgcolor1} if($dbt->{website}->{$varenv->{syshost}}->{bgcolor1});
$bgcolor1 = $dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1} if($dbt->{merchant_ids}->{$varenv->{merchant_id}}->{bgcolor1});
+ my $red = "#c83434";
my $coo = $q->cookie(-name=>'domcookie') || $R::sessionid;
my $ctadr = $users_sharee if(ref($users_sharee) eq "HASH" && $users_sharee->{c_id});
@@ -58,14 +59,16 @@ sub tpl(){
print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'iframe-bank-account'}->{txt}"),"\n";
print $q->div({-class=>'content2'}, "$varenv->{cms}->{'iframe-sepa-mandat-prolog'}->{txt}"),"\n";
- #print $q->div({-class=>'content2'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n";
+ if($ctadr->{int03} == 1 && $ctadr->{ct_name} =~ /^\w{2}-\w+/ && !$ctadr->{int18}){
+ print $q->div({-class=>'content2',-style=>"color:$red"}, "$varenv->{cms}->{'iframe-payAck-failure'}->{txt}"),"\n";
+ }
foreach (@tpl_order){
my ($key,$des,$size) = split /=/,$_;
$ctadr->{$key} = $q->unescapeHTML("$ctadr->{$key}");
my $label_des="";
- my $red = "#c83434";
+ $red = "#c83434";
my $required="required";
if($key eq "txt22"){
if($R::IBAN){
diff --git a/copri4/shareeapp-operator/src/Tpl/RentalData.pm b/copri4/shareeapp-operator/src/Tpl/RentalData.pm
index 44b9830..c92faeb 100755
--- a/copri4/shareeapp-operator/src/Tpl/RentalData.pm
+++ b/copri4/shareeapp-operator/src/Tpl/RentalData.pm
@@ -101,9 +101,6 @@ sub tpl {
my $bonus_ak = "$varenv->{cms}->{'iframe-bonusnumber-accepted'}->{txt}";
$bonus_ak = "$varenv->{cms}->{'iframe-activation-code-info'}->{txt}" if($project eq "Freiburg");
- my $payable_check=0;
- $payable_check = $bw->isuser_rentable($ctadr,$varenv);
-
print "
\n";
#subMenue--------
@@ -167,6 +164,11 @@ sub tpl {
}#end confirm code manage
else{
+ my $payable_check=0;
+ $payable_check = $bw->isuser_rentable($ctadr,$varenv);
+ if($payable_check <= 1){
+ print $q->div({-class=>'content2',-style=>"color:$red"}, "$varenv->{cms}->{'iframe-payAck-failure'}->{txt}"),"\n";
+ }
print $q->start_form(-name=>'accountscreen', -action=>"/$varenv->{mandant}/Account/$varenv->{accounting_3}$session"),"\n";
print $q->hidden(-name=>"sessionid",-override=>1,-value=>"$R::sessionid");
diff --git a/copri4/shareeconf/examples/apikeys.cfg b/copri4/shareeconf/examples/apikeys.cfg
index df14c50..6dd8ec5 100755
--- a/copri4/shareeconf/examples/apikeys.cfg
+++ b/copri4/shareeconf/examples/apikeys.cfg
@@ -1,11 +1,18 @@
+
+ username = "xxxxxxxxxx"
+ passwd = "xxxxxxxx"
+
+
- gtx_key = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ gtx_key = "xxxxxxxxxxxxxxxxxxxxxxxxx"
- pkey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+ pkey = "xxxxxxxxxxxxxxxxxxxxxxxx"
-
- xxxkey = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
+
+ endpoint = "https://shareedms-operator.example.tld/APIshareeio"
+ sharee_api_key = "xxxxxxxxxxxxxxxxxxxxxxx"
+
+
diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg
index 48dec0e..591edfd 100755
--- a/copri4/shareeconf/examples/global.cfg
+++ b/copri4/shareeconf/examples/global.cfg
@@ -254,6 +254,14 @@
speed = 1
meter = 50
+
+ 0 = ""
+ 1 = "Aufwand TeilRad Fibu Gebühr"
+ 2 = "Payone Gebühr"
+ 3 = "Zahlungseingang Teilzahlung"
+ 4 = "Zahlungseingang Prepaid/Vorkasse"
+ 5 = "Operator Prepaid Abbuchung"
+
jsscript = "js/mobile_script.js"
style_bootstrap_icons = "external/bootstrap-icons-1.10.2/bootstrap-icons.css"
diff --git a/copri4/shareeconf/examples/sharee_operator.sql.gz b/copri4/shareeconf/examples/sharee_operator.sql.gz
index 248c2d5..5481a07 100755
Binary files a/copri4/shareeconf/examples/sharee_operator.sql.gz and b/copri4/shareeconf/examples/sharee_operator.sql.gz differ