reactioncommerce · sujithvn · Oct 4, 2022 · Oct 14, 2022 · Oct 14, 2022 · aldeed
diff --git a/packages/api-plugin-authorization-simple/src/util/defaultRoles.js b/packages/api-plugin-authorization-simple/src/util/defaultRoles.js
@@ -60,6 +60,7 @@ export const defaultShopManagerRoles = [
   "reaction:legacy:products/update:prices",
   "reaction:legacy:products/update",
   "reaction:legacy:shipping-rates/update:settings",
+  "reaction:legacy:fulfillmentTypes/update:settings",
   "reaction:legacy:fulfillmentTypes/create",
   "reaction:legacy:fulfillmentTypes/delete",
   "reaction:legacy:fulfillmentTypes/read",

diff --git a/packages/api-plugin-fulfillment/src/index.js b/packages/api-plugin-fulfillment/src/index.js
@@ -54,6 +54,22 @@ export default async function register(app) {
     },
     simpleSchemas: {
       MethodEmptyData
+    },
+    shopSettingsConfig: {
+      baseFulfillmentTypesForShop: {
+        permissionsThatCanEdit: ["reaction:legacy:fulfillmentTypes/update:settings"],
+        simpleSchema: {
+          type: {
+            "baseFulfillmentTypesForShop": {
+              type: Array,
+              optional: true
+            },
+            "baseFulfillmentTypesForShop.$": {
+              type: String
+            }
+          }
+        }
+      }
     }
   });
 }
diff --git a/packages/api-plugin-fulfillment/src/schemas/schema.graphql b/packages/api-plugin-fulfillment/src/schemas/schema.graphql
@@ -1,3 +1,17 @@
+extend type ShopSettings {
+  """
+  List of fulfillment types that will be added to each new product by default
+  """
+  baseFulfillmentTypesForShop: [FulfillmentType]
+}
+
+extend input ShopSettingsUpdates {
+  """
+  The input for default fulfillment type for shop should be one of the installed fulfillment type plugin
+  """
+  baseFulfillmentTypesForShop: [FulfillmentType]
+}
+
 "Allowed fulfillment types, extended by fulfillment-type plugins"
 enum FulfillmentType {
   "Default fulfillment type when none is decided by user"

diff --git a/packages/api-plugin-products/src/mutations/createProduct.js b/packages/api-plugin-products/src/mutations/createProduct.js
@@ -49,6 +49,15 @@ export default async function createProduct(context, input) {
     throw new ReactionError("invalid-param", "Creating a deleted product is not allowed");
   }
 
+  // Include the base/shop-level fulfillment types for all products
+  // if user has provided additional fulfillment types, include them also
+  const { baseFulfillmentTypesForShop } = await context.queries.appSettings(context, shopId);
+  const { supportedFulfillmentTypes } = initialProductData;
+  let combinedSupportedFulfillmentTypes = [];
+  if (baseFulfillmentTypesForShop) combinedSupportedFulfillmentTypes = [...baseFulfillmentTypesForShop];
+  if (supportedFulfillmentTypes) combinedSupportedFulfillmentTypes = [...combinedSupportedFulfillmentTypes, ...supportedFulfillmentTypes];
+  combinedSupportedFulfillmentTypes = [...new Set(combinedSupportedFulfillmentTypes)];
+
   const createdAt = new Date();
   const newProduct = {
     _id: newProductId,
@@ -59,7 +68,6 @@ export default async function createProduct(context, input) {
     isVisible: false,
     shopId,
     shouldAppearInSitemap: true,
-    supportedFulfillmentTypes: initialProductData.supportedFulfillmentTypes || [],
     title: "",
     type: "simple",
     updatedAt: createdAt,
@@ -68,6 +76,8 @@ export default async function createProduct(context, input) {
     },
     ...initialProductData
   };
+  // Adding this outside to ensure that this is not over-written by the original initialProductData.supportedFulfillmentTypes
+  newProduct.supportedFulfillmentTypes = combinedSupportedFulfillmentTypes || [];
 
   // Apply custom transformations from plugins.
   for (const customFunc of context.getFunctionsOfType("mutateNewProductBeforeCreate")) {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml