Merge branch 'main' into support-35419

Author: ShipilA

changes.md

@@ -17,3 +17,21 @@
 - changed property `newVariantSelection` of type `ProductSelectionVariantSelectionChangedMessagePayload` to be optional
 </details>
 
+
+<details>
+<summary>Added Property(s)</summary>
+
+- added property `interfaceId` to type `MyTransactionDraft`
+- added property `interfaceId` to type `Transaction`
+- added property `interfaceId` to type `TransactionDraft`
+</details>
+
+
+<details>
+<summary>Added Type(s)</summary>
+
+- added type `PaymentTransactionInterfaceIdSetMessage`
+- added type `PaymentTransactionInterfaceIdSetMessagePayload`
+- added type `PaymentSetTransactionInterfaceIdAction`
+</details>
+

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

@@ -7264,6 +7264,7 @@ input MyTransactionDraft {
   amount: MoneyInput!
   interactionId: String
   custom: CustomFieldsDraft
+  interfaceId: String
 }
 
 type NestedAttributeDefinitionType implements AttributeDefinitionType {
@@ -8316,6 +8317,13 @@ type PaymentTransactionAdded implements MessagePayload {
   type: String!
 }
 
+type PaymentTransactionInterfaceIdSet implements MessagePayload {
+  transactionId: String!
+  newInterfaceId: String
+  oldInterfaceId: String
+  type: String!
+}
+
 type PaymentTransactionStateChanged implements MessagePayload {
   transactionId: String!
   state: TransactionState!
@@ -8361,6 +8369,7 @@ input PaymentUpdateAction {
   setStatusInterfaceText: SetPaymentStatusInterfaceText
   setTransactionCustomField: SetPaymentTransactionCustomField
   setTransactionCustomType: SetPaymentTransactionCustomType
+  setTransactionInterfaceId: SetPaymentTransactionInterfaceId
   transitionState: TransitionPaymentState
 }
 
@@ -10891,6 +10900,8 @@ type RecurringOrder implements Versioned {
   customerRef: Reference
   customer: Customer
   customerEmail: String
+  storeRef: KeyReference
+  store: Store
   id: String!
   version: Long!
   createdAt: DateTime!
@@ -13128,6 +13139,11 @@ input SetPaymentTransactionCustomType {
   transactionId: String!
 }
 
+input SetPaymentTransactionInterfaceId {
+  transactionId: String!
+  interfaceId: String
+}
+
 input SetProductAssetCustomField {
   variantId: Int
   sku: String
@@ -16086,6 +16102,7 @@ type Transaction {
   interactionId: String
   state: TransactionState!
   custom: CustomFieldsType
+  interfaceId: String
 }
 
 input TransactionDraft {
@@ -16095,6 +16112,7 @@ input TransactionDraft {
   interactionId: String
   state: TransactionState
   custom: CustomFieldsDraft
+  interfaceId: String
 }
 
 enum TransactionState {

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

@@ -20,10 +20,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Gets the current or staged representation of a <a href="https://docs.commercetools.com/apis/ctp:api:type:Product" rel="nofollow">Product</a> by its ID in the specified <a href="https://docs.commercetools.com/apis/ctp:api:type:Store" rel="nofollow">Store</a>. If the Store has defined some languages, countries, distribution, supply Channels, and/or Product Selection, they are used for projections based on <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionLocales" rel="nofollow">locale</a>, <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionPrices" rel="nofollow">price</a>, and <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionInventoryEntries" rel="nofollow">inventory</a>.</p>
- *  <p>If <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductSelection" rel="nofollow">ProductSelection</a> is used, it affects the <span>availability of the Product</span> in the specified Store.</p>
- *  <p>If a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductTailoring" rel="nofollow">ProductTailoring</a> exists for the Product with the given <code>id</code> and the given Store, this endpoint returns the ProductProjection with tailored data.</p>
- *  <p>When used with an API Client that has the <code>view_published_products:{projectKey}</code> scope, this endpoint only returns published (current) Product Projections.</p>
+ *  <p>Gets the current or staged representation of a <a href="https://docs.commercetools.com/apis/ctp:api:type:Product" rel="nofollow">Product</a> by its ID in the specified <a href="https://docs.commercetools.com/apis/ctp:api:type:Store" rel="nofollow">Store</a>. If the Store has defined some languages, countries, distribution, supply Channels, and/or Product Selection, they are used for projections based on <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionLocales" rel="nofollow">locale</a>, <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionPrices" rel="nofollow">price</a>, and <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionInventoryEntries" rel="nofollow">inventory</a>. If <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductSelection" rel="nofollow">ProductSelection</a> is used, it affects the <span>availability of the Product</span> in the specified Store. If a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductTailoring" rel="nofollow">ProductTailoring</a> exists for the Product with the given <code>id</code> and the given Store, this endpoint returns the ProductProjection with tailored data. When used with an API Client that has the <code>view_published_products:{projectKey}</code> scope, this endpoint only returns published (current) Product Projections.</p>
  *
  * <hr>
  * <div class=code-example>

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

@@ -20,10 +20,7 @@
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
- *  <p>Gets the current or staged representation of a <a href="https://docs.commercetools.com/apis/ctp:api:type:Product" rel="nofollow">Product</a> by its key in the specified <a href="https://docs.commercetools.com/apis/ctp:api:type:Store" rel="nofollow">Store</a>. If the Store has defined some languages, countries, distribution, supply Channels, and/or Product Selection, they are used for projections based on <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionLocales" rel="nofollow">locale</a>, <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionPrices" rel="nofollow">price</a>, and <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionInventoryEntries" rel="nofollow">inventory</a>.</p>
- *  <p>If <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductSelection" rel="nofollow">ProductSelection</a> is used, it affects the <span>availability of the Product</span> in the specified Store.</p>
- *  <p>If a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductTailoring" rel="nofollow">ProductTailoring</a> exists for the Product with the given <code>key</code> and the given Store, this endpoint returns the ProductProjection with tailored data.</p>
- *  <p>When used with an API Client that has the <code>view_published_products:{projectKey}</code> scope, this endpoint only returns published (current) Product Projections.</p>
+ *  <p>Gets the current or staged representation of a <a href="https://docs.commercetools.com/apis/ctp:api:type:Product" rel="nofollow">Product</a> by its key in the specified <a href="https://docs.commercetools.com/apis/ctp:api:type:Store" rel="nofollow">Store</a>. If the Store has defined some languages, countries, distribution, supply Channels, and/or Product Selection, they are used for projections based on <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionLocales" rel="nofollow">locale</a>, <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionPrices" rel="nofollow">price</a>, and <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductProjectionInventoryEntries" rel="nofollow">inventory</a>. If <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductSelection" rel="nofollow">ProductSelection</a> is used, it affects the <span>availability of the Product</span> in the specified Store. If a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductTailoring" rel="nofollow">ProductTailoring</a> exists for the Product with the given <code>key</code> and the given Store, this endpoint returns the ProductProjection with tailored data. When used with an API Client that has the <code>view_published_products:{projectKey}</code> scope, this endpoint only returns published (current) Product Projections.</p>
  *
  * <hr>
  * <div class=code-example>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetDeleteDaysAfterLastModificationAction.java

@@ -14,6 +14,7 @@
 
 /**
  *  <p>Number of days after the last modification before a Cart is deleted.</p>
+ *  <p>Carts with <a href="https://docs.commercetools.com/apis/ctp:api:type:CartOrigin" rel="nofollow">CartOrigin</a> <code>RecurringOrder</code> are not affected by this update action.</p>
  *  <p>If a <a href="https://docs.commercetools.com/apis/ctp:api:type:ChangeSubscription" rel="nofollow">ChangeSubscription</a> exists for Carts, a <a href="https://docs.commercetools.com/apis/ctp:api:type:ResourceDeletedDeliveryPayload" rel="nofollow">ResourceDeletedDeliveryPayload</a> is sent.</p>
  *
  * <hr>

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/cart/CartSetDeleteDaysAfterLastModificationActionImpl.java

@@ -18,6 +18,7 @@
 
 /**
  *  <p>Number of days after the last modification before a Cart is deleted.</p>
+ *  <p>Carts with <a href="https://docs.commercetools.com/apis/ctp:api:type:CartOrigin" rel="nofollow">CartOrigin</a> <code>RecurringOrder</code> are not affected by this update action.</p>
  *  <p>If a <a href="https://docs.commercetools.com/apis/ctp:api:type:ChangeSubscription" rel="nofollow">ChangeSubscription</a> exists for Carts, a <a href="https://docs.commercetools.com/apis/ctp:api:type:ResourceDeletedDeliveryPayload" rel="nofollow">ResourceDeletedDeliveryPayload</a> is sent.</p>
  */
 @Generated(value = "io.vrap.rmf.codegen.rendering.CoreCodeGenerator", comments = "https://github.com/commercetools/rmf-codegen")

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/common/Price.java

@@ -106,6 +106,7 @@ public interface Price extends com.commercetools.api.models.Customizable<Price>,
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      * @return discounted
      */
     @Valid
@@ -195,6 +196,7 @@ public interface Price extends com.commercetools.api.models.Customizable<Price>,
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      * @param discounted value to be set
      */
 

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/common/PriceBuilder.java

@@ -213,6 +213,7 @@ public PriceBuilder validUntil(@Nullable final java.time.ZonedDateTime validUnti
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      * @param builder function to build the discounted value
      * @return Builder
      */
@@ -225,6 +226,7 @@ public PriceBuilder discounted(
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      * @param builder function to build the discounted value
      * @return Builder
      */
@@ -237,6 +239,7 @@ public PriceBuilder withDiscounted(
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      * @param discounted value to be set
      * @return Builder
      */
@@ -493,6 +496,7 @@ public java.time.ZonedDateTime getValidUntil() {
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      * @return discounted
      */
 

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/common/PriceImpl.java

@@ -147,6 +147,7 @@ public java.time.ZonedDateTime getValidUntil() {
 
     /**
      *  <p>Is set if a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscount" rel="nofollow">ProductDiscount</a> has been applied. If set, the API uses the DiscountedPrice value for the <span>Line Item price selection</span>. When a <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueRelative" rel="nofollow">relative discount</a> has been applied and the fraction part of the DiscountedPrice <code>value</code> is 0.5, the <code>value</code> is rounded in favor of the customer with <span>half-down rounding</span>.</p>
+     *  <p>If an <a href="https://docs.commercetools.com/apis/ctp:api:type:ProductDiscountValueAbsolute" rel="nofollow">absolute discount</a> value exceeds the price of the Product Variant, the discounted price is a negative value.</p>
      */
 
     public com.commercetools.api.models.common.DiscountedPrice getDiscounted() {

commercetools/commercetools-sdk-java-api/src/main/java-generated/com/commercetools/api/models/me/MyTransactionDraft.java

@@ -79,6 +79,14 @@ public interface MyTransactionDraft extends com.commercetools.api.models.Customi
     @JsonProperty("custom")
     public CustomFieldsDraft getCustom();
 
+    /**
+     *  <p>Identifier used by the payment service that processes the Payment (for example, a PSP) in the current transaction.</p>
+     * @return interfaceId
+     */
+
+    @JsonProperty("interfaceId")
+    public String getInterfaceId();
+
     /**
      *  <p>Date and time (UTC) the Transaction took place.</p>
      * @param timestamp value to be set
@@ -114,6 +122,13 @@ public interface MyTransactionDraft extends com.commercetools.api.models.Customi
 
     public void setCustom(final CustomFieldsDraft custom);
 
+    /**
+     *  <p>Identifier used by the payment service that processes the Payment (for example, a PSP) in the current transaction.</p>
+     * @param interfaceId value to be set
+     */
+
+    public void setInterfaceId(final String interfaceId);
+
     /**
      * factory method
      * @return instance of MyTransactionDraft
@@ -134,6 +149,7 @@ public static MyTransactionDraft of(final MyTransactionDraft template) {
         instance.setAmount(template.getAmount());
         instance.setInteractionId(template.getInteractionId());
         instance.setCustom(template.getCustom());
+        instance.setInterfaceId(template.getInterfaceId());
         return instance;
     }
 
@@ -155,6 +171,7 @@ public static MyTransactionDraft deepCopy(@Nullable final MyTransactionDraft tem
         instance.setAmount(com.commercetools.api.models.common.Money.deepCopy(template.getAmount()));
         instance.setInteractionId(template.getInteractionId());
         instance.setCustom(com.commercetools.api.models.type.CustomFieldsDraft.deepCopy(template.getCustom()));
+        instance.setInterfaceId(template.getInterfaceId());
         return instance;
     }