Merge branch 'devops-staging' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend

src/product/product.service.ts

@@ -466,7 +466,32 @@ export class ProductService {
     }
   }
 
-  async findOneActive(code: string, type: string) {
+  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'],
@@ -487,6 +512,8 @@ export class ProductService {
           throw e;
         }
       }
+
+    }
   }
 
   async findOneById(id: string) {

src/transaction/transaction.service.ts

@@ -332,10 +332,14 @@ export class TransactionService {
           currentUser.username,
       );
 
+    const supplierData = await this.supplierService.findByCode('IRS');
+
     //GET PRODUCT
     const product = await this.productService.findOneActive(
         orderTransactionDto.productCode,
-          'prepaid'
+        'prepaid',
+        userData.roles.name,
+        supplierData.id
     );
 
       const product_price = await this.productHistoryPriceService.findOne(
@@ -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(