@pelcro/react-pelcro-js 3.0.0-beta.11 → 3.0.0-beta.12

package/dist/index.cjs.js

@@ -3670,6 +3670,7 @@ var successfully$1 = "successfully";
 var entitlement$1 = "Some of the content on this page is available with one or more of our plans. <1>Subscribe</1> now to get full page access.";
 var recaptcha$1 = "This site is protected by reCAPTCHA and the Google <1>Privacy Policy</1> and <3>Terms of Service</3> apply.";
 var invalidInvoice$1 = "Invalid invoice ID, please contact support";
+var zeroTotalInvoice$1 = "You can't view an invoice of 0$";
 var messages_en = {
 	youAreSafe: youAreSafe$1,
 	cancel: cancel$1,
@@ -3677,7 +3678,8 @@ var messages_en = {
 	successfully: successfully$1,
 	entitlement: entitlement$1,
 	recaptcha: recaptcha$1,
-	invalidInvoice: invalidInvoice$1
+	invalidInvoice: invalidInvoice$1,
+	zeroTotalInvoice: zeroTotalInvoice$1
 };
 
 var youAreSafe = "Vous êtes en sécurité - PCI conforme 128 SSL par";
@@ -3687,6 +3689,7 @@ var successfully = "avec succès.";
 var entitlement = "Une partie du contenu de cette page est disponible sous un ou plusieurs de nos plans. <1>Abonnez-vous</1> à l'un de nos plans disponibles pour accéder à plus de contenu";
 var recaptcha = "Ce site est protégé par reCAPTCHA - les <1>règles de confidentialité</1> Google ainsi que les <3>conditions d'utilisation</3> s'appliquent.";
 var invalidInvoice = "Invalid invoice ID, please contact support";
+var zeroTotalInvoice = "You can't view an invoice of 0$";
 var messages_fr = {
 	youAreSafe: youAreSafe,
 	cancel: cancel,
@@ -3694,7 +3697,8 @@ var messages_fr = {
 	successfully: successfully,
 	entitlement: entitlement,
 	recaptcha: recaptcha,
-	invalidInvoice: invalidInvoice
+	invalidInvoice: invalidInvoice,
+	zeroTotalInvoice: zeroTotalInvoice
 };
 
 var labels$j = {
@@ -9154,6 +9158,17 @@ const showInvoiceDetailsFromUrl = () => {
       return notify.error(errorMessage);
     }
 
+    const {
+      invoice
+    } = usePelcro.getStore();
+
+    if (invoice.total === 0) {
+      const errorMessage = i18next.t("messages:zeroTotalInvoice", {
+        returnObjects: true
+      });
+      return notify.error(errorMessage);
+    }
+
     return switchView("invoice-details");
   });
 };
@@ -12810,6 +12825,7 @@ class Subscription {
    * @property {number} [quantity]
    * @property {string} addressId
    * @property {number} invoiceId
+   * @property {boolean} isExistingSource
    */
 
   /**
@@ -12995,11 +13011,15 @@ class StripeGateway {
           token,
           invoiceId
         } = options;
-        window.Pelcro.invoice.pay({
+        const params = options.isExistingSource ? {
+          source_id: token,
+          invoice_id: invoiceId
+        } : {
           payment_gateway: _classPrivateFieldGet(this, _paymentGateway),
           gateway_token: token,
           invoice_id: invoiceId
-        }, (err, res) => {
+        };
+        window.Pelcro.invoice.pay(params, (err, res) => {
           callback(err, res);
         });
       }
@@ -13889,6 +13909,7 @@ const PaymentMethodContainerWithoutStripe = ({
     return subscription.execute({
       type: SUBSCRIPTION_TYPES.PAY_INVOICE,
       token: gatewayToken,
+      isExistingSource: Boolean(selectedPaymentMethodId),
       invoiceId: invoice.id
     }, (err, res) => {
       dispatch({
@@ -13911,9 +13932,6 @@ const PaymentMethodContainerWithoutStripe = ({
         });
       }
 
-      set({
-        invoice: null
-      });
       onSuccess(res);
     });
   };
@@ -14271,7 +14289,7 @@ const PaymentMethodContainerWithoutStripe = ({
       case HANDLE_PAYPAL_SUBSCRIPTION:
         return lib_5(state, (state, dispatch) => {
           if (type === "invoicePayment") {
-            payInvoice(new PaypalGateWay(), action.payload, dispatch);
+            payInvoice(new PaypalGateway(), action.payload, dispatch);
           } else {
             handlePaypalSubscription(state, action.payload);
           }
@@ -22405,7 +22423,7 @@ const InvoicesMenu = props => {
 };
 
 const InvoicesItems = () => {
-  var _window$Pelcro$invoic;
+  var _window$Pelcro$invoic, _window$Pelcro$invoic2;
 
   const {
     t
@@ -22414,7 +22432,7 @@ const InvoicesItems = () => {
     setInvoice,
     switchView
   } = usePelcro();
-  const invoices = (_window$Pelcro$invoic = window.Pelcro.invoice.list()) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
+  const invoices = (_window$Pelcro$invoic = (_window$Pelcro$invoic2 = window.Pelcro.invoice.list()) === null || _window$Pelcro$invoic2 === void 0 ? void 0 : _window$Pelcro$invoic2.filter(invoice => invoice.total > 0)) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
 
   const showInvoiceDetails = event => {
     if (setInvoice(event.target.dataset.id)) {
@@ -23090,9 +23108,9 @@ class Dashboard extends React.Component {
 }
 
 function hasInvoices() {
-  var _window$Pelcro$invoic;
+  var _window$Pelcro$invoic, _window$Pelcro$invoic2;
 
-  const invoices = (_window$Pelcro$invoic = window.Pelcro.invoice.list()) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
+  const invoices = (_window$Pelcro$invoic = (_window$Pelcro$invoic2 = window.Pelcro.invoice.list()) === null || _window$Pelcro$invoic2 === void 0 ? void 0 : _window$Pelcro$invoic2.filter(invoice => invoice.total > 0)) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
   return invoices.length > 0;
 }
 
@@ -25287,11 +25305,11 @@ const InvoiceDetailsView = props => {
   }, t("labels.summary")), invoice && /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("p", {
     className: "plc-mr-2 pelcro-invoice-creation-date"
   }, `${t("labels.creationDate")} ${formattedCreationDate}`), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "plc-flex plc-items-center plc-pt-2 plc-mt-2 plc-border-t plc-border-gray-400 plc-min-h-12 plc-justify-evenly pelcro-invoice-plan-wrapper"
+    className: "plc-flex plc-items-center plc-pt-2 plc-mt-2 plc-border-t plc-border-gray-400 plc-min-h-12 plc-justify-between pelcro-invoice-plan-wrapper"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "plc-w-1/2 plc-break-words pelcro-invoice-plan-name"
+    className: "plc-break-words pelcro-invoice-plan-name"
   }, invoice.plan.nickname), /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "plc-w-1/5 plc-text-center pelcro-invoice-summary-price"
+    className: "plc-text-center pelcro-invoice-summary-price"
   }, calcAndFormatItemsTotal([invoice.plan], invoice.currency))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "plc-flex plc-justify-end plc-pt-2 plc-mt-2 plc-font-bold plc-border-t plc-border-gray-400 pelcro-invoice-total-wrapper"
   }, /*#__PURE__*/React__default['default'].createElement("div", {

package/dist/index.esm.js

@@ -3640,6 +3640,7 @@ var successfully$1 = "successfully";
 var entitlement$1 = "Some of the content on this page is available with one or more of our plans. <1>Subscribe</1> now to get full page access.";
 var recaptcha$1 = "This site is protected by reCAPTCHA and the Google <1>Privacy Policy</1> and <3>Terms of Service</3> apply.";
 var invalidInvoice$1 = "Invalid invoice ID, please contact support";
+var zeroTotalInvoice$1 = "You can't view an invoice of 0$";
 var messages_en = {
 	youAreSafe: youAreSafe$1,
 	cancel: cancel$1,
@@ -3647,7 +3648,8 @@ var messages_en = {
 	successfully: successfully$1,
 	entitlement: entitlement$1,
 	recaptcha: recaptcha$1,
-	invalidInvoice: invalidInvoice$1
+	invalidInvoice: invalidInvoice$1,
+	zeroTotalInvoice: zeroTotalInvoice$1
 };
 
 var youAreSafe = "Vous êtes en sécurité - PCI conforme 128 SSL par";
@@ -3657,6 +3659,7 @@ var successfully = "avec succès.";
 var entitlement = "Une partie du contenu de cette page est disponible sous un ou plusieurs de nos plans. <1>Abonnez-vous</1> à l'un de nos plans disponibles pour accéder à plus de contenu";
 var recaptcha = "Ce site est protégé par reCAPTCHA - les <1>règles de confidentialité</1> Google ainsi que les <3>conditions d'utilisation</3> s'appliquent.";
 var invalidInvoice = "Invalid invoice ID, please contact support";
+var zeroTotalInvoice = "You can't view an invoice of 0$";
 var messages_fr = {
 	youAreSafe: youAreSafe,
 	cancel: cancel,
@@ -3664,7 +3667,8 @@ var messages_fr = {
 	successfully: successfully,
 	entitlement: entitlement,
 	recaptcha: recaptcha,
-	invalidInvoice: invalidInvoice
+	invalidInvoice: invalidInvoice,
+	zeroTotalInvoice: zeroTotalInvoice
 };
 
 var labels$j = {
@@ -9124,6 +9128,17 @@ const showInvoiceDetailsFromUrl = () => {
       return notify.error(errorMessage);
     }
 
+    const {
+      invoice
+    } = usePelcro.getStore();
+
+    if (invoice.total === 0) {
+      const errorMessage = i18next.t("messages:zeroTotalInvoice", {
+        returnObjects: true
+      });
+      return notify.error(errorMessage);
+    }
+
     return switchView("invoice-details");
   });
 };
@@ -12780,6 +12795,7 @@ class Subscription {
    * @property {number} [quantity]
    * @property {string} addressId
    * @property {number} invoiceId
+   * @property {boolean} isExistingSource
    */
 
   /**
@@ -12965,11 +12981,15 @@ class StripeGateway {
           token,
           invoiceId
         } = options;
-        window.Pelcro.invoice.pay({
+        const params = options.isExistingSource ? {
+          source_id: token,
+          invoice_id: invoiceId
+        } : {
           payment_gateway: _classPrivateFieldGet(this, _paymentGateway),
           gateway_token: token,
           invoice_id: invoiceId
-        }, (err, res) => {
+        };
+        window.Pelcro.invoice.pay(params, (err, res) => {
           callback(err, res);
         });
       }
@@ -13859,6 +13879,7 @@ const PaymentMethodContainerWithoutStripe = ({
     return subscription.execute({
       type: SUBSCRIPTION_TYPES.PAY_INVOICE,
       token: gatewayToken,
+      isExistingSource: Boolean(selectedPaymentMethodId),
       invoiceId: invoice.id
     }, (err, res) => {
       dispatch({
@@ -13881,9 +13902,6 @@ const PaymentMethodContainerWithoutStripe = ({
         });
       }
 
-      set({
-        invoice: null
-      });
       onSuccess(res);
     });
   };
@@ -14241,7 +14259,7 @@ const PaymentMethodContainerWithoutStripe = ({
       case HANDLE_PAYPAL_SUBSCRIPTION:
         return lib_5(state, (state, dispatch) => {
           if (type === "invoicePayment") {
-            payInvoice(new PaypalGateWay(), action.payload, dispatch);
+            payInvoice(new PaypalGateway(), action.payload, dispatch);
           } else {
             handlePaypalSubscription(state, action.payload);
           }
@@ -22375,7 +22393,7 @@ const InvoicesMenu = props => {
 };
 
 const InvoicesItems = () => {
-  var _window$Pelcro$invoic;
+  var _window$Pelcro$invoic, _window$Pelcro$invoic2;
 
   const {
     t
@@ -22384,7 +22402,7 @@ const InvoicesItems = () => {
     setInvoice,
     switchView
   } = usePelcro();
-  const invoices = (_window$Pelcro$invoic = window.Pelcro.invoice.list()) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
+  const invoices = (_window$Pelcro$invoic = (_window$Pelcro$invoic2 = window.Pelcro.invoice.list()) === null || _window$Pelcro$invoic2 === void 0 ? void 0 : _window$Pelcro$invoic2.filter(invoice => invoice.total > 0)) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
 
   const showInvoiceDetails = event => {
     if (setInvoice(event.target.dataset.id)) {
@@ -23060,9 +23078,9 @@ class Dashboard extends Component {
 }
 
 function hasInvoices() {
-  var _window$Pelcro$invoic;
+  var _window$Pelcro$invoic, _window$Pelcro$invoic2;
 
-  const invoices = (_window$Pelcro$invoic = window.Pelcro.invoice.list()) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
+  const invoices = (_window$Pelcro$invoic = (_window$Pelcro$invoic2 = window.Pelcro.invoice.list()) === null || _window$Pelcro$invoic2 === void 0 ? void 0 : _window$Pelcro$invoic2.filter(invoice => invoice.total > 0)) !== null && _window$Pelcro$invoic !== void 0 ? _window$Pelcro$invoic : [];
   return invoices.length > 0;
 }
 
@@ -25257,11 +25275,11 @@ const InvoiceDetailsView = props => {
   }, t("labels.summary")), invoice && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
     className: "plc-mr-2 pelcro-invoice-creation-date"
   }, `${t("labels.creationDate")} ${formattedCreationDate}`), /*#__PURE__*/React__default.createElement("div", {
-    className: "plc-flex plc-items-center plc-pt-2 plc-mt-2 plc-border-t plc-border-gray-400 plc-min-h-12 plc-justify-evenly pelcro-invoice-plan-wrapper"
+    className: "plc-flex plc-items-center plc-pt-2 plc-mt-2 plc-border-t plc-border-gray-400 plc-min-h-12 plc-justify-between pelcro-invoice-plan-wrapper"
   }, /*#__PURE__*/React__default.createElement("div", {
-    className: "plc-w-1/2 plc-break-words pelcro-invoice-plan-name"
+    className: "plc-break-words pelcro-invoice-plan-name"
   }, invoice.plan.nickname), /*#__PURE__*/React__default.createElement("div", {
-    className: "plc-w-1/5 plc-text-center pelcro-invoice-summary-price"
+    className: "plc-text-center pelcro-invoice-summary-price"
   }, calcAndFormatItemsTotal([invoice.plan], invoice.currency))), /*#__PURE__*/React__default.createElement("div", {
     className: "plc-flex plc-justify-end plc-pt-2 plc-mt-2 plc-font-bold plc-border-t plc-border-gray-400 pelcro-invoice-total-wrapper"
   }, /*#__PURE__*/React__default.createElement("div", {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pelcro/react-pelcro-js",
   "description": "Pelcro's React UI Elements",
-  "version": "3.0.0-beta.11",
+  "version": "3.0.0-beta.12",
   "license": "MIT",
   "private": false,
   "main": "dist/index.cjs.js",