From 0aef5ad11e580c5a08546bc37950811af5f10c19 Mon Sep 17 00:00:00 2001 From: Benjamin Piouffle Date: Mon, 5 Oct 2020 11:07:31 +0200 Subject: [PATCH] fix(createOrder): Tax ID number --- package-lock.json | 6 +++--- package.json | 2 +- server/graphql/v1/mutations/orders.js | 4 ++-- server/graphql/v2/mutation/OrderMutations.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 22e1603a9a0..f7b3fc1503c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3933,9 +3933,9 @@ } }, "@opencollective/taxes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@opencollective/taxes/-/taxes-3.0.0.tgz", - "integrity": "sha512-POA2gJo8ibusNeWEk0I/RoNyn+4g29utwUcZTIZ6UIXHGTKeBB63vrH5Y11T3jlTE7BeyqVZgl0v6WcBFquusQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@opencollective/taxes/-/taxes-3.1.0.tgz", + "integrity": "sha512-bhW95nOuuGBCGX/2pPDwyQoWGdZkPXo7xaFIdVlbQRH/PX71mHibEi/VGTPmy7BZfj01ktVxqUGbNl8obPRMrQ==", "requires": { "jsvat": "2.2.0", "lodash": "^4.17.20", diff --git a/package.json b/package.json index cc48ed62bee..9450805b268 100644 --- 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 index 4e0b1c2e49f..412238a0d0c 100644 --- 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 index 0734274c5bf..99fecfe4c77 100644 --- 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 },