Fixing style errors.

This commit is contained in:
stickler-ci 2022-06-29 14:38:43 +00:00
parent 3dcf7db198
commit f4c7c03dc1
2 changed files with 8 additions and 10 deletions

View File

@ -780,16 +780,14 @@ else { // Show the table of membership types
print '<td class="center"><span class="amount nowrap">'; print '<td class="center"><span class="amount nowrap">';
$displayedamount = max(intval($objp->amount), intval($conf->global->MEMBER_MIN_AMOUNT)); $displayedamount = max(intval($objp->amount), intval($conf->global->MEMBER_MIN_AMOUNT));
$caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $objp->caneditamount; $caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $objp->caneditamount;
if($objp->subscription) { if ($objp->subscription) {
print $displayedamount.' '.strtoupper($conf->currency); print $displayedamount.' '.strtoupper($conf->currency);
if ($caneditamount && $displayedamount>0) { if ($caneditamount && $displayedamount>0) {
print $form->textwithpicto('', $langs->transnoentities("CanEditAmountShortForValues"), 1, 'help', '', 0, 3); print $form->textwithpicto('', $langs->transnoentities("CanEditAmountShortForValues"), 1, 'help', '', 0, 3);
} } elseif ($caneditamount) {
elseif ($caneditamount) {
print $langs->transnoentities("CanEditAmountShort"); print $langs->transnoentities("CanEditAmountShort");
} }
} } else {
else {
print "–"; // No subscription required print "–"; // No subscription required
} }
print '</span></td>'; print '</span></td>';

View File

@ -1622,7 +1622,7 @@ if ($source == 'member' || $source == 'membersubscription') {
print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
$caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $adht->caneditamount; $caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $adht->caneditamount;
$minimumamount = empty($conf->global->MEMBER_MIN_AMOUNT)? $adht->amount : max($conf->global->MEMBER_MIN_AMOUNT, $adht->amount > $amount); $minimumamount = empty($conf->global->MEMBER_MIN_AMOUNT)? $adht->amount : max($conf->global->MEMBER_MIN_AMOUNT, $adht->amount > $amount);
if(!$caneditamount && $minimumamount > $amount) { if (!$caneditamount && $minimumamount > $amount) {
print ' '. $langs->trans("AmountIsLowerToMinimumNotice", price($adht->amount, 1, $langs, 1, -1, -1, $currency)); print ' '. $langs->trans("AmountIsLowerToMinimumNotice", price($adht->amount, 1, $langs, 1, -1, -1, $currency));
} }