From b2320974007eeecade60e5b620768918ecb33e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 24 Oct 2022 17:42:10 +0300 Subject: [PATCH] close #2687 Enhancement: Remove wizard taxes step --- app/Http/Controllers/Wizard/Taxes.php | 117 -------- .../Components/Layouts/Wizard/Scripts.php | 33 --- resources/assets/js/Wizard.vue | 4 - .../assets/js/views/wizard/Currencies.vue | 2 +- resources/assets/js/views/wizard/Steps.vue | 14 - resources/assets/js/views/wizard/Taxes.vue | 269 ------------------ resources/assets/js/wizard.js | 10 +- .../layouts/wizard/scripts.blade.php | 1 - resources/views/wizard/taxes/index.blade.php | 7 - routes/wizard.php | 4 - 10 files changed, 5 insertions(+), 456 deletions(-) delete mode 100644 app/Http/Controllers/Wizard/Taxes.php delete mode 100644 resources/assets/js/views/wizard/Taxes.vue delete mode 100644 resources/views/wizard/taxes/index.blade.php diff --git a/app/Http/Controllers/Wizard/Taxes.php b/app/Http/Controllers/Wizard/Taxes.php deleted file mode 100644 index 80a81c4f5..000000000 --- a/app/Http/Controllers/Wizard/Taxes.php +++ /dev/null @@ -1,117 +0,0 @@ -middleware('permission:create-settings-taxes')->only('create', 'store', 'duplicate', 'import'); - $this->middleware('permission:read-settings-taxes')->only('index', 'show', 'edit', 'export'); - $this->middleware('permission:update-settings-taxes')->only('update', 'enable', 'disable'); - $this->middleware('permission:delete-settings-taxes')->only('destroy'); - } - - /** - * Show the form for editing the specified resource. - * - * @return Response - */ - public function index() - { - $taxes = Tax::collect(); - - return $this->response('wizard.taxes.index', compact('taxes')); - } - - /** - * Show the form for viewing the specified resource. - * - * @return Response - */ - public function show() - { - return redirect()->route('wizard.taxes.index'); - } - - /** - * Store a newly created resource in storage. - * - * @param Request $request - * - * @return Response - */ - public function store(Request $request) - { - $response = $this->ajaxDispatch(new CreateTax($request)); - - if ($response['success']) { - $message = trans('messages.success.added', ['type' => trans_choice('general.taxes', 1)]); - } else { - $message = $response['message']; - } - - $response['message'] = $message; - - return response()->json($response); - } - - /** - * Update the specified resource in storage. - * - * @param Tax $tax - * @param Request $request - * - * @return Response - */ - public function update(Tax $tax, Request $request) - { - $response = $this->ajaxDispatch(new UpdateTax($tax, $request)); - - if ($response['success']) { - $message = trans('messages.success.updated', ['type' => $tax->name]); - } else { - $message = $response['message']; - } - - $response['message'] = $message; - - return response()->json($response); - } - - /** - * Remove the specified resource from storage. - * - * @param Tax $tax - * - * @return Response - */ - public function destroy(Tax $tax) - { - $tax_id = $tax->id; - - $response = $this->ajaxDispatch(new DeleteTax($tax)); - - if ($response['success']) { - $message = trans('messages.success.deleted', ['type' => $tax->name]); - } else { - $message = $response['message']; - } - - $response['tax_id'] = $tax_id; - $response['message'] = $message; - - return response()->json($response); - } -} diff --git a/app/View/Components/Layouts/Wizard/Scripts.php b/app/View/Components/Layouts/Wizard/Scripts.php index a2ec25253..24a1bf99c 100644 --- a/app/View/Components/Layouts/Wizard/Scripts.php +++ b/app/View/Components/Layouts/Wizard/Scripts.php @@ -6,7 +6,6 @@ use Akaunting\Money\Currency as MoneyCurrency; use App\Abstracts\View\Component; use App\Models\Common\Media; use App\Models\Setting\Currency; -use App\Models\Setting\Tax; use App\Traits\Modules; class Scripts extends Component @@ -21,8 +20,6 @@ class Scripts extends Component public $currency_codes; - public $taxes; - public $modules; /** @@ -41,8 +38,6 @@ class Scripts extends Component // Prepare codes $this->currency_codes = $this->getCurrencyCodes(); - $this->taxes = $this->getTaxes(); - $this->modules = $this->getFeaturedModules([ 'query' => [ 'limit' => 5 @@ -122,29 +117,6 @@ class Scripts extends Component 'cancel' => trans('general.cancel'), ], - 'taxes' => [ - 'title' => trans_choice('general.taxes', 2), - 'add_new' => trans('general.add_new'), - 'no_taxes' => trans('taxes.no_taxes'), - 'create_task' => trans('taxes.create_task'), - 'new_tax' => trans('taxes.new_tax'), - '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('modules.ready'), 'recommended_apps' => trans('modules.recommended_apps'), @@ -185,9 +157,4 @@ class Scripts extends Component return $codes; } - - protected function getTaxes() - { - return Tax::all(); - } } diff --git a/resources/assets/js/Wizard.vue b/resources/assets/js/Wizard.vue index 9a61e052e..fe2e1f90a 100644 --- a/resources/assets/js/Wizard.vue +++ b/resources/assets/js/Wizard.vue @@ -2,7 +2,6 @@ { @@ -36,14 +34,12 @@ translations: { company: {}, currencies: {}, - taxes: {}, finish: {}, }, company: {}, countries: {}, currencies: [], currency_codes: [], - taxes: [], modules: {}, page_loaded: true }; diff --git a/resources/assets/js/views/wizard/Currencies.vue b/resources/assets/js/views/wizard/Currencies.vue index 3f3b16c39..cf4a39509 100644 --- a/resources/assets/js/views/wizard/Currencies.vue +++ b/resources/assets/js/views/wizard/Currencies.vue @@ -414,7 +414,7 @@ next() { if (this.active++ > 2); - this.$router.push("/wizard/taxes"); + this.$router.push("/wizard/finish"); }, }, }; diff --git a/resources/assets/js/views/wizard/Steps.vue b/resources/assets/js/views/wizard/Steps.vue index 846b2620b..b27e01376 100644 --- a/resources/assets/js/views/wizard/Steps.vue +++ b/resources/assets/js/views/wizard/Steps.vue @@ -28,19 +28,6 @@ -
  • - - Text - - - {{ translations.taxes.title }} - - -
    • -
  • -
    - - -
    -
    - data_usage -
    - -
    -
    - - - - - - - - - - - - - - - - -
    - {{ translations.taxes.name }} - - {{ translations.taxes.rate }} -
    - {{ item.name }} - - {{ item.rate }} - - - -
    - - -
    - - - -
    - - {{ translations.taxes.cancel }} - - - -
    -
    -
    -
    -
    - - {{ translations.taxes.no_taxes }} - - - - {{ translations.taxes.create_task }} - -
    - -
    - -
    - - -
    - -
    - - - - -
    - - {{ translations.taxes.cancel }} - - - -
    -
    -
    -
    - -
    - - {{ translations.taxes.previous }} - - - - {{ translations.taxes.next }} - -
    -
    - - - -
    - - -
    - - - diff --git a/resources/assets/js/wizard.js b/resources/assets/js/wizard.js index 633aa7dce..72b267044 100644 --- a/resources/assets/js/wizard.js +++ b/resources/assets/js/wizard.js @@ -10,7 +10,6 @@ Vue.use(VueRouter); import Wizard from './Wizard.vue'; import Company from './views/wizard/Company.vue'; import Currencies from './views/wizard/Currencies.vue'; -import Taxes from './views/wizard/Taxes.vue'; import Finish from './views/wizard/Finish.vue'; var global_path = new URL(url).protocol + '//' + window.location.host; @@ -18,7 +17,9 @@ var base_path = url.replace(global_path, ''); const router = new VueRouter({ mode: 'history', + base: base_path, + routes: [ { path: '/wizard', @@ -35,18 +36,15 @@ const router = new VueRouter({ name: 'Currencies', component: Currencies }, - { - path: '/wizard/taxes', - name: 'Taxes', - component: Taxes - }, { path: '/wizard/finish', name: 'Finish', component: Finish } ], + linkActiveClass: 'active', + scrollBehavior: (to, from ,savedPosition) => { if (savedPosition) { return savedPosition; diff --git a/resources/views/components/layouts/wizard/scripts.blade.php b/resources/views/components/layouts/wizard/scripts.blade.php index 0f0a2ab25..02294861e 100644 --- a/resources/views/components/layouts/wizard/scripts.blade.php +++ b/resources/views/components/layouts/wizard/scripts.blade.php @@ -10,7 +10,6 @@ var wizard_countries = {!! json_encode(trans('countries')) !!}; var wizard_currencies = {!! json_encode($currencies) !!}; var wizard_currency_codes = {!! json_encode($currency_codes) !!}; - var wizard_taxes = {!! json_encode($taxes) !!}; var wizard_modules = {!! json_encode($modules) !!}; diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php deleted file mode 100644 index 2d9c051b8..000000000 --- a/resources/views/wizard/taxes/index.blade.php +++ /dev/null @@ -1,7 +0,0 @@ - - - {{ trans('general.wizard') }} - - - - diff --git a/routes/wizard.php b/routes/wizard.php index a746cfb07..b4999ea78 100644 --- a/routes/wizard.php +++ b/routes/wizard.php @@ -16,10 +16,6 @@ Route::group(['as' => 'wizard.'], function () { Route::get('currencies/{currency}/disable', 'Settings\Currencies@disable')->name('currencies.disable'); Route::resource('currencies', 'Wizard\Currencies'); - Route::get('taxes/{tax}/enable', 'Settings\Taxes@enable')->name('taxes.enable'); - Route::get('taxes/{tax}/disable', 'Settings\Taxes@disable')->name('taxes.disable'); - Route::resource('taxes', 'Wizard\Taxes'); - Route::get('finish', 'Wizard\Finish@index')->name('finish.index'); Route::patch('finish', 'Wizard\Finish@update')->name('finish.update'); });