Implemented base functionality of DirectSaleForm.

core/core.h

@@ -12,5 +12,6 @@
 #include "settingsservice.h"
 #include "settingsform.h"
 #include "enums.h"
+#include "objectbinder.h"
 
 #endif // CORE_H

shop/data/voucheritem.cpp

@@ -3,7 +3,10 @@
 
 VoucherItem::VoucherItem(QObject *parent) : QObject(parent)
 {
-
+    m_price = 0;
+    m_unitPrice = 0;
+    m_count = 0;
+    m_refId = 0;
 }
 
 int VoucherItem::id() const

shop/data/voucheritem.h

@@ -17,8 +17,6 @@ class VoucherItem : public QObject
     Q_PROPERTY(int count READ count WRITE setCount)
     Q_PROPERTY(QDecDouble unitPrice READ unitPrice WRITE setUnitPrice)
     Q_PROPERTY(QDecDouble price READ price WRITE setPrice)
-    Q_PROPERTY(int refId READ refId WRITE setRefId)
-    Q_PROPERTY(QString itemPlugin READ itemPlugin WRITE setItemPlugin)
     Q_PROPERTY(Enums::VatType vatType READ vatType WRITE setVatType)
 
 public:

shop/directsaleform.cpp

@@ -6,9 +6,32 @@ DirectSaleForm::DirectSaleForm(QWidget *parent) :
     ui(new Ui::DirectSaleForm)
 {
     ui->setupUi(this);
+    m_shopItem = QSharedPointer<DirectSaleItem>(new DirectSaleItem);
+
+    m_binder.setData(m_shopItem.data());
+    m_binder.registerBinding(ui->name);
+    m_binder.registerBinding(ui->unitPrice);
+    m_binder.registerBinding(ui->count);
+    m_binder.bindToUi();
 }
 
 DirectSaleForm::~DirectSaleForm()
 {
     delete ui;
 }
+
+QSharedPointer<IShopItem> DirectSaleForm::shopItem() const
+{
+    return m_shopItem;
+}
+
+void DirectSaleForm::on_buttonBox_rejected()
+{
+    this->reject();
+}
+
+void DirectSaleForm::on_buttonBox_accepted()
+{
+    m_binder.bindToData();
+    this->accept();
+}

shop/directsaleform.h

@@ -2,7 +2,12 @@
 #define DIRECTSALEFORM_H
 
 #include <QDialog>
-#include<QWidget>
+#include <QWidget>
+#include <QSharedPointer>
+#include <core.h>
+
+#include "ishopitem.h"
+#include "directsaleitem.h"
 
 namespace Ui {
 class DirectSaleForm;
@@ -16,8 +21,17 @@ public:
     explicit DirectSaleForm(QWidget *parent = 0);
     ~DirectSaleForm();
 
+    QSharedPointer<IShopItem> shopItem() const;
+
+private slots:
+    void on_buttonBox_rejected();
+
+    void on_buttonBox_accepted();
+
 private:
     Ui::DirectSaleForm *ui;
+    ObjectBinder m_binder;
+    QSharedPointer<DirectSaleItem> m_shopItem;
 };
 
 #endif // DIRECTSALEFORM_H

shop/directsaleform.ui

@@ -22,7 +22,7 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLineEdit" name="commodityName"/>
+    <widget class="QLineEdit" name="name"/>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="priceLabel">
@@ -32,7 +32,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QDoubleSpinBox" name="price"/>
+    <widget class="QDoubleSpinBox" name="unitPrice"/>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="countLabel">

shop/directsaleitem.cpp

@@ -0,0 +1,46 @@
+#include "directsaleitem.h"
+
+DirectSaleItem::DirectSaleItem(QObject *parent) : QObject(parent)
+{
+    m_count = 1;
+}
+
+int DirectSaleItem::id()
+{
+    return 0;
+}
+
+QString DirectSaleItem::name()
+{
+    return m_name;
+}
+
+QDecDouble DirectSaleItem::unitPrice()
+{
+    return m_unitPrice;
+}
+
+QString DirectSaleItem::pluginId()
+{
+    return "";
+}
+
+int DirectSaleItem::count() const
+{
+    return m_count;
+}
+
+void DirectSaleItem::setCount(int count)
+{
+    m_count = count;
+}
+
+void DirectSaleItem::setName(const QString &name)
+{
+    m_name = name;
+}
+
+void DirectSaleItem::setUnitPrice(const QDecDouble &unitPrice)
+{
+    m_unitPrice = unitPrice;
+}

shop/directsaleitem.h

@@ -0,0 +1,42 @@
+#ifndef DIRECTSALEITEM_H
+#define DIRECTSALEITEM_H
+
+#include <QObject>
+#include <QString>
+#include "ishopitem.h"
+
+class DirectSaleItem : public QObject, public IShopItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QDecDouble unitPrice READ unitPrice WRITE setUnitPrice)
+    Q_PROPERTY(int count READ count WRITE setCount)
+
+public:
+    explicit DirectSaleItem(QObject *parent = 0);
+
+signals:
+
+public slots:
+
+    // IShopItem interface
+public:
+    int id() override;
+    QString name() override;
+    QDecDouble unitPrice() override;
+    QString pluginId() override;
+
+    int count() const;
+    void setCount(int count);
+
+    void setName(const QString &name);
+
+    void setUnitPrice(const QDecDouble &unitPrice);
+
+private:
+    QString m_name;
+    QDecDouble m_unitPrice;
+    int m_count;
+};
+
+#endif // DIRECTSALEITEM_H

shop/ishopitem.h

@@ -9,8 +9,10 @@ class SHOPSHARED_EXPORT IShopItem
 {
 
 public:
-    QString name() = 0;
+    virtual int id() = 0;
-    QDecDouble unitPrice() = 0;
+    virtual QString name() = 0;
+    virtual QDecDouble unitPrice() = 0;
+    virtual QString pluginId() = 0;
 };
 
 #endif // ISHOPITEM_H

shop/shop.cpp

@@ -1,6 +1,7 @@
 #include "shop.h"
 #include <QIcon>
 #include "shopform.h"
+#include "shopservice.h"
 
 
 Shop::Shop()
@@ -10,6 +11,7 @@ Shop::Shop()
 void Shop::initServiceUi()
 {
     m_ui = new ShopForm();
+    m_service = new ShopService();
 }
 
 QIcon Shop::pluginIcon()

shop/shop.pro

@@ -18,8 +18,10 @@ SOURCES += shop.cpp \
     directsaleform.cpp \
     temporaryreceiptsaveform.cpp \
     receiptsaveform.cpp \
-    receiptloadform.cpp
+    receiptloadform.cpp \
-    data/voucheritem.cpp
+    data/voucheritem.cpp \
+    shopservice.cpp \
+    directsaleitem.cpp
 
 HEADERS += shop.h\
         shop_global.h \
@@ -28,11 +30,13 @@ HEADERS += shop.h\
     directsaleform.h \
     temporaryreceiptsaveform.h \
     receiptsaveform.h \
-    receiptloadform.h
+    receiptloadform.h \
     ishopitem.h \
     data/voucheritem.h \
     data/shop-data.h \
-    isellableservice.h
+    isellableservice.h \
+    shopservice.h \
+    directsaleitem.h
 
 unix {
     target.path = /usr/lib

shop/shopform.cpp

@@ -4,12 +4,17 @@
 #include "temporaryreceiptsaveform.h"
 #include "receiptsaveform.h"
 #include "receiptloadform.h"
+#include "shopservice.h"
 
 ShopForm::ShopForm(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::ShopForm)
 {
     ui->setupUi(this);
+    ShopService srv;
+    m_voucher = srv.createVoucher();
+    m_itemsModel = new AutoTableModel<VoucherItem>(this);
+    ui->actualReceipt->setModel(m_itemsModel);
 }
 
 ShopForm::~ShopForm()
@@ -20,6 +25,13 @@ ShopForm::~ShopForm()
 void ShopForm::on_directSale_clicked()
 {
     DirectSaleForm *form = new DirectSaleForm(this);
+
+    connect(form, &QDialog::accepted, [this, form](){
+        ShopService srv;
+        srv.addShopItem(m_voucher, form->shopItem(), ((DirectSaleItem*)form->shopItem().data())->count());
+        this->m_itemsModel->addRow(m_voucher->items()[m_voucher->items().count() - 1]);
+    });
+
     form->show();
 }
 

shop/shopform.h

@@ -2,6 +2,9 @@
 #define SHOPFORM_H
 
 #include <QWidget>
+#include <QList>
+#include "data/shop-data.h"
+#include <autotablemodel.h>
 
 namespace Ui {
 class ShopForm;
@@ -26,6 +29,8 @@ private slots:
 
 private:
     Ui::ShopForm *ui;
+    QSharedPointer<Voucher> m_voucher;
+    AutoTableModel<VoucherItem> *m_itemsModel;
 };
 
 #endif // SHOPFORM_H

shop/shopservice.cpp

@@ -4,3 +4,34 @@ ShopService::ShopService()
 {
 
 }
+
+QSharedPointer<Voucher> ShopService::createVoucher()
+{
+    QSharedPointer<Voucher> voucher(new Voucher);
+    voucher->setStatus(Voucher::NEW);
+    return voucher;
+}
+
+void ShopService::addShopItem(QSharedPointer<Voucher> voucher, QSharedPointer<IShopItem> item, int count)
+{
+    QSharedPointer<VoucherItem> vItem(new VoucherItem);
+    vItem->setName(item->name());
+    vItem->setUnitPrice(item->unitPrice());
+    vItem->setCount(count);
+    vItem->setRefId(item->id());
+    vItem->setItemPlugin(item->pluginId());
+
+    voucher->addItem(vItem);
+}
+
+void ShopService::calculate(QSharedPointer<Voucher> voucher)
+{
+    QDecDouble total;
+
+    foreach (QSharedPointer<VoucherItem> item, voucher->items()) {
+        QDecDouble itemPrice = item->unitPrice() * item->count();
+        total += itemPrice;
+    }
+
+    voucher->setTotalPrice(total);
+}

shop/shopservice.h

@@ -1,11 +1,20 @@
 #ifndef SHOPSERVICE_H
 #define SHOPSERVICE_H
 
+#include <QSharedPointer>
 
-class ShopService
+#include <core.h>
+
+#include "data/shop-data.h"
+#include "ishopitem.h"
+
+class ShopService : public Service<Voucher>
 {
 public:
     ShopService();
+    QSharedPointer<Voucher> createVoucher();
+    void addShopItem(QSharedPointer<Voucher> voucher, QSharedPointer<IShopItem> item, int count);
+    void calculate(QSharedPointer<Voucher> voucher);
 };
 
-#endif // SHOPSERVICE_H
+#endif // SHOPSERVICE_H