diff --git a/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue b/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue index 4e63a1c02..71fd81598 100644 --- a/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue +++ b/services/frontend/src/components/common/modals/bulk/MembershipStatusDialog.vue @@ -3,13 +3,13 @@ import {computed, ref, watch} from "vue" import BulkDialogScaffold from "./BulkDialogScaffold.vue" import {useBulkPreview} from "@/composables/useBulkPreview" import {useSubmitFeedback} from "@/composables/formUtils" +import type {BulkActionResult, BulkMembershipPreview} from "@/domains/user" import { - endMemberships, - previewBulkEnd, - previewBulkStart, - startMemberships, -} from "@/services/api/blueshell/sdk.gen" -import type {BulkActionResult, BulkMembershipPreview} from "@/services/api" + endTheMemberships, + readMembershipEnd, + readMembershipStart, + startTheMemberships, +} from "@/domains/user" import {parseBulkRejection, type BulkRejection} from "@/utils/bulkRejection" import {bulkRowsFromPreview} from "@/utils/bulkPreviewRows" import type {BulkTarget} from "@/utils/bulkTarget" @@ -60,8 +60,8 @@ interface DialogConfig { dateSentence: string /** Past tense for the result line, e.g. "3 ended, 1 skipped". */ appliedVerb: string - previewApi: typeof previewBulkEnd | typeof previewBulkStart - submitApi: typeof endMemberships | typeof startMemberships + previewApi: typeof readMembershipEnd | typeof readMembershipStart + submitApi: typeof endTheMemberships | typeof startTheMemberships help: {title: string; body: string} } @@ -72,8 +72,8 @@ const configMap: Record = { icon: "mdi-account-remove", dateSentence: "Memberships end on", appliedVerb: "ended", - previewApi: previewBulkEnd, - submitApi: endMemberships, + previewApi: readMembershipEnd, + submitApi: endTheMemberships, help: { title: "End membership", body: @@ -90,8 +90,8 @@ const configMap: Record = { icon: "mdi-account-plus", dateSentence: "Memberships start on", appliedVerb: "started", - previewApi: previewBulkStart, - submitApi: startMemberships, + previewApi: readMembershipStart, + submitApi: startTheMemberships, help: { title: "Start membership", body: diff --git a/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue b/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue index 19421f132..92364cc50 100644 --- a/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue +++ b/services/frontend/src/components/common/modals/bulk/PaidStatusDialog.vue @@ -3,7 +3,7 @@ import {computed, ref, watch} from "vue" import BulkDialogScaffold from "./BulkDialogScaffold.vue" import {useBulkPreview} from "@/composables/useBulkPreview" import {useSubmitFeedback} from "@/composables/formUtils" -import {markPaid, markUnpaid} from "@/services/api/blueshell/sdk.gen" +import {recordPaid, recordUnpaid, type BulkContributionCall} from "@/domains/contribution" import {parseBulkRejection, type BulkRejection} from "@/utils/bulkRejection" import {computeMarkPaidRows, computeMarkUnpaidRows} from "@/utils/bulkCompute" import type {BulkTarget} from "@/utils/bulkTarget" @@ -46,7 +46,7 @@ interface DialogConfig { confirmLabel: string icon: string computeRows: (targets: BulkTarget[]) => ReturnType - submitApi: typeof markPaid | typeof markUnpaid + submitApi: BulkContributionCall help: {title: string; body: string} } @@ -56,7 +56,7 @@ const configMap: Record<"paid" | "unpaid", DialogConfig> = { confirmLabel: "Mark paid", icon: "mdi-cash-check", computeRows: (targets: BulkTarget[]) => computeMarkPaidRows(targets), - submitApi: markPaid, + submitApi: recordPaid, help: { title: "Mark as paid", body: @@ -71,7 +71,7 @@ const configMap: Record<"paid" | "unpaid", DialogConfig> = { confirmLabel: "Mark unpaid", icon: "mdi-cash-remove", computeRows: (targets: BulkTarget[]) => computeMarkUnpaidRows(targets), - submitApi: markUnpaid, + submitApi: recordUnpaid, help: { title: "Mark as unpaid", body: diff --git a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue index 39abafee0..5cd8c9459 100644 --- a/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue +++ b/services/frontend/src/components/common/modals/bulk/paymentEmail/PaymentEmailFeesStep.vue @@ -1,6 +1,6 @@