Merge branch 'development' into 'devops-staging'
Feat: add query productPriceRepository See merge request empatnusabangsa/ppob/ppob-backend!197
This commit is contained in:
commit
ddefced938
|
@ -12,6 +12,7 @@ import { UsersModule } from 'src/users/users.module';
|
||||||
import { ConfigurableModule } from '../configurable/configurable.module';
|
import { ConfigurableModule } from '../configurable/configurable.module';
|
||||||
import { CheckBillHistory } from './entities/check-bill-history.entity';
|
import { CheckBillHistory } from './entities/check-bill-history.entity';
|
||||||
import { CallbackPartner } from './entities/callback-partner.entity';
|
import { CallbackPartner } from './entities/callback-partner.entity';
|
||||||
|
import {ProductHistoryPrice} from "../product/entities/product-history-price.entity";
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -21,6 +22,7 @@ import { CallbackPartner } from './entities/callback-partner.entity';
|
||||||
Transactions,
|
Transactions,
|
||||||
CheckBillHistory,
|
CheckBillHistory,
|
||||||
CallbackPartner,
|
CallbackPartner,
|
||||||
|
ProductHistoryPrice,
|
||||||
]),
|
]),
|
||||||
ProductModule,
|
ProductModule,
|
||||||
ConfigurableModule,
|
ConfigurableModule,
|
||||||
|
|
|
@ -35,6 +35,8 @@ export class TransactionService {
|
||||||
private transactionRepository: Repository<Transactions>,
|
private transactionRepository: Repository<Transactions>,
|
||||||
@InjectRepository(TransactionJournal)
|
@InjectRepository(TransactionJournal)
|
||||||
private transactionJournalRepository: Repository<TransactionJournal>,
|
private transactionJournalRepository: Repository<TransactionJournal>,
|
||||||
|
@InjectRepository(ProductHistoryPrice)
|
||||||
|
private productPriceRepository: Repository<ProductHistoryPrice>,
|
||||||
@InjectRepository(COA)
|
@InjectRepository(COA)
|
||||||
private coaRepository: Repository<COA>,
|
private coaRepository: Repository<COA>,
|
||||||
@InjectRepository(CheckBillHistory)
|
@InjectRepository(CheckBillHistory)
|
||||||
|
@ -1202,6 +1204,12 @@ export class TransactionService {
|
||||||
relations: ['product_price'],
|
relations: ['product_price'],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const dataProductPrice = await this.productPriceRepository.findOne({
|
||||||
|
where: {
|
||||||
|
id:dataTransaction.product_price
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// const dataMsg = callback.msg;
|
// const dataMsg = callback.msg;
|
||||||
// const failedReason = dataMsg.split('.');
|
// const failedReason = dataMsg.split('.');
|
||||||
|
|
||||||
|
@ -1223,13 +1231,15 @@ export class TransactionService {
|
||||||
dataTransaction.callback_json = callback;
|
dataTransaction.callback_json = callback;
|
||||||
dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal`;
|
dataTransaction.failed_reason = `Trx ${product.code} ke ${dataTransaction.destination} gagal`;
|
||||||
|
|
||||||
console.log("inipricetable", dataTransaction.product_price.price)
|
// console.log("inipricetable", dataTransaction.product_price.price)
|
||||||
console.log("inipricecallback", callback['price'])
|
// console.log("inipricecallback", callback['price'])
|
||||||
if(callback['message']) {
|
if(callback['message']) {
|
||||||
if (callback['message'].includes('METRO')) {
|
if (callback['message'].includes('METRO')) {
|
||||||
if (callback['price'] != dataTransaction.product_price.price) {
|
if (callback['price'] != dataTransaction.product_price.price) {
|
||||||
|
console.log("inipricetable", dataTransaction.product_price.price)
|
||||||
|
console.log("inipricecallback", callback['price'])
|
||||||
console.log("mskupdt", "msk")
|
console.log("mskupdt", "msk")
|
||||||
dataTransaction.product_price.price = callback['price']
|
dataProductPrice.price = callback['price']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user