projects
/
web/konrad/smoke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
7f8df92
)
fix shipping cost in bill template
author
Konrad Rosenbaum
<konrad@silmor.de>
Mon, 20 Mar 2017 19:15:14 +0000 (20:15 +0100)
committer
Konrad Rosenbaum
<konrad@silmor.de>
Mon, 20 Mar 2017 19:15:14 +0000 (20:15 +0100)
Change-Id: I958980ee8af12181f5128813e2c2f1736c19323d
commonlib/templates/billrender.cpp
patch
|
blob
|
history
diff --git
a/commonlib/templates/billrender.cpp
b/commonlib/templates/billrender.cpp
index
fb35cd5
..
bf6a856
100644
(file)
--- a/
commonlib/templates/billrender.cpp
+++ b/
commonlib/templates/billrender.cpp
@@
-100,6
+100,9
@@
QVariant MBillRenderer::getVariable(QString vn)
if(vn=="SHIPPING")return m_order.shippingtype().value().description().value();else
if(vn=="SHIPPINGPRICE"){
return m_order.shippingtype().value().cost().value();
+ }else
+ if(vn=="SHIPPINGCOST"){
+ return m_order.shippingcosts().value();
}else{
if(vn.contains(':')){
QStringList sl=vn.split(':');