From c999551beff978551a90408e5816f97664fd23a6 Mon Sep 17 00:00:00 2001 From: konrad Date: Sun, 25 Apr 2010 12:10:57 +0000 Subject: [PATCH] ported ticket return trn git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@441 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- src/mwin/overview.cpp | 46 +++++++++------------------------------------- src/mwin/overview.h | 4 +--- 2 files changed, 10 insertions(+), 40 deletions(-) diff --git a/src/mwin/overview.cpp b/src/mwin/overview.cpp index 17b1bed..e10fe88 100644 --- a/src/mwin/overview.cpp +++ b/src/mwin/overview.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -107,8 +108,8 @@ MOverview::MOverview(QString pk) m->addAction(tr("&Show all customers"),this,SLOT(customerMgmt())); m=mb->addMenu(tr("&Misc")); - m->addAction(tr("Return &ticket..."),this,SLOT(ticketReturn())); - m->addAction(tr("Return &voucher..."),this,SLOT(voucherReturn())); + m->addAction(tr("Return &ticket or voucher..."),this,SLOT(ticketReturn())) + ->setEnabled(req->RReturnTicketVoucher); m->addSeparator(); m->addAction(tr("Edit &Shipping Options..."),this,SLOT(editShipping())); m->addSeparator(); @@ -198,7 +199,7 @@ void MOverview::editShipping() void MOverview::tabChanged(int idx) { - qDebug("tab index %i",idx); +// qDebug("tab index %i",idx); QWidget*w=tab->currentWidget(); if(w==entrancetab){ entrancetab->initialize(); @@ -206,45 +207,16 @@ void MOverview::tabChanged(int idx) } void MOverview::ticketReturn() -{/*TODO - //get ticket - bool ok; - QString tid=QInputDialog::getText(this,tr("Return Ticket"),tr("Please enter the ticket ID to return:"),QLineEdit::Normal,"",&ok); - if(!ok || tid=="")return; - MTicket tick(req,tid); - if(!tick.isValid()){ - QMessageBox::warning(this,tr("Warning"),tr("This is not a valid ticket.")); - return; - } - //check state - if(tick.status()!=MTicket::Bought && tick.status()!=MTicket::Reserved){ - QMessageBox::warning(this,tr("Warning"),tr("This ticket cannot be returned, it has already been used or is in the wrong state.")); - return; - } - //submit - QString r=tick.ticketReturn(); - if(r!="")QMessageBox::warning(this,tr("Warning"),trUtf8(r.toUtf8()));*/ -} - -void MOverview::voucherReturn() -{/*TODO +{ //get ticket bool ok; - QString tid=QInputDialog::getText(this,tr("Return Voucher"),tr("Please enter the voucher ID to return:"),QLineEdit::Normal,"",&ok); + QString tid=QInputDialog::getText(this,tr("Return Ticket/Voucher"),tr("Please enter the ticket or voucher ID to return:"),QLineEdit::Normal,"",&ok); if(!ok || tid=="")return; - MVoucher vouc(req,tid); - if(!vouc.isValid()){ - QMessageBox::warning(this,tr("Warning"),tr("This is not a valid voucher.")); - return; - } + MTReturnTicketVoucher rtv=MTReturnTicketVoucher::query(tid.trimmed()); //check state - if(vouc.isUsed()){ - QMessageBox::warning(this,tr("Warning"),tr("This voucher cannot be returned, it has already been used.")); - return; + if(rtv.hasError()){ + QMessageBox::warning(this,tr("Warning"),tr("This ticket/voucher cannot be returned: %1").arg(rtv.errorString())); } - //submit - QString r=vouc.voucherReturn(); - if(r!="")QMessageBox::warning(this,tr("Warning"),trUtf8(r.toUtf8()));*/ } void MOverview::deductVoucher() diff --git a/src/mwin/overview.h b/src/mwin/overview.h index 7aeda85..8283e1c 100644 --- a/src/mwin/overview.h +++ b/src/mwin/overview.h @@ -67,10 +67,8 @@ class MOverview:public QMainWindow /**generic check which tab is active*/ void tabChanged(int); - /**return a ticket*/ + /**return a ticket or voucher*/ void ticketReturn(); - /**return a voucher*/ - void voucherReturn(); /**deduct some money from a voucher (to pay outside the system)*/ void deductVoucher(); -- 1.7.2.5