authscape 1.0.334 → 1.0.336

package/index.js

@@ -2937,6 +2937,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var CheckoutForm = function CheckoutForm(_ref) {
   var payButtonText = _ref.payButtonText,
+    invoiceId = _ref.invoiceId,
     clientSecret = _ref.clientSecret,
     currentUser = _ref.currentUser,
     paymentMethodType = _ref.paymentMethodType,
@@ -2955,7 +2956,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
     setErrorMessage = _useState4[1];
   var handleSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
-      var _yield$stripe$confirm, error, response, setupIntent, addPaymentMethodResponse, _response, _yield$stripe$confirm2, _error, _response2, paymentIntent;
+      var _yield$stripe$confirm, error, response, setupIntent, addPaymentMethodResponse, _response, _response2, _yield$stripe$confirm2, _error, _response3, paymentIntent;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -2971,7 +2972,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
             return _context.abrupt("return");
           case 4:
             if (!(amount == null || currentUser != null)) {
-              _context.next = 47;
+              _context.next = 54;
               break;
             }
             _context.next = 7;
@@ -2995,7 +2996,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
             // details incomplete)
             setIsPaymentProcessing(false);
             setErrorMessage(error.message);
-            _context.next = 45;
+            _context.next = 52;
             break;
           case 14:
             // Your customer will be redirected to your `return_url`. For some payment
@@ -3009,7 +3010,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
             response = _context.sent;
             setupIntent = response.setupIntent;
             _context.t0 = setupIntent.status;
-            _context.next = _context.t0 === 'succeeded' ? 22 : _context.t0 === 'processing' ? 36 : _context.t0 === 'requires_payment_method' ? 39 : 42;
+            _context.next = _context.t0 === 'succeeded' ? 22 : _context.t0 === 'processing' ? 43 : _context.t0 === 'requires_payment_method' ? 46 : 49;
             break;
           case 22:
             _context.next = 24;
@@ -3021,51 +3022,70 @@ var CheckoutForm = function CheckoutForm(_ref) {
           case 24:
             addPaymentMethodResponse = _context.sent;
             if (!(addPaymentMethodResponse != null && addPaymentMethodResponse.status == 200)) {
-              _context.next = 34;
+              _context.next = 41;
               break;
             }
             onResponse("succeeded", setupIntent.id, setupIntent.payment_method);
             if (!(amount != null)) {
-              _context.next = 32;
+              _context.next = 39;
               break;
             }
-            _context.next = 30;
+            if (!(invoiceId != null)) {
+              _context.next = 35;
+              break;
+            }
+            _context.next = 31;
+            return apiService().post("/Invoices/PayInvoice", {
+              invoiceId: invoiceId,
+              walletPaymentMethodId: addPaymentMethodResponse.data
+            });
+          case 31:
+            _response = _context.sent;
+            if (_response != null && _response.status == 200) {
+              onResponse("paid", null);
+            } else {
+              onResponse("failed", null);
+            }
+            _context.next = 39;
+            break;
+          case 35:
+            _context.next = 37;
             return apiService().post("/Payment/Charge", {
               paymentMethodType: paymentMethodType,
               walletPaymentMethodId: addPaymentMethodResponse.data,
               amount: amount
             });
-          case 30:
-            _response = _context.sent;
-            if (_response != null && _response.status == 200) {
-              onResponse("paid", _response.data.stripePaymentIntentId);
+          case 37:
+            _response2 = _context.sent;
+            if (_response2 != null && _response2.status == 200) {
+              onResponse("paid", _response2.data.stripePaymentIntentId);
             } else {
               onResponse("failed", null);
             }
-          case 32:
-            _context.next = 35;
+          case 39:
+            _context.next = 42;
             break;
-          case 34:
+          case 41:
             onResponse("failed", null);
-          case 35:
-            return _context.abrupt("break", 45);
-          case 36:
+          case 42:
+            return _context.abrupt("break", 52);
+          case 43:
             onResponse("processing", setupIntent.id, setupIntent.payment_method);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 45);
-          case 39:
+            return _context.abrupt("break", 52);
+          case 46:
             onResponse("requires_payment_method", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 45);
-          case 42:
+            return _context.abrupt("break", 52);
+          case 49:
             onResponse("failed", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 45);
-          case 45:
-            _context.next = 81;
+            return _context.abrupt("break", 52);
+          case 52:
+            _context.next = 88;
             break;
-          case 47:
-            _context.next = 49;
+          case 54:
+            _context.next = 56;
             return stripe.confirmPayment({
               //`Elements` instance that was used to create the Payment Element
               elements: elements,
@@ -3074,11 +3094,11 @@ var CheckoutForm = function CheckoutForm(_ref) {
                 return_url: process.env.websiteBaseUri + '/confirmPayment?redirectUrl=' + encodeURIComponent(window.location.search)
               }
             });
-          case 49:
+          case 56:
             _yield$stripe$confirm2 = _context.sent;
             _error = _yield$stripe$confirm2.error;
             if (!_error) {
-              _context.next = 56;
+              _context.next = 63;
               break;
             }
             // This point will only be reached if there is an immediate error when
@@ -3086,50 +3106,50 @@ var CheckoutForm = function CheckoutForm(_ref) {
             // details incomplete)
             setIsPaymentProcessing(false);
             setErrorMessage(_error.message);
-            _context.next = 81;
+            _context.next = 88;
             break;
-          case 56:
+          case 63:
             // Your customer will be redirected to your `return_url`. For some payment
             // methods like iDEAL, your customer will be redirected to an intermediate
             // site first to authorize the payment, then redirected to the `return_url`.
-            _response2 = null;
+            _response3 = null;
             if (!(amount == null)) {
-              _context.next = 63;
+              _context.next = 70;
               break;
             }
-            _context.next = 60;
+            _context.next = 67;
             return stripe.retrieveSetupIntent(clientSecret);
-          case 60:
-            _response2 = _context.sent;
-            _context.next = 66;
+          case 67:
+            _response3 = _context.sent;
+            _context.next = 73;
             break;
-          case 63:
-            _context.next = 65;
+          case 70:
+            _context.next = 72;
             return stripe.retrievePaymentIntent(clientSecret);
-          case 65:
-            _response2 = _context.sent;
-          case 66:
-            paymentIntent = _response2.paymentIntent;
+          case 72:
+            _response3 = _context.sent;
+          case 73:
+            paymentIntent = _response3.paymentIntent;
             _context.t1 = paymentIntent.status;
-            _context.next = _context.t1 === 'succeeded' ? 70 : _context.t1 === 'processing' ? 72 : _context.t1 === 'requires_payment_method' ? 75 : 78;
+            _context.next = _context.t1 === 'succeeded' ? 77 : _context.t1 === 'processing' ? 79 : _context.t1 === 'requires_payment_method' ? 82 : 85;
             break;
-          case 70:
+          case 77:
             // need to store the payment intent with the customer if they are logged in... currentUser
             onResponse("succeeded", paymentIntent.id);
-            return _context.abrupt("break", 81);
-          case 72:
+            return _context.abrupt("break", 88);
+          case 79:
             onResponse("processing", paymentIntent.id);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 81);
-          case 75:
+            return _context.abrupt("break", 88);
+          case 82:
             onResponse("requires_payment_method", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 81);
-          case 78:
+            return _context.abrupt("break", 88);
+          case 85:
             onResponse("failed", null);
             setIsPaymentProcessing(false);
-            return _context.abrupt("break", 81);
-          case 81:
+            return _context.abrupt("break", 88);
+          case 88:
           case "end":
             return _context.stop();
         }
@@ -3404,6 +3424,7 @@ function StripePayment(_ref3) {
       options: options
     }, /*#__PURE__*/_react["default"].createElement(CheckoutForm, {
       payButtonText: payButtonText,
+      invoiceId: invoiceId,
       clientSecret: options != null ? options.clientSecret : null,
       onResponse: onResponse,
       paymentMethodType: paymentMethodType,
@@ -3457,7 +3478,7 @@ function StripePayment(_ref3) {
         marginTop: 2
       },
       onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var response, _response3;
+        var response, _response4;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -3485,9 +3506,9 @@ function StripePayment(_ref3) {
                 amount: amount
               });
             case 9:
-              _response3 = _context3.sent;
-              if (_response3 != null && _response3.status == 200) {
-                onResponse("paid", _response3.data.stripePaymentIntentId);
+              _response4 = _context3.sent;
+              if (_response4 != null && _response4.status == 200) {
+                onResponse("paid", _response4.data.stripePaymentIntentId);
               }
             case 11:
             case "end":
@@ -3505,6 +3526,7 @@ function StripePayment(_ref3) {
       options: options
     }, /*#__PURE__*/_react["default"].createElement(CheckoutForm, {
       payButtonText: payButtonText,
+      invoiceId: invoiceId,
       clientSecret: options != null ? options.clientSecret : null,
       onResponse: onResponse,
       paymentMethodType: paymentMethodType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.334",
+  "version": "1.0.336",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/stripe/StripePayment.js

@@ -5,7 +5,7 @@ import PaymentRoundedIcon from '@mui/icons-material/PaymentRounded';
 import Typography from '@mui/material/Typography';
 import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/material';
 
-  const CheckoutForm = ({payButtonText, clientSecret, currentUser, paymentMethodType, walletId, onResponse, amount}) => {
+  const CheckoutForm = ({payButtonText, invoiceId, clientSecret, currentUser, paymentMethodType, walletId, onResponse, amount}) => {
 
     const [isPaymentProcessing, setIsPaymentProcessing] = useState(false);
 
@@ -79,21 +79,38 @@ import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/
 
                 if (amount != null)
                 {
-                  // charge the customer
-                  let response = await apiService().post("/Payment/Charge", {
-
-                      paymentMethodType: paymentMethodType,
-                      walletPaymentMethodId: addPaymentMethodResponse.data,
-                      amount: amount
-                  });
-                  
-                  if (response != null && response.status == 200)
+                  if (invoiceId != null)
                   {
-                      onResponse("paid", response.data.stripePaymentIntentId);
+                    let response = await apiService().post("/Invoices/PayInvoice", {
+                        invoiceId: invoiceId,
+                        walletPaymentMethodId: addPaymentMethodResponse.data
+                    });
+                    if (response != null && response.status == 200)
+                    {
+                      onResponse("paid", null);
+                    }
+                    else
+                    {
+                      onResponse("failed", null);
+                    }
                   }
                   else
                   {
-                    onResponse("failed", null);
+                    // charge the customer
+                    let response = await apiService().post("/Payment/Charge", {
+                        paymentMethodType: paymentMethodType,
+                        walletPaymentMethodId: addPaymentMethodResponse.data,
+                        amount: amount
+                    });
+                    
+                    if (response != null && response.status == 200)
+                    {
+                        onResponse("paid", response.data.stripePaymentIntentId);
+                    }
+                    else
+                    {
+                      onResponse("failed", null);
+                    }
                   }
                 }
                 
@@ -341,7 +358,7 @@ import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/
 
                         {(options != null && process.env.stripePublicKey != null) &&
                             <Elements stripe={stripePromise} options={options}>
-                                <CheckoutForm payButtonText={payButtonText} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} currentUser={currentUser} walletId={walletId} amount={amount} />
+                                <CheckoutForm payButtonText={payButtonText} invoiceId={invoiceId} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} currentUser={currentUser} walletId={walletId} amount={amount} />
                             </Elements>
                         }
                     </Box>
@@ -417,7 +434,7 @@ import { Select, Grid, MenuItem, Box, Button, Tab, Tabs, TextField } from '@mui/
 
                                 {(options != null && process.env.stripePublicKey != null) &&
                                     <Elements stripe={stripePromise} options={options}>
-                                        <CheckoutForm payButtonText={payButtonText} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} walletId={walletId} currentUser={currentUser} amount={amount} />
+                                        <CheckoutForm payButtonText={payButtonText} invoiceId={invoiceId} clientSecret={options != null ? options.clientSecret : null} onResponse={onResponse} paymentMethodType={paymentMethodType} walletId={walletId} currentUser={currentUser} amount={amount} />
                                     </Elements>
                                 }
                             </Box>