diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.cpp b/src/ATBAPP/ATBDeviceControllerPlugin.cpp index 2fbe505..aa1c100 100644 --- a/src/ATBAPP/ATBDeviceControllerPlugin.cpp +++ b/src/ATBAPP/ATBDeviceControllerPlugin.cpp @@ -923,6 +923,15 @@ void ATBDeviceControllerPlugin::requestPrintQR(const QString & printingString) //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3); } ); } +void ATBDeviceControllerPlugin::requestPrintCutFiscal(const qint16 & printTimer) +{ + qCritical() << "requestPrintCutFiscal --------------------------------------------"; + hw->prn_switchPower(true); + QTimer::singleShot(200, this, [this](){ hw->prn_cut(3); + QTimer::singleShot(1800, this, SLOT(onPrinterWaitForPrintingFiscal())); + } ); +} + void ATBDeviceControllerPlugin::requestPrintCut(const qint16 & printTimer) { QTimer::singleShot(printTimer, this, SLOT(onPrinterWaitForPrintingReceipt())); @@ -980,8 +989,8 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingFiscal() switch (printerResult) { case 0: // still printing - qCritical() << "--> printer: WaitForPrintingReceipt"; - QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt())); + qCritical() << "--> printer: WaitForPrintingFiscal"; + QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingFiscal())); // should be changed to fiscal !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! DS break; case 1: // printing finished, Ok qCritical() << "DC Finished printing fiscal"; @@ -989,8 +998,7 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingFiscal() // TODO: TicketNumber "", ""); - hw->prn_switchPower(true); - QTimer::singleShot(200, this, [this](){ hw->prn_cut(3); } ); + break; case 2: // printing finished, Error qCritical() << "DC Error: wait for printing fiscal"; diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.h b/src/ATBAPP/ATBDeviceControllerPlugin.h index 1c2d224..801e84e 100644 --- a/src/ATBAPP/ATBDeviceControllerPlugin.h +++ b/src/ATBAPP/ATBDeviceControllerPlugin.h @@ -82,6 +82,7 @@ public: void requestPrintFiscal(const QString & printingString); void requestPrintQR(const QString & printingString); void requestPrintCut(const qint16 & printTimer); + void requestPrintCutFiscal(const qint16 & printTimer); // TASKS: Account ------------------------------------------------------------- void requestAccount(); diff --git a/src/ATBAPP/DeviceControllerInterface.h b/src/ATBAPP/DeviceControllerInterface.h index cdec72d..380bd02 100644 --- a/src/ATBAPP/DeviceControllerInterface.h +++ b/src/ATBAPP/DeviceControllerInterface.h @@ -80,6 +80,7 @@ public: virtual void requestPrintFiscal(const QString & printingString) = 0; virtual void requestPrintQR(const QString & printingSTring) = 0; virtual void requestPrintCut(const qint16 & printTimer) = 0; + virtual void requestPrintCutFiscal(const qint16 & printTimer) = 0; // read coin/cash processing variants virtual nsDeviceControllerInterface::COIN_PROCESSOR coinProcessor() = 0;