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

Merge branch 'development' into 'devops-staging'

Browse Source 
Feat: add column supplier_name and product_price at get list history user

See merge request empatnusabangsa/ppob/ppob-backend!191
This commit is contained in:
muhammad fadil 2022-07-18 15:41:53 +00:00
commit caf921b400
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,7 +530,6 @@ export class TransactionService {
if (supplier.code != 'IRS') { if (supplier.code != 'IRS') {
const parsingResponse = hitSupplier.split(' '); const parsingResponse = hitSupplier.split(' ');
console.log
const newHitSupplier = { const newHitSupplier = {
success: hitSupplier.includes('diproses'), success: hitSupplier.includes('diproses'),
harga: parseInt( harga: parseInt(
@ -1570,7 +1569,8 @@ export class TransactionService {
) )
.leftJoin('transaction.product_price', 'product_price') .leftJoin('transaction.product_price', 'product_price')
.leftJoin('product_price.product', 'product') .leftJoin('product_price.product', 'product')
.addSelect('transaction.amount', 'price') .leftJoin('product.supplier', 'supplier')
.addSelect('transaction.amount', 'price')
.addSelect('transaction.destination') .addSelect('transaction.destination')
.addSelect('transaction.seri_number', 'seri_number') .addSelect('transaction.seri_number', 'seri_number')
.addSelect('transaction.supplier_trx_id', 'transaction_code') .addSelect('transaction.supplier_trx_id', 'transaction_code')
@ -1579,8 +1579,10 @@ export class TransactionService {
.addSelect('transaction.failed_reason', 'failed_reason') .addSelect('transaction.failed_reason', 'failed_reason')
.addSelect('userData.name', 'buyer') .addSelect('userData.name', 'buyer')
.addSelect('product.name', 'name') .addSelect('product.name', 'name')
.addSelect('product.id', 'product_id') .addSelect('product_price.price', 'product_price')
.orderBy('transaction.created_at', 'DESC'); .addSelect('product.name', 'supplier_name')
.addSelect('supplier.name', 'supplier_name')
.orderBy('transaction.created_at', 'DESC');
if (startDate && endDate) { if (startDate && endDate) {
baseQuery.andWhere( baseQuery.andWhere(