From 32894e7151d44593d4412df6ddcde47c1b8df5ad Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Tue, 25 May 2021 19:52:39 +0300 Subject: [PATCH] Code refactoring --- app/Http/Controllers/Wizard/Companies.php | 13 +- app/Http/Controllers/Wizard/Currencies.php | 13 -- app/Http/Controllers/Wizard/Data.php | 27 ++-- app/Http/Controllers/Wizard/Taxes.php | 20 +-- app/Http/Controllers/Wizard/Translations.php | 102 ---------------- resources/assets/js/Wizard.vue | 23 +++- .../assets/js/components/AkauntingDate.vue | 16 ++- .../AkauntingDropzoneFileUpload.vue | 36 ++++++ resources/assets/js/views/wizard/Company.vue | 115 ++++++++++++------ .../assets/js/views/wizard/Currencies.vue | 2 +- resources/assets/js/views/wizard/Finish.vue | 2 +- resources/assets/js/views/wizard/Taxes.vue | 2 +- resources/views/layouts/wizard.blade.php | 35 +++--- .../views/partials/wizard/content.blade.php | 22 ---- .../partials/wizard/pagination.blade.php | 14 --- routes/wizard.php | 1 - 16 files changed, 190 insertions(+), 253 deletions(-) delete mode 100644 app/Http/Controllers/Wizard/Translations.php delete mode 100644 resources/views/partials/wizard/content.blade.php delete mode 100644 resources/views/partials/wizard/pagination.blade.php diff --git a/app/Http/Controllers/Wizard/Companies.php b/app/Http/Controllers/Wizard/Companies.php index df99c962b..1247cf2eb 100644 --- a/app/Http/Controllers/Wizard/Companies.php +++ b/app/Http/Controllers/Wizard/Companies.php @@ -93,19 +93,12 @@ class Companies extends Controller // Save all settings setting()->save(); - $message = trans('messages.success.updated', ['type' => trans_choice('general.companies', 2)]); - - $response = [ + return response()->json([ 'status' => null, 'success' => true, 'error' => false, - 'message' => $message, + 'message' => trans('messages.success.updated', ['type' => trans_choice('general.companies', 2)]), 'data' => null, - 'redirect' => route('wizard.currencies.index'), - ]; - - flash($message)->success(); - - return response()->json($response); + ]); } } diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php index 19bf8d679..0e5f9f259 100644 --- a/app/Http/Controllers/Wizard/Currencies.php +++ b/app/Http/Controllers/Wizard/Currencies.php @@ -58,17 +58,10 @@ class Currencies extends Controller { $response = $this->ajaxDispatch(new CreateCurrency($request)); - //$response['redirect'] = route('wizard.currencies.index'); - if ($response['success']) { - $message = trans('messages.success.added', ['type' => trans_choice('general.currencies', 1)]); - - //flash($message)->success(); } else { $message = $response['message']; - - //flash($message)->error()->important(); } $response['message'] = $message; @@ -88,16 +81,10 @@ class Currencies extends Controller { $response = $this->ajaxDispatch(new UpdateCurrency($currency, $request)); - // $response['redirect'] = route('wizard.currencies.index'); - if ($response['success']) { $message = trans('messages.success.updated', ['type' => $currency->name]); - - // flash($message)->success(); } else { $message = $response['message']; - - // flash($message)->error()->important(); } $response['message'] = $message; diff --git a/app/Http/Controllers/Wizard/Data.php b/app/Http/Controllers/Wizard/Data.php index eb419ab77..acc9de0cb 100644 --- a/app/Http/Controllers/Wizard/Data.php +++ b/app/Http/Controllers/Wizard/Data.php @@ -34,7 +34,7 @@ class Data extends Controller public function index() { $translations = [ - 'companies' => [ + 'company' => [ 'title' => trans_choice('general.companies', 1), 'api_key' => trans('modules.api_key'), 'form_enter' => trans('general.form.enter'), @@ -112,28 +112,37 @@ class Data extends Controller } $taxes = Tax::collect(); - - $data = [ + + $modules = $this->getFeaturedModules([ 'query' => [ 'limit' => 4 ] - ]; + ]); - $modules = $this->getFeaturedModules($data); + $company = company(); - $company = Company::find(company_id()); + $company->api_key = setting('apps.api_key'); + $company->financial_start = setting('localisation.financial_start'); + + if ($company->logo) { + $logo = \Plank\Mediable\Media::find($company->logo); + + $logo->path = route('uploads.get', $logo->id); + + $company->logo = $logo; + } return response()->json([ 'success' => true, 'errors' => false, - 'message' => 'Get languages text..', + 'message' => 'Get all data...', 'data' => [ + 'translations' => $translations, + 'company' => $company, 'currencies' => $currencies, 'currency_codes' => $codes, 'taxes' => $taxes, 'modules' => $modules, - 'translations' => $translations, - 'companies' => $company, ], ]); } diff --git a/app/Http/Controllers/Wizard/Taxes.php b/app/Http/Controllers/Wizard/Taxes.php index f2394a98b..70d1722c1 100644 --- a/app/Http/Controllers/Wizard/Taxes.php +++ b/app/Http/Controllers/Wizard/Taxes.php @@ -46,17 +46,12 @@ class Taxes extends Controller { $response = $this->ajaxDispatch(new CreateTax($request)); - // $response['redirect'] = route('wizard.taxes.index'); - if ($response['success']) { $message = trans('messages.success.added', ['type' => trans_choice('general.taxes', 1)]); - - // flash($message)->success(); } else { $message = $response['message']; - - // flash($message)->error()->important(); } + $response['message'] = $message; return response()->json($response); @@ -74,16 +69,10 @@ class Taxes extends Controller { $response = $this->ajaxDispatch(new UpdateTax($tax, $request)); - // $response['redirect'] = route('wizard.taxes.index'); - if ($response['success']) { $message = trans('messages.success.updated', ['type' => $tax->name]); - - // flash($message)->success(); } else { $message = $response['message']; - - // flash($message)->error()->important(); } $response['message'] = $message; @@ -104,17 +93,12 @@ class Taxes extends Controller $response = $this->ajaxDispatch(new DeleteTax($tax)); - // $response['redirect'] = route('wizard.taxes.index'); - if ($response['success']) { $message = trans('messages.success.deleted', ['type' => $tax->name]); - - // flash($message)->success(); } else { $message = $response['message']; - - // flash($message)->error()->important(); } + $response['tax_id'] = $tax_id; $response['message'] = $message; diff --git a/app/Http/Controllers/Wizard/Translations.php b/app/Http/Controllers/Wizard/Translations.php deleted file mode 100644 index d19cf4204..000000000 --- a/app/Http/Controllers/Wizard/Translations.php +++ /dev/null @@ -1,102 +0,0 @@ -middleware('permission:create-common-companies')->only('create', 'store', 'duplicate', 'import'); - $this->middleware('permission:read-common-companies')->only('index', 'show', 'edit', 'export'); - $this->middleware('permission:update-common-companies')->only('update', 'enable', 'disable'); - $this->middleware('permission:delete-common-companies')->only('destroy'); - } - - /** - * Show the form for creating a new resource. - * - * @return Response - */ - public function index() - { - $translations = [ - 'companies' => [ - 'title' => trans_choice('general.companies', 1), - 'api_key' => trans('modules.api_key'), - 'form_enter' => trans('general.form.enter'), - 'get_api_key' => trans('modules.get_api_key'), - 'tax_number' => trans('general.tax_number'), - 'financial_start' => trans('settings.localisation.financial_start'), - 'address' => trans('settings.company.address'), - 'logo' => trans('settings.company.logo'), - 'skip' => trans('general.skip'), - 'save' => trans('general.save'), - ], - - 'currencies' => [ - 'title' => trans_choice('general.currencies', 2), - 'add_new' => trans('general.add_new'), - 'name' => trans('general.name'), - 'code' => trans('currencies.code'), - 'rate' => trans('currencies.rate'), - 'enabled' => trans('general.enabled'), - 'actions' => trans('general.actions') , - 'yes' => trans('general.yes'), - 'no' => trans('general.no'), - 'edit' => trans('general.edit'), - 'delete' => trans('general.delete'), - 'save' => trans('general.save'), - 'precision' => trans('currencies.precision'), - 'symbol' => trans('currencies.symbol.symbol'), - 'position' => trans('currencies.symbol.position'), - 'decimal_mark' => trans('currencies.decimal_mark'), - 'thousands_separator' => trans('currencies.thousands_separator'), - 'previous' => trans('pagination.previous'), - 'next' => trans('pagination.next'), - 'delete_confirm' => trans('general.delete_confirm'), - 'cancel' => trans('general.cancel'), - ], - - 'taxes' => [ - 'title' => trans_choice('general.taxes', 2), - 'add_new' => trans('general.add_new'), - 'name' => trans('general.name'), - 'rate_percent' => trans('taxes.rate_percent'), - 'enabled' => trans('general.enabled'), - 'actions' => trans('general.actions'), - 'yes' => trans('general.yes'), - 'no' => trans('general.no'), - 'edit' => trans('general.edit'), - 'delete' => trans('general.delete'), - 'name' => trans('general.name'), - 'rate' => trans('currencies.rate'), - 'enabled' => trans('general.enabled'), - 'save' => trans('general.save'), - 'previous' => trans('pagination.previous'), - 'next' => trans('pagination.next'), - 'cancel' => trans('general.cancel'), - ], - 'finish' => [ - 'title' => trans_choice('general.finish', 1), - 'recommended_apps' => trans('modules.recommended_apps'), - 'no_apps' => trans('modules.no_apps'), - 'developer' => trans('modules.developer'), - 'previous' => trans('pagination.previous'), - 'go_to_dashboard' => trans('general.go_to_dashboard'), - ] - ]; - - return response()->json([ - 'success' => true, - 'errors' => false, - 'message' => 'Get languages text..', - 'data' => $translations, - ]); - } -} diff --git a/resources/assets/js/Wizard.vue b/resources/assets/js/Wizard.vue index f0317c2ba..3c70749dc 100644 --- a/resources/assets/js/Wizard.vue +++ b/resources/assets/js/Wizard.vue @@ -5,14 +5,18 @@ :taxes="taxes" :modules="modules.data" :currency_codes="currency_codes" - :companies="companies" + :company="company" > diff --git a/resources/assets/js/components/AkauntingDropzoneFileUpload.vue b/resources/assets/js/components/AkauntingDropzoneFileUpload.vue index 742b1bc90..3fe8e0017 100644 --- a/resources/assets/js/components/AkauntingDropzoneFileUpload.vue +++ b/resources/assets/js/components/AkauntingDropzoneFileUpload.vue @@ -231,6 +231,42 @@ export default { async mounted() { this.initDropzone(); }, + + watch: { + attachments: function (attachments) { + attachments.forEach((attachment) => { + var mockFile = { + id: attachment[0].id, + name: attachment[0].name, + size: attachment[0].size, + type: attachment[0].type, + download: attachment[0].downloadPath, + dropzone: 'edit', + }; + + this.dropzone.emit("addedfile", mockFile); + this.dropzone.options.thumbnail.call(this.dropzone, mockFile, attachment[0].path); + + // Make sure that there is no progress bar, etc... + this.dropzone.emit("complete", mockFile); + }, this); + + + + this.files.forEach(async (attachment) => { + if (attachment.download) { + attachment.previewElement.querySelector("[data-dz-download]").href = attachment.download; + attachment.previewElement.querySelector("[data-dz-download]").classList.remove("d-none"); + } + }); + + if (this.preview == 'single' && attachments.length == 1) { + this.$nextTick(() => { + document.querySelector("#dropzone-" + this._uid).classList.add("dz-max-files-reached"); + }); + } + }, + }, } diff --git a/resources/assets/js/views/wizard/Company.vue b/resources/assets/js/views/wizard/Company.vue index daa60ce83..7f429e6cb 100644 --- a/resources/assets/js/views/wizard/Company.vue +++ b/resources/assets/js/views/wizard/Company.vue @@ -1,51 +1,51 @@