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

Merge pull request #10073 from ptibogxiv/patch-95

Browse Source 
Fix order&co billed on online payment page
This commit is contained in:
Laurent Destailleur 2018-11-24 11:08:26 +01:00 committed by GitHub
commit 0cc4ee2b01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1437,10 +1437,22 @@ if ($action != 'dopayment')
{
if ($found && ! $error) // We are in a management option and no error
{
if ($source == 'invoice' && $object->paye)
if ($source == 'order' && $object->billed)
{
print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("OrderBilled").'</span>';
}
elseif ($source == 'invoice' && $object->paye)
{
print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("InvoicePaid").'</span>';
}
elseif ($source == 'membersubscription' && $object->datefin > dol_now())
{
print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("MembershipPaid").'</span>';
}
elseif ($source == 'donation' && $object->paid)
{
print '<br><br><span class="amountpaymentcomplete">'.$langs->trans("DonationPaid").'</span>';
}
else
{
// Buttons for all payments registration methods