Merge branch 'development' into 'devops-staging'

Development

See merge request empatnusabangsa/ppob/ppob-backend!163

src/product/product.service.ts

@@ -380,7 +380,6 @@ export class ProductService {
         relations: ['supplier'],
         where: {
           code: code,
-          type: type,
         },
       });
     } catch (e) {

src/transaction/ppob_callback.controller.ts

@@ -78,7 +78,7 @@ export class PpobCallbackController {
       );
       //
     } else {
-      if (response['status'] != 20) {
+      if (response['status'].toString() != '20') {
         //TODO: UPDATE GAGAL
         const updateTransaction =
           await this.transactionService.callbackOrderFailed(

src/transaction/transaction.service.ts

@@ -485,7 +485,7 @@ export class TransactionService {
       try {
         const billId = await this.checkBillHistoryRepository.findOneOrFail({
           where: {
-            id: orderTransactionDto.bill_trx_id
+            trx_id: orderTransactionDto.bill_trx_id
           },
         });
         product_price.price = billId.amount;
@@ -502,7 +502,6 @@ export class TransactionService {
           throw e;
         }
       }
-
     }
 
     if (coaAccount.amount < product_price.mark_up_price + product_price.price) {
@@ -529,16 +528,22 @@ export class TransactionService {
       trxId,
       supplier,
     );
+    // let hitSupplier;
 
     if (supplier.code != 'IRS') {
       const parsingResponse = hitSupplier.split(' ');
-      hitSupplier = {
+      console.log
+      const newHitSupplier = {
         success: hitSupplier.includes('diproses'),
         harga: parseInt(
-          parsingResponse[parsingResponse.length - 2].replaceAll('.', ''),
+          parsingResponse[parsingResponse.length - 2].replace(/\./g,' '),
         ),
         msg: hitSupplier,
       };
+      hitSupplier = newHitSupplier;
+      if(orderTransactionDto.bill_trx_id !== null){
+        hitSupplier.harga = product_price.price;
+      }
     }
     // const hitSupplier = {
     //   harga: 2000,
@@ -1167,8 +1172,7 @@ export class TransactionService {
     const coaExpense = await this.coaService.findByName(
       `${coaType[coaType.EXPENSE]}-SYSTEM`,
     );
-
-    if (!userData.partner) {
+    if (userData.partner != null) {
       //GET SALES
       supervisorData = await this.calculateCommission(
         supervisorData,