Merge branch 'develop' into feature/MED-129

app/home/(user)/(dashboard)/order/[orderId]/confirmed/page.tsx

@@ -1,19 +1,19 @@
 import { redirect } from 'next/navigation';
-import { PageBody, PageHeader } from '@kit/ui/page';
 
-import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
-import { withI18n } from '~/lib/i18n/with-i18n';
-
-import { getAnalysisOrder } from '~/lib/services/order.service';
-import { retrieveOrder } from '@lib/data/orders';
-import { pathsConfig } from '@kit/shared/config';
-
-import Divider from "@modules/common/components/divider"
+import CartTotals from '@/app/home/(user)/_components/order/cart-totals';
 import OrderDetails from '@/app/home/(user)/_components/order/order-details';
 import OrderItems from '@/app/home/(user)/_components/order/order-items';
-import CartTotals from '@/app/home/(user)/_components/order/cart-totals';
+import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
+import { retrieveOrder } from '@lib/data/orders';
+import Divider from '@modules/common/components/divider';
+
+import { pathsConfig } from '@kit/shared/config';
+import { PageBody, PageHeader } from '@kit/ui/page';
 import { Trans } from '@kit/ui/trans';
 
+import { withI18n } from '~/lib/i18n/with-i18n';
+import { getAnalysisOrder } from '~/lib/services/order.service';
+
 export async function generateMetadata() {
   const { t } = await createI18nServerInstance();
 
@@ -27,12 +27,16 @@ async function OrderConfirmedPage(props: {
 }) {
   const params = await props.params;
 
-  const order = await getAnalysisOrder({ analysisOrderId: Number(params.orderId) }).catch(() => null);
+  const order = await getAnalysisOrder({
+    analysisOrderId: Number(params.orderId),
+  }).catch(() => null);
   if (!order) {
     redirect(pathsConfig.app.myOrders);
   }
 
-  const medusaOrder = await retrieveOrder(order.medusa_order_id).catch(() => null);
+  const medusaOrder = await retrieveOrder(order.medusa_order_id).catch(
+    () => null,
+  );
   if (!medusaOrder) {
     redirect(pathsConfig.app.myOrders);
   }
@@ -41,7 +45,7 @@ async function OrderConfirmedPage(props: {
     <PageBody>
       <PageHeader title={<Trans i18nKey="cart:orderConfirmed.title" />} />
       <Divider />
-      <div className="grid grid-cols-1 small:grid-cols-[1fr_360px] gap-x-40 lg:px-4 gap-y-6">
+      <div className="small:grid-cols-[1fr_360px] grid grid-cols-1 gap-x-40 gap-y-6 lg:px-4">
         <OrderDetails order={order} />
         <Divider />
         <OrderItems medusaOrder={medusaOrder} />

app/home/(user)/(dashboard)/order/[orderId]/page.tsx

@@ -1,19 +1,19 @@
 import { redirect } from 'next/navigation';
-import { PageBody, PageHeader } from '@kit/ui/page';
 
-import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
-import { withI18n } from '~/lib/i18n/with-i18n';
-
-import { getAnalysisOrder } from '~/lib/services/order.service';
-import { retrieveOrder } from '@lib/data/orders';
-import { pathsConfig } from '@kit/shared/config';
-
-import Divider from "@modules/common/components/divider"
+import CartTotals from '@/app/home/(user)/_components/order/cart-totals';
 import OrderDetails from '@/app/home/(user)/_components/order/order-details';
 import OrderItems from '@/app/home/(user)/_components/order/order-items';
-import CartTotals from '@/app/home/(user)/_components/order/cart-totals';
+import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
+import { retrieveOrder } from '@lib/data/orders';
+import Divider from '@modules/common/components/divider';
+
+import { pathsConfig } from '@kit/shared/config';
+import { PageBody, PageHeader } from '@kit/ui/page';
 import { Trans } from '@kit/ui/trans';
 
+import { withI18n } from '~/lib/i18n/with-i18n';
+import { getAnalysisOrder } from '~/lib/services/order.service';
+
 export async function generateMetadata() {
   const { t } = await createI18nServerInstance();
 
@@ -27,12 +27,16 @@ async function OrderConfirmedPage(props: {
 }) {
   const params = await props.params;
 
-  const order = await getAnalysisOrder({ analysisOrderId: Number(params.orderId) }).catch(() => null);
+  const order = await getAnalysisOrder({
+    analysisOrderId: Number(params.orderId),
+  }).catch(() => null);
   if (!order) {
     redirect(pathsConfig.app.myOrders);
   }
 
-  const medusaOrder = await retrieveOrder(order.medusa_order_id).catch(() => null);
+  const medusaOrder = await retrieveOrder(order.medusa_order_id).catch(
+    () => null,
+  );
   if (!medusaOrder) {
     redirect(pathsConfig.app.myOrders);
   }
@@ -41,7 +45,7 @@ async function OrderConfirmedPage(props: {
     <PageBody>
       <PageHeader title={<Trans i18nKey="cart:order.title" />} />
       <Divider />
-      <div className="grid grid-cols-1 small:grid-cols-[1fr_360px] gap-x-40 lg:px-4 gap-y-6">
+      <div className="small:grid-cols-[1fr_360px] grid grid-cols-1 gap-x-40 gap-y-6 lg:px-4">
         <OrderDetails order={order} />
         <Divider />
         <OrderItems medusaOrder={medusaOrder} />

app/home/(user)/(dashboard)/order/page.tsx

@@ -1,11 +1,16 @@
 import React from 'react';
 
+import React from 'react';
+
 import { redirect } from 'next/navigation';
 
 import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
 import { listProductTypes } from '@lib/data/products';
 import { Divider } from '@medusajs/ui';
 
+import { pathsConfig } from '@kit/shared/config';
+import { Divider } from '@medusajs/ui';
+
 import { pathsConfig } from '@kit/shared/config';
 import { PageBody } from '@kit/ui/makerkit/page';
 import { Trans } from '@kit/ui/trans';
@@ -87,6 +92,7 @@ async function OrdersPage() {
               />
             </React.Fragment>
           );
+          );
         })}
         {analysisOrders.length === 0 && (
           <h5 className="mt-6">