Răsfoiți Sursa

feat(admin-ui): Allow fulfillment when in PartiallyDelivered state

Relates to #565
Michael Bromley 5 ani în urmă
părinte
comite
b36ce3829c

+ 3 - 1
packages/admin-ui/src/lib/order/src/components/order-detail/order-detail.component.ts

@@ -204,7 +204,9 @@ export class OrderDetailComponent
             .every(item => !!item.fulfillment);
         return (
             !allItemsFulfilled &&
-            (order.nextStates.includes('Shipped') || order.nextStates.includes('PartiallyShipped'))
+            (order.nextStates.includes('Shipped') ||
+                order.nextStates.includes('PartiallyShipped') ||
+                order.nextStates.includes('Delivered'))
         );
     }
 

+ 2 - 0
packages/admin-ui/src/lib/settings/src/public_api.ts

@@ -10,6 +10,7 @@ export * from './components/global-settings/global-settings.component';
 export * from './components/payment-method-detail/payment-method-detail.component';
 export * from './components/payment-method-list/payment-method-list.component';
 export * from './components/permission-grid/permission-grid.component';
+export * from './components/profile/profile.component';
 export * from './components/role-detail/role-detail.component';
 export * from './components/role-list/role-list.component';
 export * from './components/shipping-eligibility-test-result/shipping-eligibility-test-result.component';
@@ -32,6 +33,7 @@ export * from './providers/routing/channel-resolver';
 export * from './providers/routing/country-resolver';
 export * from './providers/routing/global-settings-resolver';
 export * from './providers/routing/payment-method-resolver';
+export * from './providers/routing/profile-resolver';
 export * from './providers/routing/role-resolver';
 export * from './providers/routing/shipping-method-resolver';
 export * from './providers/routing/tax-category-resolver';