From 528d67b7efd1b8ab97eab107d0f36c8b8fdfea54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <53110792+CihanSenturk@users.noreply.github.com> Date: Fri, 17 Jan 2025 20:30:57 +0300 Subject: [PATCH] updated document import export fields --- app/Exports/Purchases/Bills/Sheets/Bills.php | 4 ++++ .../Purchases/RecurringBills/Sheets/RecurringBills.php | 4 ++++ app/Exports/Sales/Invoices/Sheets/Invoices.php | 4 ++++ .../Sales/RecurringInvoices/Sheets/RecurringInvoices.php | 5 ++++- app/Imports/Purchases/Bills/Sheets/Bills.php | 6 ++++++ .../Purchases/RecurringBills/Sheets/RecurringBills.php | 6 ++++++ app/Imports/Sales/Invoices/Sheets/Invoices.php | 6 ++++++ .../Sales/RecurringInvoices/Sheets/RecurringInvoices.php | 6 ++++++ 8 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/Exports/Purchases/Bills/Sheets/Bills.php b/app/Exports/Purchases/Bills/Sheets/Bills.php index c8183db9b..5cfaf362e 100644 --- a/app/Exports/Purchases/Bills/Sheets/Bills.php +++ b/app/Exports/Purchases/Bills/Sheets/Bills.php @@ -54,7 +54,11 @@ class Bills extends Export implements WithColumnFormatting 'contact_state', 'contact_zip_code', 'contact_city', + 'title', + 'subheading', 'notes', + 'template', + 'color', 'parent_number' ]; } diff --git a/app/Exports/Purchases/RecurringBills/Sheets/RecurringBills.php b/app/Exports/Purchases/RecurringBills/Sheets/RecurringBills.php index 024e3a744..13b02547b 100644 --- a/app/Exports/Purchases/RecurringBills/Sheets/RecurringBills.php +++ b/app/Exports/Purchases/RecurringBills/Sheets/RecurringBills.php @@ -54,7 +54,11 @@ class RecurringBills extends Export implements WithColumnFormatting, WithParentS 'contact_state', 'contact_zip_code', 'contact_city', + 'title', + 'subheading', 'notes', + 'template', + 'color', ]; } diff --git a/app/Exports/Sales/Invoices/Sheets/Invoices.php b/app/Exports/Sales/Invoices/Sheets/Invoices.php index d82068c93..33f85cee5 100644 --- a/app/Exports/Sales/Invoices/Sheets/Invoices.php +++ b/app/Exports/Sales/Invoices/Sheets/Invoices.php @@ -54,8 +54,12 @@ class Invoices extends Export implements WithColumnFormatting 'contact_state', 'contact_zip_code', 'contact_city', + 'title', + 'subheading', 'notes', 'footer', + 'template', + 'color', 'parent_number', ]; } diff --git a/app/Exports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php b/app/Exports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php index aac6fe75f..1c30b30db 100644 --- a/app/Exports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php +++ b/app/Exports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php @@ -28,7 +28,6 @@ class RecurringInvoices extends Export implements WithColumnFormatting, WithPare $model->invoiced_at = $model->issued_at; $model->contact_country = $country; - return parent::map($model); } @@ -55,8 +54,12 @@ class RecurringInvoices extends Export implements WithColumnFormatting, WithPare 'contact_state', 'contact_zip_code', 'contact_city', + 'title', + 'subheading', 'notes', 'footer', + 'template', + 'color', ]; } diff --git a/app/Imports/Purchases/Bills/Sheets/Bills.php b/app/Imports/Purchases/Bills/Sheets/Bills.php index 3681f8999..5a0f441c2 100644 --- a/app/Imports/Purchases/Bills/Sheets/Bills.php +++ b/app/Imports/Purchases/Bills/Sheets/Bills.php @@ -5,10 +5,13 @@ namespace App\Imports\Purchases\Bills\Sheets; use App\Abstracts\Import; use App\Http\Requests\Document\Document as Request; use App\Models\Document\Document as Model; +use App\Traits\Documents; use Illuminate\Support\Str; class Bills extends Import { + Use Documents; + public $request_class = Request::class; public $model = Model::class; @@ -46,6 +49,9 @@ class Bills extends Import $row['currency_code'] = $this->getCurrencyCode($row); $row['type'] = Model::BILL_TYPE; $row['contact_country'] = !empty($country) ? $country : null; + $row['title'] = $row['title'] ?? Model::BILL_TYPE; + $row['template'] = $row['template'] ?? setting($this->getDocumentSettingKey(Model::BILL_TYPE, 'template'), 'default'); + $row['color'] = $row['color'] ?? setting($this->getDocumentSettingKey(Model::BILL_TYPE, 'color'), '#55588b'); $row['parent_id'] = $this->getParentId($row) ?? 0; return $row; diff --git a/app/Imports/Purchases/RecurringBills/Sheets/RecurringBills.php b/app/Imports/Purchases/RecurringBills/Sheets/RecurringBills.php index cae2cc5e0..4550047bf 100644 --- a/app/Imports/Purchases/RecurringBills/Sheets/RecurringBills.php +++ b/app/Imports/Purchases/RecurringBills/Sheets/RecurringBills.php @@ -5,10 +5,13 @@ namespace App\Imports\Purchases\RecurringBills\Sheets; use App\Abstracts\Import; use App\Http\Requests\Document\Document as Request; use App\Models\Document\Document as Model; +use App\Traits\Documents; use Illuminate\Support\Str; class RecurringBills extends Import { + Use Documents; + public $request_class = Request::class; public $model = Model::class; @@ -46,6 +49,9 @@ class RecurringBills extends Import $row['currency_code'] = $this->getCurrencyCode($row); $row['type'] = Model::BILL_RECURRING_TYPE; $row['contact_country'] = !empty($country) ? $country : null; + $row['title'] = $row['title'] ?? Model::BILL_RECURRING_TYPE; + $row['template'] = $row['template'] ?? setting($this->getDocumentSettingKey(Model::BILL_RECURRING_TYPE, 'template'), 'default'); + $row['color'] = $row['color'] ?? setting($this->getDocumentSettingKey(Model::BILL_RECURRING_TYPE, 'color'), '#55588b'); return $row; } diff --git a/app/Imports/Sales/Invoices/Sheets/Invoices.php b/app/Imports/Sales/Invoices/Sheets/Invoices.php index c32f12cdc..5315d2598 100644 --- a/app/Imports/Sales/Invoices/Sheets/Invoices.php +++ b/app/Imports/Sales/Invoices/Sheets/Invoices.php @@ -5,10 +5,13 @@ namespace App\Imports\Sales\Invoices\Sheets; use App\Abstracts\Import; use App\Http\Requests\Document\Document as Request; use App\Models\Document\Document as Model; +use App\Traits\Documents; use Illuminate\Support\Str; class Invoices extends Import { + Use Documents; + public $request_class = Request::class; public $model = Model::class; @@ -46,6 +49,9 @@ class Invoices extends Import $row['currency_code'] = $this->getCurrencyCode($row); $row['type'] = Model::INVOICE_TYPE; $row['contact_country'] = !empty($country) ? $country : null; + $row['title'] = $row['title'] ?? Model::INVOICE_TYPE; + $row['template'] = $row['template'] ?? setting($this->getDocumentSettingKey(Model::INVOICE_TYPE, 'template'), 'default'); + $row['color'] = $row['color'] ?? setting($this->getDocumentSettingKey(Model::INVOICE_TYPE, 'color'), '#55588b'); $row['parent_id'] = $this->getParentId($row) ?? 0; return $row; diff --git a/app/Imports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php b/app/Imports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php index c95083a47..170081077 100644 --- a/app/Imports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php +++ b/app/Imports/Sales/RecurringInvoices/Sheets/RecurringInvoices.php @@ -5,10 +5,13 @@ namespace App\Imports\Sales\RecurringInvoices\Sheets; use App\Abstracts\Import; use App\Http\Requests\Document\Document as Request; use App\Models\Document\Document as Model; +use App\Traits\Documents; use Illuminate\Support\Str; class RecurringInvoices extends Import { + Use Documents; + public $request_class = Request::class; public $model = Model::class; @@ -45,6 +48,9 @@ class RecurringInvoices extends Import $row['contact_id'] = $this->getContactId($row, 'customer'); $row['currency_code'] = $this->getCurrencyCode($row); $row['type'] = Model::INVOICE_RECURRING_TYPE; + $row['title'] = $row['title'] ?? Model::INVOICE_RECURRING_TYPE; + $row['template'] = $row['template'] ?? setting($this->getDocumentSettingKey(Model::INVOICE_RECURRING_TYPE, 'template'), 'default'); + $row['color'] = $row['color'] ?? setting($this->getDocumentSettingKey(Model::INVOICE_RECURRING_TYPE, 'color'), '#55588b'); $row['contact_country'] = !empty($country) ? $country : null; return $row;