X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=invoices.cgi;h=cc505d4c52f3f09f7b9296811405f4b58906d551;hb=c9bb4a41908f01e2e9698d17cf1027255b53a47b;hp=d079ced606d4e8e7d57f2aace09d1219de1940b1;hpb=3c750be4fa892b6f79b5141f09701752c7249930;p=invoices diff --git a/invoices.cgi b/invoices.cgi index d079ced..cc505d4 100755 --- a/invoices.cgi +++ b/invoices.cgi @@ -2,42 +2,16 @@ _EXEC="$(realpath "${0%/*}")" . "$_EXEC/cgilite/cgilite.sh" +. "$_EXEC/cgilite/logging.sh" . "$_EXEC/cgilite/storage.sh" - -debug(){ - if [ $# = 0 ]; then - tee /dev/stderr - else - printf %s\\n "$*" >/dev/stderr - fi -} - -timeid(){ - # generate time based ID - # Fixme: Unix time stamps assumed to be 32bit always - d=$(date +%s) - { printf $( - while [ "$d" -gt 0 ]; do - printf \\%o\\n $((d % 256)) - d=$((d / 256)) - done |tac |tr -d \\n - ) - head -c5 /dev/urandom - } \ - | uuencode -m - \ - | sed -n '2{y;+/;:_;;p}' -} - -checkid(){ - grep -m 1 -xE '[0-9a-zA-Z:_]{12}'; -} +. "$_EXEC/cgilite/session.sh" yield_page(){ printf 'Content-Type: text/html; charset=utf-8\r\n\r\n' ./cgilite/html-sh.sed <%s[a href="/clients/%s" Edit]] - ' "$(HTML "$address")" "$(HTML "${c#clients/}")" + -->%s + +[label Hourly Rate:] %s€ + [a href="/clients/%s" Edit]] + ' "$(HTML "$address")" \ + "$(HTML "${hourly#hourly=}")" \ + "$(HTML "${c#clients/}")" done } @@ -117,31 +96,119 @@ list_senders(){ done } +sender_list(){ + local select="$1" n name + [ -d senders/ ] && for n in '' senders/*; do + [ "$n" ] && name="$(sed q "$n" |HTML)" + [ "${n#senders/}" = "$select" ] \ + && printf '' "${n#senders/}" "$name" \ + || printf '' "${n#senders/}" "$name" + done +} + +client_list(){ + local select="$1" n address hourly name + [ -d clients/ ] && for n in '' clients/*; do + [ "$n" ] && read -r address hourly <"$n" + name="$(UNSTRING "${address#address=}" |sed q |HTML)" + [ "${n#clients/}" = "$select" ] \ + && printf '' "${n#clients/}" "$name" \ + || printf '' "${n#clients/}" "$name" + done +} + list_invoices(){ [ -d invoices/ ] && for i in invoices/*; do - read -r sender client date number vat<<-EOF - sed q "$i" + read -r sender client date number vat vatrate<<-EOF + $(sed q "$i") EOF [ -f "senders/${sender#sender=}" ] \ && sender="$(sed q "senders/${sender#sender=}")" \ || sender="(unset)" - [ -f "clients/${client#client=}" ] \ - && client="$(sed q "client/${client#client=}")" \ - || client="(unset)" - [ "$date" -gt 0 ] \ - && date="$(date -d @$date +%x)" \ + [ ! -f "clients/${client#client=}" ] \ + && client="(unset)" \ + || read -r client hourly <"clients/${client#client=}" + [ "${date#date=}" -ge 0 ] 2>&- \ + && date="$(date -d "@${date#date=}" +%x)" \ || date="(unset)" printf '[div .invoice [h2 %s] [label From:] %s [label To:] %s [label on] %s - [a href="/invoices/%s" Edit] - ]' "$(HTML "$number")" "$(HTML "$sender")" \ - "$(HTML "$client")" "$(HTML "$date")" + [a href="/invoice/%s" Edit] + ]' "$(UNSTRING "${number#number=}" |HTML)" \ + "$(HTML "$sender")" \ + "$(UNSTRING "${client#address=}" |sed q |HTML)" "$(HTML "$date")" \ + "$(HTML ${i#invoices/})" done } +edit_invoice(){ + id="$1" + if [ -f "invoices/$id" ]; then + read -r sender client date number vat vatrate<<-EOF + $(sed q "invoices/$id") + EOF + fi + + [ "${date#date=}" -ge 0 ] 2>&- \ + && date="$(date -d "@${date#date=}" +%F)" \ + || date="$(date +%F)" + [ "${number#number=}" ] || number="number=$(date +%s)" + [ "${vatrate#vatrate=}" -ge 0 ] 2>&- || vatrate="vatrate=19" + + cat <<-EOF + [form method="POST" action="/update_invoice" + [hidden "id" "$(HTML "$id")"] + + [label Sender:] + [select name=sender + $(sender_list "${sender#sender=}") + ] + + [label Client:] + [select name=client + $(client_list "${client#client=}") + ] + + [label for=number Invoice Number:] + [input #number name=number value="$(UNSTRING "${number#number=}" |HTML)"] + + [label for=date Date:] + [input #date name=date value="${date}" placeholder="YYYY-MM-TT"] + + [radio "vat" "smallbusiness" #vatsb $([ "${vat#vat=}" = smallbusiness ] && printf checked) ] + [label for=vatsb Small business exemption from VAT] + [radio "vat" "nett" #vatnett $([ "${vat#vat=}" = nett ] && printf checked)] + [label for=vatnett Nett] + [radio "vat" "gross" #vatgross $([ "${vat#vat=}" = gross ] && printf checked)] + [label for=vatgross Gross] + [label for=vatrate VAT Rate: [input type=number name="vatrate" value="${vatrate#vatrate=}"]% ] + + [table + [tr [th Date] [th Work] [th Hours] [th Price] ] +$({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \ + | while read -r time work hours; do + hours="$(UNSTRING "${hours#hours=}" |grep -m1 -xE '[0-9]+' || printf 0)" + printf '[tr + [td [textarea name=date +%s] ] + [td [textarea name=work +%s] ] + [td [input type=number name=hours value="%s"] ] + [td %s] + ]' "$(UNSTRING "${time#time=}" |HTML)" \ + "$(UNSTRING "${work#work=}" |HTML)" \ + "$hours" "$((hours * hourly)) €" + done +) + ] + [submit "update" "update" Update] + ] + EOF +} + info="$(PATH "${PATH_INFO}")" case $info in @@ -187,11 +254,25 @@ case $info in ;; /invoices) { list_invoices - printf '[a href="/invoices/%s" New]' "$(timeid)" + printf '[a .new href="/invoice/%s" New]' "$(timeid)" } | yield_page invoices ;; /invoice/*) - edit_invoice "${info#/invoices/}" |yield_page invoice + edit_invoice "${info#/invoice/}" |yield_page invoice + ;; + /update_invoice) + id="$(POST id |checkid)" + if [ "$(POST update)" = update -a "$id" ]; then + mkdir -p invoices + printf 'sender=%s client=%s date=%s number=%s vat=%s vatrate=%s\n' \ + "$(POST sender)" "$(POST client)" \ + "$(date -d "$(POST date)" +%s)" \ + "$(POST number |STRING)" \ + "$(POST vat |grep -m1 -xE 'smallbusiness|gross|nett')" \ + "$(POST vatrate |grep -m1 -xE '[0-9]+')" \ + >"invoices/$id" + fi + REDIRECT "/invoice/$id" ;; *) REDIRECT /invoices ;;