470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further clean up of paying to trader code inside payMoney()

Browse Source
This commit is contained in:
Dev 2024-11-01 13:41:16 +00:00
parent fb32466c76
commit 8e3ee3f30e
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
project/src/services/PaymentService.ts
View File

@ -47,6 +47,7 @@ export class PaymentService {
): void { ): void {
// May need to convert to trader currency // May need to convert to trader currency
const trader = this.traderHelper.getTrader(request.tid, sessionID); const trader = this.traderHelper.getTrader(request.tid, sessionID);
const payToTrader = this.traderHelper.traderEnumHasValue(request.tid);
// Track the amounts of each type of currency involved in the trade. // Track the amounts of each type of currency involved in the trade.
const currencyAmounts: { [key: string]: number } = {}; const currencyAmounts: { [key: string]: number } = {};
@ -95,21 +96,21 @@ export class PaymentService {
return; return;
} }
// Convert the amount to the trader's currency and update the sales sum. if (payToTrader) {
const costOfPurchaseInCurrency = this.handbookHelper.fromRUB( // Convert the amount to the trader's currency and update the sales sum.
this.handbookHelper.inRUB(currencyAmount, currencyTpl), const costOfPurchaseInCurrency = this.handbookHelper.fromRUB(
this.paymentHelper.getCurrency(trader.currency), this.handbookHelper.inRUB(currencyAmount, currencyTpl),
); this.paymentHelper.getCurrency(trader.currency),
);
// Only update traders // Only update traders
if (this.traderHelper.traderEnumHasValue(request.tid)) {
pmcData.TradersInfo[request.tid].salesSum += costOfPurchaseInCurrency; pmcData.TradersInfo[request.tid].salesSum += costOfPurchaseInCurrency;
} }
} }
} }
// If no currency-based payment is involved, handle it separately // If no currency-based payment is involved, handle it separately
if (totalCurrencyAmount === 0) { if (totalCurrencyAmount === 0 && payToTrader) {
this.logger.debug(this.localisationService.getText("payment-zero_price_no_payment")); this.logger.debug(this.localisationService.getText("payment-zero_price_no_payment"));
// Convert the handbook price to the trader's currency and update the sales sum. // Convert the handbook price to the trader's currency and update the sales sum.
@ -117,10 +118,11 @@ export class PaymentService {
this.getTraderItemHandbookPriceRouble(request.item_id, request.tid), this.getTraderItemHandbookPriceRouble(request.item_id, request.tid),
this.paymentHelper.getCurrency(trader.currency), this.paymentHelper.getCurrency(trader.currency),
); );
pmcData.TradersInfo[request.tid].salesSum += costOfPurchaseInCurrency; pmcData.TradersInfo[request.tid].salesSum += costOfPurchaseInCurrency;
} }
if (this.traderHelper.traderEnumHasValue(request.tid)) { if (payToTrader) {
this.traderHelper.lvlUp(request.tid, pmcData); this.traderHelper.lvlUp(request.tid, pmcData);
} }