From 5c6a3111ee717f6a62e49fa674357b2723762bdd Mon Sep 17 00:00:00 2001 From: ragu Date: Tue, 27 Jun 2023 07:11:08 +0200 Subject: [PATCH] Change Faktura-Config db-table layout and pdf invoice. coding some cms-texts --- copri4/main/src/Mod/APIjsonserver.pm | 4 ++-- copri4/main/src/Mod/Prelogic.pm | 12 ++---------- copri4/main/src/Mod/Printpreview.pm | 6 +++--- copri4/main/src/Tpl/Calorin.pm | 2 +- copri4/main/src/scripts/mailTransportcms.pl | 19 ++++++++++--------- copri4/shareeapp-operator/src/Tpl/FormEdit.pm | 8 ++++---- .../src/Tpl/PayoneCCclient.pm | 2 +- .../shareeapp-operator/src/Tpl/PayoneSEPA.pm | 2 +- copri4/shareedms-operator/src/Lib/Mlogic.pm | 2 +- 9 files changed, 25 insertions(+), 32 deletions(-) diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm index 5d8fed2..c1a83a5 100755 --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -698,8 +698,8 @@ elsif($q->param('request') eq "stations_available"){ my $lnow = strftime("%Y-%m-%d %H:%M:%S", localtime(time)); my $localtime = Time::Piece->strptime($lnow, "%Y-%m-%d %H:%M:%S"); 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_end = Time::Piece->strptime("2023-05-21 23:59: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-07-06 23:59:00", "%Y-%m-%d %H:%M:%S"); my $epoch_start = $merchant_message_start->epoch; my $epoch_end = $merchant_message_end->epoch; diff --git a/copri4/main/src/Mod/Prelogic.pm b/copri4/main/src/Mod/Prelogic.pm index f6ca6f2..e76f88b 100755 --- a/copri4/main/src/Mod/Prelogic.pm +++ b/copri4/main/src/Mod/Prelogic.pm @@ -106,7 +106,6 @@ sub preinit(){ $R::kind_of_trans = $R::kind_of_trans || $users_dms->{kind_of_trans}; my $mandant_main_id = 100002; 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}){ return "failure::Fehler
keine eindeutige Modulzuweisung vorhanden."; @@ -116,12 +115,7 @@ sub preinit(){ my $ct_name = $q->escapeHTML("$R::ct_name"); my $barcode=0; - - #Kassen-Abschluss Logik 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){ $db->users_up("cash_sort",$R::cash_sort,$users_dms->{u_id}); @@ -247,7 +241,6 @@ sub preinit(){ # #like new_adr in Premain.pm $table = "contentadr"; 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 $freenr = $lb->get_freenr($table,$barcode_last->{$table}); ($ct_name,$barcode) = $lb->barcodeable($table,$freenr);#new nr routine @@ -256,9 +249,8 @@ sub preinit(){ }else{ return "failure::Fehler, neue Nummer kann nicht generiert werden"; } - if($p_main_id && $users_dms->{kind_of_trans}){ - #if($address->{main_id} && $users_dms->{kind_of_trans}){ - $rel = $db->get_rel4tpl($p_main_id,$lang); + if($users_dms->{kind_of_trans}){ + $rel = $db->get_rel4tpl("200011",$lang); $c_idnew = $db->insert_content2($table,$ct_name,$users_dms->{u_id},""); $i_rows += 1 if($c_idnew > 0); $db->update_barcode($table,$c_idnew,$ct_name,$barcode); diff --git a/copri4/main/src/Mod/Printpreview.pm b/copri4/main/src/Mod/Printpreview.pm index 64c0725..6245507 100755 --- a/copri4/main/src/Mod/Printpreview.pm +++ b/copri4/main/src/Mod/Printpreview.pm @@ -355,7 +355,7 @@ td { print "\n"; print $q->start_table({-width=>'100%',-border=>'0',-align=>'left', -cellpadding=>'3', -cellspacing=>'0'}),"\n"; 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->td({-class=>'tdpdf1'}, "$ctt->{txt02}  "),"\n"; print $q->Tr(); @@ -1003,9 +1003,9 @@ td { print ""; print $q->start_table({-border=>'0',-align=>'left'}); 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->td({-class=>'tdpdf2'}, "$ctf->{txt10}"),"\n"; + print $q->td({-class=>'tdpdf2'}, "$ctf->{txt08}"),"\n"; print $q->Tr(); print $q->td({-class=>'tdpdf2'}, "$txt11[0]"),"\n"; print $q->Tr(); diff --git a/copri4/main/src/Tpl/Calorin.pm b/copri4/main/src/Tpl/Calorin.pm index f12729e..6168b66 100755 --- a/copri4/main/src/Tpl/Calorin.pm +++ b/copri4/main/src/Tpl/Calorin.pm @@ -354,7 +354,7 @@ sub tpl(){ ($year_st,$mon_st,$day_st,$hh_st,$mm_st) = $lb->split_date($cttpos->{$pid}->{itime}); } 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}); }else{ ($year_en,$mon_en,$day_en,$hh_en,$mm_en) = $lb->split_date($cttpos->{$pid}->{itime}); diff --git a/copri4/main/src/scripts/mailTransportcms.pl b/copri4/main/src/scripts/mailTransportcms.pl index 316b1a3..17ccf8e 100755 --- a/copri4/main/src/scripts/mailTransportcms.pl +++ b/copri4/main/src/scripts/mailTransportcms.pl @@ -122,18 +122,19 @@ sub send_invoice { my $project = $dbt->{operator}->{$varenv{dbname}}->{project} || ""; 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} }); my $cms_message_key = "email-invoice"; 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 = { table => "contenttrans", fetch => "one", @@ -405,7 +406,7 @@ EOF $sendref->{message} =~ s/::invoice_name::/$invoice_name/; $sendref->{message} =~ s/::txid::/$ctt->{txt16}/; $sendref->{message} =~ s/::email_temppassword::/\$ctadr->{txt04}\<\/b\>/g; - $sendref->{message} =~ s/::email_ack_digest::/\$ctadr->{txt34}\<\/b\>/g; + $sendref->{message} =~ s/::email_ack_digest::/\$ctadr->{txt34}\<\/b\>/g;#send_emailack $sendref->{message} =~ s/::signature::/$signature/; $sendref->{message} =~ s/\n/\
/g; diff --git a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm index d486676..993bdd4 100755 --- a/copri4/shareeapp-operator/src/Tpl/FormEdit.pm +++ b/copri4/shareeapp-operator/src/Tpl/FormEdit.pm @@ -300,13 +300,13 @@ EOF $i++; if($i==1){ 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{ - 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"; } if($path =~ /$varenv->{accounting_1}/){ - print $q->div({-class=>'content2'}, "$varenv->{cms}->{'iframe-paymentdata-form'}->{txt}"),"\n"; + print $q->div({-class=>'content2'}, "$varenv->{cms}->{'iframe-paymentdata-form'}->{txt}"),"\n"; } if($path =~ /$varenv->{accounting_2}/){ if($tpl_id == 302008){ @@ -318,7 +318,7 @@ EOF } 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"; } diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm b/copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm index 48b6b5c..29d66f0 100755 --- a/copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm +++ b/copri4/shareeapp-operator/src/Tpl/PayoneCCclient.pm @@ -46,7 +46,7 @@ sub tpl(){ print "
\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'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n"; diff --git a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm index f04f300..3b39059 100755 --- a/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm +++ b/copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm @@ -75,7 +75,7 @@ sub tpl(){ print "
\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'}, "Zur Validierung Ihrer Zahlungsdaten wird eine 1,- € Testbuchung vorgenommen. Wir werden nach erfolgreicher Abbuchung den Betrag als Mietgutschrift in Ihrem Account hinterlegen."),"\n"; diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm index e09a3ca..b61c381 100755 --- a/copri4/shareedms-operator/src/Lib/Mlogic.pm +++ b/copri4/shareedms-operator/src/Lib/Mlogic.pm @@ -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}); - 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 © 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 © TeilRad GmbH 2023")),"\n"; print $q->div({-style=>'padding: 30px 0 0 0;'}, ""), "\n"; $self->tplselect($node_meta,$users_dms,$mode,$varenv,$feedb);