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

clean indent

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-10-27 10:07:47 +01:00
parent b2b057e9b5
commit 20f97807ce
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
5 changed files with 70 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/contrat/card.php
View File

@ -444,13 +444,13 @@ if (empty($reshook))
$error++; $error++;
} }
$date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year')); $date_start = dol_mktime(GETPOST('date_start' . $predef . 'hour'), GETPOST('date_start' . $predef . 'min'), GETPOST('date_start' . $predef . 'sec'), GETPOST('date_start' . $predef . 'month'), GETPOST('date_start' . $predef . 'day'), GETPOST('date_start' . $predef . 'year'));
$date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year')); $date_end = dol_mktime(GETPOST('date_end' . $predef . 'hour'), GETPOST('date_end' . $predef . 'min'), GETPOST('date_end' . $predef . 'sec'), GETPOST('date_end' . $predef . 'month'), GETPOST('date_end' . $predef . 'day'), GETPOST('date_end' . $predef . 'year'));
if (!empty($date_start) && !empty($date_end) && $date_start > $date_end) if (!empty($date_start) && !empty($date_end) && $date_start > $date_end)
{ {
setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors'); setEventMessages($langs->trans("Error").': '.$langs->trans("DateStartPlanned").' > '.$langs->trans("DateEndPlanned"), null, 'errors');
$error++; $error++;
} }
// Extrafields // Extrafields
$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line); $extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@ -531,7 +531,7 @@ if (empty($reshook))
$pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU'); $pu_ht = price2num($pu_ttc / (1 + ($tmpvat/100)), 'MU');
} }
else else
{ {
$pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU'); $pu_ttc = price2num($pu_ht * (1 + ($tmpvat/100)), 'MU');
} }
} }
@ -727,9 +727,9 @@ if (empty($reshook))
$objectline->pa_ht=$pa_ht; $objectline->pa_ht=$pa_ht;
if ($fk_unit > 0) { if ($fk_unit > 0) {
$objectline->fk_unit = GETPOST('unit'); $objectline->fk_unit = GETPOST('unit');
} else { } else {
$objectline->fk_unit = null; $objectline->fk_unit = null;
} }
// Extrafields // Extrafields
@ -1418,19 +1418,20 @@ else
$morehtmlref.='<br>'.$langs->trans('Project') . ' '; $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
if ($user->rights->contrat->creer) if ($user->rights->contrat->creer)
{ {
if ($action != 'classify') if ($action != 'classify') {
$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : '; $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
if ($action == 'classify') { }
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1); if ($action == 'classify') {
$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'; //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
$morehtmlref.='<input type="hidden" name="action" value="classin">'; $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
$morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; $morehtmlref.='<input type="hidden" name="action" value="classin">';
$morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1); $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">'; $morehtmlref.=$formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
$morehtmlref.='</form>'; $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
} else { $morehtmlref.='</form>';
$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1); } else {
} $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
}
} else { } else {
if (! empty($object->fk_project)) { if (! empty($object->fk_project)) {
$proj = new Project($db); $proj = new Project($db);
@ -2253,7 +2254,7 @@ $db->close();
if (! empty($conf->margin->enabled) && $action == 'editline') if (! empty($conf->margin->enabled) && $action == 'editline')
{ {
// TODO Why this ? To manage margin on contracts ? // TODO Why this ? To manage margin on contracts ?
?> ?>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
var idprod = $("input[name='idprod']").val(); var idprod = $("input[name='idprod']").val();
@ -2308,5 +2309,5 @@ $(document).ready(function() {
} }
}); });
</script> </script>
<?php <?php
} }

8
htdocs/contrat/class/contrat.class.php
View File

@ -9,7 +9,7 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2015-2018 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2015-2018 Ferran Marcet <fmarcet@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -861,9 +861,9 @@ class Contrat extends CommonObject
// multilangs // multilangs
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($objp->fk_product) && ! empty($loadalsotranslation)) { if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($objp->fk_product) && ! empty($loadalsotranslation)) {
$line = new Product($this->db); $line = new Product($this->db);
$line->fetch($objp->fk_product); $line->fetch($objp->fk_product);
$line->getMultiLangs(); $line->getMultiLangs();
} }
$this->lines[$pos] = $line; $this->lines[$pos] = $line;

12
htdocs/dav/dav.lib.php
View File

@ -24,19 +24,19 @@
// define CDAV_CONTACT_TAG if not // define CDAV_CONTACT_TAG if not
if(!defined('CDAV_CONTACT_TAG')) if(!defined('CDAV_CONTACT_TAG'))
{ {
if(isset($conf->global->CDAV_CONTACT_TAG)) if (isset($conf->global->CDAV_CONTACT_TAG))
define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG); define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
else else
define('CDAV_CONTACT_TAG', ''); define('CDAV_CONTACT_TAG', '');
} }
// define CDAV_URI_KEY if not // define CDAV_URI_KEY if not
if(!defined('CDAV_URI_KEY')) if(!defined('CDAV_URI_KEY'))
{ {
if(isset($conf->global->CDAV_URI_KEY)) if (isset($conf->global->CDAV_URI_KEY))
define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY); define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
else else
define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8)); define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
} }

2
htdocs/public/agenda/agendaexport.php
View File

@ -220,7 +220,7 @@ if ($format == 'rss')
$result=readfile($outputfile); $result=readfile($outputfile);
if (! $result) print 'File '.$outputfile.' was empty.'; if (! $result) print 'File '.$outputfile.' was empty.';
// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename)); // header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
exit; exit;
} }
else else

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

@ -1878,42 +1878,37 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent)) //if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
//{ //{
print ' print '
<table id="dolpaymenttable" summary="Payment form" class="center"> <table id="dolpaymenttable" summary="Payment form" class="center">
<tbody><tr><td class="textpublicpayment">'; <tbody><tr><td class="textpublicpayment">';
if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{ {
print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>'; print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
} }
print ' print '<div class="form-row left">';
<div class="form-row left"> print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>'; if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{
print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
}
if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) print '<div id="card-element">
{ <!-- a Stripe Element will be inserted here. -->
print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>'; </div>';
}
print '<div id="card-element"> print '<!-- Used to display form errors -->
<!-- a Stripe Element will be inserted here. --> <div id="card-errors" role="alert"></div>
</div> </div>';
<!-- Used to display form errors --> print '<br>';
<div id="card-errors" role="alert"></div> print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
</div> print '</td></tr></tbody>';
print '</table>';
<br>';
print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
print '
</td></tr></tbody>
</table>';
//} //}
if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
@ -2006,7 +2001,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
{ {
print $e->getMessage(); print $e->getMessage();
} }
?> ?>
// Code for payment with option STRIPE_USE_NEW_CHECKOUT set // Code for payment with option STRIPE_USE_NEW_CHECKOUT set
// Create a Stripe client. // Create a Stripe client.
@ -2049,11 +2044,11 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
}); });
<?php <?php
} }
elseif (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) elseif (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{ {
?> ?>
// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set // Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
// Create a Stripe client. // Create a Stripe client.
@ -2153,11 +2148,11 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
} }
}); });
<?php <?php
} }
else // Old method (not SCA ready) else // Old method (not SCA ready)
{ {
?> ?>
// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off // Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
// Create a Stripe client. // Create a Stripe client.
@ -2209,7 +2204,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
<?php <?php
if (empty($conf->global->STRIPE_USE_3DSECURE)) // Ask credit card directly, no 3DS test if (empty($conf->global->STRIPE_USE_3DSECURE)) // Ask credit card directly, no 3DS test
{ {
?> ?>
/* Use token */ /* Use token */
stripe.createToken(card).then(function(result) { stripe.createToken(card).then(function(result) {
if (result.error) { if (result.error) {
@ -2221,11 +2216,11 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
stripeTokenHandler(result.token); stripeTokenHandler(result.token);
} }
}); });
<?php <?php
} }
else // Ask credit card with 3DS test else // Ask credit card with 3DS test
{ {
?> ?>
/* Use 3DS source */ /* Use 3DS source */
stripe.createSource(card).then(function(result) { stripe.createSource(card).then(function(result) {
if (result.error) { if (result.error) {
@ -2237,7 +2232,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
stripeSourceHandler(result.source); stripeSourceHandler(result.source);
} }
}); });
<?php <?php
} }
?> ?>
}); });
@ -2291,7 +2286,7 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
form.submit(); form.submit();
} }
<?php <?php
} }
print '</script>'; print '</script>';