Implemented "EET switch to offline" feature.

This commit is contained in:
2017-02-21 22:15:43 +01:00
parent ec16d90fa4
commit 954f655363
3 changed files with 29 additions and 4 deletions
+14 -3
View File
@@ -126,7 +126,7 @@ void ShopService::updateRelatedItem(VoucherItem* item, int countAdded)
}
}
bool ShopService::processEet(VoucherPtr voucher, QString message)
bool ShopService::processEet(VoucherPtr voucher, QString &message)
{
if (voucher->eetStatus() == Voucher::EET_NOT_ENTERING)
{
@@ -153,8 +153,9 @@ bool ShopService::processEet(VoucherPtr voucher, QString message)
sender->setPlayground(settings->eetPlayground());
QEventLoop loop;
bool replyFinished = false;
connect(sender, &EetSender::sendFinished, [this, voucher, sender, &loop](){
connect(sender, &EetSender::sendFinished, [this, voucher, sender, &loop, &replyFinished](){
Transaction tx;
voucher->setEetBkp(sender->resut()->bkp());
@@ -176,10 +177,15 @@ bool ShopService::processEet(VoucherPtr voucher, QString message)
sender->deleteLater();
loop.quit();
replyFinished = true;
});
sender->sendRequest(&request);
loop.exec();
if (!replyFinished)
{
loop.exec();
}
auto addMessage = [&message](EetMessage *msg, const QString &label){
if (message.isEmpty())
@@ -206,6 +212,11 @@ void ShopService::setEetOnline(bool online)
EetSender::m_online = online;
}
bool ShopService::isEetOnline()
{
return EetSender::m_online;
}
void ShopService::moveItems(QList<VoucherItemPtr> items, VoucherPtr source, VoucherPtr target)
{
Transaction tx;