Merge pull request #4659 from opencollective/fix/new-cf-vat

createOrder: Fix tax ID number
opencollective · Oct 5, 2020 · 964af7a · 964af7a
2 parents a580ca9 + 0aef5ad
commit 964af7a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "@hyperwatch/hyperwatch": "3.7.1",
     "@octokit/auth-oauth-app": "3.0.5",
     "@octokit/rest": "18.0.6",
-    "@opencollective/taxes": "3.0.0",
+    "@opencollective/taxes": "3.1.0",
     "@paypal/payouts-sdk": "^1.0.0",
     "algoliasearch": "3.35.1",
     "apollo-server-express": "2.18.1",

diff --git a/server/graphql/v1/mutations/orders.js b/server/graphql/v1/mutations/orders.js
@@ -394,10 +394,10 @@ export async function createOrder(order, loaders, remoteUser, reqIp) {
       if (netAmountForCollective !== expectedAmountForCollective || order.taxAmount !== expectedTaxAmount) {
         const prettyTotalAmount = formatCurrency(order.totalAmount, currency, 2);
         const prettyExpectedAmount = formatCurrency(expectedAmountForCollective, currency, 2);
-        const taxInfo = expectedTaxAmount ? ` + ${formatCurrency(expectedTaxAmount, currency, 2)} tax` : '';
+        const taxInfoStr = expectedTaxAmount ? ` + ${formatCurrency(expectedTaxAmount, currency, 2)} tax` : '';
         const platformFeeInfo = order.platformFee ? ` + ${formatCurrency(order.platformFee, currency, 2)} fees` : '';
         throw new Error(
-          `This tier uses a fixed amount. Order total must be ${prettyExpectedAmount}${taxInfo}${platformFeeInfo}. You set: ${prettyTotalAmount}`,
+          `This tier uses a fixed amount. Order total must be ${prettyExpectedAmount}${taxInfoStr}${platformFeeInfo}. You set: ${prettyTotalAmount}`,
         );
       }
     }

diff --git a/server/graphql/v2/mutation/OrderMutations.js b/server/graphql/v2/mutation/OrderMutations.js
@@ -80,7 +80,7 @@ const orderMutations = {
         taxAmount: tax && getValueInCentsFromAmountInput(tax.amount),
         taxType: tax?.type,
         countryISO: tax?.country,
-        taxIdNumber: tax?.idNumber,
+        taxIDNumber: tax?.idNumber,
         isFeesOnTop: !isNil(platformFee),
         paymentMethod: await getLegacyPaymentMethodFromPaymentMethodInput(order.paymentMethod),
         fromCollective: { id: fromCollective.id },