Rewrite placeOrder and support multiple payments for an order

client/modules/i18n/currency.js

@@ -43,6 +43,7 @@ export function findCurrency(defaultCurrency, useDefaultShopCurrency) {
 
 /**
  * @name formatPriceString
+ * @deprecated Slowly migrating everything to use `formatMoney` from "/imports/utils/formatMoney" instead
  * @summary Return shop/locale specific formatted price. Also accepts a range formatted with " - ".
  * @memberof i18n
  * @method

imports/collections/schemas/orders.js

@@ -342,7 +342,6 @@ export const OrderFulfillmentGroup = new SimpleSchema({
   },
   "items.$": OrderItem,
   "itemIds": [String],
-  "payment": Payment,
   "shipmentMethod": SelectedFulfillmentOption,
   "shippingLabelUrl": {
     type: String,
@@ -372,6 +371,7 @@ export const OrderFulfillmentGroup = new SimpleSchema({
  * @property {String} _id required
  * @property {String} accountId Account ID for account orders, or null for anonymous
  * @property {String} anonymousAccessToken Token for accessing anonymous carts, null for account carts
+ * @property {Address} [billingAddress] Optional billing address
  * @property {String} cartId optional For tracking which cart created this order
  * @property {Date} createdAt required
  * @property {String} currencyCode required
@@ -380,6 +380,7 @@ export const OrderFulfillmentGroup = new SimpleSchema({
  * @property {Object[]} exportHistory optional
  * @property {History[]} history optional
  * @property {Notes[]} notes optional
+ * @property {Payment[]} payments Array of payments
  * @property {Shipment[]} shipping Array of fulfillment groups
  * @property {String} shopId required The owner shop
  * @property {OrderTransaction[]} transactions optional
@@ -401,6 +402,13 @@ export const Order = new SimpleSchema({
     index: 1,
     optional: true
   },
+  // Although billing address is typically needed only by the payment plugin,
+  // some tax services require it to calculate taxes for digital items. Thus
+  // it should be provided here in order to be added to the CommonOrder if possible.
+  "billingAddress": {
+    type: Address,
+    optional: true
+  },
   "cartId": {
     type: String,
     optional: true
@@ -438,6 +446,11 @@ export const Order = new SimpleSchema({
     optional: true
   },
   "notes.$": Notes,
+  "payments": {
+    type: Array,
+    optional: true
+  },
+  "payments.$": Payment,
   "referenceId": String,
   "shipping": [OrderFulfillmentGroup],
   "shopId": {

imports/collections/schemas/payments.js

@@ -15,6 +15,7 @@ import { Address } from "./address";
  * @property {Number} total Grand total
  */
 export const Invoice = new SimpleSchema({
+  currencyCode: String,
   discounts: {
     type: Number,
     min: 0
@@ -79,6 +80,7 @@ registerSchema("CurrencyExchangeRate", CurrencyExchangeRate);
  * @property {String} [cardBrand] The brand of card, if the payment method was a credit card
  * @property {CurrencyExchangeRate} [currency] The exchange rate, if the user's currency is different from shop's
  * @property {Object} [data] Arbitrary data that the payment method needs
+ * @property {String} mode "authorize" if still needs to be captured, or "capture" if captured. "cancel" if auth was canceled.
  * @property {Invoice} invoice A summary of the totals that make up the full charge amount. Created when the payment is added to an order.
  * @property {String} shopId The ID of the shop that is being paid. This might be a merchant shop in a marketplace setup.
  */
@@ -92,6 +94,14 @@ export const Payment = new SimpleSchema({
     optional: true
   },
   "amount": Number,
+  "captureErrorCode": {
+    type: String,
+    optional: true
+  },
+  "captureErrorMessage": {
+    type: String,
+    optional: true
+  },
   "cardBrand": {
     type: String,
     optional: true
@@ -108,7 +118,6 @@ export const Payment = new SimpleSchema({
     blackbox: true
   },
   "displayName": String,
-  "invoice": Invoice,
   "method": String,
   "mode": String,
   "name": String,

imports/node-app/core/util/appEvents.js

@@ -1,3 +1,5 @@
+import Logger from "@reactioncommerce/logger";
+
 /**
  * This is a temporary events solution on our path to
  * event streams and services. For now, some code relies
@@ -7,16 +9,25 @@
 
 /**
  * @summary calls each function in an array with args, one at a time
+ * @param {String} name Event name
  * @param {Function[]} funcs List of functions to call
  * @param {Array} args Arguments to pass to each function
  * @returns {undefined} Promise that resolves with undefined after all
  *   functions in the list have been called
  */
-async function synchronousPromiseLoop(funcs, args) {
+async function synchronousPromiseLoop(name, funcs, args) {
   const func = funcs.shift();
-  await func(...args);
+
+  // One function failing should not prevent others from running,
+  // so catch and log
+  try {
+    await func(...args);
+  } catch (error) {
+    Logger.error(`Error in "${name}" consumer`, error);
+  }
+
   if (funcs.length) {
-    await synchronousPromiseLoop(funcs, args);
+    await synchronousPromiseLoop(name, funcs, args);
   }
 }
 
@@ -28,7 +39,7 @@ class AppEvents {
 
     // Can't use forEach or map because we want each func to wait
     // until the previous func promise resolves
-    await synchronousPromiseLoop(this.handlers[name].slice(0), args);
+    await synchronousPromiseLoop(name, this.handlers[name].slice(0), args);
   }
 
   on(name, func) {

imports/node-app/devserver/mutations.js

@@ -1,8 +1,25 @@
 import { merge } from "lodash";
+// CORE
 import accounts from "/imports/plugins/core/accounts/server/no-meteor/mutations";
 import cart from "/imports/plugins/core/cart/server/no-meteor/mutations";
 import catalog from "/imports/plugins/core/catalog/server/no-meteor/mutations";
+import navigation from "/imports/plugins/core/navigation/server/no-meteor/mutations";
 import orders from "/imports/plugins/core/orders/server/no-meteor/mutations";
+import payments from "/imports/plugins/core/payments/server/no-meteor/mutations";
+import shipping from "/imports/plugins/core/shipping/server/no-meteor/mutations";
 import taxes from "/imports/plugins/core/taxes/server/no-meteor/mutations";
+// INCLUDED
+import shippingRates from "/imports/plugins/included/shipping-rates/server/no-meteor/mutations";
 
-export default merge({}, accounts, cart, catalog, orders, taxes);
+export default merge(
+  {},
+  accounts,
+  cart,
+  catalog,
+  navigation,
+  orders,
+  payments,
+  shipping,
+  taxes,
+  shippingRates
+);

imports/node-app/devserver/queries.js

@@ -1,10 +1,25 @@
 import { merge } from "lodash";
+// CORE
 import accounts from "/imports/plugins/core/accounts/server/no-meteor/queries";
 import address from "/imports/plugins/core/address/server/no-meteor/queries";
 import cart from "/imports/plugins/core/cart/server/no-meteor/queries";
 import catalog from "/imports/plugins/core/catalog/server/no-meteor/queries";
 import core from "/imports/plugins/core/core/server/no-meteor/queries";
+import navigation from "/imports/plugins/core/navigation/server/no-meteor/queries";
 import orders from "/imports/plugins/core/orders/server/no-meteor/queries";
 import taxes from "/imports/plugins/core/taxes/server/no-meteor/queries";
+// INCLUDED
+import shippingRates from "/imports/plugins/included/shipping-rates/server/no-meteor/queries";
 
-export default merge({}, accounts, address, cart, catalog, core, orders, taxes);
+export default merge(
+  {},
+  accounts,
+  address,
+  cart,
+  catalog,
+  core,
+  navigation,
+  orders,
+  taxes,
+  shippingRates
+);

imports/node-app/devserver/resolvers.js

@@ -1,17 +1,17 @@
+// CORE
 import { merge } from "lodash";
 import accounts from "/imports/plugins/core/accounts/server/no-meteor/resolvers";
 import address from "/imports/plugins/core/address/server/no-meteor/resolvers";
 import cart from "/imports/plugins/core/cart/server/no-meteor/resolvers";
 import catalog from "/imports/plugins/core/catalog/server/no-meteor/resolvers";
 import core from "/imports/plugins/core/core/server/no-meteor/resolvers";
+import navigation from "/imports/plugins/core/navigation/server/no-meteor/resolvers";
 import orders from "/imports/plugins/core/orders/server/no-meteor/resolvers";
 import payments from "/imports/plugins/core/payments/server/no-meteor/resolvers";
 import product from "/imports/plugins/core/product/server/no-meteor/resolvers";
 import shipping from "/imports/plugins/core/shipping/server/no-meteor/resolvers";
 import taxes from "/imports/plugins/core/taxes/server/no-meteor/resolvers";
-import marketplace from "/imports/plugins/included/marketplace/server/no-meteor/resolvers";
-import paymentsExample from "/imports/plugins/included/payments-example/server/no-meteor/resolvers";
-import paymentsStripe from "/imports/plugins/included/payments-stripe/server/no-meteor/resolvers";
+// INCLUDED
 import shippingRates from "/imports/plugins/included/shipping-rates/server/no-meteor/resolvers";
 
 export default merge(
@@ -21,13 +21,11 @@ export default merge(
   cart,
   catalog,
   core,
+  navigation,
   orders,
   payments,
   product,
   shipping,
   taxes,
-  marketplace,
-  paymentsExample,
-  paymentsStripe,
   shippingRates
 );

imports/plugins/core/address/server/no-meteor/schemas/schema.graphql

@@ -39,6 +39,11 @@ input AddressInput {
   "Optional second line"
   address2: String
 
+  """
+  Optionally, a name for this address (e.g. "Home") to easily identify it in the future
+  """
+  addressName: String
+
   "City"
   city: String!
 
@@ -74,9 +79,9 @@ input AddressInput {
 }
 
 "Represents a physical or mailing address somewhere on Earth"
-type Address implements Node {
+type Address {
   "The address ID"
-  _id: ID!
+  _id: ID
 
   "The street address / first line"
   address1: String!
@@ -119,15 +124,15 @@ type Address implements Node {
 }
 
 "Wraps a list of `Addresses`, providing pagination cursors and information."
-type AddressConnection implements NodeConnection {
+type AddressConnection {
   edges: [AddressEdge]
   nodes: [Address]
   pageInfo: PageInfo!
   totalCount: Int!
 }
 
 "A connection edge in which each node is an `Address` object"
-type AddressEdge implements NodeEdge {
+type AddressEdge {
   cursor: ConnectionCursor!
   node: Address
 }

imports/plugins/core/cart/server/no-meteor/resolvers/FulfillmentGroup/index.js

@@ -1,5 +1,7 @@
 import { encodeFulfillmentGroupOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/cart";
+import { resolveShopFromShopId } from "@reactioncommerce/reaction-graphql-utils";
 
 export default {
-  _id: (node) => encodeFulfillmentGroupOpaqueId(node._id)
+  _id: (node) => encodeFulfillmentGroupOpaqueId(node._id),
+  shop: resolveShopFromShopId
 };

imports/plugins/core/cart/server/no-meteor/schemas/checkout.graphql

@@ -45,6 +45,12 @@ type FulfillmentGroup implements Node {
   "The fulfillment method selected by a shopper for this group, with its associated price"
   selectedFulfillmentOption: FulfillmentOption
 
+  "The shipping address collected for this group, if relevant"
+  shippingAddress: Address
+
+  "The shop that owns the items in this group and is responsible for fulfillment"
+  shop: Shop!
+
   """
   The fulfillment type. Any valid type that has been registered by a fulfillment plugin. Examples: "shipping", "digital"
   """

imports/plugins/core/catalog/server/no-meteor/utils/getPriceRange.js

@@ -1,37 +1,5 @@
-import accounting from "accounting-js";
 import getDisplayPrice from "./getDisplayPrice";
 
-/**
- * A wrapper around accounting.formatMoney that handles minor differences between Reaction
- * API and accounting.js API.
- * @param {Number} price - A price (float)
- * @param {Object} [currencyInfo] - A currency object in Reaction schema
- * @returns {String} Formatted currency string such as "$15.99". If `currencyInfo` is not provided,
- *   returns `accounting.toFixed(price, 2)`.
- */
-export function formatMoney(price, currencyInfo) {
-  // Implementation of toFixed() that treats floats more like decimal values than binary,
-  // fixing inconsistent precision rounding in JavaScript (where some .05 values round up,
-  // while others round down):
-  if (!currencyInfo) return accounting.toFixed(price, 2);
-
-  // If there are no decimal places, in the case of the Japanese Yen, we adjust it here.
-  let priceToFormat = price;
-  if (currencyInfo.scale === 0) {
-    priceToFormat = price * 100;
-  }
-
-  const currencyFormatSettings = { ...currencyInfo };
-
-  // Precision is mis-used in accounting js. Scale is the proper term for number
-  // of decimal places. Let's adjust it here so accounting.js does not break.
-  if (typeof currencyInfo.scale === "number") {
-    currencyFormatSettings.precision = currencyInfo.scale;
-  }
-
-  return accounting.formatMoney(priceToFormat, currencyFormatSettings);
-}
-
 /**
  *
  * @method getPriceRange

imports/plugins/core/core/server/Reaction/core.js

@@ -15,7 +15,6 @@ import {
   customPublishedProductVariantFields,
   functionsByType,
   mutations,
-  paymentMethods,
   queries,
   resolvers,
   schemas
@@ -118,15 +117,6 @@ export default {
       });
     }
 
-    if (packageInfo.paymentMethods) {
-      for (const paymentMethod of packageInfo.paymentMethods) {
-        paymentMethods[paymentMethod.name] = {
-          ...paymentMethod,
-          pluginName: packageInfo.name
-        };
-      }
-    }
-
     if (packageInfo.catalog) {
       const { publishedProductFields, publishedProductVariantFields } = packageInfo.catalog;
       if (Array.isArray(publishedProductFields)) {

imports/plugins/core/core/server/fixtures/packages.js

@@ -29,11 +29,6 @@ export const getPkgData = (pkgName) => {
  * @property {Object} settings - Object
  * @property {Boolean} settings.mode - `false`
  * @property {String} settings.apikey - `""`
- * @property {Object} example - Object
- * @property {Boolean} example.enabled - `false`
- * @property {Object} example-paymentmethod - Object
- * @property {Boolean} example-paymentmethod.enabled - `true`
- * @property {Array} example-paymentmethod.support - `["Authorize", "Capture", "Refund"]`
  * @property {Array} registry - `[]`
  * @property {Object} layout - `null`
  */
@@ -44,15 +39,8 @@ export function examplePaymentMethod() {
     shopId: getShopId(),
     enabled: true,
     settings: {
-      "mode": false,
-      "apikey": "",
-      "example": {
-        enabled: false
-      },
-      "example-paymentmethod": {
-        enabled: true,
-        support: ["Authorize", "Capture", "Refund"]
-      }
+      mode: false,
+      apikey: ""
     },
     registry: [],
     layout: null