diff --git a/copri4/main/src/Mod/Prelogic.pm b/copri4/main/src/Mod/Prelogic.pm index 2d848d2..824d92d 100755 --- a/copri4/main/src/Mod/Prelogic.pm +++ b/copri4/main/src/Mod/Prelogic.pm @@ -104,13 +104,12 @@ sub preinit(){ #actual-path an get right mandant for verkauf $R::kind_of_trans = $R::kind_of_trans || $users_dms->{kind_of_trans}; - my $node_mandant = $db->get_node2($users_dms->{fullurl},"$R::kind_of_trans",$lang); - my $mandant_main_id = $R::mandant_main_id || $node_mandant->{parent_id}; - my $parent_trans = $db->get_node3("$mandant_main_id","$R::kind_of_trans","$lang") if($mandant_main_id); - my $ctf = $db->get_content1("contentuser","$node_mandant->{parent_id}"); + my $mandant_main_id = 100002; + my $parent_trans = $db->get_node3("$mandant_main_id","Faktura","$lang") if($mandant_main_id); + my $ctf = $db->get_content1("contentuser","$mandant_main_id"); my $ctb = $db->get_content1("contentuser","$users_dms->{u_id}"); - if($node_mandant->{parent_id} && !$parent_trans->{main_id}){ + if(!$parent_trans->{main_id}){ return "failure::Fehler
keine eindeutige Modulzuweisung vorhanden."; } my $rel = $db->get_rel4tpl4nd($parent_trans->{main_id},$lang,$users_dms->{c_id4trans}); @@ -833,7 +832,8 @@ sub preinit(){ $ctt->{sequence} = $R::payone_sequence || 1; #only if int14 = OPOS (set by preauthorization) - if($ctt->{int14}){ + #if($ctt->{int14}){#TODO doupleclick + if(1==1){ #SEPA capture if($ctt->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA my $payoneret = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id}); @@ -928,11 +928,13 @@ sub preinit(){ } #collect sub-nodes - my $main_ids = "$parent_trans->{main_id},"; - $main_ids .= $db->collect_noderec($parent_trans->{main_id},$lang,"nothing") if($parent_trans->{main_id}); - $main_ids =~ s/,$//; + #TODO + my $main_ids = "300008,300009";#Rechnung,Storno + #my $main_ids = "$parent_trans->{main_id},"; + #$main_ids .= $db->collect_noderec($parent_trans->{main_id},$lang,"nothing") if($parent_trans->{main_id}); + #$main_ids =~ s/,$//; - my $tpl_vk="$R::tpl_id"; + my $tpl_vk = "218"; my $table = "contenttrans"; my $sum_start = $R::sum_start || "0"; my $sum_kasse = $R::sum_kasse || "0"; @@ -968,8 +970,8 @@ sub preinit(){ my $rows = $db->count_content($table,"$_","$tpl_vk"); $db->updater("nodes","main_id",$_,"int10",$rows) if($_ > 300000 && $rows =~ /\d/); } - print $q->div({-class=>'elementwhite'},"1... redirecting to ... or CLICK ", $q->a({href=>"$varenv{wwwhost}/DMS/Faktura/Verleihjournal"},"$varenv{wwwhost}/DMS/Faktura/Verleihjournal")); - print redirect("$varenv{wwwhost}/DMS/Faktura/Verleihjournal?redirected=1\&return=0-0-0|$i_rows-$u_rows-$d_rows"); + print $q->div({-class=>'elementwhite'},"1... redirecting to ... or CLICK ", $q->a({href=>"$varenv{wwwhost}/DMS/Faktura/Verkaufsjournal"},"$varenv{wwwhost}/DMS/Faktura/Verkaufsjournal")); + print redirect("$varenv{wwwhost}/DMS/Faktura/Verkaufsjournal?redirected=1\&return=0-0-0|$i_rows-$u_rows-$d_rows"); exit 0; } } diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm index 66896c7..cfaac50 100755 --- a/copri4/main/src/Tpl/Address3.pm +++ b/copri4/main/src/Tpl/Address3.pm @@ -301,10 +301,6 @@ EOF print $q->Tr(),"\n"; print $q->td({-class=>'tdescr'},"payone error"),"\n"; print $q->td({-class=>'tdval'},"(transaction) $ctt->{txt28}"),"\n"; - }elsif($ctadr->{txt28} =~ /error/i){ - print $q->Tr(),"\n"; - print $q->td({-class=>'tdescr'},"payone error"),"\n"; - print $q->td({-class=>'tdval'},"(address) $ctadr->{txt28}"),"\n"; } print $q->end_table;