[Koha-patches] [PATCH] Minor rework of template js.
Joe Atzberger
joe.atzberger at liblime.com
Wed Jan 21 02:18:25 CET 2009
Lines explicitly ended with semicolons. Allow some better behavior if TMPL_VAR's
are undefined or zero.
Note FIXME added. I believe this is part of the fragmentary integration of
Katipo code for GST. Would be obliged if someone with access there can confirm.
---
.../prog/en/modules/acqui/neworderempty.tmpl | 27 +++++++++++---------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index a83516f..34e2cb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -5,38 +5,41 @@
//<![CDATA[
function update(f){
//collect values
-quantity=f.quantity.value
+quantity=f.quantity.value;
if (quantity ==0) {
alert("Quantity must be >0");
}
-discount=f.discount.value
-listinc=parseInt(f.listinc.value)
-currency=f.currency.value
-applygst=parseInt(f.applygst.value)
-listprice=f.list_price.value
+ discount=f.discount.value;
+ currency=f.currency.value;
+listprice=f.list_price.value;
+ listinc=parseInt(f.listinc.value);
+ applygst=parseInt(f.applygst.value);
// rrp=f.rrp.value
// ecost=f.ecost.value //budgetted cost
// GST=f.GST.value
// total=f.total.value
//make useful constants out of the above
-exchangerate=f.elements[currency].value //get exchange rate
+exchangerate=f.elements[currency].value; //get exchange rate. same as "discount" above?
gst_on=(!listinc && applygst);
//do real stuff
rrp=listprice*exchangerate;
-ecost=rrp*(100-discount)/100
+ecost=rrp*(100-discount)/100;
GST=0;
if (gst_on){
+<!-- TMPL_IF NAME="gstrate"-->
rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
+<!-- TMPL_ELSE --> ; // TMPL_VAR NAME=gstrate not set. leave rrp and GST alone.
+<!-- /TMPL_IF -->
}
-total=(ecost+GST)*quantity
+total=(ecost+GST)*quantity;
-f.rrp.value=rrp;
+ f.rrp.value=rrp;
f.ecost.value=ecost;
f.total.value=total;
-<!-- TMPL_IF NAME="GST"-->
-f.GST.value=GST;
+<!-- TMPL_IF NAME="GST" --> // FIXME: TMPL_VAR NAME="GST" never populated
+ f.GST.value=GST;
<!-- /TMPL_IF -->
return true;
}
--
1.5.5.GIT
More information about the Koha-patches
mailing list