Improve work without category

[infodrom.org/service.infodrom.org] / src / InfoCon / buch / infocon

diff --git a/src/InfoCon/buch/infocon b/src/InfoCon/buch/infocon
index 341489c..c10413b 100755 (executable)
--- a/src/InfoCon/buch/infocon
+++ b/src/InfoCon/buch/infocon
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 #  infocon - Administration tool for InfoCon
-#  Copyright (c) 1998-2003,2005-8,10,11,12,14,15  Martin Schulze <joey@infodrom.org>
+#  Copyright (c) 1998-2003,2005-8,10,11,12,14,15,16  Martin Schulze <joey@infodrom.org>
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,8 +17,6 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
 
-# $Id$
-
 use strict;
 use warnings;
 
@@ -41,6 +39,7 @@ my $term = undef;
 my $opt_all = 0;
 my $opt_verbose = 0;
 my $opt_year = 0;
+my $opt_date = undef;
 my $opt_direction = undef;
 
 sub sdate
@@ -88,6 +87,31 @@ sub date_to_string
     return sprintf("%4d%02d%02d", $year,$mon,$day);
 }
 
+sub valid_isodate
+{
+    my $date = shift;
+    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+    return sprintf('%04d-%02d-%02d', $year+1900, $mon+1, $mday) unless defined $date;
+
+    if ($date =~ /^(\d+)\.(\d+)\.?$/) {
+       if ($mon == 0 && $2 > 9) {
+           $date = sprintf('%04d-%02d-%02d', $year+1900-1, $2, $1);
+       } else {
+           $date = sprintf('%04d-%02d-%02d', $year+1900, $2, $1);
+       }
+    } elsif ($date =~ /^(\d+)\.(\d+)\.(\d+)?$/) {
+       if (length $3 == 2) {
+           $date = sprintf('20%02d-%02d-%02d', $3, $2, $1);
+       } else {
+           $date = sprintf('%04d-%02d-%02d', $3, $2, $1);
+       }
+    } elsif ($date !~ /^(\d+)-(\d+)-(\d+)$/) {
+       return undef;
+    }
+    return $date;
+}
+
 sub pay_invoice
 {
     my $nr = shift;
@@ -96,9 +120,14 @@ sub pay_invoice
     my $sth;
 
     if ($pay) {
-       $query  = "UPDATE sales SET paid=1,billing_date=now() WHERE nr = $nr";
+       my $date = valid_isodate $opt_date;
+
+       die "Invalid date\n" unless defined $date;
+
+       $query  = sprintf("UPDATE sales SET paid=1,billing_date=%s WHERE nr = %d",
+                         defined $date ? $dbh->quote($date) : 'now()', $nr);
     } else {
-       $query  = "UPDATE sales SET paid=0,billing_date=NULL WHERE nr = $nr";
+       $query  = sprintf("UPDATE sales SET paid=0,billing_date=NULL WHERE nr = %d", $nr);
     }
     $sth = $dbh->do($query);
 }
@@ -139,6 +168,11 @@ sub sales_list
        $where .= sprintf("year = %d", $opt_year);
     }
 
+    if (defined $data{category} && length $data{category}) {
+       $where .= " AND " if $where;
+       $where .= sprintf("category = %s", $dbh->quote($data{category}));
+    }
+
     if ($opt_direction) {
        if ($opt_direction eq "in") {
            $d = "price >= 0"
@@ -436,6 +470,10 @@ sub buchung_input
            'title' => 'bezahlt',
            'type' => 'boolean',
            'default' => 0},
+       'billing_date' => {
+           'title' => 'wann',
+           'type' => 'date',
+           'validate' => \&validate_date},
        'weiter' => {
            'title' => 'Weiter',
            'type' => 'boolean',
@@ -448,7 +486,8 @@ sub buchung_input
 
     $term = new Term::ReadLine '' unless $term;
 
-    my $sth = $dbh->prepare ("INSERT INTO $table (nr,date,pdf,year,category,description,tax_percent,tax_assigned,price,paid) VALUES (?,?,?,?,?,?,?,?,?,?)");
+    my $sth = $dbh->prepare ("INSERT INTO $table (nr,date,pdf,year,category,description,tax_percent,tax_assigned,price,billing_date,paid) " .
+                            "VALUES (?,?,?,?,?,?,?,?,?,?,?)");
 
     print "Buchungseingabe\n\n";
     while ($weiter =~ /[JjYy1]/) {
@@ -459,6 +498,16 @@ sub buchung_input
            }
            $ans = read_input($f, $fields->{$f});
            $answers->{$f} = $ans;
+
+           if ($f eq 'paid') {
+               if ($answers->{paid}) {
+                   $fields->{'billing_date'}{'default'} = $answers->{'date'};
+                   $ans = read_input('billing_date', $fields->{'billing_date'});
+                   $answers->{billing_date} = $ans;
+               } else {
+                   $answers->{billing_date} = undef;
+               }
+           }
        }
 
        $sth->execute(get_next_nr(),
@@ -470,6 +519,7 @@ sub buchung_input
                      $answers->{tax_percent},
                      $answers->{tax_assigned},
                      $answers->{price},
+                     defined $answers->{billing_date} ? date_to_string($answers->{billing_date}) : undef,
                      $answers->{paid});
 
        $weiter = $answers->{weiter};
@@ -502,6 +552,7 @@ sub usage
     print "  --buchung-input|-bi\n";
     print "  --buchung-unpaid\n";
     print "  --buchung-hidden\n";
+    print "  --date [yyyy-mm-dd|dd.mm.] (for --pay)\n";
     print "  --pay <nr> | --unpay <nr>\n";
     print "  --hide <nr> | --unhide <nr>\n";
     print "  --list-categories|-lc\n";
@@ -534,15 +585,16 @@ my %options = (
     'hide=s' => \$data{hide},
     'unhide=s' => \$data{unhide},
     'year=i' => \$opt_year,
+    'date=s' => \$opt_date,
     'direction|d=s' => \$opt_direction,
     'mailto:s' => \$data{mailto},
     'all' => \$opt_all,
     'verbose' => \$opt_verbose,
     'help' => \&usage,
     'dm' => sub {$table = "sales_dm"},
-    'buchung-input|bi' => \$data{'buchung-input'},
-    'buchung-unpaid|bu' => \$data{'buchung-unpaid'},
-    'buchung-hidden|bh' => \$data{'buchung-hidden'},
+    'buchung-input|bi' => \&buchung_input,
+    'buchung-unpaid|bu' => \&buchung_unpaid,
+    'buchung-hidden|bh' => \&buchung_hidden,
     'list-categories|lc' => \$data{'list-categories'},
     );
 
@@ -571,18 +623,8 @@ if (defined $data{mailto}) {
 }
 
 if (defined $data{category}) {
-    if (length($data{category})) {
-       sales_list("category = '".$data{category}."'");
-    } else {
-       sales_list;
-    }
+    sales_list;
     exit;
-} elsif (defined $data{'buchung-input'}) {
-    buchung_input;
-} elsif (defined $data{'buchung-unpaid'}) {
-    buchung_unpaid;
-} elsif (defined $data{'buchung-hidden'}) {
-    buchung_hidden;
 } elsif (defined $data{'list-categories'}) {
     list_categories;
 } elsif (defined $data{pay}) {