Separated Checkout and Payment controllers, updates to checkout and payments

app/Models/Invoice.php

@@ -300,8 +300,7 @@ class Invoice extends Model implements IDs
 	/**
 	 * @param \Leenooks\Carbon $start Start Date
 	 * @param Carbon $end End Date
-	 * @param int $interval Period End Date
-	 * @param bool $strict
+	 * @param Collection $period
 	 * @return float
 	 * @throws \Exception
 	 */
@@ -373,7 +372,7 @@ class Invoice extends Model implements IDs
 	public function payments()
 	{
 		return $this->hasManyThrough(Payment::class,PaymentItem::class,NULL,'id',NULL,'payment_id')
-			->where('active',TRUE);
+			->where('payments.active',TRUE);
 	}
 
 	/**