feat(fulfilment): add order reference to the fulfilment view

restorecommerce · Oct 29, 2024 · 1dc6761 · 1dc6761
1 parent 4b6ce8b
commit 1dc6761
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/packages/core/graphql/src/lib/documents/fragments/fulfillment.gql b/packages/core/graphql/src/lib/documents/fragments/fulfillment.gql
@@ -70,6 +70,10 @@ fragment FulfillmentFragment on IoRestorecommerceFulfillmentFulfillment {
     exportDescription
     exportType
   }
+  references {
+    instanceType
+    instanceId
+  }
   fulfillmentState
   meta {
     ...MetaFragment

diff --git a/packages/core/graphql/src/lib/generated/generated.ts b/packages/core/graphql/src/lib/generated/generated.ts
@@ -6070,6 +6070,11 @@ export type FulfillmentFragmentFragment = {
       } | null;
     } | null;
   } | null;
+  references?: Array<{
+    __typename?: 'IoRestorecommerceReferenceReference';
+    instanceType?: string | null;
+    instanceId?: string | null;
+  }> | null;
   meta?: {
     __typename?: 'IoRestorecommerceMetaMeta';
     created?: unknown | null;
@@ -7410,6 +7415,11 @@ export type FulfillmentFulfillmentMutateMutation = {
                   } | null;
                 } | null;
               } | null;
+              references?: Array<{
+                __typename?: 'IoRestorecommerceReferenceReference';
+                instanceType?: string | null;
+                instanceId?: string | null;
+              }> | null;
               meta?: {
                 __typename?: 'IoRestorecommerceMetaMeta';
                 created?: unknown | null;
@@ -7565,6 +7575,11 @@ export type FulfillmentFulfillmentReadQuery = {
                   } | null;
                 } | null;
               } | null;
+              references?: Array<{
+                __typename?: 'IoRestorecommerceReferenceReference';
+                instanceType?: string | null;
+                instanceId?: string | null;
+              }> | null;
               meta?: {
                 __typename?: 'IoRestorecommerceMetaMeta';
                 created?: unknown | null;
@@ -7695,6 +7710,11 @@ export type FulfillmentFulfillmentSubmitMutation = {
                   } | null;
                 } | null;
               } | null;
+              references?: Array<{
+                __typename?: 'IoRestorecommerceReferenceReference';
+                instanceType?: string | null;
+                instanceId?: string | null;
+              }> | null;
               meta?: {
                 __typename?: 'IoRestorecommerceMetaMeta';
                 created?: unknown | null;
@@ -10841,6 +10861,10 @@ export const FulfillmentFragmentFragmentDoc = gql`
       exportDescription
       exportType
     }
+    references {
+      instanceType
+      instanceId
+    }
     fulfillmentState
     meta {
       ...MetaFragment

diff --git a/packages/modules/fulfillment/src/lib/components/fulfillment-view-details.component.html b/packages/modules/fulfillment/src/lib/components/fulfillment-view-details.component.html
@@ -12,6 +12,11 @@
       <span>{{ '' }}</span>
     </div>
 
+    <div class="row justify-content-between align-items-center">
+      <span>Fulfilment order</span>
+      <span>{{ fulfillment.references?.[0]?.instanceId }}</span>
+    </div>
+
     <div class="row justify-content-between align-items-center">
       <span>Fulfilment product</span>
       <span>{{ fulfillment.packaging?.parcels?.[0]?.productId }}</span>

diff --git a/packages/modules/ui/src/lib/components/molecules/order-info/order-info.component.html b/packages/modules/ui/src/lib/components/molecules/order-info/order-info.component.html
@@ -16,19 +16,22 @@
   </div>
   <ul class="data-list-body no-border">
     <li class="row data-list-item justify-between">
-      <div class="flex text">Order number:</div>
+      <div class="flex text">Customer order number:</div>
       <div class="flex text align-right rc-lv-label">
         <ng-container *ngIf="order.customerOrderNr; else naTemplate">{{
           order.customerOrderNr
         }}</ng-container>
       </div>
     </li>
 
+    <!-- TODO is this a commercial or private or governmental customer??
+    A giant view of some sort.
+    -->
     <li class="row data-list-item justify-between">
       <div class="flex text">Customer:</div>
       <div class="flex text align-right rc-lv-label">
-        <ng-container *ngIf="customer; else naTemplate">{{
-          customer.firstName + ' ' + customer.lastName
+        <ng-container *ngIf="order.customerId; else naTemplate">{{
+          order.customerId
         }}</ng-container>
       </div>
     </li>