Merge branch 'development' into 'devops-staging'

Feat add column admin_price at table product history price

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

src/product/entities/product-history-price.entity.ts

@@ -32,4 +32,7 @@ export class ProductHistoryPrice extends BaseModel {
 
   @Column('text')
   type: productType;
+
+  @Column()
+  admin_price: number;
 }

src/product/product.service.ts

@@ -182,6 +182,7 @@ export class ProductService {
         'supplier.name',
         'category.name',
         'product.status',
+        'current_price.admin_price as admin_price',
       ])
       .addSelect('current_price.price')
       .addSelect(
@@ -334,7 +335,12 @@ export class ProductService {
         },
       )
       .select(['product.id'])
-      .addSelect(['product.name', 'product.code', 'sub_categories.name'])
+      .addSelect([
+        'product.name',
+        'product.code',
+        'sub_categories.name',
+        'current_price.admin_price as admin_price',
+      ])
       .addSelect(
         '(current_price.price + current_price.mark_up_price) as price',
       );