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

Fixing style errors.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/public/members/new.php
View File

@ -702,7 +702,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>'; print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
} }
print '</td><td class="nowrap">'; print '</td><td class="nowrap">';
if (empty($amount) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) { if (empty($amount) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
$amount = $conf->global->MEMBER_NEWFORM_AMOUNT; $amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
} }
@ -753,7 +753,7 @@ else { // Show the table of membership types
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
print '<br><div class="div-table-responsive">'; print '<br><div class="div-table-responsive">';
print '<table class="tagtable liste">'."\n"; print '<table class="tagtable liste">'."\n";
print '<input type="hidden" name="action" value="create">'; print '<input type="hidden" name="action" value="create">';
@ -766,7 +766,7 @@ else { // Show the table of membership types
print '<th class="center">'.$langs->trans("VoteAllowed").'</th>'; print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
print '<th class="center">'.$langs->trans("NewSubscription").'</th>'; print '<th class="center">'.$langs->trans("NewSubscription").'</th>';
print "</tr>\n"; print "</tr>\n";
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
@ -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>';

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

@ -1622,10 +1622,10 @@ 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));
} }
print '<input type="hidden" name="amount" value="'.$amount.'">'; print '<input type="hidden" name="amount" value="'.$amount.'">';
print '<input type="hidden" name="currency" value="'.$currency.'">'; print '<input type="hidden" name="currency" value="'.$currency.'">';
print '</td></tr>'."\n"; print '</td></tr>'."\n";