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

Merge pull request #17496 from daraelmin/daraelmin-patch-4

Browse Source 
Fix amnt can be paid for member as membersubscription
This commit is contained in:
Laurent Destailleur 2021-05-06 16:47:41 +02:00 committed by GitHub
commit b7601cb662
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1880,7 +1880,7 @@ if ($action != 'dopayment') {
print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("DonationPaid").'</span>'; print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("DonationPaid").'</span>';
} else { } else {
// Membership can be paid and we still allow to make renewal // Membership can be paid and we still allow to make renewal
if ($source == 'membersubscription' && $object->datefin > dol_now()) { if (($source == 'member' || $source == 'membersubscription') && $object->datefin > dol_now()) {
$langs->load("members"); $langs->load("members");
print '<br><span class="amountpaymentcomplete size15x">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>'; print '<br><span class="amountpaymentcomplete size15x">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>'; print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';