diff --git a/2col.template.mm b/2col.template.mm index 00e1be8..62fe1b4 100644 --- a/2col.template.mm +++ b/2col.template.mm @@ -47,7 +47,7 @@ ${ITEM_BODY} _ .T& Ri|Ni. -Sub-Total;${ITEM_TOTAL} +Sub-Total;$${ITEM_TOTAL} .TE .1C 1 .DS C diff --git a/gen.sh b/gen.sh index 40e69d0..1a9cf55 100755 --- a/gen.sh +++ b/gen.sh @@ -29,7 +29,7 @@ get_invoice_num() { read_hrs_csv() { TMP=$(mktemp) # Parse the CSV into: Label;Hrs;Cost - cat $1 | RATE=$RATE awk -F, '{ sum += $2 }; { print $1 ";" $2 ";" $2 * ENVIRON["RATE"] } END { print sum ";" sum * ENVIRON["RATE"] }' > $TMP + cat $1 | RATE=$RATE awk -F, '{ sum += $2 }; { print $1 ";" $2 ";" $2 * ENVIRON["RATE"] } END { print sum "; $" sum * ENVIRON["RATE"] }' > $TMP echo $TMP } read_items_csv() { @@ -60,10 +60,12 @@ elif [[ $1 = "-2" ]]; then if [[ ! -z $5 ]]; then OUTPUT=$5 fi - HRS_COST=$(cat $HRS_TMP | tail -n 1 | awk -F";" '{ print $2 }') + HRS_COST=$(cat $HRS_TMP | tail -n 1 | sed s/\\$//g | awk -F";" '{ print $2 }') CONSUME_TMP=$(read_items_csv $3) CONSUME_COST=$(cat $CONSUME_TMP | tail -n 1 | awk -F";" '{ print $2 }') - export ITEM_TOTAL=$(cat $CONSUME_TMP | tail -n 1) + export ITEM_TOTAL=$(cat $CONSUME_TMP | tail -n 1 ) + echo $ITEM_TOTAL + echo $HRS_COST export ITEM_BODY=$(cat $CONSUME_TMP | head -n -1) export TOTAL=$(A=$HRS_COST B=$ITEM_TOTAL awk 'BEGIN{ print ENVIRON["A"] + ENVIRON["B"] }') export COMPANY=$4