makerspace-react-rails 0.14.0 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faaae83371517a9a1b5712f4c4a1c0be90857139145f4592e8cb162f299ebfd1
-  data.tar.gz: 6f23abbedf818d3ba649a783cc19558ec6d99e6b99ea490dfff5f6ea7d3c3c91
+  metadata.gz: 5d125be8336a83fcad4c657f9c80e62aae9a5fb7018d5a44dc30ae1f9313acce
+  data.tar.gz: 6dd4b7c12cf5100610b2526a28bef78eb21f9b04eebb584e3baac7680d8ff59e
 SHA512:
-  metadata.gz: 86e18e3c3cb7633c5aac983ca8f4a2ef0c664243bd0a3cbdf19de7c822ce648605691ed4432449eb98683781c7520243987870f2cb78b1d2086db9b6b1da54fa
-  data.tar.gz: e57f93833ab3d170d03e1dedf26b1a8d07b95d332bbb5729ce83afccbf89744a524eabdcef86224ea634fc1a812957f3c4f9036ca186b289adc9667de9622463
+  metadata.gz: 8a739811b3412054c73198a9b0a427fd01dce9926bb8dbafce0d4e65b0a940942c9749280af699390a08fdb19c9fac22021c176da4b7109fb31d5bb5158b0ea4
+  data.tar.gz: 705bbbddb1b3e528f14a167bb48af48c0c5c784ee886b209fdc7eedcd42d840860fb7b1875643cb178914c703984de69649fa972469628bb095a79454e4d97fd

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

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.14.0"
+      VERSION = "0.16.3"
     end
   end
 end

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

@@ -205010,13 +205010,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InvoiceableResource", function() { return InvoiceableResource; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "InvoiceableResourceDisplay", function() { return InvoiceableResourceDisplay; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Properties", function() { return Properties; });
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! makerspace-ts-api-client */ "./node_modules/makerspace-ts-api-client/dist/apiClient.js");
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_0__);
 var _InvoiceableResourceD;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-
 var isMemberInvoice = function isMemberInvoice(item) {
   return item && !!item.member && !item.rental;
 };
@@ -205309,15 +205306,21 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/core/Button */ "./node_modules/@material-ui/core/Button/index.js");
 /* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
-/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! makerspace-ts-api-client */ "./node_modules/makerspace-ts-api-client/dist/apiClient.js");
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var ui_common_FormModal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ui/common/FormModal */ "./src/ui/common/FormModal.tsx");
-/* harmony import */ var ui_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ui/hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
-/* harmony import */ var ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ui/hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
-/* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
-/* harmony import */ var _common_ButtonRow__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Checkbox */ "./node_modules/@material-ui/core/Checkbox/index.js");
+/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/FormControlLabel */ "./node_modules/@material-ui/core/FormControlLabel/index.js");
+/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! makerspace-ts-api-client */ "./node_modules/makerspace-ts-api-client/dist/apiClient.js");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var ui_common_FormModal__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/common/FormModal */ "./src/ui/common/FormModal.tsx");
+/* harmony import */ var ui_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ui/hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
+/* harmony import */ var ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ui/hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
+/* harmony import */ var _common_ButtonRow__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -205336,6 +205339,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
+
+
 var AccessCardForm = function AccessCardForm(_ref) {
   var memberId = _ref.memberId;
 
@@ -205344,12 +205350,22 @@ var AccessCardForm = function AccessCardForm(_ref) {
       error = _React$useState2[0],
       setError = _React$useState2[1];
 
-  var _useModal = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_7__["default"])(),
+  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_0__["useState"](false),
+      _React$useState4 = _slicedToArray(_React$useState3, 2),
+      idVerified = _React$useState4[0],
+      setIdVerified = _React$useState4[1];
+
+  var toggleVerified = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (event) {
+    setIdVerified(event.currentTarget.checked);
+    setError("");
+  }, [setError, setIdVerified]);
+
+  var _useModal = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_10__["default"])(),
       isOpen = _useModal.isOpen,
       openModal = _useModal.openModal,
       closeModal = _useModal.closeModal;
 
-  var _useReadTransaction = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["adminGetNewCard"], {
+  var _useReadTransaction = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_6__["adminGetNewCard"], {
     uid: memberId
   }),
       newCardLoading = _useReadTransaction.isRequesting,
@@ -205357,7 +205373,7 @@ var AccessCardForm = function AccessCardForm(_ref) {
       getNewCard = _useReadTransaction.refresh,
       rejectionCard = _useReadTransaction.data;
 
-  var _useReadTransaction2 = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["getMember"], {
+  var _useReadTransaction2 = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_6__["getMember"], {
     id: memberId
   }),
       memberLoading = _useReadTransaction2.isRequesting,
@@ -205372,7 +205388,7 @@ var AccessCardForm = function AccessCardForm(_ref) {
     reset();
   }, [refreshMember, closeModal]);
 
-  var _useWriteTransaction = Object(ui_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["adminCreateCard"], onSuccess),
+  var _useWriteTransaction = Object(ui_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_8__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_6__["adminCreateCard"], onSuccess),
       createLoading = _useWriteTransaction.isRequesting,
       createError = _useWriteTransaction.error,
       createCard = _useWriteTransaction.call,
@@ -205384,21 +205400,26 @@ var AccessCardForm = function AccessCardForm(_ref) {
       return;
     }
 
+    if (!idVerified) {
+      setError("Member ID verification required to issue key.");
+      return;
+    }
+
     createCard({
       createAccessCardDetails: {
         memberId: member.id,
         uid: rejectionCard.uid
       }
     });
-  }, [rejectionCard, createCard, setError, member.id]);
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ButtonRow__WEBPACK_IMPORTED_MODULE_8__["ActionButton"], {
+  }, [rejectionCard, createCard, setError, member.id, idVerified]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ButtonRow__WEBPACK_IMPORTED_MODULE_11__["ActionButton"], {
     id: "member-detail-open-card-modal",
     color: "primary",
     variant: member && member.cardId ? "outlined" : "contained",
     disabled: memberLoading,
     label: member && member.cardId ? "Replace Fob" : "Register Fob",
     onClick: openModal
-  }), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_4__["default"], {
+  }), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_7__["default"], {
     id: "card-form",
     loading: createLoading || newCardLoading,
     isOpen: true,
@@ -205406,14 +205427,14 @@ var AccessCardForm = function AccessCardForm(_ref) {
     closeHandler: closeModal,
     onSubmit: onSubmit,
     error: createError || newCardError || error
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_5___default.a, {
     variant: "body1",
     gutterBottom: true
-  }, "Instructions to register new member key fob"), member && member.cardId ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2___default.a, {
+  }, "Instructions to register new member key fob"), member && member.cardId ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_5___default.a, {
     color: "default",
     variant: "body1",
     gutterBottom: true
-  }, "Access card exists for ", member.firstname) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_2___default.a, {
+  }, "Access card exists for ", member.firstname) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_5___default.a, {
     color: "secondary",
     variant: "body1",
     gutterBottom: true
@@ -205434,7 +205455,20 @@ var AccessCardForm = function AccessCardForm(_ref) {
     style: {
       color: "red"
     }
-  }, " No Card Found"))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("ul", null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("li", null, "If 'No Card Found', check for error message in this form.  If no error, try steps 1 and 2 again"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("li", null, "If ID displayed, click 'Submit' button")))));
+  }, " No Card Found"))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("ul", null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("li", null, "If 'No Card Found', check for error message in this form.  If no error, try steps 1 and 2 again"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("li", null, "If ID displayed, click 'Submit' button"))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    item: true,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_3___default.a, {
+      name: "id-verified",
+      id: "card-form-id-verified",
+      value: "id-verified",
+      checked: idVerified,
+      onChange: toggleVerified,
+      color: "default"
+    }),
+    label: "Verified member's name and address with valid identification"
+  }))));
 };
 
 /* harmony default export */ __webpack_exports__["default"] = (AccessCardForm);
@@ -207919,8 +207953,16 @@ function (_React$Component) {
         var field = ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"][optionMap];
 
         if (field) {
-          // Apply to form values update object
-          invoiceOptionForm[field.name] = val;
+          var value = val;
+
+          if (key === app_entities_billingPlan__WEBPACK_IMPORTED_MODULE_12__["Properties"].Amount) {
+            value -= billingPlan.discounts.reduce(function (amt, discount) {
+              return amt + Number(discount.amount);
+            }, 0);
+          } // Apply to form values update object
+
+
+          invoiceOptionForm[field.name] = value;
         }
 
         return invoiceOptionForm;
@@ -214894,7 +214936,11 @@ var DocumentForm = function DocumentForm(_ref) {
     submitText: "Proceed",
     onSubmit: onSubmit,
     error: signatureError || error,
-    loading: loading
+    loading: loading,
+    style: {
+      maxWidth: "900px",
+      margin: "auto"
+    }
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_Document__WEBPACK_IMPORTED_MODULE_8__["default"], {
     id: id,
     src: src
@@ -215075,6 +215121,85 @@ var MembershipAgreement = function MembershipAgreement() {
 
 /***/ }),
 
+/***/ "./src/ui/documents/PreviewMemberContract.tsx":
+/*!****************************************************!*\
+  !*** ./src/ui/documents/PreviewMemberContract.tsx ***!
+  \****************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ "./node_modules/react/index.js");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/core/Button */ "./node_modules/@material-ui/core/Button/index.js");
+/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _material_ui_core_DialogActions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/DialogActions */ "./node_modules/@material-ui/core/DialogActions/index.js");
+/* harmony import */ var _material_ui_core_DialogActions__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_DialogActions__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_Dialog__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Dialog */ "./node_modules/@material-ui/core/Dialog/index.js");
+/* harmony import */ var _material_ui_core_Dialog__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Dialog__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _Document__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Document */ "./src/ui/documents/Document.tsx");
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
+
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+
+
+
+
+
+
+
+var PreviewMemberContract = function PreviewMemberContract() {
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_0__["useState"](false),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      isOpen = _React$useState2[0],
+      setIsOpen = _React$useState2[1];
+
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1___default.a, {
+    onClick: function onClick() {
+      return setIsOpen(true);
+    }
+  }, "View Member Contract"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Dialog__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    fullWidth: true,
+    maxWidth: "md",
+    open: isOpen,
+    onClose: function onClose() {
+      return setIsOpen(false);
+    },
+    disableBackdropClick: true,
+    scroll: "body"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    container: true,
+    justify: "center",
+    style: {
+      margin: "1em 0",
+      padding: "0 1em"
+    }
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    item: true,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_Document__WEBPACK_IMPORTED_MODULE_5__["default"], {
+    id: "preview-member-contract",
+    src: String(_Document__WEBPACK_IMPORTED_MODULE_5__["documents"][_Document__WEBPACK_IMPORTED_MODULE_5__["Documents"].MemberContract].src)
+  }))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_DialogActions__WEBPACK_IMPORTED_MODULE_2___default.a, null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_1___default.a, {
+    variant: "outlined",
+    onClick: function onClick() {
+      return setIsOpen(false);
+    }
+  }, "Close"))));
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (PreviewMemberContract);
+
+/***/ }),
+
 /***/ "./src/ui/documents/RentalAgreement.tsx":
 /*!**********************************************!*\
   !*** ./src/ui/documents/RentalAgreement.tsx ***!
@@ -218189,7 +218314,6 @@ var InvoicesTable = function InvoicesTable(_ref) {
     cell: function cell(row) {
       if (row.subscriptionId && viewingOwnInvoices) {
         return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_17__["default"], {
-          subscriptionId: row.subscriptionId,
           memberId: row.memberId
         });
       }
@@ -218732,18 +218856,15 @@ var EditMember = function EditMember(_ref) {
       closeModal = _useModal.closeModal;
 
   var _useAuthState = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_5__["useAuthState"])(),
-      _useAuthState$current = _useAuthState.currentUser,
-      id = _useAuthState$current.id,
-      isAdmin = _useAuthState$current.isAdmin;
+      isAdmin = _useAuthState.currentUser.isAdmin;
 
-  var asAdmin = isAdmin && member.id !== id;
   var formRef = react__WEBPACK_IMPORTED_MODULE_0__["useRef"]();
   var onSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function () {
     closeModal();
     onEdit && onEdit();
   }, [onEdit, closeModal]);
 
-  var _useWriteTransaction = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_2__["default"])(asAdmin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminUpdateMember"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["updateMember"], onSuccess),
+  var _useWriteTransaction = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_2__["default"])(isAdmin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminUpdateMember"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["updateMember"], onSuccess),
       memberUpdating = _useWriteTransaction.isRequesting,
       updateError = _useWriteTransaction.error,
       update = _useWriteTransaction.call;
@@ -218809,7 +218930,7 @@ var EditMember = function EditMember(_ref) {
   }), (isOpen || formOnly) && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_MemberForm__WEBPACK_IMPORTED_MODULE_6__["default"], {
     ref: formRef,
     member: member,
-    isAdmin: asAdmin,
+    isAdmin: isAdmin,
     isOpen: true,
     isRequesting: memberUpdating,
     error: updateError,
@@ -218856,6 +218977,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _EditMember__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./EditMember */ "./src/ui/member/EditMember.tsx");
 /* harmony import */ var _RenewMember__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./RenewMember */ "./src/ui/member/RenewMember.tsx");
 /* harmony import */ var _NotificationModal__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./NotificationModal */ "./src/ui/member/NotificationModal.tsx");
+/* harmony import */ var _documents_PreviewMemberContract__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../documents/PreviewMemberContract */ "./src/ui/documents/PreviewMemberContract.tsx");
+/* harmony import */ var ui_subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ui/subscriptions/ViewSubscriptionModal */ "./src/ui/subscriptions/ViewSubscriptionModal.tsx");
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
@@ -218891,6 +219014,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
+
 
 
 
@@ -218941,6 +219066,11 @@ var MemberProfile = function MemberProfile() {
       setNotification(_NotificationModal__WEBPACK_IMPORTED_MODULE_20__["Notification"].Welcome);
     }
   }, [initRender, isOwnProfile, memberLoading, member.memberContractOnFile]);
+  react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
+    if (!initRender && isOwnProfile && !memberLoading && member.id && !(member.address && member.address.street)) {
+      setNotification(_NotificationModal__WEBPACK_IMPORTED_MODULE_20__["Notification"].IdentifcationDetails);
+    }
+  }, [initRender, isOwnProfile, memberLoading, member.address]);
 
   var _useReadTransaction2 = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_16__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["listRentals"], {}),
       _useReadTransaction2$ = _useReadTransaction2.data,
@@ -218984,8 +219114,11 @@ var MemberProfile = function MemberProfile() {
       case _NotificationModal__WEBPACK_IMPORTED_MODULE_20__["Notification"].Welcome:
         history.push(app_constants__WEBPACK_IMPORTED_MODULE_11__["Routing"].Documents.replace(app_constants__WEBPACK_IMPORTED_MODULE_11__["Routing"].PathPlaceholder.Resource, "membership").replace(app_constants__WEBPACK_IMPORTED_MODULE_11__["Routing"].PathPlaceholder.ResourceId, ""));
         break;
+
+      case _NotificationModal__WEBPACK_IMPORTED_MODULE_20__["Notification"].IdentifcationDetails:
+        goToSettings();
     }
-  }, [history, rentals, notification]);
+  }, [history, rentals, notification, goToSettings]);
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
     if (memberError && !member.id) {
       history.push(app_constants__WEBPACK_IMPORTED_MODULE_11__["Routing"].Members);
@@ -218996,6 +219129,7 @@ var MemberProfile = function MemberProfile() {
     return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_4__["default"], null);
   }
 
+  var memberSubscription = Object(_constants__WEBPACK_IMPORTED_MODULE_12__["getDetailsForMember"])(member);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_DetailView__WEBPACK_IMPORTED_MODULE_6__["default"], {
     title: "".concat(member.firstname, " ").concat(member.lastname),
     basePath: "/members/".concat(memberId),
@@ -219036,13 +219170,19 @@ var MemberProfile = function MemberProfile() {
     })), billingEnabled && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_5__["default"], {
       label: "Membership Type"
     }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      id: "member-detail-type"
-    }, Object(_constants__WEBPACK_IMPORTED_MODULE_12__["getDetailsForMember"])(member).type)), member.notes && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_5__["default"], {
+      id: "member-detail-type",
+      style: {
+        marginRight: "1em"
+      }
+    }, memberSubscription.type), isAdmin && !isOwnProfile && memberSubscription === _constants__WEBPACK_IMPORTED_MODULE_12__["membershipDetails"].subscription && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_22__["default"], {
+      memberId: memberId,
+      onChange: refreshMember
+    })), member.notes && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_5__["default"], {
       label: "Notes"
     }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
       id: "member-detail-notes",
       className: "preformatted"
-    }, member.notes))),
+    }, member.notes)), isOwnProfile && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_documents_PreviewMemberContract__WEBPACK_IMPORTED_MODULE_21__["default"], null)),
     activeResourceName: resource,
     resources: (isOwnProfile || isAdmin) && [].concat(_toConsumableArray(isEarnedMember ? [{
       name: "membership",
@@ -219180,6 +219320,14 @@ function (_React$Component) {
       });
     });
 
+    _defineProperty(_assertThisInitialized(_this), "togglePaypal", function (event) {
+      var checked = event.currentTarget.checked;
+
+      _this.setState({
+        subscription: checked
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "validate",
     /*#__PURE__*/
     function () {
@@ -219417,11 +219565,25 @@ function (_React$Component) {
           color: "default"
         }),
         label: fields.memberContractOnFile.label
+      })), member && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+        item: true,
+        xs: 12
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_7___default.a, {
+        control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default.a, {
+          name: fields.subscription.name,
+          id: fields.subscription.name,
+          value: fields.subscription.name,
+          checked: _this.state.subscription,
+          onChange: _this.togglePaypal,
+          color: "default"
+        }),
+        label: fields.subscription.label
       }))));
     });
 
     _this.state = {
-      memberContractOnFile: false
+      memberContractOnFile: false,
+      subscription: false
     };
     return _this;
   }
@@ -219431,7 +219593,8 @@ function (_React$Component) {
     value: function componentDidMount() {
       var member = this.props.member;
       this.setState({
-        memberContractOnFile: member && member.memberContractOnFile || false
+        memberContractOnFile: member && member.memberContractOnFile || false,
+        subscription: member && member.subscription || false
       });
     }
   }, {
@@ -219443,7 +219606,8 @@ function (_React$Component) {
 
       if (isOpen && !prevProps.isOpen) {
         this.setState({
-          memberContractOnFile: member && member.memberContractOnFile || false
+          memberContractOnFile: member && member.memberContractOnFile || false,
+          subscription: member && member.subscription || false
         });
       }
 
@@ -219774,6 +219938,7 @@ var Notification;
   Notification["MembershipExpired"] = "membershipExpired";
   Notification["PaymentRequired"] = "paymentRequired";
   Notification["SignRental"] = "SignRental";
+  Notification["IdentifcationDetails"] = "IdentifcationDetails";
 })(Notification || (Notification = {}));
 
 var Notifications = (_Notifications = {}, _defineProperty(_Notifications, Notification.Welcome, {
@@ -219786,6 +219951,11 @@ var Notifications = (_Notifications = {}, _defineProperty(_Notifications, Notifi
   submit: "Review Documents",
   body: "We are missing a signed rental agreement for one of your plot, shelf or locker rentals.  Please take a moment to review these documents before continuing",
   required: true
+}), _defineProperty(_Notifications, Notification.IdentifcationDetails, {
+  title: "Please complete your profile",
+  submit: "Review profile",
+  body: "Your profile is missing some required information such as your address. Please take a moment to review and update your account.",
+  required: true
 }), _Notifications);
 
 var NotificationModal = function NotificationModal(_ref) {
@@ -219940,13 +220110,14 @@ var RenewMember = function RenewMember(_ref) {
 /*!************************************!*\
   !*** ./src/ui/member/constants.ts ***!
   \************************************/
-/*! exports provided: fields, MemberRoleOptions, getDetailsForMember */
+/*! exports provided: fields, MemberRoleOptions, membershipDetails, getDetailsForMember */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fields", function() { return fields; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MemberRoleOptions", function() { return MemberRoleOptions; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "membershipDetails", function() { return membershipDetails; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDetailsForMember", function() { return getDetailsForMember; });
 /* harmony import */ var app_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! app/utils */ "./src/app/utils.ts");
 /* harmony import */ var app_entities_member__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! app/entities/member */ "./src/app/entities/member.ts");
@@ -220001,7 +220172,7 @@ var fields = function fields(admin, member) {
       name: "".concat(formPrefix, "-street"),
       placeholder: "Enter street address",
       validate: function validate(val) {
-        return member && member.id ? true : !!val;
+        return admin && member && member.id ? true : !!val;
       },
       error: "Required"
     },
@@ -220014,7 +220185,7 @@ var fields = function fields(admin, member) {
       name: "".concat(formPrefix, "-city"),
       placeholder: "Enter city",
       validate: function validate(val) {
-        return member && member.id ? true : !!val;
+        return admin && member && member.id ? true : !!val;
       },
       error: "Required"
     },
@@ -220023,7 +220194,7 @@ var fields = function fields(admin, member) {
       name: "".concat(formPrefix, "-state"),
       placeholder: "Select a state",
       validate: function validate(val) {
-        return member && member.id ? true : !!val;
+        return admin && member && member.id ? true : !!val;
       },
       error: "Required"
     },
@@ -220032,7 +220203,7 @@ var fields = function fields(admin, member) {
       name: "".concat(formPrefix, "-postalCode"),
       placeholder: "Postal Code",
       validate: function validate(val) {
-        return member && member.id ? true : !!val;
+        return admin && member && member.id ? true : !!val;
       },
       error: "Required"
     }
@@ -220083,6 +220254,13 @@ var fields = function fields(admin, member) {
       },
       error: "Member must sign contract"
     },
+    subscription: {
+      label: "On PayPal Subscription (Warning: Don't touch this)",
+      name: "".concat(formPrefix, "-subscription"),
+      transform: function transform(val) {
+        return !!val;
+      }
+    },
     notes: {
       label: "Notes",
       name: "".concat(formPrefix, "-notes")
@@ -223222,6 +223400,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _common_ButtonRow__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
 /* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
 /* harmony import */ var _SubscriptionDetails__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./SubscriptionDetails */ "./src/ui/subscriptions/SubscriptionDetails.tsx");
+/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+
 
 
 
@@ -223234,10 +223414,19 @@ __webpack_require__.r(__webpack_exports__);
 
 var CancelSubscriptionModal = function CancelSubscriptionModal(_ref) {
   var _ref$subscription = _ref.subscription,
-      subscription = _ref$subscription === void 0 ? {} : _ref$subscription,
+      propsSub = _ref$subscription === void 0 ? {} : _ref$subscription,
+      subscriptionId = _ref.subscriptionId,
       memberId = _ref.memberId,
       onSuccess = _ref.onSuccess;
-  var subscriptionId = subscription.id;
+
+  var _useReadTransaction = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["getSubscription"], {
+    id: subscriptionId
+  }, !subscriptionId || !!propsSub.id),
+      subscriptionLoading = _useReadTransaction.isRequesting,
+      data = _useReadTransaction.data,
+      subError = _useReadTransaction.error;
+
+  var subscription = data || propsSub;
 
   var _useAuthState = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_4__["useAuthState"])(),
       _useAuthState$current = _useAuthState.currentUser,
@@ -223270,12 +223459,12 @@ var CancelSubscriptionModal = function CancelSubscriptionModal(_ref) {
     id: "subscription-option-cancel",
     color: "secondary",
     variant: "outlined",
-    disabled: disableButton,
+    disabled: disableButton || !!subError,
     label: "Cancel Subscription",
     onClick: openModal
   }), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_2__["default"], {
     id: "cancel-subscription",
-    loading: isRequesting,
+    loading: subscriptionLoading || isRequesting,
     isOpen: isOpen,
     closeHandler: closeModal,
     title: "Cancel Subscription",
@@ -223611,7 +223800,8 @@ var SubscriptionDetailsInner = function SubscriptionDetailsInner(_ref) {
 
 var SubscriptionDetails = function SubscriptionDetails(_ref2) {
   var memberId = _ref2.memberId,
-      rentalSubId = _ref2.rentalSubId;
+      rentalSubId = _ref2.rentalSubId,
+      propsOnChange = _ref2.onChange;
 
   var _useAuthState = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_9__["useAuthState"])(),
       _useAuthState$current = _useAuthState.currentUser,
@@ -223660,6 +223850,7 @@ var SubscriptionDetails = function SubscriptionDetails(_ref2) {
     reloadMember();
     reloadInvoices();
     reloadSubscription();
+    propsOnChange && propsOnChange();
   }, [reloadMember, reloadInvoices, reloadSubscription]);
   var fallbackUI = isLoading && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_4__["default"], {
     id: "update-membership-modal-loading",
@@ -223681,6 +223872,7 @@ var SubscriptionDetails = function SubscriptionDetails(_ref2) {
     onSuccess: onChange
   }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_CancelSubscriptionModal__WEBPACK_IMPORTED_MODULE_13__["default"], {
     subscription: subscription,
+    subscriptionId: subscriptionId,
     memberId: memberId,
     onSuccess: onChange
   })))) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_NoSubscriptionDetails__WEBPACK_IMPORTED_MODULE_11__["default"], {
@@ -223766,7 +223958,7 @@ var subscriptionStatuses = {
   },
   pastDue: {
     label: "Past Due",
-    value: "PastDue"
+    value: "Past Due"
   },
   pending: {
     label: "Pending",
@@ -224094,6 +224286,7 @@ var SubscriptionsTable = function SubscriptionsTable() {
     xs: 12
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_CancelSubscriptionModal__WEBPACK_IMPORTED_MODULE_7__["default"], {
     subscription: selectedSubscription,
+    subscriptionId: selectedId,
     onSuccess: onCancel
   }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionFilters__WEBPACK_IMPORTED_MODULE_10__["default"], {
     onChange: refresh
@@ -224137,8 +224330,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 var ViewSubscriptionModal = function ViewSubscriptionModal(_ref) {
-  var subscriptionId = _ref.subscriptionId,
-      memberId = _ref.memberId;
+  var memberId = _ref.memberId,
+      onChange = _ref.onChange;
 
   var _useModal = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_1__["default"])(),
       isOpen = _useModal.isOpen,
@@ -224158,7 +224351,8 @@ var ViewSubscriptionModal = function ViewSubscriptionModal(_ref) {
     closeHandler: closeModal,
     cancelText: "Close"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionDetails__WEBPACK_IMPORTED_MODULE_4__["default"], {
-    memberId: memberId
+    memberId: memberId,
+    onChange: onChange
   })));
 };