diff --git a/packages/acs-client/cfg/config.json b/packages/acs-client/cfg/config.json
index 60ca9aaa..d497b737 100644
--- a/packages/acs-client/cfg/config.json
+++ b/packages/acs-client/cfg/config.json
@@ -142,6 +142,10 @@
       {
         "scopingEntity": "urn:test:acs:model:organization.Organization",
         "value": "orgKey"
+      },
+      {
+        "scopingEntity": "urn:test:acs:model:user.User",
+        "value": "userKey"
       }
     ],
     "hierarchicalResources": [
diff --git a/packages/acs-client/src/acs/decorators.ts b/packages/acs-client/src/acs/decorators.ts
index e3032c18..b65420ea 100644
--- a/packages/acs-client/src/acs/decorators.ts
+++ b/packages/acs-client/src/acs/decorators.ts
@@ -189,7 +189,7 @@ export function access_controlled_function<T extends ResourceList>(kwargs: {
           obligation => obligation.property
         );
 
-        return appResponse //_.omitDeep(appResponse, property);
+        return appResponse; // _.omitDeep(appResponse, property);
       }
       catch (err) {
         return {
diff --git a/packages/acs-client/src/utils.ts b/packages/acs-client/src/utils.ts
index fea86fdf..6324c8d0 100644
--- a/packages/acs-client/src/utils.ts
+++ b/packages/acs-client/src/utils.ts
@@ -108,7 +108,7 @@ const checkSubjectMatch = (user: ResolvedSubject, ruleSubjectAttributes: Attribu
     ));
     logger.debug('Role scoped instances for matching entity', { id: user?.id, ruleRoleScopeEntityName, matchingRoleScopedInstance });
     // validate HR scope root ID contains the role scope instances
-    const hrScopeExist = user?.hierarchical_scopes?.every((hrScope) => matchingRoleScopedInstance.includes(hrScope.id));
+    const hrScopeExist = user?.hierarchical_scopes?.some((hrScope) => matchingRoleScopedInstance.includes(hrScope.id));
     logger.debug('HR Scopes exist', { hrScopeExist });
     if (!hrScopeExist) {
       logger.info('Hierarchial scopes for matching role does not exist', { role: ruleRoleValue, instances: matchingRoleScopedInstance });
@@ -121,15 +121,13 @@ const checkSubjectMatch = (user: ResolvedSubject, ruleSubjectAttributes: Attribu
         reducedUserScope,
         hierarchicalRoleScopingCheck
       );
-    } else {
+    } else if (hrScopeExist && !user.scope) {
       // HR scope match exist but user has not provided scope so still a match is considered
-      if (!user?.scope) {
-        logger.debug('Target scope not provided using full HR tree for matched role', { role: ruleRoleValue });
-        // if no scope is provided then use the complete HR tree for user scopes
-        user?.hierarchical_scopes?.filter((hrScope) => matchingRoleScopedInstance?.includes(hrScope?.id) && hrScope?.role === ruleRoleValue).forEach((eachHRScope) => {
-          reduceUserScope(eachHRScope, reducedUserScope, hierarchicalRoleScopingCheck);
-        });
-      }
+      logger.debug('Target scope not provided using full HR tree for matched role', { role: ruleRoleValue });
+      // if no scope is provided then use the complete HR tree for user scopes
+      user?.hierarchical_scopes?.filter((hrScope) => matchingRoleScopedInstance?.includes(hrScope?.id) && hrScope?.role === ruleRoleValue).forEach((eachHRScope) => {
+        reduceUserScope(eachHRScope, reducedUserScope, hierarchicalRoleScopingCheck);
+      });
       return hrScopeExist;
     }
   } else if (ruleRoleValue) {
@@ -354,8 +352,8 @@ export const buildFilterPermissions = async (
     }
   }
   else {
-    subject.hierarchical_scopes ??= [];
-    subject.role_associations ??= [];
+    subject.hierarchical_scopes ??=[];
+    subject.role_associations ??=[];
   }
 
   const urns = cfg.get('authorization:urns');
diff --git a/packages/acs-client/test/acs.spec.test.ts b/packages/acs-client/test/acs.spec.test.ts
index f7c60461..5f4915df 100644
--- a/packages/acs-client/test/acs.spec.test.ts
+++ b/packages/acs-client/test/acs.spec.test.ts
@@ -49,6 +49,31 @@ const permitRule: RuleRQ = {
   effect: Effect.PERMIT
 };
 
+const permitRuleUserScope: RuleRQ = {
+  id: 'permit_rule_id',
+  target: {
+    actions: [],
+    resources: [{
+      id: 'urn:restorecommerce:acs:names:model:entity',
+      value: 'urn:test:acs:model:Test.Test'
+    }],
+    subjects: [
+      {
+        id: 'urn:restorecommerce:acs:names:role',
+        value: 'user-role'
+      },
+      {
+        id: 'urn:restorecommerce:acs:names:roleScopingEntity',
+        value: 'urn:test:acs:model:user.User'
+      },
+      {
+        id: 'urn:restorecommerce:acs:names:hierarchicalRoleScoping',
+        value: 'false'
+      }]
+  },
+  effect: Effect.PERMIT
+};
+
 const permitRuleNoHrs: RuleRQ = {
   id: 'no_hrs_permit_rule_id',
   target: {
@@ -351,7 +376,7 @@ describe('Testing acs-client', () => {
       );
     });
 
-    it('Should PERMIT creating Test resource with valid user Ctx', async () => {
+    it('Should PERMIT creating Test resource with valid Org scope matching Ctx', async () => {
       // test resource to be created
       const resources: CtxResource[] = updateMetaData([{
         id: 'test_id',
@@ -393,6 +418,57 @@ describe('Testing acs-client', () => {
       should.equal(response.operation_status?.message, 'success');
     });
 
+    it('Should PERMIT creating Test resource with valid User scope matching Ctx', async () => {
+      // test resource to be created
+      const resources: CtxResource[] = updateMetaData([{
+        id: 'test_id',
+        name: 'Test',
+        description: 'This is a test description',
+        meta: {
+          owners: [
+            {
+              id: 'urn:restorecommerce:acs:names:ownerIndicatoryEntity',
+              value: 'urn:test:acs:model:user.User',
+              attributes: [{
+                id: 'urn:restorecommerce:acs:names:ownerInstance',
+                value: 'test_user_id'
+              }]
+            }
+          ]
+        }
+      }]);
+
+      // user ctx data updated in session
+      const subject = {
+        id: 'test_user_id',
+        name: 'test_user',
+        scope: 'targetScope',
+        token: 'valid_token',
+        role_associations: [
+          {
+            role: 'user-role'
+          }
+        ]
+      };
+
+      const ctx: ACSClientContext = {
+        subject,
+        resources,
+      };
+
+      // call accessRequest(), the response is from mock ACS
+      const response = await accessRequest(
+        subject,
+        [{ resource: 'Test', id: resources[0].id }],
+        AuthZAction.CREATE,
+        ctx
+      ) as DecisionResponse;
+
+      should.equal(response.decision, Response_Decision.PERMIT);
+      should.equal(response.operation_status?.code, 200);
+      should.equal(response.operation_status?.message, 'success');
+    });
+
     it('Should DENY reading Test resource (DENY rule)', async () => {
       // PolicySet contains DENY rule
       PolicySetRQFactory.rules = [denyRule];
@@ -520,6 +596,236 @@ describe('Testing acs-client', () => {
       }
     );
 
+    it(
+      'Should DENY reading Test resource (PERMIT rule) with invalid user target scope',
+      async () => {
+        // PolicySet contains PERMIT rule
+        PolicySetRQFactory.rules = [permitRuleUserScope];
+
+        // test resource to be read of type 'ReadRequest'
+        const resources: CtxResource[] = [{
+          id: 'test_id',
+          meta: {
+            owners: []
+          }
+        }];
+
+        // user ctx data updated in session
+        const subject = {
+          id: 'test_user_id',
+          scope: 'invalidUserId',
+          token: 'valid_token',
+          role_associations: [
+            {
+              role: 'user-role',
+              attributes: [
+                {
+                  id: 'urn:restorecommerce:acs:names:roleScopingEntity',
+                  value: 'urn:test:acs:model:user.User',
+                  attributes: [{
+                    id: 'urn:restorecommerce:acs:names:roleScopingInstance',
+                    value: 'test_user_id'
+                  }]
+                }
+              ]
+            }
+          ],
+          hierarchical_scopes: [{
+            id: 'test_user_id',
+            role: 'user-role',
+            children: []
+          }]
+        };
+
+        const ctx: ACSClientContext = {
+          subject,
+          resources,
+        };
+
+        // call accessRequest(), the response is from mock ACS
+        const readResponse = await accessRequest(
+          subject,
+          [{ resource: 'Test', id: resources[0].id }],
+          AuthZAction.READ,
+          ctx, { operation: Operation.whatIsAllowed, database: 'postgres' }
+        ) as PolicySetRQResponse;
+
+        should.equal(readResponse.decision, Response_Decision.DENY);
+        should.equal(readResponse.operation_status?.code, 403);
+        should.equal(
+          readResponse.operation_status?.message,
+          'Access not allowed for request with subject:test_user_id, ' +
+          'resource:Test, action:READ, target_scope:invalidUserId; the response was DENY'
+        );
+      }
+    );
+
+    it(
+      'Should PERMIT reading Test resource (PERMIT rule User scope) without target scope and verify input filter ' +
+      'is extended to enforce applicable policies for matching user role',
+      async () => {
+        // PolicySet contains PERMIT rule
+        PolicySetRQFactory.rules = [permitRuleUserScope];
+
+        // test resource to be read of type 'ReadRequest'
+        const resources: CtxResource[] = [{
+          id: 'test_id',
+          meta: {
+            owners: []
+          }
+        }];
+
+        // user ctx data updated in session
+        const subject = {
+          id: 'test_user_id',
+          // scope: 'targetScope',
+          token: 'valid_token',
+          role_associations: [
+            {
+              role: 'user-role',
+              attributes: [
+                {
+                  id: 'urn:restorecommerce:acs:names:roleScopingEntity',
+                  value: 'urn:test:acs:model:user.User',
+                  attributes: [{
+                    id: 'urn:restorecommerce:acs:names:roleScopingInstance',
+                    value: 'test_user_id'
+                  }]
+                }
+              ]
+            }
+          ],
+          hierarchical_scopes: [{
+            id: 'test_user_id',
+            role: 'user-role',
+            children: []
+          }]
+        };
+
+        const ctx: ACSClientContext = {
+          subject,
+          resources,
+        };
+
+        // call accessRequest(), the response is from mock ACS
+        const readResponse = await accessRequest(
+          subject,
+          [{ resource: 'Test', id: resources[0].id }],
+          AuthZAction.READ,
+          ctx, { operation: Operation.whatIsAllowed, database: 'postgres' }
+        ) as PolicySetRQResponse;
+
+        should.exist(readResponse.decision);
+        should.equal(readResponse.decision, Response_Decision.PERMIT);
+        should.equal(readResponse.operation_status?.code, 200);
+        should.equal(readResponse.operation_status?.message, 'success');
+        // verify input is modified to enforce the applicapble poilicies
+        const filterParamKey = cfg.get('authorization:filterParamKey')[1].value;
+        const expectedFilterResponse = [{
+          field: filterParamKey,
+          operation: 'eq',
+          value: 'test_user_id'
+        }];
+        should.equal(readResponse.filters?.[0]?.resource, 'Test');
+        const filterEntityMap = readResponse.filters;
+        const filters = filterEntityMap?.[0].filters;
+        should.deepEqual(filters?.[0]?.filters?.[0], expectedFilterResponse[0]);
+      }
+    );
+
+    it(
+      'Should PERMIT reading Test resource (PERMIT rule Org Scope and User scope) without target scope and ' +
+      'verify input filter is extended to enforce applicable policies for matching user role',
+      async () => {
+        // PolicySet contains PERMIT rule for OrgScoping and UserScoping entity
+        PolicySetRQFactory.rules = [permitRule, permitRuleUserScope];
+
+        // test resource to be read of type 'ReadRequest'
+        const resources: CtxResource[] = [{
+          id: 'test_id',
+          meta: {
+            owners: []
+          }
+        }];
+
+        // user ctx data updated in session
+        const subject = {
+          id: 'test_user_id',
+          // scope: 'targetScope',
+          token: 'valid_token',
+          role_associations: [
+            {
+              role: 'test-role',
+              attributes: [
+                {
+                  id: 'urn:restorecommerce:acs:names:roleScopingEntity',
+                  value: 'urn:test:acs:model:organization.Organization',
+                  attributes: [{
+                    id: 'urn:restorecommerce:acs:names:roleScopingInstance',
+                    value: 'targetScope'
+                  }]
+                }
+              ]
+            },
+            {
+              role: 'user-role',
+              attributes: [
+                {
+                  id: 'urn:restorecommerce:acs:names:roleScopingEntity',
+                  value: 'urn:test:acs:model:user.User',
+                  attributes: [{
+                    id: 'urn:restorecommerce:acs:names:roleScopingInstance',
+                    value: 'test_user_id'
+                  }]
+                }
+              ]
+            }
+          ],
+          hierarchical_scopes: [{
+            id: 'targetScope',
+            role: 'test-role',
+            children: [{
+              id: 'targetSubScope'
+            }]
+          }, {
+            id: 'test_user_id',
+            role: 'user-role',
+            children: []
+          }]
+        };
+
+        const ctx: ACSClientContext = {
+          subject,
+          resources,
+        };
+
+        // call accessRequest(), the response is from mock ACS
+        const readResponse = await accessRequest(
+          subject,
+          [{ resource: 'Test', id: resources[0].id }],
+          AuthZAction.READ,
+          ctx, { operation: Operation.whatIsAllowed, database: 'postgres' }
+        ) as PolicySetRQResponse;
+
+        should.exist(readResponse.decision);
+        should.equal(readResponse.decision, Response_Decision.PERMIT);
+        should.equal(readResponse.operation_status?.code, 200);
+        should.equal(readResponse.operation_status?.message, 'success');
+        // verify input is modified to enforce the applicapble both Org and User poilicy
+        const orgFilterKey = cfg.get('authorization:filterParamKey')[0].value;
+        const userFilterKey = cfg.get('authorization:filterParamKey')[1].value;
+        const expectedFilterResponse = [
+          { field: orgFilterKey, operation: "eq", value: "targetScope" },
+          { field: orgFilterKey, operation: "eq", value: "targetSubScope" },
+          { field: userFilterKey, operation: "eq", value: "test_user_id" }
+        ];
+        should.equal(readResponse.filters?.[0]?.resource, 'Test');
+        const filterEntityMap = readResponse.filters;
+        const filters = filterEntityMap?.[0].filters;
+        should.deepEqual(filters?.[0]?.filters?.[0], expectedFilterResponse[0]);
+      }
+    );
+
     it(
       'Should PERMIT reading Test resource (PERMIT rule) with HR scoping enabled and verify input filter ' +
       'is extended to enforce applicable policies',
diff --git a/packages/facade/src/modules/fulfillment/gql/schema.generated.ts b/packages/facade/src/modules/fulfillment/gql/schema.generated.ts
index 647de2ba..94f2fc67 100644
--- a/packages/facade/src/modules/fulfillment/gql/schema.generated.ts
+++ b/packages/facade/src/modules/fulfillment/gql/schema.generated.ts
@@ -75,7 +75,7 @@ export type IoRestorecommerceFulfillmentFulfillment = {
   labels?: Maybe<Array<IoRestorecommerceFulfillmentLabel>>;
   trackings?: Maybe<Array<IoRestorecommerceFulfillmentTracking>>;
   totalAmounts?: Maybe<Array<IoRestorecommerceAmountAmount>>;
-  state?: Maybe<IoRestorecommerceFulfillmentState>;
+  fulfillmentState?: Maybe<IoRestorecommerceFulfillmentFulfillmentState>;
 };
 
 export type IoRestorecommerceMetaMeta = {
@@ -549,11 +549,11 @@ export type IoRestorecommerceFulfillmentLabel = {
   png?: Maybe<Scalars['String']['output']>;
   parcelId?: Maybe<Scalars['String']['output']>;
   shipmentNumber?: Maybe<Scalars['String']['output']>;
-  state?: Maybe<IoRestorecommerceFulfillmentState>;
+  state?: Maybe<IoRestorecommerceFulfillmentFulfillmentState>;
   status?: Maybe<IoRestorecommerceStatusStatus>;
 };
 
-export enum IoRestorecommerceFulfillmentState {
+export enum IoRestorecommerceFulfillmentFulfillmentState {
   Pending = 0,
   Invalid = 1,
   Submitted = 2,
@@ -1004,7 +1004,7 @@ export type IIoRestorecommerceFulfillmentFulfillment = {
   labels?: InputMaybe<Array<IIoRestorecommerceFulfillmentLabel>>;
   trackings?: InputMaybe<Array<IIoRestorecommerceFulfillmentTracking>>;
   totalAmounts?: InputMaybe<Array<IIoRestorecommerceAmountAmount>>;
-  state?: InputMaybe<IoRestorecommerceFulfillmentState>;
+  fulfillmentState?: InputMaybe<IoRestorecommerceFulfillmentFulfillmentState>;
 };
 
 export type IIoRestorecommerceFulfillmentPackaging = {
@@ -1052,7 +1052,7 @@ export type IIoRestorecommerceFulfillmentLabel = {
   png?: InputMaybe<Scalars['String']['input']>;
   parcelId?: InputMaybe<Scalars['String']['input']>;
   shipmentNumber?: InputMaybe<Scalars['String']['input']>;
-  state?: InputMaybe<IoRestorecommerceFulfillmentState>;
+  state?: InputMaybe<IoRestorecommerceFulfillmentFulfillmentState>;
   status?: InputMaybe<IIoRestorecommerceStatusStatus>;
 };
 
@@ -1700,7 +1700,7 @@ export type ResolversTypes = ResolversObject<{
   IoRestorecommerceAddressShippingAddress: ResolverTypeWrapper<IoRestorecommerceAddressShippingAddress>;
   IoRestorecommerceAddressContact: ResolverTypeWrapper<IoRestorecommerceAddressContact>;
   IoRestorecommerceFulfillmentLabel: ResolverTypeWrapper<IoRestorecommerceFulfillmentLabel>;
-  IoRestorecommerceFulfillmentState: IoRestorecommerceFulfillmentState;
+  IoRestorecommerceFulfillmentFulfillmentState: IoRestorecommerceFulfillmentFulfillmentState;
   IoRestorecommerceStatusStatus: ResolverTypeWrapper<IoRestorecommerceStatusStatus>;
   IoRestorecommerceFulfillmentTracking: ResolverTypeWrapper<IoRestorecommerceFulfillmentTracking>;
   IoRestorecommerceFulfillmentEvent: ResolverTypeWrapper<IoRestorecommerceFulfillmentEvent>;
@@ -2032,7 +2032,7 @@ export type IoRestorecommerceFulfillmentFulfillmentResolvers<ContextType = Fulfi
   labels?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFulfillmentLabel']>>, ParentType, ContextType>;
   trackings?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFulfillmentTracking']>>, ParentType, ContextType>;
   totalAmounts?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAmountAmount']>>, ParentType, ContextType>;
-  state?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentState']>, ParentType, ContextType>;
+  fulfillmentState?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentFulfillmentState']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
@@ -2501,12 +2501,12 @@ export type IoRestorecommerceFulfillmentLabelResolvers<ContextType = Fulfillment
   png?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   parcelId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   shipmentNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  state?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentState']>, ParentType, ContextType>;
+  state?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentFulfillmentState']>, ParentType, ContextType>;
   status?: Resolver<Maybe<ResolversTypes['IoRestorecommerceStatusStatus']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
-export type IoRestorecommerceFulfillmentStateResolvers = { PENDING: 0, INVALID: 1, SUBMITTED: 2, IN_TRANSIT: 3, COMPLETED: 4, WITHDRAWN: 5, CANCELLED: 6, FAILED: 7 };
+export type IoRestorecommerceFulfillmentFulfillmentStateResolvers = { PENDING: 0, INVALID: 1, SUBMITTED: 2, IN_TRANSIT: 3, COMPLETED: 4, WITHDRAWN: 5, CANCELLED: 6, FAILED: 7 };
 
 export type IoRestorecommerceStatusStatusResolvers<ContextType = FulfillmentContext, ParentType extends ResolversParentTypes['IoRestorecommerceStatusStatus'] = ResolversParentTypes['IoRestorecommerceStatusStatus']> = ResolversObject<{
   id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -3046,7 +3046,7 @@ export type Resolvers<ContextType = FulfillmentContext> = ResolversObject<{
   IoRestorecommerceAddressShippingAddress?: IoRestorecommerceAddressShippingAddressResolvers<ContextType>;
   IoRestorecommerceAddressContact?: IoRestorecommerceAddressContactResolvers<ContextType>;
   IoRestorecommerceFulfillmentLabel?: IoRestorecommerceFulfillmentLabelResolvers<ContextType>;
-  IoRestorecommerceFulfillmentState?: IoRestorecommerceFulfillmentStateResolvers;
+  IoRestorecommerceFulfillmentFulfillmentState?: IoRestorecommerceFulfillmentFulfillmentStateResolvers;
   IoRestorecommerceStatusStatus?: IoRestorecommerceStatusStatusResolvers<ContextType>;
   IoRestorecommerceFulfillmentTracking?: IoRestorecommerceFulfillmentTrackingResolvers<ContextType>;
   IoRestorecommerceFulfillmentEvent?: IoRestorecommerceFulfillmentEventResolvers<ContextType>;
diff --git a/packages/facade/src/modules/ordering/gql/schema.generated.ts b/packages/facade/src/modules/ordering/gql/schema.generated.ts
index 36154781..3bc73956 100644
--- a/packages/facade/src/modules/ordering/gql/schema.generated.ts
+++ b/packages/facade/src/modules/ordering/gql/schema.generated.ts
@@ -70,8 +70,6 @@ export type IoRestorecommerceOrderOrder = {
   shop?: Maybe<IoRestorecommerceShopShop>;
   items?: Maybe<Array<IoRestorecommerceOrderItem>>;
   orderState?: Maybe<IoRestorecommerceOrderOrderState>;
-  fulfillmentState?: Maybe<IoRestorecommerceFulfillmentState>;
-  paymentState?: Maybe<IoRestorecommerceInvoicePaymentState>;
   totalAmounts?: Maybe<Array<IoRestorecommerceAmountAmount>>;
   shippingAddress?: Maybe<IoRestorecommerceAddressShippingAddress>;
   billingAddress?: Maybe<IoRestorecommerceAddressBillingAddress>;
@@ -668,22 +666,6 @@ export enum IoRestorecommerceOrderOrderState {
   Cancelled = 4
 }
 
-export enum IoRestorecommerceFulfillmentState {
-  Pending = 0,
-  Invalid = 1,
-  Submitted = 2,
-  InTransit = 3,
-  Completed = 4,
-  Withdrawn = 5,
-  Cancelled = 6,
-  Failed = 7
-}
-
-export enum IoRestorecommerceInvoicePaymentState {
-  Unpayed = 0,
-  Payed = 1
-}
-
 export type IoRestorecommerceAddressShippingAddress = {
   __typename?: 'IoRestorecommerceAddressShippingAddress';
   address?: Maybe<IoRestorecommerceAddressAddress>;
@@ -937,8 +919,6 @@ export type IIoRestorecommerceOrderOrder = {
   shopId?: InputMaybe<Scalars['String']['input']>;
   items?: InputMaybe<Array<IIoRestorecommerceOrderItem>>;
   orderState?: InputMaybe<IoRestorecommerceOrderOrderState>;
-  fulfillmentState?: InputMaybe<IoRestorecommerceFulfillmentState>;
-  paymentState?: InputMaybe<IoRestorecommerceInvoicePaymentState>;
   totalAmounts?: InputMaybe<Array<IIoRestorecommerceAmountAmount>>;
   shippingAddress?: InputMaybe<IIoRestorecommerceAddressShippingAddress>;
   billingAddress?: InputMaybe<IIoRestorecommerceAddressBillingAddress>;
@@ -1099,7 +1079,7 @@ export type IoRestorecommerceFulfillmentFulfillment = {
   labels?: Maybe<Array<IoRestorecommerceFulfillmentLabel>>;
   trackings?: Maybe<Array<IoRestorecommerceFulfillmentTracking>>;
   totalAmounts?: Maybe<Array<IoRestorecommerceAmountAmount>>;
-  state?: Maybe<IoRestorecommerceFulfillmentState>;
+  fulfillmentState?: Maybe<IoRestorecommerceFulfillmentFulfillmentState>;
 };
 
 export type IoRestorecommerceReferenceReference = {
@@ -1186,10 +1166,21 @@ export type IoRestorecommerceFulfillmentLabel = {
   png?: Maybe<Scalars['String']['output']>;
   parcelId?: Maybe<Scalars['String']['output']>;
   shipmentNumber?: Maybe<Scalars['String']['output']>;
-  state?: Maybe<IoRestorecommerceFulfillmentState>;
+  state?: Maybe<IoRestorecommerceFulfillmentFulfillmentState>;
   status?: Maybe<IoRestorecommerceStatusStatus>;
 };
 
+export enum IoRestorecommerceFulfillmentFulfillmentState {
+  Pending = 0,
+  Invalid = 1,
+  Submitted = 2,
+  InTransit = 3,
+  Completed = 4,
+  Withdrawn = 5,
+  Cancelled = 6,
+  Failed = 7
+}
+
 export type IoRestorecommerceFulfillmentTracking = {
   __typename?: 'IoRestorecommerceFulfillmentTracking';
   shipmentNumber?: Maybe<Scalars['String']['output']>;
@@ -1238,6 +1229,11 @@ export type IoRestorecommerceInvoiceInvoice = {
   withdrawn?: Maybe<Scalars['Boolean']['output']>;
 };
 
+export enum IoRestorecommerceInvoicePaymentState {
+  Unpayed = 0,
+  Payed = 1
+}
+
 export type IoRestorecommerceInvoiceSection = {
   __typename?: 'IoRestorecommerceInvoiceSection';
   id?: Maybe<Scalars['String']['output']>;
@@ -1576,8 +1572,6 @@ export type ResolversTypes = ResolversObject<{
   IoRestorecommerceTaxTax: ResolverTypeWrapper<IoRestorecommerceTaxTax>;
   IoRestorecommerceTaxTypeTaxType: ResolverTypeWrapper<IoRestorecommerceTaxTypeTaxType>;
   IoRestorecommerceOrderOrderState: IoRestorecommerceOrderOrderState;
-  IoRestorecommerceFulfillmentState: IoRestorecommerceFulfillmentState;
-  IoRestorecommerceInvoicePaymentState: IoRestorecommerceInvoicePaymentState;
   IoRestorecommerceAddressShippingAddress: ResolverTypeWrapper<IoRestorecommerceAddressShippingAddress>;
   IoRestorecommerceAddressContact: ResolverTypeWrapper<IoRestorecommerceAddressContact>;
   IoRestorecommerceAddressBillingAddress: ResolverTypeWrapper<IoRestorecommerceAddressBillingAddress>;
@@ -1635,10 +1629,12 @@ export type ResolversTypes = ResolversObject<{
   IoRestorecommerceFulfillmentProductVariant: ResolverTypeWrapper<IoRestorecommerceFulfillmentProductVariant>;
   IoRestorecommerceFulfillmentItem: ResolverTypeWrapper<IoRestorecommerceFulfillmentItem>;
   IoRestorecommerceFulfillmentLabel: ResolverTypeWrapper<IoRestorecommerceFulfillmentLabel>;
+  IoRestorecommerceFulfillmentFulfillmentState: IoRestorecommerceFulfillmentFulfillmentState;
   IoRestorecommerceFulfillmentTracking: ResolverTypeWrapper<IoRestorecommerceFulfillmentTracking>;
   IoRestorecommerceFulfillmentEvent: ResolverTypeWrapper<IoRestorecommerceFulfillmentEvent>;
   IoRestorecommerceInvoiceInvoiceResponse: ResolverTypeWrapper<IoRestorecommerceInvoiceInvoiceResponse>;
   IoRestorecommerceInvoiceInvoice: ResolverTypeWrapper<IoRestorecommerceInvoiceInvoice>;
+  IoRestorecommerceInvoicePaymentState: IoRestorecommerceInvoicePaymentState;
   IoRestorecommerceInvoiceSection: ResolverTypeWrapper<IoRestorecommerceInvoiceSection>;
   IoRestorecommerceInvoicePosition: ResolverTypeWrapper<IoRestorecommerceInvoicePosition>;
   IoRestorecommerceInvoiceProductItem: ResolverTypeWrapper<IoRestorecommerceInvoiceProductItem>;
@@ -1864,8 +1860,6 @@ export type IoRestorecommerceOrderOrderResolvers<ContextType = OrderingContext,
   shop?: Resolver<Maybe<ResolversTypes['IoRestorecommerceShopShop']>, ParentType, ContextType>;
   items?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceOrderItem']>>, ParentType, ContextType>;
   orderState?: Resolver<Maybe<ResolversTypes['IoRestorecommerceOrderOrderState']>, ParentType, ContextType>;
-  fulfillmentState?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentState']>, ParentType, ContextType>;
-  paymentState?: Resolver<Maybe<ResolversTypes['IoRestorecommerceInvoicePaymentState']>, ParentType, ContextType>;
   totalAmounts?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAmountAmount']>>, ParentType, ContextType>;
   shippingAddress?: Resolver<Maybe<ResolversTypes['IoRestorecommerceAddressShippingAddress']>, ParentType, ContextType>;
   billingAddress?: Resolver<Maybe<ResolversTypes['IoRestorecommerceAddressBillingAddress']>, ParentType, ContextType>;
@@ -2448,10 +2442,6 @@ export type IoRestorecommerceTaxTypeTaxTypeResolvers<ContextType = OrderingConte
 
 export type IoRestorecommerceOrderOrderStateResolvers = { PENDING: 0, SUBMITTED: 1, COMPLETED: 2, WITHDRAWN: 3, CANCELLED: 4 };
 
-export type IoRestorecommerceFulfillmentStateResolvers = { PENDING: 0, INVALID: 1, SUBMITTED: 2, IN_TRANSIT: 3, COMPLETED: 4, WITHDRAWN: 5, CANCELLED: 6, FAILED: 7 };
-
-export type IoRestorecommerceInvoicePaymentStateResolvers = { UNPAYED: 0, PAYED: 1 };
-
 export type IoRestorecommerceAddressShippingAddressResolvers<ContextType = OrderingContext, ParentType extends ResolversParentTypes['IoRestorecommerceAddressShippingAddress'] = ResolversParentTypes['IoRestorecommerceAddressShippingAddress']> = ResolversObject<{
   address?: Resolver<Maybe<ResolversTypes['IoRestorecommerceAddressAddress']>, ParentType, ContextType>;
   contact?: Resolver<Maybe<ResolversTypes['IoRestorecommerceAddressContact']>, ParentType, ContextType>;
@@ -2567,7 +2557,7 @@ export type IoRestorecommerceFulfillmentFulfillmentResolvers<ContextType = Order
   labels?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFulfillmentLabel']>>, ParentType, ContextType>;
   trackings?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFulfillmentTracking']>>, ParentType, ContextType>;
   totalAmounts?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceAmountAmount']>>, ParentType, ContextType>;
-  state?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentState']>, ParentType, ContextType>;
+  fulfillmentState?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentFulfillmentState']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
@@ -2654,11 +2644,13 @@ export type IoRestorecommerceFulfillmentLabelResolvers<ContextType = OrderingCon
   png?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   parcelId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   shipmentNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
-  state?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentState']>, ParentType, ContextType>;
+  state?: Resolver<Maybe<ResolversTypes['IoRestorecommerceFulfillmentFulfillmentState']>, ParentType, ContextType>;
   status?: Resolver<Maybe<ResolversTypes['IoRestorecommerceStatusStatus']>, ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
+export type IoRestorecommerceFulfillmentFulfillmentStateResolvers = { PENDING: 0, INVALID: 1, SUBMITTED: 2, IN_TRANSIT: 3, COMPLETED: 4, WITHDRAWN: 5, CANCELLED: 6, FAILED: 7 };
+
 export type IoRestorecommerceFulfillmentTrackingResolvers<ContextType = OrderingContext, ParentType extends ResolversParentTypes['IoRestorecommerceFulfillmentTracking'] = ResolversParentTypes['IoRestorecommerceFulfillmentTracking']> = ResolversObject<{
   shipmentNumber?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   events?: Resolver<Maybe<Array<ResolversTypes['IoRestorecommerceFulfillmentEvent']>>, ParentType, ContextType>;
@@ -2707,6 +2699,8 @@ export type IoRestorecommerceInvoiceInvoiceResolvers<ContextType = OrderingConte
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
 }>;
 
+export type IoRestorecommerceInvoicePaymentStateResolvers = { UNPAYED: 0, PAYED: 1 };
+
 export type IoRestorecommerceInvoiceSectionResolvers<ContextType = OrderingContext, ParentType extends ResolversParentTypes['IoRestorecommerceInvoiceSection'] = ResolversParentTypes['IoRestorecommerceInvoiceSection']> = ResolversObject<{
   id?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   customerRemark?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
@@ -2904,8 +2898,6 @@ export type Resolvers<ContextType = OrderingContext> = ResolversObject<{
   IoRestorecommerceTaxTax?: IoRestorecommerceTaxTaxResolvers<ContextType>;
   IoRestorecommerceTaxTypeTaxType?: IoRestorecommerceTaxTypeTaxTypeResolvers<ContextType>;
   IoRestorecommerceOrderOrderState?: IoRestorecommerceOrderOrderStateResolvers;
-  IoRestorecommerceFulfillmentState?: IoRestorecommerceFulfillmentStateResolvers;
-  IoRestorecommerceInvoicePaymentState?: IoRestorecommerceInvoicePaymentStateResolvers;
   IoRestorecommerceAddressShippingAddress?: IoRestorecommerceAddressShippingAddressResolvers<ContextType>;
   IoRestorecommerceAddressContact?: IoRestorecommerceAddressContactResolvers<ContextType>;
   IoRestorecommerceAddressBillingAddress?: IoRestorecommerceAddressBillingAddressResolvers<ContextType>;
@@ -2935,10 +2927,12 @@ export type Resolvers<ContextType = OrderingContext> = ResolversObject<{
   IoRestorecommerceFulfillmentProductVariant?: IoRestorecommerceFulfillmentProductVariantResolvers<ContextType>;
   IoRestorecommerceFulfillmentItem?: IoRestorecommerceFulfillmentItemResolvers<ContextType>;
   IoRestorecommerceFulfillmentLabel?: IoRestorecommerceFulfillmentLabelResolvers<ContextType>;
+  IoRestorecommerceFulfillmentFulfillmentState?: IoRestorecommerceFulfillmentFulfillmentStateResolvers;
   IoRestorecommerceFulfillmentTracking?: IoRestorecommerceFulfillmentTrackingResolvers<ContextType>;
   IoRestorecommerceFulfillmentEvent?: IoRestorecommerceFulfillmentEventResolvers<ContextType>;
   IoRestorecommerceInvoiceInvoiceResponse?: IoRestorecommerceInvoiceInvoiceResponseResolvers<ContextType>;
   IoRestorecommerceInvoiceInvoice?: IoRestorecommerceInvoiceInvoiceResolvers<ContextType>;
+  IoRestorecommerceInvoicePaymentState?: IoRestorecommerceInvoicePaymentStateResolvers;
   IoRestorecommerceInvoiceSection?: IoRestorecommerceInvoiceSectionResolvers<ContextType>;
   IoRestorecommerceInvoicePosition?: IoRestorecommerceInvoicePositionResolvers<ContextType>;
   IoRestorecommerceInvoiceProductItem?: IoRestorecommerceInvoiceProductItemResolvers<ContextType>;