Build system changed to Cmake, ORM changed to QxORM, Qt6 compatibility.

shop/shopservice.h

@@ -16,18 +16,18 @@
 class PayDialog;
 class ShopForm;
 
-void SHOPSHARED_EXPORT payVoucherFromUI(VoucherPtr voucher, PayDialog *dialog, ShopForm *form = NULL);
+void SHOPSHARED_EXPORT payVoucherFromUI(const VoucherPtr& voucher, PayDialog *dialog, ShopForm *form = nullptr);
 
 class SHOPSHARED_EXPORT ShopService : public Service<Voucher>
 {
 public:
-    ShopService();
+    ShopService() = default;
     VoucherPtr createVoucher();
     void addShopItem(VoucherPtr voucher, QSharedPointer<IShopItem> item, int count);
     void calculate(VoucherPtr voucher);
     void calculateItem(VoucherItemPtr item);
-    void loadItems(VoucherPtr voucher);
     void pay(VoucherPtr voucher);
+    void saveVoucher(VoucherPtr entity, qx::QxSession* pSession = nullptr);
     void moveItems(QList<VoucherItemPtr> items, VoucherPtr source, VoucherPtr target);
     void updateRelatedItem(VoucherItem* item, int countAdded);
     bool processEet(VoucherPtr voucher, QString &message);
@@ -40,7 +40,7 @@ public:
     QList<VoucherPtr> tempVouchers();
     QList<VoucherPtr> paiedVouchers();
     QList<VoucherPtr> vouchersForEet();
-    QList<ShopItemPtr> allSellableItems();
+    QList<IShopItemPtr> allSellableItems();
     VoucherSum unpaidSummary();
     VoucherSum unsendEET();
 
@@ -51,11 +51,6 @@ private:
 
     QSharedPointer<GlobalSettings> m_gs;
     QDecDouble vatRate(Enums::VatType vatType);
-
-public:
-    void saveVoucher(VoucherPtr entity);
-    void updateVoucher(VoucherPtr entity);
-    void eraseVoucher(VoucherPtr entity);
 };
 
 #endif // SHOPSERVICE_H