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

7
htdocs/contrat/card.php
View File

@ -1418,8 +1418,9 @@ 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') { if ($action == 'classify') {
//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1); //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">'; $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@ -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
} }

2
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

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

@ -24,7 +24,7 @@
// 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', '');
@ -33,7 +33,7 @@ if(!defined('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));

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

@ -1887,10 +1887,8 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
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)) if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))
{ {
@ -1899,21 +1897,18 @@ if (preg_match('/^dopayment/', $action)) // If we choosed/click on the payment
print '<div id="card-element"> print '<div id="card-element">
<!-- a Stripe Element will be inserted here. --> <!-- a Stripe Element will be inserted here. -->
</div> </div>';
<!-- Used to display form errors --> print '<!-- Used to display form errors -->
<div id="card-errors" role="alert"></div> <div id="card-errors" role="alert"></div>
</div>';
</div> print '<br>';
<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 '<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 '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
print ' print '</td></tr></tbody>';
</td></tr></tbody> print '</table>';
</table>';
//} //}
if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) if (! empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION))