Merge branch 'new-release' of https://bitbucket.org/altafixco/next-indoteknik into biteship-merge

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx
#	src/lib/transaction/components/Transaction.jsx

2 files changed, 3 insertions, 1 deletions

diff --git a/src-migrate/types/product.ts b/src-migrate/types/product.ts
index 85ea702a..746cdd4a 100644
--- a/src-migrate/types/product.ts
+++ b/src-migrate/types/product.ts
@@ -4,6 +4,7 @@ export interface IProduct {
   id: number;
   image: string;
   image_mobile: string;
+  image_carousel: string[];
   code: string;
   display_name: string;
   name: string;
@@ -34,7 +35,7 @@ export interface IProduct {
     name: string;
     logo: string;
   };
-  voucher_pasti_hemat : any;
+  voucher_pasti_hemat: any;
 }
 
 export interface IProductDetail extends IProduct {
diff --git a/src-migrate/types/voucher.ts b/src-migrate/types/voucher.ts
index 3e90f449..d3140372 100644
--- a/src-migrate/types/voucher.ts
+++ b/src-migrate/types/voucher.ts
@@ -3,6 +3,7 @@ export interface IVoucher {
   image: string;
   name: string;
   code: string;
+  voucher_category: [];
   description: string | false;
   remaining_time: string;
 }