mirror of
https://gitlab.com/t6353/sharee.bike.git
synced 2025-07-03 04:26:31 +02:00
Journaling settings enhanced
This commit is contained in:
parent
bbe973ea70
commit
0ac2e784ca
9 changed files with 141 additions and 66 deletions
|
@ -419,6 +419,7 @@ sub sig_booking {
|
|||
|
||||
my $endpoint = "$dbt->{operator}->{$varenv->{dbname}}->{endpoint}/";
|
||||
my %json = ();
|
||||
$ctadr->{txt08} =~ s/n/m/i; $ctadr->{txt08} =~ s/i/j/i; $ctadr->{txt08} =~ s/l/i/i; $ctadr->{txt08} =~ s/-/\./; $ctadr->{txt08} =~ s/_/-/; $ctadr->{txt08} =~ s/[a-z]\@/\@/;
|
||||
|
||||
#reservation start
|
||||
if($todo eq "reserve"){
|
||||
|
|
|
@ -24,6 +24,7 @@ my $icon = "/icon";
|
|||
sub ibuttons(){
|
||||
my $self = shift;
|
||||
my %ib = (
|
||||
'set_gps' => 'Position',
|
||||
'operator_accounting' => '2. Abrechnung generieren',
|
||||
'service_done' => 'Wartungsprotokoll für ausgewähltes Rad einfügen/bearbeiten',
|
||||
'post_email' => 'submit',
|
||||
|
|
|
@ -806,8 +806,11 @@ sub fetch_tablerecord(){
|
|||
}
|
||||
|
||||
#prio data with newest end_time
|
||||
$where .= " order by end_time DESC" if($fetch->{table} eq "contenttranspos");
|
||||
$where .= " order by $fetch->{order} DESC" if($fetch->{order});
|
||||
if($fetch->{table} eq "contenttranspos"){
|
||||
$where .= " order by end_time DESC";
|
||||
}elsif($fetch->{order}){
|
||||
$where .= " order by $fetch->{order} DESC";
|
||||
}
|
||||
|
||||
my $sql = "SELECT * FROM $fetch->{table} $where";
|
||||
my $sth = $dbh->prepare($sql);
|
||||
|
@ -1049,7 +1052,7 @@ sub insert_contentoid {
|
|||
$values .= "'$insert->{$key}',";
|
||||
}
|
||||
}
|
||||
elsif($key =~ /template_id|cc_id|ct_id|ca_id/ && $insert->{table} =~ /contentpos|contentadrpos|contenttranspos/){
|
||||
elsif($key =~ /template_id|cc_id|ct_id|ca_id/ && $insert->{table} =~ /contentpos|contentadrpos|contenttranspos|contenttheftpos/){
|
||||
$columns .= "$key,";
|
||||
if(!looks_like_number($insert->{$key})){
|
||||
$values .= "null,";
|
||||
|
|
|
@ -426,14 +426,14 @@ td {
|
|||
#int9x are not in db
|
||||
#operator invoice
|
||||
if($ctt->{txt00} eq "Rechnung"){
|
||||
@tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int93=TeilRad Gebühren","int98=19% UmSt","int100=Summe");
|
||||
@tpl_order = ("c_id=ID","int01=Summe Erlös","state=Zahlungsart","int93=TeilRad Gebühren","int98=19% UmSt","int100=Summe");
|
||||
}
|
||||
#operator accounting
|
||||
else{
|
||||
if($varenv->{dbname} eq "sharee_sx"){
|
||||
@tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int94=payone Disagio","int02=Summe Gutschrift");
|
||||
@tpl_order = ("c_id=ID","int01=Summe Erlös","state=Zahlungsart","int94=payone Disagio","int02=Summe Gutschrift");
|
||||
}else{
|
||||
@tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int94=payone Disagio","int95=payone Transaktion","int96=payone Zahlungsmeldung","int97=payone Kreditkarte Zuordnung","int02=Summe Gutschrift");
|
||||
@tpl_order = ("c_id=ID","int01=Summe Erlös","state=Zahlungsart","int94=payone Disagio","int95=payone Transaktion","int96=payone Zahlungsmeldung","int97=payone Kreditkarte Zuordnung","int02=Summe Gutschrift");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue