Merge branch 'master' of https://git.bukova.info/repos/git/prodejna

shop/data/voucher.cpp

@@ -210,6 +210,26 @@ QDecDouble Voucher::VatAmountSecondLower()
     return TO_DEC(m_totalPriceVatSecondLower) - TO_DEC(m_priceVatSecondLower);
 }
 
+QString Voucher::numSer() const
+{
+    return m_numSer;
+}
+
+void Voucher::setNumSer(const QString &numSer)
+{
+    m_numSer = numSer;
+}
+
+QDateTime Voucher::payDateTime() const
+{
+    return m_payDateTime;
+}
+
+void Voucher::setPayDateTime(const QDateTime &payDateTime)
+{
+    m_payDateTime = payDateTime;
+}
+
 int Voucher::id() const
 {
     return m_id;

shop/data/voucher.h

@@ -16,6 +16,8 @@ class Voucher : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(QString numSer READ numSer WRITE setNumSer)
+    Q_PROPERTY(QDateTime payDateTime READ payDateTime WRITE setPayDateTime)
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QString description READ description WRITE setDescription)
     Q_PROPERTY(QSharedPointer<QObject> contact READ contact WRITE setContact)
@@ -102,10 +104,18 @@ public:
     QDecDouble vatAmountFirstLower();
     QDecDouble VatAmountSecondLower();
 
+    QString numSer() const;
+    void setNumSer(const QString &numSer);
+
+    QDateTime payDateTime() const;
+    void setPayDateTime(const QDateTime &payDateTime);
+
 private:
     friend class odb::access;
 #pragma db id auto
     int m_id;
+    QString m_numSer;
+    QDateTime m_payDateTime;
     QString m_name;
     QString m_description;
     QSharedPointer<AddressbookData> m_contact;