From 61e8ac95e621544b32ae324d7aec44b4e15bc81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 5 Oct 2019 18:09:48 +0800 Subject: Separate the product structure so the catalog doesn't have to included when not needed. --- qicclient/catalog.hxx | 43 ++----------------------------------------- qicclient/client.hxx | 1 - qicclient/product.hxx | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 qicclient/product.hxx (limited to 'qicclient') diff --git a/qicclient/catalog.hxx b/qicclient/catalog.hxx index 782c864..d539149 100644 --- a/qicclient/catalog.hxx +++ b/qicclient/catalog.hxx @@ -2,56 +2,17 @@ #define QICCLIENT_CATALOG_HXX #include -#include +#include struct icclient_catalog; namespace ICClient { - class Product - { - public: - Product(icclient_product* product) : m_sku{product->sku} - { - if (product->description) - m_description - = QString{product->description}; - if (product->comment) - m_comment = QString{product->comment}; - if (product->image) - m_image = QString{product->image}; - m_price = product->price; - } - QString const& sku() const { return m_sku; } - QString const& description() const - { - return m_description; - } - QString const& comment() const { return m_comment; } - QString const& image() const { return m_image; } - double price() const { return m_price; } - - private: - QString m_sku; - QString m_description; - QString m_comment; - QString m_image; - double m_price; - }; - class Catalog : public QAbstractListModel { Q_OBJECT public: - enum ProductRoles { - SkuRole = Qt::UserRole + 1, - DescriptionRole, - CommentRole, - ImageRole, - PriceRole - }; - explicit Catalog(QObject* parent = nullptr) : QAbstractListModel{parent} {} @@ -71,8 +32,8 @@ namespace ICClient { QHash roleNames() const Q_DECL_OVERRIDE; private: - QList products; void addProduct(Product const& product); + QList products; }; } diff --git a/qicclient/client.hxx b/qicclient/client.hxx index bccd665..9af124d 100644 --- a/qicclient/client.hxx +++ b/qicclient/client.hxx @@ -2,7 +2,6 @@ #define QICCLIENT_CLIENT_HXX #include -#include struct icclient_catalog; struct icclient_order; diff --git a/qicclient/product.hxx b/qicclient/product.hxx new file mode 100644 index 0000000..7271fe9 --- /dev/null +++ b/qicclient/product.hxx @@ -0,0 +1,40 @@ +#ifndef QICCLIENT_PRODUCT_HXX +#define QICCLIENT_PRODUCT_HXX + +#include + +namespace ICClient { + + struct Product + { + enum ProductRoles { + SkuRole = Qt::UserRole + 1, + DescriptionRole, + CommentRole, + ImageRole, + PriceRole + }; + + Product(icclient_product* product) + : sku{product->sku} + , price{product->price} + { + if (product->description) + description + = QString{product->description}; + if (product->comment) + comment = QString{product->comment}; + if (product->image) + image = QString{product->image}; + } + + QString sku; + QString description; + QString comment; + QString image; + double price; + }; + +} + +#endif // QICCLIENT_PRODUCT_HXX -- cgit v1.2.3 From dde8ee442f9551f416f8033feeb657eef6be6ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 5 Oct 2019 18:10:03 +0800 Subject: Basket class --- qicclient/basket.hxx | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 qicclient/basket.hxx (limited to 'qicclient') diff --git a/qicclient/basket.hxx b/qicclient/basket.hxx new file mode 100644 index 0000000..eabec33 --- /dev/null +++ b/qicclient/basket.hxx @@ -0,0 +1,72 @@ +#ifndef QICCLIENT_BASKET_HXX +#define QICCLIENT_BASKET_HXX + +#include +#include +#include "product.hxx" + +struct icclient_ord_order; + +namespace ICClient { + + struct Item + { + enum ItemRoles { + QuantityRole = Product::PriceRole + 1 + }; + + Item(icclient_ord_item* item) + : product{item->product} + , quantity{item->quantity} + {} + + Product product; + unsigned int quantity; + }; + + class Basket : public QAbstractListModel + { + Q_OBJECT + Q_PROPERTY(double subtotal READ subtotal NOTIFY subtotalChanged) + Q_PROPERTY(double shipping READ shipping NOTIFY shippingChanged) + Q_PROPERTY(double totalCost READ totalCost NOTIFY totalCostChanged) + Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged) + + public: + explicit Basket(QObject* parent = nullptr) + : QAbstractListModel{parent} {} + + int rowCount(QModelIndex const& parent + = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex& index + , int role = Qt::DisplayRole + ) const Q_DECL_OVERRIDE; + + double subtotal() const { return m_subtotal; } + double shipping() const { return m_shipping; } + double totalCost() const { return m_totalCost; } + + public slots: + void update(icclient_ord_order* order); + + protected: + QHash roleNames() const Q_DECL_OVERRIDE; + + signals: + void updated(); + void subtotalChanged(); + void shippingChanged(); + void totalCostChanged(); + void rowCountChanged(); + + private: + void addItem(Item const& item); + QList items; + double m_subtotal; + double m_shipping; + double m_totalCost; + }; + +} + +#endif // QICCLIENT_BASKET_HXX -- cgit v1.2.3 From c2d38b094ceba47591b0524646b1e1c88e1005c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sun, 6 Oct 2019 18:23:59 +0800 Subject: Initialise basket --- qicclient/basket.hxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'qicclient') diff --git a/qicclient/basket.hxx b/qicclient/basket.hxx index eabec33..b3b5e11 100644 --- a/qicclient/basket.hxx +++ b/qicclient/basket.hxx @@ -34,7 +34,11 @@ namespace ICClient { public: explicit Basket(QObject* parent = nullptr) - : QAbstractListModel{parent} {} + : QAbstractListModel{parent} + , m_subtotal{.0} + , m_shipping{.0} + , m_totalCost{.0} + {} int rowCount(QModelIndex const& parent = QModelIndex()) const Q_DECL_OVERRIDE; -- cgit v1.2.3 From e76505f6f147736f12282912655160dd531995a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sun, 6 Oct 2019 19:06:05 +0800 Subject: Adjusted order type --- qicclient/client.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qicclient') diff --git a/qicclient/client.hxx b/qicclient/client.hxx index 9af124d..6121c5e 100644 --- a/qicclient/client.hxx +++ b/qicclient/client.hxx @@ -4,7 +4,7 @@ #include struct icclient_catalog; -struct icclient_order; +struct icclient_ord_order; namespace ICClient { @@ -52,7 +52,7 @@ namespace ICClient { signals: void gotAllProducts(icclient_catalog* catalog); - void ordered(icclient_order* order); + void ordered(icclient_ord_order* order); void loggedIn(QString const& userName); void loggedOut(); }; -- cgit v1.2.3