Deprecate Allocations on pickup point functions template.

order-routing/javascript/pickup-point-delivery-option-generators/default/README.md

@@ -66,15 +66,11 @@ the [schema](./schema.graphql).
 
 ```json
 {
-  "allocations": [
-    {
-      "deliveryAddress": {
-        "countryCode": "CA",
-        "longitude": 43.70,
-        "latitude": -79.42
-      }
-    }
-  ]
+  "deliveryAddres": {
+    "countryCode": "CA",
+    "longitude": 43.70,
+    "latitude": -79.42
+  }
 }
 ```
 

order-routing/javascript/pickup-point-delivery-option-generators/default/schema.graphql

@@ -2940,13 +2940,18 @@ type Input {
   """
   A list of allocations.
   """
-  allocations: [Allocation!]!
+  allocations: [Allocation!]! @deprecated(reason: "Use `deliveryAddress` instead.")
 
   """
   The cart.
   """
   cart: Cart!
 
+  """
+  The delivery address for pickup point delivery option.
+  """
+  deliveryAddress: MailingAddress!
+
   """
   The result of the fetch target. Refer to network access for Shopify Functions.
   """
@@ -4303,7 +4308,7 @@ type PurchasingCompany {
 """
 Represents how products and variants can be sold and purchased.
 """
-type SellingPlan {
+type SellingPlan implements HasMetafields {
   """
   The description of the selling plan.
   """
@@ -4314,6 +4319,21 @@ type SellingPlan {
   """
   id: ID!
 
+  """
+  Returns a metafield by namespace and key that belongs to the resource.
+  """
+  metafield(
+    """
+    The key for the metafield.
+    """
+    key: String!
+
+    """
+    The container the metafield belongs to. If omitted, the app-reserved namespace will be used.
+    """
+    namespace: String
+  ): Metafield
+
   """
   The name of the selling plan. For example, '6 weeks of prepaid granola, delivered weekly'.
   """

order-routing/javascript/pickup-point-delivery-option-generators/default/src/fetch.graphql

@@ -1,9 +1,7 @@
 query FetchInput {
-  allocations {
-    deliveryAddress {
-      countryCode
-      longitude
-      latitude
-    }
+  deliveryAddress{
+    countryCode
+    longitude
+    latitude
   }
 }

order-routing/javascript/pickup-point-delivery-option-generators/default/src/fetch.liquid

@@ -1,12 +1,9 @@
 export function fetch(input) {
-    let deliveryAddress = getUniformDeliveryAddress(input.allocations);
-    if (deliveryAddress) {
-        let { countryCode, longitude, latitude } = deliveryAddress;
-        if (longitude && latitude && countryCode === 'CA') {
-            return {
-                request: buildExternalApiRequest(latitude, longitude),
-            };
-        }
+    let { countryCode, longitude, latitude } = input.deliveryAddress;
+    if (longitude && latitude && countryCode === 'CA') {
+        return {
+            request: buildExternalApiRequest(latitude, longitude),
+        };
     }
     return { request: null };
 }
@@ -28,26 +25,3 @@ function buildExternalApiRequest(latitude, longitude) {
         },
     };
 }
-
-function getUniformDeliveryAddress(allocations) {
-    if (allocations.length === 0) {
-        return null;
-    }
-
-    let deliveryAddress = allocations[0].deliveryAddress;
-
-    for (let i = 1; i < allocations.length; i++) {
-        if (!isDeliveryAddressEqual(allocations[i].deliveryAddress, deliveryAddress)) {
-            console.error("Allocations pointing to different delivery addresses are not supported.");
-            return null;
-        }
-    }
-
-    return deliveryAddress;
-}
-
-function isDeliveryAddressEqual(address1, address2) {
-    return address1.countryCode === address2.countryCode &&
-        address1.longitude === address2.longitude &&
-        address1.latitude === address2.latitude;
-}

order-routing/javascript/pickup-point-delivery-option-generators/default/src/fetch.test.liquid

@@ -8,15 +8,11 @@ import { fetch } from './fetch';
 describe('fetch function', () => {
   it('returns a request when country is Canada', () => {
     const result = fetch({
-      allocations: [
-        {
-          deliveryAddress: {
-            countryCode: 'CA',
-            longitude: 12.3,
-            latitude: 45.6,
-          }
-        }
-      ]
+      deliveryAddress: {
+        countryCode: 'CA',
+        longitude: 12.3,
+        latitude: 45.6,
+      }
     });
     const expected = ({
       request: {
@@ -37,77 +33,13 @@ describe('fetch function', () => {
 
   it('returns no request when country is not Canada', () => {
     const result = fetch({
-      allocations: [
-        {
-          deliveryAddress: {
-            countryCode: 'US',
-            longitude: 12.3,
-            latitude: 45.6,
-          }
-        }
-      ]
-    });
-    const expected = ({ request: null });
-
-    expect(result).toEqual(expected);
-  });
-
-  it('returns no request when allocations have different addresses', () => {
-    const result = fetch({
-      allocations: [
-        {
-          deliveryAddress: {
-            countryCode: 'CA',
-            longitude: 12.3,
-            latitude: 45.6,
-          }
-        },
-        {
-          deliveryAddress: {
-            countryCode: 'CA',
-            longitude: 78.9,
-            latitude: 10.1,
-          }
-        }
-      ]
-    });
-    const expected = ({ request: null });
-
-    expect(result).toEqual(expected);
-  });
-
-  it('returns a request when allocations have the same address', () => {
-    const result = fetch({
-      allocations: [
-        {
-          deliveryAddress: {
-            countryCode: 'CA',
-            longitude: 12.3,
-            latitude: 45.6,
-          }
-        },
-        {
-          deliveryAddress: {
-            countryCode: 'CA',
-            longitude: 12.3,
-            latitude: 45.6,
-          }
-        }
-      ]
-    });
-    const expected = ({
-      request: {
-        body: null,
-        headers: [
-          { name: "Accept", value: "application/json; charset=utf-8" },
-        ],
-        method: 'GET',
-        policy: {
-          readTimeoutMs: 500,
-        },
-        url: 'https://cdn.shopify.com/s/files/1/0628/3830/9033/files/pickup-points-external-api-v1.json?v=1712853748&lat=45.6&lon=12.3',
+      deliveryAddress: {
+        countryCode: 'US',
+        longitude: 12.3,
+        latitude: 45.6,
       }
     });
+    const expected = ({ request: null });
 
     expect(result).toEqual(expected);
   });

order-routing/rust/pickup-point-delivery-option-generators/default/README.md

@@ -66,15 +66,11 @@ the [schema](./schema.graphql).
 
 ```json
 {
-  "allocations": [
-    {
-      "deliveryAddress": {
-        "countryCode": "CA",
-        "longitude": 43.70,
-        "latitude": -79.42
-      }
-    }
-  ]
+  "deliveryAddress": {
+    "countryCode": "CA",
+    "longitude": 43.70,
+    "latitude": -79.42
+  }
 }
 ```
 

order-routing/rust/pickup-point-delivery-option-generators/default/schema.graphql

@@ -2940,13 +2940,18 @@ type Input {
   """
   A list of allocations.
   """
-  allocations: [Allocation!]!
+  allocations: [Allocation!]! @deprecated(reason: "Use `deliveryAddress` instead.")
 
   """
   The cart.
   """
   cart: Cart!
 
+  """
+  The delivery address for pickup point delivery option.
+  """
+  deliveryAddress: MailingAddress!
+
   """
   The result of the fetch target. Refer to network access for Shopify Functions.
   """
@@ -4303,7 +4308,7 @@ type PurchasingCompany {
 """
 Represents how products and variants can be sold and purchased.
 """
-type SellingPlan {
+type SellingPlan implements HasMetafields {
   """
   The description of the selling plan.
   """
@@ -4314,6 +4319,21 @@ type SellingPlan {
   """
   id: ID!
 
+  """
+  Returns a metafield by namespace and key that belongs to the resource.
+  """
+  metafield(
+    """
+    The key for the metafield.
+    """
+    key: String!
+
+    """
+    The container the metafield belongs to. If omitted, the app-reserved namespace will be used.
+    """
+    namespace: String
+  ): Metafield
+
   """
   The name of the selling plan. For example, '6 weeks of prepaid granola, delivered weekly'.
   """

order-routing/rust/pickup-point-delivery-option-generators/default/src/fetch.graphql

@@ -1,9 +1,7 @@
 query Input {
-  allocations {
-    deliveryAddress {
-      countryCode
-      longitude
-      latitude
-    }
+  deliveryAddress{
+    countryCode
+    longitude
+    latitude
   }
 }