Fix Braintree discounts and refunds #1265
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Braintree was not capturing discounts, instead using the amount in the original authorization for the capturing. This update changes the amount to the paymentMethod.amount, which includes discounts.
Since the return inside the IF statement will effectively kill the process if it’s hit, there is no need for the else.
|
For whomever is testing this out: Braintree typically takes 24 hours to settle a transaction. Part of this PR includes a notice / error message to alert the user to this. However, if you want to test completed / settled transactions without actually waiting 24 hours, you can force an "settlement" by adding the following to the end of the function |
kieckhafer
changed the title
This code still needs some love, just wanted to get it up for others to take a look at.
Creating a wrapper for Braintree in order to more easily perform testing
due to various instances of rounding numbers for display purposes, the adjustedTotal would sometimes display -0.00, as the adjusted total was technically -.00000000000000000000001, even though we display 0.00 when we round it. This update just shows the absolute number, as this is simple a display number and does not have any affect on what is being sent to and from the payment provider.
The current Schema had a 16 number minimum for credit cards, however braintree supports cards which have number lengths ranging from 12-19
kieckhafer
changed the title
|
|
||
| try { | ||
| let refundResult = BraintreeApi.apiCall.captureCharge(paymentCaptureDetails); | ||
| Logger.info(refundResult); |
There was a problem hiding this comment.
Maybe this should be Logger.debug? (it's not necessarily helpful as info, and these dumps of objects are not the really what is good in a big log...)
| expect(refundError).to.be.undefined; | ||
| expect(refundResult).to.not.be.undefined; | ||
| expect(refundResult.saved).to.be.true; | ||
| // expect(BraintreeApi.apiCall.createRefund).to.have.been.calledWith({ |
There was a problem hiding this comment.
If we aren't going to use it, can we remove this commented-out code?
|
Approved. Extra good job on getting testing working on this. You are an unsung hero. |
6 tasks
|
👍 |
Merged
kieckhafer
pushed a commit
that referenced
this pull request
Aug 18, 2016
* create launchdock-connect plugin (#1241) * rebuild launchdock-connect as a plugin module * build more flexible admin email verification method * add Stripe dependency for launchdock-connect * fix linting issues * Adjust inventory on shipment (#1240) * Trap order-completed change * Add missing import * Add cartItemId field to order so that we can modify inventory * Add new "inventory/sold" method * Explicitly set from and to statuses * Handle order insert hook to move ordered inventory to "sold" status * Handle moving inventory from "reserved" to "sold" status * Fix email import * Fix tests * Not so much logging * Call status change method with explicit values * Add test for moving inventory from "reserved" to "sold" * Add test for moving inventory from "sold" to "shipped" * Force eslint to recognize that switch/case should be indented (#1250) * Force eslint to recognize that swtich/case should be indented eslint/eslint#1797 * remove eslint-plugin-meteor - we need to tune this, removing until we have time * enable eslint-2 codeclimate - remove meteor-eslint plugin, failing to load with eslint-2 * updated switch indentation - test eslint switch, case indent * Add route hooks API (#1253) * build initial implementation of route hooks * extend Router with Hooks and register all hooks * more route hooks tweaks * router namespace cleanup * removed unused values from registry entry (linter) * Refactor inventory (#1251) * As noted in comments from previous PR, just some reorg kept separate from the functionality PR * Correct matching * Fix for decrement cart function (#1273) * Add failing test * Fix for update Mongo command * Add failing test for "decrease below zero" * If removeQuantity is more than quantity remove the entire line * updated linting error * linting error fix * listing issues * more cleanup and linting tweaks * fix eslint config for object key quotes * fix tests after error message update * revert quote-props linter change * revert lint changes * Simplify logic per CR comment * import moment-timezone (#1261) - fixes error .names undefined - for loading tz in i18n settings * Fix inventory tests (#1254) * Reduce size of the cart so that orders don't take so long to process. * Add a wait before pulling record * Add a wait before pulling record * Wait after calling Meteor method * Longer timeout * Longer timeout * Temporarily bypass failiing inventory test (#1280) * fix for #1072 (#1247) fix for #1072 * Use forked version of authorize.net that doesn't have vulnerability (#1252) * Update circle node (#1281) * update circle node to v4.4.7 * remove unused packages - remove eslint-plugin-meteor - remove bunyan-loggly (insecure dependency) - currently not in use * updated package.json (#1286) - updates jquery-i18next - updates i18next-browser-languagedetector * Create email job queue and Reaction.Email namespace (#1282) * build job queue for email and refactor related methods * put placeholder content in coreDefault email template * add rate limiting for accounts and notification methods * put order completed template at correct path * update old jquery-i18next * remove log * remove unused var * remove unnecessary filler in placeholder template * log warning when email template isn’t found * return job object from Reaction.Email.send() * fix missing import * fix comment for email method * remove debugging logger * updated to remove name from email should be enough info * logout and hasPermission updates (#1290) * updated hasPermissions, router behaviour - resolves #1122 - refactors client hasPermissions to wait for a userId if one isn’t immediately found - intentionally not redirecting to home page (not sure if that’s the best behavior, better to have login?) - adds subscription manager to a few more collections * fix typo * import lodash might work better if _.find exists * check for existing route table * Fix PayPal PayFlow discounts and refunds (#1275) * allow discounts and refunds with PayPal PayFlow - Fix discounts so they are working - Allow 100% discounts - Fix refunds so they are working * wrap PayPal PayFlow in wrapper for easier testing * PayPal PayFlow refund test * removed temporary file * updated cc error message * update cardNumber schemas cardNumber schemas were not allowing valid credit cards, such as Amex (15 digits), some Visa (13 digits), and foreign Maestro (12 - 19 digits). This updates to allow these lengths to be input. * Remove bash script from postinstall to fix Windows installs (#1299) * don’t run bash scripts in postinstall because Windows * add fallback fonts back to public dir * release 0.15.0 - updated package in preparation for new release * Allow any user who has the createProduct permission to also delete products (#1263) * - ignoring my custom entrypoint (for running prod image with src) * - allow users with createProduct permission to delete products (for marketplace withmultiple sellers) * - removing .gitignore files that is not welcome in repo * Fix Braintree discounts and refunds (#1265) * add Braintree Payment error to en.json * enable discounts for Braintree payments Braintree was not capturing discounts, instead using the amount in the original authorization for the capturing. This update changes the amount to the paymentMethod.amount, which includes discounts. * removed else statement after an if containing a return Since the return inside the IF statement will effectively kill the process if it’s hit, there is no need for the else. * added testing for Braintree refunds This code still needs some love, just wanted to get it up for others to take a look at. * remove no longer needed commented code * remove no longer needed commented code * added field to expected response for testing * moved braintree/refund/list methods into BraintreeApi wrapper Creating a wrapper for Braintree in order to more easily perform testing * move braintree methods into new file * reconfigure all braintree payment code to no longer use ValidateMethod * fixed lint issues * removed code used to skip over 24 hour braintree delay (for testing) * Rename braintreeapi.js to braintreeApi.js * display absolute number of adjustedTotal due to various instances of rounding numbers for display purposes, the adjustedTotal would sometimes display -0.00, as the adjusted total was technically -.00000000000000000000001, even though we display 0.00 when we round it. This update just shows the absolute number, as this is simple a display number and does not have any affect on what is being sent to and from the payment provider. * updated schema to match supported payment methods The current Schema had a 16 number minimum for credit cards, however braintree supports cards which have number lengths ranging from 12-19 * min -> max * removed comments * test testing * update braintree test * update exports of braintreeApi functions * fixed callback error when action has no callback * Updated error message to make more sense to a human user * linter fixes * updated 'Logger.info' to Logger.debug * removed unused test * removed commented callback * don't log full order details on transaction error * fix refunds and discounts for authorize.net (#1279) - Fix discounts so that they are correctly sent to authorize.net - Allow 100% discounts by adding the “voidTransaction” function and voiding transactions - Update error messaging for Refunds, as we do not (yet) allow them from Authorize.net * Fix Stripe refunds and Double Discounts (#1304) * added comment to explain voiding vs applying discount * add ___ for correctly calculating Stripe adjusted totals Stripe doesn’t “do” discounts, instead they take the discount sent to them, and apply it as a refund. This was causing any discounts to show up twice - once as a discount, once as a refund - in our adjusted total. This update fixes that by re-adding the discount price into the adjusted total when the payment provider is Stripe. * also 100% discounts on Stripe * humanizing an error code * removed unintentional text * linting fixes * removed unused commented code * removed unused commented code * Taxes (#1289) * initial commit tax-rebase plugin Initial commit for issue #972 * split providers to plugins/included * Griddle updates - fork MeteorGriddle into core/ui-grid - move fetchTI - add i18n taxSettings * initial grid editing * add taxSettings labels * initial custom add / edit tax rates - initial working forms, edit toggling.. bit rough.. * rename tax-base to taxes * updated custom grid - adds row selection * add custom rate form reset * updated custom settings * add cart hooks to trigger taxes/calculate * update hooks, taxes/deleteRate - also adds taxes/deleteRate * migrate schemas to plugins - also set taxCloud jobs to not run by default * add custom tax rates calculation - add taxes, tax to cart schema - taxes not published to client - updates global cartTotal helpers * check for shipping * migrate settings to plugins * add tax hooks to plugins -abort idea on “provides” as a package property * Avalara Tax Lookup - adds taxes/setRate method * comment unused fields - comment out first implementation unused fields These are fields that will be used future enhancements to taxes. They are commented out for now. * logger cleanup - move info to debug * updated product data with default taxable items - add taxCode placeholder to schema * taxCloud tax rate calculations * disable taxjar, check for packages - disable while module is not functional - WIP fetch rates and api configuration * custom rate ui cleanup * taxes method test - a weak attempt at a test but gets the ball rolling and actually fixes a todo * updated test, versions - add done to test - updated meteor package versions * remove unused template registry entries - final cleanup, ready for PR to development - pending tests - pending docs * avoid running country-data unless address exists * add tax rate delete - adds delete and confirm to edit form * linted griddle.js * remove unused import * fix display of taxes in order workflow perhaps this should be updated to “tax”, instead of taxes in the invoice object. * line item calculations - added for custom rates - added for avalara rates are calculated by individual line items but on a general rate for the cart. * update case linted * updated variant methods - update products/updateProductField to handle boolean - kludge update of childVariants when parentVariant is updated - remove default value from form - small cleanups
jshimko
added a commit
that referenced
this pull request
Aug 23, 2016
* development: (27 commits) Release 0.15.1 (#1314) Fix wrong method hooks context (#1307) - function isSoldOut() should return true if quantity is <= 0, not only if it is === 0. (#1311) Remove jquery-ui (#1310) Taxes (#1289) Fix Stripe refunds and Double Discounts (#1304) fix refunds and discounts for authorize.net (#1279) Fix Braintree discounts and refunds (#1265) Allow any user who has the createProduct permission to also delete products (#1263) Remove bash script from postinstall to fix Windows installs (#1299) update cardNumber schemas Fix PayPal PayFlow discounts and refunds (#1275) logout and hasPermission updates (#1290) Create email job queue and Reaction.Email namespace (#1282) updated package.json (#1286) Update circle node (#1281) Use forked version of authorize.net that doesn't have vulnerability (#1252) fix for #1072 (#1247) Temporarily bypass failiing inventory test (#1280) Fix inventory tests (#1254) ... # Conflicts: # .codeclimate.yml # .eslintignore # .meteor/versions # client/modules/core/main.js # imports/plugins/core/orders/client/templates/workflow/shippingTracking.js # imports/plugins/core/taxes/client/settings/custom.js # imports/plugins/core/taxes/client/settings/settings.js # imports/plugins/core/taxes/server/methods/methods.js # imports/plugins/included/authnet/server/methods/authnet.js # imports/plugins/included/braintree/server/methods/braintreeApi.js # imports/plugins/included/braintree/server/methods/braintreeMethods.js # imports/plugins/included/braintree/server/methods/braintreeapi-methods-refund.app-test.js # imports/plugins/included/example-paymentmethod/server/methods/example-payment-methods.app-test.js # imports/plugins/included/inventory/server/hooks/hooks.js # imports/plugins/included/inventory/server/hooks/inventory-hooks.app-test.js # imports/plugins/included/inventory/server/methods/inventory.js # imports/plugins/included/inventory/server/methods/statusChanges.js # imports/plugins/included/launchdock-connect/client/templates/dashboard.js # imports/plugins/included/paypal/server/methods/payflowpro-methods-refund.app-test.js # imports/plugins/included/paypal/server/methods/payflowproApi.js # imports/plugins/included/paypal/server/methods/payflowproMethods.js # imports/plugins/included/product-variant/client/templates/products/productDetail/variants/variantForm/variantForm.js # imports/plugins/included/taxes-avalara/server/hooks/hooks.js # imports/plugins/included/taxes-taxcloud/server/hooks/hooks.js # imports/plugins/included/taxes-taxjar/server/hooks/hooks.js # lib/collections/helpers.js # package.json # server/api/core/import.js # server/methods/catalog.js # server/methods/core/cart-remove.app-test.js # server/methods/core/orders.js # server/methods/core/shop.js
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix confirms braintree refunds are working, fixes discounts, which were not working at all, and adds the ability to give a 100% discount, which effectively voids the authorization.