ITsolved/prodejna
2
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Fixed voucher saving.

Browse Source 
closes #274
This commit is contained in:
pepa
2017-02-21 20:37:38 +01:00
parent 9e8d69827f
commit ec16d90fa4
5 changed files with 83 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shop/shopservice.cpp
+30 -5
View File
@@ -126,11 +126,11 @@ void ShopService::updateRelatedItem(VoucherItem* item, int countAdded)
}
}
void ShopService::processEet(VoucherPtr voucher)
bool ShopService::processEet(VoucherPtr voucher, QString message)
{
if (voucher->eetStatus() == Voucher::EET_NOT_ENTERING)
{
return;
return true;
}
SettingsService srvSettings("SHOP");
@@ -157,11 +157,12 @@ void ShopService::processEet(VoucherPtr voucher)
connect(sender, &EetSender::sendFinished, [this, voucher, sender, &loop](){
Transaction tx;
voucher->setEetBkp(sender->resut()->bkp());
voucher->setEetPkp(sender->resut()->pkp());
voucher->setEetFik(sender->resut()->fik());
if (sender->resut()->status() == EetResult::RESPONSE_OK)
{
voucher->setEetBkp(sender->resut()->bkp());
voucher->setEetPkp(sender->resut()->pkp());
voucher->setEetFik(sender->resut()->fik());
voucher->setEetSendDateTime(QDateTime::currentDateTime());
voucher->setEetStatus(Voucher::EET_SENT);
}
@@ -179,6 +180,30 @@ void ShopService::processEet(VoucherPtr voucher)
sender->sendRequest(&request);
loop.exec();
auto addMessage = [&message](EetMessage *msg, const QString &label){
if (message.isEmpty())
{
message = label + "\n";
}
message += QString::number(msg->code()) + ": " + msg->message();
};
foreach (EetMessage *msg, sender->resut()->errors()) {
addMessage(msg, "Errors:");
}
foreach (EetMessage *msg, sender->resut()->warnings()) {
addMessage(msg, "Warnings:");
}
return voucher->eetStatus() == Voucher::EET_SENT;
}
void ShopService::setEetOnline(bool online)
{
EetSender::m_online = online;
}
void ShopService::moveItems(QList<VoucherItemPtr> items, VoucherPtr source, VoucherPtr target)