From 24d1850be10d2fe9de78d58f1b250d6ccbf76b1f Mon Sep 17 00:00:00 2001 From: Shivendra Date: Wed, 16 Aug 2023 13:56:22 +0530 Subject: [PATCH 1/4] added show password feature for admin-panel --- .../inventory_sources/create.blade.php | 20 ++++----- .../settings/inventory_sources/edit.blade.php | 24 +++++----- .../views/users/sessions/create.blade.php | 45 +++++++++++++------ .../views/users/users/edit.blade.php | 20 ++++----- .../views/users/users/index.blade.php | 10 ++--- 5 files changed, 71 insertions(+), 48 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php index d52212ce48b..8a43fc853cf 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php @@ -50,7 +50,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.inventory-sources.create.code') @@ -73,7 +73,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.inventory-sources.create.name') @@ -126,7 +126,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.contact-name') @@ -149,7 +149,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.contact-email') @@ -172,7 +172,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.contact-number') @@ -224,7 +224,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.country') @@ -254,7 +254,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.state') @@ -302,7 +302,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.city') @@ -325,7 +325,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.street') @@ -348,7 +348,7 @@ class="text-gray-600 !mb-[0px]" - + @lang('admin::app.settings.inventory-sources.create.postcode') diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php index 0e1f049b87f..83bebc105da 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php @@ -55,7 +55,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.inventory-sources.edit.code') @@ -78,7 +78,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.inventory-sources.edit.name') @@ -131,7 +131,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.contact-name') @@ -154,7 +154,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.contact-email') @@ -229,7 +229,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.country') @@ -257,7 +257,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.state') @@ -302,7 +302,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.city') @@ -325,7 +325,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.street') @@ -348,7 +348,7 @@ class="text-gray-600 " - + @lang('admin::app.settings.inventory-sources.edit.postcode') @@ -482,7 +482,7 @@ class="text-gray-600 " - + + @endpush \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php index ae9b3deebd8..881630eebc2 100755 --- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php @@ -39,9 +39,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-

- + {{-- Name --}} - + @lang('admin::app.users.users.edit.name') @@ -62,9 +62,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + {{-- Email --}} - + @lang('admin::app.users.users.edit.email') @@ -85,9 +85,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + {{-- Password --}} - + @lang('admin::app.users.users.edit.password') @@ -108,9 +108,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + {{-- Confirm Password --}} - + @lang('admin::app.users.users.edit.confirm-password') @@ -130,9 +130,9 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + {{-- Role --}} - + @lang('admin::app.users.users.edit.role') diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php index ed21d833459..ef1f9e6c1cd 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php @@ -50,7 +50,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b
- + @lang('admin::app.users.users.index.create.name') @@ -72,7 +72,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b - + @lang('admin::app.users.users.index.create.email') @@ -94,7 +94,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b - + @lang('admin::app.users.users.index.create.password') @@ -117,7 +117,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b - + @lang('admin::app.users.users.index.create.confirm-password') @@ -139,7 +139,7 @@ class="text-gray-50 font-semibold px-[12px] py-[6px] bg-blue-600 border border-b - + @lang('admin::app.users.users.index.create.role') From ced66e006fa153a0c3ec963e9cf30696bdd1c776 Mon Sep 17 00:00:00 2001 From: Shivendra Date: Wed, 16 Aug 2023 16:18:59 +0530 Subject: [PATCH 2/4] fixed taxcategory issue --- .../Controllers/Core/CurrencyController.php | 2 +- .../Controllers/Core/LocaleController.php | 2 +- .../Admin/src/Resources/lang/en/app.php | 29 +++++--- .../views/configuration/field.blade.php | 12 ---- .../views/sales/transactions/index.blade.php | 2 +- .../settings/currencies/create.blade.php | 4 +- .../views/settings/currencies/edit.blade.php | 4 +- .../views/settings/locales/create.blade.php | 6 +- .../views/settings/locales/edit.blade.php | 6 +- .../views/tax/tax-categories/index.blade.php | 66 ++++++++++++------- 10 files changed, 74 insertions(+), 59 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php b/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php index 5146498b03f..880b27432af 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php @@ -93,7 +93,7 @@ public function update($id) $this->currencyRepository->update($data, $id); - session()->flash('success', trans('admin::app.settings.currencies.update-success')); + session()->flash('success', trans('admin::app.settings.currencies.edit.update-success')); return redirect()->route('admin.currencies.index'); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php b/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php index 71308fd561f..dfe37030ada 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php @@ -95,7 +95,7 @@ public function update($id) $this->localeRepository->update($data, $id); - session()->flash('success', trans('admin::app.settings.locales.update-success')); + session()->flash('success', trans('admin::app.settings.locales.edit.update-success')); return redirect()->route('admin.locales.index'); } diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index c592aab98d6..03849ac82ea 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -196,6 +196,13 @@ 'invoice-sent' => 'Invoice sent successfully', ], ], + + 'transactions' => [ + 'index' => [ + 'title' => 'Transactions', + 'create-btn' => 'Create Transactions', + ], + ], ], 'customers' => [ @@ -383,15 +390,16 @@ ], 'edit' => [ - 'cancel-btn' => 'Cancel', - 'code' => 'Code', - 'save-btn' => 'Save Locale', - 'general' => 'General', - 'title' => 'Edit Locales', - 'name' => 'Name', - 'direction' => 'Direction', - 'logo' => 'Locale Logo', - 'logo-path' => 'Locale Path', + 'cancel-btn' => 'Cancel', + 'code' => 'Code', + 'save-btn' => 'Save Locale', + 'general' => 'General', + 'title' => 'Edit Locales', + 'name' => 'Name', + 'direction' => 'Direction', + 'logo' => 'Locale Logo', + 'logo-path' => 'Locale Path', + 'update-success' => 'Locale Updated Successfully.', ], ], @@ -426,6 +434,7 @@ 'save-btn' => 'Save Currency', 'symbol' => 'Symbol', 'title' => 'Edit Currency', + 'update-success' => 'Currency updated successfully.', ], ], @@ -534,6 +543,8 @@ 'save-btn' => 'Save Tax Category', 'tax-rates' => 'Tax Rates', 'title' => 'Tax Categories', + 'add-tax-rates' => 'Add Tax Rates', + 'empty-text' => 'Tax Rates are not available please create new Tax Rates.', ], 'edit' => [ diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php index d3a14bee040..e0fc931bc72 100644 --- a/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php @@ -23,18 +23,6 @@ action="" enctype="multipart/form-data" > - -
-
- -
- -

- @lang('admin::app.configuration.title') / {{ $title }} -

-
- - {{-- Save Inventory --}}

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php index 39088f5fd7b..117fd0305de 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php @@ -81,7 +81,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- href="{{ route('admin.sales.transactions.create') }}" class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-gray-50 font-semibold cursor-pointer" > - @lang('admin::app.sales.transactions.create.add') + @lang('admin::app.sales.transactions.index.create-btn')

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php index d503cbfebc7..3664791e42e 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php @@ -29,7 +29,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- {!! view_render_event('bagisto.admin.settings.currencies.create.before') !!} - + @lang('admin::app.settings.currencies.create.code') @@ -51,7 +51,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.currencies.create.name') diff --git a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php index 50934f9b347..d98e9300e46 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php @@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.currencies.edit.code') @@ -71,7 +71,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.currencies.edit.name') diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php index 4af9a8ae875..d018f535845 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/create.blade.php @@ -28,7 +28,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- {!! view_render_event('bagisto.admin.settings.locale.create.before') !!} - + @lang('admin::app.settings.locales.index.code') @@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.locales.index.name') @@ -70,7 +70,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.locales.index.direction') diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php index ea227e7a0c7..0e99b061074 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php @@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.locales.edit.code') @@ -72,7 +72,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.locales.edit.name') @@ -94,7 +94,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.locales.edit.direction') diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php index 26391551636..e7fe3772db6 100644 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php @@ -126,35 +126,51 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- @lang('admin::app.settings.taxes.tax-categories.create.tax-rates')

- @foreach ($taxRates as $taxRate) - - - - - - {{ $taxRate->identifier }} - - - - @endforeach - + @if(! count($taxRates)) +
+ +
+

+ @lang('admin::app.settings.taxes.tax-categories.create.add-tax-rates') +

+

+ @lang('admin::app.settings.taxes.tax-categories.create.empty-text') +

+
+
+ @else + @foreach ($taxRates as $taxRate) + + + + + + {{ $taxRate->identifier }} + + + + @endforeach + @endif + -
From 35e4baee254637d7a0a24ea3c61cf64e6dfe95e6 Mon Sep 17 00:00:00 2001 From: Shivendra Date: Wed, 16 Aug 2023 17:41:03 +0530 Subject: [PATCH 3/4] fixed tax-category issue --- .../Controllers/Tax/TaxCategoryController.php | 4 +-- .../Controllers/Tax/TaxRateController.php | 2 +- .../Admin/src/Resources/lang/en/app.php | 5 +-- .../settings/inventory_sources/edit.blade.php | 4 --- .../views/tax/tax-categories/index.blade.php | 12 ++++--- .../views/tax/tax-rates/create.blade.php | 12 +++---- .../views/tax/tax-rates/edit.blade.php | 36 +++++++++---------- 7 files changed, 38 insertions(+), 37 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php index 5b66fee8f58..19c9e1002a7 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php @@ -66,7 +66,7 @@ public function store() Event::dispatch('tax.tax_category.create.after', $taxCategory); return new JsonResource([ - 'message' => trans('admin::app.settings.taxes.tax-categories.create-success'), + 'message' => trans('admin::app.settings.taxes.tax-categories.create.create-success'), ]); } @@ -113,7 +113,7 @@ public function update($id) Event::dispatch('tax.tax_category.update.after', $taxCategory); - session()->flash('success', trans('admin::app.settings.taxes.tax-categories.update-success')); + session()->flash('success', trans('admin::app.settings.taxes.tax-categories.edit.update-success')); return redirect()->route('admin.tax_categories.index'); } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php index 5e077a0f397..cd3a9e74455 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php @@ -141,7 +141,7 @@ public function update($id) Event::dispatch('tax.tax_rate.update.after', $taxRate); - session()->flash('success', trans('admin::app.settings.tax-rates.update-success')); + session()->flash('success', trans('admin::app.settings.taxes.tax-rates.edit.update-success')); return redirect()->route('admin.tax_rates.index'); } diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 03849ac82ea..638179968f2 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -545,6 +545,7 @@ 'title' => 'Tax Categories', 'add-tax-rates' => 'Add Tax Rates', 'empty-text' => 'Tax Rates are not available please create new Tax Rates.', + 'create-success' => 'New Tax Category Created', ], 'edit' => [ @@ -557,10 +558,9 @@ 'save-btn' => 'Save Tax Category', 'select-tax-rates' => 'Select Tax Rates', 'title' => 'Edit Tax Categories', + 'update-success' => 'Successfully Updated Tax Category', ], - 'create-success' => 'New Tax Category Created', - 'update-success' => 'Successfully Updated Tax Category', ], 'tax-rates' => [ @@ -603,6 +603,7 @@ 'zip_code' => 'Zip Code', 'zip_from' => 'Zip From', 'zip_to' => 'Zip To', + 'update-success' => 'Tax Rate Update Successfully', ], ], ], diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php index 83bebc105da..e75f740652e 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php @@ -497,10 +497,6 @@ class="text-gray-600 " } }, - mounted(){ - console.log(this.state); - }, - methods: { haveStates: function () { if (this.countryStates[this.country] && this.countryStates[this.country].length) { diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php index e7fe3772db6..785936337d2 100644 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/index.blade.php @@ -146,7 +146,7 @@ class="w-[80px] h-[80px] border border-dashed border-gray-300 rounded-[4px]" - {{ $taxRate->identifier }} + {{ $taxRate['identifier'] }} @@ -168,7 +168,7 @@ class="!text-[14px] !text-gray-600 cursor-pointer" @endif @@ -198,7 +198,11 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text- methods: { store(params, { resetForm, setErrors }) { - this.$axios.post('{{ route('admin.tax_categories.store') }}', params) + this.$axios.post('{{ route('admin.tax_categories.store') }}', params,{ + headers: { + 'Content-Type': 'multipart/form-data' + } + }) .then((response) => { this.$refs.taxCategory.toggle(); diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php index cd17298f034..3947271c22d 100755 --- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php @@ -47,7 +47,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-
- + @lang('admin::app.settings.taxes.tax-rates.create.identifier') @@ -69,7 +69,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text- - + @lang('admin::app.settings.taxes.tax-rates.create.country') @@ -98,7 +98,7 @@ class="py-[6px] px-[12px] bg-blue-600 border border-blue-700 rounded-[6px] text-