From b9463a426a0057fc45c8a33499bd5af0e192de76 Mon Sep 17 00:00:00 2001
From: Konrad Rosenbaum <konrad@silmor.de>
Date: Thu, 21 Nov 2013 18:12:21 +0100
Subject: [PATCH] log voucher ID when paying with voucher;
 show human readable payment type

---
 src/dialogs/payedit.cpp |    2 +-
 wob/db/order.wolf       |    3 ++-
 www/inc/wext/order.php  |    7 +++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/dialogs/payedit.cpp b/src/dialogs/payedit.cpp
index 7627efe..57ff39b 100644
--- a/src/dialogs/payedit.cpp
+++ b/src/dialogs/payedit.cpp
@@ -338,7 +338,7 @@ MPaymentDialog::MPaymentDialog(QWidget* parent, Qt::WindowFlags f): QDialog(pare
 	int idx=0;
 	foreach(MOPaymentType p,pt){
 		if(req->checkFlags(p.flags())){
-			m_ptype->addItem(p.name(),QVariant::fromValue<MOPaymentType>(p));
+			m_ptype->addItem(p.description(),QVariant::fromValue<MOPaymentType>(p));
 			if(p.name()==dp)idx=m_ptype->count()-1;
 		}
 	}
diff --git a/wob/db/order.wolf b/wob/db/order.wolf
index 7f1edd6..2ebddba 100644
--- a/wob/db/order.wolf
+++ b/wob/db/order.wolf
@@ -23,7 +23,8 @@
 		<Column name="flags" type="string">filter: who can log payments with this method</Column>
 		
 		<Preset><V col="paytype" val="cash"/><V col="description" val="default paytype: cash"/></Preset>
-		<Preset><V col="paytype" val="credit card"/><V col="description" val="credit card payment"/><V col="dataname" val="card data"/><V col="datapreset" val="date: %Y-%M-%D, card: ..."/></Preset>
+                <Preset><V col="paytype" val="credit card"/><V col="description" val="credit card payment"/><V col="dataname" val="card data"/><V col="datapreset" val="date: %Y-%M-%D, card: ..."/></Preset>
+                <Preset><V col="paytype" val="voucher"/><V col="description" val="payment with voucher"/><V col="dataname" val="voucher ID"/><V col="flags" val="+_admin"/></Preset>
 	</Table>
 	<Table name="order" backup="yes" audit="yes">
 		<Doc>This table contains all orders and sales.</Doc>
diff --git a/www/inc/wext/order.php b/www/inc/wext/order.php
index cff8511..e1165b9 100644
--- a/www/inc/wext/order.php
+++ b/www/inc/wext/order.php
@@ -405,6 +405,13 @@ class WOOrder extends WOOrderAbstract
 		}
 		//make corrections
 		$ord->amountpaid+=$pay;
+		//set payment type for audit
+		if(WTpaymenttype::getFromDB("voucher")!==false){
+                        $ord->paytype="voucher";//see db/order.wolf for this default paytype
+                        $ord->paydata=$vou->voucherid;
+		}else{
+                        $ord->paydata=tr("Voucher: ").$vou->voucherid;
+		}
 		$ord->update();
 		$vou->value-=$pay;
 		$vou->isused=true;
-- 
1.7.2.5