Merge branch 'promotion-program' into feature/all-promotion

6 files changed, 116 insertions, 54 deletions

diff --git a/src-migrate/pages/api/product-variant/[id].tsx b/src-migrate/pages/api/product-variant/[id].tsx
index c25c10ac..955fde6a 100644
--- a/src-migrate/pages/api/product-variant/[id].tsx
+++ b/src-migrate/pages/api/product-variant/[id].tsx
@@ -1,3 +1,4 @@
+import moment from "moment";
 import { NextApiRequest, NextApiResponse } from "next";
 import { SolrResponse } from "~/types/solr";
 
@@ -28,6 +29,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
 const map = async (variant: any, price_tier: string) => {
   const data: any = {}
+  const price = variant[`price_${price_tier}_v2_f`] || 0
 
   data.id = parseInt(variant.id)
   data.parent_id = variant.template_id_i
@@ -35,11 +37,17 @@ const map = async (variant: any, price_tier: string) => {
   data.image = variant.image_s
   data.name = variant.name_s
   data.default_code = variant.default_code_s
-  data.price = {
-    price: variant.price_v2_f,
-    discount_percentage: variant[`discount_${price_tier}_v2_f`] || 0,
-    price_discount: variant[`price_${price_tier}_v2_f`] || 0,
-  }
+  data.price = { discount_percentage: 0, price, price_discount: price }
 
   return data
+}
+
+const checkIsFlashsale = (variant: any) => {
+  const endDateStr = variant.flashsale_end_date_s || null
+  if (!endDateStr) return false
+
+  const now = moment()
+  const endDate = moment(endDateStr, 'YYYY-MM-DD HH:mm:ss')
+
+  return variant.flashsale_id_i > 0 && now.isSameOrBefore(endDate)
 }
\ No newline at end of file
diff --git a/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx b/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx
index 50671afd..8da0d9a3 100644
--- a/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx
+++ b/src-migrate/pages/api/product-variant/[id]/promotion/[category].tsx
@@ -8,10 +8,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   const category = req.query.category as string
 
   if (req.method === 'GET') {
-    const queryParams = new URLSearchParams({
-      q: `product_ids:${productId}`,
-      fq: `type_value_s:${category}`
-    })
+    const queryParams = new URLSearchParams({ q: `product_ids:${productId}` })
+    queryParams.append('fq', `type_value_s:${category}`)
+    queryParams.append('fq', `active_b:true`)
 
     const response = await fetch(`${SOLR_HOST}/solr/promotion_program_lines/select?${queryParams.toString()}`)
     const data: SolrResponse<any[]> = await response.json()
diff --git a/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx b/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx
index 8153f346..c4acacf1 100644
--- a/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx
+++ b/src-migrate/pages/api/product-variant/[id]/promotion/highlight.tsx
@@ -16,7 +16,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     let programs: any[] = []
 
     for (const type of types) {
-      queryParams.set('fq', `type_value_s:${type}`)
+      queryParams.set('fq', `type_value_s:${type}`) 
+      queryParams.append('fq', `active_b:true`)
+
       const response = await fetch(`${SOLR_HOST}/solr/promotion_program_lines/select?${queryParams.toString()}`)
       const data: SolrResponse<any[]> = await response.json()
       programs.push(...data.response.docs)
diff --git a/src-migrate/pages/shop/cart/cart.module.css b/src-migrate/pages/shop/cart/cart.module.css
index d523a55a..98a6ac86 100644
--- a/src-migrate/pages/shop/cart/cart.module.css
+++ b/src-migrate/pages/shop/cart/cart.module.css
@@ -3,11 +3,11 @@
 }
 
 .content {
-    @apply flex flex-wrap;
+    @apply flex flex-wrap ;
 }
 
 .item-wrapper {
-    @apply w-full md:w-3/4;
+    @apply w-full md:w-3/4 min-h-screen;
 }
 
 .item-skeleton {
@@ -19,7 +19,7 @@
 }
 
 .summary-wrapper {
-    @apply w-full md:w-1/4 md:pl-6 mt-6 md:mt-0;
+    @apply w-full md:w-1/4 md:pl-6 mt-6 md:mt-0 bottom-0 md:sticky sticky bg-white;
 }
 
 .summary {
diff --git a/src-migrate/pages/shop/cart/index.tsx b/src-migrate/pages/shop/cart/index.tsx
index 9ec58a48..4b4de92b 100644
--- a/src-migrate/pages/shop/cart/index.tsx
+++ b/src-migrate/pages/shop/cart/index.tsx
@@ -1,54 +1,57 @@
-import style from './cart.module.css'
+import style from './cart.module.css';
 
-import React, { useEffect, useMemo } from 'react'
-import Link from 'next/link'
-import { Button, Tooltip } from '@chakra-ui/react'
+import React, { useEffect, useMemo } from 'react';
+import Link from 'next/link';
+import { Button, Tooltip } from '@chakra-ui/react';
 
-import { getAuth } from '~/libs/auth'
-import { useCartStore } from '~/modules/cart/stores/useCartStore'
+import { getAuth } from '~/libs/auth';
+import { useCartStore } from '~/modules/cart/stores/useCartStore';
 
-import CartItem from '~/modules/cart/components/Item'
-import CartSummary from '~/modules/cart/components/Summary'
-import clsxm from '~/libs/clsxm'
+import CartItem from '~/modules/cart/components/Item';
+import CartSummary from '~/modules/cart/components/Summary';
+import clsxm from '~/libs/clsxm';
+import useDevice from '@/core/hooks/useDevice';
+import CartSummaryMobile from '~/modules/cart/components/CartSummaryMobile';
+import Image from '~/components/ui/image';
 
 const CartPage = () => {
-  const auth = getAuth()
+  const auth = getAuth();
 
-  const { loadCart, cart, summary } = useCartStore()
+  const { loadCart, cart, summary } = useCartStore();
+
+  const useDivvice = useDevice();
 
   useEffect(() => {
-    if (typeof auth === 'object' && !cart) loadCart(auth.id)
-  }, [auth, loadCart, cart])
+    if (typeof auth === 'object' && !cart) loadCart(auth.id);
+  }, [auth, loadCart, cart]);
 
   const hasSelectedPromo = useMemo(() => {
-    if (!cart) return false
+    if (!cart) return false;
     for (const item of cart.products) {
-      if (item.cart_type === 'promotion' && item.selected) return true
+      if (item.cart_type === 'promotion' && item.selected) return true;
     }
-    return false
-  }, [cart])
+    return false;
+  }, [cart]);
 
   const hasSelected = useMemo(() => {
-    if (!cart) return false
+    if (!cart) return false;
     for (const item of cart.products) {
-      if (item.selected) return true
+      if (item.selected) return true;
     }
-    return false
-  }, [cart])
+    return false;
+  }, [cart]);
 
   const hasSelectNoPrice = useMemo(() => {
-    if (!cart) return false
+    if (!cart) return false;
     for (const item of cart.products) {
-      if (item.selected && item.price.price_discount == 0) return true
+      if (item.selected && item.price.price_discount == 0) return true;
     }
-    return false
-  }, [cart])
+    return false;
+  }, [cart]);
 
   return (
     <>
-      <div className={style['title']}>
-        Keranjang Belanja
-      </div>
+      <div className={style['title']}>Keranjang Belanja</div>
 
       <div className='h-6' />
 
@@ -59,16 +62,57 @@ const CartPage = () => {
           </div>
 
           <div className={style['items']}>
-            {cart?.products.map((item) => <CartItem key={item.id} item={item} />)}
+            {cart?.products.map((item) => (
+              <CartItem key={item.id} item={item} />
+            ))}
+
+            {cart?.products?.length === 0 && (
+              <div className='flex flex-col items-center'>
+                <Image
+                  src='/images/empty_cart.svg'
+                  alt='Empty Cart'
+                  width={450}
+                  height={450}
+                />
+                <div className='text-title-sm md:text-title-lg text-center font-semibold'>
+                  Keranjangnya masih kosong nih
+                </div>
+                <div className='text-body-2 md:text-body-1 text-center mt-3'>
+                  Yuk, tambahin barang-barang yang kamu mau ke keranjang
+                  sekarang!
+                  <br />
+                  Ada banyak potongan belanjanya pakai kode voucher
+                </div>
+                <Link
+                  href='/'
+                  className='btn-solid-red rounded-full text-body-1 mt-6'
+                >
+                  Mulai Belanja
+                </Link>
+              </div>
+            )}
           </div>
         </div>
-
-        <div className={style['summary-wrapper']}>
+        <div
+          className={`${style['summary-wrapper']} ${
+            useDivvice.isMobile && cart?.product_total === 0 ? 'hidden' : ''
+          }`}
+        >
           <div className={style['summary']}>
-            <CartSummary {...summary} isLoaded={!!cart} />
+            {useDivvice.isMobile && (
+              <CartSummaryMobile {...summary} isLoaded={!!cart} />
+            )}
+            {!useDivvice.isMobile && (
+              <CartSummary {...summary} isLoaded={!!cart} />
+            )}
 
             <div className={style['summary-buttons']}>
-              <Tooltip label={hasSelectedPromo && 'Barang promo tidak dapat dibuat quotation'}>
+              <Tooltip
+                label={
+                  hasSelectedPromo &&
+                  'Barang promo tidak dapat dibuat quotation'
+                }
+              >
                 <Button
                   colorScheme='yellow'
                   w='full'
@@ -80,10 +124,12 @@ const CartPage = () => {
                 </Button>
               </Tooltip>
 
-              <Tooltip label={clsxm({
-                'Tidak ada item yang dipilih': !hasSelected,
-                'Terdapat item yang tidak ada harga': hasSelectNoPrice
-              })}>
+              <Tooltip
+                label={clsxm({
+                  'Tidak ada item yang dipilih': !hasSelected,
+                  'Terdapat item yang tidak ada harga': hasSelectNoPrice,
+                })}
+              >
                 <Button
                   colorScheme='red'
                   w='full'
@@ -99,7 +145,7 @@ const CartPage = () => {
         </div>
       </div>
     </>
-  )
-}
+  );
+};
 
-export default CartPage
\ No newline at end of file
+export default CartPage;
diff --git a/src-migrate/pages/shop/product/[slug].tsx b/src-migrate/pages/shop/product/[slug].tsx
index 733e10d9..fc72a6b0 100644
--- a/src-migrate/pages/shop/product/[slug].tsx
+++ b/src-migrate/pages/shop/product/[slug].tsx
@@ -1,5 +1,5 @@
 import { GetServerSideProps, NextPage } from 'next'
-import React from 'react'
+import React, { useEffect } from 'react'
 import dynamic from 'next/dynamic'
 import cookie from 'cookie'
 
@@ -9,6 +9,7 @@ import { IProductDetail } from '~/types/product'
 
 import { Seo } from '~/components/seo'
 import { useRouter } from 'next/router'
+import { useProductContext } from '@/contexts/ProductContext'
 
 const BasicLayout = dynamic(() => import('@/core/components/layouts/BasicLayout'), { ssr: false })
 const ProductDetail = dynamic(() => import('~/modules/product-detail'), { ssr: false })
@@ -40,6 +41,12 @@ const SELF_HOST = process.env.NEXT_PUBLIC_SELF_HOST
 const ProductDetailPage: NextPage<PageProps> = ({ product }) => {
   const router = useRouter();
 
+  const { setProduct } = useProductContext();
+
+  useEffect(() => {
+    if (product) setProduct(product);
+  }, [product, setProduct]);
+
   return (
     <BasicLayout>
       <Seo