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

add new eet and qt 6.12

Browse Source
This commit is contained in:
jony
2026-10-14 22:38:06 +02:00
parent 464216d6c3
commit 99f98b0451
17 changed files with 505 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shop/settings/shopsettings.cpp
+33
View File
@@ -6,6 +6,9 @@ ShopSettings::ShopSettings(QObject *parent) : QObject(parent)
m_lettersPerLine = 48;
m_eetActive = false;
m_eetKeyPassword = QStringLiteral("EET_PKCS12_PASSWORD");
m_eetUnitId = 1;
m_eetTimeout = 30000;
m_eetMode = 1;
m_eetTest = 0;
m_eetPlayground = 0;
@@ -94,6 +97,36 @@ void ShopSettings::setEetRegisterId(const QString &eetRegisterId)
m_eetRegisterId = eetRegisterId;
}
QString ShopSettings::eetEndpoint() const
{
return m_eetEndpoint;
}
void ShopSettings::setEetEndpoint(const QString &eetEndpoint)
{
m_eetEndpoint = eetEndpoint;
}
int ShopSettings::eetUnitId() const
{
return m_eetUnitId;
}
void ShopSettings::setEetUnitId(int eetUnitId)
{
m_eetUnitId = eetUnitId;
}
int ShopSettings::eetTimeout() const
{
return m_eetTimeout;
}
void ShopSettings::setEetTimeout(int eetTimeout)
{
m_eetTimeout = eetTimeout;
}
int ShopSettings::eetMode() const
{
return m_eetMode;
shop/settings/shopsettings.h
+15
View File
@@ -13,6 +13,9 @@ class ShopSettings : public QObject
Q_PROPERTY(bool eetActive READ eetActive WRITE setEetActive)
Q_PROPERTY(QString eetShopId READ eetShopId WRITE setEetShopId)
Q_PROPERTY(QString eetRegisterId READ eetRegisterId WRITE setEetRegisterId)
Q_PROPERTY(QString eetEndpoint READ eetEndpoint WRITE setEetEndpoint)
Q_PROPERTY(int eetUnitId READ eetUnitId WRITE setEetUnitId)
Q_PROPERTY(int eetTimeout READ eetTimeout WRITE setEetTimeout)
Q_PROPERTY(int eetMode READ eetMode WRITE setEetMode)
Q_PROPERTY(QString eetCertificate READ eetCertificate WRITE setEetCertificate)
Q_PROPERTY(QString eetKeyPassword READ eetKeyPassword WRITE setEetKeyPassword)
@@ -65,6 +68,15 @@ public:
QString eetRegisterId() const;
void setEetRegisterId(const QString &eetRegisterId);
QString eetEndpoint() const;
void setEetEndpoint(const QString &eetEndpoint);
int eetUnitId() const;
void setEetUnitId(int eetUnitId);
int eetTimeout() const;
void setEetTimeout(int eetTimeout);
int eetMode() const;
void setEetMode(int eetMode);
@@ -119,6 +131,9 @@ private:
bool m_eetActive;
QString m_eetShopId;
QString m_eetRegisterId;
QString m_eetEndpoint;
int m_eetUnitId;
int m_eetTimeout;
int m_eetMode;
QString m_eetCertificate;
QString m_eetKeyPassword;
shop/settings/shopsettingsform.cpp
+4 -1
View File
@@ -16,10 +16,13 @@ ShopSettingsForm::ShopSettingsForm(QWidget *parent) :
registerBinding(ui->lettersPerLine);
registerBinding(ui->byMessage);
#ifdef EET
#ifdef PRODEJNA_EET_V4
registerBinding(ui->eetActive);
registerBinding(ui->eetShopId);
registerBinding(ui->eetRegisterId);
registerBinding(ui->eetEndpoint);
registerBinding(ui->eetUnitId);
registerBinding(ui->eetTimeout);
QList<ComboData> listModes;
listModes << ComboData(0, tr("Simplifyed")) << ComboData(1, tr("Standard"));
registerBinding(ui->eetMode, listModes);
shop/settings/shopsettingsform.ui
+61 -11
View File
@@ -187,7 +187,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Shop ID</string>
<string>Taxpayer EIC</string>
</property>
</widget>
</item>
@@ -204,24 +204,54 @@
<item row="1" column="1">
<widget class="QLineEdit" name="eetRegisterId"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>EET endpoint</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="eetEndpoint"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_18">
<property name="text">
<string>Unit ID</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="eetUnitId">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999999999</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>EET mode</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QComboBox" name="eetMode"/>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Certificate file</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QWidget" name="widget_2" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="leftMargin">
@@ -249,28 +279,48 @@
</layout>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Private key password</string>
<string>Certificate password environment variable</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="6" column="1">
<widget class="QLineEdit" name="eetKeyPassword">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
<property name="text">
<string>EET_PKCS12_PASSWORD</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>Request timeout (ms)</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QSpinBox" name="eetTimeout">
<property name="minimum">
<number>1000</number>
</property>
<property name="maximum">
<number>600000</number>
</property>
<property name="value">
<number>30000</number>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="eetTest">
<property name="text">
<string>Test mode</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="eetPlayground">
<property name="text">
<string>Communication with playground </string>