fix bug
This commit is contained in:
parent
b1fa917576
commit
a4cd9d0b92
7797
package-lock.json
generated
Normal file
7797
package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
|
@ -52,7 +52,7 @@ import configuration from './config/configuration';
|
||||||
UsersModule,
|
UsersModule,
|
||||||
TransactionModule,
|
TransactionModule,
|
||||||
ConfigurableModule,
|
ConfigurableModule,
|
||||||
// ProductModule,
|
ProductModule,
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class AppModule {}
|
export class AppModule {}
|
||||||
|
|
|
@ -16,6 +16,7 @@ export class ProductService {
|
||||||
constructor(
|
constructor(
|
||||||
@InjectRepository(Product)
|
@InjectRepository(Product)
|
||||||
private productRepository: Repository<Product>,
|
private productRepository: Repository<Product>,
|
||||||
|
@InjectRepository(ProductHistoryPrice)
|
||||||
private productHistoryPrice: Repository<ProductHistoryPrice>,
|
private productHistoryPrice: Repository<ProductHistoryPrice>,
|
||||||
private productSubCategoriesService: ProductSubCategoriesService,
|
private productSubCategoriesService: ProductSubCategoriesService,
|
||||||
) {}
|
) {}
|
||||||
|
|
|
@ -1,20 +1,8 @@
|
||||||
import {
|
import {
|
||||||
Entity,
|
Entity,
|
||||||
Column,
|
Column,
|
||||||
PrimaryGeneratedColumn,
|
|
||||||
UpdateDateColumn,
|
|
||||||
DeleteDateColumn,
|
|
||||||
VersionColumn,
|
|
||||||
CreateDateColumn,
|
|
||||||
ManyToOne,
|
|
||||||
ManyToMany,
|
|
||||||
JoinTable,
|
|
||||||
} from 'typeorm';
|
} from 'typeorm';
|
||||||
import { Product } from '../../product/entities/product.entity';
|
|
||||||
import { User } from '../../users/entities/user.entity';
|
|
||||||
import { BaseModel } from '../../config/basemodel.entity';
|
import { BaseModel } from '../../config/basemodel.entity';
|
||||||
import { COA } from './coa.entity';
|
|
||||||
import { ProductHistoryPrice } from '../../product/entities/product-history-price.entity';
|
|
||||||
|
|
||||||
@Entity()
|
@Entity()
|
||||||
export class TransactionType extends BaseModel {
|
export class TransactionType extends BaseModel {
|
||||||
|
|
|
@ -7,7 +7,7 @@ import { COA } from './entities/coa.entity';
|
||||||
import { CoaType } from './entities/coa-type.entity';
|
import { CoaType } from './entities/coa-type.entity';
|
||||||
import { TransactionType } from './entities/transaction-type.entity';
|
import { TransactionType } from './entities/transaction-type.entity';
|
||||||
import { TransactionJournal } from './entities/transaction-journal.entity';
|
import { TransactionJournal } from './entities/transaction-journal.entity';
|
||||||
import { Transaction } from './entities/transactions.entity';
|
import { Transactions } from './entities/transactions.entity';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -16,7 +16,7 @@ import { Transaction } from './entities/transactions.entity';
|
||||||
TransactionType,
|
TransactionType,
|
||||||
COA,
|
COA,
|
||||||
TransactionJournal,
|
TransactionJournal,
|
||||||
Transaction,
|
Transactions,
|
||||||
]),
|
]),
|
||||||
],
|
],
|
||||||
controllers: [TransactionController, PpobCallbackController],
|
controllers: [TransactionController, PpobCallbackController],
|
||||||
|
|
|
@ -5,6 +5,7 @@ import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { Transactions } from './entities/transactions.entity';
|
import { Transactions } from './entities/transactions.entity';
|
||||||
import { Repository } from 'typeorm';
|
import { Repository } from 'typeorm';
|
||||||
import { User } from '../users/entities/user.entity';
|
import { User } from '../users/entities/user.entity';
|
||||||
|
import { COA } from './entities/coa.entity';
|
||||||
import { TransactionType } from './entities/transaction-type.entity';
|
import { TransactionType } from './entities/transaction-type.entity';
|
||||||
import { TransactionJournal } from './entities/transaction-journal.entity';
|
import { TransactionJournal } from './entities/transaction-journal.entity';
|
||||||
|
|
||||||
|
@ -14,11 +15,11 @@ export class TransactionService {
|
||||||
@InjectRepository(Transactions)
|
@InjectRepository(Transactions)
|
||||||
private transactionRepository: Repository<Transactions>,
|
private transactionRepository: Repository<Transactions>,
|
||||||
@InjectRepository(TransactionType)
|
@InjectRepository(TransactionType)
|
||||||
private transactionType: Repository<TransactionType>,
|
private transactionTypeRepository: Repository<TransactionType>,
|
||||||
@InjectRepository(TransactionJournal)
|
@InjectRepository(TransactionJournal)
|
||||||
private transactionJournal: Repository<TransactionJournal>,
|
private transactionJournalRepository: Repository<TransactionJournal>,
|
||||||
@InjectRepository(User)
|
@InjectRepository(COA)
|
||||||
private userRepository: Repository<User>,
|
private coaRepository: Repository<COA>
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(distributeTransactionDto: DistributeTransactionDto) {
|
async create(distributeTransactionDto: DistributeTransactionDto) {
|
||||||
|
@ -31,12 +32,22 @@ export class TransactionService {
|
||||||
amount: distributeTransactionDto.amount,
|
amount: distributeTransactionDto.amount,
|
||||||
});
|
});
|
||||||
|
|
||||||
//INSERT TRANSACTION JOURNAL
|
//INSERT TRANSACTION JOURNAL FOR SEND
|
||||||
await this.transactionJournal.insert({
|
await this.transactionJournalRepository.insert({
|
||||||
amount: distributeTransactionDto.amount,
|
amount: distributeTransactionDto.amount,
|
||||||
transaction: transactionSaved.identifiers[0],
|
transaction: transactionSaved.identifiers[0],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//INSERT TRANSACTION JOURNAL FOR RECIEVE
|
||||||
|
await this.transactionJournalRepository.insert({
|
||||||
|
amount: distributeTransactionDto.amount,
|
||||||
|
transaction: transactionSaved.identifiers[0],
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
// await this.coaRepository.update({
|
||||||
|
// amount:1
|
||||||
|
// })
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user