fixed exports

This commit is contained in:
denisdulici 2020-02-21 21:37:48 +03:00
parent 8100983b3a
commit 3fdf2d9915
11 changed files with 71 additions and 11 deletions

View File

@ -9,7 +9,7 @@ class Transactions extends Export
{
public function collection()
{
$model = Model::with(['account', 'bill', 'category', 'contact', 'invoice'])->usingSearchString(request('search'))->get();
$model = Model::with(['account', 'bill', 'category', 'contact', 'invoice'])->usingSearchString(request('search'));
if (!empty($this->ids)) {
$model->whereIn('id', (array) $this->ids);

View File

@ -20,7 +20,13 @@ class BillHistories extends Export
public function map($model): array
{
$model->bill_number = $model->bill->bill_number;
$bill = $model->bill;
if (empty($bill)) {
return [];
}
$model->bill_number = $bill->bill_number;
return parent::map($model);
}

View File

@ -20,7 +20,13 @@ class BillItemTaxes extends Export
public function map($model): array
{
$model->bill_number = $model->bill->bill_number;
$bill = $model->bill;
if (empty($bill)) {
return [];
}
$model->bill_number = $bill->bill_number;
$model->item_name = $model->item->name;
$model->tax_rate = $model->tax->rate;

View File

@ -20,7 +20,13 @@ class BillItems extends Export
public function map($model): array
{
$model->bill_number = $model->bill->bill_number;
$bill = $model->bill;
if (empty($bill)) {
return [];
}
$model->bill_number = $bill->bill_number;
$model->item_name = $model->item->name;
return parent::map($model);

View File

@ -20,7 +20,13 @@ class BillTotals extends Export
public function map($model): array
{
$model->bill_number = $model->bill->bill_number;
$bill = $model->bill;
if (empty($bill)) {
return [];
}
$model->bill_number = $bill->bill_number;
return parent::map($model);
}

View File

@ -20,7 +20,13 @@ class BillTransactions extends Export
public function map($model): array
{
$model->bill_number = $model->bill->bill_number;
$bill = $model->bill;
if (empty($bill)) {
return [];
}
$model->bill_number = $bill->bill_number;
$model->account_name = $model->account->name;
$model->category_name = $model->category->name;
$model->contact_email = $model->contact->email;

View File

@ -20,7 +20,13 @@ class InvoiceHistories extends Export
public function map($model): array
{
$model->invoice_number = $model->invoice->invoice_number;
$invoice = $model->invoice;
if (empty($invoice)) {
return [];
}
$model->invoice_number = $invoice->invoice_number;
return parent::map($model);
}

View File

@ -20,7 +20,13 @@ class InvoiceItemTaxes extends Export
public function map($model): array
{
$model->invoice_number = $model->invoice->invoice_number;
$invoice = $model->invoice;
if (empty($invoice)) {
return [];
}
$model->invoice_number = $invoice->invoice_number;
$model->item_name = $model->item->name;
$model->tax_rate = $model->tax->rate;

View File

@ -20,7 +20,13 @@ class InvoiceItems extends Export
public function map($model): array
{
$model->invoice_number = $model->invoice->invoice_number;
$invoice = $model->invoice;
if (empty($invoice)) {
return [];
}
$model->invoice_number = $invoice->invoice_number;
$model->item_name = $model->item->name;
return parent::map($model);

View File

@ -20,7 +20,13 @@ class InvoiceTotals extends Export
public function map($model): array
{
$model->invoice_number = $model->invoice->invoice_number;
$invoice = $model->invoice;
if (empty($invoice)) {
return [];
}
$model->invoice_number = $invoice->invoice_number;
return parent::map($model);
}

View File

@ -20,7 +20,13 @@ class InvoiceTransactions extends Export
public function map($model): array
{
$model->invoice_number = $model->invoice->invoice_number;
$invoice = $model->invoice;
if (empty($invoice)) {
return [];
}
$model->invoice_number = $invoice->invoice_number;
$model->account_name = $model->account->name;
$model->category_name = $model->category->name;
$model->contact_email = $model->contact->email;