roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-09 21:46:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Faktura Address edit

Browse source
This commit is contained in:
Rainer Gümpelein 2022-03-18 14:51:25 +01:00
parent 6a99d40224
commit 41ba9e252e
8 changed files with 46 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

7
copri4/main/src/Mod/APIpayone.pm
View file

@ -86,6 +86,7 @@ sub handler {
int14 => 0,#OPOS
int16 => 0,#balance
int18 => 0,#sequencenumber
int19 => 0,#receivable
};
my $operator_prefix = "";
@ -113,6 +114,7 @@ sub handler {
}
$update_ctt->{int16} = $val if($_ eq "balance");
$update_ctt->{int18} = $val if($_ eq "sequencenumber");
$update_ctt->{int19} = $val if($_ eq "receivable");
#contentadr
$update_adr->{int24} = $val if($_ eq "cardexpiredate");
@ -133,7 +135,7 @@ sub handler {
if($ctt->{c_id} > 0){
#balance > 0 then payment fails
if($update_ctt->{int16} > 0){
if($update_ctt->{int16} && $update_ctt->{int16} > 0){
$update_ctt->{int14} = 1;
$update_ctt->{txt23} = "$now_dt $txaction\nSaldo > 0 Meldung, Rücklastschrift oder Mahnung?\n" . $ctt->{txt23} if($ctt->{txt23} !~ /0 Meldung,/);#only once;
}else{
@ -142,9 +144,10 @@ sub handler {
}
$dbt->update_record($dbh,$update_ctt,$ctt);
print FILE Dumper($update_ctt) . "\n";
#set cardexpiredate
if($update_adr->{int24} > 0 && $ctadr->{c_id} > 0){
if($update_adr->{int24} && $update_adr->{int24} > 0 && $ctadr->{c_id} > 0){
$dbt->update_record($dbh,$update_adr,$ctadr);
}
}

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

@ -75,8 +75,8 @@ auswerten',
'print_pdf' => ' PDF ',
'set_relation' => 'Formular',
'set_workflow' => 'Workflow',
'set_workflow2invoice' => 'Rechnung erstellen',
'set_workflow2storno' => 'Storno erstellen',
'set_workflow2invoice' => 'Rechnung generieren',
'set_workflow2storno' => 'Storno generieren',
'relate_content' => 'Content-Menu Relation',
'relate_dialog' => 'Relation herstellen',
'relate_dialog4menu' => 'Relation herstellen',

3
copri4/main/src/Mod/Prelib.pm
View file

@ -82,11 +82,14 @@ sub set_workflow {
delete $ctt->{int01};
delete $ctt->{int14};
delete $ctt->{int15};
delete $ctt->{int16};
delete $ctt->{int18};
delete $ctt->{txt16};
delete $ctt->{txt12};
delete $ctt->{txt21};
delete $ctt->{txt22};
delete $ctt->{txt23};
delete $ctt->{txt25};
delete $ctt->{txt30};
delete $ctt->{itime};
delete $ctt->{mtime};

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

@ -486,49 +486,6 @@ sub preinit(){
}
#copy ADD ADDRESS from contentadr to contenttrans
my $c_id4trans = $R::c_id4trans || "";#It needs hidden posts. Only implemented in Address and Transact
#TODO
if(1==2 && ($R::ct_trans !~ /print_pdf|print/i) && (($ib_key eq "add_transadr") || $R::ct_trans2c_idadr || $R::set_main_id || $R::set_main_id4workflow)){
$c_id4trans = $users_dms->{c_id4trans} if($ib_key eq "add_transadr" && $users_dms->{c_id4trans});
if(!$c_id4trans){
return "failure::Wohin damit? Für die Zuweisung bitte erst ein Ziel öffnen.";
}
$table = "contenttrans";
my $ctt;
#202=Adressenliste
if(($ib_key eq "add_transadr") || ($R::ct_trans2c_idadr eq "save_contentadr")){
$ctt = $db->get_ctrel("contentadr","",$lang,"",$R::c_idadr,"202");
}else{
my $c_id4copy = $R::c_id4copy || $c_id4trans;
$ctt = $db->get_content1("contenttrans",$c_id4copy);
}
#214=Adressendefinition
my $tpl = $db->get_tpl("214");
my @ct4tpl = split (/,/,$tpl->{tpl_order});
foreach(@ct4tpl){#copy
my ($key,$val) = split /=/,$_;
$ctt->{$key} = "no" if(!$ctt->{$key} && $key =~ /txt/);
$ctt->{$key} = "0" if(!$ctt->{$key} && $key =~ /int/);
if($R::c_idadr > 0){#from contentadr
#print "---> $key";
if($key =~ /int10/){
$u_rows += $db->update_content4change($table,$c_id4trans,"",$R::c_idadr,"int10");
}elsif(($ib_key eq "add_transadr") && ($key =~ /txt09|txt10|txt11|txt12/)){
my $advanced_fields = "no";
}elsif(($R::ct_trans2c_idadr eq "save_contentadr") && ($key =~ /txt10|txt11|txt12/)){#wg.Reparaturobjekt|Rahmen|Freitext
my $advanced_fields = "no";
}else{
$u_rows += $db->update_content4change($table,$c_id4trans,"",$ctt->{$key},$key);
}
}else{
$u_rows += $db->update_content4change($table,$c_id4trans,"",$ctt->{$key},$key);
}
}
$db->update_content4change($table,$c_id4trans,"",$users_dms->{u_id},"owner");
}
###
#delete ask
if("$ib_key" eq "remove_chk4rel" && $R::main_id && $R::c_id && $R::template_id && $R::rel_id){
my $rel4nd = $db->collect_rel4nodes("",$R::c_id,$R::template_id);

51
copri4/main/src/Tpl/Address3.pm
View file

@ -62,11 +62,14 @@ sub tpl(){
my $ctt = $ctx;
if(("$R::trans2edit" eq "client" && $R::c_idadr) || ($R::ct_trans eq "add_transadr")){
$ctt = $db->get_content1("contentadr",$R::c_idadr);
$c_idadr = $ctt->{c_id};
#print "c_idadr Got it from contentadr.c_id: $c_idadr\n";
#$mandat = " | Mandat $ctt->{ct_name}" if($ctt->{ct_name});
#$c_kdnr = $ctt->{ct_name};
$ctadr = $db->get_content1("contentadr",$R::c_idadr);
$c_idadr = $ctadr->{c_id};
$ctt->{int03} = $ctadr->{int03};
$ctt->{txt01} = $ctadr->{txt01};
$ctt->{txt03} = $ctadr->{txt03};
$ctt->{txt06} = $ctadr->{txt06};
$ctt->{txt07} = $ctadr->{txt07};
$ctt->{txt08} = $ctadr->{txt08};
}
print<<EOF
@ -127,21 +130,19 @@ EOF
$set_main_id=$main_id if($rel4tpl->{main_id} > "300000");
print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id");
print $q->span({-style=>'margin:0.2em 0.5em 0 0.5em;padding:0.8em 3em;background-color:white;border:solid thin gray;'}, "$ctx->{txt00}");
print $q->span({-style=>'margin:0em 0.5em 0 0.5em;padding:0.5em 3em;background-color:white;border:solid thin gray;position:absolute;left:3px;'}, "$ctx->{txt00}");
print $q->b("\# $ctx->{ct_name}");
print $q->span({-style=>'margin:0 0.5em;'},"&nbsp;");
print "<span style='margin:0 0.2em;position:absolute;left:180px;'>\n";
print $q->b({-style=>'padding:0 1em;'}, "\# $ctx->{ct_name}"), "\n";
if($ctx->{ct_name} =~ /\d+/ && $ctx->{txt00} eq "Storno"){
print $but->singlesubmit3("ct_trans","set_workflow2invoice","","","");
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300008");
print $q->span({-style=>'margin:0 0.5em;'},"&nbsp;");
print $but->singlesubmit3("ct_trans","set_workflow2invoice","","",""),"\n";
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300008"), "\n";
}
if($ctx->{ct_name} =~ /\d+/ && $ctx->{txt00} eq "Rechnung"){
print $but->singlesubmit3("ct_trans","set_workflow2storno","","","");
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300009");
print $q->span({-style=>'margin:0 0.5em;'},"&nbsp;");
print $but->singlesubmit3("ct_trans","set_workflow2storno","","",""), "\n";
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300009"), "\n";
}
print "</span>\n";
if(!$ctt->{int01} || $ctt->{ct_name} =~ /-/){
print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}, $but->singlesubmit3("ct_trans","print_pdf","","","")," $buchen_users->{txt01} / $invoice_time ", $but->singlesubmit7("ct_trans","remove_chk4rel","$ib{remove_chk4rel}","")),"\n";
@ -183,19 +184,21 @@ EOF
$int05 = "(manuell)" if($ctt->{int05});
if($users_dms->{u_id} && ($R::trans2edit eq "client" || $R::ct_trans eq "add_transadr")){
my @_anrede = ("","Frau","Herr","Firma");
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}"),"\n";#c_id from contenttrans
#my @_anrede = ("","Frau","Herr","Firma");
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}"),"\n";
print $q->hidden(-name=>'int10', -override=>'1', -value=>"$c_idadr"),"\n";
print $q->hidden(-name=>'c_idadr', -override=>'1', -value=>"$c_idadr"),"\n";
print $q->hidden(-name=>'int03', -override=>'1', -value=>"$ctt->{int03}"),"\n";
print $q->hidden(-name=>'rel_id', -override=>'1', -value=>"$rel4tpl->{rel_id}"),"\n";
print $q->Tr(),"\n";
print "<td class='tdtxt' nowrap>";
print $but->singlesubmit7("ct_trans","save_adr","$ib{save_adr}","","","ebutton"),"\n";
#print $q->span($q->a({-class=>"ebutton3",-href=>'javascript:history.back()'}, " back "));
print "</td>\n";
print $q->td({-class=>'tdval',-nowrap=>1}, $but->selector("txt02","60px",$ctt->{txt02},@_anrede)),"\n";
#print $q->td({-class=>'tdval',-nowrap=>1}, $but->selector("txt02","60px",$ctt->{txt02},@_anrede)),"\n";
#print $q->td({-class=>'tdval'}," ID $c_idadr $mandat"),"\n";
print $q->td({-class=>'tdval'},"Kunden ID $c_idadr"),"\n";
print $q->td({-class=>'tdval',-colspan=>'2'},"Kunden ID $c_idadr"),"\n";
$ctt->{txt01} = $lb->newline($ctt->{txt01},"","1");
print $q->Tr(),"\n";
print $q->td({-class=>'tdescr'},"Vorname Name<br />Zusatz"),"\n";
@ -232,10 +235,12 @@ EOF
print $q->td({-class=>'tdtxt'},"&nbsp;"),"\n";
}
print $q->td({-class=>'tdval'},"$ctt->{txt02}"),"\n";
if($c_idadr && $rel_adr->{rel_id}){
print $q->td({-class=>'tdval'},$q->span({-style=>"background-color:#dcd77f;"},$q->a({-class=>"linknav",-href=>"/DMS/Kunden?node2edit=editpart\&mode=manager\&rel_id=$rel_adr->{rel_id}\&tpl_id=202",-title=>"Kunden Stammdaten öffnen"}," Kunden ID $c_idadr ")), $q->span({-style=>"color:red;"}," $ctadr->{int12}")),"\n";
}
#print $q->td({-class=>'tdval'},"$ctt->{txt02}"),"\n";
if($c_idadr && $rel_adr->{rel_id}){
my $vde = "";
$vde = " Vde $ctadr->{int12}" if($ctadr->{int12});
print $q->td({-class=>'tdval',-colspan=>'2'},$q->span({-style=>"background-color:#dcd77f;"},$q->a({-class=>"linknav",-href=>"/DMS/Kunden?node2edit=editpart\&mode=manager\&rel_id=$rel_adr->{rel_id}\&tpl_id=202",-title=>"Kunden Stammdaten öffnen"}," Kunden ID $c_idadr ")), $q->span({-style=>"color:red;padding-left:10px;"}," $vde")),"\n";
}
$ctt->{txt01} = $lb->newline($ctt->{txt01},"","");
print $q->Tr(),"\n"; $line_count1++;
print $q->td({-class=>'tdtxt'},"&nbsp;"),"\n";

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

@ -549,7 +549,7 @@ EOF
foreach my $tf_id (@tariff){
$tf_id =~ s/\s//g;
#print "$record_bonus->{int22} == $tf_id<br>";
if($record_bonus->{int22} == $tf_id){
if($record_bonus->{int22} == $tf_id && $varenv{syshost} ne "shareedms-kn"){
$postdes = "Tarif: $record_bonus->{int21} - $record_bonus->{int22} (public - bonus)";
$postdes .= $q->span({-style=>'color:red;padding-left:10px;'},"Fehler: Bonusnummer") if(!$ctrel->{$key});
}

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

@ -382,7 +382,7 @@ sub tpl(){
my $pos_id = "";
my $user_device = "";
#if($users_dms->{u_id} == $dbt->{copri_conf}->{bike_state}->{superu_id}){
if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765/){
if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765|21618/){
$pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$pid')"},"$cttpos->{$pid}->{c_id}", $q->span({-class=>"popuptext",-id=>"$pid"},"$pos_details"));
my $txt26 = $cttpos->{$pid}->{txt26};
my $txt21 = $cttpos->{$pid}->{txt21};

12
copri4/main/src/scripts/Ilockit_CSV2DB.pl
View file

@ -15,7 +15,7 @@
#file Teilrad_ISI_PLUS_BB01207.txt
#iconv -t utf-8 -f iso-8859-1 Ilockitkeys_110520.csv -o Ilockitkeys_110520_utf8.cs
#
#sudo su www-data -c "./src/scripts/Ilockit_CSV2DB.pl shareedms-fr01 Teilrad_ISI_GPS_BB01328.txt"
#sudo su www-data -c "./src/scripts/Ilockit_CSV2DB.pl shareedms-kn ../shareeconf/smartlock-keys/Ilockit-16-BB01742_1v2.csv"
#
#do it twice to set hex-key and bike-nr!
#
@ -25,7 +25,7 @@ BEGIN {
$syshost = $ARGV[0] || exit 1;
}
use lib "/var/www/copri4/$syshost/src";
use lib "/var/www/copri-bike/$syshost/src";
my $csv_file = $ARGV[1] || "";
@ -47,7 +47,7 @@ my $dbt = new DBtank;
my $lang = "de";
my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
my $dbh = "";
my $main_id = 300001;#TODO Mietrad Flotten ID
my $main_id = 300101;#TODO Lastenrad Flotten ID
my $template_id = 205;
###
@ -95,9 +95,9 @@ my $template_id = 205;
int04 => "0",#station Werkstatt
int10 => "5",#defect
int11 => "2",#Ilockit
int20 => "1",#locked
txt01 => "unverbaut", #Bezeichnung #TODO
txt04 => "aus Lieferung vom 29.11.2021", #Besonderheiten
int20 => "2",#unlocked
txt01 => "Lastenrad neu", #Bezeichnung #TODO
txt04 => "aus Lieferung vom 08.03.2022", #Besonderheiten
txt15 => "", #Firmware
txt17 => "", #GUID from APP
txt23 => "$csv->{$id}->{c1} $csv->{$id}->{c2} $csv->{$id}->{c3} $csv->{$id}->{c4} $csv->{$id}->{c5} $csv->{$id}->{c6}",