Merge branch 'release' into CR/product_detail

# Conflicts:
#	src-migrate/modules/product-detail/components/ProductDetail.tsx

3 files changed, 10 insertions, 0 deletions

diff --git a/src-migrate/types/cart.ts b/src-migrate/types/cart.ts
index 4e3c8b99..a3115103 100644
--- a/src-migrate/types/cart.ts
+++ b/src-migrate/types/cart.ts
@@ -32,6 +32,8 @@ export type CartItem = {
   id: number;
   name: string;
   stock: number;
+  is_in_bu: boolean;
+  on_hand_qty: number;
   weight: number;
   attributes: string[];
   parent: {
diff --git a/src-migrate/types/product.ts b/src-migrate/types/product.ts
index 927a0ca3..3854f304 100644
--- a/src-migrate/types/product.ts
+++ b/src-migrate/types/product.ts
@@ -12,6 +12,7 @@ export interface IProduct {
   variant_total: number;
   description: string;
   isSni: boolean;
+  is_in_bu: boolean;
   isTkdn: boolean;
   categories: {
     id: string;
diff --git a/src-migrate/types/promotion.ts b/src-migrate/types/promotion.ts
index 85190aad..dce442ad 100644
--- a/src-migrate/types/promotion.ts
+++ b/src-migrate/types/promotion.ts
@@ -10,15 +10,18 @@ export interface IPromotion {
   limit_user: number;
   limit_trx: number;
   price: number;
+  image: string;
   total_qty: number;
   products: {
     product_id: number;
     qty: number;
+    name: string;
   }[];
   free_products: {
     product_id: number;
     qty: number;
   }[];
+  
 }
 
 export interface IProductVariantPromo {
@@ -34,6 +37,10 @@ export interface IProductVariantPromo {
     price_discount: number;
   };
   qty: number;
+  manufacture: {
+    manufacture_name: string;
+    manufacture_id:number;
+  }
 }
 
 export type CategoryPromo = 'bundling' | 'discount_loading' | 'merchandise';