mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-05-31 08:14:35 -04:00
Fixes for tests
This commit is contained in:
parent
bc473439fe
commit
fe1cf514d6
@ -35,6 +35,7 @@ class InvoiceItemFactory
|
|||||||
$item->tax_rate3 = 0;
|
$item->tax_rate3 = 0;
|
||||||
$item->sort_id = 0;
|
$item->sort_id = 0;
|
||||||
$item->line_total = 0;
|
$item->line_total = 0;
|
||||||
|
$item->gross_line_total = 0;
|
||||||
$item->custom_value1 = '';
|
$item->custom_value1 = '';
|
||||||
$item->custom_value2 = '';
|
$item->custom_value2 = '';
|
||||||
$item->custom_value3 = '';
|
$item->custom_value3 = '';
|
||||||
|
@ -177,6 +177,11 @@ class InvoiceItemSumInclusive
|
|||||||
return $this->item->line_total;
|
return $this->item->line_total;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getGrossLineTotal()
|
||||||
|
{
|
||||||
|
return $this->item->line_total;
|
||||||
|
}
|
||||||
|
|
||||||
public function getLineItems()
|
public function getLineItems()
|
||||||
{
|
{
|
||||||
return $this->line_items;
|
return $this->line_items;
|
||||||
|
@ -259,6 +259,11 @@ class InvoiceSumInclusive
|
|||||||
return $this->sub_total;
|
return $this->sub_total;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getGrossSubTotal()
|
||||||
|
{
|
||||||
|
return $this->sub_total;
|
||||||
|
}
|
||||||
|
|
||||||
public function setSubTotal($value)
|
public function setSubTotal($value)
|
||||||
{
|
{
|
||||||
$this->sub_total = $value;
|
$this->sub_total = $value;
|
||||||
|
@ -16,6 +16,7 @@ use App\Jobs\Util\UnlinkFile;
|
|||||||
use App\Models\Invoice;
|
use App\Models\Invoice;
|
||||||
use App\Models\Quote;
|
use App\Models\Quote;
|
||||||
use App\Repositories\QuoteRepository;
|
use App\Repositories\QuoteRepository;
|
||||||
|
use App\Services\Quote\TriggeredActions;
|
||||||
use App\Utils\Ninja;
|
use App\Utils\Ninja;
|
||||||
use App\Utils\Traits\MakesHash;
|
use App\Utils\Traits\MakesHash;
|
||||||
|
|
||||||
@ -177,6 +178,13 @@ class QuoteService
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function triggeredActions($request)
|
||||||
|
{
|
||||||
|
$this->quote = (new TriggeredActions($this->quote, $request))->run();
|
||||||
|
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
public function deletePdf()
|
public function deletePdf()
|
||||||
{
|
{
|
||||||
$this->quote->invitations->each(function ($invitation){
|
$this->quote->invitations->each(function ($invitation){
|
||||||
|
66
app/Services/Quote/TriggeredActions.php
Normal file
66
app/Services/Quote/TriggeredActions.php
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Quote Ninja (https://quoteninja.com).
|
||||||
|
*
|
||||||
|
* @link https://github.com/quoteninja/quoteninja source repository
|
||||||
|
*
|
||||||
|
* @copyright Copyright (c) 2021. Quote Ninja LLC (https://quoteninja.com)
|
||||||
|
*
|
||||||
|
* @license https://www.elastic.co/licensing/elastic-license
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace App\Services\Quote;
|
||||||
|
|
||||||
|
use App\Events\Quote\QuoteWasEmailed;
|
||||||
|
use App\Jobs\Entity\EmailEntity;
|
||||||
|
use App\Models\Quote;
|
||||||
|
use App\Services\AbstractService;
|
||||||
|
use App\Utils\Ninja;
|
||||||
|
use App\Utils\Traits\GeneratesCounter;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
class TriggeredActions extends AbstractService
|
||||||
|
{
|
||||||
|
use GeneratesCounter;
|
||||||
|
|
||||||
|
private $request;
|
||||||
|
|
||||||
|
private $quote;
|
||||||
|
|
||||||
|
public function __construct(Quote $quote, Request $request)
|
||||||
|
{
|
||||||
|
$this->request = $request;
|
||||||
|
|
||||||
|
$this->quote = $quote;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function run()
|
||||||
|
{
|
||||||
|
|
||||||
|
if ($this->request->has('send_email') && $this->request->input('send_email') == 'true') {
|
||||||
|
$this->sendEmail();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->request->has('mark_sent') && $this->request->input('mark_sent') == 'true') {
|
||||||
|
$this->quote = $this->quote->service()->markSent()->save();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return $this->quote;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function sendEmail()
|
||||||
|
{
|
||||||
|
|
||||||
|
$reminder_template = $this->quote->calculateTemplate('quote');
|
||||||
|
//$reminder_template = 'payment';
|
||||||
|
|
||||||
|
$this->quote->invitations->load('contact.client.country', 'quote.client.country', 'quote.company')->each(function ($invitation) use ($reminder_template) {
|
||||||
|
EmailEntity::dispatch($invitation, $this->quote->company, $reminder_template);
|
||||||
|
});
|
||||||
|
|
||||||
|
if ($this->quote->invitations->count() > 0) {
|
||||||
|
event(new QuoteWasEmailed($this->quote->invitations->first(), $this->quote->company, Ninja::eventVars(), 'quote'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user