diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm index 1487eae..7ee5d39 100755 --- a/copri4/main/src/Mod/APIsigclient.pm +++ b/copri4/main/src/Mod/APIsigclient.pm @@ -173,7 +173,10 @@ sub sig_available { print FILE "Bike: $bike\n"; if($ctpos->{barcode} && $ctpos->{barcode} == $bike_id){ $response_out->{$bike}->{user_miniquery} = $show_dialog->{user_miniquery} if($show_dialog->{user_miniquery}); - $response_out->{$bike}->{co2saving} = $show_dialog->{co2saving} if($show_dialog->{co2saving}); + $response_out->{$bike}->{co2saving} = ""; + if($show_dialog->{co2saving}){ + $response_out->{$bike}->{co2saving} = $show_dialog->{co2saving}; + } } $response_out->{$bike}->{bike} = "$bike"; $response_out->{$bike}->{authed} = "$authed"; diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm index f159b43..9d8d0ed 100755 --- a/copri4/main/src/Tpl/Calorin.pm +++ b/copri4/main/src/Tpl/Calorin.pm @@ -63,6 +63,10 @@ sub tpl(){ $path =~ s/\/user|\/manager|\/admin//; my $now_time = strftime "%Y-%m-%d %H:%M", localtime; + my $dbh_primary = $dbt->dbconnect_extern("sharee_primary"); + my $users_dms_primary = { u_id => 0 }; + $users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2"); + my $table = "contenttrans"; my $u_name = $q->escapeHTML("$R::u_name"); my $dbh = ""; @@ -433,14 +437,20 @@ sub tpl(){ my $end_station = "$cttpos->{$pid}->{int04}"; $start_station = $q->a({-class=>"linknav3",-style=>"",-href=>"/DMS/Waren/?detail_search=1&s_int04=$cttpos->{$pid}->{int06}",-title=>"Rad Warenstamm nach Station filtern"},"$cttpos->{$pid}->{int06}") if($ct4rel_ware->{$cttpos->{$pid}->{cc_id}}->{rel_id}); $end_station = $q->a({-class=>"linknav3",-style=>"",-href=>"/DMS/Waren/?detail_search=1&s_int04=$cttpos->{$pid}->{int04}",-title=>"Rad Warenstamm nach Station filtern"},"$cttpos->{$pid}->{int04}") if($ct4rel_ware->{$cttpos->{$pid}->{cc_id}}->{rel_id}); - my $kunde = $q->a({-class=>"linknav3",-style=>"$ware_style",-href=>"/DMS/Kunden/?detail_search=1&s_c_id=$cttpos->{$pid}->{ca_id}",-title=>"Kunde im Kundenstamm"},"$cttpos->{$pid}->{txt08} ($cttpos->{$pid}->{ca_id})");#2021-05-24 saves kd name + + my $kunde = "$cttpos->{$pid}->{txt08}"; + if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){ + $kunde = $q->a({-class=>"linknav3",-style=>"$ware_style",-href=>"/DMS/Kunden/?detail_search=1&s_c_id=$cttpos->{$pid}->{ca_id}",-title=>"Kunde im Kundenstamm"},"$cttpos->{$pid}->{txt08} ($cttpos->{$pid}->{ca_id})");#2021-05-24 saves kd name + } my $edit_pos = $q->a({-class=>"editboo",-href=>"?base_edit=transpos\&c_id=$cttpos->{$pid}->{c_id}\&owner=$users_dms->{u_id}",-title=>"Miete bearbeiten ($cttpos->{$pid}->{c_id})"},$q->span({-class=>"bi bi-file-earmark-text-fill"})); print $q->div({-style=>'float:left;margin-left:1em;font-size:0.91em;'}, "$edit_pos $i) $start_time – $end_time → $kunde → Start Station $start_station → End Station $end_station → Rad $bikenr $status $lock_state $track_info → $u_name/$u_name_end $pos_id"),"\n"; - print $q->div({-style=>'float:left;margin-left:1em;font-size:0.91em;'}, "→ Faktura", $q->a({-class=>"linknav3",-style=>"$trans_style",-href=>"/DMS/Faktura?ct_trans=open\&c_id4trans=$c_id4trans\&tpl_id4trans=$tpl_id4trans\&kind_of_trans=Faktura\&owner=$users_dms->{owner}",-title=>"Faktura Terminal öffnen"},"\#$ct_name")),"\n" if($c_id4trans && $tpl_id4trans); - print $q->div({-style=>'float:left;margin-left:1em;font-size:0.91em;'}, "$user_device"),"\n"; + if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2){ + print $q->div({-style=>'float:left;margin-left:1em;font-size:0.91em;'}, "→ Faktura", $q->a({-class=>"linknav3",-style=>"$trans_style",-href=>"/DMS/Faktura?ct_trans=open\&c_id4trans=$c_id4trans\&tpl_id4trans=$tpl_id4trans\&kind_of_trans=Faktura\&owner=$users_dms->{owner}",-title=>"Faktura Terminal öffnen"},"\#$ct_name")),"\n" if($c_id4trans && $tpl_id4trans); + print $q->div({-style=>'float:left;margin-left:1em;font-size:0.91em;'}, "$user_device"),"\n"; + } }elsif($node_meta->{ct_table} eq "contenttheftpos"){ my $speed = 0; diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm index 4d9d6bc..679c3a9 100755 --- a/copri4/main/src/Tpl/TransPositionen.pm +++ b/copri4/main/src/Tpl/TransPositionen.pm @@ -529,7 +529,7 @@ EOF my $users_dms_primary = { u_id => 0 }; $users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2"); - if($users_dms_primary->{c_id} && $users_dms_primary->{int03} == 2 && !$ctt->{close_time} && $varenv{Zahlungsweise}){ + if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2 && !$ctt->{close_time} && $varenv{Zahlungsweise}){ my @_paymentstate = split(/\|/,$varenv{Zahlungsweise}); push @_paymentstate, ""; my $kind_of_payment = ""; diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm index cda5a00..175221c 100755 --- a/copri4/shareedms-operator/src/Lib/Mlogic.pm +++ b/copri4/shareedms-operator/src/Lib/Mlogic.pm @@ -168,7 +168,14 @@ sub tpl(){ $parent_id = $node->{$id}->{parent_id}; $main_id = $node->{$id}->{main_id}; } - if($node->{$id}->{main_id} && $node->{$id}->{node_name} =~ /$dbt->{shareedms_conf}->{mod_active}/){ + + my $dbh_primary = $dbt->dbconnect_extern("sharee_primary"); + my $users_dms_primary = { u_id => 0 }; + $users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2"); + + my $mod_active = "$dbt->{shareedms_conf}->{mod_active}"; + $mod_active .= "|Kunden|Faktura" if($users_dms_primary->{u_id} && $users_dms_primary->{int03} == 2); + if($node->{$id}->{main_id} && $node->{$id}->{node_name} =~ /$mod_active/){ my $topath = "/$viewsel[0]/$node->{$id}->{node_path}"; # #0. menue