PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix order-prod for b2c temporary

Browse Source
This commit is contained in:
Fadli 2022-08-31 12:25:08 +07:00
parent 73820927ce
commit 95dc740ca2
2 changed files with 61 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/product/product.service.ts
View File

@ -466,26 +466,53 @@ export class ProductService {
}
}
async findOneActive(code: string, type: string) {
try {
return await this.productRepository.findOneOrFail({
relations: ['supplier'],
where: {
code: code,
},
});
} catch (e) {
if (e instanceof EntityNotFoundError) {
throw new HttpException(
{
statusCode: HttpStatus.NOT_FOUND,
error: 'Product not found',
},
HttpStatus.NOT_FOUND,
);
} else {
throw e;
async findOneActive(code: string, type: string, roles: string, supplierId: string) {
if (roles == "Retail") {
try {
return await this.productRepository.findOneOrFail({
relations: ['supplier'],
where: {
code: code,
supplier: supplierId
},
});
} catch (e) {
if (e instanceof EntityNotFoundError) {
throw new HttpException(
{
statusCode: HttpStatus.NOT_FOUND,
error: 'Product not found',
},
HttpStatus.NOT_FOUND,
);
} else {
throw e;
}
}
} else {
try {
return await this.productRepository.findOneOrFail({
relations: ['supplier'],
where: {
code: code,
},
});
} catch (e) {
if (e instanceof EntityNotFoundError) {
throw new HttpException(
{
statusCode: HttpStatus.NOT_FOUND,
error: 'Product not found',
},
HttpStatus.NOT_FOUND,
);
} else {
throw e;
}
}
}
}

20
src/transaction/transaction.service.ts
View File

@ -332,11 +332,15 @@ export class TransactionService {
currentUser.username,
);
//GET PRODUCT
const product = await this.productService.findOneActive(
orderTransactionDto.productCode,
'prepaid'
);
const supplierData = await this.supplierService.findByCode('IRS');
//GET PRODUCT
const product = await this.productService.findOneActive(
orderTransactionDto.productCode,
'prepaid',
userData.roles.name,
supplierData.id
);
const product_price = await this.productHistoryPriceService.findOne(
product.id,
@ -483,10 +487,16 @@ export class TransactionService {
currentUser.username,
);
const supplierData = await this.supplierService.findByCode('IRS');
//GET PRODUCT AND PRICE
const product = await this.productService.findOneActive(
orderTransactionDto.productCode,
'prepaid',
userData.roles.name,
supplierData.id
);
const supplier = await this.supplierService.findByCode(