Merge pull request #3024 from CihanSenturk/add-recurring-import-export

Added import and export for recurring templates
This commit is contained in:
Cüneyt Şentürk 2023-08-16 17:43:50 +03:00 committed by GitHub
commit e6c029904b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
78 changed files with 1654 additions and 76 deletions

View File

@ -5,7 +5,7 @@ namespace App\BulkActions\Purchases;
use App\Abstracts\BulkAction;
use App\Events\Document\DocumentCancelled;
use App\Events\Document\DocumentReceived;
use App\Exports\Purchases\Bills as Export;
use App\Exports\Purchases\Bills\Bills as Export;
use App\Jobs\Banking\CreateBankingDocumentTransaction;
use App\Jobs\Document\CreateDocumentHistory;
use App\Jobs\Document\DeleteDocument;

View File

@ -7,7 +7,7 @@ use App\Events\Document\DocumentCancelled;
use App\Events\Document\DocumentCreated;
use App\Events\Document\DocumentMarkedSent;
use App\Events\Document\PaymentReceived;
use App\Exports\Sales\Invoices as Export;
use App\Exports\Sales\Invoices\Invoices as Export;
use App\Jobs\Document\DeleteDocument;
use App\Models\Document\Document;

View File

@ -0,0 +1,28 @@
<?php
namespace App\Exports\Banking;
use App\Exports\Banking\Sheets\Recurring;
use App\Exports\Banking\Sheets\RecurringTransactions as Base;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class RecurringTransactions implements WithMultipleSheets
{
use Exportable;
public $ids;
public function __construct($ids = null)
{
$this->ids = $ids;
}
public function sheets(): array
{
return [
new Recurring($this->ids),
new Base($this->ids),
];
}
}

View File

@ -0,0 +1,36 @@
<?php
namespace App\Exports\Banking\Sheets;
use App\Abstracts\Export;
use App\Models\Common\Recurring as Model;
class Recurring extends Export
{
public function collection()
{
return Model::transaction()->cursor();
}
public function map($model): array
{
$model->transaction_number = $model->recurable->number;
return parent::map($model);
}
public function fields(): array
{
return [
'recurable_type',
'transaction_number',
'frequency',
'interval',
'started_at',
'status',
'limit_by',
'limit_count',
'auto_send',
];
}
}

View File

@ -0,0 +1,53 @@
<?php
namespace App\Exports\Banking\Sheets;
use App\Abstracts\Export;
use App\Models\Banking\Transaction as Model;
use Maatwebsite\Excel\Concerns\WithColumnFormatting;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
class RecurringTransactions extends Export implements WithColumnFormatting
{
public function collection()
{
return Model::with('account', 'category', 'contact', 'document')->isRecurring()->cursor();
}
public function map($model): array
{
$model->account_name = $model->account->name;
$model->contact_email = $model->contact->email;
$model->category_name = $model->category->name;
$model->invoice_bill_number = $model->document->document_number ?? 0;
return parent::map($model);
}
public function fields(): array
{
return [
'type',
'number',
'paid_at',
'amount',
'currency_code',
'currency_rate',
'account_name',
'invoice_bill_number',
'contact_email',
'category_name',
'description',
'payment_method',
'reference',
'reconciled',
];
}
public function columnFormats(): array
{
return [
'C' => NumberFormat::FORMAT_DATE_YYYYMMDD,
];
}
}

View File

@ -1,13 +1,13 @@
<?php
namespace App\Exports\Purchases;
namespace App\Exports\Purchases\Bills;
use App\Exports\Purchases\Sheets\Bills as Base;
use App\Exports\Purchases\Sheets\BillItems;
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 App\Exports\Purchases\Bills\Sheets\Bills as Base;
use App\Exports\Purchases\Bills\Sheets\BillItems;
use App\Exports\Purchases\Bills\Sheets\BillItemTaxes;
use App\Exports\Purchases\Bills\Sheets\BillHistories;
use App\Exports\Purchases\Bills\Sheets\BillTotals;
use App\Exports\Purchases\Bills\Sheets\BillTransactions;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Purchases\Sheets;
namespace App\Exports\Purchases\Bills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentHistory as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Purchases\Sheets;
namespace App\Exports\Purchases\Bills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItemTax as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Purchases\Sheets;
namespace App\Exports\Purchases\Bills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItem as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Purchases\Sheets;
namespace App\Exports\Purchases\Bills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentTotal as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Purchases\Sheets;
namespace App\Exports\Purchases\Bills\Sheets;
use App\Abstracts\Export;
use App\Models\Banking\Transaction as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Purchases\Sheets;
namespace App\Exports\Purchases\Bills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\Document as Model;

View File

@ -0,0 +1,36 @@
<?php
namespace App\Exports\Purchases\RecurringBills;
use App\Exports\Purchases\RecurringBills\Sheets\Recurring;
use App\Exports\Purchases\RecurringBills\Sheets\RecurringBills as Base;
use App\Exports\Purchases\RecurringBills\Sheets\RecurringBillItems;
use App\Exports\Purchases\RecurringBills\Sheets\RecurringBillItemTaxes;
use App\Exports\Purchases\RecurringBills\Sheets\RecurringBillHistories;
use App\Exports\Purchases\RecurringBills\Sheets\RecurringBillTotals;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class RecurringBills implements WithMultipleSheets
{
use Exportable;
public $ids;
public function __construct($ids = null)
{
$this->ids = $ids;
}
public function sheets(): array
{
return [
new Recurring($this->ids),
new Base($this->ids),
new RecurringBillItems($this->ids),
new RecurringBillItemTaxes($this->ids),
new RecurringBillHistories($this->ids),
new RecurringBillTotals($this->ids),
];
}
}

View File

@ -0,0 +1,36 @@
<?php
namespace App\Exports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Export;
use App\Models\Common\Recurring as Model;
class Recurring extends Export
{
public function collection()
{
return Model::bill()->cursor();
}
public function map($model): array
{
$model->bill_number = $model->recurable->document_number;
return parent::map($model);
}
public function fields(): array
{
return [
'recurable_type',
'bill_number',
'frequency',
'interval',
'started_at',
'status',
'limit_by',
'limit_count',
'auto_send',
];
}
}

View File

@ -0,0 +1,37 @@
<?php
namespace App\Exports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentHistory as Model;
class RecurringBillHistories extends Export
{
public function collection()
{
return Model::with('document')->billRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->bill_number = $document->document_number;
return parent::map($model);
}
public function fields(): array
{
return [
'bill_number',
'status',
'notify',
'description',
];
}
}

View File

@ -0,0 +1,39 @@
<?php
namespace App\Exports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItemTax as Model;
class RecurringBillItemTaxes extends Export
{
public function collection()
{
return Model::with('document', 'item', 'tax')->billRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->bill_number = $document->document_number;
$model->item_name = $model->item->name;
$model->tax_rate = $model->tax->rate;
return parent::map($model);
}
public function fields(): array
{
return [
'bill_number',
'item_name',
'tax_rate',
'amount',
];
}
}

View File

@ -0,0 +1,44 @@
<?php
namespace App\Exports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItem as Model;
class RecurringBillItems extends Export
{
public function collection()
{
return Model::with('document', 'item')->billRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->bill_number = $document->document_number;
$model->item_name = $model->item->name;
$model->item_description = $model->item->description;
$model->item_type = $model->item->type;
return parent::map($model);
}
public function fields(): array
{
return [
'bill_number',
'item_name',
'item_description',
'item_type',
'quantity',
'price',
'total',
'tax',
];
}
}

View File

@ -0,0 +1,38 @@
<?php
namespace App\Exports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentTotal as Model;
class RecurringBillTotals extends Export
{
public function collection()
{
return Model::with('document')->billRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->bill_number = $document->document_number;
return parent::map($model);
}
public function fields(): array
{
return [
'bill_number',
'code',
'name',
'amount',
'sort_order',
];
}
}

View File

@ -0,0 +1,65 @@
<?php
namespace App\Exports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Export;
use App\Models\Document\Document as Model;
use Maatwebsite\Excel\Concerns\WithColumnFormatting;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
class RecurringBills extends Export implements WithColumnFormatting
{
public function collection()
{
return Model::with('category')->billRecurring()->collectForExport($this->ids, ['document_number' => 'desc']);
}
public function map($model): array
{
$country = null;
if ($model->contact_country && array_key_exists($model->contact_country, trans('countries'))) {
$country = trans('countries.' . $model->contact_country);
}
$model->category_name = $model->category->name;
$model->bill_number = $model->document_number;
$model->billed_at = $model->issued_at;
$model->contact_country = $country;
return parent::map($model);
}
public function fields(): array
{
return [
'bill_number',
'order_number',
'status',
'billed_at',
'due_at',
'amount',
'currency_code',
'currency_rate',
'category_name',
'contact_name',
'contact_email',
'contact_tax_number',
'contact_phone',
'contact_address',
'contact_country',
'contact_state',
'contact_zip_code',
'contact_city',
'notes',
];
}
public function columnFormats(): array
{
return [
'D' => NumberFormat::FORMAT_DATE_YYYYMMDD,
'E' => NumberFormat::FORMAT_DATE_YYYYMMDD,
];
}
}

View File

@ -1,13 +1,13 @@
<?php
namespace App\Exports\Sales;
namespace App\Exports\Sales\Invoices;
use App\Exports\Sales\Sheets\Invoices as Base;
use App\Exports\Sales\Sheets\InvoiceItems;
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 App\Exports\Sales\Invoices\Sheets\Invoices as Base;
use App\Exports\Sales\Invoices\Sheets\InvoiceItems;
use App\Exports\Sales\Invoices\Sheets\InvoiceItemTaxes;
use App\Exports\Sales\Invoices\Sheets\InvoiceHistories;
use App\Exports\Sales\Invoices\Sheets\InvoiceTotals;
use App\Exports\Sales\Invoices\Sheets\InvoiceTransactions;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Sales\Sheets;
namespace App\Exports\Sales\Invoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentHistory as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Sales\Sheets;
namespace App\Exports\Sales\Invoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItemTax as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Sales\Sheets;
namespace App\Exports\Sales\Invoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItem as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Sales\Sheets;
namespace App\Exports\Sales\Invoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentTotal as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Sales\Sheets;
namespace App\Exports\Sales\Invoices\Sheets;
use App\Abstracts\Export;
use App\Models\Banking\Transaction as Model;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Exports\Sales\Sheets;
namespace App\Exports\Sales\Invoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\Document as Model;

View File

@ -0,0 +1,36 @@
<?php
namespace App\Exports\Sales\RecurringInvoices;
use App\Exports\Sales\RecurringInvoices\Sheets\Recurring;
use App\Exports\Sales\RecurringInvoices\Sheets\RecurringInvoices as Base;
use App\Exports\Sales\RecurringInvoices\Sheets\RecurringInvoiceItems;
use App\Exports\Sales\RecurringInvoices\Sheets\RecurringInvoiceItemTaxes;
use App\Exports\Sales\RecurringInvoices\Sheets\RecurringInvoiceHistories;
use App\Exports\Sales\RecurringInvoices\Sheets\RecurringInvoiceTotals;
use Maatwebsite\Excel\Concerns\Exportable;
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class RecurringInvoices implements WithMultipleSheets
{
use Exportable;
public $ids;
public function __construct($ids = null)
{
$this->ids = $ids;
}
public function sheets(): array
{
return [
new Recurring($this->ids),
new Base($this->ids),
new RecurringInvoiceItems($this->ids),
new RecurringInvoiceItemTaxes($this->ids),
new RecurringInvoiceHistories($this->ids),
new RecurringInvoiceTotals($this->ids),
];
}
}

View File

@ -0,0 +1,36 @@
<?php
namespace App\Exports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Export;
use App\Models\Common\Recurring as Model;
class Recurring extends Export
{
public function collection()
{
return Model::invoice()->cursor();
}
public function map($model): array
{
$model->invoice_number = $model->recurable->document_number;
return parent::map($model);
}
public function fields(): array
{
return [
'recurable_type',
'invoice_number',
'frequency',
'interval',
'started_at',
'status',
'limit_by',
'limit_count',
'auto_send',
];
}
}

View File

@ -0,0 +1,37 @@
<?php
namespace App\Exports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentHistory as Model;
class RecurringInvoiceHistories extends Export
{
public function collection()
{
return Model::with('document')->invoiceRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->invoice_number = $document->document_number;
return parent::map($model);
}
public function fields(): array
{
return [
'invoice_number',
'status',
'notify',
'description',
];
}
}

View File

@ -0,0 +1,39 @@
<?php
namespace App\Exports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItemTax as Model;
class RecurringInvoiceItemTaxes extends Export
{
public function collection()
{
return Model::with('document', 'item', 'tax')->invoiceRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->invoice_number = $document->document_number;
$model->item_name = $model->item->name;
$model->tax_rate = $model->tax->rate;
return parent::map($model);
}
public function fields(): array
{
return [
'invoice_number',
'item_name',
'tax_rate',
'amount',
];
}
}

View File

@ -0,0 +1,44 @@
<?php
namespace App\Exports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentItem as Model;
class RecurringInvoiceItems extends Export
{
public function collection()
{
return Model::with('document', 'item')->invoiceRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->invoice_number = $document->document_number;
$model->item_name = $model->item->name;
$model->item_description = $model->item->description;
$model->item_type = $model->item->type;
return parent::map($model);
}
public function fields(): array
{
return [
'invoice_number',
'item_name',
'item_description',
'item_type',
'quantity',
'price',
'total',
'tax',
];
}
}

View File

@ -0,0 +1,38 @@
<?php
namespace App\Exports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\DocumentTotal as Model;
class RecurringInvoiceTotals extends Export
{
public function collection()
{
return Model::with('document')->invoiceRecurring()->collectForExport($this->ids, null, 'document_id');
}
public function map($model): array
{
$document = $model->document;
if (empty($document)) {
return [];
}
$model->invoice_number = $document->document_number;
return parent::map($model);
}
public function fields(): array
{
return [
'invoice_number',
'code',
'name',
'amount',
'sort_order',
];
}
}

View File

@ -0,0 +1,67 @@
<?php
namespace App\Exports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Export;
use App\Models\Document\Document as Model;
use Maatwebsite\Excel\Concerns\WithColumnFormatting;
use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
class RecurringInvoices extends Export implements WithColumnFormatting
{
public function collection()
{
return Model::with('category')->invoiceRecurring()->collectForExport($this->ids, ['document_number' => 'desc']);
}
public function map($model): array
{
$country = null;
if ($model->contact_country && array_key_exists($model->contact_country, trans('countries'))) {
$country = trans('countries.' . $model->contact_country);
}
$model->category_name = $model->category->name;
$model->invoice_number = $model->document_number;
$model->invoiced_at = $model->issued_at;
$model->contact_country = $country;
return parent::map($model);
}
public function fields(): array
{
return [
'invoice_number',
'order_number',
'status',
'invoiced_at',
'due_at',
'amount',
'currency_code',
'currency_rate',
'category_name',
'contact_name',
'contact_email',
'contact_tax_number',
'contact_phone',
'contact_address',
'contact_country',
'contact_state',
'contact_zip_code',
'contact_city',
'notes',
'footer',
];
}
public function columnFormats(): array
{
return [
'D' => NumberFormat::FORMAT_DATE_YYYYMMDD,
'E' => NumberFormat::FORMAT_DATE_YYYYMMDD,
];
}
}

View File

@ -3,7 +3,10 @@
namespace App\Http\Controllers\Banking;
use App\Abstracts\Http\Controller;
use App\Exports\Banking\RecurringTransactions as Export;
use App\Http\Requests\Banking\Transaction as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Banking\RecurringTransactions as Import;
use App\Jobs\Banking\CreateTransaction;
use App\Jobs\Banking\UpdateTransaction;
use App\Models\Banking\Account;
@ -97,7 +100,7 @@ class RecurringTransactions extends Controller
if ($response['success']) {
$response['redirect'] = route('recurring-transactions.show', $response['data']->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.transactions', 1)]);
$message = trans('messages.success.added', ['type' => trans_choice('general.recurring_transactions', 1)]);
flash($message)->success();
} else {
@ -122,13 +125,37 @@ class RecurringTransactions extends Controller
{
$clone = $recurring_transaction->duplicate();
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.transactions', 1)]);
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.recurring_transactions', 1)]);
flash($message)->success();
return redirect()->route('recurring-transactions.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportRequest $request)
{
$response = $this->importExcel(new Import, $request, trans_choice('general.recurring_transactions', 2));
if ($response['success']) {
$response['redirect'] = route('recurring-transactions.index');
flash($response['message'])->success();
} else {
$response['redirect'] = route('import.create', ['banking', 'recurring-transactions']);
flash($response['message'])->error()->important();
}
return response()->json($response);
}
/**
* Show the form for editing the specified resource.
*
@ -174,7 +201,7 @@ class RecurringTransactions extends Controller
if ($response['success']) {
$response['redirect'] = route('recurring-transactions.show', $recurring_transaction->id);
$message = trans('messages.success.updated', ['type' => trans_choice('general.transactions', 1)]);
$message = trans('messages.success.updated', ['type' => trans_choice('general.recurring_transactions', 1)]);
flash($message)->success();
} else {
@ -187,6 +214,16 @@ class RecurringTransactions extends Controller
return response()->json($response);
}
/**
* Export the specified resource.
*
* @return Response
*/
public function export()
{
return $this->exportExcel(new Export, trans_choice('general.recurring_transactions', 2));
}
/**
* End recurring template.

View File

@ -3,10 +3,10 @@
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Purchases\Bills as Export;
use App\Exports\Purchases\Bills\Bills as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Document\Document as Request;
use App\Imports\Purchases\Bills as Import;
use App\Imports\Purchases\Bills\Bills as Import;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DeleteDocument;
use App\Jobs\Document\DuplicateDocument;

View File

@ -3,7 +3,10 @@
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Purchases\RecurringBills\RecurringBills as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Document\Document as Request;
use App\Imports\Purchases\RecurringBills\RecurringBills as Import;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DuplicateDocument;
use App\Jobs\Document\UpdateDocument;
@ -114,6 +117,30 @@ class RecurringBills extends Controller
return redirect()->route('recurring-bills.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportRequest $request)
{
$response = $this->importExcel(new Import, $request, trans_choice('general.recurring_bills', 2));
if ($response['success']) {
$response['redirect'] = route('recurring-bills.index');
flash($response['message'])->success();
} else {
$response['redirect'] = route('import.create', ['purchases', 'recurring-bills']);
flash($response['message'])->error()->important();
}
return response()->json($response);
}
/**
* Show the form for editing the specified resource.
*
@ -155,6 +182,16 @@ class RecurringBills extends Controller
return response()->json($response);
}
/**
* Export the specified resource.
*
* @return Response
*/
public function export()
{
return $this->exportExcel(new Export, trans_choice('general.recurring_bills', 2));
}
/**
* End recurring template.
*

View File

@ -3,10 +3,10 @@
namespace App\Http\Controllers\Sales;
use App\Abstracts\Http\Controller;
use App\Exports\Sales\Invoices as Export;
use App\Exports\Sales\Invoices\Invoices as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Document\Document as Request;
use App\Imports\Sales\Invoices as Import;
use App\Imports\Sales\Invoices\Invoices as Import;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DeleteDocument;
use App\Jobs\Document\DuplicateDocument;

View File

@ -3,7 +3,10 @@
namespace App\Http\Controllers\Sales;
use App\Abstracts\Http\Controller;
use App\Exports\Sales\RecurringInvoices\RecurringInvoices as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Document\Document as Request;
use App\Imports\Sales\RecurringInvoices\RecurringInvoices as Import;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DuplicateDocument;
use App\Jobs\Document\UpdateDocument;
@ -114,6 +117,30 @@ class RecurringInvoices extends Controller
return redirect()->route('recurring-invoices.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportRequest $request)
{
$response = $this->importExcel(new Import, $request, trans_choice('general.recurring_invoices', 2));
if ($response['success']) {
$response['redirect'] = route('recurring-invoices.index');
flash($response['message'])->success();
} else {
$response['redirect'] = route('import.create', ['sales', 'recurring-invoices']);
flash($response['message'])->error()->important();
}
return response()->json($response);
}
/**
* Show the form for editing the specified resource.
*
@ -155,6 +182,16 @@ class RecurringInvoices extends Controller
return response()->json($response);
}
/**
* Export the specified resource.
*
* @return Response
*/
public function export()
{
return $this->exportExcel(new Export, trans_choice('general.recurring_invoices', 2));
}
/**
* End recurring template.
*

View File

@ -0,0 +1,18 @@
<?php
namespace App\Imports\Banking;
use App\Abstracts\ImportMultipleSheets;
use App\Imports\Banking\Sheets\Recurring;
use App\Imports\Banking\Sheets\RecurringTransactions as Base;
class RecurringTransactions extends ImportMultipleSheets
{
public function sheets(): array
{
return [
'recurring_transactions' => new Base(),
'recurring' => new Recurring(),
];
}
}

View File

@ -0,0 +1,24 @@
<?php
namespace App\Imports\Banking\Sheets;
use App\Abstracts\Import;
use App\Models\Banking\Transaction;
use App\Models\Common\Recurring as Model;
class Recurring extends Import
{
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
$row = parent::map($row);
$row['recurable_id'] = (int) Transaction::isRecurring()->number($row['transaction_number'])->pluck('id')->first();
return $row;
}
}

View File

@ -0,0 +1,38 @@
<?php
namespace App\Imports\Banking\Sheets;
use App\Abstracts\Import;
use App\Models\Document\Document;
use App\Models\Banking\Transaction as Model;
use App\Http\Requests\Banking\Transaction as Request;
class RecurringTransactions extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
$row = parent::map($row);
$transaction_type = str_replace('-recurring', '', $row['type']);
$row['currency_code'] = $this->getCurrencyCode($row);
$row['account_id'] = $this->getAccountId($row);
$row['category_id'] = $this->getCategoryId($row, $transaction_type);
$row['contact_id'] = $this->getContactId($row, $transaction_type);
if ($transaction_type == 'income') {
$row['document_id'] = Document::invoiceRecurring()->number($row['invoice_bill_number'])->pluck('id')->first();
} else {
$row['document_id'] = Document::billRecurring()->number($row['invoice_bill_number'])->pluck('id')->first();
}
return $row;
}
}

View File

@ -1,14 +1,14 @@
<?php
namespace App\Imports\Purchases;
namespace App\Imports\Purchases\Bills;
use App\Abstracts\ImportMultipleSheets;
use App\Imports\Purchases\Sheets\Bills as Base;
use App\Imports\Purchases\Sheets\BillItems;
use App\Imports\Purchases\Sheets\BillItemTaxes;
use App\Imports\Purchases\Sheets\BillHistories;
use App\Imports\Purchases\Sheets\BillTotals;
use App\Imports\Purchases\Sheets\BillTransactions;
use App\Imports\Purchases\Bills\Sheets\Bills as Base;
use App\Imports\Purchases\Bills\Sheets\BillItems;
use App\Imports\Purchases\Bills\Sheets\BillItemTaxes;
use App\Imports\Purchases\Bills\Sheets\BillHistories;
use App\Imports\Purchases\Bills\Sheets\BillTotals;
use App\Imports\Purchases\Bills\Sheets\BillTransactions;
class Bills extends ImportMultipleSheets
{

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Purchases\Sheets;
namespace App\Imports\Purchases\Bills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentHistory as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Purchases\Sheets;
namespace App\Imports\Purchases\Bills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItemTax as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Purchases\Sheets;
namespace App\Imports\Purchases\Bills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItem as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Purchases\Sheets;
namespace App\Imports\Purchases\Bills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentTotal as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Purchases\Sheets;
namespace App\Imports\Purchases\Bills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Banking\Transaction as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Purchases\Sheets;
namespace App\Imports\Purchases\Bills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\Document as Request;

View File

@ -0,0 +1,26 @@
<?php
namespace App\Imports\Purchases\RecurringBills;
use App\Abstracts\ImportMultipleSheets;
use App\Imports\Purchases\RecurringBills\Sheets\Recurring;
use App\Imports\Purchases\RecurringBills\Sheets\RecurringBills as Base;
use App\Imports\Purchases\RecurringBills\Sheets\RecurringBillItems;
use App\Imports\Purchases\RecurringBills\Sheets\RecurringBillItemTaxes;
use App\Imports\Purchases\RecurringBills\Sheets\RecurringBillHistories;
use App\Imports\Purchases\RecurringBills\Sheets\RecurringBillTotals;
class RecurringBills extends ImportMultipleSheets
{
public function sheets(): array
{
return [
'recurring_bills' => new Base(),
'recurring_bill_items' => new RecurringBillItems(),
'recurring_bill_item_taxes' => new RecurringBillItemTaxes(),
'recurring_bill_histories' => new RecurringBillHistories(),
'recurring_bill_totals' => new RecurringBillTotals(),
'recurring' => new Recurring(),
];
}
}

View File

@ -0,0 +1,27 @@
<?php
namespace App\Imports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Import;
use App\Models\Document\Document;
use App\Models\Common\Recurring as Model;
class Recurring extends Import
{
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
$row = parent::map($row);
$row['recurable_id'] = (int) Document::where('type', '=', Document::BILL_RECURRING_TYPE)
->number($row['bill_number'])
->pluck('id')
->first();
return $row;
}
}

View File

@ -0,0 +1,49 @@
<?php
namespace App\Imports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentHistory as Request;
use App\Models\Document\Document;
use App\Models\Document\DocumentHistory as Model;
class RecurringBillHistories extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'bill_number')) {
return [];
}
$row['bill_number'] = (string) $row['bill_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::BILL_RECURRING_TYPE)
->number($row['bill_number'])
->pluck('id')
->first();
$row['notify'] = (int) $row['notify'];
$row['type'] = Document::BILL_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['bill_number'] = 'required|string';
unset($rules['bill_id']);
return $rules;
}
}

View File

@ -0,0 +1,66 @@
<?php
namespace App\Imports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItemTax as Request;
use App\Models\Common\Item;
use App\Models\Document\Document;
use App\Models\Document\DocumentItem;
use App\Models\Document\DocumentItemTax as Model;
class RecurringBillItemTaxes extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'bill_number')) {
return [];
}
$row['bill_number'] = (string) $row['bill_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::BILL_RECURRING_TYPE)
->number($row['bill_number'])
->pluck('id')
->first();
if (empty($row['document_item_id']) && !empty($row['item_name'])) {
$item_id = Item::name($row['item_name'])->pluck('id')->first();
$row['document_item_id'] = DocumentItem::where('type', '=', Document::BILL_RECURRING_TYPE)
->where('item_id', $item_id)
->pluck('id')
->first();
}
$row['tax_id'] = $this->getTaxId($row);
if (empty($row['name']) && !empty($row['item_name'])) {
$row['name'] = $row['item_name'];
}
$row['amount'] = (double) $row['amount'];
$row['type'] = Document::BILL_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['bill_number'] = 'required|string';
unset($rules['bill_id']);
return $rules;
}
}

View File

@ -0,0 +1,57 @@
<?php
namespace App\Imports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItem as Request;
use App\Models\Document\Document;
use App\Models\Document\DocumentItem as Model;
class RecurringBillItems extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'bill_number')) {
return [];
}
$row['bill_number'] = (string) $row['bill_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::BILL_RECURRING_TYPE)
->number($row['bill_number'])
->pluck('id')
->first();
if (empty($row['item_id']) && !empty($row['item_name'])) {
$row['item_id'] = $this->getItemIdFromName($row);
$row['name'] = $row['item_name'];
}
$row['description'] = !empty($row['item_description']) ? $row['item_description'] : '';
$row['tax'] = (double) $row['tax'];
$row['tax_id'] = 0;
$row['type'] = Document::BILL_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['bill_number'] = 'required|string';
unset($rules['bill_id']);
return $rules;
}
}

View File

@ -0,0 +1,47 @@
<?php
namespace App\Imports\Purchases\RecurringBills\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentTotal as Request;
use App\Models\Document\Document;
use App\Models\Document\DocumentTotal as Model;
class RecurringBillTotals extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'bill_number')) {
return [];
}
$row['bill_number'] = (string) $row['bill_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::BILL_RECURRING_TYPE)
->number($row['bill_number'])
->pluck('id')
->first();
$row['type'] = Document::BILL_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['bill_number'] = 'required|string';
unset($rules['bill_id']);
return $rules;
}
}

View File

@ -0,0 +1,52 @@
<?php
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 Illuminate\Support\Str;
class RecurringBills extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'bill_number')) {
return [];
}
$row['bill_number'] = (string) $row['bill_number'];
$row = parent::map($row);
$country = array_search($row['contact_country'], trans('countries'));
$row['document_number'] = $row['bill_number'];
$row['issued_at'] = $row['billed_at'];
$row['category_id'] = $this->getCategoryId($row, 'expense');
$row['contact_id'] = $this->getContactId($row, 'vendor');
$row['currency_code'] = $this->getCurrencyCode($row);
$row['type'] = Model::BILL_RECURRING_TYPE;
$row['contact_country'] = !empty($country) ? $country : null;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['bill_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
$rules['billed_at'] = $rules['issued_at'];
$rules['currency_rate'] = 'required|gt:0';
unset($rules['document_number'], $rules['issued_at'], $rules['type']);
return $rules;
}
}

View File

@ -1,14 +1,14 @@
<?php
namespace App\Imports\Sales;
namespace App\Imports\Sales\Invoices;
use App\Abstracts\ImportMultipleSheets;
use App\Imports\Sales\Sheets\Invoices as Base;
use App\Imports\Sales\Sheets\InvoiceItems;
use App\Imports\Sales\Sheets\InvoiceItemTaxes;
use App\Imports\Sales\Sheets\InvoiceHistories;
use App\Imports\Sales\Sheets\InvoiceTotals;
use App\Imports\Sales\Sheets\InvoiceTransactions;
use App\Imports\Sales\Invoices\Sheets\Invoices as Base;
use App\Imports\Sales\Invoices\Sheets\InvoiceItems;
use App\Imports\Sales\Invoices\Sheets\InvoiceItemTaxes;
use App\Imports\Sales\Invoices\Sheets\InvoiceHistories;
use App\Imports\Sales\Invoices\Sheets\InvoiceTotals;
use App\Imports\Sales\Invoices\Sheets\InvoiceTransactions;
class Invoices extends ImportMultipleSheets
{

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Sales\Sheets;
namespace App\Imports\Sales\Invoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentHistory as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Sales\Sheets;
namespace App\Imports\Sales\Invoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItemTax as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Sales\Sheets;
namespace App\Imports\Sales\Invoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItem as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Sales\Sheets;
namespace App\Imports\Sales\Invoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentTotal as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Sales\Sheets;
namespace App\Imports\Sales\Invoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Banking\Transaction as Request;

View File

@ -1,6 +1,6 @@
<?php
namespace App\Imports\Sales\Sheets;
namespace App\Imports\Sales\Invoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\Document as Request;

View File

@ -0,0 +1,26 @@
<?php
namespace App\Imports\Sales\RecurringInvoices;
use App\Abstracts\ImportMultipleSheets;
use App\Imports\Sales\RecurringInvoices\Sheets\Recurring;
use App\Imports\Sales\RecurringInvoices\Sheets\RecurringInvoices as Base;
use App\Imports\Sales\RecurringInvoices\Sheets\RecurringInvoiceItems;
use App\Imports\Sales\RecurringInvoices\Sheets\RecurringInvoiceItemTaxes;
use App\Imports\Sales\RecurringInvoices\Sheets\RecurringInvoiceHistories;
use App\Imports\Sales\RecurringInvoices\Sheets\RecurringInvoiceTotals;
class RecurringInvoices extends ImportMultipleSheets
{
public function sheets(): array
{
return [
'recurring_invoices' => new Base(),
'recurring_invoice_items' => new RecurringInvoiceItems(),
'recurring_invoice_item_taxes' => new RecurringInvoiceItemTaxes(),
'recurring_invoice_histories' => new RecurringInvoiceHistories(),
'recurring_invoice_totals' => new RecurringInvoiceTotals(),
'recurring' => new Recurring(),
];
}
}

View File

@ -0,0 +1,27 @@
<?php
namespace App\Imports\Sales\RecurringInvoices\Sheets;
use App\Models\Document\Document;
use App\Models\Common\Recurring as Model;
use Modules\BackupRestore\Abstracts\Import;
class Recurring extends Import
{
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
$row = parent::map($row);
$row['recurable_id'] = (int) Document::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->number($row['invoice_number'])
->pluck('id')
->first();
return $row;
}
}

View File

@ -0,0 +1,49 @@
<?php
namespace App\Imports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentHistory as Request;
use App\Models\Document\Document;
use App\Models\Document\DocumentHistory as Model;
class RecurringInvoiceHistories extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'invoice_number')) {
return [];
}
$row['invoice_number'] = (string) $row['invoice_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->number($row['invoice_number'])
->pluck('id')
->first();
$row['notify'] = (int) $row['notify'];
$row['type'] = Document::INVOICE_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['invoice_number'] = 'required|string';
unset($rules['invoice_id']);
return $rules;
}
}

View File

@ -0,0 +1,66 @@
<?php
namespace App\Imports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItemTax as Request;
use App\Models\Common\Item;
use App\Models\Document\Document;
use App\Models\Document\DocumentItem;
use App\Models\Document\DocumentItemTax as Model;
class RecurringInvoiceItemTaxes extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'invoice_number')) {
return [];
}
$row['invoice_number'] = (string) $row['invoice_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->number($row['invoice_number'])
->pluck('id')
->first();
if (empty($row['document_item_id']) && !empty($row['item_name'])) {
$item_id = Item::name($row['item_name'])->pluck('id')->first();
$row['document_item_id'] = DocumentItem::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->where('item_id', $item_id)
->pluck('id')
->first();
}
$row['tax_id'] = $this->getTaxId($row);
if (empty($row['name']) && !empty($row['item_name'])) {
$row['name'] = $row['item_name'];
}
$row['amount'] = (double) $row['amount'];
$row['type'] = Document::INVOICE_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['invoice_number'] = 'required|string';
unset($rules['invoice_id']);
return $rules;
}
}

View File

@ -0,0 +1,57 @@
<?php
namespace App\Imports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentItem as Request;
use App\Models\Document\Document;
use App\Models\Document\DocumentItem as Model;
class RecurringInvoiceItems extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'invoice_number')) {
return [];
}
$row['invoice_number'] = (string) $row['invoice_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->number($row['invoice_number'])
->pluck('id')
->first();
if (empty($row['item_id']) && ! empty($row['item_name'])) {
$row['item_id'] = $this->getItemIdFromName($row);
$row['name'] = $row['item_name'];
}
$row['description'] = !empty($row['item_description']) ? $row['item_description'] : '';
$row['tax'] = (double) $row['tax'];
$row['tax_id'] = 0;
$row['type'] = Document::INVOICE_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['invoice_number'] = 'required|string';
unset($rules['invoice_id']);
return $rules;
}
}

View File

@ -0,0 +1,47 @@
<?php
namespace App\Imports\Sales\RecurringInvoices\Sheets;
use App\Abstracts\Import;
use App\Http\Requests\Document\DocumentTotal as Request;
use App\Models\Document\Document;
use App\Models\Document\DocumentTotal as Model;
class RecurringInvoiceTotals extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'invoice_number')) {
return [];
}
$row['invoice_number'] = (string) $row['invoice_number'];
$row = parent::map($row);
$row['document_id'] = (int) Document::where('type', '=', Document::INVOICE_RECURRING_TYPE)
->number($row['invoice_number'])
->pluck('id')
->first();
$row['type'] = Document::INVOICE_RECURRING_TYPE;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['invoice_number'] = 'required|string';
unset($rules['invoice_id']);
return $rules;
}
}

View File

@ -0,0 +1,52 @@
<?php
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 Illuminate\Support\Str;
class RecurringInvoices extends Import
{
public $request_class = Request::class;
public function model(array $row)
{
return new Model($row);
}
public function map($row): array
{
if ($this->isEmpty($row, 'invoice_number')) {
return [];
}
$row['invoice_number'] = (string) $row['invoice_number'];
$row = parent::map($row);
$country = array_search($row['contact_country'], trans('countries'));
$row['document_number'] = $row['invoice_number'];
$row['issued_at'] = $row['invoiced_at'];
$row['category_id'] = $this->getCategoryId($row, 'income');
$row['contact_id'] = $this->getContactId($row, 'customer');
$row['currency_code'] = $this->getCurrencyCode($row);
$row['type'] = Model::INVOICE_RECURRING_TYPE;
$row['contact_country'] = !empty($country) ? $country : null;
return $row;
}
public function prepareRules(array $rules): array
{
$rules['invoice_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
$rules['invoiced_at'] = $rules['issued_at'];
$rules['currency_rate'] = 'required|gt:0';
unset($rules['document_number'], $rules['issued_at'], $rules['type']);
return $rules;
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -21,6 +21,24 @@
@endcan
</x-slot>
<x-slot name="moreButtons">
<x-dropdown id="dropdown-more-actions">
<x-slot name="trigger">
<span class="material-icons pointer-events-none">more_horiz</span>
</x-slot>
@can('create-banking-transactions')
<x-dropdown.link href="{{ route('import.create', ['banking', 'recurring-transactions']) }}">
{{ trans('import.import') }}
</x-dropdown.link>
@endcan
<x-dropdown.link href="{{ route('recurring-transactions.export', request()->input()) }}">
{{ trans('general.export') }}
</x-dropdown.link>
</x-dropdown>
</x-slot>
<x-slot name="content">
@if ($transactions->count() || request()->get('search', false))
<x-index.container>
@ -141,23 +159,29 @@
<x-empty-page
group="banking"
page="recurring_templates"
hide-button-import
permission-create="create-banking-transactions"
:buttons="[
[
'url' => route('recurring-transactions.create', ['type' => 'income-recurring']),
'permission' => 'create-banking-transactions',
'text' => trans('general.title.new', ['type' => trans_choice('general.recurring_incomes', 1)]),
'description' => '',
'active_badge' => true,
'url' => route('recurring-transactions.create', ['type' => 'income-recurring']),
'permission' => 'create-banking-transactions',
'text' => trans('general.title.new', ['type' => trans_choice('general.recurring_incomes', 1)]),
'description' => '',
'active_badge' => true,
],
[
'url' => route('recurring-transactions.create', ['type' => 'expense-recurring']),
'permission' => 'create-banking-transactions',
'text' => trans('general.title.new', ['type' => trans_choice('general.recurring_expenses', 1)]),
'description' => '',
'active_badge' => true,
'url' => route('recurring-transactions.create', ['type' => 'expense-recurring']),
'permission' => 'create-banking-transactions',
'text' => trans('general.title.new', ['type' => trans_choice('general.recurring_expenses', 1)]),
'description' => '',
'active_badge' => true,
],
[
'url' => route('import.create', ['banking', 'recurring-transactions']),
'permission' => 'create-banking-transactions',
'text' => trans('import.title', ['type' => trans_choice('general.recurring_transactions', 2)]),
'description' => trans('general.empty.actions.import', ['type' => strtolower(trans_choice('general.recurring_transactions', 2))]),
'active_badge' => false,
],
]"
/>
@endif

View File

@ -14,7 +14,7 @@
</x-slot>
<x-slot name="moreButtons">
<x-documents.index.more-buttons type="bill-recurring" hide-export hide-cancelled />
<x-documents.index.more-buttons type="bill-recurring" hide-cancelled />
</x-slot>
<x-slot name="content">

View File

@ -14,7 +14,7 @@
</x-slot>
<x-slot name="moreButtons">
<x-documents.index.more-buttons type="invoice-recurring" hide-export />
<x-documents.index.more-buttons type="invoice-recurring" />
</x-slot>
<x-slot name="content">

View File

@ -80,6 +80,8 @@ Route::group(['prefix' => 'sales'], function () {
Route::get('recurring-invoices/{recurring_invoice}/duplicate', 'Sales\RecurringInvoices@duplicate')->name('recurring-invoices.duplicate');
Route::get('recurring-invoices/{recurring_invoice}/end', 'Sales\RecurringInvoices@end')->name('recurring-invoices.end');
Route::post('recurring-invoices/import', 'Sales\RecurringInvoices@import')->middleware('import')->name('recurring-invoices.import');
Route::get('recurring-invoices/export', 'Sales\RecurringInvoices@export')->name('recurring-invoices.export');
Route::resource('recurring-invoices', 'Sales\RecurringInvoices', ['middleware' => ['date.format', 'money', 'dropzone']]);
Route::get('customers/{customer}/create-invoice', 'Sales\Customers@createInvoice')->name('customers.create-invoice');
@ -104,6 +106,8 @@ Route::group(['prefix' => 'purchases'], function () {
Route::get('recurring-bills/{recurring_bill}/duplicate', 'Purchases\RecurringBills@duplicate')->name('recurring-bills.duplicate');
Route::get('recurring-bills/{recurring_bill}/end', 'Purchases\RecurringBills@end')->name('recurring-bills.end');
Route::post('recurring-bills/import', 'Purchases\RecurringBills@import')->middleware('import')->name('recurring-bills.import');
Route::get('recurring-bills/export', 'Purchases\RecurringBills@export')->name('recurring-bills.export');
Route::resource('recurring-bills', 'Purchases\RecurringBills', ['middleware' => ['date.format', 'money', 'dropzone']]);
Route::get('vendors/{vendor}/create-bill', 'Purchases\Vendors@createBill')->name('vendors.create-bill');
@ -142,6 +146,8 @@ Route::group(['prefix' => 'banking'], function () {
Route::get('recurring-transactions/{recurring_transaction}/duplicate', 'Banking\RecurringTransactions@duplicate')->name('recurring-transactions.duplicate');
Route::get('recurring-transactions/{recurring_transaction}/end', 'Banking\RecurringTransactions@end')->name('recurring-transactions.end');
Route::post('recurring-transactions/import', 'Banking\RecurringTransactions@import')->middleware('import')->name('recurring-transactions.import');
Route::get('recurring-transactions/export', 'Banking\RecurringTransactions@export')->name('recurring-transactions.export');
Route::resource('recurring-transactions', 'Banking\RecurringTransactions', ['middleware' => ['date.format', 'money', 'dropzone']]);
Route::get('transfers/{transfer}/print', 'Banking\Transfers@printTransfer')->name('transfers.print');

View File

@ -2,7 +2,7 @@
namespace Tests\Feature\Purchases;
use App\Exports\Purchases\Bills as Export;
use App\Exports\Purchases\Bills\Bills as Export;
use App\Jobs\Document\CreateDocument;
use App\Models\Document\Document;
use Illuminate\Http\UploadedFile;

View File

@ -2,7 +2,7 @@
namespace Tests\Feature\Sales;
use App\Exports\Sales\Invoices as Export;
use App\Exports\Sales\Invoices\Invoices as Export;
use App\Jobs\Document\CreateDocument;
use App\Models\Document\Document;
use App\Notifications\Sale\Invoice as Notification;