Merge branch 'main' into hotfix-devx-714-fixing-release

Author: ShipilA

changes.md

@@ -3,20 +3,36 @@
 <details>
 <summary>Added Type(s)</summary>
 
+- added type `CartDiscountSetRecurringOrderScopeAction`
 - added type `CartLock`
+- added type `FreezeStrategy`
 - added type `CartLockCartAction`
 - added type `CartSetPurchaseOrderNumberAction`
 - added type `CartUnlockCartAction`
 - added type `CartPurchaseOrderNumberSetMessage`
 - added type `CartPurchaseOrderNumberSetMessagePayload`
+- added type `AnyOrder`
+- added type `AnyOrderDraft`
+- added type `ApplicableRecurrencePolicies`
+- added type `ApplicableRecurrencePoliciesDraft`
+- added type `NonRecurringOrdersOnly`
+- added type `NonRecurringOrdersOnlyDraft`
+- added type `RecurringOrderScope`
+- added type `RecurringOrderScopeDraft`
+- added type `RecurringOrdersOnly`
+- added type `RecurringOrdersOnlyDraft`
 </details>
 
 
 <details>
 <summary>Added Property(s)</summary>
 
+- added property `recurringOrderScope` to type `CartDiscount`
+- added property `recurringOrderScope` to type `CartDiscountDraft`
+- added property `freezeStrategy` to type `Cart`
 - added property `lock` to type `Cart`
 - added property `purchaseOrderNumber` to type `Cart`
 - added property `purchaseOrderNumber` to type `CartDraft`
+- added property `strategy` to type `CartFreezeCartAction`
 </details>
 

commercetools/commercetools-graphql-api/src/main/resources/graphql/schema.graphqls

@@ -682,6 +682,26 @@ enum AnonymousCartSignInMode {
   UseAsNewActiveCustomerCart
 }
 
+"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
+type AnyOrder implements RecurringOrderScope {
+  type: RecurringOrderScopeType!
+}
+
+input AnyOrderInput {
+  dummy: String
+}
+
+"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
+type ApplicableRecurrencePolicies implements RecurringOrderScope {
+  recurrencePolicies: [RecurrencePolicy!]!
+  type: RecurringOrderScopeType!
+  recurrencePoliciesRef: [Reference!]!
+}
+
+input ApplicableRecurrencePoliciesInput {
+  recurrencePolicies: [ResourceIdentifierInput!]!
+}
+
 type Applied implements OrderEditResult {
   excerptBeforeEdit: OrderExcerpt!
   excerptAfterEdit: OrderExcerpt!
@@ -1835,6 +1855,7 @@ type Cart implements Versioned & ReferenceExpandable {
   shippingCustomFields: CustomFieldsType
   discountTypeCombination: DiscountTypeCombination
   cartState: CartState!
+  freezeStrategy: FreezeStrategy
   key: String
   lock: CartLock
   custom: CustomFieldsType
@@ -1903,6 +1924,7 @@ type CartDiscount implements Versioned & ReferenceExpandable {
   lastModifiedAt: DateTime!
   createdBy: Initiator
   lastModifiedBy: Initiator
+  recurringOrderScope: RecurringOrderScope!
 }
 
 type CartDiscountCreated implements MessagePayload {
@@ -1930,6 +1952,7 @@ input CartDiscountDraft {
   key: String
   stores: [ResourceIdentifierInput!]
   discountGroup: ResourceIdentifierInput
+  recurringOrderScope: RecurringOrderScopeInput
 }
 
 type CartDiscountLimitWithCurrent implements LimitWithCurrent {
@@ -2035,6 +2058,7 @@ input CartDiscountUpdateAction {
   setValidFromAndUntil: SetCartDiscountValidFromAndUntil
   setValidUntil: SetCartDiscountValidUntil
   setDiscountGroup: SetCartDiscountDiscountGroup
+  setRecurringOrderScope: SetCartDiscountRecurringOrderScope
 }
 
 interface CartDiscountValue {
@@ -4978,8 +5002,21 @@ input FixedPriceDiscountValueInput {
   money: [CartDiscountValueBaseMoneyInput!]!
 }
 
+enum FreezeStrategy {
+  """
+  More lenient version of a Cart freeze (See [Freeze a Cart](https://docs.commercetools.com/api/carts-orders-overview#freeze-a-cart) for details).
+  """
+  SoftFreeze
+
+  """
+  Stricter version of a Cart freeze (See [Freeze a Cart](https://docs.commercetools.com/api/carts-orders-overview#freeze-a-cart) for details).
+  """
+  HardFreeze
+}
+
 input FreezeCart {
   dummy: String
+  strategy: FreezeStrategy
 }
 
 interface Geometry {
@@ -7363,6 +7400,15 @@ type NestedAttributeDefinitionType implements AttributeDefinitionType {
   name: String!
 }
 
+"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
+type NonRecurringOrdersOnly implements RecurringOrderScope {
+  type: RecurringOrderScopeType!
+}
+
+input NonRecurringOrdersOnlyInput {
+  dummy: String
+}
+
 type NotProcessed implements OrderEditResult {
   type: String!
 }
@@ -11223,6 +11269,25 @@ type RecurringOrderScheduleSet implements MessagePayload {
   type: String!
 }
 
+"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
+interface RecurringOrderScope {
+  type: RecurringOrderScopeType!
+}
+
+input RecurringOrderScopeInput {
+  AnyOrder: AnyOrderInput
+  RecurringOrdersOnly: RecurringOrdersOnlyInput
+  NonRecurringOrdersOnly: NonRecurringOrdersOnlyInput
+  ApplicableRecurrencePolicies: ApplicableRecurrencePoliciesInput
+}
+
+enum RecurringOrderScopeType {
+  AnyOrder
+  NonRecurringOrdersOnly
+  RecurringOrdersOnly
+  ApplicableRecurrencePolicies
+}
+
 type RecurringOrderStartsAtSet implements MessagePayload {
   startsAt: DateTime!
   oldStartsAt: DateTime!
@@ -11271,6 +11336,15 @@ input RecurringOrderUpdateAction {
   transitionState: TransitionRecurringOrderState
 }
 
+"BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
+type RecurringOrdersOnly implements RecurringOrderScope {
+  type: RecurringOrderScopeType!
+}
+
+input RecurringOrdersOnlyInput {
+  dummy: String
+}
+
 type Reference {
   typeId: String!
   id: String!
@@ -12168,13 +12242,18 @@ enum SearchFieldType {
 
 "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
 input SearchFilterExpressionInput {
+  and: [SearchQueryInput!]
+  or: [SearchQueryInput!]
+  not: [SearchQueryInput!]
+  filter: [SearchQueryInput!]
   range: SearchQueryRangeExpressionInput
   fullText: SearchFullTextExpressionInput
   fullTextPrefix: SearchFullTextPrefixInput
   exists: SearchExistsInput
   prefix: SearchAnyValueExpressionInput
   wildcard: SearchAnyValueExpressionInput
   exact: SearchAnyValueExpressionInput
+  fuzzy: SearchFuzzyExpressionInput
 }
 
 "BETA: This feature can be subject to change and should be used carefully in production. https://docs.commercetools.com/api/contract#public-beta"
@@ -12615,6 +12694,10 @@ input SetCartDiscountKey {
   key: String
 }
 
+input SetCartDiscountRecurringOrderScope {
+  recurringOrderScope: RecurringOrderScopeInput!
+}
+
 input SetCartDiscountStores {
   stores: [ResourceIdentifierInput!]
 }

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyCartsCustomerIdByCustomerIdMergePost.java

@@ -16,7 +16,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Merges items from an anonymous Cart into the most recently modified active Cart of a Customer. If no active Cart exists, the anonymous Cart becomes the Customer's active Cart. For more information, see <span>Merge behavior</span>.</p>
+ *  <p>Merges items from an anonymous Cart into the most recently modified active Cart of a Customer. If no active Cart exists, the anonymous Cart becomes the Customer's active Cart. For more information about merge mode behaviors, merge rules, and tax recalculation, see <span>Merge a Cart</span>.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyCartsCustomerIdByCustomerIdMergePostString.java

@@ -17,7 +17,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Merges items from an anonymous Cart into the most recently modified active Cart of a Customer. If no active Cart exists, the anonymous Cart becomes the Customer's active Cart. For more information, see <span>Merge behavior</span>.</p>
+ *  <p>Merges items from an anonymous Cart into the most recently modified active Cart of a Customer. If no active Cart exists, the anonymous Cart becomes the Customer's active Cart. For more information about merge mode behaviors, merge rules, and tax recalculation, see <span>Merge a Cart</span>.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdMergePost.java

@@ -18,7 +18,7 @@
 /**
  *  <p>Merges items from an anonymous Cart into the most recently modified active Cart of a Customer. If no active Cart exists, the anonymous Cart becomes the Customer's active Cart.</p>
  *  <p>If the Cart exists in the Project but does not have a <code>store</code> specified, or the <code>store</code> field references a different Store, a <a href="https://docs.commercetools.com/apis/ctp:api:type:ResourceNotFoundError" rel="nofollow">ResourceNotFound</a> error is returned.</p>
- *  <p>For more information, see <span>Merge behavior</span>.</p>
+ *  <p>For more information about merge mode behaviors, merge rules, and tax recalculation, see <span>Merge a Cart</span>.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/client/ByProjectKeyInStoreKeyByStoreKeyCartsCustomerIdByCustomerIdMergePostString.java

@@ -19,7 +19,7 @@
 /**
  *  <p>Merges items from an anonymous Cart into the most recently modified active Cart of a Customer. If no active Cart exists, the anonymous Cart becomes the Customer's active Cart.</p>
  *  <p>If the Cart exists in the Project but does not have a <code>store</code> specified, or the <code>store</code> field references a different Store, a <a href="https://docs.commercetools.com/apis/ctp:api:type:ResourceNotFoundError" rel="nofollow">ResourceNotFound</a> error is returned.</p>
- *  <p>For more information, see <span>Merge behavior</span>.</p>
+ *  <p>For more information about merge mode behaviors, merge rules, and tax recalculation, see <span>Merge a Cart</span>.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/approval_rule/RuleRequester.java

@@ -34,7 +34,7 @@
 public interface RuleRequester {
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @return associateRole
      */
     @NotNull
@@ -43,7 +43,7 @@ public interface RuleRequester {
     public AssociateRoleKeyReference getAssociateRole();
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param associateRole value to be set
      */
 

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterBuilder.java

@@ -25,7 +25,7 @@ public class RuleRequesterBuilder implements Builder<RuleRequester> {
     private com.commercetools.api.models.associate_role.AssociateRoleKeyReference associateRole;
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param builder function to build the associateRole value
      * @return Builder
      */
@@ -39,7 +39,7 @@ public RuleRequesterBuilder associateRole(
     }
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param builder function to build the associateRole value
      * @return Builder
      */
@@ -52,7 +52,7 @@ public RuleRequesterBuilder withAssociateRole(
     }
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param associateRole value to be set
      * @return Builder
      */
@@ -64,7 +64,7 @@ public RuleRequesterBuilder associateRole(
     }
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @return associateRole
      */
 

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterDraft.java

@@ -34,7 +34,7 @@
 public interface RuleRequesterDraft extends io.vrap.rmf.base.client.Draft<RuleRequesterDraft> {
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @return associateRole
      */
     @NotNull
@@ -43,7 +43,7 @@ public interface RuleRequesterDraft extends io.vrap.rmf.base.client.Draft<RuleRe
     public AssociateRoleResourceIdentifier getAssociateRole();
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param associateRole value to be set
      */
 

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/approval_rule/RuleRequesterDraftBuilder.java

@@ -25,7 +25,7 @@ public class RuleRequesterDraftBuilder implements Builder<RuleRequesterDraft> {
     private com.commercetools.api.models.associate_role.AssociateRoleResourceIdentifier associateRole;
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param builder function to build the associateRole value
      * @return Builder
      */
@@ -39,7 +39,7 @@ public RuleRequesterDraftBuilder associateRole(
     }
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param builder function to build the associateRole value
      * @return Builder
      */
@@ -52,7 +52,7 @@ public RuleRequesterDraftBuilder withAssociateRole(
     }
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @param associateRole value to be set
      * @return Builder
      */
@@ -64,7 +64,7 @@ public RuleRequesterDraftBuilder associateRole(
     }
 
     /**
-     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
+     *  <p>The <a href="https://docs.commercetools.com/apis/ctp:api:type:AssociateRole" rel="nofollow">Associate Role</a> that an <a href="https://docs.commercetools.com/apis/ctp:api:type:Associate" rel="nofollow">Associate</a> must hold for the Approval Rule to apply to the Orders they create.</p>
      * @return associateRole
      */