shorten time when using TicketType

src/ATBAPP/ATBDeviceControllerPlugin.cpp

@@ -44,7 +44,6 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     // read variables from setting
     this->serialPortName = settings.value("ATBDeviceControllerPlugin/serialPort", "ttymxc2").toString();
     QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "ISO 8859-2").toString().toLatin1();
-//    QByteArray printerEncoding = settings.value("ATBDeviceControllerPlugin/printerEncoding", "Windows-1250").toString().toLatin1();
     QString printerLocaleString = settings.value("ATBDeviceControllerPlugin/printerLocale", "de_DE").toString().toLatin1();
     this->printerLocale = QLocale(printerLocaleString);
 
@@ -133,7 +132,7 @@ PLUGIN_STATE ATBDeviceControllerPlugin::initDCPlugin(QObject *eventReceiver, con
     this->codec = QTextCodec::codecForName(printerEncoding);
 
     if (this->codec == nullptr) {
-        printerEncoding = "Windows-1250";
+        printerEncoding = "ISO 8859-1";
         qCritical() << "ATBDeviceControllerPlugin: ERROR: printer encoding \"" << printerEncoding << "\" is not supported!";
         qCritical() << "     ... use default encoding: " << printerEncoding;
         this->codec = QTextCodec::codecForName(printerEncoding);
@@ -358,7 +357,6 @@ void ATBDeviceControllerPlugin::requestStopCashInput()
 
 void ATBDeviceControllerPlugin::cashCollect()
 {
-    qCritical() << "cashCollect() called ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++";
     hw->vend_success();
 
     // inserted amount
@@ -835,8 +833,6 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QHash<QString, QVarian
 
 void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingString)
 {
-    this->codec = QTextCodec::codecForName("ISO 8859-2");
-
     QByteArray ba_receipt = this->codec->fromUnicode(printingString);
 
     //QByteArray ba = printingString.toUtf8();
@@ -845,9 +841,8 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
                      printerDefaultFont.size,
                      printerDefaultFont.width,
                      printerDefaultFont.height);
-
-    qCritical().noquote() << ba_receipt.toHex(' ');
     hw->prn_sendText(&ba_receipt);
+
     // DEBUG
     //qCritical() << "---------------------------------------------------------------";
     //qCritical() << "ATBDeviceControllerPlugin::requestPrintReceipt()";
@@ -862,88 +857,6 @@ void ATBDeviceControllerPlugin::requestPrintReceipt(const QString & printingStri
     //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
 }
 
-void ATBDeviceControllerPlugin::requestPrintFiscal(const QString & printingString)
-{
-    this->codec = QTextCodec::codecForName("Windows-1250");
-
-    qCritical() << "Printer codec forced:"
-                << this->codec->name();
-
-    QByteArray ba_receipt = this->codec->fromUnicode(printingString);
-
-    //QByteArray ba = printingString.toUtf8();
-    hw->prn_switchPower(true);
-    hw->prn_sendPrnSetup(100, 25, 'c', 0);
-    hw->prn_setFonts(printerDefaultFont.font,
-                     //printerDefaultFont.size,
-                     11,
-                     printerDefaultFont.width,
-                     printerDefaultFont.height);
-
-    qCritical() << "Receipt bytes (hex):";
-    qCritical().noquote() << ba_receipt.toHex(' ');
-    hw->prn_sendText(&ba_receipt);
-    // DEBUG
-    //qCritical() << "---------------------------------------------------------------";
-    //qCritical() << "ATBDeviceControllerPlugin::requestPrintFiscal()";
-    //qCritical() << "    receipt data:";
-    //qCritical() << QString(ba_receipt);
-    //qCritical() << "---------------------------------------------------------------";
-
-
-    this->printResultCheckCounter = 0;
-    //QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingReceipt()));
-
-    //QTimer::singleShot(2000, this, [this](){ hw->prn_cut(3);  } );
-}
-
-void ATBDeviceControllerPlugin::requestPrintQR(const QString & printingString)
-{
-    QByteArray ba_qr = this->codec->fromUnicode(printingString);
-
-    QString nl = "\n";
-    QByteArray ba_nl = this->codec->fromUnicode(nl);
-
-    //QByteArray ba = printingString.toUtf8();
-    hw->prn_switchPower(true);
-    hw->prn_sendText(&ba_nl);
-    hw->prn_sendQRdata(&ba_qr);
-    hw->prn_printQRcode();
-    hw->prn_sendText(&ba_nl);
-    // DEBUG
-    qCritical() << "---------------------------------------------------------------";
-    qCritical() << "ATBDeviceControllerPlugin::requestPrintQR()";
-    qCritical() << "    QR data:";
-    qCritical() << QString(ba_qr);
-    qCritical() << "---------------------------------------------------------------";
-
-
-    this->printResultCheckCounter = 0;
-    //QTimer::singleShot(2000, this, SLOT(onPrinterWaitForPrintingFiscal()));
-
-    //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, [this]()
-            {
-                onPrinterWaitForPrintingFiscal();
-            });
-        });
-}
-
-void ATBDeviceControllerPlugin::requestPrintCut(const qint16 & printTimer)
-{
-       QTimer::singleShot(printTimer, this, SLOT(onPrinterWaitForPrintingReceipt()));
-}
-
 void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
 {
     quint8 printerResult = this->hw->prn_getPrintResult();
@@ -990,52 +903,6 @@ void ATBDeviceControllerPlugin::onPrinterWaitForPrintingReceipt()
 
 }
 
-void ATBDeviceControllerPlugin::onPrinterWaitForPrintingFiscal()
-{
-    quint8 printerResult = this->hw->prn_getPrintResult();
-
-    switch (printerResult) {
-    case 0:    // still printing
-        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";
-        emit this->printFiscalFinished(nsDeviceControllerInterface::RESULT_STATE::SUCCESS,
-                                        // TODO: TicketNumber
-                                        "",
-                                        "");
-
-        break;
-    case 2:    // printing finished, Error
-        qCritical() << "DC Error: wait for printing fiscal";
-        this->errorCode = "PRINTER";               // TODO: get more detailed error code from low level API
-        this->errorDescription = "Printer error";  // TODO: get more detailed error description from low level API
-
-        emit this->printFiscalFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
-                                       this->errorCode,
-                                       this->errorDescription);
-        hw->prn_switchPower(true);
-        QTimer::singleShot(200, this, [this](){ hw->prn_cut(3);  } );
-        break;
-    default:
-        qCritical() << "DC Error: wait for printing fiscal: printerResult = " << printerResult;
-        this->errorCode = "PRINTER";               // TODO: get more detailed error code from low level API
-        this->errorDescription = "Printer error(" + QString(printerResult) + ")";
-
-        emit this->printFiscalFinished(nsDeviceControllerInterface::RESULT_STATE::ERROR_BACKEND,
-                                       this->errorCode,
-                                       this->errorDescription);
-        // do an emergency cut
-        hw->prn_switchPower(true);
-        QTimer::singleShot(200, this, [this](){ hw->prn_cut(3);  } );
-
-        break;
-    }
-
-}
-
-
 
 void ATBDeviceControllerPlugin::requestPrintTicket(const QHash<QString, QVariant> & printingData)
 {
@@ -1294,11 +1161,11 @@ void ATBDeviceControllerPlugin::onPrinterPrintNextTemplate()
 
         if (this->currentTicket->hasTemplateDynData()) {
             // set new dyn data:
-            QTimer::singleShot(400, this, SLOT(onPrinterPrepareDynTemplateData()));
+            QTimer::singleShot(300, this, SLOT(onPrinterPrepareDynTemplateData()));
         }
         else {
             // print next template
-            QTimer::singleShot(50, this, SLOT(onPrinterPrintNextTemplate()));
+            QTimer::singleShot(300, this, SLOT(onPrinterPrintNextTemplate()));
         }
     }
 }
@@ -1423,7 +1290,7 @@ void ATBDeviceControllerPlugin::prepareDynTemplateData()
         return;
     }
 
-    QTimer::singleShot(1000, this, SLOT(onPrinterDataPreparedForTemplates()));
+    QTimer::singleShot(300, this, SLOT(onPrinterDataPreparedForTemplates()));
 }
 
 

src/ATBAPP/ATBDeviceControllerPlugin.h

@@ -79,10 +79,6 @@ public:
     void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData);
     void requestPrintReceipt(const QHash<QString, QVariant> & printingData);
     void requestPrintReceipt(const QString & printingString);
-    void requestPrintFiscal(const QString & printingString);
-    void requestPrintQR(const QString & printingString);
-    void requestPrintCut(const qint16 & printTimer);
-    void requestPrintCutFiscal(const qint16 & printTimer);
 
     // TASKS: Account -------------------------------------------------------------
     void requestAccount();
@@ -189,7 +185,6 @@ private slots:
    void onPrinterPrintNextTemplate();
    void onPrinterWaitForPrintingTicket();
    void onPrinterWaitForPrintingReceipt();
-   void onPrinterWaitForPrintingFiscal();
 
    void onPrinterPrepareDynTemplateData();
 

src/ATBAPP/DeviceControllerInterface.h

@@ -77,10 +77,6 @@ public:
     virtual void requestPrintTicket(nsDeviceControllerInterface::TICKET_VARIANT ticketVariant, const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QHash<QString, QVariant> & printingData) = 0;
     virtual void requestPrintReceipt(const QString & printingString) = 0;
-    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;
@@ -119,10 +115,6 @@ signals:
     void printReceiptFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
                                      const QString & errorCode,
                                      const QString & errorDescription);
-    void printFiscalFinished(nsDeviceControllerInterface::RESULT_STATE resultState,
-                                     const QString & errorCode,
-                                     const QString & errorDescription);
-
 
 
     void coinAttached();