lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing translation

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-01 10:58:06 +01:00
parent c80151717e
commit a68721c5b4
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/don/admin/donation.php
View File

@ -322,24 +322,26 @@ print '<td width="60" class="center">'.$langs->trans("Value")."</td>\n";
print '<td></td>'; print '<td></td>';
print "</tr>\n"; print "</tr>\n";
if (!empty($conf->societe->enabled)) {
print '<tr class="oddeven">';
print '<td colspan="2">';
print $langs->trans("DonationUseThirdparties");
print '</td>';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('DONATION_USE_THIRDPARTIES');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
print $form->selectarray("DONATION_USE_THIRDPARTIES", $arrval, $conf->global->DONATION_USE_THIRDPARTIES);
}
print "</td>\n";
print "</tr>\n";
}
print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.newToken().'" />'; print '<input type="hidden" name="token" value="'.newToken().'" />';
print '<input type="hidden" name="action" value="set_DONATION_ACCOUNTINGACCOUNT" />'; print '<input type="hidden" name="action" value="set_DONATION_ACCOUNTINGACCOUNT" />';
print '<tr class="oddeven">';
print '<td colspan="2">';
print $form->textwithpicto($langs->trans("DonationUserThirdparties"), $langs->trans("DonationUserThirdpartiesDesc"));
print '</td>';
print '<td class="center">';
if ($conf->use_javascript_ajax) {
print ajax_constantonoff('DONATION_USE_THIRDPARTIES');
} else {
$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
print $form->selectarray("DONATION_USE_THIRDPARTIES", $arrval, $conf->global->DONATION_USE_THIRDPARTIES);
}
print "</td>\n";
print "</tr>\n";
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'; print '<td>';
$label = $langs->trans("AccountAccounting"); $label = $langs->trans("AccountAccounting");

1
htdocs/langs/en_US/donations.lang
View File

@ -32,3 +32,4 @@ DONATION_ART238=Show article 238 from CGI if you are concerned
DONATION_ART885=Show article 885 from CGI if you are concerned DONATION_ART885=Show article 885 from CGI if you are concerned
DonationPayment=Donation payment DonationPayment=Donation payment
DonationValidated=Donation %s validated DonationValidated=Donation %s validated
DonationUseThirdparties=Ask a thirdparty on each donation record

10
htdocs/public/payment/newpayment.php
View File

@ -1457,7 +1457,10 @@ if ($source == 'membersubscription')
} }
} else { } else {
$valtoshow = $amount; $valtoshow = $amount;
if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow); if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
$valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
$amount = $valtoshow;
}
print '<b>'.price($valtoshow).'</b>'; print '<b>'.price($valtoshow).'</b>';
print '<input type="hidden" name="amount" value="'.$valtoshow.'">'; print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
print '<input type="hidden" name="newamount" value="'.$valtoshow.'">'; print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
@ -1596,7 +1599,10 @@ if ($source == 'donation')
print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">'; print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
} else { } else {
$valtoshow = $amount; $valtoshow = $amount;
if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) $valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow); if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
$valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
$amount = $valtoshow;
}
print '<b>'.price($valtoshow).'</b>'; print '<b>'.price($valtoshow).'</b>';
print '<input type="hidden" name="amount" value="'.$valtoshow.'">'; print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
print '<input type="hidden" name="newamount" value="'.$valtoshow.'">'; print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';