roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-11 22:37:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

tarif_elements cms language fix

Browse source
This commit is contained in:
ragu 2023-10-18 12:15:15 +02:00
parent b92f2c6b5c
commit 41bd55d6c2
12 changed files with 74 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ my $response = {
apiserver => "$apiserver",
response => "$respreq",
uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}",
copri_version => "4.1.23.18",
copri_version => "4.1.23.19",
user_id => "",
authcookie => "",
new_authcoo => "0",

2
copri4/main/src/Mod/Buttons.pm
View file

@ -262,7 +262,7 @@ sub selector_class(){
my $column = shift;
my $class = shift || "";
my $style = shift || "";
my $sel = shift || "";
my $sel = shift || 0;
my @selval = @_;
my @selopt = ();

12
copri4/main/src/Mod/Modalbox.pm
View file

@ -24,6 +24,7 @@ sub new {
}
sub mobox(){
my $varenv = shift;
my $node_meta = shift;
my $users_dms = shift;
my $return = shift || "";
@ -35,7 +36,6 @@ sub mobox(){
my $dbt = new DBtank;
$q->import_names('R');
my @keywords = $q->param;
my %varenv = $cf->envonline();
my $script = $q->script_name();
my $path = $q->path_info();
my $lang = "de";
@ -52,7 +52,7 @@ sub mobox(){
my $rows = $address_wc + $table_wc;
my $height = "600";
if($varenv{orga} eq "dms"){
if($varenv->{orga} eq "dms"){
$rows = $rows - 0;
}else{
$rows = $rows - 10;
@ -67,13 +67,13 @@ print<<EOF
background: $bg_color;
}
.ui-dialog > .ui-widget-header {
color:$varenv{color};
color:$varenv->{color};
font-weight:normal;
border:1px solid $bg_color2;
background: $bg_color2;
}
.ui-widget-overlay {
background: #666 url("$varenv{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;
background: #666 url("$varenv->{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;
opacity: .5;
filter: Alpha(Opacity=50);
}
@ -103,9 +103,9 @@ EOF
print "<div id='dialog-form' style='text-align:center;margin:0;padding:2px;max-width:1200px;' title='Terminal – Faktura $debug'>";
if(looks_like_number($users_dms->{c_id4trans}) && looks_like_number($users_dms->{tpl_id4trans})){
if($table eq "contenttrans" && $varenv{orga} eq "dms"){
if($table eq "contenttrans" && $varenv->{orga} eq "dms"){
require "Tpl/Address3.pm";
&Address3::tpl($node_meta,$users_dms,$return);
&Address3::tpl($varenv,$node_meta,$users_dms,$return);
}
}else{
print $q->div({-style=>"padding:0.1em;margin:0em;background-color:white;font-size:0.81em;"}, "Ein neues Formular kann im COPRI Hauptfenster geöffnet werden (Code: $users_dms->{c_id4trans} && $users_dms->{tpl_id4trans})",

6
copri4/main/src/Mod/Modalbox3.pm
View file

@ -21,6 +21,7 @@ sub new {
}
sub mobox3(){
my $varenv = shift;
my $node_meta = shift;
my $users_dms = shift;
my $feedb = shift || {};
@ -31,7 +32,6 @@ sub mobox3(){
my $but = new Buttons;
$q->import_names('R');
my @keywords = $q->param;
my %varenv = $cf->envonline();
my $script = $q->script_name();
my $path = $q->path_info();
my $coo = $q->cookie(-name=>'domcookie');
@ -69,7 +69,7 @@ print<<EOF
background: $bg_color2;
}
.ui-widget-overlay {
background: #666 url("$varenv{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;
background: #666 url("$varenv->{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;
opacity: .5;
filter: Alpha(Opacity=50);
}
@ -114,7 +114,7 @@ EOF
#}
elsif(($R::node2edit && $R::node2edit =~ /editpart/) || ($R::base_edit && $R::base_edit !~ /delete/)){
require "Tpl/BaseEdit.pm";
&BaseEdit::tpl($node_meta,$users_dms,$feedb);
&BaseEdit::tpl($varenv,$node_meta,$users_dms,$feedb);
}
else{
print $q->div("Zugriff verweigert.");

2
copri4/main/src/Mod/Pricing.pm
View file

@ -417,7 +417,7 @@ sub fetch_rentalfeed {
$ctpos->{int17} =~ s/\./,/ if($lang eq "de");
$return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int17}","$ctpos->{int17} € / 24 $varenv_prim->{cms}->{'unit-hour'}->{txt}"];
}elsif($td_template->{$td}->{time02} && $ctpos->{time02} =~ /[1-9]/){
if($further_freedtime_available == 1 || ($ctpos->{int10} == 3 && $ctpos->{time02})){
if($varenv->{orga} eq "dms" || $further_freedtime_available == 1 || ($ctpos->{int10} == 3 && $ctpos->{time02})){
$time_unit = $dbt->time_format($varenv_prim,$ctpos->{time02});
$time_unit .= " / $varenv_prim->{cms}->{'unit-day'}->{txt}" if($dbt->{operator}->{$varenv->{dbname}}->{project} ne "Konstanz");
$return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{time02}","$time_unit"];

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

@ -52,6 +52,7 @@ sub printpre(){
my $pkey = $R::pkey || "";
my $debug = 0;#print line to doc if debug
$varenv{cms} = $dbt->fetch_cms($dbh,{ lang => $lang });
my $api_file = "/var/www/copri4/shareeconf/apikeys.cfg";
my $aconf = Config::General->new($api_file);
my %apikeyconf = $aconf->getall;