eigen
/
pos-be
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 295 Wiki Activity

Merge pull request 'development' (#107) from development into production
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details 

Reviewed-on: #107
pull/113/head 1.1.3-production.1
irfan 2024-10-06 23:00:03 +00:00
parent 1a633cc574 e6066b534c
commit 79f3966b49
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/transaction/sales-price-formula/data/services/sales-price-formula-data.service.ts
View File

@ -38,8 +38,9 @@ export class SalesPriceFormulaDataService extends BaseDataService<SalesPriceForm
}, },
}); });
const tenantShareMargin = item?.tenant?.share_margin;
const profitShare = (item?.share_profit ?? 0) / 100; const profitShare = (item?.share_profit ?? 0) / 100;
const tenantShare = (item?.tenant?.share_margin ?? 0) / 100; const tenantShare = tenantShareMargin ? (100 - tenantShareMargin) / 100 : 0;
return { profitShare, tenantShare }; return { profitShare, tenantShare };
} }

32
src/modules/transaction/transaction/domain/usecases/handlers/pos-transaction.handler.ts
View File

@ -15,6 +15,7 @@ import { mappingRevertTransaction } from '../managers/helpers/mapping-transactio
import { apm } from '../../../../../../core/apm'; import { apm } from '../../../../../../core/apm';
import { TABLE_NAME } from 'src/core/strings/constants/table.constants'; import { TABLE_NAME } from 'src/core/strings/constants/table.constants';
import { TransactionChangeStatusEvent } from '../../entities/event/transaction-change-status.event'; import { TransactionChangeStatusEvent } from '../../entities/event/transaction-change-status.event';
import { PriceCalculator } from '../calculator/price.calculator';
@EventsHandler(ChangeDocEvent) @EventsHandler(ChangeDocEvent)
export class PosTransactionHandler implements IEventHandler<ChangeDocEvent> { export class PosTransactionHandler implements IEventHandler<ChangeDocEvent> {
@ -23,6 +24,7 @@ export class PosTransactionHandler implements IEventHandler<ChangeDocEvent> {
private taxService: TaxDataService, private taxService: TaxDataService,
private formulaService: SalesPriceFormulaDataService, private formulaService: SalesPriceFormulaDataService,
private eventBus: EventBus, private eventBus: EventBus,
private calculator: PriceCalculator,
) {} ) {}
async handle(event: ChangeDocEvent) { async handle(event: ChangeDocEvent) {
@ -71,22 +73,36 @@ export class PosTransactionHandler implements IEventHandler<ChangeDocEvent> {
// jika update // create // jika update // create
else { else {
const tax_datas = taxes?.map((tax) => { // const tax_datas = taxes?.map((tax) => {
return { // return {
tax_id: tax.id, // tax_id: tax.id,
tax_name: tax.name, // tax_name: tax.name,
tax_value: tax.value, // tax_value: tax.value,
}; // };
}); // });
mappingRevertTransaction(data, TransactionType.COUNTER); mappingRevertTransaction(data, TransactionType.COUNTER);
Object.assign(data, { Object.assign(data, {
taxes: tax_datas,
profit_share_formula: profit_formula.formula_string, profit_share_formula: profit_formula.formula_string,
sales_price_formula: sales_formula.formula_string, sales_price_formula: sales_formula.formula_string,
}); });
try {
const { dpp_value, tax_datas, other } =
await this.calculator.calculate(data);
Object.assign(data, {
taxes: tax_datas,
payment_total_dpp: dpp_value,
profit_share_formula: profit_formula.formula_string,
sales_price_formula: sales_formula.formula_string,
payment_total_share: other.total_profit_share,
payment_total_tax: other.payment_total_tax,
});
} catch (error) {
apm.captureError(error);
}
apmTransactions.setLabel('Id', data?.id); apmTransactions.setLabel('Id', data?.id);
apmTransactions.setLabel('Code', data?.code); apmTransactions.setLabel('Code', data?.code);
apmTransactions.setLabel('Status', data?.status); apmTransactions.setLabel('Status', data?.status);