Make approve/capture/refund/listRefunds multishop-aware #2912

brent-hoover · 2017-09-21T02:47:09Z

To Test

Full reset
Create a shop and a marketplace product and enable Stripe Connect in the shop
Create an order with Basic Reaction Product and your created product
As the marketplace admin Approve and then Capture the order
In another browser as the merchant observe the order and approve and capture the order
Observe that these captures are done separately
Issue a refund for this order in the merchant and marketplace admins respectively
Observe the refund is issued against the correct charge and is reflected in the dashboard correctly.

spencern · 2017-09-25T18:51:27Z

@zenweasel I know you were pushing to get this ready before you finished up last week, but as it's still [WIP] and no reviewers have been assigned, I'd imagine it's not quite done yet?

brent-hoover · 2017-09-26T21:57:36Z

@spencern Yes. The methods are working but tests are still broken. Should have this ready for review today

brent-hoover · 2017-09-27T11:50:36Z

Got all tests working but when I pulled in changes all the order filtering/dashboard is broken. Trying to figure out what is going on

brent-hoover · 2017-09-28T10:51:35Z

Still working on fixing up orders but hope to have this ready tomorrow morning some time

brent-hoover · 2017-09-29T01:55:55Z

Ok @spencern this should be ready to look at now.

spencern · 2017-09-30T02:15:54Z

Getting a shipping methods are not configured error when trying to checkout right now. I'll debug that a bit and follow up shortly.

spencern

I'm able to capture and refund stripe connect orders, and that's the major accomplishment of this PR.

I'm also seeing errors in the client when I capture on merchant shop, then capture and start to fulfill on primary shop. This error prevents me from using the orders dashboard from the merchant shop. But I was able to successfully capture the charge before getting locked out.

TypeError: Cannot read property 'Icon' of undefined
    at OrderDashboard.render (orderDashboard.js:118)
    at modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:108703
    at measureLifeCyclePerf (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:107983)
    at ReactCompositeComponentWrapper._renderValidatedComponentWithoutOwnerOrContext (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:108702)
    at ReactCompositeComponentWrapper._renderValidatedComponent (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:108729)
    at ReactCompositeComponentWrapper.performInitialMount (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:108269)
    at ReactCompositeComponentWrapper.mountComponent (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:108165)
    at Object.mountComponent (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:100926)
    at ReactDOMComponent.mountChildren (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:107281)
    at ReactDOMComponent._createInitialChildren (modules.js?hash=7a1e98364f0a9d66bf273a939be2089560be603f:104480)

I'm seeing i18n issues on the merchant shop orders page, but not the primary shop, but based on the code it seems unlikely that's the fault of this PR, and should probably be addressed in another PR.

This PR highlights a some other marketplace related issues I think - around the display and fulfillment of part of an order by multiple shops and admins.

I'm missing the name of the customer in the merchant shop order list.

There are other issues that are known and already have tickets that are present in this PR:

Shipping charge is multiple of actual shipping cost
Extra boxes on orders list

I'm tempted to approve this despite all the issues I'm seeing as I do think it accomplishes what it sets out to accomplish, but should probably create issues and verify they are present in the marketplace branch before doing so and merging.

spencern · 2017-10-02T05:20:29Z

imports/plugins/included/payments-stripe/server/methods/stripe.js

@@ -28,17 +25,33 @@ function unformatFromStripe(amount) {
  return (amount / 100);
 }

+export const utils = {};
+
+utils.getStripeApi = function (paymentPackageId) {


Thanks for abstracting this. Needed to happen

spencern · 2017-10-02T05:21:51Z

imports/plugins/included/payments-stripe/server/methods/stripe.js

-      transactionId: paymentMethod.transactionId,
-      captureDetails: captureDetails
-    });
+    const capturePromise = stripe.charges.capture(paymentMethod.transactionId, captureDetails);


Do you think we should change my current createCharges method to use Promises instead of async/await? Feels weird to me to do this in different ways within the same plugin.

spencern · 2017-10-02T05:27:30Z

imports/plugins/included/search-mongo/server/methods/searchcollections.js

@@ -185,7 +185,10 @@ export function buildOrderSearchRecord(orderId) {
  orderSearch.billingName = shopBilling.address && shopBilling.address.fullName;
  orderSearch.billingPhone = shopBilling.address && shopBilling.address.phone.replace(/\D/g, "");
  orderSearch.shippingName = shopShipping.address && shopShipping.address.fullName;
-  orderSearch.shippingPhone = shopShipping.address && shopShipping.address.phone.replace(/\D/g, "");
+  if (shopShipping.address && shopShipping.address.phone) {


Did this sneak in from a different PR? Or just fixing an undocumented issue that you came across?

I was running into this throwing a can't find replace of undefined when trying to place an order. Probably just something that hadn't come up in testing before? Sort of just a workaround but required to keep moving.

spencern · 2017-10-02T05:29:52Z

server/methods/core/orders.js

+// than one shop
+/**
+ * ordersInventoryAdjustByShop
+ * adjust inventory for a particular shop when an order is approved


As part of removing the "approval" step, I think that inventory should be reduced when an order is placed (after copyCartToOrder) so that we avoid the possibility of multiple orders for the same inventory.

I think removing Approval should probably be separate from this PR. Created a separate issue for it here: #2988

spencern · 2017-10-02T05:42:08Z

Successfully captured a payment from a marketplace shop

Successfully issued partial refund!

brent-hoover · 2017-10-02T06:41:44Z

@spencern Have you pulled recently? I fixed that Icon issue on another PR (it was unrelated to this one and just a bad import) and it should have been merged in.

I have opened an issue for the problems with viewing orders as a merchant admin here: #2976

brent-hoover · 2017-10-02T06:51:04Z

@spencern Yeah, these other (I believe unrelated) issues are why this took me longer than expected (to fix some and document others). But I think this PR does what it's supposed to without introducing any new errors.

spencern

A few more issues that I think I've found, but want to make sure I'm not misunderstanding where something might be stored

When the capture is performed, it appears to be stored a level deeper than it should be in the transactions array. Show here with the charge response and the capture response wrapped in a response object.
I'm not seeing where the refund transaction is stored. After issuing two refunds, I'm seeing both of them in the UI, but neither in the Payment object transactions array. As I understand it, the transactions array is supposed to be a record of every transaction that has occurred with that payment, so I was expecting to find two refund transactions. It's clear something is being stored somewhere though, so perhaps I'm just looking in the wrong place?

It does seem to work otherwise at this point, so if we can clarify these two issues, I think we're set to merge.

brent-hoover · 2017-10-03T06:37:08Z

Refunds are not stored anywhere for any payment methods. That's essentially why we have the listRefunds methods

spencern · 2017-10-03T07:18:07Z

Regarding the transaction being wrapped in a "response" object. It appears that other payment providers do this sometimes, but it's the raw response from the payment provider. Since each provider returns different data in different formats, I'm going to say this is not a blocker and we'll merge and reconcile later if necessary.

spencern

Based on @zenweasel and I's convo and looking into the specific code around the transaction objects, I think this is good to go.

brent-hoover and others added 28 commits September 8, 2017 15:15

Capture just the records for a particular shop

425ff5d

if refund results are empty do nothing

2da0fb4

Catch and log errors with refunds

5529103

Return all orders where the users shopId is attached to an item

fbca2c5

Return all orders where the users shopId is attached to an item

f9d5b2b

Merge branch 'marketplace' into brent-fix-issue-2765

9635ce1

Remove validated-method mess I created. Use plain functions

cb81e27

Fix stripe tests

c05eec4

Fix fixtures

3743aa7

Correctly store paymentPackageId and then use that to get right key

c9436bd

Approve by shopId

8e0ad77

Don't rewrite values when approving order

9800351

Use an aggregate function to filter orders

12f6d59

Create a reactive-aggregate

089c08e

Add JSDoc and check

47a747b

Fix Stripe tests

cd10fed

Don't hardcode shopId

403a7a3

Fix tests

961f946

pass in orderCount to orderTable

b04bd8c

pass in orderCount to orderTable

3c1fdb4

Merge branch 'marketplace' into brent-fix-issue-2765

94f5096

Merge branch 'marketplace' into brent-fix-issue-2765

1506fb6

Merge branch 'marketplace' into brent-fix-issue-2765

7f7eb80

Remove integration tests that didn't run

6635ab6

Eliminate extra layer. Move functions directly into stripe.js

3e672b2

Make create/list refunds method aware of connect

ee8b090

Merge branch 'marketplace' into brent-fix-issue-2765

334b028

Merge branch 'marketplace' into brent-fix-issue-2765

0a1cc94

spencern and others added 2 commits September 27, 2017 09:36

Merge branch 'marketplace' into brent-fix-issue-2765

fdf91e1

Merge branch 'marketplace' into brent-fix-issue-2765

1141049

brent-hoover added 7 commits September 29, 2017 08:15

Work around error in search collection which blocks orders

b4e4bfe

Store the correct packageId along with payment method package

0cce930

Remove unused function

a85affe

Merge branch 'marketplace' into brent-fix-issue-2765

7952d9f

Make approve write out updated billing records correctly

975963b

Lint fix

68aecf1

Restore tests for invoice amounts

cd0cedc

brent-hoover requested a review from spencern September 29, 2017 01:54

brent-hoover changed the title ~~[WIP] Make approve/capture/refund/listRefunds multishop-aware~~ Make approve/capture/refund/listRefunds multishop-aware Sep 29, 2017

Merge branch 'marketplace' into brent-fix-issue-2765

0059da1

spencern reviewed Oct 2, 2017

View reviewed changes

spencern reviewed Oct 3, 2017

View reviewed changes

spencern approved these changes Oct 3, 2017

View reviewed changes

spencern merged commit adaae0e into marketplace Oct 3, 2017

spencern deleted the brent-fix-issue-2765 branch October 3, 2017 07:18

This was referenced Oct 3, 2017

Stripe Create Refund for Stripe Connect charges #2767

Closed

Stripe List Refunds should work with Stripe Connect charges #2766

Closed

Capture Stripe Connect Direct Charges #2765

Closed

spencern mentioned this pull request Oct 11, 2017

Release 1.5.0 #3089

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make approve/capture/refund/listRefunds multishop-aware #2912

Make approve/capture/refund/listRefunds multishop-aware #2912

brent-hoover commented Sep 21, 2017 •

edited

Loading

spencern commented Sep 25, 2017

brent-hoover commented Sep 26, 2017

brent-hoover commented Sep 27, 2017

brent-hoover commented Sep 28, 2017

brent-hoover commented Sep 29, 2017

spencern commented Sep 30, 2017

spencern left a comment

spencern Oct 2, 2017

spencern Oct 2, 2017

spencern Oct 2, 2017

brent-hoover Oct 2, 2017

spencern Oct 2, 2017

brent-hoover Oct 2, 2017 •

edited

Loading

spencern commented Oct 2, 2017

brent-hoover commented Oct 2, 2017

brent-hoover commented Oct 2, 2017

spencern left a comment •

edited

Loading

brent-hoover commented Oct 3, 2017

spencern commented Oct 3, 2017

spencern left a comment

Make approve/capture/refund/listRefunds multishop-aware #2912

Make approve/capture/refund/listRefunds multishop-aware #2912

Conversation

brent-hoover commented Sep 21, 2017 • edited Loading

To Test

spencern commented Sep 25, 2017

brent-hoover commented Sep 26, 2017

brent-hoover commented Sep 27, 2017

brent-hoover commented Sep 28, 2017

brent-hoover commented Sep 29, 2017

spencern commented Sep 30, 2017

spencern left a comment

Choose a reason for hiding this comment

spencern Oct 2, 2017

Choose a reason for hiding this comment

spencern Oct 2, 2017

Choose a reason for hiding this comment

spencern Oct 2, 2017

Choose a reason for hiding this comment

brent-hoover Oct 2, 2017

Choose a reason for hiding this comment

spencern Oct 2, 2017

Choose a reason for hiding this comment

brent-hoover Oct 2, 2017 • edited Loading

Choose a reason for hiding this comment

spencern commented Oct 2, 2017

brent-hoover commented Oct 2, 2017

brent-hoover commented Oct 2, 2017

spencern left a comment • edited Loading

Choose a reason for hiding this comment

brent-hoover commented Oct 3, 2017

spencern commented Oct 3, 2017

spencern left a comment

Choose a reason for hiding this comment

brent-hoover commented Sep 21, 2017 •

edited

Loading

brent-hoover Oct 2, 2017 •

edited

Loading

spencern left a comment •

edited

Loading