Skip to content

r < d v163 #888

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 25 commits into from
Dec 17, 2025
Merged

r < d v163 #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2785a0a
unsubscribe provider from fund immediately
ateamcms Nov 14, 2025
a4ab1a3
prevalidation voucher top-up feature
dev-rminds Nov 21, 2025
81b9e13
remove console.log and fix updated prevalidations count in the notifi…
dev-rminds Nov 21, 2025
438ba31
add notes to product reservations
ateamcms Nov 21, 2025
eb21483
feat: support file attachments on reservation custom fields
dev-rminds Nov 26, 2025
2c31e21
update translations
dev-rminds Nov 26, 2025
609c63a
Merge branch 'feature.custom-reservation-fields-file-type' into featu…
dev-rminds Nov 26, 2025
fc10e7f
Merge pull request #870 from teamforus/feature.add-notes-to-product-r…
dev-rminds Nov 26, 2025
57bd55f
add reservations custom fields for provider
ateamcms Nov 29, 2025
595498a
reservation custom fields for provider refactoring and ability to rem…
dev-rminds Dec 5, 2025
5162cd5
Merge pull request #872 from teamforus/feature.reservations-custom-fi…
dev-rminds Dec 5, 2025
471db81
Merge branch 'develop' into feature.unsubscribe-provider-from-fund-im…
dev-rminds Dec 8, 2025
4f8e460
provider immediate unsubscription minor refactoring
dev-rminds Dec 8, 2025
b6dfc33
update provider re-subscribe icon
dev-rminds Dec 8, 2025
3edf322
webshop css header and footer minor fixes
ateamcms Dec 9, 2025
caffc70
Merge branch 'develop' into feature.prevalidations-update
RobinMeles Dec 15, 2025
796460e
prevalidations translations
RobinMeles Dec 15, 2025
e938cc8
Merge pull request #869 from teamforus/feature.prevalidations-update
RobinMeles Dec 15, 2025
7f58042
Merge branch 'develop' into feature.unsubscribe-provider-from-fund-im…
RobinMeles Dec 15, 2025
b596d07
Merge pull request #863 from teamforus/feature.unsubscribe-provider-f…
RobinMeles Dec 15, 2025
d057028
Merge branch 'develop' into feature.custom-reservation-fields-file-type
RobinMeles Dec 15, 2025
4f38534
translations for file upload in reservations
RobinMeles Dec 16, 2025
8a337a2
Merge pull request #871 from teamforus/feature.custom-reservation-fie…
RobinMeles Dec 16, 2025
a00f3f8
Merge branch 'develop' into feature.webshop-css-header-and-footer-min…
RobinMeles Dec 16, 2025
7fad5d6
Merge pull request #880 from teamforus/feature.webshop-css-header-and…
RobinMeles Dec 16, 2025
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ deepl.env.mjs
deepl.env.*.mjs
!deepl.env.example.mjs

forus-backend

# Compiled source #
###################
*.com
Expand Down
48 changes: 33 additions & 15 deletions react/assets/forus-platform/scss/_common/blocks/block-attachments-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,82 @@
.block.block-attachments-list {
display: flex;
flex-direction: column;
width: 100%;
gap: 10px;

.attachment-item {
background: #fff;
display: flex;
border: 1px solid #d4d9dd;
flex-direction: row;
padding: 5px 15px 5px 10px;
padding: 5px 10px;
border-radius: var(--border-radius);
gap: 10px;
align-items: center;
min-height: 32px;

.attachment-icon {
display: flex;
flex-direction: row;
gap: 10px;
align-items: center;

.mdi {
font-size: 18px;
line-height: 25px;
line-height: 18px;
color: #004195;
}

.attachment-size {
color: #646f79;
font: 600 13px/24px var(--base-font);
font: 600 13px/18px var(--base-font);
flex: 1 0 60px;
}
}

.attachment-name {
color: #262626;
font: 600 13px/24px var(--base-font);
font: 600 13px/18px var(--base-font);
flex: 1 1 auto;
min-width: 0;
word-wrap: break-word;
white-space: normal;
}

.attachment-date {
font: 400 13px/24px var(--base-font);
font: 400 13px/18px var(--base-font);
}

.attachment-preview {
.attachment-actions {
display: flex;
flex-direction: row;
color: #262626;
font: 500 12px/24px var(--base-font);
gap: 5px;
align-items: center;
gap: 6px;
}

.attachment-action {
display: inline-flex;
align-items: center;
justify-content: center;
width: 20px;
height: 20px;
border: none;
background: transparent;
padding: 0;
cursor: pointer;
color: #646f79;
transition: color 0.15s ease-in-out;

.mdi {
font-size: 16px;
line-height: 24px;
height: 24px;
color: #555;
line-height: 18px;
height: 18px;
}

&:hover {
color: var(--color-primary);
}
&:hover,
&:focus-visible {
color: var(--color-primary);
outline: none;
}
}
}
Expand Down
211 changes: 211 additions & 0 deletions react/assets/forus-platform/scss/_common/blocks/block-file-uploader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
.block.block-file-uploader {
display: flex;
flex-direction: column;
gap: 10px;

.uploader-droparea {
display: flex;
flex-direction: column;
gap: 15px;
width: 100%;
background: #f8f8f8;
padding: 25px 30px;
text-align: center;
border: 1px dashed #e5e6ec;
border-radius: calc(var(--border-radius) / 2);
color: #515152;

.droparea-icon {
margin: 0 auto;
color: inherit;
display: flex;
justify-content: center;

.mdi {
width: 50px;
height: 50px;
font-size: 24px;
padding: 10px;
flex-direction: column;
justify-content: center;
border: 1px solid var(--color-primary);
color: var(--color-primary);
margin: 0 auto;
}
}

.droparea-title {
font: 500 16px/26px var(--base-font);
justify-content: center;
color: inherit;

strong {
font-weight: 700;
}

small {
font-size: 14px;
}

&.droparea-title-required {
strong {
&:after {
content: '*';
color: #ff5548;
font: inherit;
margin-left: 2px;
}
}
}
}

.droparea-button {
display: flex;
justify-content: center;
}

.droparea-size {
display: flex;
justify-content: center;
font: 600 13px/18px var(--base-font);
color: inherit;
}

.droparea-hidden-input {
display: none;
}

&.is-dragover {
background: white;
border-color: silver;
}

&:last-child {
margin-bottom: 0;
}
}

.uploader-files {
display: flex;
flex-direction: column;
gap: 10px;

.uploader-files-title {
display: flex;
font: 700 16px/24px var(--base-font);
flex-direction: row;
padding: 0 0 5px;
gap: 6px;

.uploader-files-title-count {
padding: 2px 6px;
background: #e5e5e5;
border-radius: var(--border-radius);
font: 600 14px/20px var(--base-font);
}
}
}

&.block-file-uploader-compact {
max-width: 100%;
display: flex;
flex-direction: column-reverse;
align-items: flex-start;

.droparea-icon,
.droparea-title,
.droparea-hidden-input {
display: none;
}

.uploader-droparea {
display: flex;
padding: 0;
background: none;
border: none;
flex-direction: row;
justify-content: flex-start;
align-items: center;

.droparea-max-limit {
color: #353535;
font-size: 11px;
font-weight: 400;
line-height: 11px;
font-family: var(--base-font), serif;

&::before {
content: '*';
color: #ed133c;
padding-right: 3px;
}
}
}

.uploader-files {
max-width: 100%;
}
}

&.block-file-uploader-inline {
max-width: 100%;
display: flex;

.droparea-icon,
.droparea-title,
.droparea-hidden-input {
display: none;
}

.uploader-droparea {
display: flex;
padding: 0;
background: none;
border: none;
flex-direction: row;
justify-content: flex-start;
align-items: center;

.droparea-max-limit {
color: #353535;
font-size: 11px;
font-weight: 400;
line-height: 11px;
font-family: var(--base-font), serif;

&::before {
content: '*';
color: #ed133c;
padding-right: 3px;
}
}
}

.uploader-files {
padding: 15px 20px;
border: 1px solid var(--border-color);
border-radius: var(--border-radius);
width: 100%;
flex-direction: column;
gap: 5px;
background-color: #fbfbfb;
}
}

.file-item-error {
font: 400 13px/20px var(--base-font);
}

@media (max-width: 991px) {
.uploader-droparea {
border: none;
background: none;
padding: 0 0;

.droparea-icon,
.droparea-title {
display: none;
}
}
}
}
67 changes: 1 addition & 66 deletions react/assets/forus-platform/scss/_common/dashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
@import 'blocks/block-attachments-list.scss';
@import 'blocks/block-request-clarification.scss';
@import 'blocks/block-product-media-uploader.scss';
@import 'blocks/block-file-uploader';

// Select controls
@import 'select-controls/select-control-funds';
Expand Down Expand Up @@ -2311,72 +2312,6 @@ body {
}
}

&.card-block-requests {
box-shadow: 0 2px 5px rgba(25, 39, 52, 0.11);
border-radius: var(--border-radius);
margin: 20px 0;
color: #646f79;
background-color: #fff;
border: 1px solid #d4d9dd;

.card-section {
padding: 10px 15px;
}

.card-heading {
flex: 1;
margin: 0;
align-self: center;
font: 600 13px/13px var(--base-font);
letter-spacing: -0.2px;
color: #404040;
cursor: pointer;
}

.button {
font: 600 12px/12px var(--base-font);
color: #134478;
}

.mdi {
color: #134478;
margin-right: 6px;
}

&.card-block-requests-danger {
color: #404040;
background-color: #fff5f0;
border: 1px solid #e63b3b;

.mdi {
color: #e63b3b;
}

.button {
.mdi {
margin-left: 3px;
color: #134478;
}
}
}

&.card-block-requests-warning {
background-color: #fcfaf6;
border: 1px solid #f8e39a;
color: #404040;

.mdi {
color: #ffb05a;
}

.button {
.mdi {
color: #ffb05a;
}
}
}
}

&.card-block-request-record {
.card-header {
.card-title {
Expand Down
Loading
Loading