X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=invoices.sh;h=9e07e9fab11ffbec85a9d97fbd37c31c02f59e94;hb=363a64cdc01d34e8b1e9ba3bf4b1a68ae2dfeb1c;hp=0e801157c4917249c9669cd69dd996021e17b2cd;hpb=de8eaf901067d4e0c72e5b0ca05f6dc12553fd79;p=invoices

diff --git a/invoices.sh b/invoices.sh
index 0e80115..9e07e9f 100755
--- a/invoices.sh
+++ b/invoices.sh
@@ -40,16 +40,18 @@ list_invoices(){
       [h2
           %s]
       [label From:] %s [label To:] %s [label on] %s
-      [a href="/invoice/%s" Edit]
+      [label Amount:] %.2f €
+      [a href="/invoices/%s" Edit]
     ]' "$(UNSTRING "${number#number=}" |HTML)" \
        "$(HTML "$sender")" \
        "$(UNSTRING "${client#address=}" |sed q |HTML)" "$(HTML "$date")" \
+       "$(invoice_total "${i#invoices/}")" \
        "$(HTML ${i#invoices/})"
   done
 }
 
 edit_invoice(){
-  id="$1"
+  local id="$1" sender client date number vat vatrate caddress hourly total
   if [ -f "invoices/$id" ]; then
     read -r sender client date number vat vatrate<<-EOF
 	$(sed q "invoices/$id")
@@ -59,70 +61,139 @@ edit_invoice(){
   [ "${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"
+  [ "${number#number=}" ] \
+  && number="${number#number=}" \
+  || number="$(date +%s)"
+  [ "${vatrate#vatrate=}" -ge 0 ] 2>&- \
+  && vatrate="${vatrate#vatrate=}" \
+  || vatrate=19
+
+  [ -f "clients/${client#client=}" ] \
+  && read -r caddress hourly <"clients/${client#client=}"
+  hourly="${hourly#hourly=}"
+
+  total=$(invoice_total "$id")
 
   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] ]
+	  [label for=number Invoice Number:]
+	  [input #number name=number value="$(UNSTRING "${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}"]% ]
+	
+	  [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
+  | while read -r time work hours; do
+    hours="$(UNSTRING "${hours#hours=}" |grep -m1 -xE '[0-9]+' || printf 0)"
+    printf '[tr
+            [td [textarea name=time
 %s] ]
-              [td [textarea name=work
+            [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
+            [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]
+            [tr [td colspan=4 
+            $(case $vat in
+              vat=nett)
+                awk "BEGIN {
+                  printf \"Sum: %7.2f €<br/> + VAT: %7.2f €<br/> [strong Total:] %7.2f €\",
+                   $total, int($total * $vatrate + .5) / 100,
+                   $total + int($total * $vatrate + .5) / 100
+                }" ;;
+              vat=gross)
+                awk "BEGIN {
+                  printf \"[strong Total:] %7.2f €<br/> incl VAT: %7.2f €<br/>+ nett: %7.2f €\",
+                   $total, int($total / (100 + $vatrate) * $vatrate * 100 + .5) / 100,
+                   $total - int($total / (100 + $vatrate) * $vatrate * 100 + .5) / 100
+                }" ;;
+              *) printf '[strong Total:] %.2f €' "$total" ;;
+            esac)
+            ]]
+	  ]
+	  [submit "update" "$(tid "invoices/$id")" Update]
 	]
 	EOF
 }
 
+invoice_total(){
+  local id="$1" sender client date number vat vatrate \
+        total=0 caddress hourly time work hours
+
+  if [ -f "invoices/$id" ]; then
+    read -r sender client date number vat vatrate<<-EOF
+	$(sed q "invoices/$id")
+	EOF
+
+    [ -f "clients/${client#client=}" ] \
+    && read -r caddress hourly <"clients/${client#client=}"
+    [ "${hourly#hourly=}" -gt 0 ] 2>&- \
+    && hourly="${hourly#hourly=}" \
+    || hourly=0
+
+    sed 1d "invoices/$id" \
+    | { while read time work hours; do
+        [ "${hours#hours=}" -gt 0 ] 2>&- \
+        && hours="${hours#hours=}" \
+        || hours=0
+        total=$((total + hours * hourly))
+      done
+      printf %.2f\\n "$total"
+    }
+  else
+    printf %.2f\\n 0
+  fi
+}
+
 update_invoice(){
-  id="$(POST id |checkid)"
-  if [ "$(POST update)" = update -a "$id" ]; then
+  local id="$(POST id |checkid)" extra=0
+
+  if [ "$(POST update)" = "$(tid "invoices/$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"
+
+    for n in "$(POST_COUNT time)" "$(POST_COUNT work)" "$(POST_COUNT hours)"; do
+      [ "$n" -gt "$extra" ] && extra="$n"
+    done
+
+    { 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]+')"
+      for n in $(seq 1 $extra); do
+        printf 'time=%s	work=%s	hours=%s\n' \
+          "$(POST time $n |STRING)" "$(POST work $n |STRING)" \
+          "$(POST hours $n |STRING)" \
+        | grep -xvF 'time=	work=	hours=0'
+      done
+    } >"invoices/$id"
   fi
+  REDIRECT "/invoices/$id"
 }