Added insert date to voucher items and save date to vouchers. Additional voucher descriptions (name, contact...) are now copied from saved vouchers when load items.

closes #286

shop/data/voucher.cpp

@@ -281,6 +281,16 @@ void Voucher::setEetFik(const QString &eetFik)
     m_eetFik = eetFik;
 }
 
+QDateTime Voucher::saveDateTime() const
+{
+    return m_saveDateTime;
+}
+
+void Voucher::setSaveDateTime(const QDateTime &saveDateTime)
+{
+    m_saveDateTime = saveDateTime;
+}
+
 int Voucher::id() const
 {
     return m_id;

shop/data/voucher.h

@@ -18,6 +18,7 @@ class Voucher : public QObject
 
     Q_PROPERTY(QString numSer READ numSer WRITE setNumSer)
     Q_PROPERTY(QDateTime payDateTime READ payDateTime WRITE setPayDateTime)
+    Q_PROPERTY(QDateTime saveDateTime READ saveDateTime WRITE setSaveDateTime)
     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)
@@ -139,12 +140,16 @@ public:
     QString eetFik() const;
     void setEetFik(const QString &eetFik);
 
+    QDateTime saveDateTime() const;
+    void setSaveDateTime(const QDateTime &saveDateTime);
+
 private:
     friend class odb::access;
 #pragma db id auto
     int m_id;
     QString m_numSer;
     QDateTime m_payDateTime;
+    QDateTime m_saveDateTime;
     QString m_name;
     QString m_description;
     QSharedPointer<AddressbookData> m_contact;

shop/data/voucheritem.cpp

@@ -127,4 +127,14 @@ void VoucherItem::setVoucher(const QWeakPointer<Voucher> &voucher)
     m_voucher = voucher;
 }
 
+QDateTime VoucherItem::insertDate() const
+{
+    return m_insertDate;
+}
+
+void VoucherItem::setInsertDate(const QDateTime &insertDate)
+{
+    m_insertDate = insertDate;
+}
+
 

shop/data/voucheritem.h

@@ -6,6 +6,7 @@
 #include <QDecDouble.hh>
 #include <odb/core.hxx>
 #include <QSharedPointer>
+#include <QDateTime>
 
 #include <enums.h>
 
@@ -16,6 +17,7 @@ class VoucherItem : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(QDateTime insertDate READ insertDate WRITE setInsertDate)
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged)
     Q_PROPERTY(QDecDouble unitPrice READ unitPrice WRITE setUnitPrice)
@@ -62,6 +64,9 @@ public:
     QWeakPointer<Voucher> voucher() const;
     void setVoucher(const QWeakPointer<Voucher> &voucher);
 
+    QDateTime insertDate() const;
+    void setInsertDate(const QDateTime &insertDate);
+
 signals:
     void countChanged(int oldCount);
 
@@ -76,6 +81,7 @@ private:
     int m_priceWitouthVat;
     int m_price;
     int m_refId;
+    QDateTime m_insertDate;
     QString m_itemPlugin;
     Enums::VatType m_vatType;
     #pragma db not_null