makerspace-react-rails 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5991556465c9e5da05758cc401f03d7a1fd68e27df2bc5df92744031833a6caf
-  data.tar.gz: '00407463852eea90f98fdd75c4c9af9a9e93f3df0d3a186ba0fcde8e5cb7d074'
+  metadata.gz: 6170752feb04dfcdee00d6e7cce2022bbde02b1e71cc55e595f36aec5b3efed1
+  data.tar.gz: bc1580e6fcfdee729d489c95c3fb500c7aa81e8ccc708fd26c3309de3f8d8c21
 SHA512:
-  metadata.gz: 3f060295c3fc20474ce0527a0e7993f35bda8cac183ed7a0a0108b130cdb32e3dd63385f264f264c306ffc906734642280ac10542d399db9d2f9128ffdd747eb
-  data.tar.gz: 5e6f095fb085960d48d2ccc68a444bc0af8910359c9e92ffce4eaaa9b5113eb00b1eb7bed7041d380c4ede49e998bb8f0fea196c653a86291dbb74c1b2d62248
+  metadata.gz: 0cc4a420d904223d1bd7d527665ad54434663559c8e1b8434150567e5b8b299263c83f8c14f0ea0418488a453acf022ece9c1b1c11c0d67334a2fee739ad2c22
+  data.tar.gz: 2651876529b32d6a656ef95bfc15b33a02e77a84f05cb4d7226eb091b38a8e0dbfc601cdc761836cded70ebcb6c8737dccabad512a1908ed12444af008f29f0c

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

@@ -1,7 +1,7 @@
 module Makerspace
   module React
     module Rails
-      VERSION = "0.6.1"
+      VERSION = "0.6.2"
     end
   end
 end

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

@@ -37704,6 +37704,38 @@ exports.default = _default;
 
 /***/ }),
 
+/***/ "./node_modules/@material-ui/icons/FilterList.js":
+/*!*******************************************************!*\
+  !*** ./node_modules/@material-ui/icons/FilterList.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", {
+  d: "M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"
+}), _react.default.createElement("path", {
+  fill: "none",
+  d: "M0 0h24v24H0z"
+})), 'FilterList');
+
+exports.default = _default;
+
+/***/ }),
+
 /***/ "./node_modules/@material-ui/icons/Menu.js":
 /*!*************************************************!*\
   !*** ./node_modules/@material-ui/icons/Menu.js ***!
@@ -102656,6 +102688,19 @@ var MemberRole;
     MemberRole["Admin"] = "admin";
     MemberRole["Member"] = "member";
 })(MemberRole = exports.MemberRole || (exports.MemberRole = {}));
+var PlanType;
+(function (PlanType) {
+    PlanType["Membership"] = "membership";
+    PlanType["Rental"] = "rental";
+})(PlanType = exports.PlanType || (exports.PlanType = {}));
+var SubscriptionStatus;
+(function (SubscriptionStatus) {
+    SubscriptionStatus["Active"] = "Active";
+    SubscriptionStatus["Canceled"] = "Canceled";
+    SubscriptionStatus["PastDue"] = "PastDue";
+    SubscriptionStatus["Pending"] = "Pending";
+    SubscriptionStatus["Expired"] = "Expired";
+})(SubscriptionStatus = exports.SubscriptionStatus || (exports.SubscriptionStatus = {}));
 var TransactionStatus;
 (function (TransactionStatus) {
     TransactionStatus["Failed"] = "failed";
@@ -102677,23 +102722,23 @@ function adminListSubscriptions(params) {
     return exports.makeRequest("GET", "/admin/billing/subscriptions", params, "subscriptions");
 }
 exports.adminListSubscriptions = adminListSubscriptions;
-function adminCancelSubscription(id) {
-    return exports.makeRequest("DELETE", "/admin/billing/subscriptions/{id}".replace("{id}", id));
+function adminCancelSubscription(params) {
+    return exports.makeRequest("DELETE", "/admin/billing/subscriptions/{id}".replace("{id}", params.id));
 }
 exports.adminCancelSubscription = adminCancelSubscription;
 function adminListTransaction(params) {
     return exports.makeRequest("GET", "/admin/billing/transactions", params, "transactions");
 }
 exports.adminListTransaction = adminListTransaction;
-function adminGetTransaction(id) {
-    return exports.makeRequest("GET", "/admin/billing/transactions/{id}".replace("{id}", id), undefined, "transaction");
+function adminGetTransaction(params) {
+    return exports.makeRequest("GET", "/admin/billing/transactions/{id}".replace("{id}", params.id), undefined, "transaction");
 }
 exports.adminGetTransaction = adminGetTransaction;
-function adminDeleteTransaction(id) {
-    return exports.makeRequest("DELETE", "/admin/billing/transactions/{id}".replace("{id}", id));
+function adminDeleteTransaction(params) {
+    return exports.makeRequest("DELETE", "/admin/billing/transactions/{id}".replace("{id}", params.id));
 }
 exports.adminDeleteTransaction = adminDeleteTransaction;
-function adminGetNewCard() {
+function adminGetNewCard(params) {
     return exports.makeRequest("GET", "/admin/cards/new", undefined, "card");
 }
 exports.adminGetNewCard = adminGetNewCard;
@@ -102701,148 +102746,148 @@ function adminListCards(params) {
     return exports.makeRequest("GET", "/admin/cards", params, "cards");
 }
 exports.adminListCards = adminListCards;
-function adminCreateCard(createAccessCardDetails) {
-    return exports.makeRequest("POST", "/admin/cards", { card: createAccessCardDetails }, "card");
+function adminCreateCard(params) {
+    return exports.makeRequest("POST", "/admin/cards", { card: params.createAccessCardDetails }, "card");
 }
 exports.adminCreateCard = adminCreateCard;
-function adminUpdateCard(id, updateAccessCardDetails) {
-    return exports.makeRequest("PUT", "/admin/cards/{id}".replace("{id}", id), { card: updateAccessCardDetails }, "card");
+function adminUpdateCard(params) {
+    return exports.makeRequest("PUT", "/admin/cards/{id}".replace("{id}", params.id), { card: params.updateAccessCardDetails }, "card");
 }
 exports.adminUpdateCard = adminUpdateCard;
-function adminListEarnedMembershipReports(id, params) {
-    return exports.makeRequest("GET", "/admin/earned_memberships/{id}/reports".replace("{id}", id), params, "reports");
+function adminListEarnedMembershipReports(params) {
+    return exports.makeRequest("GET", "/admin/earned_memberships/{id}/reports".replace("{id}", params.id), params, "reports");
 }
 exports.adminListEarnedMembershipReports = adminListEarnedMembershipReports;
 function adminListEarnedMemberships(params) {
     return exports.makeRequest("GET", "/admin/earned_memberships", params, "earnedMemberships");
 }
 exports.adminListEarnedMemberships = adminListEarnedMemberships;
-function adminCreateEarnedMembership(createEarnedMembershipDetails) {
-    return exports.makeRequest("POST", "/admin/earned_memberships", { earnedMembership: createEarnedMembershipDetails }, "earnedMembership");
+function adminCreateEarnedMembership(params) {
+    return exports.makeRequest("POST", "/admin/earned_memberships", { earnedMembership: params.createEarnedMembershipDetails }, "earnedMembership");
 }
 exports.adminCreateEarnedMembership = adminCreateEarnedMembership;
-function adminGetEarnedMembership(id) {
-    return exports.makeRequest("GET", "/admin/earned_memberships/{id}".replace("{id}", id), undefined, "earnedMembership");
+function adminGetEarnedMembership(params) {
+    return exports.makeRequest("GET", "/admin/earned_memberships/{id}".replace("{id}", params.id), undefined, "earnedMembership");
 }
 exports.adminGetEarnedMembership = adminGetEarnedMembership;
-function adminUpdateEarnedMembership(id, updateEarnedMembershipDetails) {
-    return exports.makeRequest("PUT", "/admin/earned_memberships/{id}".replace("{id}", id), { earnedMembership: updateEarnedMembershipDetails }, "earnedMembership");
+function adminUpdateEarnedMembership(params) {
+    return exports.makeRequest("PUT", "/admin/earned_memberships/{id}".replace("{id}", params.id), { earnedMembership: params.updateEarnedMembershipDetails }, "earnedMembership");
 }
 exports.adminUpdateEarnedMembership = adminUpdateEarnedMembership;
-function adminCreateInvoiceOption(createInvoiceOptionDetails) {
-    return exports.makeRequest("POST", "/admin/invoice_options", { invoiceOption: createInvoiceOptionDetails }, "invoiceOption");
+function adminCreateInvoiceOption(params) {
+    return exports.makeRequest("POST", "/admin/invoice_options", { invoiceOption: params.createInvoiceOptionDetails }, "invoiceOption");
 }
 exports.adminCreateInvoiceOption = adminCreateInvoiceOption;
-function adminUpdateInvoiceOption(id, updateInvoiceOptionDetails) {
-    return exports.makeRequest("PUT", "/admin/invoice_options/{id}".replace("{id}", id), { invoiceOption: updateInvoiceOptionDetails }, "invoiceOption");
+function adminUpdateInvoiceOption(params) {
+    return exports.makeRequest("PUT", "/admin/invoice_options/{id}".replace("{id}", params.id), { invoiceOption: params.updateInvoiceOptionDetails }, "invoiceOption");
 }
 exports.adminUpdateInvoiceOption = adminUpdateInvoiceOption;
-function adminDeleteInvoiceOption(id) {
-    return exports.makeRequest("DELETE", "/admin/invoice_options/{id}".replace("{id}", id));
+function adminDeleteInvoiceOption(params) {
+    return exports.makeRequest("DELETE", "/admin/invoice_options/{id}".replace("{id}", params.id));
 }
 exports.adminDeleteInvoiceOption = adminDeleteInvoiceOption;
 function adminListInvoices(params) {
     return exports.makeRequest("GET", "/admin/invoices", params, "invoices");
 }
 exports.adminListInvoices = adminListInvoices;
-function adminCreateInvoices(createInvoiceDetails) {
-    return exports.makeRequest("POST", "/admin/invoices", { invoiceOption: createInvoiceDetails }, "invoice");
+function adminCreateInvoices(params) {
+    return exports.makeRequest("POST", "/admin/invoices", { invoiceOption: params.createInvoiceDetails }, "invoice");
 }
 exports.adminCreateInvoices = adminCreateInvoices;
-function adminUpdateInvoice(id, updateInvoiceDetails) {
-    return exports.makeRequest("PUT", "/admin/invoices/{id}".replace("{id}", id), { invoice: updateInvoiceDetails }, "invoice");
+function adminUpdateInvoice(params) {
+    return exports.makeRequest("PUT", "/admin/invoices/{id}".replace("{id}", params.id), { invoice: params.updateInvoiceDetails }, "invoice");
 }
 exports.adminUpdateInvoice = adminUpdateInvoice;
-function adminDeleteInvoice(id) {
-    return exports.makeRequest("DELETE", "/admin/invoices/{id}".replace("{id}", id));
+function adminDeleteInvoice(params) {
+    return exports.makeRequest("DELETE", "/admin/invoices/{id}".replace("{id}", params.id));
 }
 exports.adminDeleteInvoice = adminDeleteInvoice;
-function adminCreateMember(createMemberDetails) {
-    return exports.makeRequest("POST", "/admin/members", { member: createMemberDetails }, "member");
+function adminCreateMember(params) {
+    return exports.makeRequest("POST", "/admin/members", { member: params.createMemberDetails }, "member");
 }
 exports.adminCreateMember = adminCreateMember;
-function adminUpdateMember(id, updateMemberDetails) {
-    return exports.makeRequest("PUT", "/admin/members/{id}".replace("{id}", id), { member: updateMemberDetails }, "member");
+function adminUpdateMember(params) {
+    return exports.makeRequest("PUT", "/admin/members/{id}".replace("{id}", params.id), { member: params.updateMemberDetails }, "member");
 }
 exports.adminUpdateMember = adminUpdateMember;
 function adminListRentals(params) {
     return exports.makeRequest("GET", "/admin/rentals", params, "rentals");
 }
 exports.adminListRentals = adminListRentals;
-function adminCreateRental(createRentalDetails) {
-    return exports.makeRequest("POST", "/admin/rentals", { rental: createRentalDetails }, "rental");
+function adminCreateRental(params) {
+    return exports.makeRequest("POST", "/admin/rentals", { rental: params.createRentalDetails }, "rental");
 }
 exports.adminCreateRental = adminCreateRental;
-function adminUpdateRental(id, updateRentalDetails) {
-    return exports.makeRequest("PUT", "/admin/rentals/{id}".replace("{id}", id), { rental: updateRentalDetails }, "rental");
+function adminUpdateRental(params) {
+    return exports.makeRequest("PUT", "/admin/rentals/{id}".replace("{id}", params.id), { rental: params.updateRentalDetails }, "rental");
 }
 exports.adminUpdateRental = adminUpdateRental;
-function adminDeleteRental(id) {
-    return exports.makeRequest("DELETE", "/admin/rentals/{id}".replace("{id}", id));
+function adminDeleteRental(params) {
+    return exports.makeRequest("DELETE", "/admin/rentals/{id}".replace("{id}", params.id));
 }
 exports.adminDeleteRental = adminDeleteRental;
-function getNewPaymentMethod() {
+function getNewPaymentMethod(params) {
     return exports.makeRequest("GET", "/billing/payment_methods/new", undefined, "clientToken");
 }
 exports.getNewPaymentMethod = getNewPaymentMethod;
-function listPaymentMethods() {
+function listPaymentMethods(params) {
     return exports.makeRequest("GET", "/billing/payment_methods", undefined, "paymentMethods");
 }
 exports.listPaymentMethods = listPaymentMethods;
-function createPaymentMethod(createPaymentMethodDetails) {
-    return exports.makeRequest("POST", "/billing/payment_methods", { payment_method: createPaymentMethodDetails }, "paymentMethod");
+function createPaymentMethod(params) {
+    return exports.makeRequest("POST", "/billing/payment_methods", { payment_method: params.createPaymentMethodDetails }, "paymentMethod");
 }
 exports.createPaymentMethod = createPaymentMethod;
-function getPaymentMethod(id) {
-    return exports.makeRequest("GET", "/billing/payment_methods/{id}".replace("{id}", id), undefined, "paymentMethod");
+function getPaymentMethod(params) {
+    return exports.makeRequest("GET", "/billing/payment_methods/{id}".replace("{id}", params.id), undefined, "paymentMethod");
 }
 exports.getPaymentMethod = getPaymentMethod;
-function deletePaymentMethod(id) {
-    return exports.makeRequest("DELETE", "/billing/payment_methods/{id}".replace("{id}", id));
+function deletePaymentMethod(params) {
+    return exports.makeRequest("DELETE", "/billing/payment_methods/{id}".replace("{id}", params.id));
 }
 exports.deletePaymentMethod = deletePaymentMethod;
-function getReceipt(id) {
-    return exports.makeRequest("GET", "/billing/receipts/{id}".replace("{id}", id));
+function getReceipt(params) {
+    return exports.makeRequest("GET", "/billing/receipts/{id}".replace("{id}", params.id));
 }
 exports.getReceipt = getReceipt;
-function getSubscription(id) {
-    return exports.makeRequest("GET", "/billing/subscriptions/{id}".replace("{id}", id), undefined, "subscription");
+function getSubscription(params) {
+    return exports.makeRequest("GET", "/billing/subscriptions/{id}".replace("{id}", params.id), undefined, "subscription");
 }
 exports.getSubscription = getSubscription;
-function updateSubscription(id, updateSubscriptionDetails) {
-    return exports.makeRequest("PUT", "/billing/subscriptions/{id}".replace("{id}", id), { subscription: updateSubscriptionDetails }, "subscription");
+function updateSubscription(params) {
+    return exports.makeRequest("PUT", "/billing/subscriptions/{id}".replace("{id}", params.id), { subscription: params.updateSubscriptionDetails }, "subscription");
 }
 exports.updateSubscription = updateSubscription;
-function cancelSubscription(id) {
-    return exports.makeRequest("DELETE", "/billing/subscriptions/{id}".replace("{id}", id));
+function cancelSubscription(params) {
+    return exports.makeRequest("DELETE", "/billing/subscriptions/{id}".replace("{id}", params.id));
 }
 exports.cancelSubscription = cancelSubscription;
 function listTransactions(params) {
     return exports.makeRequest("GET", "/billing/transactions", params, "transactions");
 }
 exports.listTransactions = listTransactions;
-function createTransaction(createTransactionDetails) {
-    return exports.makeRequest("POST", "/billing/transactions", { transaction: createTransactionDetails }, "transaction");
+function createTransaction(params) {
+    return exports.makeRequest("POST", "/billing/transactions", { transaction: params.createTransactionDetails }, "transaction");
 }
 exports.createTransaction = createTransaction;
-function deleteTransaction(id) {
-    return exports.makeRequest("DELETE", "/billing/transactions/{id}".replace("{id}", id));
+function deleteTransaction(params) {
+    return exports.makeRequest("DELETE", "/billing/transactions/{id}".replace("{id}", params.id));
 }
 exports.deleteTransaction = deleteTransaction;
-function getDocument(id) {
-    return exports.makeRequest("GET", "/documents/{id}".replace("{id}", id));
+function getDocument(params) {
+    return exports.makeRequest("GET", "/documents/{id}".replace("{id}", params.id), params);
 }
 exports.getDocument = getDocument;
-function listEarnedMembershipReports(id, params) {
-    return exports.makeRequest("GET", "/earned_memberships/{id}/reports".replace("{id}", id), params, "reports");
+function listEarnedMembershipReports(params) {
+    return exports.makeRequest("GET", "/earned_memberships/{id}/reports".replace("{id}", params.id), params, "reports");
 }
 exports.listEarnedMembershipReports = listEarnedMembershipReports;
-function createEarnedMembershipReport(id, createEarnedMembershipReportDetails) {
-    return exports.makeRequest("POST", "/earned_memberships/{id}/reports".replace("{id}", id), { report: createEarnedMembershipReportDetails }, "report");
+function createEarnedMembershipReport(params) {
+    return exports.makeRequest("POST", "/earned_memberships/{id}/reports".replace("{id}", params.id), { report: params.createEarnedMembershipReportDetails }, "report");
 }
 exports.createEarnedMembershipReport = createEarnedMembershipReport;
-function getEarnedMembership(id) {
-    return exports.makeRequest("GET", "/earned_memberships/{id}".replace("{id}", id), undefined, "earnedMembership");
+function getEarnedMembership(params) {
+    return exports.makeRequest("GET", "/earned_memberships/{id}".replace("{id}", params.id), undefined, "earnedMembership");
 }
 exports.getEarnedMembership = getEarnedMembership;
 function listInvoiceOptions(params) {
@@ -102853,60 +102898,60 @@ function listInvoices(params) {
     return exports.makeRequest("GET", "/invoices", params, "invoices");
 }
 exports.listInvoices = listInvoices;
-function createInvoice(createInvoiceDetails) {
-    return exports.makeRequest("POST", "/invoices", { invoiceOption: createInvoiceDetails }, "invoice");
+function createInvoice(params) {
+    return exports.makeRequest("POST", "/invoices", { invoiceOption: params.createInvoiceDetails }, "invoice");
 }
 exports.createInvoice = createInvoice;
-function listMembersPermissions(id) {
-    return exports.makeRequest("GET", "/members/{id}/permissions".replace("{id}", id), undefined, "permissions");
+function listMembersPermissions(params) {
+    return exports.makeRequest("GET", "/members/{id}/permissions".replace("{id}", params.id), undefined, "permissions");
 }
 exports.listMembersPermissions = listMembersPermissions;
 function listMembers(params) {
     return exports.makeRequest("GET", "/members", params, "members");
 }
 exports.listMembers = listMembers;
-function registerMember(registerMemberDetails) {
-    return exports.makeRequest("POST", "/members", { member: registerMemberDetails }, "member");
+function registerMember(params) {
+    return exports.makeRequest("POST", "/members", { member: params.registerMemberDetails }, "member");
 }
 exports.registerMember = registerMember;
-function getMember(id) {
-    return exports.makeRequest("GET", "/members/{id}".replace("{id}", id), undefined, "member");
+function getMember(params) {
+    return exports.makeRequest("GET", "/members/{id}".replace("{id}", params.id), undefined, "member");
 }
 exports.getMember = getMember;
-function updateMember(id, updateMemberDetails) {
-    return exports.makeRequest("PUT", "/members/{id}".replace("{id}", id), { member: updateMemberDetails }, "member");
+function updateMember(params) {
+    return exports.makeRequest("PUT", "/members/{id}".replace("{id}", params.id), { member: params.updateMemberDetails }, "member");
 }
 exports.updateMember = updateMember;
-function signIn(signInDetails) {
-    return exports.makeRequest("POST", "/members/sign_in", { member: signInDetails }, "member");
+function signIn(params) {
+    return exports.makeRequest("POST", "/members/sign_in", { member: params.signInDetails }, "member");
 }
 exports.signIn = signIn;
-function signOut() {
+function signOut(params) {
     return exports.makeRequest("DELETE", "/members/sign_out");
 }
 exports.signOut = signOut;
-function requestPasswordReset(passwordResetDetails) {
-    return exports.makeRequest("POST", "/members/password", { member: passwordResetDetails });
+function requestPasswordReset(params) {
+    return exports.makeRequest("POST", "/members/password", { member: params.passwordResetDetails });
 }
 exports.requestPasswordReset = requestPasswordReset;
-function resetPassword(passwordResetDetails) {
-    return exports.makeRequest("PUT", "/members/password", { member: passwordResetDetails });
+function resetPassword(params) {
+    return exports.makeRequest("PUT", "/members/password", { member: params.passwordResetDetails });
 }
 exports.resetPassword = resetPassword;
-function sendRegistrationEmail(registrationEmailDetails) {
-    return exports.makeRequest("POST", "/send_registration", { email: registrationEmailDetails });
+function sendRegistrationEmail(params) {
+    return exports.makeRequest("POST", "/send_registration", { email: params.registrationEmailDetails });
 }
 exports.sendRegistrationEmail = sendRegistrationEmail;
 function listRentals(params) {
     return exports.makeRequest("GET", "/rentals", params, "rentals");
 }
 exports.listRentals = listRentals;
-function getRental(id) {
-    return exports.makeRequest("GET", "/rentals/{id}".replace("{id}", id), undefined, "rental");
+function getRental(params) {
+    return exports.makeRequest("GET", "/rentals/{id}".replace("{id}", params.id), undefined, "rental");
 }
 exports.getRental = getRental;
-function updateRental(id, updateRentalDetails) {
-    return exports.makeRequest("PUT", "/rentals/{id}".replace("{id}", id), { rental: updateRentalDetails }, "rental");
+function updateRental(params) {
+    return exports.makeRequest("PUT", "/rentals/{id}".replace("{id}", params.id), { rental: params.updateRentalDetails }, "rental");
 }
 exports.updateRental = updateRental;
 //# sourceMappingURL=apiClient.js.map
@@ -187595,12 +187640,16 @@ const AccessCardForm = ({
     error: newCardError,
     refresh: getNewCard,
     data: rejectionCard
-  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["adminGetNewCard"], [memberId]);
+  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["adminGetNewCard"], {
+    uid: memberId
+  });
   const {
     isRequesting: memberLoading,
     refresh: refreshMember,
     data: member = {}
-  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["getMember"], memberId);
+  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["getMember"], {
+    id: memberId
+  });
   const onSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](({
     reset
   }) => {
@@ -187621,8 +187670,10 @@ const AccessCardForm = ({
     }
 
     createCard({
-      memberId: member.id,
-      uid: rejectionCard.uid
+      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"], {
@@ -187701,12 +187752,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _react_svg_loader_assets_FilledLaserableLogo_svg__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! -!react-svg-loader!assets/FilledLaserableLogo.svg */ "./node_modules/react-svg-loader/lib/loader.js!./src/assets/FilledLaserableLogo.svg");
 /* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
 /* harmony import */ var ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ui/membership/MembershipSelectForm */ "./src/ui/membership/MembershipSelectForm.tsx");
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_10__ = __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_10___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ui/hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
-/* harmony import */ var app_entities_invoice__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! app/entities/invoice */ "./src/app/entities/invoice.ts");
-
-
+/* harmony import */ var _membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../membership/InvoicingGate */ "./src/ui/membership/InvoicingGate.tsx");
 
 
 
@@ -187738,13 +187784,7 @@ const LandingPage = () => {
         pathname: app_constants__WEBPACK_IMPORTED_MODULE_8__["Routing"].SignUp
       });
     }
-  }, [history, search]); // TODO: Remove this when all invoicing released globally
-
-  const {
-    data: options = []
-  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_11__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_10__["listInvoiceOptions"], {
-    types: [app_entities_invoice__WEBPACK_IMPORTED_MODULE_12__["InvoiceableResource"].Membership]
-  });
+  }, [history, search]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
     container: true,
     spacing: 24,
@@ -187781,7 +187821,7 @@ const LandingPage = () => {
     container: true,
     spacing: 24,
     justify: "center"
-  }, options.length ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_2___default.a, {
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_10__["default"], null, open => open ? 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_Typography__WEBPACK_IMPORTED_MODULE_6___default.a, {
@@ -187802,7 +187842,7 @@ const LandingPage = () => {
     color: "secondary",
     fullWidth: true,
     onClick: () => goToSignup()
-  }, "Register")))))));
+  }, "Register"))))))));
 };
 
 /* harmony default export */ __webpack_exports__["default"] = (LandingPage);
@@ -187891,7 +187931,9 @@ class LoginForm extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
         requestingPassword: true
       }, async () => {
         const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__["requestPasswordReset"])({
-          email
+          passwordResetDetails: {
+            email
+          }
         });
 
         if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__["isApiErrorResponse"])(response)) {
@@ -188251,8 +188293,10 @@ class PasswordReset extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
       }); // Successfully changing password counts as auth action for Devise
 
       const passwordReset = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_14__["resetPassword"])({
-        resetPasswordToken: passwordToken,
-        password
+        passwordResetDetails: {
+          resetPasswordToken: passwordToken,
+          password
+        }
       });
 
       if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_14__["isApiErrorResponse"])(passwordReset)) {
@@ -188475,9 +188519,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
 /* harmony import */ var _hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
 /* harmony import */ var ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ui/membership/MembershipSelectForm */ "./src/ui/membership/MembershipSelectForm.tsx");
-/* harmony import */ var ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ui/hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
-/* harmony import */ var app_entities_invoice__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! app/entities/invoice */ "./src/app/entities/invoice.ts");
-
+/* harmony import */ var _membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ../membership/InvoicingGate */ "./src/ui/membership/InvoicingGate.tsx");
 
 
 
@@ -188536,7 +188578,9 @@ const SignUpFormComponent = () => {
     await dispatch(Object(_actions__WEBPACK_IMPORTED_MODULE_17__["submitSignUpAction"])(validSignUp));
 
     if (option) {
-      await buildInvoice(option);
+      await buildInvoice({
+        createInvoiceDetails: option
+      });
     }
   }, [option]);
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
@@ -188553,13 +188597,7 @@ const SignUpFormComponent = () => {
       discountId,
       id: option.id
     });
-  }, [setOption]); // TODO: Remove this when all invoicing released globally
-
-  const {
-    data: options = []
-  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_21__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_10__["listInvoiceOptions"], {
-    types: [app_entities_invoice__WEBPACK_IMPORTED_MODULE_22__["InvoiceableResource"].Membership]
-  });
+  }, [setOption]);
   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_4___default.a, {
     container: true,
     justify: "center",
@@ -188640,13 +188678,13 @@ const SignUpFormComponent = () => {
         onClick: toggleMask
       }))
     }
-  })), options.length && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_membership_InvoicingGate__WEBPACK_IMPORTED_MODULE_21__["default"], null, open => open && 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"](ui_membership_MembershipSelectForm__WEBPACK_IMPORTED_MODULE_20__["default"], {
     onSelect: selectMembership,
     allowNone: true
-  })), !isRequesting && error && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_12__["default"], {
+  }))), !isRequesting && error && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_12__["default"], {
     id: `${ui_auth_constants__WEBPACK_IMPORTED_MODULE_11__["signUpPrefix"]}-error`,
     error: error
   })))))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
@@ -188692,9 +188730,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "submitSignUpAction", function() { return submitSignUpAction; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "authReducer", function() { return authReducer; });
 /* harmony import */ var ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ui/auth/constants */ "./src/ui/auth/constants.ts");
-/* harmony import */ var ui_member_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ui/member/utils */ "./src/ui/member/utils.ts");
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__ = __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_2___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var ui_reducer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ui/reducer */ "./src/ui/reducer.ts");
+/* harmony import */ var ui_member_utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ui/member/utils */ "./src/ui/member/utils.ts");
+/* 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 _checkout_cart__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../checkout/cart */ "./src/ui/checkout/cart.ts");
 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; }
@@ -188705,17 +188745,21 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
+
 const handleAuthWithPermissions = async (response, dispatch, ignoreError = false) => {
-  if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(response)) {
+  if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["isApiErrorResponse"])(response)) {
     dispatch({
       type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].AuthUserFailure,
       error: ignoreError ? undefined : response.error.message
     });
   } else {
     const member = response.data;
-    const permissionsResponse = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["listMembersPermissions"])(member.id);
+    const permissionsResponse = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["listMembersPermissions"])({
+      id: member.id
+    });
 
-    if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(permissionsResponse)) {
+    if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["isApiErrorResponse"])(permissionsResponse)) {
       dispatch({
         type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].AuthUserFailure,
         error: permissionsResponse.error.message
@@ -188737,14 +188781,17 @@ const loginUserAction = loginForm => async dispatch => {
   dispatch({
     type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartAuthRequest
   });
-  const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["signIn"])(loginForm);
+  const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["signIn"])({
+    signInDetails: loginForm
+  });
   await handleAuthWithPermissions(response, dispatch);
 };
 const sessionLoginUserAction = () => async dispatch => {
   dispatch({
     type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartAuthRequest
-  });
-  const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["signIn"])();
+  }); // TODO: SignIn fn fails if no params provided
+
+  const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["signIn"])({});
   await handleAuthWithPermissions(response, dispatch, true);
 };
 const refreshUserAction = sessionLoginUserAction;
@@ -188752,8 +188799,13 @@ const logoutUserAction = () => async dispatch => {
   dispatch({
     type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartAuthRequest
   });
-  await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["signOut"])(); // TODO Reset stores
-
+  await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["signOut"])();
+  dispatch({
+    type: ui_reducer__WEBPACK_IMPORTED_MODULE_1__["TransactionAction"].Reset
+  });
+  dispatch({
+    type: _checkout_cart__WEBPACK_IMPORTED_MODULE_4__["CartAction"].EmptyCart
+  });
   dispatch({
     type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].LogoutSuccess
   });
@@ -188762,7 +188814,9 @@ const submitSignUpAction = signUpForm => async dispatch => {
   dispatch({
     type: ui_auth_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartAuthRequest
   });
-  const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["registerMember"])(signUpForm);
+  const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["registerMember"])({
+    registerMemberDetails: signUpForm
+  });
   await handleAuthWithPermissions(response, dispatch);
 };
 const defaultState = {
@@ -188794,7 +188848,7 @@ const authReducer = (state = defaultState, action) => {
       } = action;
       return _objectSpread({}, state, {
         currentUser: _objectSpread({}, member, {
-          isAdmin: Object(ui_member_utils__WEBPACK_IMPORTED_MODULE_1__["memberIsAdmin"])(member)
+          isAdmin: Object(ui_member_utils__WEBPACK_IMPORTED_MODULE_2__["memberIsAdmin"])(member)
         }),
         permissions,
         isRequesting: false,
@@ -190160,7 +190214,9 @@ const createBillingAction = invoiceForm => async dispatch => {
   dispatch({
     type: ui_billing_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartCreateRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminCreateInvoiceOption"])(invoiceForm);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminCreateInvoiceOption"])({
+    createInvoiceOptionDetails: invoiceForm
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -190177,7 +190233,10 @@ const updateBillingAction = (invoiceOptionId, updateDetails) => async dispatch =
   dispatch({
     type: ui_billing_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartUpdateRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminUpdateInvoiceOption"])(invoiceOptionId, updateDetails);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminUpdateInvoiceOption"])({
+    id: invoiceOptionId,
+    updateInvoiceOptionDetails: updateDetails
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -190195,7 +190254,9 @@ const deleteBillingAction = invoiceOptionId => async dispatch => {
   dispatch({
     type: ui_billing_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartDeleteRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteInvoiceOption"])(invoiceOptionId);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteInvoiceOption"])({
+    id: invoiceOptionId
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -190544,8 +190605,7 @@ const CartList = ({
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     !item && history.push(Object(_member_utils__WEBPACK_IMPORTED_MODULE_15__["buildProfileRouting"])(currentUserId));
     return emptyCart;
-  }, []); // TODO: Update this when you update writeTransaction
-
+  }, []);
   const onSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](({
     response: {
       data: transaction
@@ -190604,15 +190664,17 @@ const CartList = ({
       return;
     }
 
-    call(_objectSpread({}, Object(_cart__WEBPACK_IMPORTED_MODULE_13__["isInvoiceSelection"])(item) ? {
-      invoiceId: item.id
-    } : _objectSpread({
-      invoiceOptionId: item.id
-    }, item.discountId && {
-      discountId: item.discountId
-    }), {
-      paymentMethodId
-    }));
+    call({
+      createTransactionDetails: _objectSpread({}, Object(_cart__WEBPACK_IMPORTED_MODULE_13__["isInvoiceSelection"])(item) ? {
+        invoiceId: item.id
+      } : _objectSpread({
+        invoiceOptionId: item.id
+      }, item.discountId && {
+        discountId: item.discountId
+      }), {
+        paymentMethodId
+      })
+    });
   }, [call, item, paymentMethodId]);
 
   if (!item) {
@@ -190903,8 +190965,10 @@ class CreditCardForm extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
             toggleLoading(false);
           } else {
             const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_7__["createPaymentMethod"])({
-              payment_method_nonce: payload.nonce,
-              make_default: true
+              createPaymentMethodDetails: {
+                payment_method_nonce: payload.nonce,
+                make_default: true
+              }
             });
 
             if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_7__["isApiErrorResponse"])(result)) {
@@ -191482,7 +191546,9 @@ class PaymentMethodsContainer extends react__WEBPACK_IMPORTED_MODULE_0__["Compon
       this.setState({
         isDeleting: true
       });
-      const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__["deletePaymentMethod"])(selectedPaymentMethodId);
+      const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__["deletePaymentMethod"])({
+        id: selectedPaymentMethodId
+      });
 
       if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__["isApiErrorResponse"])(result)) {
         this.setState({
@@ -191686,8 +191752,10 @@ class PaypalButton extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
           client: braintreeInstance
         }, (paypalCheckoutErr, paypalCheckoutInstance) => {
           if (paypalCheckoutErr) throw paypalCheckoutErr;
+          const env =  false ? undefined : "sandbox";
+          console.log("Loading PayPal env", env);
           paypal_checkout__WEBPACK_IMPORTED_MODULE_4__["Button"].render({
-            env:  false ? undefined : "sandbox",
+            env,
             payment: () => {
               return paypalCheckoutInstance.createPayment({
                 flow: 'vault'
@@ -191702,8 +191770,10 @@ class PaypalButton extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
 
                 try {
                   await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_8__["createPaymentMethod"])({
-                    payment_method_nonce: payload.nonce,
-                    make_default: true
+                    createPaymentMethodDetails: {
+                      payment_method_nonce: payload.nonce,
+                      make_default: true
+                    }
                   });
                   this.props.paymentMethodCallback && this.props.paymentMethodCallback(payload.nonce);
                 } catch (e) {
@@ -192309,6 +192379,168 @@ const ErrorMessage = props => {
 
 /***/ }),
 
+/***/ "./src/ui/common/FilterButton.tsx":
+/*!****************************************!*\
+  !*** ./src/ui/common/FilterButton.tsx ***!
+  \****************************************/
+/*! exports provided: default, withFilterButton */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withFilterButton", function() { return withFilterButton; });
+/* 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_icons_FilterList__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/icons/FilterList */ "./node_modules/@material-ui/icons/FilterList.js");
+/* harmony import */ var _material_ui_icons_FilterList__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_icons_FilterList__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Button */ "./node_modules/@material-ui/core/Button/index.js");
+/* harmony import */ var _material_ui_core_Button__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_Drawer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/Drawer */ "./node_modules/@material-ui/core/Drawer/index.js");
+/* harmony import */ var _material_ui_core_Drawer__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Drawer__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
+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); }
+
+
+
+
+
+
+
+const FilterButton = ({
+  children,
+  label = "Filters"
+}) => {
+  const {
+    isOpen,
+    openModal,
+    closeModal
+  } = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_4__["default"])();
+  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_2___default.a, {
+    variant: "contained",
+    color: "default",
+    onClick: openModal
+  }, label, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_icons_FilterList__WEBPACK_IMPORTED_MODULE_1___default.a, null)), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Drawer__WEBPACK_IMPORTED_MODULE_3___default.a, {
+    anchor: "right",
+    open: isOpen,
+    onClose: closeModal
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("div", {
+    role: "presentation",
+    style: {
+      margin: "2em"
+    }
+  }, children(closeModal))));
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (FilterButton);
+const withFilterButton = (Component, label) => props => react__WEBPACK_IMPORTED_MODULE_0__["createElement"](FilterButton, {
+  label: label
+}, close => react__WEBPACK_IMPORTED_MODULE_0__["createElement"](Component, _extends({
+  close: close
+}, props)));
+
+/***/ }),
+
+/***/ "./src/ui/common/Filters/QueryContext.tsx":
+/*!************************************************!*\
+  !*** ./src/ui/common/Filters/QueryContext.tsx ***!
+  \************************************************/
+/*! exports provided: QueryContextConsumer, QueryContextProvider, withQueryContext, useQueryContext */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueryContextConsumer", function() { return QueryContextConsumer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "QueryContextProvider", function() { return QueryContextProvider; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "withQueryContext", function() { return withQueryContext; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "useQueryContext", function() { return useQueryContext; });
+/* 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 _table_constants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../table/constants */ "./src/ui/common/table/constants.ts");
+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 _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; }
+
+
+
+const defaultInitQuery = {
+  pageNum: 0,
+  orderBy: "",
+  order: _table_constants__WEBPACK_IMPORTED_MODULE_1__["SortDirection"].Asc
+};
+const defaultValues = {
+  params: defaultInitQuery,
+  sort: () => {},
+  changePage: () => {},
+  setParam: () => {}
+};
+const QueryContext = react__WEBPACK_IMPORTED_MODULE_0__["createContext"](defaultValues);
+const QueryContextConsumer = QueryContext.Consumer;
+const QueryContextProvider = ({
+  children,
+  initialState = {}
+}) => {
+  const [params, setParams] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](_objectSpread({}, defaultInitQuery, {}, initialState));
+  const changePage = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](newPage => {
+    setParams(curr => _objectSpread({}, curr, {
+      pageNum: newPage
+    }));
+  }, [setParams]);
+  const setParam = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"]((fieldname, value, resetPage = true) => {
+    setParams(curr => _objectSpread({}, curr, {
+      [fieldname]: typeof value === "function" ? value(curr[fieldname]) : value,
+      pageNum: resetPage ? 0 : curr.pageNum
+    }));
+  }, [params, setParams]);
+  const sort = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"]((by, order) => {
+    setParams(curr => _objectSpread({}, curr, {
+      order,
+      orderBy: by,
+      pageNum: 0
+    }));
+  }, [setParams]);
+  const context = react__WEBPACK_IMPORTED_MODULE_0__["useMemo"](() => ({
+    params,
+    sort,
+    changePage,
+    setParam
+  }), [params, setParam]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](QueryContext.Provider, {
+    value: context
+  }, children);
+};
+function withQueryContext(WrappedComponent, initialState) {
+  return class extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
+    render() {
+      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](QueryContextProvider, {
+        initialState: initialState
+      }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](WrappedComponent, this.props), ";");
+    }
+
+  };
+}
+function useQueryContext(initialState = {}) {
+  const context = react__WEBPACK_IMPORTED_MODULE_0__["useContext"](QueryContext);
+
+  if (!context.setParam) {
+    throw new Error("useQueryContext invoked outside QueryContextProvider");
+  } // Set initial params on mount
+
+
+  react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
+    Object.entries(initialState).map(([key, val]) => {
+      context.setParam(key, curr => curr === undefined ? val : curr);
+    });
+  }, []);
+  Object.entries(initialState).forEach(([key, val]) => {
+    context.params[key] = context.params[key] === undefined ? val : context.params[key];
+  });
+  return context;
+}
+
+/***/ }),
+
 /***/ "./src/ui/common/Form.tsx":
 /*!********************************!*\
   !*** ./src/ui/common/Form.tsx ***!
@@ -193113,7 +193345,9 @@ const MemberSearchInput = ({
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     const fetchMember = async () => {
       if (selection) {
-        const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"])(selection.value);
+        const response = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"])({
+          id: selection.value
+        });
 
         if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(response)) {
           console.error(response.error);
@@ -193436,52 +193670,20 @@ const StatusLabel = props => {
 /*!***********************************************!*\
   !*** ./src/ui/common/table/StatefulTable.tsx ***!
   \***********************************************/
-/*! exports provided: useQueryState, default */
+/*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "useQueryState", function() { return useQueryState; });
 /* 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 _TableContainer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./TableContainer */ "./src/ui/common/table/TableContainer.tsx");
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./constants */ "./src/ui/common/table/constants.ts");
+/* harmony import */ var _Filters_QueryContext__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+
 
 
 
-const useQueryState = (initialState = {}) => {
-  const [order, setOrder] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](initialState.order || _constants__WEBPACK_IMPORTED_MODULE_2__["SortDirection"].Asc);
-  const [orderBy, setOrderBy] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](initialState.orderBy);
-  const [search, setSearch] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](initialState.search);
-  const [pageNum, setPageNum] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](initialState.pageNum || 0);
-  const setAllQuery = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](newQuery => {
-    const {
-      order: newOrder,
-      orderBy: newOrderBy,
-      search: newSearch,
-      pageNum: newPageNum
-    } = newQuery;
-    newOrder && setOrder(newOrder);
-    newOrderBy && setOrderBy(newOrderBy);
-    newSearch && setSearch(newSearch);
-    newPageNum && setPageNum(newPageNum);
-  }, [setOrder, setOrderBy, setSearch, setPageNum]);
-  const setQuery = Object.assign(setAllQuery, {
-    setOrder,
-    setSearch,
-    setOrderBy,
-    setPageNum
-  });
-  const reset = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    setPageNum(initialState.pageNum || 0);
-  }, [setPageNum]);
-  return [{
-    order,
-    orderBy,
-    search,
-    pageNum
-  }, setQuery, reset];
-};
 
 const StatefulTable = ({
   id,
@@ -193489,8 +193691,6 @@ const StatefulTable = ({
   loading,
   data = [],
   error,
-  queryParams,
-  setQuery,
   rowId,
   columns,
   renderSearch,
@@ -193499,17 +193699,23 @@ const StatefulTable = ({
   totalItems
 }) => {
   const {
-    setOrder,
-    setOrderBy,
-    setSearch,
-    setPageNum
-  } = setQuery;
-  const {
-    order,
-    orderBy,
-    pageNum
-  } = queryParams;
-  react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => setQuery(queryParams), [JSON.stringify(queryParams), setQuery]);
+    params: {
+      order,
+      orderBy,
+      pageNum
+    },
+    sort,
+    changePage,
+    setParam
+  } = Object(_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_3__["useQueryContext"])();
+  react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
+    if (renderSearch) {
+      setParam("search", curr => curr || "");
+    }
+  }, [renderSearch]);
+  const search = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](val => {
+    setParam("search", val);
+  }, [setParam]);
   const onSort = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](newOrderBy => {
     let newOrder = _constants__WEBPACK_IMPORTED_MODULE_2__["SortDirection"].Desc;
 
@@ -193517,11 +193723,9 @@ const StatefulTable = ({
       newOrder = _constants__WEBPACK_IMPORTED_MODULE_2__["SortDirection"].Asc;
     }
 
-    setOrder(newOrder);
-    setOrderBy(orderBy);
-    setPageNum(0);
-  }, [pageNum, setOrder, setOrderBy]);
-  const onPageChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](newPage => setPageNum(newPage), [setPageNum]);
+    sort(newOrderBy, newOrder);
+  }, [pageNum, sort, orderBy, order]);
+  const onPageChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](newPage => changePage(newPage), [changePage]);
   const onSelect = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"]((id, selected) => {
     if (Array.isArray(selectedIds)) {
       const updatedIds = selectedIds.slice();
@@ -193553,10 +193757,6 @@ const StatefulTable = ({
       }
     }
   }, [setSelectedIds, data]);
-  const onSearchEnter = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](searchTerm => {
-    setSearch(searchTerm);
-    setPageNum(0);
-  }, [setSearch, setPageNum]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_TableContainer__WEBPACK_IMPORTED_MODULE_1__["default"], {
     id: id,
     title: title,
@@ -193574,7 +193774,7 @@ const StatefulTable = ({
     onPageChange: onPageChange,
     onSelect: setSelectedIds && onSelect,
     onSelectAll: Array.isArray(selectedIds) && setSelectedIds && onSelectAll,
-    onSearchEnter: renderSearch && onSearchEnter
+    onSearchEnter: renderSearch && search
   });
 };
 
@@ -194348,8 +194548,11 @@ const MembershipAgreement = () => {
     call: update
   } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["updateMember"], onSuccess);
   const onContractAccept = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async signature => {
-    await update(currentUserId, {
-      signature
+    await update({
+      id: currentUserId,
+      updateMemberDetails: {
+        signature
+      }
     });
   }, [update]);
   const onConductAccept = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
@@ -194433,8 +194636,11 @@ const RentalAgreement = ({
     call: update
   } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["updateRental"], onSuccess);
   const onContractAccept = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async signature => {
-    await update(rentalId, {
-      signature
+    await update({
+      id: rentalId,
+      updateRentalDetails: {
+        signature
+      }
     });
   }, [update]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_DocumentForm__WEBPACK_IMPORTED_MODULE_6__["default"], {
@@ -195412,7 +195618,9 @@ const readMembershipAction = (membershipId, admin = false) => async dispatch =>
     type: ui_earnedMemberships_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartReadRequest
   });
   const func = admin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminGetEarnedMembership"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getEarnedMembership"];
-  const result = await func(membershipId);
+  const result = await func({
+    id: membershipId
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -195430,7 +195638,9 @@ const createMembershipAction = membershipForm => async dispatch => {
   dispatch({
     type: ui_earnedMemberships_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartCreateRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminCreateEarnedMembership"])(membershipForm);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminCreateEarnedMembership"])({
+    createEarnedMembershipDetails: membershipForm
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -195447,7 +195657,10 @@ const updateMembershipAction = (membershipId, updatedMembership) => async dispat
   dispatch({
     type: ui_earnedMemberships_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartUpdateRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminUpdateEarnedMembership"])(membershipId, updatedMembership);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminUpdateEarnedMembership"])({
+    id: membershipId,
+    updateEarnedMembershipDetails: updatedMembership
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -195782,14 +195995,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-const useReadTransaction = (transaction, ...args) => {
-  const [state, dispatch] = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_3__["useApiState"])(Object(_reducer_functions__WEBPACK_IMPORTED_MODULE_4__["buildQueryString"])(transaction, ...args));
+const useReadTransaction = (transaction, args, delay, key) => {
+  const [state, dispatch] = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_3__["useApiState"])(Object(_reducer_functions__WEBPACK_IMPORTED_MODULE_4__["buildQueryString"])(transaction, args, key));
   const [force, setForce] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](false);
   const refresh = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => setForce(prevState => !prevState), []);
   const getCurrentState = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    const key = Object(_reducer_functions__WEBPACK_IMPORTED_MODULE_4__["buildQueryString"])(transaction, ...args);
-    return Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_3__["getApiState"])(key, Object(app_main__WEBPACK_IMPORTED_MODULE_6__["getStore"])().getState());
-  }, [transaction, Object(ui_utils_stringifyArgs__WEBPACK_IMPORTED_MODULE_1__["default"])(args)]);
+    const apiKey = Object(_reducer_functions__WEBPACK_IMPORTED_MODULE_4__["buildQueryString"])(transaction, args, key);
+    return Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_3__["getApiState"])(apiKey, Object(app_main__WEBPACK_IMPORTED_MODULE_6__["getStore"])().getState());
+  }, [transaction, Object(ui_utils_stringifyArgs__WEBPACK_IMPORTED_MODULE_1__["default"])(args), key]);
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     const callTransaction = async () => {
       const currentState = getCurrentState();
@@ -195798,7 +196011,7 @@ const useReadTransaction = (transaction, ...args) => {
         dispatch({
           type: _reducer__WEBPACK_IMPORTED_MODULE_5__["TransactionAction"].Start
         });
-        const response = await transaction(...args);
+        const response = await transaction(args);
 
         if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(response)) {
           dispatch({
@@ -195818,8 +196031,8 @@ const useReadTransaction = (transaction, ...args) => {
       }
     };
 
-    callTransaction();
-  }, [Object(ui_utils_stringifyArgs__WEBPACK_IMPORTED_MODULE_1__["default"])(args), force]);
+    !delay && callTransaction();
+  }, [Object(ui_utils_stringifyArgs__WEBPACK_IMPORTED_MODULE_1__["default"])(args), key, force, delay]);
   return _objectSpread({}, state, {
     refresh
   });
@@ -195854,6 +196067,28 @@ const useScrollToHeader = () => {
 
 /***/ }),
 
+/***/ "./src/ui/hooks/useUUID.ts":
+/*!*********************************!*\
+  !*** ./src/ui/hooks/useUUID.ts ***!
+  \*********************************/
+/*! exports provided: useUUID */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "useUUID", function() { return useUUID; });
+/* 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 _utils_generateUUID__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../utils/generateUUID */ "./src/ui/utils/generateUUID.ts");
+
+
+function useUUID() {
+  const uuid = react__WEBPACK_IMPORTED_MODULE_0__["useRef"](Object(_utils_generateUUID__WEBPACK_IMPORTED_MODULE_1__["default"])());
+  return uuid.current;
+}
+
+/***/ }),
+
 /***/ "./src/ui/hooks/useWriteTransaction.ts":
 /*!*********************************************!*\
   !*** ./src/ui/hooks/useWriteTransaction.ts ***!
@@ -195892,14 +196127,13 @@ const useWriteTransaction = (transaction, onSuccess) => {
       called: false,
       response: undefined
     });
-  }, [setState]); // TODO: This args spread is messing up my nice typings
-
-  const call = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async (...args) => {
+  }, [setState]);
+  const call = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async args => {
     setState(prevState => _objectSpread({}, prevState, {
       isRequesting: true,
       called: true
     }));
-    const response = await transaction(...args);
+    const response = await transaction(args);
     const error = response.error;
     setState(prevState => _objectSpread({}, prevState, {
       response,
@@ -195981,14 +196215,14 @@ const CreateInvoiceModal = ({
   const {
     call,
     isRequesting,
-    error,
-    response,
-    reset
+    error
   } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_3__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminCreateInvoices"], onCreate);
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async form => {
     const validUpdate = formRef.current.validate && (await formRef.current.validate(form));
     if (!form.isValid()) return;
-    validUpdate && call(validUpdate);
+    validUpdate && call({
+      createInvoiceDetails: validUpdate
+    });
   }, [formRef, call]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ButtonRow__WEBPACK_IMPORTED_MODULE_4__["ActionButton"], {
     id: "invoices-list-create",
@@ -196067,12 +196301,12 @@ const DeleteInvoiceModal = ({
   const {
     call,
     isRequesting,
-    error,
-    response,
-    reset
+    error
   } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_8__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteInvoice"], onDelete);
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    call(invoice.id);
+    call({
+      id: invoice.id
+    });
   }, [invoice, call]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ButtonRow__WEBPACK_IMPORTED_MODULE_9__["ActionButton"], {
     id: "invoices-list-delete",
@@ -196165,6 +196399,213 @@ const InvoiceDetails = ({
 
 /***/ }),
 
+/***/ "./src/ui/invoice/InvoiceFilters.tsx":
+/*!*******************************************!*\
+  !*** ./src/ui/invoice/InvoiceFilters.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_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_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/FormControlLabel */ "./node_modules/@material-ui/core/FormControlLabel/index.js");
+/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/FormControl */ "./node_modules/@material-ui/core/FormControl/index.js");
+/* harmony import */ var _material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/RadioGroup */ "./node_modules/@material-ui/core/RadioGroup/index.js");
+/* harmony import */ var _material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/FormLabel */ "./node_modules/@material-ui/core/FormLabel/index.js");
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/Radio */ "./node_modules/@material-ui/core/Radio/index.js");
+/* harmony import */ var _material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/TextField */ "./node_modules/@material-ui/core/TextField/index.js");
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+/* harmony import */ var _common_FilterButton__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../common/FilterButton */ "./src/ui/common/FilterButton.tsx");
+
+
+
+
+
+
+
+
+
+
+
+
+const InvoiceFilters = ({
+  close,
+  onChange
+}) => {
+  const {
+    params,
+    setParam
+  } = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__["useQueryContext"])();
+  const toggleRadio = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](key => event => {
+    const {
+      value
+    } = event.target;
+    let param;
+
+    if (value === "true") {
+      param = true;
+    } else if (value === "false") {
+      param = false;
+    }
+
+    setParam(key, param);
+    onChange();
+    close();
+  }, [setParam, onChange, close]);
+
+  const paramToVal = param => {
+    return param === true ? "true" : param === false ? "false" : "both";
+  };
+
+  const onSearch = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](event => {
+    if (event.key === "Enter") {
+      const searchTerm = event.target.value;
+      setParam("search", searchTerm);
+      onChange();
+      close();
+    }
+  }, [setParam, onChange, close]);
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default.a, {
+    variant: "headline",
+    gutterBottom: true
+  }, "Invoice Filters"), 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_5___default.a, {
+    component: "legend"
+  }, "Search for dues"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    id: "invoice-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_5___default.a, {
+    component: "legend"
+  }, "Filter by Past Due"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    name: "settled",
+    value: paramToVal(params.pastDue),
+    onChange: toggleRadio("pastDue")
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "true",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Past Due"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "false",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Not Past Due"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "both",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Both"
+  })))), 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_5___default.a, {
+    component: "legend"
+  }, "Filter by Refunded"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    name: "settled",
+    value: paramToVal(params.refunded),
+    onChange: toggleRadio("refunded")
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "true",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Refunded"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "false",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Not Refunded"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "both",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Both"
+  })))), 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_5___default.a, {
+    component: "legend"
+  }, "Filter by Refund Requested"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    name: "settled",
+    value: paramToVal(params.refundRequested),
+    onChange: toggleRadio("refunded")
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "true",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Requested"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "false",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Not Requestedd"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "both",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Both"
+  })))), 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_5___default.a, {
+    component: "legend"
+  }, "Filter by Paid"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_4___default.a, {
+    name: "settled",
+    value: paramToVal(params.settled),
+    onChange: toggleRadio("settled")
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "true",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Paid"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "false",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Unpaid"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "both",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_6___default.a, null),
+    label: "Both"
+  })))));
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_FilterButton__WEBPACK_IMPORTED_MODULE_10__["withFilterButton"])(InvoiceFilters));
+
+/***/ }),
+
 /***/ "./src/ui/invoice/InvoiceForm.tsx":
 /*!****************************************!*\
   !*** ./src/ui/invoice/InvoiceForm.tsx ***!
@@ -196486,33 +196927,25 @@ __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 use_react_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! use-react-router */ "./node_modules/use-react-router/use-react-router.js");
 /* harmony import */ var use_react_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(use_react_router__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/Checkbox */ "./node_modules/@material-ui/core/Checkbox/index.js");
-/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/FormControlLabel */ "./node_modules/@material-ui/core/FormControlLabel/index.js");
-/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__ = __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_4___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
-/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
-/* harmony import */ var _common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../common/table/StatefulTable */ "./src/ui/common/table/StatefulTable.tsx");
-/* harmony import */ var app_entities_invoice__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! app/entities/invoice */ "./src/app/entities/invoice.ts");
-/* harmony import */ var ui_common_table_constants__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ui/common/table/constants */ "./src/ui/common/table/constants.ts");
-/* harmony import */ var ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
-/* harmony import */ var ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ui/common/StatusLabel */ "./src/ui/common/StatusLabel.tsx");
-/* harmony import */ var ui_constants__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ui/constants */ "./src/ui/constants.ts");
-/* harmony import */ var _utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/extractTotalItems */ "./src/ui/utils/extractTotalItems.ts");
-/* harmony import */ var _invoice_CreateInvoiceModal__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../invoice/CreateInvoiceModal */ "./src/ui/invoice/CreateInvoiceModal.tsx");
-/* harmony import */ var _invoice_DeleteInvoiceModal__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../invoice/DeleteInvoiceModal */ "./src/ui/invoice/DeleteInvoiceModal.tsx");
-/* harmony import */ var _common_ButtonRow__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./utils */ "./src/ui/invoice/utils.ts");
-/* harmony import */ var _ViewInvoiceModal__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./ViewInvoiceModal */ "./src/ui/invoice/ViewInvoiceModal.tsx");
-/* harmony import */ var _subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ../subscriptions/ViewSubscriptionModal */ "./src/ui/subscriptions/ViewSubscriptionModal.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 _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; }
-
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__ = __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_2___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
+/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var _common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../common/table/StatefulTable */ "./src/ui/common/table/StatefulTable.tsx");
+/* harmony import */ var app_entities_invoice__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! app/entities/invoice */ "./src/app/entities/invoice.ts");
+/* harmony import */ var ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/common/table/constants */ "./src/ui/common/table/constants.ts");
+/* harmony import */ var ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
+/* harmony import */ var ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ui/common/StatusLabel */ "./src/ui/common/StatusLabel.tsx");
+/* harmony import */ var ui_constants__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/constants */ "./src/ui/constants.ts");
+/* harmony import */ var _utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/extractTotalItems */ "./src/ui/utils/extractTotalItems.ts");
+/* harmony import */ var _invoice_CreateInvoiceModal__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../invoice/CreateInvoiceModal */ "./src/ui/invoice/CreateInvoiceModal.tsx");
+/* harmony import */ var _invoice_DeleteInvoiceModal__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../invoice/DeleteInvoiceModal */ "./src/ui/invoice/DeleteInvoiceModal.tsx");
+/* harmony import */ var _common_ButtonRow__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./utils */ "./src/ui/invoice/utils.ts");
+/* harmony import */ var _ViewInvoiceModal__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./ViewInvoiceModal */ "./src/ui/invoice/ViewInvoiceModal.tsx");
+/* harmony import */ var _subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../subscriptions/ViewSubscriptionModal */ "./src/ui/subscriptions/ViewSubscriptionModal.tsx");
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+/* harmony import */ var _InvoiceFilters__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./InvoiceFilters */ "./src/ui/invoice/InvoiceFilters.tsx");
 
 
 
@@ -196538,29 +196971,29 @@ const getFields = (memberId, onUpdate) => [...(memberId ? [] : [{
   id: "member",
   label: "Member",
   cell: row => row.memberName,
-  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_9__["SortDirection"].Desc
+  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc
 }]), {
   id: "resourceClass",
   label: "Type",
-  cell: row => app_entities_invoice__WEBPACK_IMPORTED_MODULE_8__["InvoiceableResourceDisplay"][row.resourceClass],
-  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_9__["SortDirection"].Desc
+  cell: row => app_entities_invoice__WEBPACK_IMPORTED_MODULE_6__["InvoiceableResourceDisplay"][row.resourceClass],
+  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc
 }, {
   id: "dueDate",
   label: "Due Date",
-  cell: row => Object(_utils__WEBPACK_IMPORTED_MODULE_17__["renderInvoiceDueDate"])(row),
-  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_9__["SortDirection"].Desc
+  cell: row => Object(_utils__WEBPACK_IMPORTED_MODULE_15__["renderInvoiceDueDate"])(row),
+  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc
 }, {
   id: "amount",
   label: "Amount",
-  cell: row => Object(ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_10__["numberAsCurrency"])(row.amount),
-  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_9__["SortDirection"].Desc
+  cell: row => Object(ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_8__["numberAsCurrency"])(row.amount),
+  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc
 }, {
   id: "status",
   label: "Status",
   cell: row => {
-    const statusColor = row.pastDue && !row.settled ? ui_constants__WEBPACK_IMPORTED_MODULE_12__["Status"].Danger : ui_constants__WEBPACK_IMPORTED_MODULE_12__["Status"].Success;
-    const label = Object(_utils__WEBPACK_IMPORTED_MODULE_17__["renderInvoiceStatus"])(row);
-    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_11__["default"], {
+    const statusColor = row.pastDue && !row.settled ? ui_constants__WEBPACK_IMPORTED_MODULE_10__["Status"].Danger : ui_constants__WEBPACK_IMPORTED_MODULE_10__["Status"].Success;
+    const label = Object(_utils__WEBPACK_IMPORTED_MODULE_15__["renderInvoiceStatus"])(row);
+    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_StatusLabel__WEBPACK_IMPORTED_MODULE_9__["default"], {
       label: label,
       color: statusColor
     });
@@ -196570,13 +197003,13 @@ const getFields = (memberId, onUpdate) => [...(memberId ? [] : [{
   label: "View",
   cell: row => {
     if (row.subscriptionId) {
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_19__["default"], {
+      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_subscriptions_ViewSubscriptionModal__WEBPACK_IMPORTED_MODULE_17__["default"], {
         subscriptionId: row.subscriptionId,
         memberId: row.memberId
       });
     }
 
-    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_ViewInvoiceModal__WEBPACK_IMPORTED_MODULE_18__["default"], {
+    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_ViewInvoiceModal__WEBPACK_IMPORTED_MODULE_16__["default"], {
       invoice: row,
       onUpdate: onUpdate
     });
@@ -196586,10 +197019,6 @@ const getFields = (memberId, onUpdate) => [...(memberId ? [] : [{
 const InvoicesTable = ({
   stageInvoice
 }) => {
-  const [hideSettled, setHideSettled] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](true);
-  const toggleHideSettled = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    setHideSettled(settled => !settled);
-  }, [setHideSettled]);
   const {
     match: {
       params: {
@@ -196602,27 +197031,36 @@ const InvoicesTable = ({
       isAdmin,
       id: currentUserId
     }
-  } = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_5__["useAuthState"])();
-  const [queryParams, setQueryState] = Object(_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_7__["useQueryState"])();
-  const [selectedInvoice, setSelectedInvoice] = react__WEBPACK_IMPORTED_MODULE_0__["useState"]();
+  } = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_3__["useAuthState"])();
   const viewingOwnInvoices = memberId === currentUserId;
+  const asAdmin = isAdmin && !viewingOwnInvoices;
+  const {
+    params
+  } = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_18__["useQueryContext"])({
+    settled: false,
+    refunded: undefined,
+    pastDue: undefined,
+    refundRequested: undefined,
+    memberId: memberId
+  });
+  const [selectedInvoice, setSelectedInvoice] = react__WEBPACK_IMPORTED_MODULE_0__["useState"]();
   const {
     refresh: refreshMember
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["getMember"], memberId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"], {
+    id: memberId
+  });
+  const adminInvoiceResponse = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminListInvoices"], params, !asAdmin);
+  const invoiceResponse = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["listInvoices"], params, asAdmin);
   const {
     isRequesting,
     error,
     data = [],
     response,
     refresh
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(isAdmin && !viewingOwnInvoices ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["adminListInvoices"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["listInvoices"], _objectSpread({}, queryParams, {
-    hideSettled,
-    resourceId: memberId
-  })); // TODO: Need to fix these types of conditionals
-
+  } = asAdmin ? adminInvoiceResponse : invoiceResponse;
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     if (Array.isArray(data) && data.length) {
-      const newSelection = data.find(invoice => invoice.memberId === currentUserId && Object(_utils__WEBPACK_IMPORTED_MODULE_17__["isInvoicePayable"])(invoice));
+      const newSelection = data.find(invoice => invoice.memberId === currentUserId && Object(_utils__WEBPACK_IMPORTED_MODULE_15__["isInvoicePayable"])(invoice));
       setSelectedInvoice(newSelection);
     }
   }, [JSON.stringify(data), setSelectedInvoice]);
@@ -196635,25 +197073,17 @@ const InvoicesTable = ({
   }, [refresh, refreshMember]);
   const rowId = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](invoice => invoice.id, []);
   const fields = getFields(memberId, onSuccess);
-  const payNow = viewingOwnInvoices && Object(_utils__WEBPACK_IMPORTED_MODULE_17__["isInvoicePayable"])(selectedInvoice);
+  const payNow = viewingOwnInvoices && Object(_utils__WEBPACK_IMPORTED_MODULE_15__["isInvoicePayable"])(selectedInvoice);
   const goToCheckout = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => stageInvoice(selectedInvoice), [selectedInvoice, stageInvoice]);
-  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, isAdmin && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_invoice_CreateInvoiceModal__WEBPACK_IMPORTED_MODULE_14__["default"], {
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, isAdmin && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_invoice_CreateInvoiceModal__WEBPACK_IMPORTED_MODULE_12__["default"], {
     memberId: memberId,
     onSuccess: onSuccess
-  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_invoice_DeleteInvoiceModal__WEBPACK_IMPORTED_MODULE_15__["default"], {
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_invoice_DeleteInvoiceModal__WEBPACK_IMPORTED_MODULE_13__["default"], {
     invoice: selectedInvoice,
     onSuccess: onSuccess
-  }), 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_2___default.a, {
-      name: "hide-settled",
-      value: "hide-settled",
-      id: "hide-settled",
-      checked: !!hideSettled,
-      onChange: toggleHideSettled,
-      color: "default"
-    }),
-    label: "Hide settled dues"
-  })), viewingOwnInvoices && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ButtonRow__WEBPACK_IMPORTED_MODULE_16__["ActionButton"], {
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_InvoiceFilters__WEBPACK_IMPORTED_MODULE_19__["default"], {
+    onChange: refresh
+  })), viewingOwnInvoices && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ButtonRow__WEBPACK_IMPORTED_MODULE_14__["ActionButton"], {
     id: "invoices-list-payNow",
     style: {
       float: "right"
@@ -196663,23 +197093,21 @@ const InvoicesTable = ({
     disabled: !payNow,
     onClick: goToCheckout,
     label: "Pay Selected Dues"
-  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_7__["default"], {
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_5__["default"], {
     id: "invoices-table",
     title: "Dues",
     loading: isRequesting,
     data: data,
     error: error,
-    queryParams: queryParams,
-    setQuery: setQueryState,
     columns: fields,
     rowId: rowId,
-    totalItems: Object(_utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_13__["default"])(response),
+    totalItems: Object(_utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_11__["default"])(response),
     selectedIds: selectedInvoice && selectedInvoice.id,
     setSelectedIds: setSelected
   }));
 };
 
-/* harmony default export */ __webpack_exports__["default"] = (InvoicesTable);
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_18__["withQueryContext"])(InvoicesTable));
 
 /***/ }),
 
@@ -196747,9 +197175,12 @@ const SettleInvoiceModal = ({
     error
   } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["adminUpdateInvoice"], onUpdate);
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    call(invoice.id, _objectSpread({}, invoice, {
-      settled: true
-    }));
+    call({
+      id: invoice.id,
+      updateInvoiceDetails: _objectSpread({}, invoice, {
+        settled: true
+      })
+    });
   }, [invoice, call]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, Object(_invoice_utils__WEBPACK_IMPORTED_MODULE_10__["isInvoiceSettled"])(invoice) ? "Settled" : react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Button__WEBPACK_IMPORTED_MODULE_2___default.a, {
     variant: "outlined",
@@ -197020,7 +197451,9 @@ const EditMember = ({
     isRequesting: memberLoading,
     refresh: refreshMember,
     data: member = {}
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_1__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"], memberId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_1__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"], {
+    id: memberId
+  });
   const onSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
     refreshMember();
     closeModal();
@@ -197033,7 +197466,10 @@ const EditMember = ({
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async form => {
     const validUpdate = await formRef.current.validate(form);
     if (!form.isValid()) return;
-    update(memberId, validUpdate);
+    update({
+      id: memberId,
+      updateMemberDetails: validUpdate
+    });
   }, [formRef, update]);
   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_4__["ActionButton"], {
     id: "member-detail-open-edit-modal",
@@ -197143,7 +197579,9 @@ const MemberProfile = () => {
     refresh: refreshMember,
     error: memberError,
     data: member = {}
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_16__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"], memberId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_16__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["getMember"], {
+    id: memberId
+  });
   const [notification, setNotification] = react__WEBPACK_IMPORTED_MODULE_0__["useState"]();
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     if (!initRender && isOwnProfile && !memberLoading && member.id && !member.memberContractOnFile) {
@@ -197152,7 +197590,7 @@ const MemberProfile = () => {
   }, [initRender, isOwnProfile, memberLoading, member.memberContractOnFile]);
   const {
     data: rentals = []
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_16__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["listRentals"], memberId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_16__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["listRentals"], {});
   react__WEBPACK_IMPORTED_MODULE_0__["useEffect"](() => {
     const missingAgreement = rentals.find(rental => !rental.contractOnFile);
 
@@ -197702,7 +198140,9 @@ const RenewMember = ({
     isRequesting: memberLoading,
     refresh: refreshMember,
     data: member
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_5__["getMember"], memberId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_5__["getMember"], {
+    id: memberId
+  });
   const onSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](({
     reset
   }) => {
@@ -197718,7 +198158,10 @@ const RenewMember = ({
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async form => {
     const validUpdate = await formRef.current.validate(form);
     if (!form.isValid()) return;
-    renew(memberId, validUpdate);
+    renew({
+      id: memberId,
+      updateMemberDetails: validUpdate
+    });
   }, [formRef, renew]);
   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_7__["ActionButton"], {
     id: "member-detail-open-renew-modal",
@@ -197893,7 +198336,9 @@ const readMemberAction = memberId => async dispatch => {
   dispatch({
     type: ui_member_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartReadRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getMember"])(memberId);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getMember"])({
+    id: memberId
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -197915,9 +198360,15 @@ const updateMemberAction = (memberId, updateDetails, isAdmin = false) => async d
   let result;
 
   if (isAdmin) {
-    result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminUpdateMember"])(memberId, updateDetails);
+    result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminUpdateMember"])({
+      id: memberId,
+      updateMemberDetails: updateDetails
+    });
   } else {
-    result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["updateMember"])(memberId, updateDetails);
+    result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["updateMember"])({
+      id: memberId,
+      updateMemberDetails: updateDetails
+    });
   }
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["isApiErrorResponse"])(result)) {
@@ -198674,7 +199125,9 @@ const createMembersAction = memberForm => async dispatch => {
     type: ui_members_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartCreateRequest
   });
   let newMember;
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminCreateMember"])(memberForm);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminCreateMember"])({
+    createMemberDetails: memberForm
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -198862,8 +199315,11 @@ const ChangePaymentMethodModal = ({
     closeModal();
   });
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async () => {
-    paymentMethodId && call(subscriptionId, {
-      paymentMethodToken: paymentMethodId
+    paymentMethodId && call({
+      id: subscriptionId,
+      updateSubscriptionDetails: {
+        paymentMethodToken: paymentMethodId
+      }
     });
   }, [call, subscriptionId, paymentMethodId]);
 
@@ -198918,6 +199374,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _common_FormModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../common/FormModal */ "./src/ui/common/FormModal.tsx");
 /* harmony import */ var _member_utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../member/utils */ "./src/ui/member/utils.ts");
 /* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
+/* harmony import */ var _hooks_useUUID__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../hooks/useUUID */ "./src/ui/hooks/useUUID.ts");
+
 
 
 
@@ -198931,9 +199389,10 @@ __webpack_require__.r(__webpack_exports__);
 const DuplicateInvoiceModal = ({
   type
 }) => {
+  const uuid = Object(_hooks_useUUID__WEBPACK_IMPORTED_MODULE_9__["useUUID"])();
   const {
     data: invoices = []
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["listInvoices"]);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_4__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_3__["listInvoices"], {}, undefined, uuid);
   const {
     currentUser: {
       id: currentUserId
@@ -198981,6 +199440,43 @@ const DuplicateInvoiceModal = ({
 
 /***/ }),
 
+/***/ "./src/ui/membership/InvoicingGate.tsx":
+/*!*********************************************!*\
+  !*** ./src/ui/membership/InvoicingGate.tsx ***!
+  \*********************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* 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__);
+/* harmony import */ var ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ui/hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var app_entities_invoice__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! app/entities/invoice */ "./src/app/entities/invoice.ts");
+
+
+
+/**
+ * Since we cant gate all Invoicing features by a user permission, this allows disabling of all invoicing by disabling or removing
+ * invoice options. If all billing permissions are set to false and no results  return from this options request, effectively
+ * all invoicing components will be disabled. Useful for an emergency response.
+ */
+
+const InvoicingGate = ({
+  children
+}) => {
+  const {
+    data: options = []
+  } = Object(ui_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_1__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_0__["listInvoiceOptions"], {
+    types: [app_entities_invoice__WEBPACK_IMPORTED_MODULE_2__["InvoiceableResource"].Membership]
+  });
+  return children(!!options.length);
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (InvoicingGate);
+
+/***/ }),
+
 /***/ "./src/ui/membership/MembershipSelectForm.tsx":
 /*!****************************************************!*\
   !*** ./src/ui/membership/MembershipSelectForm.tsx ***!
@@ -199172,8 +199668,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var ui_billing_actions__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ui/billing/actions */ "./src/ui/billing/actions.ts");
 /* harmony import */ var ui_member_actions__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ui/member/actions */ "./src/ui/member/actions.ts");
 /* harmony import */ var ui_earnedMemberships_actions__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/earnedMemberships/actions */ "./src/ui/earnedMemberships/actions.ts");
-/* harmony import */ var ui_transactions_actions__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ui/transactions/actions */ "./src/ui/transactions/actions.ts");
-/* harmony import */ var _checkout_cart__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./checkout/cart */ "./src/ui/checkout/cart.ts");
+/* harmony import */ var _checkout_cart__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./checkout/cart */ "./src/ui/checkout/cart.ts");
 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; }
@@ -199189,18 +199684,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-
 const getRootReducer = history => Object(redux__WEBPACK_IMPORTED_MODULE_0__["combineReducers"])({
   router: Object(connected_react_router__WEBPACK_IMPORTED_MODULE_1__["connectRouter"])(history),
   base: baseReducer,
   auth: ui_auth_actions__WEBPACK_IMPORTED_MODULE_2__["authReducer"],
-  cart: _checkout_cart__WEBPACK_IMPORTED_MODULE_9__["cartReducer"],
+  cart: _checkout_cart__WEBPACK_IMPORTED_MODULE_8__["cartReducer"],
   members: ui_members_actions__WEBPACK_IMPORTED_MODULE_3__["membersReducer"],
   member: ui_member_actions__WEBPACK_IMPORTED_MODULE_6__["memberReducer"],
   rentals: ui_rentals_actions__WEBPACK_IMPORTED_MODULE_4__["rentalsReducer"],
   billing: ui_billing_actions__WEBPACK_IMPORTED_MODULE_5__["billingReducer"],
-  earnedMemberships: ui_earnedMemberships_actions__WEBPACK_IMPORTED_MODULE_7__["earnedMembershipsReducer"],
-  transactions: ui_transactions_actions__WEBPACK_IMPORTED_MODULE_8__["transactionsReducer"]
+  earnedMemberships: ui_earnedMemberships_actions__WEBPACK_IMPORTED_MODULE_7__["earnedMembershipsReducer"]
 });
 let TransactionAction;
 
@@ -199374,7 +199867,9 @@ const DeleteRentalModal = ({
     error
   } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteRental"], onSuccess);
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    rental && call(rental.id);
+    rental && call({
+      id: rental.id
+    });
   }, [rental, call]);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ButtonRow__WEBPACK_IMPORTED_MODULE_7__["ActionButton"], {
     id: "rentals-list-delete",
@@ -200198,7 +200693,9 @@ const createRentalAction = rentalForm => async dispatch => {
   dispatch({
     type: ui_rentals_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartCreateRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminCreateRental"])(rentalForm);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminCreateRental"])({
+    createRentalDetails: rentalForm
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -200216,7 +200713,10 @@ const updateRentalAction = (rentalId, updatedRental) => async dispatch => {
   dispatch({
     type: ui_rentals_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartUpdateRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminUpdateRental"])(rentalId, updatedRental);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminUpdateRental"])({
+    id: rentalId,
+    updateRentalDetails: updatedRental
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -200234,7 +200734,9 @@ const deleteRentalAction = rentalId => async dispatch => {
   dispatch({
     type: ui_rentals_constants__WEBPACK_IMPORTED_MODULE_1__["Action"].StartDeleteRequest
   });
-  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteRental"])(rentalId);
+  const result = await Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteRental"])({
+    id: rentalId
+  });
 
   if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["isApiErrorResponse"])(result)) {
     dispatch({
@@ -200558,13 +201060,17 @@ const CreateReport = ({
     error: memberError,
     refresh: refreshMember,
     data: member
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getMember"], currentUserId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getMember"], {
+    id: currentUserId
+  });
   const {
     isRequesting: loadingEM,
     error: errorEM,
     data: earnedMembership,
     refresh: refreshEM
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getEarnedMembership"], earnedMembershipId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getEarnedMembership"], {
+    id: earnedMembershipId
+  });
   const onSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](({
     reset
   }) => {
@@ -200584,7 +201090,10 @@ const CreateReport = ({
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](async form => {
     const validUpdate = await formRef.current.validate(form);
     if (!form.isValid()) return;
-    return await createReport(earnedMembershipId, validUpdate);
+    return await createReport({
+      id: earnedMembershipId,
+      createEarnedMembershipReportDetails: validUpdate
+    });
   }, [createReport, formRef]);
   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_7__["ActionButton"], {
     id: "report-list-create",
@@ -200853,6 +201362,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
 /* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
 /* harmony import */ var _common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../common/table/StatefulTable */ "./src/ui/common/table/StatefulTable.tsx");
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.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 _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; }
+
+
 
 
 
@@ -200887,7 +201404,10 @@ const ReportsTable = ({
   earnedMembershipId
 }) => {
   const [selectedId, setSelectedId] = react__WEBPACK_IMPORTED_MODULE_0__["useState"]();
-  const [queryParams, setQueryState, resetQuery] = Object(_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_13__["useQueryState"])();
+  const {
+    params,
+    changePage
+  } = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_14__["useQueryContext"])();
   const {
     isOpen,
     openModal,
@@ -200907,26 +201427,37 @@ const ReportsTable = ({
     }
   } = use_react_router__WEBPACK_IMPORTED_MODULE_3___default()();
   const isOwnMembership = currentUserId === memberId;
+  const asAdmin = isAdmin && !isOwnMembership;
   const setSeleted = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](ids => {
     setSelectedId(Array.isArray(ids) && ids[0] || undefined);
   }, [setSelectedId]);
   const {
     data: member
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["getMember"], memberId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["getMember"], {
+    id: memberId
+  });
   const {
     data: earnedMembership
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(isAdmin && !isOwnMembership ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["adminGetEarnedMembership"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["getEarnedMembership"], earnedMembershipId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(asAdmin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["adminGetEarnedMembership"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["getEarnedMembership"], {
+    id: earnedMembershipId
+  });
+  const adminEMResponse = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["adminListEarnedMembershipReports"], _objectSpread({
+    id: earnedMembershipId
+  }, params), !asAdmin);
+  const emResponse = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["listEarnedMembershipReports"], _objectSpread({
+    id: earnedMembershipId
+  }, params), asAdmin);
   const {
     isRequesting,
     error,
     data: reports = [],
     response,
     refresh
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_9__["default"])(isAdmin && !isOwnMembership ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["adminListEarnedMembershipReports"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["listEarnedMembershipReports"], earnedMembershipId, queryParams);
+  } = asAdmin ? adminEMResponse : emResponse;
   const onCreate = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
     refresh();
-    resetQuery();
-  }, [refresh, resetQuery]);
+    changePage(0);
+  }, [refresh, changePage]);
   const openDetails = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](reportId => {
     setSelectedId(reportId);
     openModal();
@@ -200951,8 +201482,6 @@ const ReportsTable = ({
     totalItems: Object(_utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_10__["default"])(response),
     selectedIds: [selectedId],
     setSelectedIds: setSeleted,
-    queryParams: queryParams,
-    setQuery: setQueryState,
     columns: getFields(openDetails),
     rowId: rowId
   }), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_reports_ReportForm__WEBPACK_IMPORTED_MODULE_7__["ReportForm"], {
@@ -200967,7 +201496,7 @@ const ReportsTable = ({
   })));
 };
 
-/* harmony default export */ __webpack_exports__["default"] = (ReportsTable);
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_14__["withQueryContext"])(ReportsTable));
 
 /***/ }),
 
@@ -201328,7 +201857,7 @@ const ManageRentalSubscriptions = () => {
     isRequesting: rentalsLoading,
     data: rentals = [],
     error: rentalsError
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["listRentals"]);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_6__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["listRentals"], {});
   ;
   const subscriptionRentals = rentals.filter(rental => !!rental.subscriptionId);
   const fallbackUI = rentalsLoading && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_7__["default"], {
@@ -201479,7 +202008,9 @@ const SettingsContainer = () => {
     isRequesting: loadingMember,
     error: memberError,
     data: member
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_11__["getMember"], currentUserId);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_11__["getMember"], {
+    id: currentUserId
+  });
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
     container: true,
     spacing: 16
@@ -201615,7 +202146,9 @@ const CancelSubscriptionModal = ({
     onSuccess && onSuccess();
   });
   const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    call(subscriptionId);
+    call({
+      id: subscriptionId
+    });
   }, [call, subscriptionId]);
   const disableButton = !subscriptionId || subscription.status === "Canceled";
   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"], {
@@ -201862,34 +202395,31 @@ const SubscriptionDetails = ({
     error: getMemberError,
     data: member,
     refresh: reloadMember
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getMember"], id);
-  let result = {};
-
-  if (asAdmin) {
-    result = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminListInvoices"], {
-      resourceId: memberId
-    });
-  } else {
-    result = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["listInvoices"], {});
-  } // Use prop if exists
-
-
-  const subscriptionId = rentalSubId || (member ? member.subscriptionId : undefined);
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getMember"], {
+    id
+  });
+  const adminResult = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminListInvoices"], {
+    resourceId: [memberId]
+  }, !asAdmin);
+  const baseResult = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["listInvoices"], {}, asAdmin);
   const {
     isRequesting: invoicesLoading,
     data: invoices = [],
     error: invoicesError,
     refresh: reloadInvoices
-  } = result; // TODO: this should delay calling until we have sub ID
+  } = asAdmin ? adminResult : baseResult; // Use prop if exists
 
+  const subscriptionId = rentalSubId || (member ? member.subscriptionId : undefined);
   const {
     isRequesting: subscriptionLoading,
     data: subscription,
     error: subError,
     refresh: reloadSubscription
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getSubscription"], subscriptionId);
-  const isLoading = loadingMember || subscriptionId && subscriptionLoading || invoicesLoading;
-  const error = getMemberError || subscriptionId && subError || invoicesError;
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_5__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["getSubscription"], {
+    id: subscriptionId
+  }, !subscriptionId);
+  const isLoading = loadingMember || subscriptionLoading || invoicesLoading;
+  const error = getMemberError || subError || invoicesError;
   const subscriptionInvoice = invoices.find(invoice => invoice.subscriptionId === subscriptionId);
   const onChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
     reloadMember();
@@ -201930,6 +202460,257 @@ const SubscriptionDetails = ({
 
 /***/ }),
 
+/***/ "./src/ui/subscriptions/SubscriptionFilters.tsx":
+/*!******************************************************!*\
+  !*** ./src/ui/subscriptions/SubscriptionFilters.tsx ***!
+  \******************************************************/
+/*! exports provided: subscriptionStatuses, default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "subscriptionStatuses", function() { return subscriptionStatuses; });
+/* 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_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/FormControlLabel */ "./node_modules/@material-ui/core/FormControlLabel/index.js");
+/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/FormControl */ "./node_modules/@material-ui/core/FormControl/index.js");
+/* harmony import */ var _material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/FormLabel */ "./node_modules/@material-ui/core/FormLabel/index.js");
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/FormGroup */ "./node_modules/@material-ui/core/FormGroup/index.js");
+/* harmony import */ var _material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/Checkbox */ "./node_modules/@material-ui/core/Checkbox/index.js");
+/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/TextField */ "./node_modules/@material-ui/core/TextField/index.js");
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+/* harmony import */ var _common_FilterButton__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../common/FilterButton */ "./src/ui/common/FilterButton.tsx");
+/* harmony import */ var _utils_timeToDate__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
+/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__ = __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_13___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__);
+/* harmony import */ var _common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
+/* harmony import */ var _common_ErrorMessage__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../common/ErrorMessage */ "./src/ui/common/ErrorMessage.tsx");
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+const subscriptionStatuses = {
+  active: {
+    label: "Active",
+    value: "Active"
+  },
+  canceled: {
+    label: "Canceled",
+    value: "Canceled"
+  },
+  pastDue: {
+    label: "Past Due",
+    value: "PastDue"
+  },
+  pending: {
+    label: "Pending",
+    value: "Pending"
+  },
+  expired: {
+    label: "Expired",
+    value: "Expired"
+  }
+};
+
+const SubscriptionFilters = ({
+  close,
+  onChange
+}) => {
+  const {
+    params,
+    setParam
+  } = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__["useQueryContext"])();
+  const {
+    data: billingPlans = [],
+    isRequesting: plansLoading,
+    error: plansError
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_13__["adminListBillingPlans"], {});
+  const onSearch = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](event => {
+    if (event.key === "Enter") {
+      const searchTerm = event.target.value;
+      setParam("search", searchTerm);
+      onChange();
+      close();
+    }
+  }, [setParam, onChange, close]);
+  const onInputChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](param => event => {
+    const {
+      value
+    } = event.currentTarget;
+    setParam(param, value);
+    onChange();
+    close();
+  }, [setParam, onChange, close]);
+  const onCheckboxChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](param => event => {
+    const {
+      value,
+      checked
+    } = event.currentTarget;
+    setParam(param, curr => {
+      if (checked) {
+        return [...curr, value];
+      } else {
+        const updated = curr.slice();
+        const valIndex = updated.indexOf(value);
+
+        if (valIndex > -1) {
+          updated.splice(valIndex, 1);
+        }
+
+        return updated;
+      }
+    });
+    onChange();
+    close();
+  }, [setParam, onChange, close]);
+  const fallbackUI = plansLoading && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_14__["default"], {
+    id: "plans-loading",
+    contained: true
+  }) || plansError && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_15__["default"], {
+    error: plansError
+  });
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default.a, {
+    variant: "headline",
+    gutterBottom: true
+  }, "Subscription Filters"), 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"
+  }, "Search for subscriptions"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    id: "subscription-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 Subscription Start Due"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    value: Object(_utils_timeToDate__WEBPACK_IMPORTED_MODULE_11__["toDatePicker"])(params.startDate),
+    name: "start-date-filter",
+    id: "start-date-filter",
+    type: "date",
+    onChange: onInputChange("startDate")
+  }))), 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 Subscription End Due"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    value: Object(_utils_timeToDate__WEBPACK_IMPORTED_MODULE_11__["toDatePicker"])(params.endDate),
+    name: "end-date-filter",
+    id: "end-date-filter",
+    type: "date",
+    onChange: onInputChange("endDate")
+  }))), 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"
+  }, "Subscription status"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5___default.a, null, Object.values(subscriptionStatuses).map(status => react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    key: status.value,
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default.a, {
+      checked: params.subscriptionStatus.includes(status.value),
+      onChange: onCheckboxChange("subscriptionStatus"),
+      value: status.value
+    }),
+    label: status.label
+  }))))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
+    item: true,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default.a, {
+    variant: "subheading"
+  }, "Filter by Billing Plan")), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
+    item: true,
+    xs: 12
+  }, fallbackUI || 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_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"
+  }, "Membership Plans"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5___default.a, null, billingPlans.map(plan => react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    key: plan.id,
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default.a, {
+      checked: params.planId.includes(plan.id),
+      onChange: onCheckboxChange("planId"),
+      value: plan.id
+    }),
+    label: plan.name
+  }))))), 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"
+  }, "Rental Plans"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5___default.a, null, billingPlans.map(plan => react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    key: plan.id,
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default.a, {
+      checked: params.planId.includes(plan.id),
+      onChange: onCheckboxChange("planId"),
+      value: plan.id
+    }),
+    label: plan.name
+  }))))))));
+};
+
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_FilterButton__WEBPACK_IMPORTED_MODULE_10__["withFilterButton"])(SubscriptionFilters));
+
+/***/ }),
+
 /***/ "./src/ui/subscriptions/SubscriptionsList.tsx":
 /*!****************************************************!*\
   !*** ./src/ui/subscriptions/SubscriptionsList.tsx ***!
@@ -201943,24 +202724,26 @@ __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_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_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/FormControlLabel */ "./node_modules/@material-ui/core/FormControlLabel/index.js");
-/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControlLabel__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 makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__ = __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_4___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../common/table/StatefulTable */ "./src/ui/common/table/StatefulTable.tsx");
-/* harmony import */ var _utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
-/* harmony import */ var _utils_timeToDate__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
-/* harmony import */ var _utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils/extractTotalItems */ "./src/ui/utils/extractTotalItems.ts");
-/* harmony import */ var _CancelSubscriptionModal__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./CancelSubscriptionModal */ "./src/ui/subscriptions/CancelSubscriptionModal.tsx");
-/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__ = __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_2___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../common/table/StatefulTable */ "./src/ui/common/table/StatefulTable.tsx");
+/* harmony import */ var _utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
+/* harmony import */ var _utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
+/* harmony import */ var _utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils/extractTotalItems */ "./src/ui/utils/extractTotalItems.ts");
+/* harmony import */ var _CancelSubscriptionModal__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./CancelSubscriptionModal */ "./src/ui/subscriptions/CancelSubscriptionModal.tsx");
+/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+/* harmony import */ var _SubscriptionFilters__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./SubscriptionFilters */ "./src/ui/subscriptions/SubscriptionFilters.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 _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 
 
 
@@ -201983,7 +202766,7 @@ const fields = [{
 }, {
   id: "amount",
   label: "Amount",
-  cell: row => Object(_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_6__["numberAsCurrency"])(row.amount)
+  cell: row => Object(_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_4__["numberAsCurrency"])(row.amount)
 }, {
   id: "status",
   label: "Status",
@@ -201991,31 +202774,42 @@ const fields = [{
 }, {
   id: "nextBilling",
   label: "Next Billing Date",
-  cell: row => Object(_utils_timeToDate__WEBPACK_IMPORTED_MODULE_7__["timeToDate"])(row.nextBillingDate)
+  cell: row => Object(_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["timeToDate"])(row.nextBillingDate)
 }];
 
 const rowId = sub => sub.id;
 
 const SubscriptionsTable = () => {
-  const [hideCanceled, setHideCanceled] = react__WEBPACK_IMPORTED_MODULE_0__["useState"](true);
-  const toggleHideCanceled = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
-    setHideCanceled(canceled => !canceled);
-  }, [setHideCanceled]);
   const [selectedId, setSelectedId] = react__WEBPACK_IMPORTED_MODULE_0__["useState"]();
-  const [queryParams, setQueryState, resetQuery] = Object(_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_5__["useQueryState"])();
+
+  const _useQueryContext = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__["useQueryContext"])({
+    search: undefined,
+    startDate: undefined,
+    endDate: undefined,
+    planId: [],
+    subscriptionStatus: [_SubscriptionFilters__WEBPACK_IMPORTED_MODULE_10__["subscriptionStatuses"].active.value]
+  }),
+        {
+    params: {
+      pageNum,
+      order,
+      orderBy
+    },
+    changePage
+  } = _useQueryContext,
+        restParams = _objectWithoutProperties(_useQueryContext.params, ["pageNum", "order", "orderBy"]);
+
   const {
     isRequesting,
     data: subscriptions = [],
     response,
     refresh,
     error
-  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_10__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_4__["adminListSubscriptions"], _objectSpread({}, queryParams, {
-    hideCanceled
-  }));
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_8__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminListSubscriptions"], _objectSpread({}, restParams));
   const onCancel = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
     refresh();
-    resetQuery();
-  }, [refresh, resetQuery]);
+    changePage(0);
+  }, [refresh, changePage]);
   const selectedSubscription = subscriptions.find(sub => sub.id === selectedId);
   return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
     container: true,
@@ -202024,36 +202818,26 @@ const SubscriptionsTable = () => {
   }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_1___default.a, {
     item: true,
     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_9__["default"], {
+  }, 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,
     onSuccess: onCancel
-  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
-    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_3___default.a, {
-      name: "hide-canceled",
-      value: "hide-canceled",
-      id: "hide-canceled",
-      checked: !!hideCanceled,
-      onChange: toggleHideCanceled,
-      color: "default"
-    }),
-    label: "Hide canceled subscriptions."
-  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_5__["default"], {
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_SubscriptionFilters__WEBPACK_IMPORTED_MODULE_10__["default"], {
+    onChange: refresh
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_3__["default"], {
     id: "subscriptions-table",
     title: "Subscriptions",
     loading: isRequesting,
     data: Object.values(subscriptions),
     error: error,
-    totalItems: Object(_utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_8__["default"])(response),
+    totalItems: Object(_utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_6__["default"])(response),
     selectedIds: selectedId,
     setSelectedIds: setSelectedId,
-    queryParams: queryParams,
-    setQuery: setQueryState,
     columns: fields,
     rowId: rowId
   })));
 };
 
-/* harmony default export */ __webpack_exports__["default"] = (SubscriptionsTable);
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_9__["withQueryContext"])(SubscriptionsTable));
 
 /***/ }),
 
@@ -202165,11 +202949,16 @@ __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_Typography__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
 /* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var ui_common_FormModal__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ui/common/FormModal */ "./src/ui/common/FormModal.tsx");
-/* harmony import */ var ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ui/common/KeyValueItem */ "./src/ui/common/KeyValueItem.tsx");
-/* harmony import */ var ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ui/utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
-/* harmony import */ var ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
-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; }
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__ = __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_2___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var ui_common_FormModal__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ui/common/FormModal */ "./src/ui/common/FormModal.tsx");
+/* harmony import */ var ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ui/common/KeyValueItem */ "./src/ui/common/KeyValueItem.tsx");
+/* harmony import */ var ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ui/utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
+/* harmony import */ var ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
+/* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
+/* harmony import */ var _common_ButtonRow__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
+/* harmony import */ var _hooks_useModal__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../hooks/useModal */ "./src/ui/hooks/useModal.ts");
+/* harmony import */ var _hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../hooks/useWriteTransaction */ "./src/ui/hooks/useWriteTransaction.ts");
 
 
 
@@ -202178,564 +202967,426 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-class DeleteTransactionModal extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
-  constructor(...args) {
-    super(...args);
 
-    _defineProperty(this, "formRef", void 0);
 
-    _defineProperty(this, "setFormRef", ref => this.formRef = ref);
-  }
 
-  render() {
-    const {
-      isOpen,
-      onClose,
-      isRequesting,
-      error,
-      onSubmit,
-      transaction,
+
+const RefundTransactionModal = ({
+  transaction = {},
+  onSuccess
+}) => {
+  const {
+    currentUser: {
       isAdmin
-    } = this.props;
-    const title = isAdmin ? "Refund Transaction" : "Request Refund";
-    const text = isAdmin ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", null, "Are you sure you want to refund this transaction?") : react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", null, "Would you like to request a refund for this transaction?", react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("br", null), "An administrator will review the request and notify you of a decision. Please note, requests for refunds are evaluated on a case by case basis and are not guaranteed.");
-    return transaction ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_2__["default"], {
-      formRef: this.setFormRef,
-      id: "refund-transaction",
-      loading: isRequesting,
-      isOpen: isOpen,
-      closeHandler: onClose,
-      title: title,
-      onSubmit: onSubmit,
-      error: error
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_1___default.a, {
-      gutterBottom: true
-    }, text), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_3__["default"], {
-      label: "Date"
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      id: "refund-transaction-date"
-    }, Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_4__["timeToDate"])(transaction.createdAt))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_3__["default"], {
-      label: "Amount"
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      id: "refund-transaction-amount"
-    }, Object(ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_5__["numberAsCurrency"])(Number(transaction.amount) - Number(transaction.discountAmount)))), isAdmin && transaction.memberName && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_3__["default"], {
-      label: "Member"
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      id: "refund-transaction-member"
-    }, transaction.memberName)), transaction.invoice && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_3__["default"], {
-      label: "Description"
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      id: "refund-transaction-description"
-    }, transaction.invoice.description))) : null;
+    }
+  } = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_7__["useAuthState"])();
+  const {
+    isOpen,
+    openModal,
+    closeModal
+  } = Object(_hooks_useModal__WEBPACK_IMPORTED_MODULE_9__["default"])();
+  const title = isAdmin ? "Refund Transaction" : "Request Refund";
+  const text = isAdmin ? react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", null, "Are you sure you want to refund this transaction?") : react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", null, "Would you like to request a refund for this transaction?", react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("br", null), "An administrator will review the request and notify you of a decision. Please note, requests for refunds are evaluated on a case by case basis and are not guaranteed."); // Disable if invoice already refunded or not yet settled
+
+  let disabled = true;
+  let label = "Refund transaction";
+
+  if (transaction.id) {
+    if (transaction.status !== makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["TransactionStatus"].Settled) {
+      disabled = true;
+      label = "Transaction in progress";
+    } else {
+      if (isAdmin) {
+        label = "Refund Transaction";
+        disabled = !!transaction.refundedTransactionId;
+      } else {
+        label = "Request Refund";
+        disabled = !!transaction.refundedTransactionId || !!(transaction.invoice && transaction.invoice.refundRequested);
+      }
+    }
   }
 
-}
+  const onWriteSuccess = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
+    closeModal();
+    onSuccess && onSuccess();
+  }, [onSuccess, closeModal]);
+  const {
+    isRequesting,
+    error,
+    call
+  } = Object(_hooks_useWriteTransaction__WEBPACK_IMPORTED_MODULE_10__["default"])(isAdmin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["adminDeleteTransaction"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_2__["deleteTransaction"], onWriteSuccess);
+  const onSubmit = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
+    call({
+      id: transaction.id
+    });
+  }, [call, transaction]);
+  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"], {
+    label: label,
+    id: "transactions-list-delete",
+    variant: "contained",
+    color: "secondary",
+    disabled: disabled,
+    onClick: openModal
+  }), isOpen && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_FormModal__WEBPACK_IMPORTED_MODULE_3__["default"], {
+    id: "refund-transaction",
+    loading: isRequesting,
+    isOpen: isOpen,
+    closeHandler: closeModal,
+    title: title,
+    onSubmit: onSubmit,
+    error: error
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_1___default.a, {
+    gutterBottom: true
+  }, text), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_4__["default"], {
+    label: "Date"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
+    id: "refund-transaction-date"
+  }, Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["timeToDate"])(transaction.createdAt))), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_4__["default"], {
+    label: "Amount"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
+    id: "refund-transaction-amount"
+  }, Object(ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_6__["numberAsCurrency"])(Number(transaction.amount) - Number(transaction.discountAmount)))), isAdmin && transaction.memberName && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_4__["default"], {
+    label: "Member"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
+    id: "refund-transaction-member"
+  }, transaction.memberName)), transaction.invoice && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_KeyValueItem__WEBPACK_IMPORTED_MODULE_4__["default"], {
+    label: "Description"
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
+    id: "refund-transaction-description"
+  }, transaction.invoice.description))));
+};
 
-/* harmony default export */ __webpack_exports__["default"] = (DeleteTransactionModal);
+/* harmony default export */ __webpack_exports__["default"] = (RefundTransactionModal);
 
 /***/ }),
 
-/***/ "./src/ui/transactions/TransactionsList.tsx":
-/*!**************************************************!*\
-  !*** ./src/ui/transactions/TransactionsList.tsx ***!
-  \**************************************************/
-/*! exports provided: default */
+/***/ "./src/ui/transactions/TransactionsFilter.tsx":
+/*!****************************************************!*\
+  !*** ./src/ui/transactions/TransactionsFilter.tsx ***!
+  \****************************************************/
+/*! exports provided: transactionStatuses, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "transactionStatuses", function() { return transactionStatuses; });
 /* 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 moment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
-/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
-/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
-/* 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 _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/TextField */ "./node_modules/@material-ui/core/TextField/index.js");
-/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var app_entities_transaction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! app/entities/transaction */ "./src/app/entities/transaction.ts");
-/* harmony import */ var ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/common/table/constants */ "./src/ui/common/table/constants.ts");
-/* harmony import */ var ui_common_table_TableContainer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ui/common/table/TableContainer */ "./src/ui/common/table/TableContainer.tsx");
-/* harmony import */ var ui_transactions_actions__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ui/transactions/actions */ "./src/ui/transactions/actions.ts");
-/* harmony import */ var ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ui/utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
-/* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
-/* harmony import */ var ui_transactions_UpdateTransactionContainer__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ui/transactions/UpdateTransactionContainer */ "./src/ui/transactions/UpdateTransactionContainer.tsx");
-/* harmony import */ var ui_transactions_RefundTransactionModal__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ui/transactions/RefundTransactionModal */ "./src/ui/transactions/RefundTransactionModal.tsx");
-/* harmony import */ var ui_common_ButtonRow__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ui/common/ButtonRow */ "./src/ui/common/ButtonRow.tsx");
-/* harmony import */ var ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
-/* harmony import */ var ui_transactions_utils__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ui/transactions/utils */ "./src/ui/transactions/utils.tsx");
-/* harmony import */ var _common_MemberSearchInput__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../common/MemberSearchInput */ "./src/ui/common/MemberSearchInput.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 _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; }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-class TransactionsList extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
-  constructor(props) {
-    super(props);
-
-    _defineProperty(this, "fields", [{
-      id: "createdAt",
-      label: "Date",
-      cell: row => Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_10__["timeToDate"])(row.createdAt),
-      defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc
-    }, {
-      id: "amount",
-      label: "Amount",
-      cell: row => {
-        const amount = Number(row.amount);
-        const discount = Number(row.discountAmount);
-        let total = amount;
-
-        if (discount) {
-          total -= discount;
-        }
-
-        const totalAsText = Object(ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_15__["numberAsCurrency"])(total);
-
-        if (row.refundedTransactionId) {
-          return `(${totalAsText})`;
-        }
-
-        return totalAsText;
-      },
-      defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc
-    }, {
-      id: "description",
-      label: "Description",
-      cell: row => {
-        let description = "";
-
-        if (row.refundedTransactionId) {
-          description += "Refund";
-        } else if (row.subscriptionId) {
-          description += "Subscription Payment";
-        } else {
-          description += "Standard Payment";
-        }
-
-        if (row.invoice) {
-          description += ` for ${row.invoice.name}`;
-        }
-
-        return description;
-      }
-    }, ...(this.props.member ? [] : [{
-      id: "member",
-      label: "Member",
-      cell: row => {
-        if (row.memberId) {
-          return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router_dom__WEBPACK_IMPORTED_MODULE_3__["Link"], {
-            to: `/members/${row.memberId}`
-          }, row.memberName);
-        }
-
-        if (row.customerDetails) {
-          return `${row.customerDetails.first_name} ${row.customerDetails.last_name}`;
-        }
-
-        return "Unknown";
-      },
-      width: 200
-    }]), {
-      id: "status",
-      label: "Status",
-      cell: ui_transactions_utils__WEBPACK_IMPORTED_MODULE_16__["renderTransactionStatus"]
-    }]);
-
-    _defineProperty(this, "openDeleteModal", () => this.openTransactionModal(app_constants__WEBPACK_IMPORTED_MODULE_11__["CrudOperation"].Delete));
-
-    _defineProperty(this, "openTransactionModal", operation => this.setState({
-      openTransactionForm: true,
-      modalOperation: operation
-    }));
-
-    _defineProperty(this, "closeTransactionModal", () => {
-      this.setState({
-        openTransactionForm: false
-      });
-    });
-
-    _defineProperty(this, "getActionButtons", () => {
-      const {
-        selectedId
-      } = this.state;
-      const {
-        admin,
-        transactions
-      } = this.props;
-      const transaction = transactions && selectedId && transactions[selectedId]; // Disable if invoice already refunded or not yet settled
-
-      let disabled = true;
-      let label = "Refund transaction";
-
-      if (transaction) {
-        if (transaction.status !== app_entities_transaction__WEBPACK_IMPORTED_MODULE_6__["TransactionStatus"].Settled) {
-          disabled = true;
-          label = "Transaction in progress";
-        } else {
-          if (admin) {
-            label = "Refund Transaction";
-            disabled = !!transaction.refundedTransactionId;
-          } else {
-            label = "Request Refund";
-            disabled = !!transaction.refundedTransactionId || !!(transaction.invoice && transaction.invoice.refundRequested);
-          }
-        }
-      }
-
-      const actionButtons = [{
-        label,
-        id: "transactions-list-delete",
-        variant: "contained",
-        color: "secondary",
-        disabled: disabled,
-        onClick: this.openDeleteModal
-      }];
-      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_common_ButtonRow__WEBPACK_IMPORTED_MODULE_14__["default"], {
-        actionButtons: actionButtons
-      });
-    });
-
-    _defineProperty(this, "getQueryParams", () => {
-      const {
-        pageNum,
-        orderBy,
-        order,
-        startDate,
-        endDate,
-        member
-      } = this.state;
-      return _objectSpread({
-        pageNum,
-        orderBy,
-        order,
-        startDate,
-        endDate
-      }, member && {
-        searchBy: app_entities_transaction__WEBPACK_IMPORTED_MODULE_6__["TransactionSearchCriteria"].Member,
-        searchId: member.id
-      });
-    });
-
-    _defineProperty(this, "getTransactions", (resetPage = false) => {
-      const {
-        admin,
-        member
-      } = this.props;
-
-      if (resetPage) {
-        this.setState({
-          pageNum: 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_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @material-ui/core/FormControlLabel */ "./node_modules/@material-ui/core/FormControlLabel/index.js");
+/* harmony import */ var _material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @material-ui/core/FormControl */ "./node_modules/@material-ui/core/FormControl/index.js");
+/* harmony import */ var _material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormControl__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @material-ui/core/FormLabel */ "./node_modules/@material-ui/core/FormLabel/index.js");
+/* harmony import */ var _material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormLabel__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @material-ui/core/FormGroup */ "./node_modules/@material-ui/core/FormGroup/index.js");
+/* harmony import */ var _material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @material-ui/core/Checkbox */ "./node_modules/@material-ui/core/Checkbox/index.js");
+/* harmony import */ var _material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @material-ui/core/TextField */ "./node_modules/@material-ui/core/TextField/index.js");
+/* harmony import */ var _material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! @material-ui/core/Typography */ "./node_modules/@material-ui/core/Typography/index.js");
+/* harmony import */ var _material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var _material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! @material-ui/core/Radio */ "./node_modules/@material-ui/core/Radio/index.js");
+/* harmony import */ var _material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! @material-ui/core/RadioGroup */ "./node_modules/@material-ui/core/RadioGroup/index.js");
+/* harmony import */ var _material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+/* harmony import */ var _common_FilterButton__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../common/FilterButton */ "./src/ui/common/FilterButton.tsx");
+/* harmony import */ var _utils_timeToDate__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
+/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_15__ = __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_15___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var _common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../common/LoadingOverlay */ "./src/ui/common/LoadingOverlay.tsx");
+/* harmony import */ var _common_ErrorMessage__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../common/ErrorMessage */ "./src/ui/common/ErrorMessage.tsx");
 
-      if (member && !member.customerId) {
-        return;
-      }
 
-      this.props.getTransactions(admin, this.getQueryParams());
-    });
 
-    _defineProperty(this, "rowId", row => row.id);
 
-    _defineProperty(this, "onSort", prop => {
-      const orderBy = prop;
-      let order = ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Desc;
 
-      if (this.state.orderBy === orderBy && this.state.order === order) {
-        order = ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Asc;
-      }
 
-      this.setState({
-        order,
-        orderBy,
-        pageNum: 0
-      }, () => this.getTransactions(true));
-    });
 
-    _defineProperty(this, "onPageChange", newPage => {
-      this.setState({
-        pageNum: newPage
-      }, this.getTransactions);
-    });
 
-    _defineProperty(this, "onSelect", (id, selected) => {
-      if (selected) {
-        this.setState({
-          selectedId: id
-        });
-      } else {
-        this.setState({
-          selectedId: undefined
-        });
-      }
-    });
 
-    _defineProperty(this, "updateMemberValue", newMember => {
-      this.setState({
-        member: newMember
-      }, () => this.getTransactions(true));
-    });
 
-    _defineProperty(this, "renderInvoiceForms", () => {
-      const {
-        selectedId,
-        openTransactionForm,
-        modalOperation
-      } = this.state;
-      const {
-        transactions,
-        member,
-        admin
-      } = this.props;
 
-      const refundModal = renderProps => {
-        const submit = async form => {
-          const success = await renderProps.submit(form);
 
-          if (success) {
-            this.setState({
-              selectedId: undefined,
-              pageNum: 0
-            }, this.getTransactions);
-          }
-        };
 
-        return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_transactions_RefundTransactionModal__WEBPACK_IMPORTED_MODULE_13__["default"], {
-          ref: renderProps.setRef,
-          transaction: renderProps.transaction,
-          isOpen: renderProps.isOpen,
-          isRequesting: renderProps.isRequesting,
-          error: renderProps.error,
-          onClose: renderProps.closeHandler,
-          onSubmit: submit,
-          isAdmin: admin
-        });
-      };
 
-      const selectedTransaction = transactions[selectedId];
-      return !!selectedTransaction && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_transactions_UpdateTransactionContainer__WEBPACK_IMPORTED_MODULE_12__["default"], {
-        operation: app_constants__WEBPACK_IMPORTED_MODULE_11__["CrudOperation"].Delete,
-        isAdmin: admin,
-        isOpen: openTransactionForm && modalOperation === app_constants__WEBPACK_IMPORTED_MODULE_11__["CrudOperation"].Delete,
-        transaction: transactions[selectedId],
-        closeHandler: this.closeTransactionModal,
-        render: refundModal
-      });
-    });
 
-    _defineProperty(this, "updateStartDate", event => {
-      const {
-        value
-      } = event.currentTarget;
-      const newDate = value ? new Date(Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_10__["dateToTime"])(value)) : "";
-      this.setState({
-        startDate: newDate
-      }, () => this.getTransactions(true));
-    });
 
-    _defineProperty(this, "updateEndDate", event => {
-      const {
-        value
-      } = event.currentTarget;
-      const newDate = value ? new Date(Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_10__["dateToTime"])(value)) : "";
-      this.setState({
-        endDate: newDate
-      }, () => this.getTransactions(true));
-    });
 
-    this.state = {
-      selectedId: undefined,
-      pageNum: 0,
-      orderBy: "",
-      order: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_7__["SortDirection"].Asc,
-      startDate: new Date(moment__WEBPACK_IMPORTED_MODULE_1__().subtract(1, "day").valueOf()),
-      endDate: new Date(),
-      modalOperation: undefined,
-      openTransactionForm: false,
-      member: undefined
-    };
-  }
 
-  componentDidMount() {
-    this.getTransactions();
+const transactionStatuses = {
+  authorizing: {
+    label: "Authorizing",
+    value: "Authorizing"
+  },
+  authorized: {
+    label: "Authorized",
+    value: "Authorized"
+  },
+  authorizationExpired: {
+    label: "Authorization Expired",
+    value: "AuthorizationExpired"
+  },
+  submittedForSettlement: {
+    label: "Submitted For Settlement",
+    value: "SubmittedForSettlement"
+  },
+  settling: {
+    label: "Settling",
+    value: "Settling"
+  },
+  settlementPending: {
+    label: "SettlementPending",
+    value: "SettlementPending"
+  },
+  settlementDeclined: {
+    label: "SettlementDeclined",
+    value: "SettlementDeclined"
+  },
+  settled: {
+    label: "Settled",
+    value: "Settled"
+  },
+  voided: {
+    label: "Voided",
+    value: "Voided"
+  },
+  processorDeclined: {
+    label: "ProcessorDeclined",
+    value: "ProcessorDeclined"
+  },
+  gatewayRejected: {
+    label: "GatewayRejected",
+    value: "GatewayRejected"
+  },
+  failed: {
+    label: "Failed",
+    value: "Failed"
   }
+};
 
-  componentDidUpdate(prevProps) {
-    const {
-      member: oldMember
-    } = prevProps;
+const TransactionFilters = ({
+  close,
+  onChange
+}) => {
+  const {
+    params,
+    setParam
+  } = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__["useQueryContext"])();
+  const {
+    data: billingPlans = [],
+    isRequesting: plansLoading,
+    error: plansError
+  } = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_14__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_15__["adminListBillingPlans"], {});
+  const onSearch = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](event => {
+    if (event.key === "Enter") {
+      const searchTerm = event.target.value;
+      setParam("search", searchTerm);
+      onChange();
+      close();
+    }
+  }, [setParam, onChange, close]);
+  const setType = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](event => {
+    setParam("type", event.target.value);
+    onChange();
+    close();
+  }, [setParam, onChange, close]);
+  const toggleRefunded = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](event => {
     const {
-      member
-    } = this.props;
+      value
+    } = event.target;
+    let param;
 
-    if ((oldMember && oldMember.id) !== (member && member.id)) {
-      // or member change
-      this.getTransactions(true);
+    if (value === "true") {
+      param = true;
+    } else if (value === "false") {
+      param = false;
     }
-  }
 
-  render() {
+    setParam("refund", param);
+
+    if (!params.type) {
+      setParam("type", "Sale");
+    }
+
+    onChange();
+    close();
+  }, [setParam, onChange, close, params]);
+  const onInputChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](param => event => {
     const {
-      transactions,
-      totalItems,
-      isReading,
-      readError,
-      admin,
-      member
-    } = this.props;
+      value
+    } = event.currentTarget;
+    setParam(param, value);
+    onChange();
+    close();
+  }, [setParam, onChange, close]);
+  const onCheckboxChange = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](param => event => {
     const {
-      selectedId,
-      pageNum,
-      order,
-      orderBy,
-      startDate,
-      endDate
-    } = this.state;
-    const transactionList = Object.values(transactions);
-    let error = readError; // Give better error if nothing loads for member
+      value,
+      checked
+    } = event.currentTarget;
+    setParam(param, curr => {
+      if (checked) {
+        return [...curr, value];
+      } else {
+        const updated = curr.slice();
+        const valIndex = updated.indexOf(value);
 
-    if (!transactionList.length && !error && member && !member.customerId) {
-      error = `No online payment history for ${member.firstname} ${member.lastname}.`;
-    }
+        if (valIndex > -1) {
+          updated.splice(valIndex, 1);
+        }
 
-    return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
-      container: true,
-      spacing: 24,
-      justify: "center"
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_4___default.a, {
-      item: true,
-      xs: 12
-    }, this.getActionButtons()), 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"]("span", {
-      style: {
-        marginRight: "20px"
-      }
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_5___default.a, {
-      value: Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_10__["toDatePicker"])(startDate),
-      label: "Start Date",
-      name: "start-date-filter",
-      id: "start-date-filter",
-      type: "date",
-      onChange: this.updateStartDate,
-      InputLabelProps: {
-        shrink: true
-      }
-    })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      style: {
-        marginRight: "20px"
-      }
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_5___default.a, {
-      value: Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_10__["toDatePicker"])(endDate),
-      label: "End Date",
-      name: "end-date-filter",
-      id: "end-date-filter",
-      type: "date",
-      onChange: this.updateEndDate,
-      InputLabelProps: {
-        shrink: true
+        return updated;
       }
-    })), !member && react__WEBPACK_IMPORTED_MODULE_0__["createElement"]("span", {
-      style: {
-        width: "200px",
-        display: "inline-block"
-      }
-    }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_MemberSearchInput__WEBPACK_IMPORTED_MODULE_17__["default"], {
-      name: "member-filter",
-      placeholder: "Search by name or email",
-      onChange: this.updateMemberValue
-    }))), 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"](ui_common_table_TableContainer__WEBPACK_IMPORTED_MODULE_8__["default"], {
-      id: "transactions-table",
-      title: member ? "Payment History" : "Transactions",
-      loading: isReading,
-      data: transactionList,
-      error: error,
-      totalItems: totalItems,
-      selectedIds: [selectedId],
-      pageNum: pageNum,
-      columns: this.fields,
-      order: order,
-      orderBy: orderBy,
-      onSort: this.onSort,
-      rowId: this.rowId,
-      onPageChange: this.onPageChange,
-      onSelect: this.onSelect
-    }), this.renderInvoiceForms()));
-  }
-
-}
+    });
+    onChange();
+    close();
+  }, [setParam, onChange, close]);
 
-const mapStateToProps = (state, _ownProps) => {
-  const {
-    entities: transactions,
-    read: {
-      totalItems,
-      isRequesting: isReading,
-      error: readError
-    }
-  } = state.transactions;
-  const {
-    currentUser: {
-      isAdmin: admin
-    }
-  } = state.auth;
-  return {
-    transactions,
-    totalItems,
-    isReading,
-    readError,
-    admin
+  const paramToVal = param => {
+    return param === true ? "true" : param === false ? "false" : "both";
   };
-};
 
-const mapDispatchToProps = (dispatch, ownProps) => {
-  const {
-    member
-  } = ownProps;
-  return {
-    getTransactions: (admin, queryParams) => dispatch(Object(ui_transactions_actions__WEBPACK_IMPORTED_MODULE_9__["readTransactionsAction"])(admin, _objectSpread({}, queryParams, {}, member && {
-      searchBy: app_entities_transaction__WEBPACK_IMPORTED_MODULE_6__["TransactionSearchCriteria"].Member,
-      searchId: member.id
-    })))
-  };
+  const fallbackUI = plansLoading && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_LoadingOverlay__WEBPACK_IMPORTED_MODULE_16__["default"], {
+    id: "plans-loading",
+    contained: true
+  }) || plansError && react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_ErrorMessage__WEBPACK_IMPORTED_MODULE_17__["default"], {
+    error: plansError
+  });
+  return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react__WEBPACK_IMPORTED_MODULE_0__["Fragment"], null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Typography__WEBPACK_IMPORTED_MODULE_8___default.a, {
+    variant: "headline",
+    gutterBottom: true
+  }, "Transaction Filters"), 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"
+  }, "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,
+    onChange: setType
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "Sale",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default.a, null),
+    label: "Sale"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "Credit",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default.a, null),
+    label: "Credit"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default.a, null),
+    label: "Both"
+  })))), 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 Refunded"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_RadioGroup__WEBPACK_IMPORTED_MODULE_10___default.a, {
+    name: "settled",
+    value: paramToVal(params.refund),
+    onChange: toggleRefunded
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "true",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default.a, null),
+    label: "Refunded"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "false",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default.a, null),
+    label: "Not Refunded"
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    value: "both",
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Radio__WEBPACK_IMPORTED_MODULE_9___default.a, null),
+    label: "Both"
+  })))), 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 Start Due"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    value: Object(_utils_timeToDate__WEBPACK_IMPORTED_MODULE_13__["toDatePicker"])(params.startDate),
+    name: "start-date-filter",
+    id: "start-date-filter",
+    type: "date",
+    onChange: onInputChange("startDate")
+  }))), 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 End Due"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_TextField__WEBPACK_IMPORTED_MODULE_7___default.a, {
+    value: Object(_utils_timeToDate__WEBPACK_IMPORTED_MODULE_13__["toDatePicker"])(params.endDate),
+    name: "end-date-filter",
+    id: "end-date-filter",
+    type: "date",
+    onChange: onInputChange("endDate")
+  }))), 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"
+  }, "Transaction status"), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormGroup__WEBPACK_IMPORTED_MODULE_5___default.a, null, Object.values(transactionStatuses).map(status => react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_FormControlLabel__WEBPACK_IMPORTED_MODULE_2___default.a, {
+    key: status.value,
+    control: react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Checkbox__WEBPACK_IMPORTED_MODULE_6___default.a, {
+      checked: params.transactionStatus.includes(status.value),
+      onChange: onCheckboxChange("transactionStatus"),
+      value: status.value
+    }),
+    label: status.label
+  }))))));
 };
 
-/* harmony default export */ __webpack_exports__["default"] = (Object(react_router_dom__WEBPACK_IMPORTED_MODULE_3__["withRouter"])(Object(react_redux__WEBPACK_IMPORTED_MODULE_2__["connect"])(mapStateToProps, mapDispatchToProps)(TransactionsList)));
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_FilterButton__WEBPACK_IMPORTED_MODULE_12__["withFilterButton"])(TransactionFilters));
 
 /***/ }),
 
-/***/ "./src/ui/transactions/UpdateTransactionContainer.tsx":
-/*!************************************************************!*\
-  !*** ./src/ui/transactions/UpdateTransactionContainer.tsx ***!
-  \************************************************************/
+/***/ "./src/ui/transactions/TransactionsList.tsx":
+/*!**************************************************!*\
+  !*** ./src/ui/transactions/TransactionsList.tsx ***!
+  \**************************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -202743,298 +203394,191 @@ const mapDispatchToProps = (dispatch, ownProps) => {
 __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 react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js");
-/* harmony import */ var ui_transactions_actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ui/transactions/actions */ "./src/ui/transactions/actions.ts");
-/* harmony import */ var app_constants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! app/constants */ "./src/app/constants.ts");
+/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! moment */ "./node_modules/moment/moment.js");
+/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/esm/react-router-dom.js");
+/* 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 ui_common_table_constants__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ui/common/table/constants */ "./src/ui/common/table/constants.ts");
+/* harmony import */ var ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ui/utils/timeToDate */ "./src/ui/utils/timeToDate.ts");
+/* harmony import */ var ui_transactions_RefundTransactionModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ui/transactions/RefundTransactionModal */ "./src/ui/transactions/RefundTransactionModal.tsx");
+/* harmony import */ var ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ui/utils/numberAsCurrency */ "./src/ui/utils/numberAsCurrency.ts");
+/* harmony import */ var ui_transactions_utils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ui/transactions/utils */ "./src/ui/transactions/utils.tsx");
+/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_9__ = __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_9___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var _reducer_hooks__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../reducer/hooks */ "./src/ui/reducer/hooks.ts");
+/* harmony import */ var _common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../common/Filters/QueryContext */ "./src/ui/common/Filters/QueryContext.tsx");
+/* harmony import */ var _hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../hooks/useReadTransaction */ "./src/ui/hooks/useReadTransaction.ts");
+/* harmony import */ var _common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../common/table/StatefulTable */ "./src/ui/common/table/StatefulTable.tsx");
+/* harmony import */ var _utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../utils/extractTotalItems */ "./src/ui/utils/extractTotalItems.ts");
+/* harmony import */ var _TransactionsFilter__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./TransactionsFilter */ "./src/ui/transactions/TransactionsFilter.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 _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 
 
 
-class UpdateTransaction extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
-  constructor(...args) {
-    super(...args);
 
-    _defineProperty(this, "formRef", void 0);
 
-    _defineProperty(this, "setFormRef", ref => this.formRef = ref);
 
-    _defineProperty(this, "submitTransactionForm", async form => {
-      await this.props.dispatchTransaction();
 
-      if (!this.props.error) {
-        return true;
-      }
-    });
-  }
 
-  componentDidUpdate(prevProps) {
-    const {
-      isRequesting: wasRequesting
-    } = prevProps;
-    const {
-      isOpen,
-      isRequesting,
-      closeHandler,
-      error
-    } = this.props;
 
-    if (isOpen && wasRequesting && !isRequesting && !error) {
-      closeHandler();
-    }
-  }
 
-  render() {
-    const {
-      render
-    } = this.props;
 
-    const renderPayload = _objectSpread({}, this.props, {
-      submit: this.submitTransactionForm,
-      setRef: this.setFormRef
-    });
 
-    return render(renderPayload);
-  }
 
-}
 
-const mapStateToProps = (state, ownProps) => {
-  let stateProps = {};
-  const {
-    operation
-  } = ownProps;
 
-  switch (operation) {
-    case app_constants__WEBPACK_IMPORTED_MODULE_3__["CrudOperation"].Delete:
-      stateProps = state.transactions.delete;
-      break;
-  }
 
-  const {
-    isRequesting,
-    error
-  } = stateProps;
-  return {
-    error,
-    isRequesting
-  };
-};
-
-const mapDispatchToProps = (dispatch, ownProps) => {
-  const {
-    transaction,
-    operation,
-    isAdmin
-  } = ownProps;
-  return {
-    dispatchTransaction: () => {
-      let action;
 
-      switch (operation) {
-        case app_constants__WEBPACK_IMPORTED_MODULE_3__["CrudOperation"].Delete:
-          action = Object(ui_transactions_actions__WEBPACK_IMPORTED_MODULE_2__["refundTransactionAction"])(transaction.id, isAdmin);
-          break;
-      }
+const getFields = includeMember => [{
+  id: "createdAt",
+  label: "Date",
+  cell: row => Object(ui_utils_timeToDate__WEBPACK_IMPORTED_MODULE_5__["timeToDate"])(row.createdAt),
+  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_4__["SortDirection"].Desc
+}, {
+  id: "amount",
+  label: "Amount",
+  cell: row => {
+    const amount = Number(row.amount);
+    const discount = Number(row.discountAmount);
+    let total = amount;
 
-      return dispatch(action);
+    if (discount) {
+      total -= discount;
     }
-  };
-};
-
-/* harmony default export */ __webpack_exports__["default"] = (Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])(mapStateToProps, mapDispatchToProps)(UpdateTransaction));
-
-/***/ }),
-
-/***/ "./src/ui/transactions/actions.ts":
-/*!****************************************!*\
-  !*** ./src/ui/transactions/actions.ts ***!
-  \****************************************/
-/*! exports provided: readTransactionsAction, refundTransactionAction, transactionsReducer */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "readTransactionsAction", function() { return readTransactionsAction; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "refundTransactionAction", function() { return refundTransactionAction; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "transactionsReducer", function() { return transactionsReducer; });
-/* harmony import */ var ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ui/transactions/constants */ "./src/ui/transactions/constants.ts");
-/* harmony import */ var makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__ = __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_1___default = /*#__PURE__*/__webpack_require__.n(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__);
-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 _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; }
+    const totalAsText = Object(ui_utils_numberAsCurrency__WEBPACK_IMPORTED_MODULE_7__["numberAsCurrency"])(total);
 
+    if (row.refundedTransactionId) {
+      return `(${totalAsText})`;
+    }
 
+    return totalAsText;
+  },
+  defaultSortDirection: ui_common_table_constants__WEBPACK_IMPORTED_MODULE_4__["SortDirection"].Desc
+}, {
+  id: "description",
+  label: "Description",
+  cell: row => {
+    let description = "";
 
-const readTransactionsAction = (isUserAdmin, queryParams) => async dispatch => {
-  dispatch({
-    type: ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartReadRequest
-  });
-  const func = isUserAdmin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminListTransaction"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["listTransactions"];
-  const result = await func(queryParams);
+    if (row.refundedTransactionId) {
+      description += "Refund";
+    } else if (row.subscriptionId) {
+      description += "Subscription Payment";
+    } else {
+      description += "Standard Payment";
+    }
 
-  if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["isApiErrorResponse"])(result)) {
-    dispatch({
-      type: ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].GetTransactionsFailure,
-      error: result.error.message
-    });
-  } else {
-    const {
-      response,
-      data
-    } = result;
-    const totalItems = response.headers.get("total-items");
-    dispatch({
-      type: ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].GetTransactionsSuccess,
-      data: {
-        transactions: data,
-        totalItems: Number(totalItems)
-      }
-    });
-  }
-};
-const refundTransactionAction = (transactionId, admin) => async dispatch => {
-  dispatch({
-    type: ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartDeleteRequest
-  });
-  const func = admin ? makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["adminDeleteTransaction"] : makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["deleteTransaction"];
-  const result = await func(transactionId);
+    if (row.invoice) {
+      description += ` for ${row.invoice.name}`;
+    }
 
-  if (Object(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_1__["isApiErrorResponse"])(result)) {
-    dispatch({
-      type: ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].DeleteTransactionFailure,
-      error: result.error.message
-    });
-    return false;
-  } else {
-    dispatch({
-      type: ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].DeleteTransactionSuccess
-    });
-    return true;
+    return description;
   }
-};
-const defaultState = {
-  entities: {},
-  read: {
-    isRequesting: false,
-    error: "",
-    totalItems: 0
-  },
-  delete: {
-    isRequesting: false,
-    error: ""
-  }
-};
-const transactionsReducer = (state = defaultState, action) => {
-  switch (action.type) {
-    case ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartReadRequest:
-      return _objectSpread({}, state, {
-        read: _objectSpread({}, state.read, {
-          isRequesting: true
-        })
-      });
+}, ...(includeMember ? [] : [{
+  id: "member",
+  label: "Member",
+  cell: row => {
+    if (row.memberId) {
+      return react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router_dom__WEBPACK_IMPORTED_MODULE_2__["Link"], {
+        to: `/members/${row.memberId}`
+      }, row.memberName);
+    }
 
-    case ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].GetTransactionsSuccess:
-      const {
-        data: {
-          transactions,
-          totalItems
-        }
-      } = action;
-      const newTransactions = {};
-      transactions.forEach(transaction => {
-        newTransactions[transaction.id] = transaction;
-      });
-      return _objectSpread({}, state, {
-        entities: newTransactions,
-        read: _objectSpread({}, state.read, {
-          totalItems,
-          isRequesting: false,
-          error: ""
-        })
-      });
+    if (row.customerDetails) {
+      return `${row.customerDetails.first_name} ${row.customerDetails.last_name}`;
+    }
 
-    case ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].GetTransactionsFailure:
-      const {
-        error
-      } = action;
-      return _objectSpread({}, state, {
-        read: _objectSpread({}, state.read, {
-          isRequesting: false,
-          error
-        })
-      });
+    return "Unknown";
+  },
+  width: 200
+}]), {
+  id: "status",
+  label: "Status",
+  cell: ui_transactions_utils__WEBPACK_IMPORTED_MODULE_8__["renderTransactionStatus"]
+}];
 
-    case ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].StartDeleteRequest:
-      return _objectSpread({}, state, {
-        delete: _objectSpread({}, state.delete, {
-          isRequesting: true
-        })
-      });
+const rowId = sub => sub.id;
 
-    case ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].DeleteTransactionSuccess:
-      const refundedTransaction = action.data;
-      return _objectSpread({}, state, {
-        entities: _objectSpread({}, state.entities, {}, refundedTransaction && {
-          [refundedTransaction.id]: refundedTransaction
-        }),
-        delete: _objectSpread({}, state.delete, {
-          isRequesting: false,
-          error: ""
-        })
-      });
+const TransactionsTable = ({
+  member
+}) => {
+  const [selectedId, setSelectedId] = react__WEBPACK_IMPORTED_MODULE_0__["useState"]();
+  const {
+    currentUser: {
+      isAdmin
+    }
+  } = Object(_reducer_hooks__WEBPACK_IMPORTED_MODULE_10__["useAuthState"])();
 
-    case ui_transactions_constants__WEBPACK_IMPORTED_MODULE_0__["Action"].DeleteTransactionFailure:
-      const deleteError = action.error;
-      return _objectSpread({}, state, {
-        delete: _objectSpread({}, state.delete, {
-          isRequesting: false,
-          error: deleteError
-        })
-      });
+  const _useQueryContext = Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__["useQueryContext"])({
+    search: undefined,
+    startDate: new Date(moment__WEBPACK_IMPORTED_MODULE_1__().subtract(1, "day").valueOf()),
+    endDate: new Date(),
+    type: undefined,
+    refund: undefined,
+    transactionStatus: []
+  }),
+        {
+    params: {
+      pageNum,
+      order,
+      orderBy
+    },
+    changePage
+  } = _useQueryContext,
+        restParams = _objectWithoutProperties(_useQueryContext.params, ["pageNum", "order", "orderBy"]);
 
-    default:
-      return state;
-  }
+  const adminResponse = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_9__["adminListTransaction"], _objectSpread({}, restParams), !isAdmin);
+  const baseResponse = Object(_hooks_useReadTransaction__WEBPACK_IMPORTED_MODULE_12__["default"])(makerspace_ts_api_client__WEBPACK_IMPORTED_MODULE_9__["listTransactions"], _objectSpread({}, restParams), isAdmin);
+  const {
+    isRequesting,
+    data: transactions = [],
+    response,
+    refresh,
+    error
+  } = isAdmin ? adminResponse : baseResponse;
+  const onCancel = react__WEBPACK_IMPORTED_MODULE_0__["useCallback"](() => {
+    refresh();
+    changePage(0);
+  }, [refresh, changePage]);
+  const selectedTransaction = transactions.find(transaction => transaction.id === selectedId);
+  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,
+    xs: 12
+  }, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_material_ui_core_Grid__WEBPACK_IMPORTED_MODULE_3___default.a, null, react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ui_transactions_RefundTransactionModal__WEBPACK_IMPORTED_MODULE_6__["default"], {
+    transaction: selectedTransaction,
+    onSuccess: onCancel
+  }), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_TransactionsFilter__WEBPACK_IMPORTED_MODULE_15__["default"], {
+    onChange: refresh
+  })), react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_common_table_StatefulTable__WEBPACK_IMPORTED_MODULE_13__["default"], {
+    id: "transactions-table",
+    title: member ? "Payment History" : "Transactions",
+    loading: isRequesting,
+    data: Object.values(transactions),
+    error: error,
+    totalItems: Object(_utils_extractTotalItems__WEBPACK_IMPORTED_MODULE_14__["default"])(response),
+    selectedIds: selectedId,
+    setSelectedIds: setSelectedId,
+    columns: getFields(!!member),
+    rowId: rowId
+  })));
 };
 
-/***/ }),
-
-/***/ "./src/ui/transactions/constants.ts":
-/*!******************************************!*\
-  !*** ./src/ui/transactions/constants.ts ***!
-  \******************************************/
-/*! exports provided: Action */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Action", function() { return Action; });
-let Action;
-
-(function (Action) {
-  Action["StartReadRequest"] = "TRANSACTIONS/START_READ_REQUEST";
-  Action["GetTransactionsSuccess"] = "TRANSACTIONS/GET_TRANSACTIONS_SUCCESS";
-  Action["GetTransactionsFailure"] = "TRANSACTIONS/GET_TRANSACTIONS_FAILURE";
-  Action["StartCreateRequest"] = "TRANSACTIONS/START_CREATE_REQUEST";
-  Action["CreateTransactionSuccess"] = "TRANSACTIONS/CREATE_TRANSACTION_SUCCESS";
-  Action["CreateTransactionFailure"] = "TRANSACTIONS/CREATE_TRANSACTION_FAILURE";
-  Action["StartUpdateRequest"] = "TRANSACTION/START_UPDATE_REQUEST";
-  Action["UpdateTransactionSuccess"] = "TRANSACTION/UPDATE_TRANSACTION_SUCCESS";
-  Action["UpdateTransactionFailure"] = "TRANSACTION/UPDATE_TRANSACTION_FAILURE";
-  Action["StartDeleteRequest"] = "TRANSACTION/START_DELETE_REQUEST";
-  Action["DeleteTransactionSuccess"] = "TRANSACTION/DELETE_TRANSACTION_SUCCESS";
-  Action["DeleteTransactionFailure"] = "TRANSACTION/DELETE_TRANSACTION_FAILURE";
-})(Action || (Action = {}));
+/* harmony default export */ __webpack_exports__["default"] = (Object(_common_Filters_QueryContext__WEBPACK_IMPORTED_MODULE_11__["withQueryContext"])(TransactionsTable));
 
 /***/ }),