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

now displays only buttons if the corresponding boolean is checked

Browse Source
This commit is contained in:
Dorian Vabre 2021-04-20 10:24:36 +02:00
parent f82d1d246d
commit 7405813ad0
3 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/paiement.php
View File

@ -253,7 +253,7 @@ if (empty($reshook)) {
if (!$error) { if (!$error) {
// Create payment and update this->multicurrency_amounts if this->amounts filled or // Create payment and update this->multicurrency_amounts if this->amounts filled or
// this->amounts if this->multicurrency_amounts filled. // this->amounts if this->multicurrency_amounts filled.
$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents $paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
if ($paiement_id < 0) { if ($paiement_id < 0) {
setEventMessages($paiement->error, $paiement->errors, 'errors'); setEventMessages($paiement->error, $paiement->errors, 'errors');
$error++; $error++;

6
htdocs/public/payment/paymentok.php
View File

@ -167,11 +167,7 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
// Creation of payment line // Creation of payment line
$paiement = new Paiement($db); $paiement = new Paiement($db);
$paiement->datepaye = dol_now(); $paiement->datepaye = dol_now();
$paiement->amounts = $amounts; // Array with all payments dispatching with invoice id $paiement->amounts[] = $paidinvoice->total_ttc; // Array with all payments dispatching with invoice id
$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
$paiement->paiementid = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
$paiement->num_payment = GETPOST('num_paiement', 'alpha');
$paiement->note_private = GETPOST('comment', 'alpha');
// Validating the attendee // Validating the attendee
$attendeetovalidate = new ConferenceOrBoothAttendee($db); $attendeetovalidate = new ConferenceOrBoothAttendee($db);

32
htdocs/public/project/index.php
View File

@ -172,22 +172,10 @@ if ($urllogo) {
print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n"; print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
// Output introduction text $text = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
$text = ''; $text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) { $text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
$langs->load("members");
if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
$text .= $langs->trans($reg[1])."<br>\n";
} else {
$text .= $conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
}
$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
}
if (empty($text)) {
$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
}
print $text; print $text;
// Output payment summary form // Output payment summary form
@ -204,11 +192,17 @@ print "\n";
// Show all action buttons // Show all action buttons
print '<br>'; print '<br>';
print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">'; // Output introduction text
print '<br><br>'; if($project->accept_conference_suggestions){
print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
print '<br><br>';
}
print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">'; print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
print '<br><br>'; print '<br><br>';
print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">'; if($project->accept_booth_suggestions){
print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
}
print '</td></tr>'."\n"; print '</td></tr>'."\n";