From fb5e920a11665ccd35797cc4dbeea5938f242901 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Sun, 14 Dec 2025 17:02:21 +0700 Subject: [PATCH] refactor(traits): Update trait imports to a new namespace structure and remove unused traits for improved organization and maintainability. --- app/Enums/ArticleStatus.php | 4 ++-- app/Enums/AuditStockStatus.php | 4 ++-- app/Enums/Concentration.php | 4 ++-- app/Enums/Day.php | 4 ++-- app/Enums/EmploymentStatus.php | 4 ++-- app/Enums/ExpenseType.php | 4 ++-- app/Enums/Gender.php | 4 ++-- app/Enums/IsActive.php | 4 ++-- app/Enums/IsPaid.php | 4 ++-- app/Enums/IsShow.php | 4 ++-- app/Enums/OrderChannel.php | 4 ++-- app/Enums/OrderStatus.php | 4 ++-- app/Enums/OutletStatus.php | 4 ++-- app/Enums/PaymentMethod.php | 4 ++-- app/Enums/PaymentStatus.php | 4 ++-- app/Enums/PointRecordType.php | 4 ++-- app/Enums/PriceRequestStatus.php | 4 ++-- app/Enums/SalaryAdjustmentType.php | 4 ++-- app/Enums/StockOpnameStatus.php | 4 ++-- app/Enums/UserRole.php | 4 ++-- app/Enums/UserStatus.php | 4 ++-- app/Enums/VoucherType.php | 4 ++-- app/Livewire/Auth/ForgotPassword.php | 2 +- app/Livewire/Auth/Login.php | 2 +- app/Livewire/Auth/Register.php | 4 ++-- app/Livewire/Auth/ResetPassword.php | 2 +- app/Livewire/Datatable/Catalog/BottlesTable.php | 2 +- app/Livewire/Datatable/Catalog/BrandsTable.php | 2 +- app/Livewire/Datatable/Finance/ExpensesTable.php | 2 +- app/Livewire/Datatable/Finance/PayrollsTable.php | 2 +- app/Livewire/Datatable/Manage/ArticlesTable.php | 2 +- app/Livewire/Datatable/Manage/PurchasesTable.php | 2 +- app/Livewire/Datatable/Manage/StockOpnameTable.php | 2 +- app/Livewire/Forms/Studio/Catalog/BottleForm.php | 2 +- app/Livewire/Forms/Studio/Catalog/BrandForm.php | 4 ++-- app/Livewire/Forms/Studio/Catalog/CategoryForm.php | 2 +- app/Livewire/Forms/Studio/Catalog/PerfumeForm.php | 2 +- app/Livewire/Forms/Studio/Catalog/ProductForm.php | 2 +- app/Livewire/Forms/Studio/Feature/ChooseUsForm.php | 2 +- .../Forms/Studio/Feature/PerfumeFeatureForm.php | 2 +- app/Livewire/Forms/Studio/Finance/ExpenseForm.php | 2 +- .../Forms/Studio/Information/BroadcastForm.php | 2 +- app/Livewire/Forms/Studio/Information/FaqForm.php | 2 +- app/Livewire/Forms/Studio/Manage/ArticleForm.php | 2 +- app/Livewire/Forms/Studio/Manage/OrderForm.php | 2 +- app/Livewire/Forms/Studio/Manage/PurchaseForm.php | 2 +- app/Livewire/Forms/Studio/Master/OutletForm.php | 2 +- app/Livewire/Forms/Studio/Setting/AccountForm.php | 2 +- app/Livewire/Forms/Studio/Setting/PasswordForm.php | 2 +- app/Livewire/Member/Overview.php | 2 +- app/Livewire/Studio/Catalog/Bottle/Create.php | 8 ++++---- app/Livewire/Studio/Catalog/Bottle/Edit.php | 8 ++++---- app/Livewire/Studio/Catalog/Bottle/Index.php | 8 ++++---- app/Livewire/Studio/Catalog/Brand.php | 10 +++++----- app/Livewire/Studio/Catalog/Category.php | 10 +++++----- app/Livewire/Studio/Catalog/Perfume/Create.php | 10 +++++----- app/Livewire/Studio/Catalog/Perfume/Edit.php | 10 +++++----- app/Livewire/Studio/Catalog/Perfume/Index.php | 8 ++++---- app/Livewire/Studio/Catalog/Product/Create.php | 8 ++++---- app/Livewire/Studio/Catalog/Product/Edit.php | 8 ++++---- app/Livewire/Studio/Catalog/Product/Index.php | 8 ++++---- app/Livewire/Studio/Feature/ChooseUs.php | 10 +++++----- app/Livewire/Studio/Feature/PerfumeFeature.php | 10 +++++----- app/Livewire/Studio/Finance/Expense.php | 10 +++++----- app/Livewire/Studio/Finance/Payroll.php | 12 ++++++------ app/Livewire/Studio/Information/Broadcast.php | 12 ++++++------ app/Livewire/Studio/Information/Faq.php | 10 +++++----- app/Livewire/Studio/Information/PriceRequest.php | 6 +++--- app/Livewire/Studio/Loyalty/Customer.php | 10 +++++----- app/Livewire/Studio/Loyalty/Tier/Index.php | 10 +++++----- app/Livewire/Studio/Loyalty/Tier/Reward.php | 10 +++++----- app/Livewire/Studio/Loyalty/Voucher/Create.php | 8 ++++---- app/Livewire/Studio/Loyalty/Voucher/Edit.php | 8 ++++---- app/Livewire/Studio/Loyalty/Voucher/Index.php | 6 +++--- app/Livewire/Studio/Manage/Article/Create.php | 6 +++--- app/Livewire/Studio/Manage/Article/Edit.php | 6 +++--- app/Livewire/Studio/Manage/Article/Index.php | 6 +++--- app/Livewire/Studio/Manage/Order/Create.php | 8 ++++---- app/Livewire/Studio/Manage/Order/Index.php | 6 +++--- app/Livewire/Studio/Manage/Purchase/Create.php | 8 ++++---- app/Livewire/Studio/Manage/Purchase/Index.php | 8 ++++---- app/Livewire/Studio/Manage/StockOpname/Index.php | 4 ++-- app/Livewire/Studio/Manage/StockOpname/Manage.php | 4 ++-- app/Livewire/Studio/Manage/StockOpname/Show.php | 2 +- app/Livewire/Studio/Master/Formula.php | 10 +++++----- app/Livewire/Studio/Master/Outlet/Create.php | 4 ++-- app/Livewire/Studio/Master/Outlet/Edit.php | 4 ++-- app/Livewire/Studio/Master/Outlet/Index.php | 10 +++++----- app/Livewire/Studio/Master/User/Create.php | 10 +++++----- app/Livewire/Studio/Master/User/Edit.php | 10 +++++----- app/Livewire/Studio/Master/User/Index.php | 6 +++--- app/Livewire/Studio/Setting/Account.php | 6 +++--- app/Livewire/Studio/Setting/Application.php | 6 +++--- app/Traits/{ => Authorization}/WithAuthorization.php | 2 +- app/Traits/{ => Components}/WithCategorySelector.php | 2 +- app/Traits/{ => Components}/WithCloseModal.php | 2 +- app/Traits/{ => Components}/WithConfirmation.php | 2 +- app/Traits/{ => Components}/WithOutletSelector.php | 2 +- app/Traits/{ => Components}/WithRoleSelector.php | 2 +- app/Traits/{ => Components}/WithToast.php | 2 +- app/Traits/{ => Components}/WithUserSelector.php | 2 +- app/Traits/{ => Enums}/WithCommentEnum.php | 2 +- app/Traits/{ => Enums}/WithValueEnum.php | 2 +- app/Traits/{ => Media}/WithMediaHandler.php | 2 +- app/Traits/{ => Pricing}/WithShowPrice.php | 2 +- app/Traits/{ => Utilities}/WithSortOrder.php | 2 +- app/Traits/{ => Utilities}/WithUpdatedData.php | 2 +- 107 files changed, 259 insertions(+), 259 deletions(-) rename app/Traits/{ => Authorization}/WithAuthorization.php (84%) rename app/Traits/{ => Components}/WithCategorySelector.php (88%) rename app/Traits/{ => Components}/WithCloseModal.php (92%) rename app/Traits/{ => Components}/WithConfirmation.php (91%) rename app/Traits/{ => Components}/WithOutletSelector.php (88%) rename app/Traits/{ => Components}/WithRoleSelector.php (87%) rename app/Traits/{ => Components}/WithToast.php (90%) rename app/Traits/{ => Components}/WithUserSelector.php (87%) rename app/Traits/{ => Enums}/WithCommentEnum.php (87%) rename app/Traits/{ => Enums}/WithValueEnum.php (84%) rename app/Traits/{ => Media}/WithMediaHandler.php (98%) rename app/Traits/{ => Pricing}/WithShowPrice.php (98%) rename app/Traits/{ => Utilities}/WithSortOrder.php (98%) rename app/Traits/{ => Utilities}/WithUpdatedData.php (82%) diff --git a/app/Enums/ArticleStatus.php b/app/Enums/ArticleStatus.php index cb43a82..9ff7803 100644 --- a/app/Enums/ArticleStatus.php +++ b/app/Enums/ArticleStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum ArticleStatus: int { diff --git a/app/Enums/AuditStockStatus.php b/app/Enums/AuditStockStatus.php index adab7e6..25ed67c 100644 --- a/app/Enums/AuditStockStatus.php +++ b/app/Enums/AuditStockStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum AuditStockStatus: string { diff --git a/app/Enums/Concentration.php b/app/Enums/Concentration.php index 1c5df6f..27f8d05 100644 --- a/app/Enums/Concentration.php +++ b/app/Enums/Concentration.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum Concentration: int { diff --git a/app/Enums/Day.php b/app/Enums/Day.php index e5ed260..1036e02 100644 --- a/app/Enums/Day.php +++ b/app/Enums/Day.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum Day: int { diff --git a/app/Enums/EmploymentStatus.php b/app/Enums/EmploymentStatus.php index 5caecbc..f2ca26d 100644 --- a/app/Enums/EmploymentStatus.php +++ b/app/Enums/EmploymentStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum EmploymentStatus: int { diff --git a/app/Enums/ExpenseType.php b/app/Enums/ExpenseType.php index cad0ccf..8c1abcf 100644 --- a/app/Enums/ExpenseType.php +++ b/app/Enums/ExpenseType.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum ExpenseType: int { diff --git a/app/Enums/Gender.php b/app/Enums/Gender.php index 3b76b31..cbd634d 100644 --- a/app/Enums/Gender.php +++ b/app/Enums/Gender.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum Gender: int { diff --git a/app/Enums/IsActive.php b/app/Enums/IsActive.php index 9cd8e9f..b5bed10 100644 --- a/app/Enums/IsActive.php +++ b/app/Enums/IsActive.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum IsActive: int { diff --git a/app/Enums/IsPaid.php b/app/Enums/IsPaid.php index f362227..e7ecedc 100644 --- a/app/Enums/IsPaid.php +++ b/app/Enums/IsPaid.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum IsPaid: int { diff --git a/app/Enums/IsShow.php b/app/Enums/IsShow.php index 7c9398e..075a2b5 100644 --- a/app/Enums/IsShow.php +++ b/app/Enums/IsShow.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum IsShow: int { diff --git a/app/Enums/OrderChannel.php b/app/Enums/OrderChannel.php index 8e86aa2..af7f9b4 100644 --- a/app/Enums/OrderChannel.php +++ b/app/Enums/OrderChannel.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum OrderChannel: int { diff --git a/app/Enums/OrderStatus.php b/app/Enums/OrderStatus.php index 5b4a035..be82a42 100644 --- a/app/Enums/OrderStatus.php +++ b/app/Enums/OrderStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum OrderStatus: int { diff --git a/app/Enums/OutletStatus.php b/app/Enums/OutletStatus.php index 20c55e6..3ed4423 100644 --- a/app/Enums/OutletStatus.php +++ b/app/Enums/OutletStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum OutletStatus: int { diff --git a/app/Enums/PaymentMethod.php b/app/Enums/PaymentMethod.php index 0654e7b..5f3feb2 100644 --- a/app/Enums/PaymentMethod.php +++ b/app/Enums/PaymentMethod.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum PaymentMethod: int { diff --git a/app/Enums/PaymentStatus.php b/app/Enums/PaymentStatus.php index 897f3f3..6a3c93f 100644 --- a/app/Enums/PaymentStatus.php +++ b/app/Enums/PaymentStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum PaymentStatus: int { diff --git a/app/Enums/PointRecordType.php b/app/Enums/PointRecordType.php index fc33e29..c2f8ae2 100644 --- a/app/Enums/PointRecordType.php +++ b/app/Enums/PointRecordType.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum PointRecordType: int { diff --git a/app/Enums/PriceRequestStatus.php b/app/Enums/PriceRequestStatus.php index 18ba11d..00e5b0e 100644 --- a/app/Enums/PriceRequestStatus.php +++ b/app/Enums/PriceRequestStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum PriceRequestStatus: int { diff --git a/app/Enums/SalaryAdjustmentType.php b/app/Enums/SalaryAdjustmentType.php index acd18c6..4935323 100644 --- a/app/Enums/SalaryAdjustmentType.php +++ b/app/Enums/SalaryAdjustmentType.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum SalaryAdjustmentType: int { diff --git a/app/Enums/StockOpnameStatus.php b/app/Enums/StockOpnameStatus.php index ebdb031..c533646 100644 --- a/app/Enums/StockOpnameStatus.php +++ b/app/Enums/StockOpnameStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum StockOpnameStatus: int { diff --git a/app/Enums/UserRole.php b/app/Enums/UserRole.php index c8d4b1a..58252e6 100644 --- a/app/Enums/UserRole.php +++ b/app/Enums/UserRole.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum UserRole: string { diff --git a/app/Enums/UserStatus.php b/app/Enums/UserStatus.php index 39ef464..b62218e 100644 --- a/app/Enums/UserStatus.php +++ b/app/Enums/UserStatus.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum UserStatus: int { diff --git a/app/Enums/VoucherType.php b/app/Enums/VoucherType.php index f4e752e..4838297 100644 --- a/app/Enums/VoucherType.php +++ b/app/Enums/VoucherType.php @@ -2,8 +2,8 @@ namespace App\Enums; -use App\Traits\WithCommentEnum; -use App\Traits\WithValueEnum; +use App\Traits\Enums\WithCommentEnum; +use App\Traits\Enums\WithValueEnum; enum VoucherType: int { diff --git a/app/Livewire/Auth/ForgotPassword.php b/app/Livewire/Auth/ForgotPassword.php index 2fd2762..816c14c 100644 --- a/app/Livewire/Auth/ForgotPassword.php +++ b/app/Livewire/Auth/ForgotPassword.php @@ -3,7 +3,7 @@ namespace App\Livewire\Auth; use App\Livewire\Forms\Auth\ForgotPasswordForm; -use App\Traits\WithToast; +use App\Traits\Components\WithToast; use Illuminate\Support\Facades\Password; use Illuminate\View\View; use Livewire\Attributes\Layout; diff --git a/app/Livewire/Auth/Login.php b/app/Livewire/Auth/Login.php index 78db28d..9525730 100644 --- a/app/Livewire/Auth/Login.php +++ b/app/Livewire/Auth/Login.php @@ -5,7 +5,7 @@ use App\Enums\UserStatus; use App\Livewire\Forms\Auth\LoginForm; use App\Models\User; -use App\Traits\WithToast; +use App\Traits\Components\WithToast; use Illuminate\Support\Facades\Auth; use Illuminate\View\View; use Livewire\Attributes\Layout; diff --git a/app/Livewire/Auth/Register.php b/app/Livewire/Auth/Register.php index d7bd223..498caf7 100644 --- a/app/Livewire/Auth/Register.php +++ b/app/Livewire/Auth/Register.php @@ -6,8 +6,8 @@ use App\Livewire\Forms\Auth\RegisterForm; use App\Models\PushNotification; use App\Models\User; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Support\Str; use Illuminate\View\View; use Livewire\Attributes\Layout; diff --git a/app/Livewire/Auth/ResetPassword.php b/app/Livewire/Auth/ResetPassword.php index 29c400d..5671aed 100644 --- a/app/Livewire/Auth/ResetPassword.php +++ b/app/Livewire/Auth/ResetPassword.php @@ -3,7 +3,7 @@ namespace App\Livewire\Auth; use App\Livewire\Forms\Auth\ResetPasswordForm; -use App\Traits\WithToast; +use App\Traits\Components\WithToast; use Illuminate\Support\Facades\Password; use Illuminate\View\View; use Livewire\Attributes\Layout; diff --git a/app/Livewire/Datatable/Catalog/BottlesTable.php b/app/Livewire/Datatable/Catalog/BottlesTable.php index f5e82b6..bac228e 100644 --- a/app/Livewire/Datatable/Catalog/BottlesTable.php +++ b/app/Livewire/Datatable/Catalog/BottlesTable.php @@ -6,7 +6,7 @@ use App\Models\PriceRequest; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Blade; use Illuminate\Support\Str; diff --git a/app/Livewire/Datatable/Catalog/BrandsTable.php b/app/Livewire/Datatable/Catalog/BrandsTable.php index f1e86b8..ce366f5 100644 --- a/app/Livewire/Datatable/Catalog/BrandsTable.php +++ b/app/Livewire/Datatable/Catalog/BrandsTable.php @@ -5,7 +5,7 @@ use App\Models\Brand; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Views\Column; diff --git a/app/Livewire/Datatable/Finance/ExpensesTable.php b/app/Livewire/Datatable/Finance/ExpensesTable.php index 8f82322..5d9fad2 100644 --- a/app/Livewire/Datatable/Finance/ExpensesTable.php +++ b/app/Livewire/Datatable/Finance/ExpensesTable.php @@ -6,7 +6,7 @@ use App\Traits\Datatable\WithAppendColumn; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Views\Column; diff --git a/app/Livewire/Datatable/Finance/PayrollsTable.php b/app/Livewire/Datatable/Finance/PayrollsTable.php index 4e8dc55..a5809f9 100644 --- a/app/Livewire/Datatable/Finance/PayrollsTable.php +++ b/app/Livewire/Datatable/Finance/PayrollsTable.php @@ -6,7 +6,7 @@ use App\Models\Payroll; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Blade; use Rappasoft\LaravelLivewireTables\DataTableComponent; diff --git a/app/Livewire/Datatable/Manage/ArticlesTable.php b/app/Livewire/Datatable/Manage/ArticlesTable.php index 26fabb8..accaba7 100644 --- a/app/Livewire/Datatable/Manage/ArticlesTable.php +++ b/app/Livewire/Datatable/Manage/ArticlesTable.php @@ -6,7 +6,7 @@ use App\Traits\Datatable\WithAppendColumn; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Blade; use Rappasoft\LaravelLivewireTables\DataTableComponent; diff --git a/app/Livewire/Datatable/Manage/PurchasesTable.php b/app/Livewire/Datatable/Manage/PurchasesTable.php index 7982011..588366d 100644 --- a/app/Livewire/Datatable/Manage/PurchasesTable.php +++ b/app/Livewire/Datatable/Manage/PurchasesTable.php @@ -6,7 +6,7 @@ use App\Traits\Datatable\WithAppendColumn; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Views\Column; diff --git a/app/Livewire/Datatable/Manage/StockOpnameTable.php b/app/Livewire/Datatable/Manage/StockOpnameTable.php index 23e2b71..c5a1101 100644 --- a/app/Livewire/Datatable/Manage/StockOpnameTable.php +++ b/app/Livewire/Datatable/Manage/StockOpnameTable.php @@ -6,7 +6,7 @@ use App\Traits\Datatable\WithAppendColumn; use App\Traits\Datatable\WithConfiguration; use App\Traits\Datatable\WithPrependColumn; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Database\Eloquent\Builder; use Rappasoft\LaravelLivewireTables\DataTableComponent; use Rappasoft\LaravelLivewireTables\Views\Column; diff --git a/app/Livewire/Forms/Studio/Catalog/BottleForm.php b/app/Livewire/Forms/Studio/Catalog/BottleForm.php index e8f4657..0e6437f 100644 --- a/app/Livewire/Forms/Studio/Catalog/BottleForm.php +++ b/app/Livewire/Forms/Studio/Catalog/BottleForm.php @@ -4,7 +4,7 @@ use App\Models\Bottle; use App\Rules\UnsignedInteger; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Catalog/BrandForm.php b/app/Livewire/Forms/Studio/Catalog/BrandForm.php index 5fa4f75..02694a2 100644 --- a/app/Livewire/Forms/Studio/Catalog/BrandForm.php +++ b/app/Livewire/Forms/Studio/Catalog/BrandForm.php @@ -3,8 +3,8 @@ namespace App\Livewire\Forms\Studio\Catalog; use App\Models\Brand; -use App\Traits\WithMediaHandler; -use App\Traits\WithSortOrder; +use App\Traits\Media\WithMediaHandler; +use App\Traits\Utilities\WithSortOrder; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Catalog/CategoryForm.php b/app/Livewire/Forms/Studio/Catalog/CategoryForm.php index c810858..6c30c57 100644 --- a/app/Livewire/Forms/Studio/Catalog/CategoryForm.php +++ b/app/Livewire/Forms/Studio/Catalog/CategoryForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Catalog; use App\Models\Category; -use App\Traits\WithSortOrder; +use App\Traits\Utilities\WithSortOrder; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Catalog/PerfumeForm.php b/app/Livewire/Forms/Studio/Catalog/PerfumeForm.php index 9731e32..705ff73 100644 --- a/app/Livewire/Forms/Studio/Catalog/PerfumeForm.php +++ b/app/Livewire/Forms/Studio/Catalog/PerfumeForm.php @@ -5,7 +5,7 @@ use App\Enums\Concentration; use App\Models\Perfume; use App\Rules\UnsignedInteger; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Catalog/ProductForm.php b/app/Livewire/Forms/Studio/Catalog/ProductForm.php index b2e87ab..08e6ab3 100644 --- a/app/Livewire/Forms/Studio/Catalog/ProductForm.php +++ b/app/Livewire/Forms/Studio/Catalog/ProductForm.php @@ -4,7 +4,7 @@ use App\Models\Product; use App\Rules\UnsignedInteger; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Feature/ChooseUsForm.php b/app/Livewire/Forms/Studio/Feature/ChooseUsForm.php index 5751da7..f3549c9 100644 --- a/app/Livewire/Forms/Studio/Feature/ChooseUsForm.php +++ b/app/Livewire/Forms/Studio/Feature/ChooseUsForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Feature; use App\Models\ChooseUs; -use App\Traits\WithSortOrder; +use App\Traits\Utilities\WithSortOrder; use Illuminate\Support\Facades\DB; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Feature/PerfumeFeatureForm.php b/app/Livewire/Forms/Studio/Feature/PerfumeFeatureForm.php index 01ed016..19b5ab1 100644 --- a/app/Livewire/Forms/Studio/Feature/PerfumeFeatureForm.php +++ b/app/Livewire/Forms/Studio/Feature/PerfumeFeatureForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Feature; use App\Models\PerfumeFeature; -use App\Traits\WithSortOrder; +use App\Traits\Utilities\WithSortOrder; use Illuminate\Support\Facades\DB; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Finance/ExpenseForm.php b/app/Livewire/Forms/Studio/Finance/ExpenseForm.php index e9afef5..1d1af1a 100644 --- a/app/Livewire/Forms/Studio/Finance/ExpenseForm.php +++ b/app/Livewire/Forms/Studio/Finance/ExpenseForm.php @@ -5,7 +5,7 @@ use App\Enums\ExpenseType; use App\Models\Expense; use App\Rules\UnsignedInteger; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Information/BroadcastForm.php b/app/Livewire/Forms/Studio/Information/BroadcastForm.php index c26b43c..6813f1a 100644 --- a/app/Livewire/Forms/Studio/Information/BroadcastForm.php +++ b/app/Livewire/Forms/Studio/Information/BroadcastForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Information; use App\Models\Broadcast; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Information/FaqForm.php b/app/Livewire/Forms/Studio/Information/FaqForm.php index ae0a0ce..85f9580 100644 --- a/app/Livewire/Forms/Studio/Information/FaqForm.php +++ b/app/Livewire/Forms/Studio/Information/FaqForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Information; use App\Models\Faq; -use App\Traits\WithSortOrder; +use App\Traits\Utilities\WithSortOrder; use Illuminate\Support\Facades\DB; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Manage/ArticleForm.php b/app/Livewire/Forms/Studio/Manage/ArticleForm.php index 4953e9d..2beb795 100644 --- a/app/Livewire/Forms/Studio/Manage/ArticleForm.php +++ b/app/Livewire/Forms/Studio/Manage/ArticleForm.php @@ -4,7 +4,7 @@ use App\Enums\ArticleStatus; use App\Models\Article; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Manage/OrderForm.php b/app/Livewire/Forms/Studio/Manage/OrderForm.php index 18164a9..1aff99d 100644 --- a/app/Livewire/Forms/Studio/Manage/OrderForm.php +++ b/app/Livewire/Forms/Studio/Manage/OrderForm.php @@ -11,10 +11,10 @@ use App\Models\User; use App\Models\Voucher; use App\Rules\UnsignedInteger; +use App\Traits\Media\WithMediaHandler; use App\Traits\Order\WithDiscount; use App\Traits\Order\WithOrderItem; use App\Traits\Order\WithUpdateStock; -use App\Traits\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Manage/PurchaseForm.php b/app/Livewire/Forms/Studio/Manage/PurchaseForm.php index 60c611d..0b1ed38 100644 --- a/app/Livewire/Forms/Studio/Manage/PurchaseForm.php +++ b/app/Livewire/Forms/Studio/Manage/PurchaseForm.php @@ -4,9 +4,9 @@ use App\Models\Purchase; use App\Rules\UnsignedInteger; +use App\Traits\Media\WithMediaHandler; use App\Traits\Purchase\WithPurchaseItems; use App\Traits\Purchase\WithUpdateStock; -use App\Traits\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Master/OutletForm.php b/app/Livewire/Forms/Studio/Master/OutletForm.php index cfa64a8..cd5f304 100644 --- a/app/Livewire/Forms/Studio/Master/OutletForm.php +++ b/app/Livewire/Forms/Studio/Master/OutletForm.php @@ -8,7 +8,7 @@ use App\Models\Outlet; use App\Models\User; use App\Rules\PhoneNumber; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Setting/AccountForm.php b/app/Livewire/Forms/Studio/Setting/AccountForm.php index f3aeff8..75f5b76 100644 --- a/app/Livewire/Forms/Studio/Setting/AccountForm.php +++ b/app/Livewire/Forms/Studio/Setting/AccountForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Setting; use App\Models\User; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Validation\Rule; use Livewire\Form; diff --git a/app/Livewire/Forms/Studio/Setting/PasswordForm.php b/app/Livewire/Forms/Studio/Setting/PasswordForm.php index 3136058..62410fc 100644 --- a/app/Livewire/Forms/Studio/Setting/PasswordForm.php +++ b/app/Livewire/Forms/Studio/Setting/PasswordForm.php @@ -3,7 +3,7 @@ namespace App\Livewire\Forms\Studio\Setting; use App\Models\User; -use App\Traits\WithMediaHandler; +use App\Traits\Media\WithMediaHandler; use Illuminate\Support\Facades\Hash; use Illuminate\Validation\Rules\Password; use Livewire\Form; diff --git a/app/Livewire/Member/Overview.php b/app/Livewire/Member/Overview.php index 4af9b9a..9e2c210 100644 --- a/app/Livewire/Member/Overview.php +++ b/app/Livewire/Member/Overview.php @@ -7,7 +7,7 @@ use App\Models\Membership; use App\Models\PointRecord; use App\Models\Tier; -use App\Traits\WithToast; +use App\Traits\Components\WithToast; use Illuminate\Support\Facades\DB; use Livewire\Attributes\Layout; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Catalog/Bottle/Create.php b/app/Livewire/Studio/Catalog/Bottle/Create.php index 46411df..8882ac2 100644 --- a/app/Livewire/Studio/Catalog/Bottle/Create.php +++ b/app/Livewire/Studio/Catalog/Bottle/Create.php @@ -4,10 +4,10 @@ use App\Livewire\Forms\Studio\Catalog\BottleForm; use App\Models\Outlet; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Bottle/Edit.php b/app/Livewire/Studio/Catalog/Bottle/Edit.php index 816deff..14e8cf7 100644 --- a/app/Livewire/Studio/Catalog/Bottle/Edit.php +++ b/app/Livewire/Studio/Catalog/Bottle/Edit.php @@ -5,10 +5,10 @@ use App\Livewire\Forms\Studio\Catalog\BottleForm; use App\Models\Bottle; use App\Models\Outlet; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Bottle/Index.php b/app/Livewire/Studio/Catalog/Bottle/Index.php index eab8b04..e8a6c45 100644 --- a/app/Livewire/Studio/Catalog/Bottle/Index.php +++ b/app/Livewire/Studio/Catalog/Bottle/Index.php @@ -3,11 +3,11 @@ namespace App\Livewire\Studio\Catalog\Bottle; use App\Models\Bottle; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithShowPrice; -use App\Traits\WithToast; +use App\Traits\Pricing\WithShowPrice; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Catalog/Brand.php b/app/Livewire/Studio/Catalog/Brand.php index bd57015..1fe871f 100644 --- a/app/Livewire/Studio/Catalog/Brand.php +++ b/app/Livewire/Studio/Catalog/Brand.php @@ -4,12 +4,12 @@ use App\Livewire\Forms\Studio\Catalog\BrandForm; use App\Models\Brand as BrandModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Catalog/Category.php b/app/Livewire/Studio/Catalog/Category.php index ea3cb6b..0c0b5e3 100644 --- a/app/Livewire/Studio/Catalog/Category.php +++ b/app/Livewire/Studio/Catalog/Category.php @@ -4,12 +4,12 @@ use App\Livewire\Forms\Studio\Catalog\CategoryForm; use App\Models\Category as CategoryModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Catalog/Perfume/Create.php b/app/Livewire/Studio/Catalog/Perfume/Create.php index 3289be0..dba9daf 100644 --- a/app/Livewire/Studio/Catalog/Perfume/Create.php +++ b/app/Livewire/Studio/Catalog/Perfume/Create.php @@ -8,11 +8,11 @@ use App\Models\Category; use App\Models\Outlet; use App\Models\PushNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCategorySelector; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCategorySelector; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Perfume/Edit.php b/app/Livewire/Studio/Catalog/Perfume/Edit.php index 3b8c2eb..4175fdc 100644 --- a/app/Livewire/Studio/Catalog/Perfume/Edit.php +++ b/app/Livewire/Studio/Catalog/Perfume/Edit.php @@ -7,11 +7,11 @@ use App\Models\Category; use App\Models\Outlet; use App\Models\Perfume; -use App\Traits\WithAuthorization; -use App\Traits\WithCategorySelector; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCategorySelector; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Perfume/Index.php b/app/Livewire/Studio/Catalog/Perfume/Index.php index dbb6083..030e0c0 100644 --- a/app/Livewire/Studio/Catalog/Perfume/Index.php +++ b/app/Livewire/Studio/Catalog/Perfume/Index.php @@ -3,11 +3,11 @@ namespace App\Livewire\Studio\Catalog\Perfume; use App\Models\Perfume; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithShowPrice; -use App\Traits\WithToast; +use App\Traits\Pricing\WithShowPrice; use Flux\Flux; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Product/Create.php b/app/Livewire/Studio/Catalog/Product/Create.php index e655cb8..be2fc0b 100644 --- a/app/Livewire/Studio/Catalog/Product/Create.php +++ b/app/Livewire/Studio/Catalog/Product/Create.php @@ -4,10 +4,10 @@ use App\Livewire\Forms\Studio\Catalog\ProductForm; use App\Models\Outlet; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Product/Edit.php b/app/Livewire/Studio/Catalog/Product/Edit.php index 8fdfe57..0d17957 100644 --- a/app/Livewire/Studio/Catalog/Product/Edit.php +++ b/app/Livewire/Studio/Catalog/Product/Edit.php @@ -5,10 +5,10 @@ use App\Livewire\Forms\Studio\Catalog\ProductForm; use App\Models\Outlet; use App\Models\Product; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Catalog/Product/Index.php b/app/Livewire/Studio/Catalog/Product/Index.php index 537f993..7104228 100644 --- a/app/Livewire/Studio/Catalog/Product/Index.php +++ b/app/Livewire/Studio/Catalog/Product/Index.php @@ -3,11 +3,11 @@ namespace App\Livewire\Studio\Catalog\Product; use App\Models\Product; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithShowPrice; -use App\Traits\WithToast; +use App\Traits\Pricing\WithShowPrice; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Feature/ChooseUs.php b/app/Livewire/Studio/Feature/ChooseUs.php index de9e768..e12e11b 100644 --- a/app/Livewire/Studio/Feature/ChooseUs.php +++ b/app/Livewire/Studio/Feature/ChooseUs.php @@ -4,12 +4,12 @@ use App\Livewire\Forms\Studio\Feature\ChooseUsForm; use App\Models\ChooseUs as ChooseUsModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Feature/PerfumeFeature.php b/app/Livewire/Studio/Feature/PerfumeFeature.php index 26f0afd..7d6e4d0 100644 --- a/app/Livewire/Studio/Feature/PerfumeFeature.php +++ b/app/Livewire/Studio/Feature/PerfumeFeature.php @@ -4,12 +4,12 @@ use App\Livewire\Forms\Studio\Feature\PerfumeFeatureForm; use App\Models\PerfumeFeature as PerfumeFeatureModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Finance/Expense.php b/app/Livewire/Studio/Finance/Expense.php index c1789e3..15b743f 100644 --- a/app/Livewire/Studio/Finance/Expense.php +++ b/app/Livewire/Studio/Finance/Expense.php @@ -5,12 +5,12 @@ use App\Livewire\Forms\Studio\Finance\ExpenseForm; use App\Models\Expense as ExpenseModel; use App\Models\Outlet; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Finance/Payroll.php b/app/Livewire/Studio/Finance/Payroll.php index 2a9b7d2..907eb7b 100644 --- a/app/Livewire/Studio/Finance/Payroll.php +++ b/app/Livewire/Studio/Finance/Payroll.php @@ -9,13 +9,13 @@ use App\Models\PayrollAdjustment; use App\Models\PushNotification; use App\Models\User; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; +use App\Traits\Components\WithUserSelector; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; -use App\Traits\WithUserSelector; +use App\Traits\Utilities\WithUpdatedData; use Barryvdh\DomPDF\Facade\Pdf; use Flux\Flux; use Illuminate\Support\Facades\DB; diff --git a/app/Livewire/Studio/Information/Broadcast.php b/app/Livewire/Studio/Information/Broadcast.php index 8acd1b0..26039ba 100644 --- a/app/Livewire/Studio/Information/Broadcast.php +++ b/app/Livewire/Studio/Information/Broadcast.php @@ -7,12 +7,12 @@ use App\Models\Broadcast as BroadcastModel; use App\Models\PushNotification; use App\Models\User; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithRoleSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithRoleSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Information/Faq.php b/app/Livewire/Studio/Information/Faq.php index 3b77735..7b54e96 100644 --- a/app/Livewire/Studio/Information/Faq.php +++ b/app/Livewire/Studio/Information/Faq.php @@ -4,12 +4,12 @@ use App\Livewire\Forms\Studio\Information\FaqForm; use App\Models\Faq as FaqModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Information/PriceRequest.php b/app/Livewire/Studio/Information/PriceRequest.php index fd59cb7..b859902 100644 --- a/app/Livewire/Studio/Information/PriceRequest.php +++ b/app/Livewire/Studio/Information/PriceRequest.php @@ -6,10 +6,10 @@ use App\Jobs\StorePushNotification; use App\Models\PriceRequest as PriceRequestModel; use App\Models\PushNotification; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Loyalty/Customer.php b/app/Livewire/Studio/Loyalty/Customer.php index afe148b..5c9b8f3 100644 --- a/app/Livewire/Studio/Loyalty/Customer.php +++ b/app/Livewire/Studio/Loyalty/Customer.php @@ -4,12 +4,12 @@ use App\Livewire\Forms\Studio\Loyalty\CustomerForm; use App\Models\Customer as CustomerModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Loyalty/Tier/Index.php b/app/Livewire/Studio/Loyalty/Tier/Index.php index aefad5b..e832708 100644 --- a/app/Livewire/Studio/Loyalty/Tier/Index.php +++ b/app/Livewire/Studio/Loyalty/Tier/Index.php @@ -7,12 +7,12 @@ use App\Models\Perfume; use App\Models\Product; use App\Models\Tier as TierModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Loyalty/Tier/Reward.php b/app/Livewire/Studio/Loyalty/Tier/Reward.php index 635ce79..be192ec 100644 --- a/app/Livewire/Studio/Loyalty/Tier/Reward.php +++ b/app/Livewire/Studio/Loyalty/Tier/Reward.php @@ -5,12 +5,12 @@ use App\Livewire\Forms\Studio\Loyalty\Tier\RewardForm; use App\Livewire\Studio\Loyalty\Tier\Index as Tier; use App\Models\TierReward; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Loyalty/Voucher/Create.php b/app/Livewire/Studio/Loyalty/Voucher/Create.php index d1ad3ee..35a9075 100644 --- a/app/Livewire/Studio/Loyalty/Voucher/Create.php +++ b/app/Livewire/Studio/Loyalty/Voucher/Create.php @@ -6,10 +6,10 @@ use App\Livewire\Forms\Studio\Loyalty\VoucherForm; use App\Models\Outlet; use App\Models\PushNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Loyalty/Voucher/Edit.php b/app/Livewire/Studio/Loyalty/Voucher/Edit.php index 8e60390..d5839bb 100644 --- a/app/Livewire/Studio/Loyalty/Voucher/Edit.php +++ b/app/Livewire/Studio/Loyalty/Voucher/Edit.php @@ -5,10 +5,10 @@ use App\Livewire\Forms\Studio\Loyalty\VoucherForm; use App\Models\Outlet; use App\Models\Voucher; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Loyalty/Voucher/Index.php b/app/Livewire/Studio/Loyalty/Voucher/Index.php index 815edb5..dab8cfb 100644 --- a/app/Livewire/Studio/Loyalty/Voucher/Index.php +++ b/app/Livewire/Studio/Loyalty/Voucher/Index.php @@ -3,10 +3,10 @@ namespace App\Livewire\Studio\Loyalty\Voucher; use App\Models\Voucher; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Manage/Article/Create.php b/app/Livewire/Studio/Manage/Article/Create.php index b6b800d..20e81cd 100644 --- a/app/Livewire/Studio/Manage/Article/Create.php +++ b/app/Livewire/Studio/Manage/Article/Create.php @@ -5,9 +5,9 @@ use App\Jobs\StorePushNotification; use App\Livewire\Forms\Studio\Manage\ArticleForm; use App\Models\PushNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Illuminate\Support\Str; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Manage/Article/Edit.php b/app/Livewire/Studio/Manage/Article/Edit.php index a202e2b..8c84fe3 100644 --- a/app/Livewire/Studio/Manage/Article/Edit.php +++ b/app/Livewire/Studio/Manage/Article/Edit.php @@ -4,9 +4,9 @@ use App\Livewire\Forms\Studio\Manage\ArticleForm; use App\Models\Article; -use App\Traits\WithAuthorization; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Manage/Article/Index.php b/app/Livewire/Studio/Manage/Article/Index.php index f5fb0be..1a0470c 100644 --- a/app/Livewire/Studio/Manage/Article/Index.php +++ b/app/Livewire/Studio/Manage/Article/Index.php @@ -3,10 +3,10 @@ namespace App\Livewire\Studio\Manage\Article; use App\Models\Article; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Manage/Order/Create.php b/app/Livewire/Studio/Manage/Order/Create.php index 0ad7679..24c9853 100644 --- a/app/Livewire/Studio/Manage/Order/Create.php +++ b/app/Livewire/Studio/Manage/Order/Create.php @@ -9,6 +9,9 @@ use App\Models\Product; use App\Models\PushNotification; use App\Models\User; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Order\WithAddItem; use App\Traits\Order\WithCalculateTotal; use App\Traits\Order\WithDiscount; @@ -16,10 +19,7 @@ use App\Traits\Order\WithMember; use App\Traits\Order\WithOrderItem; use App\Traits\Order\WithUpdateItem; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Manage/Order/Index.php b/app/Livewire/Studio/Manage/Order/Index.php index 9b4120c..09a3d2b 100644 --- a/app/Livewire/Studio/Manage/Order/Index.php +++ b/app/Livewire/Studio/Manage/Order/Index.php @@ -3,11 +3,11 @@ namespace App\Livewire\Studio\Manage\Order; use App\Models\Order; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; use App\Traits\Order\WithUpdateStock; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\On; diff --git a/app/Livewire/Studio/Manage/Purchase/Create.php b/app/Livewire/Studio/Manage/Purchase/Create.php index 7ca9017..b2bb6b5 100644 --- a/app/Livewire/Studio/Manage/Purchase/Create.php +++ b/app/Livewire/Studio/Manage/Purchase/Create.php @@ -6,15 +6,15 @@ use App\Models\Bottle; use App\Models\Perfume; use App\Models\Product; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Purchase\WithAddItem; use App\Traits\Purchase\WithCalculateTotal; use App\Traits\Purchase\WithDeleteItem; use App\Traits\Purchase\WithPurchaseItems; use App\Traits\Purchase\WithUpdateItem; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Manage/Purchase/Index.php b/app/Livewire/Studio/Manage/Purchase/Index.php index 0f4624b..ad9c8f4 100644 --- a/app/Livewire/Studio/Manage/Purchase/Index.php +++ b/app/Livewire/Studio/Manage/Purchase/Index.php @@ -3,12 +3,12 @@ namespace App\Livewire\Studio\Manage\Purchase; use App\Models\Purchase; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; use App\Traits\Purchase\WithUpdateStock; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; use Flux\Flux; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Manage/StockOpname/Index.php b/app/Livewire/Studio/Manage/StockOpname/Index.php index 198c880..0d2d904 100644 --- a/app/Livewire/Studio/Manage/StockOpname/Index.php +++ b/app/Livewire/Studio/Manage/StockOpname/Index.php @@ -4,8 +4,8 @@ use App\Enums\StockOpnameStatus; use App\Models\StockOpname; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\DB; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Manage/StockOpname/Manage.php b/app/Livewire/Studio/Manage/StockOpname/Manage.php index be7566c..3aaadc6 100644 --- a/app/Livewire/Studio/Manage/StockOpname/Manage.php +++ b/app/Livewire/Studio/Manage/StockOpname/Manage.php @@ -6,8 +6,8 @@ use App\Livewire\Forms\Studio\Manage\StockOpnameForm; use App\Models\StockOpname; use App\Models\StockOpnameItem; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Collection; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Manage/StockOpname/Show.php b/app/Livewire/Studio/Manage/StockOpname/Show.php index ede7ed4..b7fc82e 100644 --- a/app/Livewire/Studio/Manage/StockOpname/Show.php +++ b/app/Livewire/Studio/Manage/StockOpname/Show.php @@ -4,7 +4,7 @@ use App\Models\StockOpname; use App\Models\StockOpnameItem; -use App\Traits\WithAuthorization; +use App\Traits\Authorization\WithAuthorization; use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Collection; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Master/Formula.php b/app/Livewire/Studio/Master/Formula.php index 500e527..26aeb5f 100644 --- a/app/Livewire/Studio/Master/Formula.php +++ b/app/Livewire/Studio/Master/Formula.php @@ -5,12 +5,12 @@ use App\Livewire\Forms\Studio\Master\FormulaForm; use App\Models\Bottle; use App\Models\Formula as FormulaModel; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Flux\Flux; use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Collection; diff --git a/app/Livewire/Studio/Master/Outlet/Create.php b/app/Livewire/Studio/Master/Outlet/Create.php index 0f5b575..59f564b 100644 --- a/app/Livewire/Studio/Master/Outlet/Create.php +++ b/app/Livewire/Studio/Master/Outlet/Create.php @@ -4,9 +4,9 @@ use App\Enums\Day; use App\Livewire\Forms\Studio\Master\OutletForm; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithToast; use App\Traits\Outlet\WithFacilityHandler; -use App\Traits\WithAuthorization; -use App\Traits\WithToast; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Master/Outlet/Edit.php b/app/Livewire/Studio/Master/Outlet/Edit.php index 765cc79..7c00377 100644 --- a/app/Livewire/Studio/Master/Outlet/Edit.php +++ b/app/Livewire/Studio/Master/Outlet/Edit.php @@ -5,9 +5,9 @@ use App\Enums\Day; use App\Livewire\Forms\Studio\Master\OutletForm; use App\Models\Outlet; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithToast; use App\Traits\Outlet\WithFacilityHandler; -use App\Traits\WithAuthorization; -use App\Traits\WithToast; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Master/Outlet/Index.php b/app/Livewire/Studio/Master/Outlet/Index.php index 70c670c..f36af50 100644 --- a/app/Livewire/Studio/Master/Outlet/Index.php +++ b/app/Livewire/Studio/Master/Outlet/Index.php @@ -4,11 +4,11 @@ use App\Enums\Day; use App\Models\Outlet; -use App\Traits\WithAuthorization; -use App\Traits\WithCloseModal; -use App\Traits\WithConfirmation; -use App\Traits\WithMediaHandler; -use App\Traits\WithToast; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithCloseModal; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; +use App\Traits\Media\WithMediaHandler; use Flux\Flux; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Str; diff --git a/app/Livewire/Studio/Master/User/Create.php b/app/Livewire/Studio/Master/User/Create.php index 7891ba2..e32b131 100644 --- a/app/Livewire/Studio/Master/User/Create.php +++ b/app/Livewire/Studio/Master/User/Create.php @@ -4,11 +4,11 @@ use App\Livewire\Forms\Studio\Master\UserForm; use App\Models\Outlet; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithRoleSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithRoleSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Master/User/Edit.php b/app/Livewire/Studio/Master/User/Edit.php index 2117ee2..2a22f24 100644 --- a/app/Livewire/Studio/Master/User/Edit.php +++ b/app/Livewire/Studio/Master/User/Edit.php @@ -5,11 +5,11 @@ use App\Livewire\Forms\Studio\Master\UserForm; use App\Models\Outlet; use App\Models\User; -use App\Traits\WithAuthorization; -use App\Traits\WithOutletSelector; -use App\Traits\WithRoleSelector; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithOutletSelector; +use App\Traits\Components\WithRoleSelector; +use App\Traits\Components\WithToast; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Livewire\Attributes\Title; use Livewire\Component; diff --git a/app/Livewire/Studio/Master/User/Index.php b/app/Livewire/Studio/Master/User/Index.php index f70218c..01960a3 100644 --- a/app/Livewire/Studio/Master/User/Index.php +++ b/app/Livewire/Studio/Master/User/Index.php @@ -4,10 +4,10 @@ use App\Models\Employee; use App\Models\User; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithConfirmation; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithConfirmation; -use App\Traits\WithToast; use Flux\Flux; use Illuminate\Database\Eloquent\Collection; use Illuminate\Support\Facades\Hash; diff --git a/app/Livewire/Studio/Setting/Account.php b/app/Livewire/Studio/Setting/Account.php index bc24b0a..93f21ee 100644 --- a/app/Livewire/Studio/Setting/Account.php +++ b/app/Livewire/Studio/Setting/Account.php @@ -5,10 +5,10 @@ use App\Livewire\Forms\Studio\Setting\AccountForm; use App\Livewire\Forms\Studio\Setting\PasswordForm; use App\Livewire\Forms\Studio\Setting\ProfileForm; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Hash; use Livewire\Attributes\Title; diff --git a/app/Livewire/Studio/Setting/Application.php b/app/Livewire/Studio/Setting/Application.php index b70231a..c353e20 100644 --- a/app/Livewire/Studio/Setting/Application.php +++ b/app/Livewire/Studio/Setting/Application.php @@ -10,10 +10,10 @@ use App\Settings\GeneralSettings; use App\Settings\SeoSettings; use App\Settings\SocialSettings; +use App\Traits\Authorization\WithAuthorization; +use App\Traits\Components\WithToast; use App\Traits\Notification\WithSubscribeNotification; -use App\Traits\WithAuthorization; -use App\Traits\WithToast; -use App\Traits\WithUpdatedData; +use App\Traits\Utilities\WithUpdatedData; use Illuminate\Contracts\View\View; use Illuminate\Support\Facades\Artisan; use Livewire\Attributes\Title; diff --git a/app/Traits/WithAuthorization.php b/app/Traits/Authorization/WithAuthorization.php similarity index 84% rename from app/Traits/WithAuthorization.php rename to app/Traits/Authorization/WithAuthorization.php index 31ed319..3ba21ef 100644 --- a/app/Traits/WithAuthorization.php +++ b/app/Traits/Authorization/WithAuthorization.php @@ -1,6 +1,6 @@