roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-07-01 02:06:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Payment sum_preauth fix

Browse source
This commit is contained in:
Rainer Gümpelein 2022-02-17 13:41:16 +01:00
parent 7656e9d291
commit 435f6c1aa5
1 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ sub preauthorizationSEPA_main {
my $self = shift; my $self = shift;
my $varenv = shift; my $varenv = shift;
my $ctadr = shift; my $ctadr = shift;
my $ctt = shift; my $ctt_rec = shift;
my $owner = shift || 0; my $owner = shift || 0;
my $payoneret = ""; my $payoneret = "";
my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf}; my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf};
@ -118,25 +118,23 @@ sub preauthorizationSEPA_main {
table => "contenttrans", table => "contenttrans",
fetch => "one", fetch => "one",
template_id => 218, template_id => 218,
c_id => $ctt->{c_id}, c_id => $ctt_rec->{c_id},
}; };
my $ctt_up = $dbt->fetch_record($dbh,$pref); my $ctt = { c_id => 0 };
$ctt = $dbt->fetch_record($dbh,$pref);
$ctt->{ct_name} = $ctt_up->{ct_name}; if($ctt_rec->{renewed}){
if($ctt->{renewed}){ if($ctt->{ct_name} =~ /\d+-\d+/){
$ctt->{ct_name} = $ctt_up->{ct_name}; my ($ct_name,$subname) = split(/-/,$ctt->{ct_name});
if($ctt_up->{ct_name} =~ /\d+-\d+/){
my ($ct_name,$subname) = split(/-/,$ctt_up->{ct_name});
$subname++; $subname++;
$ctt->{ct_name} = "$ct_name-$subname"; $ctt->{ct_name} = "$ct_name-$subname";
}else{ }else{
$ctt->{ct_name} = "$ctt_up->{ct_name}-1"; $ctt->{ct_name} = "$ctt->{ct_name}-1";
} }
} }
$ctt->{reference} = $dbt->{operator}->{$varenv->{dbname}}->{oprefix} . "-S-" . $ctt->{ct_name}; $ctt->{reference} = $dbt->{operator}->{$varenv->{dbname}}->{oprefix} . "-S-" . $ctt->{ct_name};
#2019-05-18, makes only sense if int15 alias $sum_preauth > 0 if($ctadr->{c_id} && $ctt->{c_id} && $ctt->{int01} > 0){
if($ctadr->{c_id} && $ctt->{c_id} && $ctt->{int15} > 0){
my $lastname = $ctadr->{txt01}; my $lastname = $ctadr->{txt01};
(my $firstname,$lastname) = split(/\s+/,$ctadr->{txt01}) if($ctadr->{txt01} =~ /\w\s+\w/i); (my $firstname,$lastname) = split(/\s+/,$ctadr->{txt01}) if($ctadr->{txt01} =~ /\w\s+\w/i);
@ -153,7 +151,7 @@ sub preauthorizationSEPA_main {
#$currency = "CHF" if($bcountry eq "CH"); #$currency = "CHF" if($bcountry eq "CH");
$ctadr->{txt23} =~ s/\s//g; $ctadr->{txt23} =~ s/\s//g;
my $amount = 0; my $amount = 0;
$amount = $ctt->{int15} * 100 if($ctt->{int15}); $amount = $ctt->{int01} * 100 if($ctt->{int01});
my $preauth_request = { my $preauth_request = {
request => 'preauthorization', request => 'preauthorization',
clearingtype => 'elv', clearingtype => 'elv',
@ -186,10 +184,21 @@ sub captureSEPA_main {
my $self = shift; my $self = shift;
my $varenv = shift; my $varenv = shift;
my $ctadr = shift; my $ctadr = shift;
my $ctt = shift; my $ctt_rec = shift;
my $owner = shift || 0; my $owner = shift || 0;
my $payoneret = ""; my $payoneret = "";
my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf}; my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf};
my $dbh = "";
#to get actual data
my $pref = {
table => "contenttrans",
fetch => "one",
template_id => 218,
c_id => $ctt_rec->{c_id},
};
my $ctt = { c_id => 0 };
$ctt = $dbt->fetch_record($dbh,$pref);
if($ctt->{c_id} && (!$ctt->{state} || $ctt->{int14})){ if($ctt->{c_id} && (!$ctt->{state} || $ctt->{int14})){
my $amount = 0; my $amount = 0;
@ -214,7 +223,7 @@ sub preauthorizationCC_main {
my $self = shift; my $self = shift;
my $varenv = shift; my $varenv = shift;
my $ctadr = shift; my $ctadr = shift;
my $ctt = shift; my $ctt_rec = shift;
my $owner = shift || 0; my $owner = shift || 0;
my $payoneret = ""; my $payoneret = "";
my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf}; my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf};
@ -225,25 +234,23 @@ sub preauthorizationCC_main {
table => "contenttrans", table => "contenttrans",
fetch => "one", fetch => "one",
template_id => 218, template_id => 218,
c_id => $ctt->{c_id}, c_id => $ctt_rec->{c_id},
}; };
my $ctt_up = $dbt->fetch_record($dbh,$pref); my $ctt = { c_id => 0 };
$ctt = $dbt->fetch_record($dbh,$pref);
$ctt->{ct_name} = $ctt_up->{ct_name}; if($ctt_rec->{renewed}){
if($ctt->{renewed}){ if($ctt->{ct_name} =~ /\d+-\d+/){
$ctt->{ct_name} = $ctt_up->{ct_name}; my ($ct_name,$subname) = split(/-/,$ctt->{ct_name});
if($ctt_up->{ct_name} =~ /\d+-\d+/){
my ($ct_name,$subname) = split(/-/,$ctt_up->{ct_name});
$subname++; $subname++;
$ctt->{ct_name} = "$ct_name-$subname"; $ctt->{ct_name} = "$ct_name-$subname";
}else{ }else{
$ctt->{ct_name} = "$ctt_up->{ct_name}-1"; $ctt->{ct_name} = "$ctt->{ct_name}-1";
} }
} }
$ctt->{reference} = $dbt->{operator}->{$varenv->{dbname}}->{oprefix} . "-C-" . $ctt->{ct_name}; $ctt->{reference} = $dbt->{operator}->{$varenv->{dbname}}->{oprefix} . "-C-" . $ctt->{ct_name};
#2019-05-18, makes only sense if int15 alias $sum_preauth > 0 if($ctadr->{c_id} && $ctt->{c_id} && $ctt->{int01} > 0){
if($ctadr->{c_id} && $ctt->{c_id} && $ctt->{int15} > 0){
my $lastname = $ctadr->{txt01}; my $lastname = $ctadr->{txt01};
(my $firstname,$lastname) = split(/\s+/,$ctadr->{txt01}) if($ctadr->{txt01} =~ /\w\s+\w/); (my $firstname,$lastname) = split(/\s+/,$ctadr->{txt01}) if($ctadr->{txt01} =~ /\w\s+\w/);
chomp($firstname); chomp($firstname);
@ -254,7 +261,7 @@ sub preauthorizationCC_main {
chomp($city); chomp($city);
my $amount = 0; my $amount = 0;
$amount = $ctt->{int15} * 100 if($ctt->{int15}); $amount = $ctt->{int01} * 100 if($ctt->{int01});
my $preauth_request = { my $preauth_request = {
request => 'preauthorization', request => 'preauthorization',
clearingtype => 'cc', clearingtype => 'cc',
@ -291,10 +298,21 @@ sub captureCC_main {
my $self = shift; my $self = shift;
my $varenv = shift; my $varenv = shift;
my $ctadr = shift; my $ctadr = shift;
my $ctt = shift; my $ctt_rec = shift;
my $owner = shift || 0; my $owner = shift || 0;
my $payoneret = ""; my $payoneret = "";
my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf}; my $payone_conf = $dbt->{operator}->{$varenv->{dbname}}->{payone_conf} || $dbt->{payone_conf};
my $dbh = "";
#to get actual data
my $pref = {
table => "contenttrans",
fetch => "one",
template_id => 218,
c_id => $ctt_rec->{c_id},
};
my $ctt = { c_id => 0 };
$ctt = $dbt->fetch_record($dbh,$pref);
if($ctt->{c_id} && (!$ctt->{state} || $ctt->{int14} || $ctt->{txt28})){ if($ctt->{c_id} && (!$ctt->{state} || $ctt->{int14} || $ctt->{txt28})){
my $amount = 0; my $amount = 0;
@ -618,11 +636,11 @@ sub payone_capture(){
} }
#preauth #preauth
if($ctadr->{int03} && $ctadr->{int03} == 1 && $ctadr->{ct_name} && $ctadr->{ct_name} =~ /\w{2}-\d+/ && (!$ctt->{txt16} || $ctt->{int03} ne "1")){ if($ctadr->{int03} && $ctadr->{int03} == 1 && $ctadr->{ct_name} && $ctadr->{ct_name} =~ /\w{2}-\d+/ && !$ctt->{txt16}){
$self->preauthorizationSEPA_main($varenv,$ctadr,$ctt,$owner); $self->preauthorizationSEPA_main($varenv,$ctadr,$ctt,$owner);
sleep 2; sleep 2;
}elsif($ctadr->{int03} && $ctadr->{int03} == 2 && $ctadr->{ct_name} && length($ctadr->{ct_name}) >= 19 && (!$ctt->{txt16} || $ctt->{int03} ne "2")){ }elsif($ctadr->{int03} && $ctadr->{int03} == 2 && $ctadr->{ct_name} && length($ctadr->{ct_name}) >= 19 && !$ctt->{txt16}){
$self->preauthorizationCC_main($varenv,$ctadr,$ctt,$owner); $self->preauthorizationCC_main($varenv,$ctadr,$ctt,$owner);
sleep 2; sleep 2;
} }
@ -639,7 +657,7 @@ sub payone_capture(){
$self->captureCC_main($varenv,$ctadr,$ctt,$owner); $self->captureCC_main($varenv,$ctadr,$ctt,$owner);
} }
else{ else{
$return_text = "Payment.pm can not get TXID\n"; $return_text = "Payment.pm can not get TXID ($ctadr->{int03} && $ctadr->{ct_name} && !$ctt->{txt16})\n";
} }
#wkhtml #wkhtml