reactioncommerce · sujithvn · May 18, 2023 · Nov 1, 2022 · Oct 17, 2022 · Oct 18, 2022
diff --git a/apps/reaction/jest.config.cjs b/apps/reaction/jest.config.cjs
@@ -30,8 +30,12 @@ const externalNodeModules = [
   "@reactioncommerce/api-plugin-pricing-simple",
   "@reactioncommerce/api-plugin-products",
   "@reactioncommerce/api-plugin-settings",
-  "@reactioncommerce/api-plugin-shipments-flat-rate",
-  "@reactioncommerce/api-plugin-shipments",
+  "@reactioncommerce/api-plugin-fulfillment",
+  "@reactioncommerce/api-plugin-fulfillment-type-shipping",
+  "@reactioncommerce/api-plugin-fulfillment-type-pickup",
+  "@reactioncommerce/api-plugin-fulfillment-method-shipping-flat-rate",
+  "@reactioncommerce/api-plugin-fulfillment-method-shipping-dynamic-rate",
+  "@reactioncommerce/api-plugin-fulfillment-method-pickup-store",
   "@reactioncommerce/api-plugin-shops",
   "@reactioncommerce/api-plugin-simple-schema",
   "@reactioncommerce/api-plugin-sitemap-generator",

diff --git a/apps/reaction/package.json b/apps/reaction/package.json
@@ -37,6 +37,12 @@
     "@reactioncommerce/api-plugin-email-smtp": "1.0.8",
     "@reactioncommerce/api-plugin-email-templates": "1.1.7",
     "@reactioncommerce/api-plugin-files": "1.1.0",
+    "@reactioncommerce/api-plugin-fulfillment": "1.0.0",
+    "@reactioncommerce/api-plugin-fulfillment-type-shipping": "1.0.0",
+    "@reactioncommerce/api-plugin-fulfillment-type-pickup": "1.0.0",
+    "@reactioncommerce/api-plugin-fulfillment-method-shipping-flat-rate": "1.0.0",
+    "@reactioncommerce/api-plugin-fulfillment-method-shipping-dynamic-rate": "1.0.0",
+    "@reactioncommerce/api-plugin-fulfillment-method-pickup-store": "1.0.0",
     "@reactioncommerce/api-plugin-i18n": "1.0.6",
     "@reactioncommerce/api-plugin-inventory": "1.0.5",
     "@reactioncommerce/api-plugin-inventory-simple": "1.0.6",
@@ -50,8 +56,6 @@
     "@reactioncommerce/api-plugin-pricing-simple": "1.0.7",
     "@reactioncommerce/api-plugin-products": "1.3.1",
     "@reactioncommerce/api-plugin-settings": "1.0.7",
-    "@reactioncommerce/api-plugin-shipments": "1.0.3",
-    "@reactioncommerce/api-plugin-shipments-flat-rate": "1.0.10",
     "@reactioncommerce/api-plugin-shops": "1.3.0",
     "@reactioncommerce/api-plugin-simple-schema": "1.0.3",
     "@reactioncommerce/api-plugin-sitemap-generator": "1.2.3",

diff --git a/apps/reaction/plugins.json b/apps/reaction/plugins.json
@@ -28,8 +28,12 @@
   "discounts": "@reactioncommerce/api-plugin-discounts",
   "discountCodes": "@reactioncommerce/api-plugin-discounts-codes",
   "surcharges": "@reactioncommerce/api-plugin-surcharges",
-  "shipments": "@reactioncommerce/api-plugin-shipments",
-  "shipmentsFlatRate": "@reactioncommerce/api-plugin-shipments-flat-rate",
+  "fulfillment": "@reactioncommerce/api-plugin-fulfillment",
+  "fulfillmentTypeShipping": "@reactioncommerce/api-plugin-fulfillment-type-shipping",
+  "fulfillmentTypePickup": "@reactioncommerce/api-plugin-fulfillment-type-pickup",
+  "fulfillmentMethodShippingFlatRate": "@reactioncommerce/api-plugin-fulfillment-method-shipping-flat-rate",
+  "fulfillmentMethodShippingDynamicRate": "@reactioncommerce/api-plugin-fulfillment-method-shipping-dynamic-rate",
+  "fulfillmentMethodPickupStore": "@reactioncommerce/api-plugin-fulfillment-method-pickup-store",
   "taxes": "@reactioncommerce/api-plugin-taxes",
   "taxesFlatRate": "@reactioncommerce/api-plugin-taxes-flat-rate",
   "navigation": "@reactioncommerce/api-plugin-navigation",

diff --git a/...tests/integration/api/mutations/addOrderFulfillmentGroup/addOrderFulfillmentGroup.test.js b/...tests/integration/api/mutations/addOrderFulfillmentGroup/addOrderFulfillmentGroup.test.js
@@ -24,9 +24,37 @@ const mockShipmentMethod = {
   handling: 0,
   label: "mockLabel",
   name: "mockName",
+  fulfillmentMethod: "flatRate",
   rate: 3.99
 };
 
+const mockFulfillmentEntry = {
+  _id: "mockShippingMethod",
+  name: "Default Shipping Provider",
+  provider: {
+    enabled: true,
+    label: "Flat Rate",
+    name: "flatRates"
+  },
+  fulfillmentType: "shipping",
+  methods: [
+    {
+      cost: 2.5,
+      fulfillmentTypes: [
+        "shipping"
+      ],
+      fulfillmentMethod: "flatRate",
+      group: "Ground",
+      handling: 1.5,
+      label: "Standard mockMethod",
+      name: "mockMethod",
+      rate: 1,
+      _id: "METHOD_ID",
+      enabled: true
+    }
+  ]
+};
+
 const mockInvoice = Factory.OrderInvoice.makeOne({
   currencyCode: "USD",
   // Need to ensure 0 discount to avoid creating negative totals
@@ -58,14 +86,18 @@ beforeAll(async () => {
   testApp.registerPlugin({
     name: "addOrderFulfillmentGroup.test.js",
     functionsByType: {
-      getFulfillmentMethodsWithQuotes: [getFulfillmentMethodsWithQuotes]
+      fulfillmentMethodsWithQuotes: [{ key: "shipping", handler: getFulfillmentMethodsWithQuotes }]
     }
   });
 
   await testApp.start();
 
   shopId = await insertPrimaryShop(testApp.context);
 
+  // Add shipping methods
+  mockFulfillmentEntry.shopId = shopId;
+  await testApp.collections.Fulfillment.insertOne(mockFulfillmentEntry);
+
   const adminGroup = Factory.Group.makeOne({
     _id: "adminGroup",
     createdBy: null,
@@ -165,6 +197,7 @@ test("user with `reaction:legacy:orders/update` role can add an order fulfillmen
   const group = Factory.OrderFulfillmentGroup.makeOne({
     invoice: mockInvoice,
     items: [orderItem],
+    type: "shipping",
     shopId
   });
 
@@ -303,6 +336,7 @@ test("user with `reaction:legacy:orders/move:item` role can add an order fulfill
       currencyCode: "USD"
     },
     shopId,
+    type: "shipping",
     totalItemQuantity: 12
   });
 

diff --git a/apps/reaction/tests/integration/api/mutations/checkout/anonymousCheckout.test.js b/apps/reaction/tests/integration/api/mutations/checkout/anonymousCheckout.test.js
@@ -1,3 +1,4 @@
+import encodeOpaqueId from "@reactioncommerce/api-utils/encodeOpaqueId.js";
 import importAsString from "@reactioncommerce/api-utils/importAsString.js";
 import getCommonData from "./checkoutTestsCommon.js";
 
@@ -269,7 +270,12 @@ describe("as an anonymous user", () => {
       return;
     }
 
-    const option = result.updateFulfillmentOptionsForGroup.cart.checkout.fulfillmentGroups[0].availableFulfillmentOptions[0];
+    const mockFulfillmentMethodId = "mockMethod";
+    const opaqueMockFulfillmentMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockFulfillmentMethodId);
+
+    // From the multiple Fulfillment methods, find out the exact method we are looking for
+    const options = result.updateFulfillmentOptionsForGroup.cart.checkout.fulfillmentGroups[0].availableFulfillmentOptions;
+    const option = options.find((opt) => opt.fulfillmentMethod._id === opaqueMockFulfillmentMethodId);
     opaqueFulfillmentMethodId = option.fulfillmentMethod._id;
 
     expect(option).toEqual({

diff --git a/...eaction/tests/integration/api/mutations/checkout/anonymousToAuthenticatedCheckout.test.js b/...eaction/tests/integration/api/mutations/checkout/anonymousToAuthenticatedCheckout.test.js
@@ -122,6 +122,7 @@ describe("as an anonymous user", () => {
               productId: opaqueProductId,
               productVariantId: opaqueCartProductVariantId
             },
+            selectedFulfillmentType: "shipping",
             quantity: 1
           }
         }
@@ -294,7 +295,12 @@ describe("as an anonymous user", () => {
       return;
     }
 
-    const option = result.updateFulfillmentOptionsForGroup.cart.checkout.fulfillmentGroups[0].availableFulfillmentOptions[0];
+    const mockFulfillmentMethodId = "mockMethod";
+    const opaqueMockFulfillmentMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockFulfillmentMethodId);
+
+    // From the multiple Fulfillment methods, find out the exact method we are looking for
+    const options = result.updateFulfillmentOptionsForGroup.cart.checkout.fulfillmentGroups[0].availableFulfillmentOptions;
+    const option = options.find((opt) => opt.fulfillmentMethod._id === opaqueMockFulfillmentMethodId);
     opaqueFulfillmentMethodId = option.fulfillmentMethod._id;
 
     expect(option).toEqual({

diff --git a/apps/reaction/tests/integration/api/mutations/checkout/authenticatedCheckout.test.js b/apps/reaction/tests/integration/api/mutations/checkout/authenticatedCheckout.test.js
@@ -119,6 +119,7 @@ describe("as a signed in user", () => {
               productId: opaqueProductId,
               productVariantId: opaqueCartProductVariantId
             },
+            selectedFulfillmentType: "shipping",
             quantity: 1
           }
         }
@@ -293,7 +294,12 @@ describe("as a signed in user", () => {
       return;
     }
 
-    const option = result.updateFulfillmentOptionsForGroup.cart.checkout.fulfillmentGroups[0].availableFulfillmentOptions[0];
+    const mockFulfillmentMethodId = "mockMethod";
+    const opaqueMockFulfillmentMethodId = encodeOpaqueId("reaction/fulfillmentMethod", mockFulfillmentMethodId);
+
+    // From the multiple Fulfillment methods, find out the exact method we are looking for
+    const options = result.updateFulfillmentOptionsForGroup.cart.checkout.fulfillmentGroups[0].availableFulfillmentOptions;
+    const option = options.find((opt) => opt.fulfillmentMethod._id === opaqueMockFulfillmentMethodId);
     opaqueFulfillmentMethodId = option.fulfillmentMethod._id;
 
     expect(option).toEqual({

diff --git a/apps/reaction/tests/integration/api/mutations/checkout/checkoutTestsCommon.js b/apps/reaction/tests/integration/api/mutations/checkout/checkoutTestsCommon.js
@@ -73,12 +73,14 @@ const mockShippingMethod = {
     label: "Flat Rate",
     name: "flatRates"
   },
+  fulfillmentType: "shipping",
   methods: [
     {
       cost: 2.5,
       fulfillmentTypes: [
         "shipping"
       ],
+      fulfillmentMethod: "flatRate",
       group: "Ground",
       handling: 1.5,
       label: "Standard mockMethod",
@@ -186,7 +188,7 @@ beforeAll(async () => {
 
   // Add shipping methods
   mockShippingMethod.shopId = internalShopId;
-  await testApp.collections.Shipping.insertOne(mockShippingMethod);
+  await testApp.collections.Fulfillment.insertOne(mockShippingMethod);
 
   // Add Tags and products
   mockProduct.shopId = internalShopId;

diff --git a/apps/reaction/tests/integration/api/mutations/createProduct/createProduct.test.js b/apps/reaction/tests/integration/api/mutations/createProduct/createProduct.test.js
@@ -37,7 +37,7 @@ const expectedProduct = {
     { service: "pinterest", message: "" },
     { service: "twitter", message: "" }
   ],
-  supportedFulfillmentTypes: ["shipping"],
+  supportedFulfillmentTypes: [],
   tagIds: [],
   title: "",
   updatedAt: jasmine.any(String),

diff --git a/apps/reaction/tests/integration/api/mutations/moveOrderItems/moveOrderItems.test.js b/apps/reaction/tests/integration/api/mutations/moveOrderItems/moveOrderItems.test.js
@@ -19,9 +19,37 @@ const mockShipmentMethod = {
   handling: 0,
   label: "mockLabel",
   name: "mockName",
+  fulfillmentMethod: "flatRate",
   rate: 3.99
 };
 
+const mockFulfillmentEntry = {
+  _id: "mockShippingMethod",
+  name: "Default Shipping Provider",
+  provider: {
+    enabled: true,
+    label: "Flat Rate",
+    name: "flatRates"
+  },
+  fulfillmentType: "shipping",
+  methods: [
+    {
+      cost: 2.5,
+      fulfillmentTypes: [
+        "shipping"
+      ],
+      fulfillmentMethod: "flatRate",
+      group: "Ground",
+      handling: 1.5,
+      label: "Standard mockMethod",
+      name: "mockMethod",
+      rate: 1,
+      _id: "METHOD_ID",
+      enabled: true
+    }
+  ]
+};
+
 beforeAll(async () => {
   const getFulfillmentMethodsWithQuotes = (context, commonOrderExtended, [rates]) => {
     rates.push({
@@ -46,13 +74,17 @@ beforeAll(async () => {
   testApp.registerPlugin({
     name: "moveOrderItems.test.js",
     functionsByType: {
-      getFulfillmentMethodsWithQuotes: [getFulfillmentMethodsWithQuotes]
+      fulfillmentMethodsWithQuotes: [{ key: "shipping", handler: getFulfillmentMethodsWithQuotes }]
     }
   });
 
   await testApp.start();
   shopId = await insertPrimaryShop(testApp.context);
 
+  // Add shipping methods
+  mockFulfillmentEntry.shopId = shopId;
+  await testApp.collections.Fulfillment.insertOne(mockFulfillmentEntry);
+
   catalogItem = Factory.Catalog.makeOne({
     isDeleted: false,
     product: Factory.CatalogProduct.makeOne({
@@ -124,6 +156,7 @@ test("user who placed an order can move an order item", async () => {
       ...mockShipmentMethod,
       currencyCode: "USD"
     },
+    type: "shipping",
     shopId
   });
 
@@ -138,6 +171,7 @@ test("user who placed an order can move an order item", async () => {
       ...mockShipmentMethod,
       currencyCode: "USD"
     },
+    type: "shipping",
     shopId
   });
 

diff --git a/...ion/tests/integration/api/mutations/shippingRates/createFlatRateFulfillmentMethod.test.js b/...ion/tests/integration/api/mutations/shippingRates/createFlatRateFulfillmentMethod.test.js
@@ -28,7 +28,7 @@ const adminGroup = Factory.Group.makeOne({
   _id: "adminGroup",
   createdBy: null,
   name: "admin",
-  permissions: ["reaction:legacy:shippingMethods/create"],
+  permissions: ["reaction:legacy:fulfillmentMethods/create"],
   slug: "admin",
   shopId: internalShopId
 });

diff --git a/...ests/integration/api/mutations/shippingRates/createFlatRateFulfillmentRestriction.test.js b/...ests/integration/api/mutations/shippingRates/createFlatRateFulfillmentRestriction.test.js
@@ -32,7 +32,7 @@ const adminGroup = Factory.Group.makeOne({
   _id: "adminGroup",
   createdBy: null,
   name: "admin",
-  permissions: ["reaction:legacy:shippingRestrictions/create"],
+  permissions: ["reaction:legacy:fulfillmentRestrictions/create"],
   slug: "admin",
   shopId: internalShopId
 });
@@ -81,7 +81,7 @@ test("shop owner cannot update flat rate fulfillment restriction if not logged i
   }
 });
 
-test("user with `reaction:legacy:shippingMethods/create` permissions can update flat rate fulfillment restriction", async () => {
+test("user with `reaction:legacy:fulfillmentMethods/create` permissions can update flat rate fulfillment restriction", async () => {
   let result;
   await testApp.setLoggedInUser(mockOwnerAccount);
 

diff --git a/...ion/tests/integration/api/mutations/shippingRates/deleteFlatRateFulfillmentMethod.test.js b/...ion/tests/integration/api/mutations/shippingRates/deleteFlatRateFulfillmentMethod.test.js
@@ -37,7 +37,7 @@ const adminGroup = Factory.Group.makeOne({
   _id: "adminGroup",
   createdBy: null,
   name: "admin",
-  permissions: ["reaction:legacy:shippingMethods/delete"],
+  permissions: ["reaction:legacy:fulfillmentMethods/delete"],
   slug: "admin",
   shopId: internalShopId
 });
@@ -80,7 +80,7 @@ beforeAll(async () => {
   await testApp.collections.Groups.insertOne(adminGroup);
   await testApp.collections.Groups.insertOne(customerGroup);
 
-  await testApp.collections.Shipping.insertOne({
+  await testApp.collections.Fulfillment.insertOne({
     methods: [{
       _id: mockFulfillmentMethodId,
       shopId: internalShopId,
@@ -114,7 +114,7 @@ test("user can not delete flat rate fulfillment method if admin is not logged in
   }
 });
 
-test("user can delete flat rate fulfillment method if they have `reaction:legacy:shippingMethods/delete` permissions", async () => {
+test("user can delete flat rate fulfillment method if they have `reaction:legacy:fulfillmentMethods/delete` permissions", async () => {
   await testApp.setLoggedInUser(mockAdminAccount);
 
   let result;

diff --git a/...ests/integration/api/mutations/shippingRates/deleteFlatRateFulfillmentRestriction.test.js b/...ests/integration/api/mutations/shippingRates/deleteFlatRateFulfillmentRestriction.test.js
@@ -36,7 +36,7 @@ const adminGroup = Factory.Group.makeOne({
   _id: "adminGroup",
   createdBy: null,
   name: "admin",
-  permissions: ["reaction:legacy:shippingRestrictions/delete"],
+  permissions: ["reaction:legacy:fulfillmentRestrictions/delete"],
   slug: "admin",
   shopId: internalShopId
 });
@@ -58,7 +58,7 @@ beforeAll(async () => {
   await testApp.start();
 
   await insertPrimaryShop(testApp.context, { _id: internalShopId, name: shopName });
-  await testApp.collections.FlatRateFulfillmentRestrictions.insertOne(mockFulfillmentRestriction);
+  await testApp.collections.FulfillmentRestrictions.insertOne(mockFulfillmentRestriction);
   await testApp.collections.Groups.insertOne(adminGroup);
 
   await testApp.createUserAndAccount(mockOwnerAccount);

diff --git a/...ion/tests/integration/api/mutations/shippingRates/updateFlatRateFulfillmentMethod.test.js b/...ion/tests/integration/api/mutations/shippingRates/updateFlatRateFulfillmentMethod.test.js
@@ -44,7 +44,7 @@ const adminGroup = Factory.Group.makeOne({
   _id: "adminGroup",
   createdBy: null,
   name: "admin",
-  permissions: ["reaction:legacy:shippingMethods/update"],
+  permissions: ["reaction:legacy:fulfillmentMethods/update"],
   slug: "admin",
   shopId: internalShopId
 });
@@ -87,7 +87,7 @@ beforeAll(async () => {
   await testApp.collections.Groups.insertOne(adminGroup);
   await testApp.collections.Groups.insertOne(customerGroup);
 
-  await testApp.collections.Shipping.insertOne({
+  await testApp.collections.Fulfillment.insertOne({
     methods: [mockFulfillmentMethod],
     shopId: internalShopId
   });