mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 23:27:31 -05:00 
			
		
		
		
	Merge pull request #6235 from turbo124/v5-develop
Fixes for payments with credits
This commit is contained in:
		
						commit
						ae099e9b57
					
				@ -69,7 +69,7 @@ class ClientService
 | 
				
			|||||||
                        $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
 | 
					                        $query->whereDate('due_date', '<=', now()->format('Y-m-d'))
 | 
				
			||||||
                              ->orWhereNull('due_date');
 | 
					                              ->orWhereNull('due_date');
 | 
				
			||||||
                  })
 | 
					                  })
 | 
				
			||||||
                  ->orderBy('created_at','ASC');
 | 
					                  ->orderBy('created_at','ASC')->get();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function getPaymentMethods(float $amount)
 | 
					    public function getPaymentMethods(float $amount)
 | 
				
			||||||
 | 
				
			|||||||
@ -119,6 +119,7 @@ class PaymentService
 | 
				
			|||||||
                                    ->service()
 | 
					                                    ->service()
 | 
				
			||||||
                                    ->getCredits();
 | 
					                                    ->getCredits();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            foreach ($credits as $credit) {
 | 
					            foreach ($credits as $credit) {
 | 
				
			||||||
                //starting invoice balance
 | 
					                //starting invoice balance
 | 
				
			||||||
                $invoice_balance = $invoice->balance;
 | 
					                $invoice_balance = $invoice->balance;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user