Skip to content

Commit

Permalink
Merge pull request bagisto#7967 from shivendra-webkul/show-passwoed
Browse files Browse the repository at this point in the history 
Added Show password in admin login
  • Loading branch information
@devansh-webkul
devansh-webkul committed Aug 16, 2023
2 parents 4e03270 + 37fa04b commit ad12887
Show file tree
Hide file tree
Showing 19 changed files with 181 additions and 140 deletions.
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Http/Controllers/Core/CurrencyController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Http/Controllers/Core/LocaleController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
4 changes: 2 additions & 2 deletions packages/Webkul/Admin/src/Http/Controllers/Tax/TaxCategoryController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
]);
}

Expand Down Expand Up @@ -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');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Http/Controllers/Tax/TaxRateController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
34 changes: 23 additions & 11 deletions packages/Webkul/Admin/src/Resources/lang/en/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,13 @@
'invoice-sent' => 'Invoice sent successfully',
],
],

'transactions' => [
'index' => [
'title' => 'Transactions',
'create-btn' => 'Create Transactions',
],
],
],

'customers' => [
Expand Down Expand Up @@ -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.',

],
],
Expand Down Expand Up @@ -426,6 +434,7 @@
'save-btn' => 'Save Currency',
'symbol' => 'Symbol',
'title' => 'Edit Currency',
'update-success' => 'Currency updated successfully.',
],
],

Expand Down Expand Up @@ -534,6 +543,9 @@
'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.',
'create-success' => 'New Tax Category Created',
],

'edit' => [
Expand All @@ -546,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' => [
Expand Down Expand Up @@ -592,6 +603,7 @@
'zip_code' => 'Zip Code',
'zip_from' => 'Zip From',
'zip_to' => 'Zip To',
'update-success' => 'Tax Rate Update Successfully',
],
],
],
Expand Down
12 changes: 0 additions & 12 deletions packages/Webkul/Admin/src/Resources/views/configuration/field.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,6 @@
action=""
enctype="multipart/form-data"
>
<a href="{{ route('admin.configuration.index') }}">
<div class="flex items-center cursor-pointer">
<div class="inline-flex gap-x-[4px] items-center justify-between text-gray-600 text-center w-full max-w-max rounded-[6px]">
<span class="icon-sort-left text-[24px]"></span>
</div>

<p class="text-gray-600">
@lang('admin::app.configuration.title') / {{ $title }}
</p>
</div>
</a>

{{-- Save Inventory --}}
<div class="flex gap-[16px] justify-between items-center mt-[14px] max-sm:flex-wrap">
<p class="text-[20px] text-gray-800 font-bold">
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/sales/transactions/index.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
</a>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions packages/Webkul/Admin/src/Resources/views/settings/currencies/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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') !!}

<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.currencies.create.code')
</x-admin::form.control-group.label>

Expand All @@ -51,7 +51,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
</x-admin::form.control-group>

<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.currencies.create.name')
</x-admin::form.control-group.label>

Expand Down
4 changes: 2 additions & 2 deletions packages/Webkul/Admin/src/Resources/views/settings/currencies/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
</x-admin::form.control-group.control>

<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.currencies.edit.code')
</x-admin::form.control-group.label>

Expand All @@ -71,7 +71,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-
</x-admin::form.control-group>

<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.currencies.edit.name')
</x-admin::form.control-group.label>

Expand Down
20 changes: 10 additions & 10 deletions packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-

<!-- Code -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.code')
</x-admin::form.control-group.label>

Expand All @@ -73,7 +73,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-

<!-- Name -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.name')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -126,7 +126,7 @@ class="text-gray-600 !mb-[0px]"

<!-- Contact name -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.contact-name')
</x-admin::form.control-group.label>

Expand All @@ -149,7 +149,7 @@ class="text-gray-600 !mb-[0px]"

<!-- Contact Email -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.contact-email')
</x-admin::form.control-group.label>

Expand All @@ -172,7 +172,7 @@ class="text-gray-600 !mb-[0px]"

<!-- Contact Number -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.contact-number')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -224,7 +224,7 @@ class="text-gray-600 !mb-[0px]"

<!-- Country -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.country')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -254,7 +254,7 @@ class="text-gray-600 !mb-[0px]"

<!-- State -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.state')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -302,7 +302,7 @@ class="text-gray-600 !mb-[0px]"

<!-- City -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.city')
</x-admin::form.control-group.label>

Expand All @@ -325,7 +325,7 @@ class="text-gray-600 !mb-[0px]"

<!-- Street -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.street')
</x-admin::form.control-group.label>

Expand All @@ -348,7 +348,7 @@ class="text-gray-600 !mb-[0px]"

<!-- postcode -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.create.postcode')
</x-admin::form.control-group.label>

Expand Down
20 changes: 10 additions & 10 deletions packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-

<!-- Code -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.code')
</x-admin::form.control-group.label>

Expand All @@ -78,7 +78,7 @@ class="px-[12px] py-[6px] bg-blue-600 border border-blue-700 rounded-[6px] text-

<!-- Name -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.name')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -131,7 +131,7 @@ class="text-gray-600 "

<!-- Contact Name -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.contact-name')
</x-admin::form.control-group.label>

Expand All @@ -154,7 +154,7 @@ class="text-gray-600 "

<!-- Contact Email -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.contact-email')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -229,7 +229,7 @@ class="text-gray-600 "

<!-- Country -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.country')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -257,7 +257,7 @@ class="text-gray-600 "

<!-- State -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.state')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -302,7 +302,7 @@ class="text-gray-600 "

<!-- City -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.city')
</x-admin::form.control-group.label>

Expand All @@ -325,7 +325,7 @@ class="text-gray-600 "

<!-- Street -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.street')
</x-admin::form.control-group.label>

Expand All @@ -348,7 +348,7 @@ class="text-gray-600 "

<!-- Post Code -->
<x-admin::form.control-group class="mb-[10px]">
<x-admin::form.control-group.label>
<x-admin::form.control-group.label class="required">
@lang('admin::app.settings.inventory-sources.edit.postcode')
</x-admin::form.control-group.label>

Expand Down Expand Up @@ -482,7 +482,7 @@ class="text-gray-600 "
</x-admin::form>
</div>
</script>

<script type="module">
app.component('v-inventory-edit-form', {
template: '#v-inventory-edit-form-template',
Expand Down
Loading

0 comments on commit ad12887

Please sign in to comment.