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

Lastenradbayern img

Browse source
This commit is contained in:
ragu 2022-05-24 10:46:05 +02:00
parent 98e098caae
commit cc4dfcd70f
35 changed files with 20 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,7 @@ if(!$coo && !$q->param('merchant_id')){
if($return_merchant->{project_id} eq "Bayern"){
$response->{agb_html} = "site/agb_lastenradbayern.html";
$response->{bike_info_html} = "site/bike_info_bayern.html";
$response->{privacy_html} = "site/privacy_lastenradbayern.html";
}
}

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

@ -696,7 +696,6 @@ sub handler {
background-position: right bottom;
background-attachment:fixed;
background-size:$varenv{background_size};
font-family: $varenv{font_family};
font-size: $varenv{font_size};
line-height: $varenv{line_height};
margin: 0; padding: 0;

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

@ -93,9 +93,9 @@ sub kmlGenerator {
my $icon_red = "Open_Red.png";
my $icon_blue = "Open_Blue.png";
if($project eq "Bayern"){
$icon_green = "LastenradBay_Standortpfeil_gruen_03a.png";
$icon_red = "LastenradBay_Standortpfeil_rot_03a.png";
$icon_blue = "LastenradBay_Standortpfeil_blau_03a.png";
$icon_green = "LastenradBay-custom-marker-gruen.png";
$icon_red = "LastenradBay-custom-marker-rot.png";
$icon_blue = "LastenradBay-custom-marker-bayblau.png";
}
my $timestamp = strftime "%Y%m%d%H%M%S", localtime;

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

@ -227,7 +227,7 @@ sub preinit(){
}
}
if(($ct_name || $ct->{barcode}) && $rel->{content_id}){
if($ct->{barcode} && $ct->{barcode} > 0 && $rel->{content_id}){
my $partnr = "$ct_name / $ct->{barcode}";
$partnr = "$ct_name" if("$ct_name" eq "$ct->{barcode}" || !$ct->{barcode});
my $bezeichnung = "$ct->{txt01}";
@ -258,7 +258,7 @@ sub preinit(){
}elsif($ct_name && !$rel->{content_id}){
return "failure::Für die Terminzuordnung bitte zuerst einen Verkauf Vorgang öffnen oder neu erzeugen.<br /> ::$varenv{wwwhost}/Verkauf::Zum Verkauf";
}else{
return "failure::Die Artikelnummer ist in der Waren Datenbank nicht angelegt oder einem anderen Lagerort zugeordnet.<br /> ::$varenv{wwwhost}/Waren::Waren verwalten";
return "failure::Die Artikelnummer konnte nicht gefunden werden.<br /> ::$varenv{wwwhost}/Waren::Waren verwalten";
}
}
#####

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

@ -259,7 +259,7 @@ td {
my $position;
my $h_toppx = "$h_top" . "px";
$position = "position:absolute; top: $h_toppx;" if($h_top);
print $q->div({-style=>"$position width:$width;text-align:right;border:0px solid black;margin:0 0 200px 0;"},$q->span({-style=>'margin:0em;'},$q->img({-src=>"$varenv{metahost}/img/images/$logo",-height=>'120px;'})),$q->span({-style=>'font-size:1em;'},"\n"));
print $q->div({-style=>"$position width:$width;text-align:right;border:0px solid black;margin:0 0 200px 0;"},$q->span({-style=>'margin:0em;'},$q->img({-src=>"$varenv{metahost}/img/$logo",-height=>'120px;'})),$q->span({-style=>'font-size:1em;'},"\n"));
}
#Briefkopf + Adresse
@ -269,7 +269,7 @@ td {
my $ctt = $db->get_content1("contenttrans",$c_id);
$ctt->{txt01} = $lb->newline($ctt->{txt01},$users->{tiny_mce},"0");
print $q->div({-style=>"width:$width; text-align:right;border:0px solid black;margin:0 0 200px 0;"},$q->span({-style=>'margin:0em;'},$q->img({-src=>"$varenv{metahost}/img/images/$logo",-height=>'120px;'})),$q->span({-style=>'font-size:1em;'},"")),"\n";
print $q->div({-style=>"width:$width; text-align:right;border:0px solid black;margin:0 0 200px 0;"},$q->span({-style=>'margin:0em;'},$q->img({-src=>"$varenv{metahost}/img/$logo",-height=>'120px;'})),$q->span({-style=>'font-size:1em;'},"")),"\n";
print $q->start_table({-width=>'100%',-border=>'0',-align=>'center', -cellpadding=>'3', -cellspacing=>'0'}),"\n";
print "<tr>\n";
@ -443,8 +443,8 @@ td {
if("$key" eq "ct_name"){
my $ct_pos = "";
if($cttpos->{$id}->{int09}){#if Tarif defined
$ct_pos = "Endstation: $cttpos->{$id}->{txt13}$cttpos->{$id}->{int04}<br />" if($cttpos->{$id}->{int04});
$ct_pos .= "Mietrad: $cttpos->{$id}->{ct_name}";
$ct_pos = "Mietrad: $cttpos->{$id}->{ct_name}";
$ct_pos .= "<br />Endstation: $cttpos->{$id}->{txt13}$cttpos->{$id}->{int04}" if($cttpos->{$id}->{int04});
}else{
$ct_pos = "$cttpos->{$id}->{ct_name}";
}

6
copri4/main/src/Tpl/TransPositionen.pm
View file

@ -145,7 +145,7 @@ EOF
my ($key,$val) = split /=/,$_;
$k++ if($val);
if($key eq "ct_name"){
print $q->th($q->textfield(-class=>'etxt',-style=>'height:19px;width:140px;font-size:1.3em;text-align:right;',-id=>"json_select",-name=>"json_select",-value=>"", -override=>'1',-size=>"25",-maxlength=>50, -placeholder=>'Nummer',-autofocus=>1),"");
print $q->th($q->textfield(-class=>'etxt',-style=>'height:19px;width:140px;font-size:1.3em;text-align:right;',-id=>"json_select",-name=>"json_select",-value=>"", -override=>'1',-size=>"25",-maxlength=>50, -placeholder=>'Nummer'),"");
}elsif($key =~ /int|txt|time\d+/){
print $q->th("$val");
}
@ -263,7 +263,7 @@ EOF
if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
print $q->td({-class=>'tdint', -nowrap=>1},"$pricing->{real_clock} $pricing->{freed_time}"),"\n";
}else{
print $q->td({-colspan=>'1',-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>10, -autofocus=>1)),"\n";
print $q->td({-colspan=>'1',-class=>'element',-style=>"$txtstyle $set_style"},$q->textfield(-class=>'etxt',-style=>"$txtstyle",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-size=>"$isize",-maxlength=>10)),"\n";
}
}elsif($key =~ /int02/){
if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
@ -290,7 +290,7 @@ EOF
my ($e_yy,$e_mo,$e_dd,$e_hh,$e_mi) = $lb->split_date($cttpos->{$id}->{end_time});
print "<td class='element' style='$txtstyle $set_style;background-color: #ededed;$occupied_style;'\n>";
print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;background-color: #ededed;",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-rows=>"1",-cols=>65),"<br />\n";
print $q->textarea(-class=>'autos',-style=>"border: 1px solid #ededed;background-color: #ededed;",-name=>"col_$key",-default=>"$cttpos->{$id}->{$key}", -override=>'1',-rows=>"1",-cols=>65, -autofocus=>1),"<br />\n";
#if Traiff Nr.
if($cttpos->{$id}->{int09}){

1
copri4/main/src/scripts/tests Symbolic link
View file

@ -0,0 +1 @@
../../../../../sharee.bike/copri-bike/main/src/scripts/tests