From 76fe0eb26a26f4ce64ff8bdc3a7d4e4b24eaf319 Mon Sep 17 00:00:00 2001
From: ragu <ragu@gnu-systems.net>
Date: Wed, 6 Sep 2023 08:17:13 +0200
Subject: [PATCH] adding rental debug log. Check and view receivable amount in
 the invoice

---
 copri4/main/src/Mod/APIpayone.pm    | 2 ++
 copri4/main/src/Mod/APIsigclient.pm | 4 ++--
 copri4/main/src/Tpl/Address3.pm     | 8 ++++++--
 copri4/main/src/Tpl/BaseEdit.pm     | 8 +++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/copri4/main/src/Mod/APIpayone.pm b/copri4/main/src/Mod/APIpayone.pm
index 908ee18..a2b7913 100755
--- a/copri4/main/src/Mod/APIpayone.pm
+++ b/copri4/main/src/Mod/APIpayone.pm
@@ -154,6 +154,8 @@ sub handler {
 	  }
 
 	  #Testing, if capture price ne receivable, then capture fails
+	  #2023-09-05, does not work on payone server-error. there is noch further capture
+	  #Look at $pay_state in Address.pm
 	  if($txaction eq "capture" && $update_ctt->{int16} == 0 && $ctt->{int01} != $update_ctt->{int19}){
 	    $update_adr->{int12} = $vde_on_fail;
 	    $update_ctt->{int14} = 1;
diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm
index 36bcf70..5512c02 100755
--- a/copri4/main/src/Mod/APIsigclient.pm
+++ b/copri4/main/src/Mod/APIsigclient.pm
@@ -290,7 +290,7 @@ sub sig_available {
 	  }
 	  #just like caching
           $return2copri->{$bike}->{main_id} = "300102";
-          $return2copri->{$bike}->{main_id} = "300001" if($bike_id == 1001 || $bike_id == 84);#Contributor bikes
+          $return2copri->{$bike}->{main_id} = "300001" if($bike_id == 84);#Contributor bikes
 	  $return2copri->{$bike}->{int11} = 3;#system
 	  $return2copri->{$bike}->{int25} = 1;#tracking on
           $return2copri->{$bike}->{barcode} = $bike_id;
@@ -541,7 +541,7 @@ sub sig_booking {
    }
    
    #keep in mind, all other states will be done on REST, hopefully
-   $update_pos->{txt25} = "$ctpos->{txt25}\n$sig_book->{return_state}";# if($sig_book->{return_state});
+   $update_pos->{txt25} = "$ctpos->{txt25}\n- $sig_book->{return_state}";
    $rows = $dbt->update_record($dbh,$update_pos,$ctpos);
    print FILE "<--- rows: $rows, update_pos: $ctpos->{c_id}, with:" . Dumper($update_pos) . "\n";
 
diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm
index 0b7c0b6..b4c9b9b 100755
--- a/copri4/main/src/Tpl/Address3.pm
+++ b/copri4/main/src/Tpl/Address3.pm
@@ -344,7 +344,11 @@ EOF
      }
     }
   }else{
-    my $pay_sequence = " | sequencenr: $ctt->{int18}" if($ctt->{int18});
+    my $pay_state = "";
+    #if txid && balance==0 && sequence==0 && invoice-sum!=receivable
+    $pay_state = " | receivable: $ctt->{int19}. Einzug im PMI prüfen!" if($ctt->{txt16} && $ctt->{int16} == 0 && $ctt->{int18} == 0 && looks_like_number($ctt->{int19}) && $ctt->{int01} != $ctt->{int19});
+    my $pay_sequence = "";
+    $pay_sequence = " | sequencenr: $ctt->{int18}" if($ctt->{int18});
     my @_paymentstate = split(/\|/,$dbt->{shareedms_conf}->{payment_state});
     my $kind_of_payment = "fehlt";
     $kind_of_payment = "$_paymentstate[0]" if($ctadr->{int03} == 1);
@@ -364,7 +368,7 @@ EOF
     print $q->td({-class=>'tdval4'},"$ctt->{txt16}"),"\n";
     print $q->Tr(),"\n";
     print $q->td({-class=>'tdescr4'},"Payone Saldo"),"\n";
-    print $q->td({-class=>'tdval4'},"$ctt->{int16} $pay_sequence"),"\n";
+    print $q->td({-class=>'tdval4'},"$ctt->{int16} $pay_sequence $pay_state"),"\n";
     print $q->Tr(),"\n";
     print $q->td({-class=>'tdescr4'},"Payone Referenz"),"\n";
     print $q->td({-class=>'tdval4'},"$ctt->{txt25}"),"\n";
diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm
index d9b9723..57a2cc4 100755
--- a/copri4/main/src/Tpl/BaseEdit.pm
+++ b/copri4/main/src/Tpl/BaseEdit.pm
@@ -517,7 +517,13 @@ EOF
 	  $cttpos->{$key} = $q->unescapeHTML("$cttpos->{$key}");
           $cttpos->{$key} = $lb->newline($cttpos->{$key},"","");
        	  print $q->Tr(),"\n";
-	  #print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
+	  print $q->td({-class=>'content1_cms',-colspan=>2},"$cttpos->{$key}"),"\n";
+	 }
+ 	}elsif($key eq "txt25"){
+	 if($cttpos->{$key} && $users_dms->{int03} > 1){
+	  $cttpos->{$key} = $q->unescapeHTML("$cttpos->{$key}");
+          $cttpos->{$key} = $lb->newline($cttpos->{$key},"","");
+       	  print $q->Tr(),"\n";
 	  print $q->td({-class=>'content1_cms',-colspan=>2},"$cttpos->{$key}"),"\n";
 	 }
         }elsif($key =~ /txt/){