Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
fb0d3cd
add children age group by gender for prefill
ateamcms Jan 29, 2026
1d5a717
prevent overwriting product list while quick change query on webshop
ateamcms Jan 30, 2026
9830543
add fund request record groups
ateamcms Feb 3, 2026
1ec39f3
add dusk attribute to toggle collapse button for fund request record
ateamcms Feb 3, 2026
895ac26
fixed an issue where canceling a product search request would not sto…
dev-rminds Feb 4, 2026
22bfa5b
move postcode to throttled values in product filter
ateamcms Feb 4, 2026
672c8f6
Merge branch 'develop' into fixes.prevent-overwriting-product-list-wh…
dev-rminds Feb 4, 2026
7f2c312
update application flow without email
dev-rminds Feb 5, 2026
29e1b7e
Merge branch 'develop' into feature.add-children-age-group-by-gender-…
RobinMeles Feb 5, 2026
94de47d
compare emails not case sensitive in voucher batch upload
ateamcms Feb 9, 2026
9cc40a2
fund-request with optional email tests
dev-rminds Feb 10, 2026
7554b76
exclude vouchers with empty emails from duplicate checks to prevent f…
dev-rminds Feb 10, 2026
9df411a
Bump webpack in the npm_and_yarn group across 1 directory
dependabot[bot] Feb 10, 2026
f34cbc1
Merge pull request #962 from teamforus/update-application-flow-withou…
dev-rminds Feb 10, 2026
c784b09
Merge remote-tracking branch 'origin/develop' into feature.add-fund-r…
ateamcms Feb 10, 2026
53a2170
fix merge conflicts
ateamcms Feb 10, 2026
4a01247
remove unused env flags
dev-rminds Feb 10, 2026
4f7b0c1
remove old unused flags from the back
dev-rminds Feb 10, 2026
3463a72
fix implementation.show_product_map usage
dev-rminds Feb 10, 2026
cbbefe1
Merge pull request #963 from teamforus/remove-unused-env-flags
RobinMeles Feb 10, 2026
17b7bb3
Merge pull request #958 from teamforus/dependabot/npm_and_yarn/npm_an…
RobinMeles Feb 10, 2026
f883cfa
Bump axios in the npm_and_yarn group across 1 directory
dependabot[bot] Feb 10, 2026
e9be91a
Merge branch 'develop' into feature.add-fund-request-record-groups
dev-rminds Feb 10, 2026
72db90f
fund request groups - refactoring, cleanup and minor fixes
dev-rminds Feb 11, 2026
340c4fc
Merge pull request #964 from teamforus/dependabot/npm_and_yarn/npm_an…
RobinMeles Feb 11, 2026
b7b1258
Merge branch 'develop' into feature.add-children-age-group-by-gender-…
RobinMeles Feb 11, 2026
b190bdb
Merge branch 'develop' into update-application-flow-without-email
RobinMeles Feb 11, 2026
6a28a77
Merge pull request #957 from teamforus/update-application-flow-withou…
RobinMeles Feb 11, 2026
6513540
Merge branch 'develop' into fixes.prevent-overwriting-product-list-wh…
RobinMeles Feb 11, 2026
d87ffb3
Merge pull request #948 from teamforus/fixes.prevent-overwriting-prod…
RobinMeles Feb 11, 2026
0add57e
Merge branch 'develop' into feature.compare-emails-not-case-sensitive…
RobinMeles Feb 11, 2026
d5adb08
Merge pull request #961 from teamforus/feature.compare-emails-not-cas…
RobinMeles Feb 11, 2026
25f5396
Merge branch 'develop' into feature.add-fund-request-record-groups
RobinMeles Feb 11, 2026
8ff05e7
Merge branch 'develop' into feature.add-children-age-group-by-gender-…
ateamcms Feb 11, 2026
39783f9
missing translations
RobinMeles Feb 11, 2026
6ca5038
Merge pull request #956 from teamforus/feature.add-fund-request-recor…
RobinMeles Feb 11, 2026
35c35cb
Merge branch 'develop' into feature.add-children-age-group-by-gender-…
RobinMeles Feb 12, 2026
2f515ab
Merge pull request #946 from teamforus/feature.add-children-age-group…
RobinMeles Feb 12, 2026
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
516 changes: 244 additions & 272 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"ts-loader": "^9.2.6",
"typescript": "5.5",
"url-loader": "^4.1.1",
"webpack": "^5.94.0",
"webpack": "^5.105.0",
"webpack-cli": "^6.0.1",
"webpack-dev-server": "^5.1.0"
},
Expand Down
14 changes: 8 additions & 6 deletions react/assets/forus-platform/scss/_common/components/tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@
& > a {
font: inherit;
}

&.cell-chevron,
&.cell-chevron {
width: 1px;
padding: 10px 0 10px 15px;
}
}

th {
Expand Down Expand Up @@ -540,6 +534,14 @@
@include ellipsis();
display: flex;
}

&.td-collapsable-lg {
min-height: 30px;

.collapsable-content {
font: 500 14px/20px var(--base-font);
}
}
}

&:first-child {
Expand Down
29 changes: 23 additions & 6 deletions react/assets/forus-webshop/scss/includes/blocks/block-sign_up.scss
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@
.sign_up-pane-link {
font: 600 13px/18px var(--base-font);
color: var(--sign_up_accent_color);
text-decoration: none;
}

&.sign_up-pane-text-sm {
Expand Down Expand Up @@ -311,10 +310,9 @@
}

.sign_up-pane-link {
font: 500 14px/27px var(--base-font);
margin: 0 0 15px;
font: 500 14px/20px var(--base-font);
color: var(--sign_up_accent_color);
transition: color .4s;
transition: color 0.4s;
display: inline;
text-decoration: underline;
cursor: pointer;
Expand All @@ -323,6 +321,26 @@
text-decoration: none;
color: var(--tc);
}

&.sign_up-pane-link-button {
display: inline-flex;
align-items: center;
background: none;
border: 0;
padding: 0;

.mdi {
line-height: 20px;
height: 20px;
font-size: 20px;
}

&[disabled] {
pointer-events: none;
color: #646464 !important;
text-decoration: none;
}
}
}

.form {
Expand Down Expand Up @@ -1101,8 +1119,7 @@
padding: 20px;

.sign_up-pane-heading,
.sign_up-pane-text,
.sign_up-pane-link {
.sign_up-pane-text {
margin: 0 0 15px;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ table.table {
& > a {
font: inherit;
}

&.cell-chevron,
&.cell-chevron {
width: 1px;
padding: 10px 10px;
padding-left: 15px;
padding-right: 0;
}
}

th {
Expand Down
7 changes: 5 additions & 2 deletions react/src/dashboard/components/modals/ModalVouchersUpload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -442,13 +442,16 @@ export default function ModalVouchersUpload({
{ icon: 'timer-sand' },
);

const emails = data.map((voucher) => voucher.identity_email);
const emails = data
.map((voucher) => voucher.identity_email?.toLowerCase())
.filter((email) => Boolean(email));

const bsnList = [
...data.map((voucher) => voucher.relation_bsn),
...data.map((voucher) => voucher.identity_bsn),
];

const existingEmails = list.filter((row) => emails.includes(row.email));
const existingEmails = list.filter((row) => emails.includes(row.email?.toLowerCase()));
const existingBsn = list.filter((csvRow) => bsnList.includes(csvRow.bsn));

if (existingEmails.length === 0 && existingBsn.length === 0) {
Expand Down
Loading
Loading