[WIP] Stripe Connect Capture charge

imports/plugins/core/orders/client/components/orderDashboard.js

@@ -16,6 +16,7 @@ class OrderDashboard extends Component {
     handleSelect: PropTypes.func,
     isLoading: PropTypes.object,
     multipleSelect: PropTypes.bool,
+    orderCount: PropTypes.number,
     orders: PropTypes.array,
     query: PropTypes.object,
     renderFlowList: PropTypes.bool,
@@ -89,6 +90,7 @@ class OrderDashboard extends Component {
             <div>
               <OrderTable
                 orders={this.props.orders}
+                orderCount={this.props.orderCount}
                 query={this.state.query}
                 selectedItems={this.props.selectedItems}
                 handleSelect={this.props.handleSelect}

imports/plugins/core/orders/client/components/orderTable.js

@@ -43,6 +43,7 @@ class OrderTable extends Component {
     isLoading: PropTypes.object,
     isOpen: PropTypes.bool,
     multipleSelect: PropTypes.bool,
+    orderCount: PropTypes.number,
     orders: PropTypes.array,
     query: PropTypes.object,
     renderFlowList: PropTypes.bool,
@@ -337,7 +338,7 @@ class OrderTable extends Component {
           }
           publication="CustomPaginatedOrders"
           collection={Orders}
-          matchingResultsCount="order-count"
+          matchingResultsCount={this.props.orderCount.toString()}
           query={this.props.query}
           columnMetadata={customColumnMetadata}
           externalLoadingComponent={Loading}

imports/plugins/core/orders/client/containers/orderDashboardContainer.js

@@ -73,6 +73,7 @@ const OrderHelper =  {
 class OrderDashboardContainer extends Component {
   static propTypes = {
     handleMenuClick: PropTypes.func,
+    orderCount: PropTypes.number,
     orders: PropTypes.array
   }
 
@@ -737,6 +738,7 @@ class OrderDashboardContainer extends Component {
     return (
       <OrderDashboard
         handleSelect={this.handleSelect}
+        orderCount={this.props.orderCount}
         orders={this.state.orders}
         query={this.state.query}
         filter={this.state.filter}
@@ -765,9 +767,10 @@ const composer = (props, onData) => {
 
   if (mediaSubscription.ready() && ordersSubscription.ready()) {
     const orders = Orders.find().fetch();
-
+    const orderCount = Orders.find().count();
     onData(null, {
-      orders
+      orders,
+      orderCount
     });
   }
 };

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

@@ -34,10 +34,14 @@ function stripeCaptureCharge(paymentMethod) {
     amount: formatForStripe(paymentMethod.amount)
   };
 
+  const stripePackage = Packages.findOne(paymentMethod.paymentPackageId);
+  const stripeKey = stripePackage.settings.api_key || stripePackage.settings.connectAuth.access_token;
+
   try {
-    const captureResult = StripeApi.methods.captureCharge.call({
+    const captureResult = StripeApi.methods.captureCharge({
       transactionId: paymentMethod.transactionId,
-      captureDetails: captureDetails
+      captureDetails: captureDetails,
+      apiKey: stripeKey
     });
     if (captureResult.status === "succeeded") {
       result = {
@@ -120,10 +124,7 @@ function buildPaymentMethods(options) {
 
   const shopIds = Object.keys(transactionsByShopId);
   const storedCard = cardData.type.charAt(0).toUpperCase() + cardData.type.slice(1) + " " + cardData.number.slice(-4);
-  const packageData = Packages.findOne({
-    name: "reaction-stripe",
-    shopId: Reaction.getPrimaryShopId()
-  });
+
 
   const paymentMethods = [];
 
@@ -140,6 +141,11 @@ function buildPaymentMethods(options) {
         };
       });
 
+      const packageData = Packages.findOne({
+        name: "reaction-stripe",
+        shopId: shopId
+      });
+
       const paymentMethod = {
         processor: "Stripe",
         storedCard: storedCard,
@@ -350,7 +356,7 @@ export const methods = {
    */
   "stripe/payment/capture": function (paymentMethod) {
     check(paymentMethod, Reaction.Schemas.PaymentMethod);
-    // let result;
+
     const captureDetails = {
       amount: formatForStripe(paymentMethod.amount)
     };
@@ -388,7 +394,7 @@ export const methods = {
 
     let result;
     try {
-      const refundResult = StripeApi.methods.createRefund.call({ refundDetails });
+      const refundResult = StripeApi.methods.createRefund({ refundDetails });
       Logger.debug(refundResult);
       if (refundResult && refundResult.object === "refund") {
         result = {
@@ -423,16 +429,18 @@ export const methods = {
     check(paymentMethod, Reaction.Schemas.PaymentMethod);
     let result;
     try {
-      const refunds = StripeApi.methods.listRefunds.call({ transactionId: paymentMethod.transactionId });
+      const refunds = StripeApi.methods.listRefunds({ transactionId: paymentMethod.transactionId });
       result = [];
-      for (const refund of refunds.data) {
-        result.push({
-          type: refund.object,
-          amount: refund.amount / 100,
-          created: refund.created * 1000,
-          currency: refund.currency,
-          raw: refund
-        });
+      if (refunds) {
+        for (const refund of refunds.data) {
+          result.push({
+            type: refund.object,
+            amount: refund.amount / 100,
+            created: refund.created * 1000,
+            currency: refund.currency,
+            raw: refund
+          });
+        }
       }
     } catch (error) {
       Logger.error(error);

imports/plugins/included/payments-stripe/server/methods/stripeapi-methods-capture.app-test.js

@@ -2,6 +2,7 @@
 import { Meteor } from "meteor/meteor";
 import { expect } from "meteor/practicalmeteor:chai";
 import { sinon } from "meteor/practicalmeteor:sinon";
+import { Packages } from "/lib/collections";
 import { StripeApi } from "./stripeapi";
 
 const stripeCaptureResult = {
@@ -78,10 +79,12 @@ describe("stripe/payment/capture", function () {
   });
 
   it("should call StripeApi.methods.captureCharge with the proper parameters and return saved = true", function (done) {
+    const stripePackage = Packages.findOne({ name: "reaction-stripe" });
+    const apiKey = stripePackage.settings.api_key;
     const paymentMethod = {
       processor: "Stripe",
       storedCard: "Visa 4242",
-      paymentPackageId: "vrXutd72c2m7Lenqw",
+      paymentPackageId: stripePackage._id,
       paymentSettingsKey: "reaction-stripe",
       method: "credit",
       transactionId: "ch_17hZ4wBXXkbZQs3xL5JhlSgS",
@@ -90,10 +93,9 @@ describe("stripe/payment/capture", function () {
       mode: "capture",
       createdAt: new Date()
     };
-    sandbox.stub(StripeApi.methods.captureCharge, "call", function () {
+    sandbox.stub(StripeApi.methods, "captureCharge", function () {
       return stripeCaptureResult;
     });
-    // spyOn(StripeApi.methods.captureCharge, "call").and.returnValue(stripeCaptureResult);
 
     let captureResult = null;
     let captureError = null;
@@ -103,11 +105,12 @@ describe("stripe/payment/capture", function () {
       expect(captureError).to.be.undefined;
       expect(captureResult).to.not.be.undefined;
       expect(captureResult.saved).to.be.true;
-      expect(StripeApi.methods.captureCharge.call).to.have.been.calledWith({
+      expect(StripeApi.methods.captureCharge).to.have.been.calledWith({
         transactionId: paymentMethod.transactionId,
         captureDetails: {
           amount: 1999
-        }
+        },
+        apiKey: apiKey
       });
       done();
     });

imports/plugins/included/payments-stripe/server/methods/stripeapi-methods-refund.app-test.js

@@ -44,7 +44,7 @@ describe("stripe/refund/create", function () {
       receipt_number: null
     };
 
-    sandbox.stub(StripeApi.methods.createRefund, "call", function () {
+    sandbox.stub(StripeApi.methods, "createRefund", function () {
       return stripeRefundResult;
     });
     // spyOn(StripeApi.methods.createRefund, "call").and.returnValue(stripeRefundResult);
@@ -57,7 +57,7 @@ describe("stripe/refund/create", function () {
       expect(refundError).to.be.undefined;
       expect(refundResult).to.not.be.undefined;
       expect(refundResult.saved).to.be.true;
-      expect(StripeApi.methods.createRefund.call).to.have.been.calledWith({
+      expect(StripeApi.methods.createRefund).to.have.been.calledWith({
         refundDetails: {
           charge: paymentMethod.transactionId,
           amount: 1999,

imports/plugins/included/payments-stripe/server/methods/stripeapi-methods-refundlist.app-test.js

@@ -53,7 +53,7 @@ describe("stripe/refunds/list", function () {
       has_more: false,
       url: "/v1/refunds"
     };
-    sandbox.stub(StripeApi.methods.listRefunds, "call", function () {
+    sandbox.stub(StripeApi.methods, "listRefunds", function () {
       return stripeRefundListResult;
     });
 
@@ -69,7 +69,7 @@ describe("stripe/refunds/list", function () {
       expect(refundListResult[0].amount).to.equal(19.99);
       expect(refundListResult[0].currency).to.equal("usd");
 
-      expect(StripeApi.methods.listRefunds.call).to.have.been.calledWith({
+      expect(StripeApi.methods.listRefunds).to.have.been.calledWith({
         transactionId: paymentMethod.transactionId
       });
       done();