Skip to content

Change finalize basket logic #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kambizzandi merged 8 commits into from
Jul 4, 2022
Merged

Change finalize basket logic #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2cdff8d
working on freezing wallet
kambizzandi Jun 26, 2022
c24741b
payment gateway type max amount
kambizzandi Jun 27, 2022
d134b48
freeze wallet completed
kambizzandi Jun 30, 2022
ebadf1d
freeze and unfreeze completed
kambizzandi Jul 1, 2022
9bf4e72
max amount added to available gtw types
kambizzandi Jul 2, 2022
dfc60b5
working on approve online payment
kambizzandi Jul 2, 2022
ce086d1
finalize and approveonline finished
kambizzandi Jul 4, 2022
b1cc497
migration file created for change finalize logic
kambizzandi Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Interfaces/AAA/Accounting_Defs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,16 @@ namespace Targoman::API::AAA {

TARGOMAN_DEFINE_ENUM(enuVoucherType,
Withdrawal = 'W',
Expense = 'E',
Invoice = 'E', //Expense -> Invoice
Income = 'I',
Credit = 'C',
Debit = 'D',
Prize = 'Z',
TransferFrom = 'F',
TransferTo = 'T',

Freeze = 'R', //freeze wallet
UnFreeze = 'U', //unfreeze wallet
)

TARGOMAN_DEFINE_ENUM(enuVoucherStatus,
Expand All @@ -57,8 +61,8 @@ TARGOMAN_DEFINE_ENUM(enuVoucherStatus,
);

TARGOMAN_DEFINE_ENUM(enuDiscountType,
Percent = '%',
Currency = '$',
Percent = '%',
Currency = '$',
);

TARGOMAN_DEFINE_ENUM(enuVoucherItemProcessStatus,
Expand All @@ -82,6 +86,8 @@ extern Targoman::Common::Configuration::tmplConfigurable<QString> Secret;
extern QByteArray voucherSign(const QByteArray& _data);

constexpr char VOUCHER_ITEM_NAME_INC_WALLET[] = "INC_WALLET";
constexpr char VOUCHER_ITEM_NAME_COD_CREDIT[] = "COD_CREDIT";
constexpr char VOUCHER_ITEM_NAME_COD_DEBIT[] = "COD_DEBIT";
//constexpr char PENDING_VOUCHER_NAME_COUPON_DISCOUNT[] = "COUPON_DISCOUNT";
constexpr char PENDING_VOUCHER_NAME_REFERRER_PRIZE[] = "REFERRER_PRIZE";

Expand Down Expand Up @@ -851,14 +857,18 @@ TAPI_DEFINE_STRUCT(stuPreVoucher,
SF_QString (Summary),
SF_quint16 (Round),
SF_quint32 (ToPay, 0, v>0),
SF_quint64 (VoucherID),
SF_QString (Sign)
);

TAPI_DEFINE_STRUCT(stuVoucher,
SF_quint64 (ID, 0, v>0),
SF_Struct (Info, stuPreVoucher, v.ToPay),
// SF_Struct (PreVoucher, stuPreVoucher, v.ToPay),
SF_QString (PaymentLink),
SF_QString (PaymentKey),
SF_quint32 (Payed),
SF_quint32 (Remained),
SF_Enum (Status, enuVoucherStatus, enuVoucherStatus::New)
);

Expand Down
14 changes: 7 additions & 7 deletions Interfaces/AAA/intfAccountingBasedModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,15 +388,15 @@ Targoman::API::AAA::stuPreVoucher IMPL_REST_POST(intfAccountingBasedModule, addT
// .andWhere({ tblAccountUserAssetsBase::Fields::uasVoucherItemUUID, enuConditionOperator::Equal, it->UUID })
.one();

tblAccountUserAssetsBase::DTO AccountUserAssetsBase;
AccountUserAssetsBase.fromJson(QJsonObject::fromVariantMap(UserAssetInfo));
tblAccountUserAssetsBase::DTO AccountUserAssetsBaseDTO;
AccountUserAssetsBaseDTO.fromJson(QJsonObject::fromVariantMap(UserAssetInfo));

tblAccountSaleablesBase::DTO AccountSaleablesBase;
AccountSaleablesBase.fromJson(QJsonObject::fromVariantMap(UserAssetInfo));
tblAccountSaleablesBase::DTO AccountSaleablesBaseDTO;
AccountSaleablesBaseDTO.fromJson(QJsonObject::fromVariantMap(UserAssetInfo));

if ((AccountSaleablesBase.slbCode != _saleableCode)
|| (AccountUserAssetsBase.uas_usrID != CurrentUserID)
|| (AccountUserAssetsBase.uasVoucherItemUUID != it->UUID)
if ((AccountSaleablesBaseDTO.slbCode != _saleableCode)
|| (AccountUserAssetsBaseDTO.uas_usrID != CurrentUserID)
|| (AccountUserAssetsBaseDTO.uasVoucherItemUUID != it->UUID)
)
continue;

Expand Down
Loading