diff --git a/ModuleHelpers/MT/Interfaces/intfMTAccounting.cpp b/ModuleHelpers/MT/Interfaces/intfMTAccounting.cpp new file mode 100644 index 00000000..54f905f6 --- /dev/null +++ b/ModuleHelpers/MT/Interfaces/intfMTAccounting.cpp @@ -0,0 +1,222 @@ +/****************************************************************************** +# TargomanAPI: REST API for Targoman +# +# Copyright 2014-2020 by Targoman Intelligent Processing +# +# TargomanAPI is free software: you can redistribute it and/or modify +# it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# TargomanAPI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# along with Targoman. If not, see . + ******************************************************************************/ +/** + * @author S.Mehran M.Ziabary + * @author Kambiz Zandi + */ + +#include "intfMTAccounting.h" + +namespace Targoman::API::ModuleHelpers::MT::Interfaces { + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +intfAccountUnitsI18NMT::intfAccountUnitsI18NMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountUnitsI18N( + _schema, + tblAccountUnitsI18NMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountUnitsI18NMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountUnitsI18NMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +intfAccountUnitsMT::intfAccountUnitsMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountUnits( + _schema, + tblAccountUnitsMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountUnitsMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountUnitsMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +intfAccountProductsI18NMT::intfAccountProductsI18NMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountProductsI18N( + _schema, + tblAccountProductsI18NMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountProductsI18NMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountProductsI18NMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +intfAccountProductsMT::intfAccountProductsMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountProducts( + _schema, + tblAccountProductsMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountProductsMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountProductsMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +intfAccountSaleablesI18NMT::intfAccountSaleablesI18NMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountSaleablesI18N( + _schema, + tblAccountSaleablesI18NMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountSaleablesI18NMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountSaleablesI18NMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +intfAccountSaleablesMT::intfAccountSaleablesMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountSaleables( + _schema, + tblAccountSaleablesMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountSaleablesMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountSaleablesMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +intfAccountSaleablesFilesMT::intfAccountSaleablesFilesMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountSaleablesFiles( + _schema, + tblAccountSaleablesFilesMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountSaleablesFilesMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountSaleablesFilesMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +intfAccountUserAssetsMT::intfAccountUserAssetsMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountUserAssets( + _schema, + tblAccountUserAssetsMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountUserAssetsMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountUserAssetsMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +intfAccountUserAssetsFilesMT::intfAccountUserAssetsFilesMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountUserAssetsFiles( + _schema, + tblAccountUserAssetsFilesMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountUserAssetsFilesMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountUserAssetsFilesMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +intfAccountAssetUsageMT::intfAccountAssetUsageMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountAssetUsage( + _schema, + tblAccountAssetUsageMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountAssetUsageMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountAssetUsageMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +intfAccountCouponsMT::intfAccountCouponsMT( + const QString& _schema, + const QList& _exclusiveCols, + const QList& _exclusiveRelations, + const QList& _exclusiveIndexes +) : + intfAccountCoupons( + _schema, + tblAccountCouponsMTBase::Private::ExtraORMFields + _exclusiveCols, + tblAccountCouponsMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, + tblAccountCouponsMTBase::Private::ExtraIndexes + _exclusiveIndexes + ) +{ ; } + +/******************************************************************/ +/******************************************************************/ +/******************************************************************/ +//intfAccountPrizesMT::intfAccountPrizesMT( +// const QString& _schema, +// const QList& _exclusiveCols, +// const QList& _exclusiveRelations, +// const QList& _exclusiveIndexes +//) : +// intfAccountPrizes( +// _schema, +// tblAccountPrizesMTBase::Private::ExtraORMFields + _exclusiveCols, +// tblAccountPrizesMTBase::Private::ExtraRelations(_schema) + _exclusiveRelations, +// tblAccountPrizesMTBase::Private::ExtraIndexes + _exclusiveIndexes +// ) +//{ ; } + +} //namespace Targoman::API::ModuleHelpers::MT::Interfaces diff --git a/ModuleHelpers/MT/Interfaces/intfMTAccounting.h b/ModuleHelpers/MT/Interfaces/intfMTAccounting.h new file mode 100644 index 00000000..67c43302 --- /dev/null +++ b/ModuleHelpers/MT/Interfaces/intfMTAccounting.h @@ -0,0 +1,555 @@ +/****************************************************************************** +# TargomanAPI: REST API for Targoman +# +# Copyright 2014-2020 by Targoman Intelligent Processing +# +# TargomanAPI is free software: you can redistribute it and/or modify +# it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# TargomanAPI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU AFFERO GENERAL PUBLIC LICENSE for more details. +# +# You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE +# along with Targoman. If not, see . + ******************************************************************************/ +/** + * @author S. Mehran M. Ziabary + * @author Kambiz Zandi + */ + +#ifndef TARGOMAN_API_MODULEHELPERS_MT_INTERFACES_INTFMTACCOUNTING_H +#define TARGOMAN_API_MODULEHELPERS_MT_INTERFACES_INTFMTACCOUNTING_H + +#include "Interfaces/AAA/Accounting_Defs.hpp" +#include "Interfaces/AAA/AAA.hpp" + +namespace Targoman::API::ModuleHelpers::MT::Interfaces { + +/******************************************************/ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-variable" + +namespace tblAccountUnitsMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { +// constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountUnitsMTBase_DTO \ + SF_tblAccountUnitsBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountUnitsMTBase_DTO + ); +} + +namespace tblAccountUnitsI18NMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { +// constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountUnitsI18NMTBase_DTO \ + SF_tblAccountUnitsI18NBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountUnitsI18NMTBase_DTO + ); +} + +namespace tblAccountProductsMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { +// constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountProductsMTBase_DTO \ + SF_tblAccountProductsBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountProductsMTBase_DTO + ); +} + +namespace tblAccountProductsI18NMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { +// constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountProductsI18NMTBase_DTO \ + SF_tblAccountProductsI18NBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountProductsI18NMTBase_DTO + ); +} + +namespace tblAccountSaleablesMTBase { + + namespace ExtraFields { + TARGOMAN_CREATE_CONSTEXPR(slbValidityDurationInDays); + TARGOMAN_CREATE_CONSTEXPR(slbValidityWords); + } + + namespace ExtraRelation { +// constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + //ColName Type Validation Default UpBy Sort Filter Self Virt PK + { ExtraFields::slbValidityDurationInDays, S(quint32), QFV.integer(), 0, UPOwner }, + { ExtraFields::slbValidityWords, S(quint32), QFV.integer(), 0, UPOwner }, + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountSaleablesMTBase_DTO \ + SF_tblAccountSaleablesBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountSaleablesMTBase_DTO, + + SF_quint32 (slbValidityDurationInDays), + SF_quint32 (slbValidityWords) + ); +} + +namespace tblAccountSaleablesI18NMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { +// constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountSaleablesI18NMTBase_DTO \ + SF_tblAccountSaleablesI18NBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountSaleablesI18NMTBase_DTO + ); +} + +namespace tblAccountSaleablesFilesMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountSaleablesFilesMTBase_DTO \ + SF_tblAccountSaleablesFilesBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountSaleablesFilesMTBase_DTO + ); +} + +namespace tblAccountUserAssetsMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { + // constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + //ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountUserAssetsMTBase_DTO \ + SF_tblAccountUserAssetsBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountUserAssetsMTBase_DTO + ); +} + +namespace tblAccountUserAssetsFilesMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { + } + + namespace Private { + const QList ExtraORMFields = { + //ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountUserAssetsFilesMTBase_DTO \ + SF_tblAccountUserAssetsFilesBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountUserAssetsFilesMTBase_DTO + ); +} + +namespace tblAccountAssetUsageMTBase { + + namespace ExtraFields { + //usgRemainingDays + } + + namespace ExtraRelation { + // constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + //ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountAssetUsageMTBase_DTO \ + SF_tblAccountAssetUsageBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountAssetUsageMTBase_DTO + ); +} + +namespace tblAccountCouponsMTBase { + + namespace ExtraFields { + } + + namespace ExtraRelation { + // constexpr char AAA[] = "aaa"; + } + + namespace Private { + const QList ExtraORMFields = { + ///ColName Type Validation Default UpBy Sort Filter Self Virt PK + }; + + inline const QList ExtraRelations(Q_DECL_UNUSED const QString& _schema) { + ///Col Reference Table ForeignCol Rename LeftJoin + return { }; + }; + + const QList ExtraIndexes = { + }; + + } //namespace Private + +#define SF_tblAccountCouponsMTBase_DTO \ + SF_tblAccountCouponsBase_DTO + + TAPI_DEFINE_STRUCT(DTO, + SF_tblAccountCouponsMTBase_DTO + ); +} + +#pragma GCC diagnostic pop + +/******************************************************/ +/******************************************************/ +/******************************************************/ +class intfAccountUnitsMT : public intfAccountUnits +{ + Q_OBJECT + +public: + intfAccountUnitsMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +class intfAccountUnitsI18NMT : public intfAccountUnitsI18N +{ + Q_OBJECT + +public: + intfAccountUnitsI18NMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +/******************************************************/ +/******************************************************/ +class intfAccountProductsMT : public intfAccountProducts +{ + Q_OBJECT + +public: + intfAccountProductsMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +class intfAccountProductsI18NMT : public intfAccountProductsI18N +{ + Q_OBJECT + +public: + intfAccountProductsI18NMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +/******************************************************/ +/******************************************************/ +class intfAccountSaleablesMT : public intfAccountSaleables +{ + Q_OBJECT + +public: + intfAccountSaleablesMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +class intfAccountSaleablesI18NMT : public intfAccountSaleablesI18N +{ + Q_OBJECT + +public: + intfAccountSaleablesI18NMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +class intfAccountSaleablesFilesMT : public intfAccountSaleablesFiles +{ + Q_OBJECT + +public: + intfAccountSaleablesFilesMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +/******************************************************/ +/******************************************************/ +class intfAccountUserAssetsMT : public intfAccountUserAssets +{ + Q_OBJECT + +public: + intfAccountUserAssetsMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +class intfAccountUserAssetsFilesMT : public intfAccountUserAssetsFiles +{ + Q_OBJECT + +public: + intfAccountUserAssetsFilesMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +/******************************************************/ +/******************************************************/ +class intfAccountAssetUsageMT : public intfAccountAssetUsage +{ + Q_OBJECT + +public: + intfAccountAssetUsageMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +/******************************************************/ +/******************************************************/ +class intfAccountCouponsMT : public intfAccountCoupons +{ + Q_OBJECT + +public: + intfAccountCouponsMT(const QString& _schema, + const QList& _exclusiveCols = {}, + const QList& _exclusiveRelations = {}, + const QList& _exclusiveIndexes = {}); +}; + +/******************************************************/ +/******************************************************/ +/******************************************************/ +//There is no Prize in this module +/*class intfAccountPrizesMT : public intfAccountPrizes +{ + Q_OBJECT + +public: + intfAccountPrizesMT(); +}; +*/ + +} //namespace Targoman::API::ModuleHelpers::MT::Interfaces + +#endif // TARGOMAN_API_MODULEHELPERS_MT_INTERFACES_INTFMTACCOUNTING_H diff --git a/ModuleHelpers/MT/MT.pro b/ModuleHelpers/MT/MT.pro index 8ddc0e52..65dcdd59 100644 --- a/ModuleHelpers/MT/MT.pro +++ b/ModuleHelpers/MT/MT.pro @@ -14,6 +14,7 @@ PRIVATE_HEADERS += \ HEADERS += \ Classes/clsDerivedHelperSubmodules.h \ + Interfaces/intfMTAccounting.h \ Interfaces/intfMTHelpers.h \ MTHelper.h \ MTDefs.hpp \ @@ -36,6 +37,7 @@ HEADERS += \ # $$BASE_PROJECT_PATH/3rdParty/E4MT/src/clsFormalityChecker.cpp \ SOURCES += \ Classes/clsDerivedHelperSubmodules.cpp \ + Interfaces/intfMTAccounting.cpp \ Interfaces/intfMTHelpers.cpp \ MTHelper.cpp \ Classes/clsEngine.cpp \ diff --git a/ModuleHelpers/MT/migrations/applytomodules/db/m20220918_165445_Helpers_MT_add_slbValidity_fields.sql b/ModuleHelpers/MT/migrations/applytomodules/db/m20220918_165445_Helpers_MT_add_slbValidity_fields.sql new file mode 100644 index 00000000..547579f1 --- /dev/null +++ b/ModuleHelpers/MT/migrations/applytomodules/db/m20220918_165445_Helpers_MT_add_slbValidity_fields.sql @@ -0,0 +1,8 @@ +/* Migration File: m20220918_165445_Helpers_MT_add_slbValidity_fields.sql */ +/* CAUTION: don't forget to use {{dbprefix}} for schemas */ + +USE `{{dbprefix}}{{Schema}}`; + +ALTER TABLE `tblAccountSaleables` + ADD COLUMN `slbValidityDurationInDays` INT UNSIGNED NOT NULL DEFAULT 0 AFTER `slbUpdatedBy_usrID`, + ADD COLUMN `slbValidityWords` INT UNSIGNED NOT NULL DEFAULT 0 AFTER `slbValidityDurationInDays`; diff --git a/Modules/MT/functionalTest/testMT.hpp b/Modules/MT/functionalTest/testMT.hpp index 431d9891..443654c5 100644 --- a/Modules/MT/functionalTest/testMT.hpp +++ b/Modules/MT/functionalTest/testMT.hpp @@ -223,6 +223,17 @@ private slots: } } + void Saleable_all() { + QT_TRY { + this->MTSaleableID = callAdminAPI( + RESTClientHelper::GET, + "MT/AccountSaleables" + ); + } QT_CATCH (const std::exception &exp) { + QTest::qFail(exp.what(), __FILE__, __LINE__); + } + } + void request_apitoken() { QT_TRY { QVariant Result = this->callUserAPI( diff --git a/Modules/MT/moduleSrc/ORM/Accounting.cpp b/Modules/MT/moduleSrc/ORM/Accounting.cpp index 90444572..6de95bdf 100644 --- a/Modules/MT/moduleSrc/ORM/Accounting.cpp +++ b/Modules/MT/moduleSrc/ORM/Accounting.cpp @@ -34,8 +34,7 @@ namespace Targoman::API::MTModule::ORM { TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountUnits) AccountUnits::AccountUnits() : - intfAccountUnits( -// true, + intfAccountUnitsMT( MTSchema, tblAccountUnits::Private::ExtraORMFields, tblAccountUnits::Private::ExtraRelations, @@ -48,8 +47,7 @@ AccountUnits::AccountUnits() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountUnitsI18N) AccountUnitsI18N::AccountUnitsI18N() : - intfAccountUnitsI18N( -// true, + intfAccountUnitsI18NMT( MTSchema, tblAccountUnitsI18N::Private::ExtraORMFields, tblAccountUnitsI18N::Private::ExtraRelations, @@ -62,8 +60,7 @@ AccountUnitsI18N::AccountUnitsI18N() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountProducts) AccountProducts::AccountProducts() : - intfAccountProducts( -// true, + intfAccountProductsMT( MTSchema, tblAccountProducts::Private::ExtraORMFields, tblAccountProducts::Private::ExtraRelations, @@ -76,8 +73,7 @@ AccountProducts::AccountProducts() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountProductsI18N) AccountProductsI18N::AccountProductsI18N() : - intfAccountProductsI18N( -// true, + intfAccountProductsI18NMT( MTSchema, tblAccountProductsI18N::Private::ExtraORMFields, tblAccountProductsI18N::Private::ExtraRelations, @@ -90,8 +86,7 @@ AccountProductsI18N::AccountProductsI18N() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountSaleables) AccountSaleables::AccountSaleables() : - intfAccountSaleables( -// true, + intfAccountSaleablesMT( MTSchema, tblAccountSaleables::Private::ExtraORMFields, tblAccountSaleables::Private::ExtraRelations, @@ -104,8 +99,7 @@ AccountSaleables::AccountSaleables() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountSaleablesI18N) AccountSaleablesI18N::AccountSaleablesI18N() : - intfAccountSaleablesI18N( -// true, + intfAccountSaleablesI18NMT( MTSchema, tblAccountSaleablesI18N::Private::ExtraORMFields, tblAccountSaleablesI18N::Private::ExtraRelations, @@ -116,8 +110,7 @@ AccountSaleablesI18N::AccountSaleablesI18N() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountSaleablesFiles) AccountSaleablesFiles::AccountSaleablesFiles() : - intfAccountSaleablesFiles( -// true, + intfAccountSaleablesFilesMT( MTSchema, tblAccountSaleablesFiles::Private::ExtraORMFields, tblAccountSaleablesFiles::Private::ExtraRelations, @@ -130,8 +123,7 @@ AccountSaleablesFiles::AccountSaleablesFiles() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountUserAssets) AccountUserAssets::AccountUserAssets() : - intfAccountUserAssets( -// true, + intfAccountUserAssetsMT( MTSchema, tblAccountUserAssets::Private::ExtraORMFields, tblAccountUserAssets::Private::ExtraRelations, @@ -142,8 +134,7 @@ AccountUserAssets::AccountUserAssets() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountUserAssetsFiles) AccountUserAssetsFiles::AccountUserAssetsFiles() : - intfAccountUserAssetsFiles( -// true, + intfAccountUserAssetsFilesMT( MTSchema, tblAccountUserAssetsFiles::Private::ExtraORMFields, tblAccountUserAssetsFiles::Private::ExtraRelations, @@ -156,8 +147,7 @@ AccountUserAssetsFiles::AccountUserAssetsFiles() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountAssetUsage) AccountAssetUsage::AccountAssetUsage() : - intfAccountAssetUsage( -// true, + intfAccountAssetUsageMT( MTSchema, tblAccountAssetUsage::Private::ExtraORMFields, tblAccountAssetUsage::Private::ExtraRelations, @@ -170,8 +160,7 @@ AccountAssetUsage::AccountAssetUsage() : TARGOMAN_API_SUBMODULE_IMPLEMENT(MT, AccountCoupons) AccountCoupons::AccountCoupons() : - intfAccountCoupons( -// true, + intfAccountCouponsMT( MTSchema, tblAccountCoupons::Private::ExtraORMFields, tblAccountCoupons::Private::ExtraRelations, diff --git a/Modules/MT/moduleSrc/ORM/Accounting.h b/Modules/MT/moduleSrc/ORM/Accounting.h index d56117f1..7a5b4108 100644 --- a/Modules/MT/moduleSrc/ORM/Accounting.h +++ b/Modules/MT/moduleSrc/ORM/Accounting.h @@ -24,10 +24,13 @@ #ifndef TARGOMAN_API_MODULES_MT_ORM_ACCOUNTING_H #define TARGOMAN_API_MODULES_MT_ORM_ACCOUNTING_H -#include "Interfaces/AAA/Accounting_Defs.hpp" -#include "Interfaces/AAA/AAA.hpp" +#include "ModuleHelpers/MT/Interfaces/intfMTAccounting.h" +//#include "Interfaces/AAA/Accounting_Defs.hpp" +//#include "Interfaces/AAA/AAA.hpp" #include "../MTDefs.hpp" +using namespace Targoman::API::ModuleHelpers::MT::Interfaces; + namespace Targoman::API::MTModule { //structures and enumes goes here @@ -64,7 +67,7 @@ namespace tblAccountUnits { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountUnitsBase_DTO + SF_tblAccountUnitsMTBase_DTO ); } @@ -92,7 +95,7 @@ namespace tblAccountUnitsI18N { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountUnitsI18NBase_DTO + SF_tblAccountUnitsI18NMTBase_DTO ); } @@ -120,7 +123,7 @@ namespace tblAccountProducts { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountProductsBase_DTO + SF_tblAccountProductsMTBase_DTO ); } @@ -148,7 +151,7 @@ namespace tblAccountProductsI18N { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountProductsI18NBase_DTO + SF_tblAccountProductsI18NMTBase_DTO ); } @@ -175,7 +178,7 @@ namespace tblAccountSaleables { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountSaleablesBase_DTO + SF_tblAccountSaleablesMTBase_DTO ); } @@ -203,7 +206,7 @@ namespace tblAccountSaleablesI18N { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountSaleablesI18NBase_DTO + SF_tblAccountSaleablesI18NMTBase_DTO ); } @@ -229,7 +232,7 @@ namespace tblAccountSaleablesFiles { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountSaleablesFilesBase_DTO + SF_tblAccountSaleablesFilesMTBase_DTO ); } @@ -256,7 +259,7 @@ namespace tblAccountUserAssets { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountUserAssetsBase_DTO + SF_tblAccountUserAssetsMTBase_DTO ); } @@ -282,7 +285,7 @@ namespace tblAccountUserAssetsFiles { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountUserAssetsFilesBase_DTO + SF_tblAccountUserAssetsFilesMTBase_DTO ); } @@ -310,7 +313,7 @@ namespace tblAccountAssetUsage { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountAssetUsageBase_DTO + SF_tblAccountAssetUsageMTBase_DTO ); } @@ -337,7 +340,7 @@ namespace tblAccountCoupons { } //namespace Private TAPI_DEFINE_STRUCT(DTO, - SF_tblAccountCouponsBase_DTO + SF_tblAccountCouponsMTBase_DTO ); } @@ -346,17 +349,17 @@ namespace tblAccountCoupons { /******************************************************/ /******************************************************/ /******************************************************/ -class AccountUnits : public intfAccountUnits +class AccountUnits : public intfAccountUnitsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountUnits) protected: - QScopedPointer AccountUnitsI18N; + QScopedPointer AccountUnitsI18N; }; /******************************************************/ -class AccountUnitsI18N : public intfAccountUnitsI18N +class AccountUnitsI18N : public intfAccountUnitsI18NMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountUnitsI18N) @@ -367,17 +370,17 @@ class AccountUnitsI18N : public intfAccountUnitsI18N /******************************************************/ /******************************************************/ /******************************************************/ -class AccountProducts : public intfAccountProducts +class AccountProducts : public intfAccountProductsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountProducts) protected: - QScopedPointer AccountProductsI18N; + QScopedPointer AccountProductsI18N; }; /******************************************************/ -class AccountProductsI18N : public intfAccountProductsI18N +class AccountProductsI18N : public intfAccountProductsI18NMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountProductsI18N) @@ -388,17 +391,17 @@ class AccountProductsI18N : public intfAccountProductsI18N /******************************************************/ /******************************************************/ /******************************************************/ -class AccountSaleables : public intfAccountSaleables +class AccountSaleables : public intfAccountSaleablesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountSaleables) protected: - QScopedPointer AccountSaleablesI18N; + QScopedPointer AccountSaleablesI18N; }; /******************************************************/ -class AccountSaleablesI18N : public intfAccountSaleablesI18N +class AccountSaleablesI18N : public intfAccountSaleablesI18NMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountSaleablesI18N) @@ -407,7 +410,7 @@ class AccountSaleablesI18N : public intfAccountSaleablesI18N }; /******************************************************/ -class AccountSaleablesFiles : public intfAccountSaleablesFiles +class AccountSaleablesFiles : public intfAccountSaleablesFilesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountSaleablesFiles) @@ -416,7 +419,7 @@ class AccountSaleablesFiles : public intfAccountSaleablesFiles /******************************************************/ /******************************************************/ /******************************************************/ -class AccountUserAssets : public intfAccountUserAssets +class AccountUserAssets : public intfAccountUserAssetsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountUserAssets) @@ -425,7 +428,7 @@ class AccountUserAssets : public intfAccountUserAssets }; /******************************************************/ -class AccountUserAssetsFiles : public intfAccountUserAssetsFiles +class AccountUserAssetsFiles : public intfAccountUserAssetsFilesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountUserAssetsFiles) @@ -436,7 +439,7 @@ class AccountUserAssetsFiles : public intfAccountUserAssetsFiles /******************************************************/ /******************************************************/ /******************************************************/ -class AccountAssetUsage : public intfAccountAssetUsage +class AccountAssetUsage : public intfAccountAssetUsageMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountAssetUsage) @@ -447,7 +450,7 @@ class AccountAssetUsage : public intfAccountAssetUsage /******************************************************/ /******************************************************/ /******************************************************/ -class AccountCoupons : public intfAccountCoupons +class AccountCoupons : public intfAccountCouponsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT, AccountCoupons) @@ -459,7 +462,7 @@ class AccountCoupons : public intfAccountCoupons /******************************************************/ /******************************************************/ //There is no Prize in this module -/*class clsAccountPrizes: public Accounting::intfAccountPrizes +/*class AccountPrizes : public intfAccountPrizesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(MT,clsAccountPrizes) diff --git a/Modules/TargomanMT/moduleSrc/ORM/Accounting.cpp b/Modules/TargomanMT/moduleSrc/ORM/Accounting.cpp index 32ef8163..af2d8c14 100644 --- a/Modules/TargomanMT/moduleSrc/ORM/Accounting.cpp +++ b/Modules/TargomanMT/moduleSrc/ORM/Accounting.cpp @@ -34,7 +34,7 @@ namespace Targoman::API::TargomanMTModule::ORM { TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountUnits) AccountUnits::AccountUnits() : - intfAccountUnits( + intfAccountUnitsMT( // false, TargomanMTSchema, tblAccountUnits::Private::ExtraORMFields, @@ -48,7 +48,7 @@ AccountUnits::AccountUnits() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountUnitsI18N) AccountUnitsI18N::AccountUnitsI18N() : - intfAccountUnitsI18N( + intfAccountUnitsI18NMT( // false, TargomanMTSchema, tblAccountUnitsI18N::Private::ExtraORMFields, @@ -62,7 +62,7 @@ AccountUnitsI18N::AccountUnitsI18N() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountProducts) AccountProducts::AccountProducts() : - intfAccountProducts( + intfAccountProductsMT( // false, TargomanMTSchema, tblAccountProducts::Private::ExtraORMFields, @@ -76,7 +76,7 @@ AccountProducts::AccountProducts() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountProductsI18N) AccountProductsI18N::AccountProductsI18N() : - intfAccountProductsI18N( + intfAccountProductsI18NMT( // false, TargomanMTSchema, tblAccountProductsI18N::Private::ExtraORMFields, @@ -90,7 +90,7 @@ AccountProductsI18N::AccountProductsI18N() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountSaleables) AccountSaleables::AccountSaleables() : - intfAccountSaleables( + intfAccountSaleablesMT( // false, TargomanMTSchema, tblAccountSaleables::Private::ExtraORMFields, @@ -104,7 +104,7 @@ AccountSaleables::AccountSaleables() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountSaleablesI18N) AccountSaleablesI18N::AccountSaleablesI18N() : - intfAccountSaleablesI18N( + intfAccountSaleablesI18NMT( // false, TargomanMTSchema, tblAccountSaleablesI18N::Private::ExtraORMFields, @@ -116,7 +116,7 @@ AccountSaleablesI18N::AccountSaleablesI18N() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountSaleablesFiles) AccountSaleablesFiles::AccountSaleablesFiles() : - intfAccountSaleablesFiles( + intfAccountSaleablesFilesMT( // false, TargomanMTSchema, tblAccountSaleablesFiles::Private::ExtraORMFields, @@ -130,7 +130,7 @@ AccountSaleablesFiles::AccountSaleablesFiles() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountUserAssets) AccountUserAssets::AccountUserAssets() : - intfAccountUserAssets( + intfAccountUserAssetsMT( // false, TargomanMTSchema, tblAccountUserAssets::Private::ExtraORMFields, @@ -142,7 +142,7 @@ AccountUserAssets::AccountUserAssets() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountUserAssetsFiles) AccountUserAssetsFiles::AccountUserAssetsFiles() : - intfAccountUserAssetsFiles( + intfAccountUserAssetsFilesMT( // false, TargomanMTSchema, tblAccountUserAssetsFiles::Private::ExtraORMFields, @@ -156,7 +156,7 @@ AccountUserAssetsFiles::AccountUserAssetsFiles() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountAssetUsage) AccountAssetUsage::AccountAssetUsage() : - intfAccountAssetUsage( + intfAccountAssetUsageMT( // false, TargomanMTSchema, tblAccountAssetUsage::Private::ExtraORMFields, @@ -170,7 +170,7 @@ AccountAssetUsage::AccountAssetUsage() : TARGOMAN_API_SUBMODULE_IMPLEMENT(TargomanMT, AccountCoupons) AccountCoupons::AccountCoupons() : - intfAccountCoupons( + intfAccountCouponsMT( // false, TargomanMTSchema, tblAccountCoupons::Private::ExtraORMFields, diff --git a/Modules/TargomanMT/moduleSrc/ORM/Accounting.h b/Modules/TargomanMT/moduleSrc/ORM/Accounting.h index de99d0ce..505da1d9 100644 --- a/Modules/TargomanMT/moduleSrc/ORM/Accounting.h +++ b/Modules/TargomanMT/moduleSrc/ORM/Accounting.h @@ -24,10 +24,13 @@ #ifndef TARGOMAN_API_MODULES_TARGOMANMT_ORM_ACCOUNTING_H #define TARGOMAN_API_MODULES_TARGOMANMT_ORM_ACCOUNTING_H -#include "Interfaces/AAA/Accounting_Defs.hpp" -#include "Interfaces/AAA/AAA.hpp" +#include "ModuleHelpers/MT/Interfaces/intfMTAccounting.h" +//#include "Interfaces/AAA/Accounting_Defs.hpp" +//#include "Interfaces/AAA/AAA.hpp" #include "../TargomanMTDefs.hpp" +using namespace Targoman::API::ModuleHelpers::MT::Interfaces; + namespace Targoman::API::TargomanMTModule { //structures and enumes goes here @@ -346,17 +349,17 @@ namespace tblAccountCoupons { /******************************************************/ /******************************************************/ /******************************************************/ -class AccountUnits : public intfAccountUnits +class AccountUnits : public intfAccountUnitsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountUnits) protected: - QScopedPointer AccountUnitsI18N; + QScopedPointer AccountUnitsI18N; }; /******************************************************/ -class AccountUnitsI18N : public intfAccountUnitsI18N +class AccountUnitsI18N : public intfAccountUnitsI18NMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountUnitsI18N) @@ -367,17 +370,17 @@ class AccountUnitsI18N : public intfAccountUnitsI18N /******************************************************/ /******************************************************/ /******************************************************/ -class AccountProducts : public intfAccountProducts +class AccountProducts : public intfAccountProductsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountProducts) protected: - QScopedPointer AccountProductsI18N; + QScopedPointer AccountProductsI18N; }; /******************************************************/ -class AccountProductsI18N : public intfAccountProductsI18N +class AccountProductsI18N : public intfAccountProductsI18NMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountProductsI18N) @@ -388,17 +391,17 @@ class AccountProductsI18N : public intfAccountProductsI18N /******************************************************/ /******************************************************/ /******************************************************/ -class AccountSaleables : public intfAccountSaleables +class AccountSaleables : public intfAccountSaleablesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountSaleables) protected: - QScopedPointer AccountSaleablesI18N; + QScopedPointer AccountSaleablesI18N; }; /******************************************************/ -class AccountSaleablesI18N : public intfAccountSaleablesI18N +class AccountSaleablesI18N : public intfAccountSaleablesI18NMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountSaleablesI18N) @@ -407,7 +410,7 @@ class AccountSaleablesI18N : public intfAccountSaleablesI18N }; /******************************************************/ -class AccountSaleablesFiles : public intfAccountSaleablesFiles +class AccountSaleablesFiles : public intfAccountSaleablesFilesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountSaleablesFiles) @@ -416,7 +419,7 @@ class AccountSaleablesFiles : public intfAccountSaleablesFiles /******************************************************/ /******************************************************/ /******************************************************/ -class AccountUserAssets : public intfAccountUserAssets +class AccountUserAssets : public intfAccountUserAssetsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountUserAssets) @@ -425,7 +428,7 @@ class AccountUserAssets : public intfAccountUserAssets }; /******************************************************/ -class AccountUserAssetsFiles : public intfAccountUserAssetsFiles +class AccountUserAssetsFiles : public intfAccountUserAssetsFilesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountUserAssetsFiles) @@ -436,7 +439,7 @@ class AccountUserAssetsFiles : public intfAccountUserAssetsFiles /******************************************************/ /******************************************************/ /******************************************************/ -class AccountAssetUsage : public intfAccountAssetUsage +class AccountAssetUsage : public intfAccountAssetUsageMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountAssetUsage) @@ -447,7 +450,7 @@ class AccountAssetUsage : public intfAccountAssetUsage /******************************************************/ /******************************************************/ /******************************************************/ -class AccountCoupons : public intfAccountCoupons +class AccountCoupons : public intfAccountCouponsMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(TargomanMT, AccountCoupons) @@ -459,7 +462,7 @@ class AccountCoupons : public intfAccountCoupons /******************************************************/ /******************************************************/ //There is no Prize in this module -/*class clsAccountPrizes: public Accounting::intfAccountPrizes +/*class AccountPrizes : public intfAccountPrizesMT { Q_OBJECT TARGOMAN_API_SUBMODULE_DEFINE(Targoman,clsAccountPrizes)