mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
fixes for service methods
This commit is contained in:
commit
63eae6000a
@ -37,9 +37,12 @@ class FeesAndLimits
|
|||||||
|
|
||||||
public $adjust_fee_percent = false;
|
public $adjust_fee_percent = false;
|
||||||
|
|
||||||
|
public $is_enabled = true;
|
||||||
|
|
||||||
//public $gateway_type_id = 1;
|
//public $gateway_type_id = 1;
|
||||||
|
|
||||||
public static $casts = [
|
public static $casts = [
|
||||||
|
'is_enabled' => 'bool',
|
||||||
'gateway_type_id' => 'int',
|
'gateway_type_id' => 'int',
|
||||||
'min_limit' => 'float',
|
'min_limit' => 'float',
|
||||||
'max_limit' => 'float',
|
'max_limit' => 'float',
|
||||||
|
@ -22,6 +22,7 @@ use App\Models\GroupSetting;
|
|||||||
use App\Repositories\GroupSettingRepository;
|
use App\Repositories\GroupSettingRepository;
|
||||||
use App\Transformers\GroupSettingTransformer;
|
use App\Transformers\GroupSettingTransformer;
|
||||||
use App\Utils\Traits\MakesHash;
|
use App\Utils\Traits\MakesHash;
|
||||||
|
use App\Utils\Traits\SavesDocuments;
|
||||||
use App\Utils\Traits\Uploadable;
|
use App\Utils\Traits\Uploadable;
|
||||||
use Illuminate\Foundation\Bus\DispatchesJobs;
|
use Illuminate\Foundation\Bus\DispatchesJobs;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@ -32,6 +33,7 @@ class GroupSettingController extends BaseController
|
|||||||
use DispatchesJobs;
|
use DispatchesJobs;
|
||||||
use Uploadable;
|
use Uploadable;
|
||||||
use MakesHash;
|
use MakesHash;
|
||||||
|
use SavesDocuments;
|
||||||
|
|
||||||
protected $entity_type = GroupSetting::class;
|
protected $entity_type = GroupSetting::class;
|
||||||
|
|
||||||
@ -357,6 +359,9 @@ class GroupSettingController extends BaseController
|
|||||||
|
|
||||||
$this->uploadLogo($request->file('company_logo'), $group_setting->company, $group_setting);
|
$this->uploadLogo($request->file('company_logo'), $group_setting->company, $group_setting);
|
||||||
|
|
||||||
|
if ($request->has('documents'))
|
||||||
|
$this->saveDocuments($request->input('documents'), $group_setting, false);
|
||||||
|
|
||||||
return $this->itemResponse($group_setting);
|
return $this->itemResponse($group_setting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ class ReminderJob implements ShouldQueue
|
|||||||
Invoice::where('next_send_date', Carbon::today()->format('Y-m-d'))->with('invitations')->cursor()->each(function ($invoice) {
|
Invoice::where('next_send_date', Carbon::today()->format('Y-m-d'))->with('invitations')->cursor()->each(function ($invoice) {
|
||||||
if ($invoice->isPayable()) {
|
if ($invoice->isPayable()) {
|
||||||
$reminder_template = $invoice->calculateTemplate('invoice');
|
$reminder_template = $invoice->calculateTemplate('invoice');
|
||||||
$invoice->service()->touchReminder($this->reminder_template)->save();
|
$invoice->service()->touchReminder($reminder_template)->save();
|
||||||
|
|
||||||
$invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
|
$invoice->invitations->each(function ($invitation) use ($invoice, $reminder_template) {
|
||||||
EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
|
EmailEntity::dispatch($invitation, $invitation->company, $reminder_template);
|
||||||
|
@ -51,6 +51,11 @@ class GroupSetting extends StaticModel
|
|||||||
return $this->hasMany(Client::class, 'id', 'group_settings_id');
|
return $this->hasMany(Client::class, 'id', 'group_settings_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function documents()
|
||||||
|
{
|
||||||
|
return $this->morphMany(Document::class, 'documentable');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve the model for a bound value.
|
* Retrieve the model for a bound value.
|
||||||
*
|
*
|
||||||
|
@ -114,6 +114,10 @@ class CreditService
|
|||||||
/* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
|
/* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
|
||||||
if(!isset($this->credit->exchange_rate) && $this->credit->client->currency()->id != (int) $this->credit->company->settings->currency_id)
|
if(!isset($this->credit->exchange_rate) && $this->credit->client->currency()->id != (int) $this->credit->company->settings->currency_id)
|
||||||
$this->credit->exchange_rate = $this->credit->client->currency()->exchange_rate;
|
$this->credit->exchange_rate = $this->credit->client->currency()->exchange_rate;
|
||||||
|
|
||||||
|
if (!isset($this->credit->public_notes))
|
||||||
|
$this->credit->public_notes = $this->credit->client->public_notes;
|
||||||
|
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
@ -372,6 +372,9 @@ class InvoiceService
|
|||||||
|
|
||||||
if (!isset($this->invoice->terms))
|
if (!isset($this->invoice->terms))
|
||||||
$this->invoice->terms = $settings->invoice_terms;
|
$this->invoice->terms = $settings->invoice_terms;
|
||||||
|
|
||||||
|
if (!isset($this->invoice->public_notes))
|
||||||
|
$this->invoice->public_notes = $this->invoice->client->public_notes;
|
||||||
|
|
||||||
/* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
|
/* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
|
||||||
if(!isset($this->invoice->exchange_rate) && $this->invoice->client->currency()->id != (int) $this->invoice->company->settings->currency_id)
|
if(!isset($this->invoice->exchange_rate) && $this->invoice->client->currency()->id != (int) $this->invoice->company->settings->currency_id)
|
||||||
|
@ -171,6 +171,9 @@ class QuoteService
|
|||||||
/* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
|
/* If client currency differs from the company default currency, then insert the client exchange rate on the model.*/
|
||||||
if(!isset($this->quote->exchange_rate) && $this->quote->client->currency()->id != (int) $this->quote->company->settings->currency_id)
|
if(!isset($this->quote->exchange_rate) && $this->quote->client->currency()->id != (int) $this->quote->company->settings->currency_id)
|
||||||
$this->quote->exchange_rate = $this->quote->client->currency()->exchange_rate;
|
$this->quote->exchange_rate = $this->quote->client->currency()->exchange_rate;
|
||||||
|
|
||||||
|
if (!isset($this->quote->public_notes))
|
||||||
|
$this->quote->public_notes = $this->quote->client->public_notes;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user