makerspace-react-rails 0.10.6 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74b8892b207e2745c9bac9e75fbd0d90d6ea87e1f390e47f2123e9cb77798a0e
-  data.tar.gz: 1a4e3f6c0978f0c36b242b84e7c799f3028643c09f3694adcceb1b2a64f40707
+  metadata.gz: aae0c538f012516bc7dfd889d132936431860f66bbe6493e5b5560866dc269d0
+  data.tar.gz: 10a2d9f7c23e3d9ab66e0b243a0d490c3a1b0e966a6566a6020ce78a7911db8e
 SHA512:
-  metadata.gz: 90f9b85990019da956c27d07e6d9a592f6d4197c3e6dd9f39b8969127d834e4934c56d301e7b9c35980d3e3428c3eca19a472994f414c3e20658c26f64d66b25
-  data.tar.gz: d4cd8a9b629b6ce9d98b1796674a44e248870a6250ab5298380b8a6c5cdf68b69fec772c0a549467a2f20d3886be0abfcca927da62519f6f87cd04e429c67fb5
+  metadata.gz: 37ab0dd220757c5e97ba2b46caf367d9387e8a319ec3f900d53ed312e1df31e1e03b7377db457923d04682edd1f4e9a33c4831c3bf4d95e7545f211ba35d1563
+  data.tar.gz: f38fcff717b5ab6691c2e4d6e1ec413dc31d86535e7e9d62e67909fccd10eb8b107af9ce5f6e51f44430a0ddb6b4d1a2654f6b553e8931084fc38a7f44a5a5f2

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

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.10.6"
+      VERSION = "0.13.0"
     end
   end
 end

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

@@ -37704,6 +37704,38 @@ exports.default = _default;
 
 /***/ }),
 
+/***/ "./node_modules/@material-ui/icons/Error.js":
+/*!**************************************************!*\
+  !*** ./node_modules/@material-ui/icons/Error.js ***!
+  \**************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(__webpack_require__(/*! react */ "./node_modules/react/index.js"));
+
+var _createSvgIcon = _interopRequireDefault(__webpack_require__(/*! ./utils/createSvgIcon */ "./node_modules/@material-ui/icons/utils/createSvgIcon.js"));
+
+var _default = (0, _createSvgIcon.default)(_react.default.createElement(_react.default.Fragment, null, _react.default.createElement("path", {
+  fill: "none",
+  d: "M0 0h24v24H0z"
+}), _react.default.createElement("path", {
+  d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z"
+})), 'Error');
+
+exports.default = _default;
+
+/***/ }),
+
 /***/ "./node_modules/@material-ui/icons/FilterList.js":
 /*!*******************************************************!*\
   !*** ./node_modules/@material-ui/icons/FilterList.js ***!
@@ -103190,6 +103222,10 @@ function deleteTransaction(params) {
     return exports.makeRequest("DELETE", "/billing/transactions/{id}".replace("{id}", params.id));
 }
 exports.deleteTransaction = deleteTransaction;
+function message(params) {
+    return exports.makeRequest("POST", "/client_error_handler", { notification: params.messageDetails });
+}
+exports.message = message;
 function getDocument(params) {
     return exports.makeRequest("GET", "/documents/{id}".replace("{id}", params.id), params);
 }
@@ -103210,6 +103246,10 @@ function listInvoiceOptions(params) {
     return exports.makeRequest("GET", "/invoice_options", params, "invoiceOptions");
 }
 exports.listInvoiceOptions = listInvoiceOptions;
+function getInvoiceOption(params) {
+    return exports.makeRequest("GET", "/invoice_options/{id}".replace("{id}", params.id), undefined, "invoiceOption");
+}
+exports.getInvoiceOption = getInvoiceOption;
 function listInvoices(params) {
     return exports.makeRequest("GET", "/invoices", params, "invoices");
 }
@@ -203743,6 +203783,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! app/PublicRouting */ "./src/app/PublicRouting.tsx");
 /* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
 /* harmony import */ var ui_member_utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/member/utils */ "./src/ui/member/utils.ts");
+/* harmony import */ var src_ui_common_ErrorBoundary__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! src/ui/common/ErrorBoundary */ "./src/ui/common/ErrorBoundary.tsx");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -203762,6 +203803,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 
 
+
 var publicPaths = [app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].Login, app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].SignUp, app_constants__WEBPACK_IMPORTED_MODULE_9__["Routing"].PasswordReset];
 
 var App = function App() {
@@ -203821,7 +203863,7 @@ var App = function App() {
       }
     }
   }, [isRequesting]);
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](src_ui_common_ErrorBoundary__WEBPACK_IMPORTED_MODULE_11__["default"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
     className: "root"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_Header__WEBPACK_IMPORTED_MODULE_4__["default"], null), attemptingLogin ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_5__["default"], {
     id: "body"
@@ -203829,7 +203871,7 @@ var App = function App() {
     permissions: permissions,
     currentUserId: currentUserId,
     isAdmin: isAdmin
-  }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__["default"], null));
+  }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](app_PublicRouting__WEBPACK_IMPORTED_MODULE_8__["default"], null)));
 };
 
 /* harmony default export */ __webpack_exports__["default"] = (App);
@@ -204143,6 +204185,7 @@ var Properties;
   Properties["PlanId"] = "planId";
   Properties["Disabled"] = "disabled";
   Properties["DiscountId"] = "discountId";
+  Properties["IsPromotion"] = "isPromotion";
 })(Properties || (Properties = {}));
 
 /***/ }),
@@ -206432,8 +206475,7 @@ var BillingContainer = function BillingContainer() {
       newMembers = _ref.newMembers,
       subscribedMembers = _ref.subscribedMembers,
       pastDueInvoices = _ref.pastDueInvoices,
-      refundsPending = _ref.refundsPending; // TODO: this any can be removed when newMembers spelling is fixed in api client
-
+      refundsPending = _ref.refundsPending;
 
   var fallbackUI = isRequesting && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_10__["default"], {
     id: "plans-loading",
@@ -206743,6 +206785,10 @@ function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterat
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -206792,7 +206838,8 @@ var defaultState = {
   type: app_entities_invoice__WEBPACK_IMPORTED_MODULE_11__["InvoiceableResource"].Membership,
   planId: "",
   planMatchError: "",
-  disableOption: false
+  disableOption: false,
+  isPromotion: false
 };
 var BillingFormComponent =
 /*#__PURE__*/
@@ -206902,9 +206949,15 @@ function (_React$Component) {
       };
     }());
 
-    _defineProperty(_assertThisInitialized(_this), "toggleDisableOption", function (_event, checked) {
+    _defineProperty(_assertThisInitialized(_this), "toggleDisableOption", function (event) {
       return _this.setState({
-        disableOption: checked
+        disableOption: event.currentTarget.checked
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "togglePromotionOption", function (event) {
+      return _this.setState({
+        isPromotion: event.currentTarget.checked
       });
     });
 
@@ -206971,7 +207024,7 @@ function (_React$Component) {
       });
     });
 
-    _this.state = defaultState;
+    _this.state = _objectSpread({}, defaultState);
     return _this;
   }
 
@@ -206997,11 +207050,14 @@ function (_React$Component) {
       var oldOptionType = oldOption && oldOption.resourceClass; // Reset on form open
 
       if (isOpen && !wasOpen) {
-        this.setState(defaultState);
+        this.setState({
+          planMatchError: ""
+        });
 
         if (option) {
           this.setState({
-            disableOption: option.disabled
+            disableOption: option.disabled,
+            isPromotion: option.isPromotion
           });
         }
       } // Reload plans if type changes
@@ -207038,7 +207094,9 @@ function (_React$Component) {
       var _this$state2 = this.state,
           type = _this$state2.type,
           planId = _this$state2.planId,
-          disableOption = _this$state2.disableOption; // TODO: The validation / when things are disabled doesn't make a lot of sense
+          disableOption = _this$state2.disableOption,
+          isPromotion = _this$state2.isPromotion;
+      console.error("type", type); // TODO: The validation / when things are disabled doesn't make a lot of sense
       // Need to work out how selecting discounts & plans will relate to fields
 
       return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_10__["default"], {
@@ -207156,6 +207214,19 @@ function (_React$Component) {
           color: "default"
         }),
         label: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].disabled.label
+      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_7___default.a, {
+        item: true,
+        xs: 12
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_3___default.a, {
+        control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_9___default.a, {
+          name: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].isPromotion.name,
+          value: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].isPromotion.name,
+          checked: isPromotion,
+          onChange: this.togglePromotionOption,
+          disabled: isRequesting,
+          color: "default"
+        }),
+        label: ui_billing_constants__WEBPACK_IMPORTED_MODULE_13__["fields"].isPromotion.label
       }))));
     }
   }]);
@@ -207389,6 +207460,18 @@ var fields = [{
       color: ui_constants__WEBPACK_IMPORTED_MODULE_13__["Status"].Success
     });
   }
+}, {
+  id: "isPromotion",
+  label: "Promotion",
+  cell: function cell(row) {
+    return row.isPromotion ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_12__["default"], {
+      label: "",
+      color: ui_constants__WEBPACK_IMPORTED_MODULE_13__["Status"].Primary
+    }) : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_12__["default"], {
+      label: "",
+      color: ui_constants__WEBPACK_IMPORTED_MODULE_13__["Status"].Info
+    });
+  }
 }];
 
 var OptionsList =
@@ -208444,6 +208527,12 @@ var fields = (_fields = {}, _defineProperty(_fields, app_entities_invoice__WEBPA
   transform: function transform(val) {
     return !!val;
   }
+}), _defineProperty(_fields, app_entities_invoice__WEBPACK_IMPORTED_MODULE_0__["Properties"].IsPromotion, {
+  label: "Mark as a Promotion. This will list it at the top, separate of other options in the billing  menu",
+  name: "".concat(formPrefix, "-promotion"),
+  transform: function transform(val) {
+    return !!val;
+  }
 }), _fields);
 
 /***/ }),
@@ -210804,38 +210893,31 @@ __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 lodash_es_capitalize__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! lodash-es/capitalize */ "./node_modules/lodash-es/capitalize.js");
-/* 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_Typography__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
-/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/Tabs */ "./node_modules/@material-ui/core/Tabs/index.js");
-/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Tab */ "./node_modules/@material-ui/core/Tab/index.js");
-/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ui/common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+/* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! use-react-router */ "./node_modules/use-react-router/use-react-router.js");
+/* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(use_react_router__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/Tabs */ "./node_modules/@material-ui/core/Tabs/index.js");
+/* harmony import */ var _material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/Tab */ "./node_modules/@material-ui/core/Tab/index.js");
+/* harmony import */ var _material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+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; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+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 _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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; }
 
 
 
@@ -210849,125 +210931,215 @@ var sectionBorderStyle = {
   borderRadius: "3px"
 };
 
-var DetailView =
-/*#__PURE__*/
-function (_React$Component) {
-  _inherits(DetailView, _React$Component);
+var DetailView = function DetailView(_ref) {
+  var activeResourceName = _ref.activeResourceName,
+      resources = _ref.resources,
+      title = _ref.title,
+      actionButtons = _ref.actionButtons,
+      information = _ref.information;
+  var resourcesExist = Array.isArray(resources) && !!resources.length;
 
-  function DetailView(props) {
-    var _this;
+  var _React$useState = react__WEBPACK_IMPORTED_MODULE_0__["useState"](resourcesExist ? resources[0] : undefined),
+      _React$useState2 = _slicedToArray(_React$useState, 2),
+      activeResource = _React$useState2[0],
+      setActiveResource = _React$useState2[1];
 
-    _classCallCheck(this, DetailView);
+  var _useReactRouter = use_react_router__WEBPACK_IMPORTED_MODULE_2___default()(),
+      resource = _useReactRouter.match.params.resource,
+      history = _useReactRouter.history,
+      pathname = _useReactRouter.location.pathname;
 
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(DetailView).call(this, props));
+  react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
+    resource && changeResource(resource);
+  }, [resource]);
+  var changeResource = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (newActiveName) {
+    var resourceLookupName = newActiveName || activeResourceName;
+
+    if (resourcesExist) {
+      var newResource = resourceLookupName && resources.find(function (resource) {
+        return resource.name === resourceLookupName;
+      }) || resources[0];
+
+      if (newResource) {
+        setActiveResource(newResource);
+
+        if (resource !== newResource.name) {
+          var hasSubpath = resources.some(function (resource) {
+            return pathname.endsWith("/".concat(resource.name));
+          });
+          var newPath = hasSubpath ? pathname.replace(/\/[^\/]*$/, "/".concat(newResource.name)) : "".concat(pathname, "/").concat(newResource.name);
+          history.push(newPath);
+        }
+      }
+    }
+  }, [activeResourceName, resources]);
+  var onTabChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (_, value) {
+    changeResource(value);
+  }, [changeResource]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    container: true,
+    spacing: 24,
+    justify: "center"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    item: true,
+    md: 10,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    id: "detail-view-title",
+    gutterBottom: true,
+    variant: "h6"
+  }, title), actionButtons), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    item: true,
+    md: 10,
+    xs: 12,
+    style: sectionBorderStyle
+  }, information), resourcesExist && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    item: true,
+    md: 10,
+    xs: 12,
+    style: _objectSpread({}, sectionBorderStyle, {
+      marginTop: "0.5em"
+    })
+  }, activeResource && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, resources.length > 1 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_5___default.a, {
+    value: activeResource.name,
+    indicatorColor: "primary",
+    textColor: "primary",
+    style: {
+      marginBottom: "1em"
+    },
+    onChange: onTabChange
+  }, resources.map(function (resource) {
+    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_6___default.a, {
+      id: "".concat(resource.name, "-tab"),
+      label: resource.displayName || Object(lodash_es_capitalize__WEBPACK_IMPORTED_MODULE_1__["default"])(resource.name),
+      value: resource.name,
+      key: resource.name
+    });
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+    style: _objectSpread({}, resources.length > 1 && {
+      marginTop: "0.5em"
+    })
+  }, activeResource.content)) || react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_7__["default"], {
+    id: "detail-view"
+  })));
+};
 
-    _defineProperty(_assertThisInitialized(_this), "setActiveResourceFromProps", function (newActiveName) {
-      var _this$props = _this.props,
-          activeResourceName = _this$props.activeResourceName,
-          resources = _this$props.resources;
-      var resourceLookupName = newActiveName || activeResourceName;
+/* harmony default export */ __webpack_exports__["default"] = (DetailView);
 
-      if (_this.resourcesExist()) {
-        var activeResource = resourceLookupName && resources.find(function (resource) {
-          return resource.name === resourceLookupName;
-        }) || resources[0];
+/***/ }),
 
-        _this.setState({
-          activeResource: activeResource
-        });
-      }
-    });
+/***/ "./src/ui/common/ErrorBoundary.tsx":
+/*!*****************************************!*\
+  !*** ./src/ui/common/ErrorBoundary.tsx ***!
+  \*****************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-    _defineProperty(_assertThisInitialized(_this), "resourcesExist", function () {
-      var resources = _this.props.resources;
-      return Array.isArray(resources) && resources.length;
-    });
+"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_Grid__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/core/Grid */ "./node_modules/@material-ui/core/Grid/index.js");
+/* harmony import */ var _material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/icons/Error */ "./node_modules/@material-ui/icons/Error.js");
+/* harmony import */ var _material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_icons_Error__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 _hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
+/* harmony import */ var _material_ui_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core */ "./node_modules/@material-ui/core/index.es.js");
+function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-    _defineProperty(_assertThisInitialized(_this), "renderInformation", function () {
-      var _this$props2 = _this.props,
-          information = _this$props2.information,
-          title = _this$props2.title,
-          actionButtons = _this$props2.actionButtons;
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        item: true,
-        md: 10,
-        xs: 12
-      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_3___default.a, {
-        id: "detail-view-title",
-        gutterBottom: true,
-        variant: "h6"
-      }, title), actionButtons), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        item: true,
-        md: 10,
-        xs: 12,
-        style: sectionBorderStyle
-      }, information));
-    });
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-    _defineProperty(_assertThisInitialized(_this), "changeResource", function (_event, value) {
-      _this.setActiveResourceFromProps(value);
-    });
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-    _defineProperty(_assertThisInitialized(_this), "renderResources", function () {
-      var activeResource = _this.state.activeResource;
-      var resources = _this.props.resources;
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        item: true,
-        md: 10,
-        xs: 12,
-        style: _objectSpread({}, sectionBorderStyle, {
-          marginTop: "0.5em"
-        })
-      }, activeResource && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, resources.length > 1 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tabs__WEBPACK_IMPORTED_MODULE_4___default.a, {
-        value: activeResource.name,
-        indicatorColor: "primary",
-        textColor: "primary",
-        style: {
-          marginBottom: "1em"
-        },
-        onChange: _this.changeResource
-      }, resources.map(function (resource) {
-        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Tab__WEBPACK_IMPORTED_MODULE_5___default.a, {
-          id: "".concat(resource.name, "-tab"),
-          label: resource.displayName || Object(lodash_es_capitalize__WEBPACK_IMPORTED_MODULE_1__["default"])(resource.name),
-          value: resource.name,
-          key: resource.name
-        });
-      })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
-        style: _objectSpread({}, resources.length > 1 && {
-          marginTop: "0.5em"
-        })
-      }, activeResource.content)) || react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_6__["default"], {
-        id: "detail-view"
-      }));
-    });
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+
+
+
+
+
+
+
+var ErrorBoundaryInternal =
+/*#__PURE__*/
+function (_React$Component) {
+  _inherits(ErrorBoundaryInternal, _React$Component);
+
+  function ErrorBoundaryInternal(props) {
+    var _this;
 
+    _classCallCheck(this, ErrorBoundaryInternal);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(ErrorBoundaryInternal).call(this, props));
     _this.state = {
-      activeResource: undefined
+      hasError: false
     };
     return _this;
   }
 
-  _createClass(DetailView, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.setActiveResourceFromProps();
+  _createClass(ErrorBoundaryInternal, [{
+    key: "componentDidCatch",
+    value: function componentDidCatch(error) {
+      this.setState({
+        hasError: true
+      });
+      this.props.reportError(error.toString());
     }
   }, {
     key: "render",
     value: function render() {
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
-        container: true,
-        spacing: 24,
-        justify: "center"
-      }, this.renderInformation(), this.resourcesExist() && this.renderResources());
+      if (this.state.hasError) {
+        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
+          container: true,
+          direction: "row",
+          justify: "center",
+          alignItems: "center"
+        }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_icons_Error__WEBPACK_IMPORTED_MODULE_2___default.a, {
+          fontSize: "large",
+          color: "error"
+        }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core__WEBPACK_IMPORTED_MODULE_5__["Typography"], {
+          color: "error"
+        }, "An unexpected error has occured. Please refresh the page and try again."));
+      }
+
+      return this.props.children;
     }
   }]);
 
-  return DetailView;
+  return ErrorBoundaryInternal;
 }(react__WEBPACK_IMPORTED_MODULE_0__["Component"]);
 
-/* harmony default export */ __webpack_exports__["default"] = (DetailView);
+var ErrorBoundary = function ErrorBoundary(_ref) {
+  var children = _ref.children;
+
+  var _useWriteTransaction = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["message"]),
+      call = _useWriteTransaction.call;
+
+  var reportError = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (err) {
+    call({
+      messageDetails: {
+        message: err
+      }
+    });
+  }, [call]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ErrorBoundaryInternal, {
+    reportError: reportError
+  }, children);
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (ErrorBoundary);
 
 /***/ }),
 
@@ -212749,11 +212921,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 var statusToStyleMap = (_statusToStyleMap = {}, _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Danger, {
-  backgroundColor: "rgba(255, 0, 0, 0.4)"
+  backgroundColor: "rgba(255, 0, 0, 1)"
 }), _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Success, {
-  backgroundColor: "rgba(88, 227, 111, 0.4)"
+  backgroundColor: "rgba(88, 227, 111, 1)"
 }), _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Info, {
   backgroundColor: "rgba(0, 0, 0, 0.12)"
+}), _defineProperty(_statusToStyleMap, ui_constants__WEBPACK_IMPORTED_MODULE_1__["Status"].Primary, {
+  backgroundColor: "rgba(33, 150, 243, 1)"
 }), _statusToStyleMap);
 var circleStyle = {
   height: "1em",
@@ -213270,7 +213444,10 @@ function (_React$Component) {
         placeholder: "Search...",
         onKeyPress: this.onSearchEnter
       })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
-        className: "table-wrapper"
+        className: "table-wrapper",
+        style: {
+          overflowX: "auto"
+        }
       }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_table_Table__WEBPACK_IMPORTED_MODULE_5__["default"], {
         id: id,
         page: pageNum,
@@ -213349,6 +213526,7 @@ var Status;
   Status["Info"] = "info";
   Status["Warn"] = "warn";
   Status["Default"] = "default";
+  Status["Primary"] = "primary";
 })(Status || (Status = {}));
 
 var ItemsPerPage;
@@ -219113,6 +219291,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _DuplicateInvoiceModal__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./DuplicateInvoiceModal */ "./src/ui/membership/DuplicateInvoiceModal.tsx");
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+
+function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
@@ -219177,8 +219363,9 @@ var MembershipSelect = function MembershipSelect(_ref) {
       _useReadTransaction$d = _useReadTransaction.data,
       options = _useReadTransaction$d === void 0 ? [] : _useReadTransaction$d;
 
-  var allOptions = react__WEBPACK_IMPORTED_MODULE_0__["useMemo"](function () {
-    return options.sort(byAmount).concat(allowNone ? [{
+  var _React$useMemo2 = react__WEBPACK_IMPORTED_MODULE_0__["useMemo"](function () {
+    var promotionOptions = [];
+    var trailingOptions = allowNone ? [{
       id: "none",
       name: "None",
       description: "Paid with cash or select an option later",
@@ -219186,9 +219373,24 @@ var MembershipSelect = function MembershipSelect(_ref) {
       resourceClass: undefined,
       quantity: 0,
       disabled: false,
-      operation: undefined
-    }] : []);
-  }, [allowNone, options]); // Select bookmarked option on load
+      operation: undefined,
+      isPromotion: false
+    }] : [];
+    var normalOptions = options.reduce(function (opts, option) {
+      if (option.isPromotion) {
+        promotionOptions.push(option);
+      } else {
+        opts.push(option);
+      }
+
+      return opts;
+    }, []);
+    return [promotionOptions, [].concat(_toConsumableArray(normalOptions.sort(byAmount)), trailingOptions)];
+  }, [allowNone, options]),
+      _React$useMemo3 = _slicedToArray(_React$useMemo2, 2),
+      promotions = _React$useMemo3[0],
+      allOptions = _React$useMemo3[1]; // Select bookmarked option on load
+
 
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](function () {
     var option = (allOptions || []).find(function (option) {
@@ -219261,11 +219463,22 @@ var MembershipSelect = function MembershipSelect(_ref) {
   var normalizedError = error && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, "Error reading membership options: ", error, ". Email", " ", react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("a", {
     href: "mailto: contact@manchestermakerspace.org"
   }, "contact@manchestermakerspace.org"), " if your desired membership option is not present");
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_DuplicateInvoiceModal__WEBPACK_IMPORTED_MODULE_11__["default"], {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, promotions && !!promotions.length && react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+    className: "membership-promotion-options"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_table_TableContainer__WEBPACK_IMPORTED_MODULE_8__["default"], {
+    id: "membership-promotion-select-table",
+    title: "Current Promotions",
+    data: promotions,
+    columns: fields,
+    rowId: function rowId(row) {
+      return row.id;
+    },
+    loading: isRequesting
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_DuplicateInvoiceModal__WEBPACK_IMPORTED_MODULE_11__["default"], {
     type: selectedOption && selectedOption.resourceClass
   }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_table_TableContainer__WEBPACK_IMPORTED_MODULE_8__["default"], {
     id: "membership-select-table",
-    title: _typeof(title) === undefined && "Select a Membership",
+    title: _typeof(title) === undefined && "Select a Membership" || promotions && !!promotions.length && "Standard Membership Options",
     data: allOptions,
     columns: fields,
     rowId: function rowId(row) {
@@ -221699,7 +221912,9 @@ var SettingsContainer = function SettingsContainer() {
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
     item: true,
     xs: 12
-  }, selectedIndex === 0 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, loadingMember && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_15__["default"], null), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_member_EditMember__WEBPACK_IMPORTED_MODULE_12__["default"], {
+  }, selectedIndex === 0 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, loadingMember && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_15__["default"], {
+    id: "settings-loading"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_member_EditMember__WEBPACK_IMPORTED_MODULE_12__["default"], {
     formOnly: true,
     member: member
   })), selectedIndex === 1 && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
@@ -221787,6 +222002,7 @@ var CancelSubscriptionModal = function CancelSubscriptionModal(_ref) {
     });
   }, [call, subscriptionId]);
   var disableButton = !subscriptionId || subscription.status === "Canceled";
+  var whosSubscription = asAdmin ? subscription.memberName ? "".concat(subscription.memberName, "'s") : "this" : "your";
   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_6__["ActionButton"], {
     id: "subscription-option-cancel",
     color: "secondary",
@@ -221806,7 +222022,7 @@ var CancelSubscriptionModal = function CancelSubscriptionModal(_ref) {
     error: error
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_1___default.a, {
     gutterBottom: true
-  }, "Are you sure you want to cancel your subscription?  This action cannot be undone."), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionDetails__WEBPACK_IMPORTED_MODULE_8__["SubscriptionDetailsInner"], {
+  }, "Are you sure you want to cancel ", whosSubscription, " subscription?  This action cannot be undone."), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionDetails__WEBPACK_IMPORTED_MODULE_8__["SubscriptionDetailsInner"], {
     subscription: subscription
   })));
 };
@@ -222960,14 +223176,6 @@ var TransactionFilters = function TransactionFilters(_ref) {
       params = _useQueryContext.params,
       setParam = _useQueryContext.setParam;
 
-  var onSearch = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (event) {
-    if (event.key === "Enter") {
-      var searchTerm = event.target.value;
-      setParam("search", searchTerm);
-      onChange();
-      close();
-    }
-  }, [setParam, onChange, close]);
   var setType = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](function (event) {
     setParam("type", event.target.value);
     onChange();
@@ -223041,21 +223249,6 @@ var TransactionFilters = function TransactionFilters(_ref) {
     component: "fieldset"
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default.a, {
     component: "legend"
-  }, "Search for transactions"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
-    id: "transaction-search-input",
-    type: "text",
-    placeholder: "Search...",
-    onKeyPress: onSearch
-  }))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
-    item: true,
-    xs: 12,
-    style: {
-      marginBottom: "1em"
-    }
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3___default.a, {
-    component: "fieldset"
-  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default.a, {
-    component: "legend"
   }, "Filter by Transaction Type"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_10___default.a, {
     name: "settled",
     value: params.type,
@@ -223311,7 +223504,6 @@ var TransactionsTable = function TransactionsTable(_ref) {
       isAdmin = _useAuthState.currentUser.isAdmin;
 
   var _useQueryContext = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__["useQueryContext"])({
-    search: undefined,
     startDate: Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["dateToMidnight"])(moment__WEBPACK_IMPORTED_MODULE_1__().subtract(2, "months").valueOf()),
     endDate: Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["dateToMidnight"])(new Date()),
     type: undefined,