mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
Minor fixes
This commit is contained in:
parent
584c83e8a6
commit
05593f0824
@ -200,14 +200,16 @@ class InvoiceFilters extends QueryFilters
|
||||
*/
|
||||
public function payable(string $client_id = ''): Builder
|
||||
{
|
||||
|
||||
if (strlen($client_id) == 0) {
|
||||
return $this->builder;
|
||||
}
|
||||
|
||||
return $this->builder->whereIn('status_id', [Invoice::STATUS_DRAFT, Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
|
||||
->where('balance', '>', 0)
|
||||
->where('is_deleted', 0)
|
||||
->where('client_id', $this->decodePrimaryKey($client_id));
|
||||
return $this->builder
|
||||
->where('client_id', $this->decodePrimaryKey($client_id))
|
||||
->whereIn('status_id', [Invoice::STATUS_DRAFT, Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])
|
||||
->where('is_deleted', 0)
|
||||
->where('balance', '>', 0);
|
||||
}
|
||||
|
||||
|
||||
|
@ -57,8 +57,6 @@ class RefundPaymentRequest extends Request
|
||||
|
||||
if (isset($input['credits'])) {
|
||||
unset($input['credits']);
|
||||
// foreach($input['credits'] as $key => $credit)
|
||||
// $input['credits'][$key]['credit_id'] = $this->decodePrimaryKey($credit['credit_id']);
|
||||
}
|
||||
|
||||
$this->replace($input);
|
||||
|
@ -12,6 +12,7 @@
|
||||
namespace App\Models;
|
||||
|
||||
use App\Utils\Traits\MakesHash;
|
||||
use Carbon\CarbonInterval;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
use Illuminate\Support\Carbon;
|
||||
|
||||
@ -248,6 +249,7 @@ class Task extends BaseModel
|
||||
$duration += max($end_time - $start_time, 0);
|
||||
}
|
||||
|
||||
// return CarbonInterval::seconds(round($duration))->locale($this->company->locale())->cascade()->forHumans();
|
||||
return round($duration);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user