Merge pull request #338 from medusajs/chore/v2-cleanups-and-fixes

Fixes to storefront to always pass region id, cleanup

.env.template

@@ -17,6 +17,7 @@ NEXT_PUBLIC_STRIPE_KEY=
 NEXT_PUBLIC_PAYPAL_CLIENT_ID=
 
 # Your MeiliSearch / Algolia keys. See – https://docs.medusajs.com/add-plugins/meilisearch or https://docs.medusajs.com/add-plugins/algolia
+NEXT_PUBLIC_FEATURE_SEARCH_ENABLED=false
 NEXT_PUBLIC_SEARCH_APP_ID=
 NEXT_PUBLIC_SEARCH_ENDPOINT=http://127.0.0.1:7700
 NEXT_PUBLIC_SEARCH_API_KEY=

next.config.js

@@ -1,11 +1,7 @@
-const { withStoreConfig } = require("./store-config")
-const store = require("./store.config.json")
-
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = withStoreConfig({
-  features: store.features,
+const nextConfig = {
   reactStrictMode: true,
   images: {
     remotePatterns: [
@@ -27,7 +23,7 @@ const nextConfig = withStoreConfig({
       },
     ],
   },
-})
+}
 
 console.log("next.config.js", JSON.stringify(module.exports, null, 2))
 

src/app/[countryCode]/(checkout)/checkout/page.tsx

@@ -6,6 +6,7 @@ import CheckoutForm from "@modules/checkout/templates/checkout-form"
 import CheckoutSummary from "@modules/checkout/templates/checkout-summary"
 import { enrichLineItems, retrieveCart } from "@lib/data/cart"
 import { HttpTypes } from "@medusajs/types"
+import { getCustomer } from "@lib/data/customer"
 
 export const metadata: Metadata = {
   title: "Checkout",
@@ -18,10 +19,7 @@ const fetchCart = async () => {
   }
 
   if (cart?.items?.length) {
-    const enrichedItems = await enrichLineItems(
-      cart?.items,
-      cart?.currency_code
-    )
+    const enrichedItems = await enrichLineItems(cart?.items, cart?.region_id!)
     cart.items = enrichedItems as HttpTypes.StoreCartLineItem[]
   }
 
@@ -30,15 +28,12 @@ const fetchCart = async () => {
 
 export default async function Checkout() {
   const cart = await fetchCart()
-
-  if (!cart) {
-    return notFound()
-  }
+  const customer = await getCustomer()
 
   return (
     <div className="grid grid-cols-1 small:grid-cols-[1fr_416px] content-container gap-x-40 py-12">
       <Wrapper cart={cart}>
-        <CheckoutForm />
+        <CheckoutForm cart={cart} customer={customer} />
       </Wrapper>
       <CheckoutSummary cart={cart} />
     </div>

src/app/[countryCode]/(main)/account/@dashboard/orders/details/[id]/page.tsx

@@ -17,7 +17,7 @@ async function getOrder(id: string) {
     return
   }
 
-  const enrichedItems = await enrichLineItems(order.items, order.currency_code)
+  const enrichedItems = await enrichLineItems(order.items, order.region_id!)
 
   return {
     ...order,

src/app/[countryCode]/(main)/cart/page.tsx

@@ -18,10 +18,7 @@ const fetchCart = async () => {
   }
 
   if (cart?.items?.length) {
-    const enrichedItems = await enrichLineItems(
-      cart?.items,
-      cart?.currency_code
-    )
+    const enrichedItems = await enrichLineItems(cart?.items, cart?.region_id!)
     cart.items = enrichedItems as HttpTypes.StoreCartLineItem[]
   }
 

src/app/[countryCode]/(main)/order/confirmed/[id]/page.tsx

@@ -17,7 +17,7 @@ async function getOrder(id: string) {
     return
   }
 
-  const enrichedItems = await enrichLineItems(order.items, order.currency_code)
+  const enrichedItems = await enrichLineItems(order.items, order.region_id!)
 
   return {
     ...order,