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

Some minor changes in Faktura and servicetool maintenance

Browse source
This commit is contained in:
ragu 2023-05-02 12:35:41 +02:00
parent d264925ad5
commit 7fca481632
6 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -993,6 +993,7 @@ sub booking_request(){
table => "contenttranspos",
fetch => "one",
ca_id => "$auth->{c_id}",
template_id => "224",
barcode => "$auto_coupon",
};
my $co_pos = { c_id => 0 };

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

@ -614,10 +614,10 @@ elsif($q->param('request') eq "bikes_all"){
}else{
#if($bikes_allraw->{$bid}->{txt10} && $bikes_allraw->{$bid}->{txt10} =~ /maintenance/)
if($bikes_allraw->{$bid}->{int10} && $bikes_allraw->{$bid}->{int10} == 4){
$bikes_all->{$oprefix . $bid}->{service_state} = "3";
$bikes_all->{$oprefix . $bid}->{state} = "maintenance";
$service_state_debug .= "$bid: 0\n";
#$bw->log("maintenance TO available service_state bike: $bid:",$bikes_all->{$oprefix . $bid}->{service_state},"");
#1 = "available"
$apif->bikestate_update($authraw,$bikes_allraw->{$bid}->{c_id},"1");
}
}
#workaround to get todo_info on defect

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

@ -613,18 +613,18 @@ sub preinit(){
$ctt = $db->get_content1("contenttrans",$ctt->{c_id});
}
if($ctadr->{ct_name} =~ /\w{2}-\d+/){
if($state !~ /Zahlungseingang/ && !$ctt->{txt16}){
if($ctadr->{ct_name} =~ /\w{2}-\d+/){
my $payoneret = $payone->preauthorizationSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
sleep 2;
}elsif(length($ctadr->{ct_name}) >= 19){
}elsif(length($ctadr->{ct_name}) >= 19){
my $payoneret = $payone->preauthorizationCC_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
sleep 2;
}
}
$ctt = $db->get_content1("contenttrans",$ctt->{c_id});
$ctt->{sequence} = $R::payone_sequence || 1;
$ctt = $db->get_content1("contenttrans",$ctt->{c_id});
$ctt->{sequence} = $R::payone_sequence || 1;
if($state !~ /Zahlungseingang/){
#SEPA capture
if($ctadr->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA
my $payoneret = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
@ -640,8 +640,8 @@ sub preinit(){
#return "failure::$return_text";
}
#}else{
#return "failure::Payone Geldeinzug nicht ausgeführt. Hat der Einzug bereits stattgefunden?";
}else{
return "failure::Payone Geldeinzug nicht ausgeführt weil TXID bereits vorhanden. Hatte der Einzug bereits stattgefunden?";
}
}elsif($ctt->{txt00} eq "Storno" || $state eq "Zahlungsausfall"){
$update_ctt->{int14} = "null";
@ -649,6 +649,10 @@ sub preinit(){
$u_rows += $dbt->update_record($dbh,$update_ctt,$ctt);
#delete OPOS at all
$db->updater($table,"barcode",$ctt->{barcode},"int14","null","","","","","");
}elsif($state eq "fehlgeschlagener Einzug"){
$update_ctt->{int14} = "null";
$update_ctt->{pay_time} = "now()";
$u_rows += $dbt->update_record($dbh,$update_ctt,$ctt);
}elsif($ctt->{txt00} eq "Rechnung" && $R::sum_paid <= 0){
$update_ctt->{int14} = "null";
$update_ctt->{pay_time} = "now()";