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

Fix link for online payment

Browse Source
This commit is contained in:
Laurent Destailleur 2018-01-08 13:21:04 +01:00
parent 5847ea7319
commit 42e659e26c
5 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/comm/propal/card.php
View File

@ -2237,8 +2237,6 @@ if ($action == 'create')
{
if ($action != 'editline')
{
$var = true;
// Add products/services form
$object->formAddObjectLine(1, $mysoc, $soc);
@ -2379,8 +2377,6 @@ if ($action == 'create')
$genallowed = $user->rights->propal->lire;
$delallowed = $user->rights->propal->creer;
$var = true;
print $formfile->showdocuments('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object);
// Show links to link elements
@ -2397,6 +2393,7 @@ if ($action == 'create')
print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
}
// Show direct download link
if ($object->statut != Propal::STATUS_DRAFT && ! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))
{
print '<br><!-- Link to download main doc -->'."\n";

7
htdocs/commande/card.php
View File

@ -2438,8 +2438,6 @@ if ($action == 'create' && $user->rights->commande->creer)
{
if ($action != 'editline')
{
$var = true;
// Add free products/services
$object->formAddObjectLine(1, $mysoc, $soc);
@ -2607,8 +2605,10 @@ if ($action == 'create' && $user->rights->commande->creer)
$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
// Show online signature link
// Show online payment link
//$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
$useonlinepayment = $conf->global->ORDER_SHOW_ONLINE_PAYMENT_ON_ORDER;
if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment)
{
print '<br><!-- Link to pay -->';
@ -2616,6 +2616,7 @@ if ($action == 'create' && $user->rights->commande->creer)
print showOnlinePaymentUrl('order', $object->ref).'<br>';
}
// Show direct download link
if ($object->statut != Commande::STATUS_DRAFT && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))
{
print '<br><!-- Link to download main doc -->'."\n";

3
htdocs/compta/facture/card.php
View File

@ -4188,8 +4188,6 @@ else if ($id > 0 || ! empty($ref))
{
if ($action != 'editline')
{
$var = true;
// Add free products/services
$object->formAddObjectLine(1, $mysoc, $soc);
@ -4493,6 +4491,7 @@ else if ($id > 0 || ! empty($ref))
print showOnlinePaymentUrl('invoice', $object->ref).'<br>';
}
// Show direct download link
if ($object->statut != Facture::STATUS_DRAFT && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))
{
print '<br><!-- Link to download main doc -->'."\n";

9
htdocs/theme/eldy/style.css.php
View File

@ -349,7 +349,7 @@ input.buttongen {
vertical-align: middle;
}
input.buttonpayment {
min-width: 300px;
min-width: 320px;
margin-bottom: 15px;
background-image: none;
line-height: 24px;
@ -359,6 +359,7 @@ input.buttonpayment {
text-align: <?php echo $left; ?>;
border: 2px solid #ccc;
background-color: #eee;
white-space: normal;
}
input.buttonpaymentcb {
background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
@ -1024,6 +1025,10 @@ select.selectarrowonleft option {
div.statusref img {
padding-right: 3px !important;
}
input.buttonpayment {
min-width: 300px;
}
}
.linkobject { cursor: pointer; }
<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
@ -3231,7 +3236,7 @@ div.titre {
padding-bottom: 5px;
}
#dolpaymenttable { min-width: 310px; font-size: 16px; } /* Width must have min to make stripe input area visible */
#dolpaymenttable { min-width: 300px; font-size: 16px; } /* Width must have min to make stripe input area visible */
#tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
#tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; }
#tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }

9
htdocs/theme/md/style.css.php
View File

@ -344,7 +344,7 @@ input.buttongen {
vertical-align: middle;
}
input.buttonpayment {
min-width: 300px;
min-width: 320px;
margin-bottom: 15px;
background-image: none;
line-height: 24px;
@ -354,6 +354,7 @@ input.buttonpayment {
text-align: <?php echo $left; ?>;
border: 2px solid #ccc;
background-color: #eee;
white-space: normal;
}
input.buttonpaymentcb {
background-image: url(<?php echo dol_buildpath($path.'/theme/common/credit_card.png',1) ?>);
@ -1014,6 +1015,10 @@ select.selectarrowonleft option {
div.statusref img {
padding-right: 3px !important;
}
input.buttonpayment {
min-width: 300px;
}
}
.linkobject { cursor: pointer; }
<?php if (GETPOST('optioncss','aZ09') == 'print') { ?>
@ -3297,7 +3302,7 @@ div.titre {
<?php print (empty($conf->dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?>
}
#dolpaymenttable { min-width: 320px; font-size: 16px; } /* Width must have min to make stripe input area visible */
#dolpaymenttable { min-width: 300px; font-size: 16px; } /* Width must have min to make stripe input area visible */
#tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; }
#tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; }
#tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; }