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

Change Faktura-Config db-table layout and pdf invoice. coding some cms-texts

Browse source
This commit is contained in:
ragu 2023-06-27 07:11:08 +02:00
parent cede793cc3
commit 5c6a3111ee
9 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -698,8 +698,8 @@ elsif($q->param('request') eq "stations_available"){
my $lnow = strftime("%Y-%m-%d %H:%M:%S", localtime(time)); my $lnow = strftime("%Y-%m-%d %H:%M:%S", localtime(time));
my $localtime = Time::Piece->strptime($lnow, "%Y-%m-%d %H:%M:%S"); my $localtime = Time::Piece->strptime($lnow, "%Y-%m-%d %H:%M:%S");
my $epoch_now = $localtime->epoch; my $epoch_now = $localtime->epoch;
my $merchant_message_start = Time::Piece->strptime("2023-05-15 00:00:00", "%Y-%m-%d %H:%M:%S"); my $merchant_message_start = Time::Piece->strptime("2023-06-26 00:00:00", "%Y-%m-%d %H:%M:%S");
my $merchant_message_end = Time::Piece->strptime("2023-05-21 23:59:00", "%Y-%m-%d %H:%M:%S"); my $merchant_message_end = Time::Piece->strptime("2023-07-06 23:59:00", "%Y-%m-%d %H:%M:%S");
my $epoch_start = $merchant_message_start->epoch; my $epoch_start = $merchant_message_start->epoch;
my $epoch_end = $merchant_message_end->epoch; my $epoch_end = $merchant_message_end->epoch;

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

@ -106,7 +106,6 @@ sub preinit(){
$R::kind_of_trans = $R::kind_of_trans || $users_dms->{kind_of_trans}; $R::kind_of_trans = $R::kind_of_trans || $users_dms->{kind_of_trans};
my $mandant_main_id = 100002; my $mandant_main_id = 100002;
my $parent_trans = $db->get_node3("$mandant_main_id","Faktura","$lang") if($mandant_main_id); my $parent_trans = $db->get_node3("$mandant_main_id","Faktura","$lang") if($mandant_main_id);
my $ctf = $db->get_content1("contentuser","$mandant_main_id");
if(!$parent_trans->{main_id}){ if(!$parent_trans->{main_id}){
return "failure::Fehler<br /> keine eindeutige Modulzuweisung vorhanden."; return "failure::Fehler<br /> keine eindeutige Modulzuweisung vorhanden.";
@ -116,12 +115,7 @@ sub preinit(){
my $ct_name = $q->escapeHTML("$R::ct_name"); my $ct_name = $q->escapeHTML("$R::ct_name");
my $barcode=0; my $barcode=0;
#Kassen-Abschluss Logik
my $s_owner_id=0; my $s_owner_id=0;
if(($ctf->{txt06} eq "Benutzer") && ($R::kind_of_trans =~ /Verkauf|Verleih|Faktur/)){
$s_owner_id = $users_dms->{u_id};
}
if($R::cash_sort){ if($R::cash_sort){
$db->users_up("cash_sort",$R::cash_sort,$users_dms->{u_id}); $db->users_up("cash_sort",$R::cash_sort,$users_dms->{u_id});
@ -247,7 +241,6 @@ sub preinit(){
# #like new_adr in Premain.pm # #like new_adr in Premain.pm
$table = "contentadr"; $table = "contentadr";
my $foreign_key="ca_id"; my $foreign_key="ca_id";
my $p_main_id = $ctf->{txt32};
my $barcode_last = $db->get_barcode("users","$table");#hier gilt: $table=column in users my $barcode_last = $db->get_barcode("users","$table");#hier gilt: $table=column in users
my $freenr = $lb->get_freenr($table,$barcode_last->{$table}); my $freenr = $lb->get_freenr($table,$barcode_last->{$table});
($ct_name,$barcode) = $lb->barcodeable($table,$freenr);#new nr routine ($ct_name,$barcode) = $lb->barcodeable($table,$freenr);#new nr routine
@ -256,9 +249,8 @@ sub preinit(){
}else{ }else{
return "failure::Fehler, neue Nummer kann nicht generiert werden"; return "failure::Fehler, neue Nummer kann nicht generiert werden";
} }
if($p_main_id && $users_dms->{kind_of_trans}){ if($users_dms->{kind_of_trans}){
#if($address->{main_id} && $users_dms->{kind_of_trans}){ $rel = $db->get_rel4tpl("200011",$lang);
$rel = $db->get_rel4tpl($p_main_id,$lang);
$c_idnew = $db->insert_content2($table,$ct_name,$users_dms->{u_id},""); $c_idnew = $db->insert_content2($table,$ct_name,$users_dms->{u_id},"");
$i_rows += 1 if($c_idnew > 0); $i_rows += 1 if($c_idnew > 0);
$db->update_barcode($table,$c_idnew,$ct_name,$barcode); $db->update_barcode($table,$c_idnew,$ct_name,$barcode);

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

@ -355,7 +355,7 @@ td {
print "<td style='border:0px solid black;vertical-align:top;width:60%;height:250px;padding:0 0 0 2em;'>\n"; print "<td style='border:0px solid black;vertical-align:top;width:60%;height:250px;padding:0 0 0 2em;'>\n";
print $q->start_table({-width=>'100%',-border=>'0',-align=>'left', -cellpadding=>'3', -cellspacing=>'0'}),"\n"; print $q->start_table({-width=>'100%',-border=>'0',-align=>'left', -cellpadding=>'3', -cellspacing=>'0'}),"\n";
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'tdpdf4', -style=>'padding-bottom:0.8em;text-decoration:underline;color:black;'}, "$ctf->{txt01} | $ctf->{txt02} | $ctf->{txt03}"),"\n"; print $q->td({-class=>'tdpdf4', -style=>'padding-bottom:0.8em;text-decoration:underline;color:black;'}, "$ctf->{txt01} | $ctf->{txt03} | $ctf->{txt06}"),"\n";
#print $q->Tr(); #print $q->Tr();
#print $q->td({-class=>'tdpdf1'}, "$ctt->{txt02} &nbsp;"),"\n"; #print $q->td({-class=>'tdpdf1'}, "$ctt->{txt02} &nbsp;"),"\n";
print $q->Tr(); print $q->Tr();
@ -1003,9 +1003,9 @@ td {
print "<td style='width:25%;'>"; print "<td style='width:25%;'>";
print $q->start_table({-border=>'0',-align=>'left'}); print $q->start_table({-border=>'0',-align=>'left'});
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "TEL: $ctf->{txt08}"),"\n"; print $q->td({-class=>'tdpdf2'}, "TEL: $ctf->{txt07}"),"\n";
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$ctf->{txt10}"),"\n"; print $q->td({-class=>'tdpdf2'}, "$ctf->{txt08}"),"\n";
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt11[0]"),"\n"; print $q->td({-class=>'tdpdf2'}, "$txt11[0]"),"\n";
print $q->Tr(); print $q->Tr();

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

@ -354,7 +354,7 @@ sub tpl(){
($year_st,$mon_st,$day_st,$hh_st,$mm_st) = $lb->split_date($cttpos->{$pid}->{itime}); ($year_st,$mon_st,$day_st,$hh_st,$mm_st) = $lb->split_date($cttpos->{$pid}->{itime});
} }
if($cttpos->{$pid}->{end_time}){ if($cttpos->{$pid}->{end_time}){
$cttpos->{$pid}->{end_time} = $now_dt if($cttpos->{$pid}->{int10} == 3); $cttpos->{$pid}->{end_time} = $now_dt if($node_meta->{ct_table} eq "contenttanspos" && $cttpos->{$pid}->{int10} == 3);
($year_en,$mon_en,$day_en,$hh_en,$mm_en) = $lb->split_date($cttpos->{$pid}->{end_time}); ($year_en,$mon_en,$day_en,$hh_en,$mm_en) = $lb->split_date($cttpos->{$pid}->{end_time});
}else{ }else{
($year_en,$mon_en,$day_en,$hh_en,$mm_en) = $lb->split_date($cttpos->{$pid}->{itime}); ($year_en,$mon_en,$day_en,$hh_en,$mm_en) = $lb->split_date($cttpos->{$pid}->{itime});

19
copri4/main/src/scripts/mailTransportcms.pl
View file

@ -122,18 +122,19 @@ sub send_invoice {
my $project = $dbt->{operator}->{$varenv{dbname}}->{project} || ""; my $project = $dbt->{operator}->{$varenv{dbname}}->{project} || "";
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname},"iso-8859-1"); my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname},"iso-8859-1");
my $pref_ctu = {
table => "contentuser",
fetch => "one",
c_id => "1",#primary hotline#TODO change to Kunden-Fakture, check tablefields
};
my $uadr = { c_id => 0 };
$uadr = $dbt->fetch_tablerecord($dbh_primary,$pref_ctu);
$varenv{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $ctadr->{txt10} }); $varenv{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $ctadr->{txt10} });
my $cms_message_key = "email-invoice"; my $cms_message_key = "email-invoice";
my $dbh = $dbt->dbconnect_extern($dbt->{operator}->{$varenv{dbname}}->{database}->{dbname},"iso-8859-1"); my $dbh = $dbt->dbconnect_extern($dbt->{operator}->{$varenv{dbname}}->{database}->{dbname},"iso-8859-1");
#ex. primary hotline c_id=1# changed to Kunden-Fakture c_is=100002, check tablefields
my $pref_ctu = {
table => "contentuser",
fetch => "one",
c_id => "100002",
};
my $uadr = { c_id => 0 };
$uadr = $dbt->fetch_tablerecord($dbh,$pref_ctu);
my $fetchctt = { my $fetchctt = {
table => "contenttrans", table => "contenttrans",
fetch => "one", fetch => "one",
@ -405,7 +406,7 @@ EOF
$sendref->{message} =~ s/::invoice_name::/$invoice_name/; $sendref->{message} =~ s/::invoice_name::/$invoice_name/;
$sendref->{message} =~ s/::txid::/$ctt->{txt16}/; $sendref->{message} =~ s/::txid::/$ctt->{txt16}/;
$sendref->{message} =~ s/::email_temppassword::/\<b\>$ctadr->{txt04}\<\/b\>/g; $sendref->{message} =~ s/::email_temppassword::/\<b\>$ctadr->{txt04}\<\/b\>/g;
$sendref->{message} =~ s/::email_ack_digest::/\<b\>$ctadr->{txt34}\<\/b\>/g; $sendref->{message} =~ s/::email_ack_digest::/\<b\>$ctadr->{txt34}\<\/b\>/g;#send_emailack
$sendref->{message} =~ s/::signature::/$signature/; $sendref->{message} =~ s/::signature::/$signature/;
$sendref->{message} =~ s/\n/\<br \/\>/g; $sendref->{message} =~ s/\n/\<br \/\>/g;

4
copri4/shareeapp-operator/src/Tpl/FormEdit.pm
View file

@ -300,7 +300,7 @@ EOF
$i++; $i++;
if($i==1){ if($i==1){
if($R::confirm_success){ if($R::confirm_success){
print $q->div({-class=>'content_title3'},"Anmeldung bestätigt"),"\n"; print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'iframe-registration-confirmed'}->{txt}"),"\n";
}else{ }else{
print $q->div({-class=>'content_title3'},"$varenv->{cms}->{$tpl01->{tpl_name}}->{txt}"),"\n"; print $q->div({-class=>'content_title3'},"$varenv->{cms}->{$tpl01->{tpl_name}}->{txt}"),"\n";
} }
@ -318,7 +318,7 @@ EOF
} }
if($i==2){ if($i==2){
print $q->div({-class=>'content_title3'},"$tpl02->{tpl_name}"),"\n"; print $q->div({-class=>'content_title3'},"$varenv->{cms}->{$tpl02->{tpl_name}}->{txt}"),"\n";
print $q->div({-class=>'content2'}, "Das Login besteht aus Ihrer e-Mail Adresse und einem mindestens 8 stelligen Passwort."),"\n"; print $q->div({-class=>'content2'}, "Das Login besteht aus Ihrer e-Mail Adresse und einem mindestens 8 stelligen Passwort."),"\n";
} }

2
copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm
View file

@ -46,7 +46,7 @@ sub tpl(){
print "<div class='form-group' style='clear:both;'>\n"; print "<div class='form-group' style='clear:both;'>\n";
print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'Kreditkartendaten'}->{txt}"),"\n"; print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'iframe-credit-card-data'}->{txt}"),"\n";
print $q->div({-class=>'content2'},"Kreditkartendaten werden von uns nicht gespeichert sondern direkt an unseren Zahlungsdienstleister Payone übermittelt. Deshalb sehen Sie hier nur leere Eingabefelder."),"\n"; print $q->div({-class=>'content2'},"Kreditkartendaten werden von uns nicht gespeichert sondern direkt an unseren Zahlungsdienstleister Payone übermittelt. Deshalb sehen Sie hier nur leere Eingabefelder."),"\n";
#print $q->div({-class=>'content2'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n"; #print $q->div({-class=>'content2'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n";

2
copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
View file

@ -75,7 +75,7 @@ sub tpl(){
print "<div class='form-group' style='clear:both;'>\n"; print "<div class='form-group' style='clear:both;'>\n";
print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'Kontoverbindung'}->{txt}"),"\n"; print $q->div({-class=>'content_title3'},"$varenv->{cms}->{'iframe-bank-account'}->{txt}"),"\n";
print $q->div({-class=>'content2'}, "Durch das SEPA Mandat können wir die Leihrad Buchungen bequem einziehen."),"\n"; print $q->div({-class=>'content2'}, "Durch das SEPA Mandat können wir die Leihrad Buchungen bequem einziehen."),"\n";
#print $q->div({-class=>'content2'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n"; #print $q->div({-class=>'content2'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n";

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

@ -287,7 +287,7 @@ sub tpl(){
} }
$debug = "syshost: $varenv->{syshost}, merchant_id: $varenv->{merchant_id}, (c_id4trans:$users_dms->{c_id4trans} && tpl_id4trans:$users_dms->{tpl_id4trans}) $node_meta->{tpl_name},$node_meta->{tpl_id},$node_meta->{ct_table},$parent_id,$main_id, permissions: ($users_dms->{int01},$users_dms->{int02},$users_dms->{int03},$users_dms->{int07},$users_dms->{int08},$users_dms->{int09})" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id}); $debug = "syshost: $varenv->{syshost}, merchant_id: $varenv->{merchant_id}, (c_id4trans:$users_dms->{c_id4trans} && tpl_id4trans:$users_dms->{tpl_id4trans}) $node_meta->{tpl_name},$node_meta->{tpl_id},$node_meta->{ct_table},$parent_id,$main_id, permissions: ($users_dms->{int01},$users_dms->{int02},$users_dms->{int03},$users_dms->{int07},$users_dms->{int08},$users_dms->{int09})" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id});
print $q->div({-style=>'position:fixed;bottom:0%;right:1%;z-index:10;padding:2px;font-size:13px;'},"$debug",$q->a({-style=>'color:black;text-decoration: none;',-href=>'https://sharee.bike',-target=>'_blank'},"sharee.bike &copy; TeilRad GmbH 2022")),"\n"; print $q->div({-style=>'position:fixed;bottom:0%;right:1%;z-index:10;padding:2px;font-size:13px;'},"$debug",$q->a({-style=>'color:black;text-decoration: none;',-href=>'https://sharee.bike',-target=>'_blank'},"sharee.bike &copy; TeilRad GmbH 2023")),"\n";
print $q->div({-style=>'padding: 30px 0 0 0;'}, ""), "\n"; print $q->div({-style=>'padding: 30px 0 0 0;'}, ""), "\n";
$self->tplselect($node_meta,$users_dms,$mode,$varenv,$feedb); $self->tplselect($node_meta,$users_dms,$mode,$varenv,$feedb);