makerspace-react-rails 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c0e7c10da842e51a7b49a1ef7bd803c1a81600a72221a7edd6bb991df42331b
-  data.tar.gz: 9b7b72765525086f3e150e49fbedf3bb58e6da0dce183a0e70e8702bc8e461a6
+  metadata.gz: 3a0ad7422a1dbfd6b6faab9e6975d3c49d9a4dabd18543311b7d3b5e22c82e91
+  data.tar.gz: 1ed061994d26fadda4d623263a49cb5c8478ecc17933e02c50c47ecce363863d
 SHA512:
-  metadata.gz: 839936e32213cb0d392be041340ee59aa7d35893d15c9a0bf0b168bc60dd19b3b2ddc16d85662390b057afd18f162f33cf1ec3a0adc5736ffb4b8b8643054721
-  data.tar.gz: 0b43d4c57adb803eb3927f349e0edd183110c993718e9c448d34cf34e0b75f6dd4b47157fc51a28013fe8e877afc6fe09bfdc58feef24cb2e45f630a9e8a8b7a
+  metadata.gz: cb38bcb277a104151ed3ea6fcb949a5eedc477783f5c435f30cb9a17718db19777f6d20157bbffb01c19fa3d70a2608b0f2e8ea6ae98e7886390d0a21676eed3
+  data.tar.gz: fa004c2dba1be981eb7995f36102ed7c6d1e9a311955f1712c7c5a8c3017497277c440de3cb41f5548b393e6638f825752ed676cd36863d73030213dffa4225d

data/lib/makerspace/react/rails/version.rb

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.4.3"
+      VERSION = "0.4.4"
     end
   end
 end

data/vendor/assets/javascripts/makerspace-react.js

@@ -176832,7 +176832,6 @@ var MemberDetail_1 = __webpack_require__(/*! ui/member/MemberDetail */ "./src/ui
 var CheckoutPage_1 = __webpack_require__(/*! ui/checkout/CheckoutPage */ "./src/ui/checkout/CheckoutPage.tsx");
 var BillingContainer_1 = __webpack_require__(/*! ui/billing/BillingContainer */ "./src/ui/billing/BillingContainer.tsx");
 var Settings_1 = __webpack_require__(/*! ui/member/Settings */ "./src/ui/member/Settings.tsx");
-var BillingContextContainer_1 = __webpack_require__(/*! ui/billing/BillingContextContainer */ "./src/ui/billing/BillingContextContainer.tsx");
 var Receipt_1 = __webpack_require__(/*! ui/checkout/Receipt */ "./src/ui/checkout/Receipt.tsx");
 var SendRegistrationComponent_1 = __webpack_require__(/*! ui/auth/SendRegistrationComponent */ "./src/ui/auth/SendRegistrationComponent.tsx");
 var SignDocuments_1 = __webpack_require__(/*! ui/documents/SignDocuments */ "./src/ui/documents/SignDocuments.tsx");
@@ -176840,20 +176839,19 @@ var PrivateRouting = function (_a) {
     var currentUserId = _a.currentUserId, permissions = _a.permissions, isAdmin = _a.isAdmin;
     var billingEnabled = permissions[constants_1.Whitelists.billing] || false;
     var earnedMembershipEnabled = isAdmin && permissions[constants_1.Whitelists.earnedMembership];
-    return (React.createElement(BillingContextContainer_1.default, null,
-        React.createElement(react_router_dom_1.Switch, null,
-            React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Members, component: MembersList_1.default }),
-            React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Documents, component: SignDocuments_1.default }),
-            React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Settings, component: Settings_1.default }),
-            React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Profile + "/" + constants_1.Routing.PathPlaceholder.Resource + constants_1.Routing.PathPlaceholder.Optional, component: MemberDetail_1.default }),
-            React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Rentals, component: RentalsList_1.default }),
-            billingEnabled && React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Billing + "/" + constants_1.Routing.PathPlaceholder.Resource + constants_1.Routing.PathPlaceholder.Optional, component: BillingContainer_1.default }),
-            billingEnabled && React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Receipt, component: Receipt_1.default }),
-            billingEnabled && React.createElement(react_router_dom_1.Route, { path: constants_1.Routing.Checkout, component: CheckoutPage_1.default }),
-            React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.SendRegistration, component: SendRegistrationComponent_1.default }),
-            earnedMembershipEnabled && React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.EarnedMemberships, component: EarnedMembershipsList_1.default }),
-            React.createElement(react_router_dom_1.Redirect, { to: constants_1.Routing.Members + "/" + currentUserId }),
-            React.createElement(react_router_dom_1.Route, { component: NotFound_1.default }))));
+    return (React.createElement(react_router_dom_1.Switch, null,
+        React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Members, component: MembersList_1.default }),
+        React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Documents, component: SignDocuments_1.default }),
+        React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Settings, component: Settings_1.default }),
+        React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Profile + "/" + constants_1.Routing.PathPlaceholder.Resource + constants_1.Routing.PathPlaceholder.Optional, component: MemberDetail_1.default }),
+        React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Rentals, component: RentalsList_1.default }),
+        billingEnabled && React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Billing + "/" + constants_1.Routing.PathPlaceholder.Resource + constants_1.Routing.PathPlaceholder.Optional, component: BillingContainer_1.default }),
+        billingEnabled && React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.Receipt, component: Receipt_1.default }),
+        billingEnabled && React.createElement(react_router_dom_1.Route, { path: constants_1.Routing.Checkout, component: CheckoutPage_1.default }),
+        React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.SendRegistration, component: SendRegistrationComponent_1.default }),
+        earnedMembershipEnabled && React.createElement(react_router_dom_1.Route, { exact: true, path: constants_1.Routing.EarnedMemberships, component: EarnedMembershipsList_1.default }),
+        React.createElement(react_router_dom_1.Redirect, { to: constants_1.Routing.Members + "/" + currentUserId }),
+        React.createElement(react_router_dom_1.Route, { component: NotFound_1.default })));
 };
 exports.default = PrivateRouting;
 
@@ -178324,6 +178322,7 @@ var DetailView_1 = __webpack_require__(/*! ui/common/DetailView */ "./src/ui/com
 var SubscriptionsList_1 = __webpack_require__(/*! ui/subscriptions/SubscriptionsList */ "./src/ui/subscriptions/SubscriptionsList.tsx");
 var TransactionsList_1 = __webpack_require__(/*! ui/transactions/TransactionsList */ "./src/ui/transactions/TransactionsList.tsx");
 var OptionsList_1 = __webpack_require__(/*! ui/billing/OptionsList */ "./src/ui/billing/OptionsList.tsx");
+var BillingContextContainer_1 = __webpack_require__(/*! ./BillingContextContainer */ "./src/ui/billing/BillingContextContainer.tsx");
 var BillingContainer = /** @class */ (function (_super) {
     __extends(BillingContainer, _super);
     function BillingContainer() {
@@ -178337,19 +178336,20 @@ var BillingContainer = /** @class */ (function (_super) {
         // Fetch member stats
     };
     BillingContainer.prototype.render = function () {
-        return (React.createElement(DetailView_1.default, { title: "Billing Central", basePath: constants_1.Routing.Billing, information: this.renderBillingInfo(), actionButtons: [], resources: [
-                {
-                    name: "subscriptions",
-                    content: (React.createElement(SubscriptionsList_1.default, null))
-                }, {
-                    name: "transactions",
-                    content: (React.createElement(TransactionsList_1.default, null))
-                }, {
-                    name: "options",
-                    displayName: "Billing Options",
-                    content: (React.createElement(OptionsList_1.default, null))
-                }
-            ] }));
+        return (React.createElement(BillingContextContainer_1.default, null,
+            React.createElement(DetailView_1.default, { title: "Billing Central", basePath: constants_1.Routing.Billing, information: this.renderBillingInfo(), actionButtons: [], resources: [
+                    {
+                        name: "subscriptions",
+                        content: (React.createElement(SubscriptionsList_1.default, null))
+                    }, {
+                        name: "transactions",
+                        content: (React.createElement(TransactionsList_1.default, null))
+                    }, {
+                        name: "options",
+                        displayName: "Billing Options",
+                        content: (React.createElement(OptionsList_1.default, null))
+                    }
+                ] })));
     };
     return BillingContainer;
 }(React.Component));
@@ -179623,7 +179623,6 @@ var Table_1 = __webpack_require__(/*! ui/common/table/Table */ "./src/ui/common/
 var numberAsCurrency_1 = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
 var ErrorMessage_1 = __webpack_require__(/*! ui/common/ErrorMessage */ "./src/ui/common/ErrorMessage.tsx");
 var LoadingOverlay_1 = __webpack_require__(/*! ui/common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
-var BillingContextContainer_1 = __webpack_require__(/*! ui/billing/BillingContextContainer */ "./src/ui/billing/BillingContextContainer.tsx");
 var FormModal_1 = __webpack_require__(/*! ui/common/FormModal */ "./src/ui/common/FormModal.tsx");
 var cart_1 = __webpack_require__(/*! ./cart */ "./src/ui/checkout/cart.ts");
 var useModal_1 = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
@@ -179644,10 +179643,13 @@ var CartList = function (_a) {
         !item && history.push(utils_1.buildProfileRouting(currentUserId));
         return emptyCart;
     }, []);
-    var discounts = React.useContext(BillingContextContainer_1.BillingContext).discounts;
+    // TODO: Update this when you update writeTransaction
     var onSuccess = React.useCallback(function (_a) {
-        var invoiceId = _a.invoiceId;
-        history.push("" + constants_1.Routing.Receipt.replace(constants_1.Routing.PathPlaceholder.InvoiceId, invoiceId));
+        var transaction = _a.response.data;
+        var invoiceId = transaction && transaction.invoice.id;
+        if (invoiceId) {
+            history.push("" + constants_1.Routing.Receipt.replace(constants_1.Routing.PathPlaceholder.InvoiceId, invoiceId));
+        }
     }, [history]);
     var _b = useWriteTransaction_1.default(makerspace_ts_api_client_1.createTransaction, onSuccess), call = _b.call, isRequesting = _b.isRequesting, error = _b.error, reset = _b.reset;
     var _c = useModal_1.default(), errorIsOpen = _c.isOpen, openModal = _c.openModal, closeModal = _c.closeModal;
@@ -179669,18 +179671,21 @@ var CartList = function (_a) {
             id: "description",
             label: "Description",
             cell: function (row) {
-                var discount = discounts && (discounts.data || []).find(function (discount) { return discount.id === row.discountId; });
                 return (React.createElement(React.Fragment, null,
-                    React.createElement("div", null, row.description),
-                    discount && (React.createElement(React.Fragment, null,
-                        React.createElement("hr", null),
-                        React.createElement("div", { id: "discount" }, discount.description)))));
+                    React.createElement("div", null, row.description)));
             },
         }], [
         {
             id: "amount",
             label: "Amount",
-            cell: function (row) { return numberAsCurrency_1.numberAsCurrency(row.amount); },
+            cell: function (row) {
+                var amount = Number(row.amount);
+                // TODO: this should use discount
+                if (row.discountId) {
+                    amount = amount * .90;
+                }
+                return numberAsCurrency_1.numberAsCurrency(amount);
+            },
         }
     ], withError ? [{
             id: "error",
@@ -179700,6 +179705,8 @@ var CartList = function (_a) {
     if (!item) {
         return null;
     }
+    // TODO: this should use discount
+    var totalAmount = item.discountId ? (Number(item.amount) * .90) : (item.amount);
     return (React.createElement(React.Fragment, null,
         React.createElement(Card_1.default, { style: { height: "100%" } },
             React.createElement(CardContent_1.default, null,
@@ -179709,7 +179716,7 @@ var CartList = function (_a) {
                     React.createElement(Grid_1.default, { item: true, xs: 12, style: { textAlign: "right" } },
                         React.createElement(Typography_1.default, { id: "total", variant: "h6", color: "inherit" },
                             "Total ",
-                            numberAsCurrency_1.numberAsCurrency(item.amount))),
+                            numberAsCurrency_1.numberAsCurrency(totalAmount))),
                     React.createElement(Grid_1.default, { item: true, xs: 12, style: { textAlign: "left" } },
                         React.createElement(Button_1.default, { id: "submit-payment-button", variant: "contained", disabled: !paymentMethodId, onClick: submitPayment }, "Submit Payment"))),
                 isRequesting && React.createElement(LoadingOverlay_1.default, { id: "checkout-submitting-overlay" }))),
@@ -186542,7 +186549,7 @@ var NoSubscriptionDetails = function (_a) {
     var resetCart = cart_1.useEmptyCart();
     var addToCart = cart_1.useAddToCart();
     var onSelect = React.useCallback(function (option, discountId) {
-        setOption(__assign(__assign({}, option), discountId && { discountId: discountId }));
+        setOption(__assign(__assign({}, option), { discountId: discountId }));
         setError("");
     }, [setOption]);
     var onSubmit = React.useCallback(function () { return __awaiter(void 0, void 0, void 0, function () {