Merge branch 'new-release' into CR/form-merchant

# Conflicts:
#	src/lib/form/components/Merchant.jsx

3 files changed, 6 insertions, 3 deletions

diff --git a/src/lib/cart/components/Cart.jsx b/src/lib/cart/components/Cart.jsx
index c6aaa596..1e25d959 100644
--- a/src/lib/cart/components/Cart.jsx
+++ b/src/lib/cart/components/Cart.jsx
@@ -27,6 +27,7 @@ import CardProdcuctsList from '@/core/components/elements/Product/cartProductsLi
 // import cardProdcuctsList from '@/core/components/elements/Product/cartProductsList'
 
 const Cart = () => {
+  const PPN = process.env.NEXT_PUBLIC_PPN
   const router = useRouter()
   const [products, setProducts] = useState(null)
   const [isLoading, setIsLoading] = useState(true)
@@ -97,7 +98,7 @@ const Cart = () => {
       if (product.canBuy == false) {
         toggleSelected(product.id)
       }
-      let priceBeforeTax = product.price.price / 1.11
+      let priceBeforeTax = product.price.price / PPN
       calculateTotalPriceBeforeTax += priceBeforeTax * product.quantity
       calculateTotalTaxAmount += (product.price.price - priceBeforeTax) * product.quantity
       calculateTotalDiscountAmount +=
diff --git a/src/lib/cart/components/CartOld.jsx b/src/lib/cart/components/CartOld.jsx
index 718541af..358efa49 100644
--- a/src/lib/cart/components/CartOld.jsx
+++ b/src/lib/cart/components/CartOld.jsx
@@ -20,6 +20,7 @@ import whatsappUrl from '@/core/utils/whatsappUrl'
 import useAuth from '@/core/hooks/useAuth'
 
 const Cart = () => {
+  const PPN = process.env.NEXT_PUBLIC_PPN
   const router = useRouter()
   const [products, setProducts] = useState(null)
   const auth = useAuth()
@@ -67,7 +68,7 @@ const Cart = () => {
       })
 
       if (!product.selected) continue
-      let priceBeforeTax = product.price.price / 1.11
+      let priceBeforeTax = product.price.price / PPN
       calculateTotalPriceBeforeTax += priceBeforeTax * product.quantity
       calculateTotalTaxAmount += (product.price.price - priceBeforeTax) * product.quantity
       calculateTotalDiscountAmount +=
diff --git a/src/lib/cart/components/Cartheader.jsx b/src/lib/cart/components/Cartheader.jsx
index 1c30bb13..6d4e2679 100644
--- a/src/lib/cart/components/Cartheader.jsx
+++ b/src/lib/cart/components/Cartheader.jsx
@@ -14,6 +14,7 @@ const { ShoppingCartIcon, PhotoIcon } = require('@heroicons/react/24/outline');
 const { default: Link } = require('next/link');
 
 const Cardheader = (cartCount) => {
+  const PPN = process.env.NEXT_PUBLIC_PPN
   const router = useRouter();
   const [subTotal, setSubTotal] = useState(null);
   const [buttonLoading, SetButtonTerapkan] = useState(false);
@@ -66,7 +67,7 @@ const Cardheader = (cartCount) => {
     for (const product of products) {
       if (product.quantity == '') continue;
 
-      let priceBeforeTax = product.price.price / 1.11;
+      let priceBeforeTax = product.price.price / PPN;
       calculateTotalPriceBeforeTax += priceBeforeTax * product.quantity;
       calculateTotalTaxAmount +=
         (product.price.price - priceBeforeTax) * product.quantity;