Added setting for default VAT type on Direct sell dialog. Fixed some compiler warnings.

shop/settings/shopsettings.cpp

@@ -17,6 +17,8 @@ ShopSettings::ShopSettings(QObject *parent) : QObject(parent)
     m_rounding = Enums::R_NONE;
     m_decimalPlaces = 0;
 
+    m_defaultVat = Enums::NONE;
+
     m_doublePrint = false;
 }
 
@@ -219,3 +221,13 @@ void ShopSettings::setDoublePrintItem(const QString &doublePrintItem)
 {
     m_doublePrintItem = doublePrintItem;
 }
+
+Enums::VatType ShopSettings::defaultVat() const
+{
+    return m_defaultVat;
+}
+
+void ShopSettings::setDefaultVat(const Enums::VatType &defaultVat)
+{
+    m_defaultVat = defaultVat;
+}

shop/settings/shopsettings.h

@@ -30,6 +30,8 @@ class ShopSettings : public QObject
     Q_PROPERTY(int decimalPlaces READ decimalPlaces WRITE setDecimalPlaces)
     Q_PROPERTY(QString roundingItem READ roundingItem WRITE setRoundingItem)
 
+    Q_PROPERTY(Enums::VatType defaultVat READ defaultVat WRITE setDefaultVat)
+
     Q_OBJECT
 public:
 
@@ -100,6 +102,9 @@ public:
     QString doublePrintItem() const;
     void setDoublePrintItem(const QString &doublePrintItem);
 
+    Enums::VatType defaultVat() const;
+    void setDefaultVat(const Enums::VatType &defaultVat);
+
 private:
     QString m_output;
     CODEPAGE m_codepage;
@@ -125,6 +130,8 @@ private:
     Enums::Rounding m_rounding;
     int m_decimalPlaces;
     QString m_roundingItem;
+
+    Enums::VatType m_defaultVat;
 };
 
 typedef QSharedPointer<ShopSettings> ShopSettingsPtr;

shop/settings/shopsettingsform.cpp

@@ -48,6 +48,14 @@ ShopSettingsForm::ShopSettingsForm(QWidget *parent) :
     registerBinding(ui->doublePrint);
     registerBinding(ui->doublePrintItem);
 
+    QList<ComboData> listVatTypes;
+    listVatTypes
+            << ComboData(Enums::NONE, tr("None"))
+            << ComboData(Enums::HIGH, tr("High"))
+            << ComboData(Enums::FIRST_LOWER, tr("First lower"))
+            << ComboData(Enums::SECOND_LOWER, tr("Second lower"));
+    registerBinding(ui->defaultVat, listVatTypes);
+
     m_itemModel = new AutoTableModel<ShopItem>();
 }
 
@@ -70,7 +78,7 @@ void ShopSettingsForm::drawButtons()
             btn->setObjectName(QString::number(i) + "_" + QString::number(j));
             btn->setAcceptDrops(true);
 
-            if (m_btnMap[btn->objectName()] != NULL)
+            if (m_btnMap[btn->objectName()] != nullptr)
             {
                 btn->setText(m_btnMap[btn->objectName()]->shortName());
             }

shop/settings/shopsettingsform.ui

@@ -317,6 +317,16 @@
           <item row="2" column="1">
            <widget class="QLineEdit" name="roundingItem"/>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_16">
+            <property name="text">
+             <string>Default VAT type</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QComboBox" name="defaultVat"/>
+          </item>
          </layout>
         </widget>
        </item>