Skip to content

Fix vouchers has balance filter #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinMeles merged 1 commit into from
Mar 16, 2026
Merged

Fix vouchers has balance filter #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions ...ashboard/components/pages/implementation-notifications/ImplementationNotificationSend.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,7 @@ export default function ImplementationNotificationSend() {
hasPermission(activeOrganization, Permission.MANAGE_VOUCHERS) && (
<div
className="button button-primary button-sm"
data-dusk="showIdentitiesBtn"
onClick={() => setShowIdentities(!showIdentities)}>
<em className="mdi mdi-view-list icon-start" />
{showIdentities
Expand Down Expand Up @@ -523,6 +524,7 @@ export default function ImplementationNotificationSend() {
value={fund}
onChange={(value: Fund) => setFund(value)}
options={funds}
dusk="selectControlFunds"
/>
</div>

Expand All @@ -539,6 +541,7 @@ export default function ImplementationNotificationSend() {
identitiesFilterUpdate({ target: value });
}}
options={identityTargets}
dusk="selectControlIdentityTargets"
/>
</div>
)}
Expand All @@ -562,7 +565,7 @@ export default function ImplementationNotificationSend() {
</div>

{targetGroup == 'identities' && identities && (
<div>
<div data-dusk="tableIdentityContent">
{showIdentities && (
<div className="card-header">
<div className="flex flex-grow">
Expand All @@ -580,6 +583,7 @@ export default function ImplementationNotificationSend() {
value={identitiesFilterValues.q}
placeholder="Zoeken"
className="form-control"
data-dusk="tableIdentitySearch"
onChange={(e) => identitiesFilterUpdate({ q: e.target.value })}
/>
</div>
Expand Down Expand Up @@ -612,7 +616,7 @@ export default function ImplementationNotificationSend() {
filterUpdate: identitiesFilterUpdate,
}}>
{identities?.data?.map((identity) => (
<tr key={identity.id}>
<tr key={identity.id} data-dusk={`tableIdentityRow${identity.id}`}>
<td>{identity.id}</td>
<td>{identity.email}</td>
<td>{identity.count_vouchers}</td>
Expand All @@ -631,21 +635,23 @@ export default function ImplementationNotificationSend() {
<div className="keyvalue-item col col-lg-3">
<div className="keyvalue-key">Met tegoeden</div>
<div className="keyvalue-value">
<span>{identities.meta.counts.active}</span>
<span data-dusk="identityCountActive">{identities.meta.counts.active}</span>
<span className="icon mdi mdi-account-multiple-outline" />
</div>
</div>
<div className="keyvalue-item col col-lg-3">
<div className="keyvalue-key">Binnen de doelgroep</div>
<div className="keyvalue-value">
<span>{identities.meta.counts.selected}</span>
<span data-dusk="identityCountSelected">
{identities.meta.counts.selected}
</span>
<span className="icon mdi mdi-account-multiple-check-outline" />
</div>
</div>
<div className="keyvalue-item col col-lg-3">
<div className="keyvalue-key">Uitgesloten gebruikers</div>
<div className="keyvalue-value">
<span>
<span data-dusk="identityCountExcluded">
{identities.meta.counts.active -
identities.meta.counts.selected -
identities.meta.counts.without_email}
Expand All @@ -656,7 +662,9 @@ export default function ImplementationNotificationSend() {
<div className="keyvalue-item col col-lg-3">
<div className="keyvalue-key">Zonder e-mailadres</div>
<div className="keyvalue-value">
<span>{identities.meta.counts.without_email}</span>
<span data-dusk="identityCountWithoutEmail">
{identities.meta.counts.without_email}
</span>
<span className="icon mdi mdi-email-off-outline" />
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions ...c/dashboard/components/pages/implementation-notifications/ImplementationNotifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ export default function ImplementationNotifications() {
id: implementation.id,
organizationId: activeOrganization.id,
}}
dataDusk="notificationSendBtn"
className="button button-default">
<em className="mdi mdi-email-outline icon-start" />
Verstuur een aangepast bericht
Expand Down
2 changes: 2 additions & 0 deletions react/src/dashboard/layout/elements/aside/LayoutAsideSponsor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ export default function LayoutAsideSponsor({ organization }: { organization: Org
iconActive={<IconWebshopsActive />}
pinnedGroups={pinnedGroups}
setPinnedGroups={setPinnedGroups}
dusk={'asideMenuGroupWebsites'}
items={[
{
name: 'Content',
Expand Down Expand Up @@ -343,6 +344,7 @@ export default function LayoutAsideSponsor({ organization }: { organization: Org
show:
organization?.implementations?.length === 1 &&
hasPermission(organization, Permission.MANAGE_IMPLEMENTATION_NOTIFICATIONS),
dusk: 'implementationNotificationsPage',
},
]}
/>
Expand Down
Loading