Merge branch 'development' into 'devops-staging'

Feat: add column partner_fee See merge request empatnusabangsa/ppob/ppob-backend!169
2022-05-23 14:22:28 +00:00
parent 4368d0ad8d 0934147c51
commit f8c18522cf
1 changed files with 2 additions and 2 deletions
--- a/src/product/product.service.ts
+++ b/src/product/product.service.ts
@@ -186,9 +186,9 @@ export class ProductService {
        'supplier.name',
        'category.name',
        'product.status',
-        'current_price.admin_price as admin_price',
      ])
-      .addSelect('current_price.price')
+      .addSelect('current_price.price', 'price')
+      .addSelect('current_price.partner_fee', 'partner_fee')
      .addSelect(
        '(current_price.price + current_price.mark_up_price) as mark_up_price',
      )