update migrations and create base migration. set discount and tax to sale invoices
This commit is contained in:
@@ -159,20 +159,30 @@ export class NamaProviderCommonBodyDto {
|
||||
@ApiProperty({
|
||||
description: ' اجرت ساخت (طلا)',
|
||||
})
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
consfee: string
|
||||
consfee?: string
|
||||
|
||||
@ApiProperty({
|
||||
description: 'حق العمل',
|
||||
})
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
bros: string
|
||||
bros?: string
|
||||
|
||||
@ApiProperty({
|
||||
description: 'سود فروشنده',
|
||||
})
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
spro: string
|
||||
spro?: string
|
||||
|
||||
@ApiProperty({
|
||||
description: 'مجموع سود، حقالعمل و اجرت',
|
||||
})
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
tcpbs?: string
|
||||
}
|
||||
|
||||
export class NamaProviderApiErrorItemDto {
|
||||
|
||||
@@ -110,6 +110,10 @@ export class NamaProviderSwitchAdapter implements IProviderSwitchAdapter {
|
||||
|
||||
return result
|
||||
} catch (err) {
|
||||
console.log('err@@@@@@@@@@@@@@@@@@', err);
|
||||
console.log(JSON.parse(JSON.stringify(mappedRequest)));
|
||||
|
||||
|
||||
const failure: TspProviderOriginalResponseDto = {
|
||||
invoice_id: payload.id,
|
||||
provider_request_payload: JSON.parse(JSON.stringify(mappedRequest)),
|
||||
|
||||
@@ -12,10 +12,11 @@ import {
|
||||
PaymentInfoDto,
|
||||
TspProviderCorrectionSendPayloadDto,
|
||||
TspProviderOriginalSendPayloadDto,
|
||||
TspProviderRevokePayloadDto,
|
||||
TspProviderRevokePayloadDto
|
||||
} from '../../dto'
|
||||
import {
|
||||
NamaProviderCorrectionRequestDto,
|
||||
NamaProviderOriginalBodyItemDto,
|
||||
NamaProviderOriginalRequestDto,
|
||||
NamaProviderPaymentInfoDto,
|
||||
NamaProviderResponseStatus,
|
||||
@@ -62,18 +63,35 @@ export class NamaProviderUtils {
|
||||
),
|
||||
...this.mapCustomerInfo(payload.customer),
|
||||
},
|
||||
body: payload.items.map(item => ({
|
||||
sstid: item.sku,
|
||||
vra: item.sku_vat,
|
||||
// sstt: item.unit_type,
|
||||
fee: String(item.unit_price),
|
||||
dis: String(item.discount),
|
||||
mu: item.measure_unit,
|
||||
am: String(item.quantity),
|
||||
consfee: '0',
|
||||
bros: '0',
|
||||
spro: '0',
|
||||
})),
|
||||
body: payload.items.map(item => {
|
||||
let data: NamaProviderOriginalBodyItemDto = {
|
||||
sstid: item.sku,
|
||||
vra: item.sku_vat,
|
||||
fee: String(item.unit_price),
|
||||
dis: String(item.discount_amount),
|
||||
mu: item.measure_unit,
|
||||
am: String(item.quantity),
|
||||
consfee: '0',
|
||||
bros: '0',
|
||||
spro: '0',
|
||||
}
|
||||
|
||||
console.log('item.gold_type_payload', item.gold_type_payload);
|
||||
|
||||
|
||||
if (item.gold_type_payload) {
|
||||
const { profit='0', commission = '0', wages = "0" } = item.gold_type_payload
|
||||
data = {
|
||||
...data,
|
||||
consfee: wages,
|
||||
bros: commission,
|
||||
spro: profit,
|
||||
tcpbs: (Number(profit) + Number(commission) + Number(wages)).toString(),
|
||||
}
|
||||
}
|
||||
|
||||
return data
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,7 +118,7 @@ export class NamaProviderUtils {
|
||||
vra: item.sku_vat,
|
||||
// sstt: item.unit_type,
|
||||
fee: String(item.unit_price),
|
||||
dis: String(item.discount),
|
||||
dis: String(item.discount_amount),
|
||||
mu: item.measure_unit,
|
||||
am: String(item.quantity),
|
||||
consfee: '0',
|
||||
|
||||
Reference in New Issue
Block a user