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

clean code

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-02-23 21:36:22 +01:00
parent b835a562b2
commit fe5f08afe3
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/loan/card.php
View File

@ -76,7 +76,7 @@ if ($reshook < 0) {
} }
if (empty($reshook)) { if (empty($reshook)) {
// Classify paid // Classify paid
if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->loan->write) { if ($action == 'confirm_paid' && $confirm == 'yes' && $user->hasRight('loan', 'write')) {
$object->fetch($id); $object->fetch($id);
$result = $object->setPaid($user); $result = $object->setPaid($user);
if ($result > 0) { if ($result > 0) {
@ -87,7 +87,7 @@ if (empty($reshook)) {
} }
// Delete loan // Delete loan
if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->write) { if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('loan', 'write')) {
$object->fetch($id); $object->fetch($id);
$result = $object->delete($user); $result = $object->delete($user);
if ($result > 0) { if ($result > 0) {
@ -100,7 +100,7 @@ if (empty($reshook)) {
} }
// Add loan // Add loan
if ($action == 'add' && $user->rights->loan->write) { if ($action == 'add' && $user->hasRight('loan', 'write')) {
if (!$cancel) { if (!$cancel) {
$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int')); $datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int'));
$dateend = dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int')); $dateend = dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
@ -168,7 +168,7 @@ if (empty($reshook)) {
header("Location: list.php"); header("Location: list.php");
exit(); exit();
} }
} elseif ($action == 'update' && $user->rights->loan->write) { } elseif ($action == 'update' && $user->hasRight('loan', 'write')) {
// Update record // Update record
if (!$cancel) { if (!$cancel) {
$result = $object->fetch($id); $result = $object->fetch($id);
@ -225,7 +225,7 @@ if (empty($reshook)) {
} }
// Link to a project // Link to a project
if ($action == 'classin' && $user->rights->loan->write) { if ($action == 'classin' && $user->hasRight('loan', 'write')) {
$object->fetch($id); $object->fetch($id);
$result = $object->setProject($projectid); $result = $object->setProject($projectid);
if ($result < 0) { if ($result < 0) {
@ -233,7 +233,7 @@ if (empty($reshook)) {
} }
} }
if ($action == 'setlabel' && $user->rights->loan->write) { if ($action == 'setlabel' && $user->hasRight('loan', 'write')) {
$object->fetch($id); $object->fetch($id);
$result = $object->setValueFrom('label', GETPOST('label'), '', '', 'text', '', $user, 'LOAN_MODIFY'); $result = $object->setValueFrom('label', GETPOST('label'), '', '', 'text', '', $user, 'LOAN_MODIFY');
if ($result < 0) { if ($result < 0) {
@ -426,13 +426,13 @@ if ($id > 0) {
$morehtmlref = '<div class="refidno">'; $morehtmlref = '<div class="refidno">';
// Ref loan // Ref loan
$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', 0, 1); $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->hasRight('loan', 'write'), 'string', '', 0, 1);
$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', null, null, '', 1); $morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->hasRight('loan', 'write'), 'string', '', null, null, '', 1);
// Project // Project
if (isModEnabled('project')) { if (isModEnabled('project')) {
$langs->loadLangs(array("projects")); $langs->loadLangs(array("projects"));
$morehtmlref .= '<br>'.$langs->trans('Project').' '; $morehtmlref .= '<br>'.$langs->trans('Project').' ';
if ($user->rights->loan->write) { if ($user->hasRight('loan', 'write')) {
if ($action != 'classify') { if ($action != 'classify') {
$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : '; $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
} }
@ -740,17 +740,17 @@ if ($id > 0) {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
// Edit // Edit
if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->write) { if (($object->paid == 0 || $object->paid == 2) && $user->hasRight('loan', 'write')) {
print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
} }
// Emit payment // Emit payment
if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) { if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->hasRight('loan', 'write')) {
print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment").'</a></div>';
} }
// Classify 'paid' // Classify 'paid'
if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->rights->loan->write) { if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->hasRight('loan', 'write')) {
print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=paid&token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>'; print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=paid&token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
} }