shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed tests

Browse Source
This commit is contained in:
Denis Duliçi
2021-04-18 01:39:36 +03:00
parent 231f45c262
commit 3f49792763
8 changed files with 386 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Exports/Common/Items.php
View File

@@ -4,10 +4,13 @@ namespace App\Exports\Common;
use App\Exports\Common\Sheets\Items as Base;
use App\Exports\Common\Sheets\ItemTaxes;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class Items implements WithMultipleSheets
{
use Exportable;
public $ids;
public function __construct($ids = null)

3
app/Exports/Purchases/Bills.php
View File

@@ -8,10 +8,13 @@ use App\Exports\Purchases\Sheets\BillItemTaxes;
use App\Exports\Purchases\Sheets\BillHistories;
use App\Exports\Purchases\Sheets\BillTotals;
use App\Exports\Purchases\Sheets\BillTransactions;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class Bills implements WithMultipleSheets
{
use Exportable;
public $ids;
public function __construct($ids = null)

3
app/Exports/Sales/Invoices.php
View File

@@ -8,10 +8,13 @@ use App\Exports\Sales\Sheets\InvoiceItemTaxes;
use App\Exports\Sales\Sheets\InvoiceHistories;
use App\Exports\Sales\Sheets\InvoiceTotals;
use App\Exports\Sales\Sheets\InvoiceTransactions;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class Invoices implements WithMultipleSheets
{
use Exportable;
public $ids;
public function __construct($ids = null)

4
app/Models/Common/Company.php
View File

@@ -441,9 +441,9 @@ class Company extends Eloquent
return $this->getMedia('company_logo')->last();
}
public function makeCurrent()
public function makeCurrent($force = false)
{
if ($this->isCurrent()) {
if (!$force && $this->isCurrent()) {
return $this;
}