Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions react/src/dashboard/props/models/Fund.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,5 @@ export default interface Fund {
fund_request_physical_card_enable?: boolean;
fund_request_physical_card_type_id?: number;
fund_physical_card_types?: Array<InlineFundPhysicalCardType>;
hide_voucher_amount?: boolean;
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ export default function SelectControlOptionsVouchers<T>({
</div>
</div>
<div className="flex flex-vertical text-right">
<div className="voucher-value">{selectedVoucher?.amount_locale}</div>
{!selectedVoucher?.fund?.hide_voucher_amount && (
<div className="voucher-value" data-dusk="voucherAmount">
{selectedVoucher?.amount_locale}
</div>
)}
<div className="voucher-date">{selectedVoucher?.expire_at_locale}</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ export default function SelectControlOptionItemVoucher<T>({
</div>
</div>
<div className="flex flex-vertical text-right">
<div className="voucher-value">{voucher?.amount_locale}</div>
{!voucher?.fund?.hide_voucher_amount && (
<div className="voucher-value" data-dusk="voucherAmount">
{voucher?.amount_locale}
</div>
)}
<div className="voucher-date">{voucher?.expire_at_locale}</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ export default function ModalProductReserve({
onKeyDown={clickOnKeyEnter}
aria-label={translate('modal_reserve_product.close')}
role="button"
data-dusk="closeModalButton"
/>

<div className="modal-header">
Expand Down Expand Up @@ -599,7 +600,11 @@ export default function ModalProductReserve({

<div className="voucher-amounts">
<div className="voucher-amount">
<div className="voucher-value">{voucher?.amount_locale}</div>
{!voucher?.fund?.hide_voucher_amount && (
<div className="voucher-value" data-dusk="voucherAmount">
{voucher?.amount_locale}
</div>
)}
<div className="voucher-value-date">
{voucher?.expire_at_locale}
</div>
Expand Down Expand Up @@ -1475,7 +1480,9 @@ export default function ModalProductReserve({
</div>
</div>
<div className="voucher-amounts">
<div className="voucher-value">{voucher.amount_locale}</div>
{!voucher?.fund?.hide_voucher_amount && (
<div className="voucher-value">{voucher?.amount_locale}</div>
)}
<div className="voucher-value-date">{voucher.expire_at_locale}</div>
</div>
</div>
Expand All @@ -1489,12 +1496,14 @@ export default function ModalProductReserve({
</div>
<div className="payment-value">{product.price_locale}</div>
</div>
<div className="payment-amount">
<div className="payment-key">
{translate('modal_reserve_product.extra_payment.remaining_credit')}
{!voucher?.fund?.hide_voucher_amount && (
<div className="payment-amount">
<div className="payment-key">
{translate('modal_reserve_product.extra_payment.remaining_credit')}
</div>
<div className="payment-value">{voucher.amount_locale}</div>
</div>
<div className="payment-value">{voucher.amount_locale}</div>
</div>
)}
<div className="divider" />
<div className="payment-amount">
<div className="payment-key">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,10 @@ export default function VouchersShow() {
date: voucherCard?.expire_at_locale,
})}
</div>
{!voucher?.product && (
<div className="voucher-details-info-amount">
{!voucher?.product && !voucher?.fund?.hide_voucher_amount && (
<div
className="voucher-details-info-amount"
data-dusk="voucherAmount">
{voucherCard?.amount_locale}
</div>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function VoucherDetailsInternalCard({
<div className="card-subtitle">{voucherCard.product.organization.name}</div>
)}

{voucherCard.type === 'regular' && (
{voucherCard.type === 'regular' && !voucherCard.fund?.hide_voucher_amount && (
<div>
<div className="card-value euro">{voucherCard.amount_locale}</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,11 @@ export default function VoucherCard({
<span>{type === 'voucher' ? voucherCard.subtitle : voucherCard.physical_card?.code_locale}</span>
</div>

{voucherCard.type === 'regular' && <div className="voucher-value">{voucherCard.amount_locale}</div>}
{voucherCard.type === 'regular' && !voucherCard.fund?.hide_voucher_amount && (
<div className="voucher-value" data-dusk="voucherAmount">
{voucherCard.amount_locale}
</div>
)}

{!voucher.deactivated && (
<div className="voucher-status-label">
Expand Down
Loading