Merge pull request #3 from commercelayer/fix-destination-visualization

Use `return.stock_location` as Destination
commercelayer · Nov 16, 2023 · 787bdd2 · 787bdd2
2 parents b001bae + 0b581f8
commit 787bdd2
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 61 deletions.
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@ac-dev/countries-service": "^1.2.0",
-    "@commercelayer/app-elements": "^1.6.3",
+    "@commercelayer/app-elements": "1.6.5",
     "@commercelayer/sdk": "5.21.1",
     "@hookform/resolvers": "^3.3.1",
     "lodash": "^4.17.21",

diff --git a/packages/app/src/components/ReturnInfo.tsx b/packages/app/src/components/ReturnInfo.tsx
@@ -20,7 +20,8 @@ export const ReturnInfo = withSkeletonTemplate<Props>(
       settings: { mode }
     } = useTokenProvider()
 
-    const returnOrderNumber = `#${returnObj?.order?.number}`
+    const returnOrderMarket = returnObj.order?.market?.name
+    const returnOrderNumber = `#${returnObj.order?.number}`
     const navigateToOrder = canAccess('orders')
       ? navigateTo({
           destination: {
@@ -51,10 +52,10 @@ export const ReturnInfo = withSkeletonTemplate<Props>(
           <Text tag='div' weight='semibold'>
             {canAccess('orders') ? (
               <Button variant='link' {...navigateToOrder}>
-                {returnOrderNumber}
+                {`${returnOrderMarket} ${returnOrderNumber}`}
               </Button>
             ) : (
-              returnOrderNumber
+              `${returnOrderMarket} ${returnOrderNumber}`
             )}
           </Text>
         </ListItem>

diff --git a/packages/app/src/components/ReturnSteps.tsx b/packages/app/src/components/ReturnSteps.tsx
@@ -54,11 +54,11 @@ export const ReturnSteps = withSkeletonTemplate<Props>(
         <div>
           <Spacer bottom='2'>
             <Text size='small' tag='div' variant='info' weight='semibold'>
-              To
+              Destination
             </Text>
           </Spacer>
           <Text weight='semibold' className='text-lg'>
-            {returnObj?.order?.market?.name}
+            {returnObj?.stock_location?.name}
           </Text>
         </div>
       </Stack>

diff --git a/packages/app/src/hooks/useReturnDetails.tsx b/packages/app/src/hooks/useReturnDetails.tsx
@@ -2,6 +2,7 @@ import { isMockedId, makeReturn } from '#mocks'
 import { useCoreApi } from '@commercelayer/app-elements'
 
 export const returnIncludeAttribute = [
+  'stock_location',
   'order',
   'order.market',
   'customer',

diff --git a/packages/app/src/pages/ReturnsList.tsx b/packages/app/src/pages/ReturnsList.tsx
@@ -59,10 +59,16 @@ export function ReturnsList(): JSX.Element {
           ItemTemplate={ListItemReturn}
           query={{
             fields: {
-              returns: ['id', 'number', 'updated_at', 'status', 'order'],
+              returns: [
+                'id',
+                'number',
+                'updated_at',
+                'status',
+                'stock_location'
+              ],
               stock_location: ['id', 'name']
             },
-            include: ['stock_location', 'order', 'order.market'],
+            include: ['stock_location'],
             pageSize: 25,
             sort: {
               updated_at: 'desc'

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml