Merge branch 'master' into development_tri/condition_page_detail_product

# Conflicts:
#	src/lib/product/components/Product/ProductDesktop.jsx

6 files changed, 16 insertions, 16 deletions

diff --git a/src/lib/product/api/productApi.js b/src/lib/product/api/productApi.js
index 4fe4cd7d..8156d1ec 100644
--- a/src/lib/product/api/productApi.js
+++ b/src/lib/product/api/productApi.js
@@ -2,7 +2,7 @@ import odooApi from '@/core/api/odooApi'
 
 const productApi = async ({ id }) => {
   if (!id) return
-  const dataProduct = await odooApi('GET', `/api/v1/product/${id}`)
+  const dataProduct = await odooApi('GET', `/api/v2/product/${id}`)
   return dataProduct
 }
 
diff --git a/src/lib/product/components/Product/ProductDesktop.jsx b/src/lib/product/components/Product/ProductDesktop.jsx
index 8983f241..dbe37068 100644
--- a/src/lib/product/components/Product/ProductDesktop.jsx
+++ b/src/lib/product/components/Product/ProductDesktop.jsx
@@ -125,7 +125,7 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
                 <div className='w-3/4'>
                   {product?.weight > 0 && <span>{product?.weight} KG</span>}
                   {product?.weight == 0 && (
-                    <a href='https://wa.me' className='text-red_r-11 font-medium'>
+                    <a href='https://wa.me' className='text-danger-500 font-medium'>
                       Tanya Berat
                     </a>
                   )}
@@ -149,13 +149,13 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
                 </div>
               </div>
             )}
-            <h3 className='text-red_r-11 font-semibold mt-1 text-title-md'>
+            <h3 className='text-danger-500 font-semibold mt-1 text-title-md'>
               {lowestPrice?.priceDiscount > 0 ? (
                 currencyFormat(lowestPrice?.priceDiscount)
               ) : (
                 <span className='text-gray_r-12/90 font-normal text-h-sm'>
                   Hubungi kami untuk dapatkan harga terbaik,&nbsp;
-                  <a href='https://wa.me/' className='text-red_r-11 underline'>
+                  <a href='https://wa.me/' className='text-danger-500 underline'>
                     klik disini
                   </a>
                 </span>
@@ -197,7 +197,7 @@ const ProductDesktop = ({ product, wishlist, toggleWishlist }) => {
             <div className='flex mt-4'>
               <button className='flex items-center gap-x-1' onClick={toggleWishlist}>
                 {wishlist.data?.productTotal > 0 ? (
-                  <HeartIcon className='w-6 fill-red_r-11 text-red_r-11' />
+                  <HeartIcon className='w-6 fill-danger-500 text-danger-500' />
                 ) : (
                   <HeartIcon className='w-6' />
                 )}
@@ -328,7 +328,7 @@ const informationTabOptions = [
 
 const TabButton = ({ children, active, ...props }) => {
   const activeClassName = active
-    ? 'text-red_r-11 underline underline-offset-4'
+    ? 'text-danger-500 underline underline-offset-4'
     : 'text-gray_r-12/80'
   return (
     <button {...props} type='button' className={`font-medium ${activeClassName}`}>
diff --git a/src/lib/product/components/Product/ProductMobile.jsx b/src/lib/product/components/Product/ProductMobile.jsx
index 13b02354..493fcbf7 100644
--- a/src/lib/product/components/Product/ProductMobile.jsx
+++ b/src/lib/product/components/Product/ProductMobile.jsx
@@ -122,7 +122,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
           )}
           <button type='button' className='ml-auto' onClick={toggleWishlist}>
             {wishlist.data?.productTotal > 0 ? (
-              <HeartIcon className='w-6 fill-red_r-11 text-red_r-11' />
+              <HeartIcon className='w-6 fill-danger-500 text-danger-500' />
             ) : (
               <HeartIcon className='w-6' />
             )}
@@ -142,13 +142,13 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
             <div className='badge-solid-red'>{activeVariant?.price?.discountPercentage}%</div>
           </div>
         )}
-        <h3 className='text-red_r-11 font-semibold mt-1'>
+        <h3 className='text-danger-500 font-semibold mt-1'>
           {activeVariant?.price?.priceDiscount > 0 ? (
             currencyFormat(activeVariant?.price?.priceDiscount)
           ) : (
             <span className='text-gray_r-11 leading-6 font-normal'>
               Hubungi kami untuk dapatkan harga terbaik,&nbsp;
-              <a href='https://wa.me/' className='text-red_r-11 underline'>
+              <a href='https://wa.me/' className='text-danger-500 underline'>
                 klik disini
               </a>
             </span>
@@ -232,7 +232,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
               </span>
             )}
             {activeVariant?.stock == 0 && (
-              <a href='https://wa.me' className='text-red_r-11 font-medium'>
+              <a href='https://wa.me' className='text-danger-500 font-medium'>
                 Tanya Stok
               </a>
             )}
@@ -240,7 +240,7 @@ const ProductMobile = ({ product, wishlist, toggleWishlist }) => {
           <SpecificationContent label='Berat Barang'>
             {activeVariant?.weight > 0 && <span>{activeVariant?.weight} KG</span>}
             {activeVariant?.weight == 0 && (
-              <a href='https://wa.me' className='text-red_r-11 font-medium'>
+              <a href='https://wa.me' className='text-danger-500 font-medium'>
                 Tanya Berat
               </a>
             )}
@@ -275,7 +275,7 @@ const informationTabOptions = [
 ]
 
 const TabButton = ({ children, active, ...props }) => {
-  const activeClassName = active ? 'text-red_r-11 underline underline-offset-4' : 'text-gray_r-11'
+  const activeClassName = active ? 'text-danger-500 underline underline-offset-4' : 'text-gray_r-11'
   return (
     <button {...props} type='button' className={`font-medium pb-1 ${activeClassName}`}>
       {children}
diff --git a/src/lib/product/components/ProductCard.jsx b/src/lib/product/components/ProductCard.jsx
index df709394..f85a0b03 100644
--- a/src/lib/product/components/ProductCard.jsx
+++ b/src/lib/product/components/ProductCard.jsx
@@ -54,7 +54,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
             </div>
           )}
 
-          <div className='text-red_r-11 font-semibold mb-2'>
+          <div className='text-danger-500 font-semibold mb-2'>
             {product?.lowestPrice.priceDiscount > 0 ? (
               currencyFormat(product?.lowestPrice.priceDiscount)
             ) : (
@@ -126,7 +126,7 @@ const ProductCard = ({ product, simpleTitle, variant = 'vertical' }) => {
             </div>
           )}
 
-          <div className='text-red_r-11 font-semibold mb-2'>
+          <div className='text-danger-500 font-semibold mb-2'>
             {product?.lowestPrice?.priceDiscount > 0 ? (
               currencyFormat(product?.lowestPrice?.priceDiscount)
             ) : (
diff --git a/src/lib/product/components/ProductFilter.jsx b/src/lib/product/components/ProductFilter.jsx
index eca95f74..be1edd18 100644
--- a/src/lib/product/components/ProductFilter.jsx
+++ b/src/lib/product/components/ProductFilter.jsx
@@ -88,7 +88,7 @@ const ProductFilter = ({ active, close, brands, categories, prefixUrl, defaultBr
               <button
                 key={orderOption.value}
                 className={`btn-light px-3 font-normal flex-shrink-0 ${
-                  order == orderOption.value ? 'bg-yellow_r-10' : 'bg-transparent'
+                  order == orderOption.value ? 'bg-warning-500' : 'bg-transparent'
                 }`}
                 onClick={() => setOrder(orderOption.value)}
               >
diff --git a/src/lib/product/components/ProductSearch.jsx b/src/lib/product/components/ProductSearch.jsx
index 8e68d62d..0010a88a 100644
--- a/src/lib/product/components/ProductSearch.jsx
+++ b/src/lib/product/components/ProductSearch.jsx
@@ -200,7 +200,7 @@ const ProductSearch = ({ query, prefixUrl, defaultBrand = null }) => {
                 <div className='text-gray_r-12/90'>
                   <span>
                     Barang yang anda cari tidak ada?{' '}
-                    <a href='#' className='text-red_r-9'>
+                    <a href='#' className='text-danger-500'>
                       Hubungi Kami
                     </a>
                   </span>