From 42e659e26c6b013d08ccdf0a6fbce10a814befb9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 13:21:04 +0100 Subject: [PATCH] Fix link for online payment --- htdocs/comm/propal/card.php | 5 +---- htdocs/commande/card.php | 7 ++++--- htdocs/compta/facture/card.php | 3 +-- htdocs/theme/eldy/style.css.php | 9 +++++++-- htdocs/theme/md/style.css.php | 9 +++++++-- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 63a691af0ee..b725f05ccc2 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -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).'
'; } + // Show direct download link if ($object->statut != Propal::STATUS_DRAFT && ! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) { print '
'."\n"; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index bb6d2d78571..b93def7d263 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -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 '
'; @@ -2616,6 +2616,7 @@ if ($action == 'create' && $user->rights->commande->creer) print showOnlinePaymentUrl('order', $object->ref).'
'; } + // Show direct download link if ($object->statut != Commande::STATUS_DRAFT && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) { print '
'."\n"; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 2261dafb818..6cddffd3b7a 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -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).'
'; } + // Show direct download link if ($object->statut != Facture::STATUS_DRAFT && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) { print '
'."\n"; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ebbadc259f7..897149def5b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -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: ; border: 2px solid #ccc; background-color: #eee; + white-space: normal; } input.buttonpaymentcb { background-image: url(); @@ -1024,6 +1025,10 @@ select.selectarrowonleft option { div.statusref img { padding-right: 3px !important; } + + input.buttonpayment { + min-width: 300px; + } } .linkobject { cursor: pointer; } @@ -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; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 2c0004a397e..183efa2c828 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -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: ; border: 2px solid #ccc; background-color: #eee; + white-space: normal; } input.buttonpaymentcb { background-image: url(); @@ -1014,6 +1015,10 @@ select.selectarrowonleft option { div.statusref img { padding-right: 3px !important; } + + input.buttonpayment { + min-width: 300px; + } } .linkobject { cursor: pointer; } @@ -3297,7 +3302,7 @@ div.titre { 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; }