Merge pull request #10073 from ptibogxiv/patch-95

Fix order&co billed on online payment page
Dolibarr · Nov 24, 2018 · 0cc4ee2 · 0cc4ee2
2 parents c1efb2d + b5d1a34
commit 0cc4ee2
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
@@ -1437,10 +1437,22 @@
 {
 	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