Merge branch 'new-release' into Feature/switch-account

# Conflicts:
#	src/lib/auth/components/CompanyProfile.jsx
#	src/lib/auth/components/Menu.jsx

1 files changed, 9 insertions, 5 deletions

diff --git a/src-migrate/modules/cart/stores/useCartStore.ts b/src-migrate/modules/cart/stores/useCartStore.ts
index c2ebf50f..e7d2cdd3 100644
--- a/src-migrate/modules/cart/stores/useCartStore.ts
+++ b/src-migrate/modules/cart/stores/useCartStore.ts
@@ -43,17 +43,20 @@ export const useCartStore = create<State & Action>((set, get) => ({
   updateCartItem: (updatedCart) => {
     const cart = get().cart;
     if (!cart) return;
-    
+
     set({ cart: updatedCart });
     const summary = computeSummary(updatedCart);
     set({ summary });
   },
-  
+
 }));
 
 const computeSummary = (cart: CartProps) => {
   let subtotal = 0;
   let discount = 0;
+
+  const PPN: number = process.env.NEXT_PUBLIC_PPN ? parseFloat(process.env.NEXT_PUBLIC_PPN) : 0;
+  
   for (const item of cart?.products) {
     if (!item.selected) continue;
 
@@ -67,8 +70,9 @@ const computeSummary = (cart: CartProps) => {
     discount += price - item.price.price_discount * item.quantity;
   }
   let total = subtotal - discount;
-  let tax = Math.round(total * 0.11);
-  let grandTotal = total + tax;
+  let grandTotal = total * PPN;
+  let tax = grandTotal - total;
+  // let grandTotal = total + tax;
 
-  return { subtotal, discount, total, tax, grandTotal };
+  return { subtotal, discount, total, grandTotal, tax  };
 };
\ No newline at end of file