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

Some minor fix in table-search and content-editor

Browse source
This commit is contained in:
ragu 2023-08-02 19:03:27 +02:00
parent 01ddabbad2
commit d9974f57a8
6 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -743,8 +743,8 @@ sub payone_capture(){
#send_invoice infomail, only if eMail never sent #send_invoice infomail, only if eMail never sent
if(-f "$dbt->{copri_conf}->{basedir}/$varenv->{syshost}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf" && !$ctt->{txt30}){ if(-f "$dbt->{copri_conf}->{basedir}/$varenv->{syshost}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf" && !$ctt->{txt30}){
system("$dbt->{copri_conf}->{basedir}/$varenv->{syshost}/src/scripts/mailTransportcms.pl '$varenv->{syshost}' 'send_invoice' '$ctt->{int10}' '$ctt->{c_id}' '' ''"); system("$dbt->{copri_conf}->{basedir}/$varenv->{syshost}/src/scripts/mailTransportcms.pl '$varenv->{syshost}' 'send_invoice' '$ctt->{int10}' '$ctt->{c_id}' '' 'email-invoice' '1'");
print EMA "---> Payment send_invoice $praefix-$ctt->{ct_name}.pdf email command: $dbt->{copri_conf}->{basedir}/$varenv->{syshost}/src/scripts/mailTransportcms.pl '$varenv->{syshost}' 'send_invoice' '$ctt->{int10}' '$ctt->{c_id}' '' ''\n"; print EMA "---> Payment send_invoice $praefix-$ctt->{ct_name}.pdf email command: $dbt->{copri_conf}->{basedir}/$varenv->{syshost}/src/scripts/mailTransportcms.pl '$varenv->{syshost}' 'send_invoice' '$ctt->{int10}' '$ctt->{c_id}' '' 'email-invoice' '1'\n";
} }
close EMA; close EMA;
} }

7
copri4/main/src/Mod/Prelib.pm
View file

@ -135,11 +135,14 @@ sub new_content {
my $dbh = ""; my $dbh = "";
my $feedb = { message => "" }; my $feedb = { message => "" };
my $main_id = $node_meta->{main_id};
$main_id = $node_meta->{parent_id} if($R::template_id == 194 && $node_meta->{main_id} >= 400001);
my $pref_cc = { my $pref_cc = {
table => "$R::ct_table", table => "$R::ct_table",
fetch => "one", fetch => "one",
template_id => "$R::template_id", template_id => "$R::template_id",
main_id => "$node_meta->{main_id}", main_id => "$main_id",
}; };
my $cc_part = { c_id => 0 }; my $cc_part = { c_id => 0 };
@ -155,7 +158,7 @@ sub new_content {
barcode => "$next_barcode", barcode => "$next_barcode",
ct_name => "---", ct_name => "---",
template_id => "$R::template_id", template_id => "$R::template_id",
main_id => "$node_meta->{main_id}", main_id => "$main_id",
txt12 => "$dbt->{operator}->{$varenv{dbname}}->{oprefix}", txt12 => "$dbt->{operator}->{$varenv{dbname}}->{oprefix}",
}; };
my $c_idnew = 0; my $c_idnew = 0;

11
copri4/main/src/Tpl/BaseEdit.pm
View file

@ -283,7 +283,11 @@ sub tpl(){
} }
} }
print $q->td({-style=>"background-color:#a7a18f;border-bottom: 1px solid silver;text-align:right;font-size:11px;"}, "$u_name / $dbmtime"); print $q->td({-style=>"background-color:#a7a18f;border-bottom: 1px solid silver;text-align:right;font-size:11px;"}, "$u_name / $dbmtime");
print $q->td({-style=>"background-color:#a7a18f;padding-right:10px;border-bottom: 1px solid silver;text-align:right;"},$but->singlesubmit7("$edit","remove_chk4rel","$ib{remove_chk4rel}","margin:0 5px;")) if($node_meta->{tpl_id} !~ /199|221/);
#if($node_meta->{tpl_id} !~ /199|221/){
if(($node_meta->{tpl_id} =~ /198|205|210|219|224|225|228|229/) || ($node_meta->{tpl_id} == 202 && $varenv{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}) || ($node_meta->{tpl_id} == 194 && !$ctrel->{int11})){
print $q->td({-style=>"background-color:#a7a18f;padding-right:10px;border-bottom: 1px solid silver;text-align:right;"},$but->singlesubmit7("$edit","remove_chk4rel","$ib{remove_chk4rel}","margin:0 5px;"));
}
print $q->end_table; print $q->end_table;
@ -618,8 +622,13 @@ EOF
$oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}-" if($node_meta->{tpl_id} == 224 || $node_meta->{tpl_id} == 228); $oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}-" if($node_meta->{tpl_id} == 224 || $node_meta->{tpl_id} == 228);
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
#CMS Textkey readonly
if($node_meta->{tpl_id} == 194 && $ctrel->{int11}){
print $q->td({-class=>'content1_cms',-colspan=>2}, "$oprefix", $q->textfield(-class=>'etxt', -style=>"width:$w;",-name=>"$key", -override=>'1',-default=>"$ct_name",-readonly=>1),$postdes),"\n";
}else{
print $q->td({-class=>'content1_cms',-colspan=>2}, "$oprefix", $q->textfield(-class=>'etxt', -style=>"width:$w;",-name=>"$key", -override=>'1',-default=>"$ct_name"),$postdes),"\n"; print $q->td({-class=>'content1_cms',-colspan=>2}, "$oprefix", $q->textfield(-class=>'etxt', -style=>"width:$w;",-name=>"$key", -override=>'1',-default=>"$ct_name"),$postdes),"\n";
} }
}
elsif($key eq "barcode"){ elsif($key eq "barcode"){
my $oprefix = ""; my $oprefix = "";
$oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}" if($node_meta->{tpl_id} == 205); $oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}" if($node_meta->{tpl_id} == 205);

14
copri4/main/src/Tpl/Liste3.pm
View file

@ -433,6 +433,12 @@ EOF
$c_id4trans = $users_dms->{c_id4trans}; $c_id4trans = $users_dms->{c_id4trans};
} }
if(!$R::detail_search && -f $hashfile && ($path =~ /letzte Suche/ || $R::select_part || $R::ct_trans || $R::trans2edit || $R::node2edit || $R::base_edit || $R::rel_edit || $R::set_state)){
$searchref = {};
$searchref = retrieve($hashfile);
$tplids = $searchref->{tplids} if($searchref->{tplids});
}
#it will takes only one dataset #it will takes only one dataset
if($node_meta->{ct_table} eq "contenttrans" && $c_id4trans && $c_id4trans =~ /^\d+$/ && $users_dms->{faksum}){ if($node_meta->{ct_table} eq "contenttrans" && $c_id4trans && $c_id4trans =~ /^\d+$/ && $users_dms->{faksum}){
$ct4rel = $db->collect_cid($table,$lang,$tplids,$R::rel_id,$R::barcode,"c_id",$c_id4trans); $ct4rel = $db->collect_cid($table,$lang,$tplids,$R::rel_id,$R::barcode,"c_id",$c_id4trans);
@ -451,15 +457,9 @@ EOF
} }
#trying to save hashref #trying to save hashref
if($R::detail_search && ref($searchref) eq "HASH"){ if(ref($searchref) eq "HASH" && $path !~ /letzte Suche/ && !$R::select_part && !$R::ct_trans && !$R::trans2edit && !$R::node2edit && !$R::base_edit && !$R::rel_edit && !$R::set_state){
store $searchref, $hashfile; store $searchref, $hashfile;
}elsif(!$R::detail_search && -f $hashfile && ($path =~ /letzte Suche/)){
#}elsif(!$R::detail_search && -f $hashfile && ($path =~ /letzte Suche/ || $R::select_part || $R::ct_trans || $R::trans2edit || $R::node2edit || $R::base_edit || $R::rel_edit || $R::set_state)){
$searchref = {};
$searchref = retrieve($hashfile);
$tplids = $searchref->{tplids} if($searchref->{tplids});
} }
#print Dumper($searchref);exit;
$rows = $db->count_content($table,"$main_ids","$tplids"); $rows = $db->count_content($table,"$main_ids","$tplids");
#Verkaufsjournal default view #Verkaufsjournal default view

2
copri4/main/src/Tpl/SubListe.pm
View file

@ -229,7 +229,7 @@ EOF
if(($node_meta->{ct_table} eq "users" && $users_dms->{int07} >= 1) || ($node_meta->{ct_table} eq "contentadrpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentuser" && $users_dms->{int08} >= 1)){ if(($node_meta->{ct_table} eq "users" && $users_dms->{int07} >= 1) || ($node_meta->{ct_table} eq "contentadrpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentpos" && $users_dms->{int01} >= 1) || ($node_meta->{ct_table} eq "contentuser" && $users_dms->{int08} >= 1)){
#trying to save hashref #trying to save hashref
if($node_meta->{tpl_id} =~ /194/ && $R::detail_search && ref($searchref) eq "HASH"){ if($node_meta->{tpl_id} =~ /194/ && ref($searchref) eq "HASH" && !$R::node2edit && !$R::base_edit){
store $searchref, $hashfile; store $searchref, $hashfile;
} }

2
copri4/shareedms-operator/src/Lib/Mlogic.pm
View file

@ -269,7 +269,7 @@ sub tpl(){
my $big2menu=""; my $big2menu="";
#while (my ($key, $value) = each %{ $dbt->{operator} }) { #while (my ($key, $value) = each %{ $dbt->{operator} }) {
foreach my $key (sort keys (%{ $dbt->{operator} })) { foreach my $key (sort keys (%{ $dbt->{operator} })) {
$big2menu .= $but->lia_button("$dbt->{operator}->{$key}->{operatorDMS}","DMS $key","","","color:#$dbt->{operator}->{$key}->{bgcolor1};","") if($dbt->{operator}->{$key}->{merchant_id}); $big2menu .= $but->lia_button("$dbt->{operator}->{$key}->{operatorDMS}","DMS $key <span style='font-size:0.81em;'>($dbt->{operator}->{$key}->{title})","","","color:#$dbt->{operator}->{$key}->{bgcolor1};","") if($dbt->{operator}->{$key}->{merchant_id});
} }
foreach my $key (sort keys (%{ $dbt->{website} })) { foreach my $key (sort keys (%{ $dbt->{website} })) {
$big2menu .= $but->lia_button("$dbt->{website}->{$key}->{operatorWeb}","Web $key","","","color:#$dbt->{website}->{$key}->{bgcolor1};","") if($dbt->{website}->{$key}->{merchant_id}); $big2menu .= $but->lia_button("$dbt->{website}->{$key}->{operatorWeb}","Web $key","","","color:#$dbt->{website}->{$key}->{bgcolor1};","") if($dbt->{website}->{$key}->{merchant_id});