From 4e84134f5a0646d353b3e4befe8a6cadbfeeb712 Mon Sep 17 00:00:00 2001 From: Yee Jia Wei Date: Sat, 25 Feb 2023 04:14:06 +0800 Subject: [PATCH 01/12] remove rate_limit option in api config --- config/api.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/config/api.php b/config/api.php index d374a644c..bbff4122c 100644 --- a/config/api.php +++ b/config/api.php @@ -156,20 +156,4 @@ return [ */ 'middleware' => explode(',', env('API_MIDDLEWARE', 'api')), - - /* - |-------------------------------------------------------------------------- - | Rate Limit (Throttle) - |-------------------------------------------------------------------------- - | - | Consumers of your API can be limited to the amount of requests they can - | make. You can create your own throttles or simply change the default - | throttles. - | - */ - - 'rate_limit' => [ - Limit::perMinute(env('API_RATE_LIMIT', 60)), - ], - ]; From d18c3b41213cf393703d1652f2366286ec8529fe Mon Sep 17 00:00:00 2001 From: Hendrik Hagendorn Date: Sun, 26 Feb 2023 18:00:29 +0100 Subject: [PATCH 02/12] improve hooking capabilities when sending documents --- app/Events/Document/DocumentSending.php | 20 ++++++++++++++ app/Http/Controllers/Sales/Invoices.php | 14 +++++++--- app/Jobs/Document/SendDocument.php | 26 +++++++++++++++++++ .../Document/SendDocumentAsCustomMail.php | 3 +++ 4 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 app/Events/Document/DocumentSending.php create mode 100644 app/Jobs/Document/SendDocument.php diff --git a/app/Events/Document/DocumentSending.php b/app/Events/Document/DocumentSending.php new file mode 100644 index 000000000..97db6503e --- /dev/null +++ b/app/Events/Document/DocumentSending.php @@ -0,0 +1,20 @@ +document = $document; + } +} diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php index be3f68250..04502c8ea 100644 --- a/app/Http/Controllers/Sales/Invoices.php +++ b/app/Http/Controllers/Sales/Invoices.php @@ -10,6 +10,7 @@ use App\Imports\Sales\Invoices as Import; use App\Jobs\Document\CreateDocument; use App\Jobs\Document\DeleteDocument; use App\Jobs\Document\DuplicateDocument; +use App\Jobs\Document\SendDocument; use App\Jobs\Document\UpdateDocument; use App\Models\Document\Document; use App\Notifications\Sale\Invoice as Notification; @@ -260,12 +261,17 @@ class Invoices extends Controller return redirect()->back(); } - // Notify the customer - $invoice->contact->notify(new Notification($invoice, 'invoice_new_customer', true)); + $response = $this->ajaxDispatch(new SendDocument($invoice)); - event(new \App\Events\Document\DocumentSent($invoice)); + if ($response['success']) { + $message = trans('documents.messages.email_sent', ['type' => trans_choice('general.invoices', 1)]); - flash(trans('documents.messages.email_sent', ['type' => trans_choice('general.invoices', 1)]))->success(); + flash($message)->success(); + } else { + $message = $response['message']; + + flash($message)->error()->important(); + } return redirect()->back(); } diff --git a/app/Jobs/Document/SendDocument.php b/app/Jobs/Document/SendDocument.php new file mode 100644 index 000000000..62e271a68 --- /dev/null +++ b/app/Jobs/Document/SendDocument.php @@ -0,0 +1,26 @@ +document = $document; + } + + public function handle(): void + { + event(new DocumentSending($document)); + + // Notify the customer + $invoice->contact->notify(new Notification($invoice, 'invoice_new_customer', true)); + + event(new DocumentSent($document)); + } +} diff --git a/app/Jobs/Document/SendDocumentAsCustomMail.php b/app/Jobs/Document/SendDocumentAsCustomMail.php index cbc44d313..db8540437 100644 --- a/app/Jobs/Document/SendDocumentAsCustomMail.php +++ b/app/Jobs/Document/SendDocumentAsCustomMail.php @@ -3,6 +3,7 @@ namespace App\Jobs\Document; use App\Abstracts\Job; +use App\Events\Document\DocumentSending; use App\Events\Document\DocumentSent; use App\Models\Document\Document; @@ -18,6 +19,8 @@ class SendDocumentAsCustomMail extends Job { $document = Document::find($this->request->get('document_id')); + event(new DocumentSending($document)); + $custom_mail = $this->request->only(['to', 'subject', 'body']); if ($this->request->get('user_email', false)) { From fc52a2456c85c178620a83e3206ec2dc47276cee Mon Sep 17 00:00:00 2001 From: novag Date: Sat, 14 Jan 2023 10:48:25 +0100 Subject: [PATCH 03/12] use the correct translation for cancellations * Some languages have different words for cancelling an action vs cancelling an invoice. --- app/BulkActions/Purchases/Bills.php | 2 +- app/BulkActions/Sales/Invoices.php | 2 +- app/Models/Document/Document.php | 2 +- resources/lang/en-GB/documents.php | 4 ++++ .../views/components/documents/show/more-buttons.blade.php | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/BulkActions/Purchases/Bills.php b/app/BulkActions/Purchases/Bills.php index 18fc2c396..8d65a3277 100644 --- a/app/BulkActions/Purchases/Bills.php +++ b/app/BulkActions/Purchases/Bills.php @@ -31,7 +31,7 @@ class Bills extends BulkAction ], 'cancelled' => [ 'icon' => 'cancel', - 'name' => 'general.cancel', + 'name' => 'documents.actions.cancel', 'message' => 'bulk_actions.message.cancelled', 'permission' => 'update-purchases-bills', ], diff --git a/app/BulkActions/Sales/Invoices.php b/app/BulkActions/Sales/Invoices.php index 7f202dfdb..07e78051b 100644 --- a/app/BulkActions/Sales/Invoices.php +++ b/app/BulkActions/Sales/Invoices.php @@ -31,7 +31,7 @@ class Invoices extends BulkAction ], 'cancelled' => [ 'icon' => 'cancel', - 'name' => 'general.cancel', + 'name' => 'documents.actions.cancel', 'message' => 'bulk_actions.message.cancelled', 'permission' => 'update-sales-invoices', ], diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php index 68b0e2ec1..4a0694ac8 100644 --- a/app/Models/Document/Document.php +++ b/app/Models/Document/Document.php @@ -614,7 +614,7 @@ class Document extends Model if (! in_array($this->status, ['cancelled', 'draft'])) { try { $actions[] = [ - 'title' => trans('general.cancel'), + 'title' => trans('documents.actions.cancel'), 'icon' => 'cancel', 'url' => route($prefix . '.cancelled', $this->id), 'permission' => 'update-' . $group . '-' . $permission_prefix, diff --git a/resources/lang/en-GB/documents.php b/resources/lang/en-GB/documents.php index bb4170856..aa68c1644 100644 --- a/resources/lang/en-GB/documents.php +++ b/resources/lang/en-GB/documents.php @@ -10,6 +10,10 @@ return [ 'billing' => 'Billing', 'advanced' => 'Advanced', + 'actions' => [ + 'cancel' => 'Cancel', + ], + 'invoice_detail' => [ 'marked' => 'You marked this invoice as', 'services' => 'Services', diff --git a/resources/views/components/documents/show/more-buttons.blade.php b/resources/views/components/documents/show/more-buttons.blade.php index d0cb0bcb5..3f6421010 100644 --- a/resources/views/components/documents/show/more-buttons.blade.php +++ b/resources/views/components/documents/show/more-buttons.blade.php @@ -113,7 +113,7 @@ - {{ trans('general.cancel') }} + {{ trans('documents.actions.cancel') }} @endcan @endif From f211864982a4f6db94334e923262584e286414b3 Mon Sep 17 00:00:00 2001 From: Merve Karaman Date: Thu, 2 Mar 2023 16:47:31 +0300 Subject: [PATCH 04/12] Cursor style changed --- resources/views/modals/transactions/share.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/modals/transactions/share.blade.php b/resources/views/modals/transactions/share.blade.php index 43195086a..29a818866 100644 --- a/resources/views/modals/transactions/share.blade.php +++ b/resources/views/modals/transactions/share.blade.php @@ -10,7 +10,7 @@ value="{{ $signedUrl }}" ref="clone" @click="onCopyLink()" - style="appearance: none; background-color: whitesmoke; border: none; font-size: 16px;" + style="appearance: none; background-color: whitesmoke; cursor:pointer; border: none; font-size: 16px;" /> From 40beacde8e61264816ec5844a4cb1dc4cc535e7c Mon Sep 17 00:00:00 2001 From: Merve Karaman Date: Thu, 2 Mar 2023 17:12:46 +0300 Subject: [PATCH 05/12] Invoice align problem solved --- .../documents/show/get-paid.blade.php | 80 ++++++++++--------- .../documents/show/make-payment.blade.php | 80 ++++++++++--------- 2 files changed, 82 insertions(+), 78 deletions(-) diff --git a/resources/views/components/documents/show/get-paid.blade.php b/resources/views/components/documents/show/get-paid.blade.php index 5f7d1f2f4..d08cd1254 100644 --- a/resources/views/components/documents/show/get-paid.blade.php +++ b/resources/views/components/documents/show/get-paid.blade.php @@ -61,54 +61,56 @@
- @if (! empty($transaction->contact) && $transaction->contact->email) - - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - - @else - - +
+ @if (! empty($transaction->contact) && $transaction->contact->email) + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - @endif + @else + + + + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} + + + + @endif - - + - - - - {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} - - + + + {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} + + - - + - - @php - $message = trans('general.delete_confirm', [ - 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', - 'type' => strtolower(trans_choice('general.transactions', 1)) - ]); - @endphp + @php + $message = trans('general.delete_confirm', [ + 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', + 'type' => strtolower(trans_choice('general.transactions', 1)) + ]); + @endphp - + +
@endforeach @else diff --git a/resources/views/components/documents/show/make-payment.blade.php b/resources/views/components/documents/show/make-payment.blade.php index ed7a37304..c382bae9a 100644 --- a/resources/views/components/documents/show/make-payment.blade.php +++ b/resources/views/components/documents/show/make-payment.blade.php @@ -44,54 +44,56 @@
- @if (! empty($transaction->contact) && $transaction->contact->email) - - - {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - - @else - - +
+ @if (! empty($transaction->contact) && $transaction->contact->email) + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} - - @endif + @else + + + + {{ trans('general.title.send', ['type' => trans_choice('general.receipts', 1)]) }} + + + + @endif - - + - - - - {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} - - + + + {{ trans('general.title.edit', ['type' => trans_choice('general.payments', 1)]) }} + + - - + - - @php - $message = trans('general.delete_confirm', [ - 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', - 'type' => strtolower(trans_choice('general.transactions', 1)) - ]); - @endphp + @php + $message = trans('general.delete_confirm', [ + 'name' => '' . Date::parse($transaction->paid_at)->format(company_date_format()) . ' - ' . money($transaction->amount, $transaction->currency_code, true) . ' - ' . $transaction->account->name . '', + 'type' => strtolower(trans_choice('general.transactions', 1)) + ]); + @endphp - + +
@endforeach @else From 43c4a7b096e6dca9ebe6b9ef335a16f44a21fd7b Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker Date: Fri, 3 Mar 2023 10:11:26 +0300 Subject: [PATCH 06/12] Fixed issue with category type --- app/Listeners/Update/V30/Version3013.php | 72 ++++++++++++++++++++++++ app/Traits/Categories.php | 4 +- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 app/Listeners/Update/V30/Version3013.php diff --git a/app/Listeners/Update/V30/Version3013.php b/app/Listeners/Update/V30/Version3013.php new file mode 100644 index 000000000..5f4ef6934 --- /dev/null +++ b/app/Listeners/Update/V30/Version3013.php @@ -0,0 +1,72 @@ +skipThisUpdate($event)) { + return; + } + + Log::channel('stdout')->info('Updating to 3.0.13 version...'); + + DB::transaction(function () { + $types = $this->getTypesByAllowedTranslations(); + + foreach ($types as $type => $translations) { + DB::table('categories')->whereIn('type', $translations)->update(['type' => $type]); + } + + }); + + Log::channel('stdout')->info('Done!'); + } + + protected function getTypesByAllowedTranslations(): array + { + $types = $this->getCategoryTypes(false); + $lang_codes = array_keys(language()->allowed()); + + foreach ($types as $type => $trans_name) { + $translations_for_type = []; + + foreach ($lang_codes as $lang_code) { + $translation = trans_choice($trans_name, 1, locale: $lang_code); + + if ($translation === $trans_name) { + continue; + } + + $translations_for_type[] = $translation; + } + + $types[$type] = $translations_for_type; + } + + /** + * Example: en-GB es-ES + * 'income' => ['Income', 'Ingresos'] + */ + return $types; + } +} diff --git a/app/Traits/Categories.php b/app/Traits/Categories.php index 14789fdd8..c2ee8f5fb 100644 --- a/app/Traits/Categories.php +++ b/app/Traits/Categories.php @@ -7,7 +7,7 @@ use Illuminate\Support\Str; trait Categories { - public function getCategoryTypes(): array + public function getCategoryTypes(bool $translate = true): array { $types = []; $configs = config('type.category'); @@ -21,7 +21,7 @@ trait Categories $name = $attr['alias'] . '::' . $name; } - $types[$type] = trans_choice($name, 1); + $types[$type] = $translate ? trans_choice($name, 1) : $name; } return $types; From a9d8d09f3df82c6240fedc6183746de9a1482842 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker Date: Fri, 3 Mar 2023 10:27:39 +0300 Subject: [PATCH 07/12] Update listener added to event --- app/Listeners/Update/V30/Version3013.php | 1 - app/Providers/Event.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Listeners/Update/V30/Version3013.php b/app/Listeners/Update/V30/Version3013.php index 5f4ef6934..4bda06ab4 100644 --- a/app/Listeners/Update/V30/Version3013.php +++ b/app/Listeners/Update/V30/Version3013.php @@ -36,7 +36,6 @@ class Version3013 extends Listener foreach ($types as $type => $translations) { DB::table('categories')->whereIn('type', $translations)->update(['type' => $type]); } - }); Log::channel('stdout')->info('Done!'); diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 498fe7a85..9593392f5 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -21,6 +21,7 @@ class Event extends Provider 'App\Listeners\Update\V30\Version305', 'App\Listeners\Update\V30\Version307', 'App\Listeners\Update\V30\Version309', + 'App\Listeners\Update\V30\Version3013', ], 'Illuminate\Auth\Events\Login' => [ 'App\Listeners\Auth\Login', From eadb3eb3c7dbf463f4d32c2f3b4e85dc9ea74b6f Mon Sep 17 00:00:00 2001 From: boracakirel Date: Fri, 3 Mar 2023 22:08:09 +0300 Subject: [PATCH 08/12] Added item_type column to the document's export file --- app/Exports/Purchases/Sheets/BillItems.php | 2 ++ app/Exports/Sales/Sheets/InvoiceItems.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/Exports/Purchases/Sheets/BillItems.php b/app/Exports/Purchases/Sheets/BillItems.php index ce8fd7fbc..425eb50d6 100644 --- a/app/Exports/Purchases/Sheets/BillItems.php +++ b/app/Exports/Purchases/Sheets/BillItems.php @@ -22,6 +22,7 @@ class BillItems extends Export $model->bill_number = $document->document_number; $model->item_name = $model->item->name; + $model->item_type = $model->item->type; return parent::map($model); } @@ -31,6 +32,7 @@ class BillItems extends Export return [ 'bill_number', 'item_name', + 'item_type', 'quantity', 'price', 'total', diff --git a/app/Exports/Sales/Sheets/InvoiceItems.php b/app/Exports/Sales/Sheets/InvoiceItems.php index bb0c93c12..c2f399bce 100644 --- a/app/Exports/Sales/Sheets/InvoiceItems.php +++ b/app/Exports/Sales/Sheets/InvoiceItems.php @@ -22,6 +22,7 @@ class InvoiceItems extends Export $model->invoice_number = $document->document_number; $model->item_name = $model->item->name; + $model->item_type = $model->item->type; return parent::map($model); } @@ -31,6 +32,7 @@ class InvoiceItems extends Export return [ 'invoice_number', 'item_name', + 'item_type', 'quantity', 'price', 'total', From c461129eb3dc51fc80611518bef19d01042acb5d Mon Sep 17 00:00:00 2001 From: boracakirel Date: Fri, 3 Mar 2023 22:10:56 +0300 Subject: [PATCH 09/12] Log import errors --- app/Utilities/Import.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Utilities/Import.php b/app/Utilities/Import.php index 266eefc8b..4a3fa1881 100644 --- a/app/Utilities/Import.php +++ b/app/Utilities/Import.php @@ -51,6 +51,7 @@ class Import 'message' => $message, ]; } catch (Throwable $e) { + report($e); if ($e instanceof ValidationException) { foreach ($e->failures() as $failure) { $message = trans('messages.error.import_column', [ From ed07d9053234eb58e07f76e3d8165bafaa050fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 6 Mar 2023 13:57:04 +0300 Subject: [PATCH 10/12] Fixed document information line styling.. --- public/css/print.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/print.css b/public/css/print.css index d863d719a..c1f266bc4 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -415,7 +415,7 @@ html[dir='rtl'] .text-right } .w-numbers { - width: 93px; + width: 120px; } .lines From d2e96fbe231f6f521c421a4481a7342c7e735c26 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker Date: Tue, 7 Mar 2023 15:18:14 +0300 Subject: [PATCH 11/12] `Validation issues for import` fixed --- app/Abstracts/Import.php | 47 ++++++++ app/Http/Requests/Banking/Transaction.php | 2 +- app/Http/Requests/Common/Item.php | 2 +- app/Http/Requests/Document/Document.php | 2 +- app/Http/Requests/Setting/Tax.php | 4 +- app/Imports/Banking/Transactions.php | 7 +- app/Imports/Banking/Transfers.php | 4 +- app/Imports/Common/Sheets/ItemTaxes.php | 7 +- app/Imports/Common/Sheets/Items.php | 7 +- .../Purchases/Sheets/BillHistories.php | 6 +- .../Purchases/Sheets/BillItemTaxes.php | 6 +- app/Imports/Purchases/Sheets/BillItems.php | 6 +- app/Imports/Purchases/Sheets/BillTotals.php | 6 +- .../Purchases/Sheets/BillTransactions.php | 6 +- app/Imports/Purchases/Sheets/Bills.php | 8 +- app/Imports/Purchases/Vendors.php | 7 +- app/Imports/Sales/Customers.php | 7 +- app/Imports/Sales/Sheets/InvoiceHistories.php | 6 +- app/Imports/Sales/Sheets/InvoiceItemTaxes.php | 6 +- app/Imports/Sales/Sheets/InvoiceItems.php | 6 +- app/Imports/Sales/Sheets/InvoiceTotals.php | 6 +- .../Sales/Sheets/InvoiceTransactions.php | 8 +- app/Imports/Sales/Sheets/Invoices.php | 8 +- app/Imports/Settings/Categories.php | 7 +- app/Imports/Settings/Taxes.php | 7 +- app/Traits/Import.php | 3 + app/Utilities/Import.php | 113 ++++++++++-------- 27 files changed, 174 insertions(+), 130 deletions(-) diff --git a/app/Abstracts/Import.php b/app/Abstracts/Import.php index 26cfc0949..c02e7ed84 100644 --- a/app/Abstracts/Import.php +++ b/app/Abstracts/Import.php @@ -2,6 +2,7 @@ namespace App\Abstracts; +use App\Abstracts\Http\FormRequest; use App\Traits\Import as ImportHelper; use App\Traits\Sources; use App\Utilities\Date; @@ -11,6 +12,7 @@ use Illuminate\Contracts\Translation\HasLocalePreference; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; +use Illuminate\Validation\ValidationException; use Maatwebsite\Excel\Concerns\Importable; use Maatwebsite\Excel\Concerns\SkipsEmptyRows; use Maatwebsite\Excel\Concerns\ToModel; @@ -27,6 +29,8 @@ abstract class Import implements HasLocalePreference, ShouldQueue, SkipsEmptyRow public $user; + public $request_class = null; + public function __construct() { $this->user = user(); @@ -70,6 +74,49 @@ abstract class Import implements HasLocalePreference, ShouldQueue, SkipsEmptyRow return []; } + /** + * You can override this method to add custom rules for each row. + */ + public function prepareRules(array $rules): array + { + return $rules; + } + + /** + * Validate each row data. + * + * @param \Illuminate\Validation\Validator $validator + * @throws ValidationException + */ + public function withValidator($validator) + { + $condition = class_exists($this->request_class) + ? ! ($request = new $this->request_class) instanceof FormRequest + : true; + + if ($condition) { + return; + } + + foreach ($validator->getData() as $row => $data) { + $request->initialize(request: $data); + + $rules = $this->prepareRules($request->rules()); + + try { + Validator::make($data, $rules)->validate(); + } catch (ValidationException $e) { + foreach ($e->validator->failed() as $attribute => $value) { + foreach ($value as $rule => $params) { + $validator->addFailure($row . '.' . $attribute, $rule, $params); + } + } + + throw new ValidationException($validator); + } + } + } + public function chunkSize(): int { return config('excel.imports.chunk_size'); diff --git a/app/Http/Requests/Banking/Transaction.php b/app/Http/Requests/Banking/Transaction.php index 5415521c2..10d9c4848 100644 --- a/app/Http/Requests/Banking/Transaction.php +++ b/app/Http/Requests/Banking/Transaction.php @@ -29,7 +29,7 @@ class Transaction extends FormRequest } // Get company id - $company_id = (int) $this->request->get('company_id'); + $company_id = (int) $this->request->get('company_id', company_id()); $attachment = 'nullable'; diff --git a/app/Http/Requests/Common/Item.php b/app/Http/Requests/Common/Item.php index 56daa3c42..1ae7b7af1 100644 --- a/app/Http/Requests/Common/Item.php +++ b/app/Http/Requests/Common/Item.php @@ -31,7 +31,7 @@ class Item extends FormRequest } return [ - 'type' => 'required|string', + 'type' => 'required|string|in:product,service', 'name' => 'required|string', 'sale_price' => $sale_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/', 'purchase_price' => $purchase_price . '|regex:/^(?=.*?[0-9])[0-9.,]+$/', diff --git a/app/Http/Requests/Document/Document.php b/app/Http/Requests/Document/Document.php index bc39ca761..33bc2666a 100644 --- a/app/Http/Requests/Document/Document.php +++ b/app/Http/Requests/Document/Document.php @@ -48,7 +48,7 @@ class Document extends FormRequest $rules = [ 'type' => 'required|string', 'document_number' => 'required|string|unique:documents,NULL,' . $id . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL', - 'status' => 'required|string', + 'status' => 'required|string|in:draft,paid,partial,sent,received,viewed,cancelled', 'issued_at' => 'required|date_format:Y-m-d H:i:s|before_or_equal:due_at', 'due_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:issued_at', 'amount' => 'required', diff --git a/app/Http/Requests/Setting/Tax.php b/app/Http/Requests/Setting/Tax.php index 84ecfac7a..b0afe079a 100644 --- a/app/Http/Requests/Setting/Tax.php +++ b/app/Http/Requests/Setting/Tax.php @@ -22,9 +22,9 @@ class Tax extends FormRequest $enabled = 'nullable'; } - $company_id = (int) $this->request->get('company_id'); + $company_id = (int) $this->request->get('company_id', company_id()); - $type = 'required|string'; + $type = 'required|string|in:fixed,normal,inclusive,withholding,compound'; if (!empty($this->request->get('type')) && $this->request->get('type') == 'compound') { $type .= '|unique:taxes,NULL,' . $id . ',id,company_id,' . $company_id . ',type,compound,deleted_at,NULL'; diff --git a/app/Imports/Banking/Transactions.php b/app/Imports/Banking/Transactions.php index b710a8e03..eae60c77c 100644 --- a/app/Imports/Banking/Transactions.php +++ b/app/Imports/Banking/Transactions.php @@ -8,6 +8,8 @@ use App\Models\Banking\Transaction as Model; class Transactions extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -25,9 +27,4 @@ class Transactions extends Import return $row; } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Imports/Banking/Transfers.php b/app/Imports/Banking/Transfers.php index 2770a8100..9c0023df8 100644 --- a/app/Imports/Banking/Transfers.php +++ b/app/Imports/Banking/Transfers.php @@ -26,10 +26,10 @@ class Transfers extends Import $row = parent::map($row); $row['transferred_at'] = Date::parse($row['transferred_at'])->format('Y-m-d'); - $row['from_account_id'] = $this->getFromAccountId($row); - $row['to_account_id'] = $this->getToAccountId($row); $row['from_currency_code'] = $this->getFromCurrencyCode($row); $row['to_currency_code'] = $this->getToCurrencyCode($row); + $row['from_account_id'] = $this->getFromAccountId($row); + $row['to_account_id'] = $this->getToAccountId($row); $row['expense_transaction_id'] = $this->getExpenseTransactionId($row); $row['income_transaction_id'] = $this->getIncomeTransactionId($row); diff --git a/app/Imports/Common/Sheets/ItemTaxes.php b/app/Imports/Common/Sheets/ItemTaxes.php index 3ea4f2efb..a25c3e3fa 100644 --- a/app/Imports/Common/Sheets/ItemTaxes.php +++ b/app/Imports/Common/Sheets/ItemTaxes.php @@ -8,6 +8,8 @@ use App\Models\Common\ItemTax as Model; class ItemTaxes extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -27,9 +29,4 @@ class ItemTaxes extends Import return $row; } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Imports/Common/Sheets/Items.php b/app/Imports/Common/Sheets/Items.php index 61880ce03..413d78873 100644 --- a/app/Imports/Common/Sheets/Items.php +++ b/app/Imports/Common/Sheets/Items.php @@ -8,6 +8,8 @@ use App\Models\Common\Item as Model; class Items extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -25,9 +27,4 @@ class Items extends Import return $row; } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Imports/Purchases/Sheets/BillHistories.php b/app/Imports/Purchases/Sheets/BillHistories.php index 75eb5aa08..f6901b7c6 100644 --- a/app/Imports/Purchases/Sheets/BillHistories.php +++ b/app/Imports/Purchases/Sheets/BillHistories.php @@ -9,6 +9,8 @@ use App\Models\Document\DocumentHistory as Model; class BillHistories extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -33,10 +35,8 @@ class BillHistories extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['bill_number'] = 'required|string'; unset($rules['bill_id']); diff --git a/app/Imports/Purchases/Sheets/BillItemTaxes.php b/app/Imports/Purchases/Sheets/BillItemTaxes.php index 62c1bbb8c..97273ad93 100644 --- a/app/Imports/Purchases/Sheets/BillItemTaxes.php +++ b/app/Imports/Purchases/Sheets/BillItemTaxes.php @@ -11,6 +11,8 @@ use App\Models\Document\DocumentItemTax as Model; class BillItemTaxes extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -46,10 +48,8 @@ class BillItemTaxes extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['bill_number'] = 'required|string'; unset($rules['bill_id']); diff --git a/app/Imports/Purchases/Sheets/BillItems.php b/app/Imports/Purchases/Sheets/BillItems.php index 8f0f83617..ebf5ded9f 100644 --- a/app/Imports/Purchases/Sheets/BillItems.php +++ b/app/Imports/Purchases/Sheets/BillItems.php @@ -9,6 +9,8 @@ use App\Models\Document\DocumentItem as Model; class BillItems extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -39,10 +41,8 @@ class BillItems extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['bill_number'] = 'required|string'; unset($rules['bill_id']); diff --git a/app/Imports/Purchases/Sheets/BillTotals.php b/app/Imports/Purchases/Sheets/BillTotals.php index a3dc6ccea..e20a41cc1 100644 --- a/app/Imports/Purchases/Sheets/BillTotals.php +++ b/app/Imports/Purchases/Sheets/BillTotals.php @@ -9,6 +9,8 @@ use App\Models\Document\DocumentTotal as Model; class BillTotals extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -30,10 +32,8 @@ class BillTotals extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['bill_number'] = 'required|string'; unset($rules['bill_id']); diff --git a/app/Imports/Purchases/Sheets/BillTransactions.php b/app/Imports/Purchases/Sheets/BillTransactions.php index 604d64df5..775a64710 100644 --- a/app/Imports/Purchases/Sheets/BillTransactions.php +++ b/app/Imports/Purchases/Sheets/BillTransactions.php @@ -8,6 +8,8 @@ use App\Models\Banking\Transaction as Model; class BillTransactions extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -34,10 +36,8 @@ class BillTransactions extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['bill_number'] = 'required|string'; return $rules; diff --git a/app/Imports/Purchases/Sheets/Bills.php b/app/Imports/Purchases/Sheets/Bills.php index 5dce7b836..a1b3cac99 100644 --- a/app/Imports/Purchases/Sheets/Bills.php +++ b/app/Imports/Purchases/Sheets/Bills.php @@ -9,6 +9,8 @@ use Illuminate\Support\Str; class Bills extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -37,16 +39,14 @@ class Bills extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $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'; unset($rules['document_number'], $rules['issued_at'], $rules['type']); - return $this->replaceForBatchRules($rules); + return $rules; } } diff --git a/app/Imports/Purchases/Vendors.php b/app/Imports/Purchases/Vendors.php index 2e4c6c5c1..c5d0aba90 100644 --- a/app/Imports/Purchases/Vendors.php +++ b/app/Imports/Purchases/Vendors.php @@ -8,6 +8,8 @@ use App\Models\Common\Contact as Model; class Vendors extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -26,9 +28,4 @@ class Vendors extends Import return $row; } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Imports/Sales/Customers.php b/app/Imports/Sales/Customers.php index 0803f6c1c..414a982a2 100644 --- a/app/Imports/Sales/Customers.php +++ b/app/Imports/Sales/Customers.php @@ -8,6 +8,8 @@ use App\Models\Common\Contact as Model; class Customers extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -26,9 +28,4 @@ class Customers extends Import return $row; } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Imports/Sales/Sheets/InvoiceHistories.php b/app/Imports/Sales/Sheets/InvoiceHistories.php index 2d05e15db..4a93e1153 100644 --- a/app/Imports/Sales/Sheets/InvoiceHistories.php +++ b/app/Imports/Sales/Sheets/InvoiceHistories.php @@ -9,6 +9,8 @@ use App\Models\Document\DocumentHistory as Model; class InvoiceHistories extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -33,10 +35,8 @@ class InvoiceHistories extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['invoice_number'] = 'required|string'; unset($rules['invoice_id']); diff --git a/app/Imports/Sales/Sheets/InvoiceItemTaxes.php b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php index 470f333c7..9f4fe26b0 100644 --- a/app/Imports/Sales/Sheets/InvoiceItemTaxes.php +++ b/app/Imports/Sales/Sheets/InvoiceItemTaxes.php @@ -11,6 +11,8 @@ use App\Models\Document\DocumentItemTax as Model; class InvoiceItemTaxes extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -46,10 +48,8 @@ class InvoiceItemTaxes extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['invoice_number'] = 'required|string'; unset($rules['invoice_id']); diff --git a/app/Imports/Sales/Sheets/InvoiceItems.php b/app/Imports/Sales/Sheets/InvoiceItems.php index ad3836aad..10a9411ce 100644 --- a/app/Imports/Sales/Sheets/InvoiceItems.php +++ b/app/Imports/Sales/Sheets/InvoiceItems.php @@ -9,6 +9,8 @@ use App\Models\Document\DocumentItem as Model; class InvoiceItems extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -39,10 +41,8 @@ class InvoiceItems extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['invoice_number'] = 'required|string'; unset($rules['invoice_id']); diff --git a/app/Imports/Sales/Sheets/InvoiceTotals.php b/app/Imports/Sales/Sheets/InvoiceTotals.php index 1cb7dc34d..bd6fd9413 100644 --- a/app/Imports/Sales/Sheets/InvoiceTotals.php +++ b/app/Imports/Sales/Sheets/InvoiceTotals.php @@ -9,6 +9,8 @@ use App\Models\Document\DocumentTotal as Model; class InvoiceTotals extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -30,10 +32,8 @@ class InvoiceTotals extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['invoice_number'] = 'required|string'; unset($rules['invoice_id']); diff --git a/app/Imports/Sales/Sheets/InvoiceTransactions.php b/app/Imports/Sales/Sheets/InvoiceTransactions.php index 1b9a1796a..c153bcd7a 100644 --- a/app/Imports/Sales/Sheets/InvoiceTransactions.php +++ b/app/Imports/Sales/Sheets/InvoiceTransactions.php @@ -8,6 +8,8 @@ use App\Models\Banking\Transaction as Model; class InvoiceTransactions extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -24,20 +26,18 @@ class InvoiceTransactions extends Import $row = parent::map($row); $row['type'] = 'income'; + $row['currency_code'] = $this->getCurrencyCode($row); $row['account_id'] = $this->getAccountId($row); $row['category_id'] = $this->getCategoryId($row, 'income'); $row['contact_id'] = $this->getContactId($row, 'customer'); - $row['currency_code'] = $this->getCurrencyCode($row); $row['document_id'] = $this->getDocumentId($row); $row['number'] = $row['transaction_number']; return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $rules['invoice_number'] = 'required|string'; return $rules; diff --git a/app/Imports/Sales/Sheets/Invoices.php b/app/Imports/Sales/Sheets/Invoices.php index fa3bc22b9..440d84d48 100644 --- a/app/Imports/Sales/Sheets/Invoices.php +++ b/app/Imports/Sales/Sheets/Invoices.php @@ -9,6 +9,8 @@ use Illuminate\Support\Str; class Invoices extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -37,16 +39,14 @@ class Invoices extends Import return $row; } - public function rules(): array + public function prepareRules(array $rules): array { - $rules = (new Request())->rules(); - $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'; unset($rules['document_number'], $rules['issued_at'], $rules['type']); - return $this->replaceForBatchRules($rules); + return $rules; } } diff --git a/app/Imports/Settings/Categories.php b/app/Imports/Settings/Categories.php index b9ae957c9..49931f583 100644 --- a/app/Imports/Settings/Categories.php +++ b/app/Imports/Settings/Categories.php @@ -8,6 +8,8 @@ use App\Models\Setting\Category as Model; class Categories extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); @@ -21,9 +23,4 @@ class Categories extends Import return $row; } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Imports/Settings/Taxes.php b/app/Imports/Settings/Taxes.php index d0d1eb6b2..f7ffb8738 100644 --- a/app/Imports/Settings/Taxes.php +++ b/app/Imports/Settings/Taxes.php @@ -8,13 +8,10 @@ use App\Models\Setting\Tax as Model; class Taxes extends Import { + public $request_class = Request::class; + public function model(array $row) { return new Model($row); } - - public function rules(): array - { - return (new Request())->rules(); - } } diff --git a/app/Traits/Import.php b/app/Traits/Import.php index ffdb40d5a..5aa5baf30 100644 --- a/app/Traits/Import.php +++ b/app/Traits/Import.php @@ -172,6 +172,7 @@ trait Import $data = [ 'company_id' => company_id(), + 'type' => $row['account_type'] ? $row['account_type'] : 'bank', 'currency_code' => $row['currency_code'], 'name' => !empty($row['account_name']) ? $row['account_name'] : $row['currency_code'], 'number' => !empty($row['account_number']) ? $row['account_number'] : (string) rand(1, 10000), @@ -198,6 +199,7 @@ trait Import $data = [ 'company_id' => company_id(), + 'type' => $row['account_type'] ? $row['account_type'] : 'bank', 'name' => $row['account_name'], 'number' => !empty($row['account_number']) ? $row['account_number'] : (string) rand(1, 10000), 'currency_code' => !empty($row['currency_code']) ? $row['currency_code'] : default_currency(), @@ -224,6 +226,7 @@ trait Import $data = [ 'company_id' => company_id(), + 'type' => $row['account_type'] ? $row['account_type'] : 'bank', 'number' => $row['account_number'], 'name' => !empty($row['account_name']) ? $row['account_name'] : $row['account_number'], 'currency_code' => !empty($row['currency_code']) ? $row['currency_code'] : default_currency(), diff --git a/app/Utilities/Import.php b/app/Utilities/Import.php index 266eefc8b..14934593e 100644 --- a/app/Utilities/Import.php +++ b/app/Utilities/Import.php @@ -2,8 +2,11 @@ namespace App\Utilities; +use App\Abstracts\Import as AbstractsImport; +use App\Abstracts\ImportMultipleSheets; use App\Jobs\Auth\NotifyUser; use App\Notifications\Common\ImportCompleted; +use Illuminate\Http\Request; use Maatwebsite\Excel\Validators\ValidationException; use Throwable; @@ -12,69 +15,81 @@ class Import /** * Import the excel file or catch errors * - * @param $class - * @param $request - * @param $translation + * @param AbstractsImport|ImportMultipleSheets $class * * @return array */ - public static function fromExcel($class, $request, $translation) + public static function fromExcel($class, Request $request, string $translation): array { + $success = true; + try { + $should_queue = should_queue(); + $file = $request->file('import'); - if (should_queue()) { - $rows = $class->toArray($file); - - $total_rows = 0; - if (!empty($rows[0])) { - $total_rows = count($rows[0]); - } else if (!empty($sheets = $class->sheets())) { - $total_rows = count($rows[array_keys($sheets)[0]]); - } - - $class->queue($file)->onQueue('imports')->chain([ - new NotifyUser(user(), new ImportCompleted($translation, $total_rows)), - ]); - - $message = trans('messages.success.import_queued', ['type' => $translation]); + if ($should_queue) { + self::importQueue($class, $file, $translation); } else { $class->import($file); - - $message = trans('messages.success.imported', ['type' => $translation]); } - $response = [ - 'success' => true, - 'error' => false, - 'data' => null, - 'message' => $message, - ]; + $message = trans( + 'messages.success.' . ($should_queue ? 'import_queued' : 'imported'), + ['type' => $translation] + ); } catch (Throwable $e) { - if ($e instanceof ValidationException) { - foreach ($e->failures() as $failure) { - $message = trans('messages.error.import_column', [ - 'message' => collect($failure->errors())->first(), - 'column' => $failure->attribute(), - 'line' => $failure->row(), - ]); + $message = self::flashFailures($e); - flash($message)->error()->important(); - } - - $message = ''; - } else { - $message = $e->getMessage(); - } - - $response = [ - 'success' => false, - 'error' => true, - 'data' => null, - 'message' => $message, - ]; + $success = false; } - return $response; + return [ + 'success' => $success, + 'error' => ! $success, + 'data' => null, + 'message' => $message, + ]; + } + + /** + * Import the excel file + * + * @param AbstractsImport|ImportMultipleSheets $class + */ + protected static function importQueue($class, $file, string $translation): void + { + $rows = $class->toArray($file); + + $total_rows = 0; + + if (! empty($rows[0])) { + $total_rows = count($rows[0]); + } else if (! empty($sheets = $class->sheets())) { + $total_rows = count($rows[array_keys($sheets)[0]]); + } + + $class->queue($file)->onQueue('imports')->chain([ + new NotifyUser(user(), new ImportCompleted($translation, $total_rows)) + ]); + } + + protected static function flashFailures(Throwable $e): string + { + if (! $e instanceof ValidationException) { + return $e->getMessage(); + } + + foreach ($e->failures() as $failure) { + $message = trans('messages.error.import_column', [ + 'message' => collect($failure->errors())->first(), + 'column' => $failure->attribute(), + 'line' => $failure->row(), + ]); + + flash($message)->error()->important(); + } + + return ''; } } From 2ce3fadd99f7d9f724012e61124e8f4617b28882 Mon Sep 17 00:00:00 2001 From: EnesSacid-Buker <73346401+EnesSacid-Buker@users.noreply.github.com> Date: Tue, 7 Mar 2023 15:39:39 +0300 Subject: [PATCH 12/12] fix typo --- app/Traits/Import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Traits/Import.php b/app/Traits/Import.php index 5aa5baf30..e6e818a39 100644 --- a/app/Traits/Import.php +++ b/app/Traits/Import.php @@ -172,7 +172,7 @@ trait Import $data = [ 'company_id' => company_id(), - 'type' => $row['account_type'] ? $row['account_type'] : 'bank', + 'type' => !empty($row['account_type']) ? $row['account_type'] : 'bank', 'currency_code' => $row['currency_code'], 'name' => !empty($row['account_name']) ? $row['account_name'] : $row['currency_code'], 'number' => !empty($row['account_number']) ? $row['account_number'] : (string) rand(1, 10000), @@ -199,7 +199,7 @@ trait Import $data = [ 'company_id' => company_id(), - 'type' => $row['account_type'] ? $row['account_type'] : 'bank', + 'type' => !empty($row['account_type']) ? $row['account_type'] : 'bank', 'name' => $row['account_name'], 'number' => !empty($row['account_number']) ? $row['account_number'] : (string) rand(1, 10000), 'currency_code' => !empty($row['currency_code']) ? $row['currency_code'] : default_currency(), @@ -226,7 +226,7 @@ trait Import $data = [ 'company_id' => company_id(), - 'type' => $row['account_type'] ? $row['account_type'] : 'bank', + 'type' => !empty($row['account_type']) ? $row['account_type'] : 'bank', 'number' => $row['account_number'], 'name' => !empty($row['account_name']) ? $row['account_name'] : $row['account_number'], 'currency_code' => !empty($row['currency_code']) ? $row['currency_code'] : default_currency(),