diff --git a/src/backend/app/Console/Commands/AddEBikesItemToNavbar.php b/src/backend/app/Console/Commands/AddEBikesItemToNavbar.php deleted file mode 100644 index 3617a70df..000000000 --- a/src/backend/app/Console/Commands/AddEBikesItemToNavbar.php +++ /dev/null @@ -1,60 +0,0 @@ -addSolarHomeSystemsToNavBar(); - - return 0; - } - - private function addSolarHomeSystemsToNavBar() - { - $eBikesMenuItem = 'E-Bikes'; - $menuItem = $this->menuItemsService->getByName($eBikesMenuItem); - - if (!$menuItem) { - $this->menuItemsService->create([ - 'name' => $eBikesMenuItem, - 'url_slug' => '/e-bikes/page/1', - 'md_icon' => 'electric_bike', - 'menu_order' => 0, - ]); - } - } -} diff --git a/src/backend/app/Console/Commands/MenuItemsGenerator.php b/src/backend/app/Console/Commands/MenuItemsGenerator.php deleted file mode 100644 index 000f982a8..000000000 --- a/src/backend/app/Console/Commands/MenuItemsGenerator.php +++ /dev/null @@ -1,25 +0,0 @@ -argument('menuItem'); - $subMenuItems = $this->argument('subMenuItems'); - $this->menuItemService->createMenuItems($menuItem, $subMenuItems); - $this->info('Menu item records has been created.'); - } -} diff --git a/src/backend/app/Console/Commands/ShiftMeterParameterConfigurationsToMeters.php b/src/backend/app/Console/Commands/ShiftMeterParameterConfigurationsToMeters.php deleted file mode 100644 index d2e7ebd69..000000000 --- a/src/backend/app/Console/Commands/ShiftMeterParameterConfigurationsToMeters.php +++ /dev/null @@ -1,170 +0,0 @@ -beginTransaction(); - $cities = $this->cityService->getAll(); - $cities->each(fn ($city) => $this->createGeoRecordForCity($city)); - $this->info('Geo records are created for cities.'); - $this->addSolarHomeSystemsToNavBar(); - $this->info('Solar Home Systems are added to the navigation bar.'); - $this->updateManufacturerTypeIfSunKingPluginIsInstalled(); - $this->info('Manufacturer type is updated if SunKing plugin is installed.'); - $this->moveMeterTokensToTokens(); - $this->info('Meter tokens are moved to tokens.'); - $meterParameters = $this->meterParameterService->getAll(); - $this->info('Meter parameter values are being shifted to meters, devices and addresses.'); - $meterParameters->each(fn ($meterParameter) => $this->setMeterDevices($meterParameter)); - DB::connection('shard')->commit(); - } catch (\Exception $e) { - $message = $e->getMessage(); - $this->info("Unexpected error occurred. Message: {$message}"); - DB::connection('shard')->rollBack(); - } - - return 0; - } - - private function setMeterDevices($meterParameter) - { - $meter = $this->meterService->getById($meterParameter->meter_id); - $meterData = [ - 'connection_type_id' => $meterParameter->connection_type_id, - 'connection_group_id' => $meterParameter->connection_group_id, - 'tariff_id' => $meterParameter->tariff_id, - ]; - $updatedMeter = $this->meterService->update($meter, $meterData); - $device = $this->deviceService->make([ - 'person_id' => $meterParameter->owner_id, - 'device_serial' => $meter->serial_number, - ]); - $this->meterDeviceService->setAssigned($device); - $this->meterDeviceService->setAssignee($updatedMeter); - $this->meterDeviceService->assign(); - $this->deviceService->save($device); - $address = $meterParameter->address()->first(); - $this->deviceAddressService->setAssigned($address); - $this->deviceAddressService->setAssignee($device); - $this->deviceAddressService->assign(); - $this->addressService->save($address); - $this->geographicalInformationService->changeOwnerWithAddress($meterParameter, $address->id); - $this->meterParameterService->delete($meterParameter); - $this->info('Meter parameter values are shifted to meters, devices and addresses.'); - } - - private function createGeoRecordForCity($city) - { - if ($city->location == null) { - $miniGridLocation = $this->miniGridService->getByIdWithLocation($city->mini_grid_id)->location; - $cityGeo = $this->geographicalInformationService->make([ - 'points' => $miniGridLocation->points, - ]); - $this->cityGeographicalInformationService->setAssigned($cityGeo); - $this->cityGeographicalInformationService->setAssignee($city); - $this->cityGeographicalInformationService->assign(); - $this->geographicalInformationService->save($cityGeo); - } - - return $city; - } - - private function addSolarHomeSystemsToNavBar() - { - $shsMenuItem = 'Solar Home Systems'; - $menuItem = $this->menuItemsService->getByName($shsMenuItem); - - if (!$menuItem) { - $this->menuItemsService->create([ - 'name' => 'Solar Home Systems', - 'url_slug' => '/solar-home-systems/page/1', - 'md_icon' => 'solar_power', - 'menu_order' => 0, - ]); - } - } - - private function updateManufacturerTypeIfSunKingPluginIsInstalled() - { - $manufacturer = $this->manufacturerService->getByName('SunKing SHS'); - if ($manufacturer) { - $manufacturer->type = 'shs'; - $manufacturer->save(); - } - } - - private function moveMeterTokensToTokens() - { - $meterTokens = MeterToken::query()->get(); - $meterTokens->each(function ($meterToken) { - $this->tokenService->create([ - 'transaction_id' => $meterToken->transaction_id, - 'token' => $meterToken->token, - 'load' => $meterToken->energy, - ]); - $meterToken->delete(); - }); - } -} diff --git a/src/backend/app/Http/Controllers/CompanyController.php b/src/backend/app/Http/Controllers/CompanyController.php index e807486fb..3973263dd 100644 --- a/src/backend/app/Http/Controllers/CompanyController.php +++ b/src/backend/app/Http/Controllers/CompanyController.php @@ -7,7 +7,6 @@ use App\Services\CompanyDatabaseService; use App\Services\CompanyService; use App\Services\MainSettingsService; -use App\Services\MenuItemsService; use App\Services\MpmPluginService; use App\Services\PluginsService; use App\Services\RegistrationTailService; @@ -23,7 +22,6 @@ public function __construct( private CompanyService $companyService, private CompanyDatabaseService $companyDatabaseService, private PluginsService $pluginsService, - private MenuItemsService $menuItemsService, private UserService $userService, private DatabaseProxyManagerService $databaseProxyManagerService, private MpmPluginService $mpmPluginService, @@ -110,7 +108,6 @@ function () use ($company, $plugins) { return response()->json([ 'message' => 'Congratulations! you have registered to MicroPowerManager successfully. You will be redirected to dashboard in seconds..', 'company' => $company, - 'sidebarData' => $this->menuItemsService->getAll(), ], 201); } ); diff --git a/src/backend/app/Http/Controllers/PluginController.php b/src/backend/app/Http/Controllers/PluginController.php index 985e0aa8e..23db86920 100644 --- a/src/backend/app/Http/Controllers/PluginController.php +++ b/src/backend/app/Http/Controllers/PluginController.php @@ -4,7 +4,6 @@ use App\Http\Resources\ApiResource; use App\Services\CompanyDatabaseService; -use App\Services\MenuItemsService; use App\Services\MpmPluginService; use App\Services\PluginsService; use App\Services\RegistrationTailService; @@ -17,7 +16,6 @@ public function __construct( private PluginsService $pluginsService, private MpmPluginService $mpmPluginService, private CompanyDatabaseService $companyDatabaseService, - private MenuItemsService $menuItemsService, private RegistrationTailService $registrationTailService, ) { } @@ -53,16 +51,10 @@ public function update(Request $request, $mpmPluginId): ApiResource } $updatedPlugin = $this->pluginsService->update($plugin, $pluginData); - $ExistingMenuItem = $this->menuItemsService->checkMenuItemIsExistsForTag($mpmPlugin); - - if (!$ExistingMenuItem) { - $this->companyDatabaseService->addPluginSpecificMenuItemsToCompanyDatabase($mpmPlugin); - } $this->registrationTailService->addMpmPluginToRegistrationTail($registrationTail, $mpmPlugin); } else { $updatedPlugin = $this->pluginsService->update($plugin, $pluginData); - $this->menuItemsService->removeMenuItemAndSubmenuItemForMenuItemName($mpmPlugin); $this->registrationTailService->removeMpmPluginFromRegistrationTail($registrationTail, $mpmPlugin); } diff --git a/src/backend/app/Http/Controllers/SidebarController.php b/src/backend/app/Http/Controllers/SidebarController.php deleted file mode 100644 index 25ef812ec..000000000 --- a/src/backend/app/Http/Controllers/SidebarController.php +++ /dev/null @@ -1,18 +0,0 @@ -menuItemsService->getAll()); - } -} diff --git a/src/backend/app/Models/MenuItems.php b/src/backend/app/Models/MenuItems.php deleted file mode 100644 index faacf1763..000000000 --- a/src/backend/app/Models/MenuItems.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(SubMenuItems::class, 'parent_id'); - } -} diff --git a/src/backend/app/Models/SubMenuItems.php b/src/backend/app/Models/SubMenuItems.php deleted file mode 100644 index 234645026..000000000 --- a/src/backend/app/Models/SubMenuItems.php +++ /dev/null @@ -1,14 +0,0 @@ -belongsTo(MenuItems::class); - } -} diff --git a/src/backend/app/Services/CompanyDatabaseService.php b/src/backend/app/Services/CompanyDatabaseService.php index e339f890a..e845e4aa6 100644 --- a/src/backend/app/Services/CompanyDatabaseService.php +++ b/src/backend/app/Services/CompanyDatabaseService.php @@ -73,13 +73,6 @@ public function getAll(?int $limit = null): Collection public function addPluginSpecificMenuItemsToCompanyDatabase($plugin, ?int $companyId = null): void { $rootClass = $plugin['root_class']; - try { - $menuItemService = app()->make(sprintf('Inensus\%s\Services\MenuItemService', $rootClass)); - } catch (\Exception $exception) { - // we return here if company chooses a plugin which does not have UI components - return; - } - $menuItems = $menuItemService->createMenuItems(); if ($companyId !== null) { /** @var DatabaseProxyManagerService $databaseProxyManagerService */ diff --git a/src/backend/app/Services/MenuItemsService.php b/src/backend/app/Services/MenuItemsService.php deleted file mode 100644 index 132715150..000000000 --- a/src/backend/app/Services/MenuItemsService.php +++ /dev/null @@ -1,113 +0,0 @@ - - */ -class MenuItemsService implements IBaseService -{ - public function __construct( - private MenuItems $menuItems, - private SubMenuItems $subMenuItems) - { - } - - public function getAll(?int $limit = null): Collection|LengthAwarePaginator - { - if ($limit) { - return $this->menuItems->newQuery()->with('SubMenuItems')->orderBy('menu_order')->paginate($limit); - } - - return $this->menuItems->newQuery()->with('SubMenuItems')->orderBy('menu_order')->get(); - } - - public function createMenuItems($menuItem, $subMenuItems): void - { - $lastOrder = $this->menuItems->newQuery()->latest()->first(); - $menuItem = $this->menuItems->newQuery()->firstOrCreate(['name' => $menuItem['name']], [ - 'name' => $menuItem['name'], - 'url_slug' => $menuItem['url_slug'], - 'md_icon' => $menuItem['md_icon'], - 'menu_order' => $lastOrder ? $lastOrder->menu_order + 1 : 1, - ]); - - foreach ($subMenuItems as $key => $value) { - $this->subMenuItems->newQuery()->firstOrCreate( - ['url_slug' => $value['url_slug']], - [ - 'name' => $value['name'], - 'url_slug' => $value['url_slug'], - 'parent_id' => $menuItem->id, - ] - ); - } - } - - public function checkMenuItemIsExistsForTag($plugin) - { - $rootClass = $plugin['root_class']; - try { - $menuItemService = app()->make(sprintf('Inensus\%s\Services\MenuItemService', $rootClass)); - } catch (\Exception $exception) { - // we return here if company chooses a plugin which does not have UI components - return 0; - } - $menuItem = $menuItemService::MENU_ITEM; - - return $this->menuItems->newQuery()->where('name', $menuItem)->first(); - } - - public function removeMenuItemAndSubmenuItemForMenuItemName($plugin) - { - $rootClass = $plugin['root_class']; - try { - $menuItemService = app()->make(sprintf('Inensus\%s\Services\MenuItemService', $rootClass)); - } catch (\Exception $exception) { - // we return here if company chooses a plugin which does not have UI components - return 0; - } - $menuItemName = $menuItemService::MENU_ITEM; - $menuItem = $this->menuItems->newQuery()->where('name', $menuItemName)->first(); - if ($menuItem) { - $this->subMenuItems->newQuery()->where('parent_id', $menuItem->id)->each(function ($subMenuItem) { - $subMenuItem->delete(); - }); - $menuItem->delete(); - } - } - - public function getByName($name) - { - return $this->menuItems->newQuery()->where('name', $name)->first(); - } - - public function getById(int $id): MenuItems - { - throw new \Exception('Method getById() not yet implemented.'); - } - - public function create($data): MenuItems - { - $lastOrder = $this->menuItems->newQuery()->latest()->first(); - $data['menu_order'] = $lastOrder ? $lastOrder->menu_order + 1 : 1; - - return $this->menuItems->newQuery()->create($data); - } - - public function update($model, $data): MenuItems - { - throw new \Exception('not implemented'); - } - - public function delete($model): ?bool - { - throw new \Exception('not implemented'); - } -} diff --git a/src/backend/database/migrations/micropowermanager/2024_09_30_113302_remove_siderbar_tables.php b/src/backend/database/migrations/micropowermanager/2024_09_30_113302_remove_siderbar_tables.php new file mode 100644 index 000000000..6637084ba --- /dev/null +++ b/src/backend/database/migrations/micropowermanager/2024_09_30_113302_remove_siderbar_tables.php @@ -0,0 +1,45 @@ +dropIfExists('menu_items'); + Schema::connection('shard')->dropIfExists('sub_menu_items'); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('shard')->create('menu_items', function (Blueprint $table) { + $table->increments('id'); + $table->string('usage_type', 191)->default('general'); + $table->char('name', 50); + $table->char('url_slug', 50); + $table->char('md_icon', 50); + $table->unsignedInteger('menu_order')->default(999); + $table->timestamp('created_at')->nullable(); + $table->timestamp('updated_at')->nullable(); + }); + Schema::connection('shard')->create('sub_menu_items', function (Blueprint $table) { + $table->increments('id'); + $table->char('name', 50); + $table->char('url_slug', 50); + $table->integer('parent_id')->unsigned(); + $table->timestamp('created_at')->nullable(); + $table->timestamp('updated_at')->nullable(); + }); + } +}; diff --git a/src/backend/packages/inensus/angaza-shs/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/angaza-shs/src/Console/Commands/InstallPackage.php index 3105f9c3e..08d373c9e 100644 --- a/src/backend/packages/inensus/angaza-shs/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/angaza-shs/src/Console/Commands/InstallPackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Inensus\AngazaSHS\Services\AngazaCredentialService; use Inensus\AngazaSHS\Services\ManufacturerService; -use Inensus\AngazaSHS\Services\MenuItemService; class InstallPackage extends Command { @@ -13,9 +12,8 @@ class InstallPackage extends Command protected $description = 'Install AngazaSHS Package'; public function __construct( - private MenuItemService $menuItemService, private ManufacturerService $manufacturerService, - private AngazaCredentialService $credentialService + private AngazaCredentialService $credentialService, ) { parent::__construct(); } diff --git a/src/backend/packages/inensus/angaza-shs/src/Services/MenuItemService.php b/src/backend/packages/inensus/angaza-shs/src/Services/MenuItemService.php deleted file mode 100644 index 3b0a4de1a..000000000 --- a/src/backend/packages/inensus/angaza-shs/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'Angaza SHS', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'shs', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/angaza-shs/angaza-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/bulk-registration/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/bulk-registration/src/Console/Commands/InstallPackage.php index c31580e89..9d282dce1 100644 --- a/src/backend/packages/inensus/bulk-registration/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/bulk-registration/src/Console/Commands/InstallPackage.php @@ -3,7 +3,6 @@ namespace Inensus\BulkRegistration\Console\Commands; use Illuminate\Console\Command; -use Inensus\BulkRegistration\Services\MenuItemService; use Inensus\BulkRegistration\Services\MeterTypeService; class InstallPackage extends Command @@ -11,14 +10,10 @@ class InstallPackage extends Command protected $signature = 'bulk-registration:install'; protected $description = 'Install Bulk Registration Package'; - private $menuItemService; - private $meterTypeService; - - public function __construct(MenuItemService $menuItemService, MeterTypeService $meterTypeService) - { + public function __construct( + private MeterTypeService $meterTypeService, + ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->meterTypeService = $meterTypeService; } public function handle(): void @@ -73,13 +68,4 @@ private function createPluginRecord() 'description' => 'BulkRegistration integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/bulk-registration/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/bulk-registration/src/Console/Commands/UpdatePackage.php index d6ef58f76..6685fbf17 100644 --- a/src/backend/packages/inensus/bulk-registration/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/bulk-registration/src/Console/Commands/UpdatePackage.php @@ -5,23 +5,16 @@ use Illuminate\Console\Command; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; -use Inensus\BulkRegistration\Services\MenuItemService; class UpdatePackage extends Command { protected $signature = 'bulk-registration:update'; protected $description = 'Update Bulk Registration Package'; - private $menuItemService; - private $fileSystem; - public function __construct( - MenuItemService $menuItemService, - Filesystem $filesystem + private Filesystem $filesystem, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->fileSystem = $filesystem; } public function handle(): void @@ -29,13 +22,12 @@ public function handle(): void $this->info('Bulk Registration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishConfigurations(); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->call('routes:generate'); - $this->createMenuItems(); $this->call('sidebar:generate'); $this->info('Package updated successfully..'); } @@ -98,13 +90,4 @@ private function publishVueFilesAgain() '--force' => true, ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/bulk-registration/src/Services/MenuItemService.php b/src/backend/packages/inensus/bulk-registration/src/Services/MenuItemService.php deleted file mode 100644 index bae8da666..000000000 --- a/src/backend/packages/inensus/bulk-registration/src/Services/MenuItemService.php +++ /dev/null @@ -1,20 +0,0 @@ - 'Bulk Registration', - 'url_slug' => '/bulk-registration/bulk-registration', - 'md_icon' => 'upload_file', - 'usage_type' => 'general', - ]; - - return ['menuItem' => $menuItem, 'subMenuItems' => []]; - } -} diff --git a/src/backend/packages/inensus/calin-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/calin-meter/src/Console/Commands/InstallPackage.php index ed8c94525..5a0757fa2 100644 --- a/src/backend/packages/inensus/calin-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/calin-meter/src/Console/Commands/InstallPackage.php @@ -5,26 +5,17 @@ use Illuminate\Console\Command; use Inensus\CalinMeter\Helpers\ApiHelpers; use Inensus\CalinMeter\Services\CalinCredentialService; -use Inensus\CalinMeter\Services\MenuItemService; class InstallPackage extends Command { protected $signature = 'calin-meter:install'; protected $description = 'Install CalinMeter Package'; - private $menuItemService; - private $apiHelpers; - private $credentialService; - public function __construct( - MenuItemService $menuItemService, - ApiHelpers $apiHelpers, - CalinCredentialService $credentialService + private ApiHelpers $apiHelpers, + private CalinCredentialService $credentialService, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->apiHelpers = $apiHelpers; - $this->credentialService = $credentialService; } public function handle(): void @@ -67,13 +58,4 @@ private function createPluginRecord() 'description' => 'CalinMeter integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/calin-meter/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/calin-meter/src/Console/Commands/UpdatePackage.php index 9e169b40d..91bbe18f8 100644 --- a/src/backend/packages/inensus/calin-meter/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/calin-meter/src/Console/Commands/UpdatePackage.php @@ -7,29 +7,18 @@ use Illuminate\Support\Facades\DB; use Inensus\CalinMeter\Helpers\ApiHelpers; use Inensus\CalinMeter\Services\CalinCredentialService; -use Inensus\CalinMeter\Services\MenuItemService; class UpdatePackage extends Command { protected $signature = 'calin-meter:update'; protected $description = 'Update CalinMeter Package'; - private $menuItemService; - private $apiHelpers; - private $credentialService; - private $fileSystem; - public function __construct( - MenuItemService $menuItemService, - ApiHelpers $apiHelpers, - CalinCredentialService $credentialService, - Filesystem $fileSystem + private ApiHelpers $apiHelpers, + private CalinCredentialService $credentialService, + private Filesystem $filesystem, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->apiHelpers = $apiHelpers; - $this->credentialService = $credentialService; - $this->fileSystem = $fileSystem; } public function handle(): void @@ -37,12 +26,11 @@ public function handle(): void $this->info('Calin Meter Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->call('routes:generate'); - $this->createMenuItems(); $this->info('Package updated successfully..'); } @@ -94,13 +82,4 @@ private function publishVueFilesAgain() '--tag' => 'vue-components', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/calin-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/calin-meter/src/Services/MenuItemService.php deleted file mode 100644 index e2f276a48..000000000 --- a/src/backend/packages/inensus/calin-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'Calin Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/calin-meters/calin-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/InstallPackage.php index 7a8af1eb4..705689792 100644 --- a/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/InstallPackage.php @@ -5,26 +5,17 @@ use Illuminate\Console\Command; use Inensus\CalinSmartMeter\Helpers\ApiHelpers; use Inensus\CalinSmartMeter\Services\CalinSmartCredentialService; -use Inensus\CalinSmartMeter\Services\MenuItemService; class InstallPackage extends Command { protected $signature = 'calin-smart-meter:install'; protected $description = 'Install CalinSmartMeter Package'; - private $menuItemService; - private $apiHelpers; - private $credentialService; - public function __construct( - MenuItemService $menuItemService, - CalinSmartCredentialService $credentialService, - ApiHelpers $apiHelpers + private CalinSmartCredentialService $credentialService, + private ApiHelpers $apiHelpers, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->apiHelpers = $apiHelpers; - $this->credentialService = $credentialService; } public function handle(): void @@ -67,13 +58,4 @@ private function createPluginRecord() 'description' => 'CalinSmartMeter integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/UpdatePackage.php index 1dc546871..8c14d8d3b 100644 --- a/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/calin-smart-meter/src/Console/Commands/UpdatePackage.php @@ -6,26 +6,17 @@ use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; use Inensus\CalinSmartMeter\Services\CalinSmartCredentialService; -use Inensus\CalinSmartMeter\Services\MenuItemService; class UpdatePackage extends Command { protected $signature = 'calin-smart-meter:update'; protected $description = 'Update CalinSmartMeter Package'; - private $menuItemService; - private $credentialService; - private $fileSystem; - public function __construct( - MenuItemService $menuItemService, - CalinSmartCredentialService $credentialService, - Filesystem $fileSystem + private CalinSmartCredentialService $credentialService, + private Filesystem $filesystem, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->credentialService = $credentialService; - $this->fileSystem = $fileSystem; } public function handle(): void @@ -33,12 +24,11 @@ public function handle(): void $this->info('Calin Smart Meter Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->call('routes:generate'); - $this->createMenuItems(); $this->info('Package updated successfully..'); } @@ -90,13 +80,4 @@ private function publishVueFilesAgain() '--tag' => 'vue-components', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php deleted file mode 100644 index 9d37533cd..000000000 --- a/src/backend/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'CalinSmart Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/calin-smart-meters/calin-smart-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/daly-bms/src/Services/MenuItemService.php b/src/backend/packages/inensus/daly-bms/src/Services/MenuItemService.php deleted file mode 100644 index f082db26b..000000000 --- a/src/backend/packages/inensus/daly-bms/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'Daly Bms', - 'url_slug' => '', - 'md_icon' => 'charging_station', - 'usage_type' => 'e-bike', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/daly-bms/daly-bms-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/gome-long-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/gome-long-meter/src/Console/Commands/InstallPackage.php index 537f8c087..edc3c4522 100644 --- a/src/backend/packages/inensus/gome-long-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/gome-long-meter/src/Console/Commands/InstallPackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Inensus\GomeLongMeter\Services\GomeLongCredentialService; use Inensus\GomeLongMeter\Services\ManufacturerService; -use Inensus\GomeLongMeter\Services\MenuItemService; class InstallPackage extends Command { @@ -13,9 +12,8 @@ class InstallPackage extends Command protected $description = 'Install GomeLongMeter Package'; public function __construct( - private MenuItemService $menuItemService, private ManufacturerService $manufacturerService, - private GomeLongCredentialService $credentialService + private GomeLongCredentialService $credentialService, ) { parent::__construct(); } @@ -29,13 +27,4 @@ public function handle(): void $this->info('Package installed successfully..'); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/gome-long-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/gome-long-meter/src/Services/MenuItemService.php deleted file mode 100644 index 904aed00e..000000000 --- a/src/backend/packages/inensus/gome-long-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'GomeLong Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/gome-long-meters/gome-long-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/kelin-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/kelin-meter/src/Console/Commands/InstallPackage.php index 91eea31f9..96e140374 100644 --- a/src/backend/packages/inensus/kelin-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/kelin-meter/src/Console/Commands/InstallPackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Inensus\KelinMeter\Helpers\ApiHelpers; use Inensus\KelinMeter\Services\KelinCredentialService; -use Inensus\KelinMeter\Services\MenuItemService; use Inensus\KelinMeter\Services\PackageInstallationService; class InstallPackage extends Command @@ -13,22 +12,12 @@ class InstallPackage extends Command protected $signature = 'kelin-meter:install'; protected $description = 'Install KelinMeters Package'; - private $menuItemService; - private $apiHelpers; - private $credentialService; - private $packageInstallationService; - public function __construct( - MenuItemService $menuItemService, - ApiHelpers $apiHelpers, - KelinCredentialService $credentialService, - PackageInstallationService $packageInstallationService + private ApiHelpers $apiHelpers, + private KelinCredentialService $credentialService, + private PackageInstallationService $packageInstallationService, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->apiHelpers = $apiHelpers; - $this->credentialService = $credentialService; - $this->packageInstallationService = $packageInstallationService; } public function handle(): void diff --git a/src/backend/packages/inensus/kelin-meter/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/kelin-meter/src/Console/Commands/UpdatePackage.php index 1aaf33a4f..b2f75d32c 100644 --- a/src/backend/packages/inensus/kelin-meter/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/kelin-meter/src/Console/Commands/UpdatePackage.php @@ -7,7 +7,6 @@ use Illuminate\Support\Facades\DB; use Inensus\KelinMeter\Helpers\ApiHelpers; use Inensus\KelinMeter\Services\KelinCredentialService; -use Inensus\KelinMeter\Services\MenuItemService; use Inensus\KelinMeter\Services\PackageInstallationService; class UpdatePackage extends Command @@ -15,25 +14,13 @@ class UpdatePackage extends Command protected $signature = 'kelin-meter:update'; protected $description = 'Update Kelin Meter Package'; - private $menuItemService; - private $credentialService; - private $apiHelpers; - private $packageInstallationService; - private $fileSystem; - public function __construct( - MenuItemService $menuItemService, - KelinCredentialService $credentialService, - ApiHelpers $apiHelpers, - PackageInstallationService $packageInstallationService, - Filesystem $fileSystem + private KelinCredentialService $credentialService, + private ApiHelpers $apiHelpers, + private PackageInstallationService $packageInstallationService, + private Filesystem $filesystem, ) { parent::__construct(); - $this->apiHelpers = $apiHelpers; - $this->menuItemService = $menuItemService; - $this->credentialService = $credentialService; - $this->packageInstallationService = $packageInstallationService; - $this->fileSystem = $fileSystem; } public function handle(): void @@ -42,13 +29,12 @@ public function handle(): void $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->packageInstallationService->createDefaultSettingRecords(); $this->call('routes:generate'); - $this->createMenuItems(); $this->info('Package updated successfully..'); } @@ -101,15 +87,4 @@ private function publishVueFilesAgain() '--force' => true, ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - if (array_key_exists('menuItem', $menuItems)) { - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } - } } diff --git a/src/backend/packages/inensus/kelin-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/kelin-meter/src/Services/MenuItemService.php deleted file mode 100644 index 0bfe49da9..000000000 --- a/src/backend/packages/inensus/kelin-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,45 +0,0 @@ - 'Kelin Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/kelin-meters/kelin-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - $subMenuItem3 = [ - 'name' => 'Customers', - 'url_slug' => '/kelin-meters/kelin-customer/page/1', - ]; - array_push($subMenuItems, $subMenuItem3); - - $subMenuItem4 = [ - 'name' => 'Meters', - 'url_slug' => '/kelin-meters/kelin-meter/page/1', - ]; - array_push($subMenuItems, $subMenuItem4); - - $subMenuItem4 = [ - 'name' => 'Settings', - 'url_slug' => '/kelin-meters/kelin-setting', - ]; - array_push($subMenuItems, $subMenuItem4); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/kelin-meter/src/Services/PackageInstallationService.php b/src/backend/packages/inensus/kelin-meter/src/Services/PackageInstallationService.php index 6c72f0e7b..34ddee422 100644 --- a/src/backend/packages/inensus/kelin-meter/src/Services/PackageInstallationService.php +++ b/src/backend/packages/inensus/kelin-meter/src/Services/PackageInstallationService.php @@ -4,15 +4,9 @@ class PackageInstallationService { - private $menuItemService; - private $syncSettingService; - public function __construct( - MenuItemService $menuItemService, - KelinSyncSettingService $syncSettingService + private KelinSyncSettingService $syncSettingService, ) { - $this->menuItemService = $menuItemService; - $this->syncSettingService = $syncSettingService; } public function createDefaultSettingRecords() diff --git a/src/backend/packages/inensus/mesomb-payment-provider/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/mesomb-payment-provider/src/Console/Commands/UpdatePackage.php index 195ec9b96..93114c7b1 100644 --- a/src/backend/packages/inensus/mesomb-payment-provider/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/mesomb-payment-provider/src/Console/Commands/UpdatePackage.php @@ -11,18 +11,10 @@ class UpdatePackage extends Command protected $signature = 'mesomb-payment-provider:update'; protected $description = 'Update the Mesomb Payment Provider Integration Package'; - private $fileSystem; - - /** - * Create a new command instance. - * - * @param Filesystem $filesystem - */ public function __construct( - Filesystem $filesystem + private Filesystem $filesystem, ) { parent::__construct(); - $this->fileSystem = $filesystem; } /** @@ -33,7 +25,7 @@ public function handle(): void $this->info('Mesomb Payment Provider Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->info('Package updated successfully..'); diff --git a/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/InstallPackage.php index 749613075..99855d3bf 100644 --- a/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/InstallPackage.php @@ -4,7 +4,6 @@ use Illuminate\Console\Command; use Inensus\MicroStarMeter\Services\ManufacturerService; -use Inensus\MicroStarMeter\Services\MenuItemService; use Inensus\MicroStarMeter\Services\MicroStarCredentialService; class InstallPackage extends Command @@ -13,9 +12,8 @@ class InstallPackage extends Command protected $description = 'Install MicroStarMeter Package'; public function __construct( - private MenuItemService $menuItemService, private ManufacturerService $manufacturerService, - private MicroStarCredentialService $credentialService + private MicroStarCredentialService $credentialService, ) { parent::__construct(); } @@ -60,13 +58,4 @@ private function createPluginRecord() 'description' => 'MicroStarMeter integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/UpdatePackage.php index 86929f162..c1998cbbf 100644 --- a/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/micro-star-meter/src/Console/Commands/UpdatePackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; -use Inensus\MicroStarMeter\Services\MenuItemService; class UpdatePackage extends Command { @@ -13,8 +12,7 @@ class UpdatePackage extends Command protected $description = 'Update MicroStarMeter Package'; public function __construct( - private MenuItemService $menuItemService, - private Filesystem $fileSystem + private Filesystem $filesystem, ) { parent::__construct(); } @@ -24,12 +22,11 @@ public function handle(): void $this->info('MicroStar Meter Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->call('routes:generate'); - $this->createMenuItems(); $this->call('sidebar:generate'); $this->info('Package updated successfully..'); } @@ -83,13 +80,4 @@ private function publishVueFilesAgain() '--tag' => 'vue-components', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/micro-star-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/micro-star-meter/src/Services/MenuItemService.php deleted file mode 100644 index 1ef68a9f8..000000000 --- a/src/backend/packages/inensus/micro-star-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'MicroStar Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/micro-star-meters/micro-star-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/spark-meter/src/Console/Commands/InstallSparkMeterPackage.php b/src/backend/packages/inensus/spark-meter/src/Console/Commands/InstallSparkMeterPackage.php index 7646182ac..97b96f949 100644 --- a/src/backend/packages/inensus/spark-meter/src/Console/Commands/InstallSparkMeterPackage.php +++ b/src/backend/packages/inensus/spark-meter/src/Console/Commands/InstallSparkMeterPackage.php @@ -6,7 +6,6 @@ use Inensus\SparkMeter\Helpers\InsertSparkMeterApi; use Inensus\SparkMeter\Services\CredentialService; use Inensus\SparkMeter\Services\CustomerService; -use Inensus\SparkMeter\Services\MenuItemService; use Inensus\SparkMeter\Services\MeterModelService; use Inensus\SparkMeter\Services\PackageInstallationService; use Inensus\SparkMeter\Services\SiteService; @@ -21,62 +20,20 @@ class InstallSparkMeterPackage extends Command protected $signature = 'spark-meter:install'; protected $description = 'Install the Spark Meter Integration Package'; - private $insertSparkMeterApi; - private $meterModelService; - private $credentialService; - private $menuItemService; - private $customerService; - private $siteService; - private $smsSettingService; - private $syncSettingService; - private $smsBodyService; - private $defaultValueService; - private $smSmsFeedbackWordService; - private $packageInstallationService; - - /** - * Create a new command instance. - * - * @param InsertSparkMeterApi $insertSparkMeterApi - * @param MeterModelService $meterModelService - * @param CredentialService $credentialService - * @param MenuItemService $menuItemService - * @param CustomerService $customerService - * @param SiteService $siteService - * @param SmSmsSettingService $smsSettingService - * @param SmSyncSettingService $syncSettingService - * @param SmSmsBodyService $smsBodyService - * @param SmSmsVariableDefaultValueService $defaultValueService - * @param SmSmsFeedbackWordService $smSmsFeedbackWordService - * @param PackageInstallationService $packageInstallationService - */ public function __construct( - InsertSparkMeterApi $insertSparkMeterApi, - MeterModelService $meterModelService, - CredentialService $credentialService, - MenuItemService $menuItemService, - CustomerService $customerService, - SiteService $siteService, - SmSmsSettingService $smsSettingService, - SmSyncSettingService $syncSettingService, - SmSmsBodyService $smsBodyService, - SmSmsVariableDefaultValueService $defaultValueService, - SmSmsFeedbackWordService $smSmsFeedbackWordService, - PackageInstallationService $packageInstallationService + private InsertSparkMeterApi $insertSparkMeterApi, + private MeterModelService $meterModelService, + private CredentialService $credentialService, + private CustomerService $customerService, + private SiteService $siteService, + private SmSmsSettingService $smsSettingService, + private SmSyncSettingService $syncSettingService, + private SmSmsBodyService $smsBodyService, + private SmSmsVariableDefaultValueService $defaultValueService, + private SmSmsFeedbackWordService $smSmsFeedbackWordService, + private PackageInstallationService $packageInstallationService, ) { parent::__construct(); - $this->insertSparkMeterApi = $insertSparkMeterApi; - $this->meterModelService = $meterModelService; - $this->credentialService = $credentialService; - $this->menuItemService = $menuItemService; - $this->customerService = $customerService; - $this->siteService = $siteService; - $this->smsSettingService = $smsSettingService; - $this->syncSettingService = $syncSettingService; - $this->smsBodyService = $smsBodyService; - $this->defaultValueService = $defaultValueService; - $this->smSmsFeedbackWordService = $smSmsFeedbackWordService; - $this->packageInstallationService = $packageInstallationService; } public function handle(): void @@ -132,15 +89,4 @@ private function createPluginRecord() 'description' => 'Spark meters integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - if (array_key_exists('menuItem', $menuItems)) { - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } - } } diff --git a/src/backend/packages/inensus/spark-meter/src/Console/Commands/UpdateSparkMeterPackage.php b/src/backend/packages/inensus/spark-meter/src/Console/Commands/UpdateSparkMeterPackage.php index 9d5ca4b67..cabc131fd 100644 --- a/src/backend/packages/inensus/spark-meter/src/Console/Commands/UpdateSparkMeterPackage.php +++ b/src/backend/packages/inensus/spark-meter/src/Console/Commands/UpdateSparkMeterPackage.php @@ -8,7 +8,6 @@ use Inensus\SparkMeter\Helpers\InsertSparkMeterApi; use Inensus\SparkMeter\Services\CredentialService; use Inensus\SparkMeter\Services\CustomerService; -use Inensus\SparkMeter\Services\MenuItemService; use Inensus\SparkMeter\Services\MeterModelService; use Inensus\SparkMeter\Services\PackageInstallationService; use Inensus\SparkMeter\Services\SiteService; @@ -23,66 +22,21 @@ class UpdateSparkMeterPackage extends Command protected $signature = 'spark-meter:update'; protected $description = 'Update the Spark Meter Integration Package'; - private $insertSparkMeterApi; - private $meterModelService; - private $credentialService; - private $menuItemService; - private $customerService; - private $siteService; - private $smsSettingService; - private $syncSettingService; - private $smsBodyService; - private $defaultValueService; - private $smSmsFeedbackWordService; - private $packageInstallationService; - private $fileSystem; - - /** - * Create a new command instance. - * - * @param InsertSparkMeterApi $insertSparkMeterApi - * @param MeterModelService $meterModelService - * @param CredentialService $credentialService - * @param MenuItemService $menuItemService - * @param CustomerService $customerService - * @param SiteService $siteService - * @param SmSmsSettingService $smsSettingService - * @param SmSyncSettingService $syncSettingService - * @param SmSmsBodyService $smsBodyService - * @param SmSmsVariableDefaultValueService $defaultValueService - * @param SmSmsFeedbackWordService $smSmsFeedbackWordService - * @param PackageInstallationService $packageInstallationService - * @param Filesystem $filesystem - */ public function __construct( - InsertSparkMeterApi $insertSparkMeterApi, - MeterModelService $meterModelService, - CredentialService $credentialService, - MenuItemService $menuItemService, - CustomerService $customerService, - SiteService $siteService, - SmSmsSettingService $smsSettingService, - SmSyncSettingService $syncSettingService, - SmSmsBodyService $smsBodyService, - SmSmsVariableDefaultValueService $defaultValueService, - SmSmsFeedbackWordService $smSmsFeedbackWordService, - PackageInstallationService $packageInstallationService, - Filesystem $filesystem + private InsertSparkMeterApi $insertSparkMeterApi, + private MeterModelService $meterModelService, + private CredentialService $credentialService, + private CustomerService $customerService, + private SiteService $siteService, + private SmSmsSettingService $smsSettingService, + private SmSyncSettingService $syncSettingService, + private SmSmsBodyService $smsBodyService, + private SmSmsVariableDefaultValueService $defaultValueService, + private SmSmsFeedbackWordService $smSmsFeedbackWordService, + private PackageInstallationService $packageInstallationService, + private Filesystem $filesystem, ) { parent::__construct(); - $this->insertSparkMeterApi = $insertSparkMeterApi; - $this->meterModelService = $meterModelService; - $this->credentialService = $credentialService; - $this->menuItemService = $menuItemService; - $this->customerService = $customerService; - $this->siteService = $siteService; - $this->smsSettingService = $smsSettingService; - $this->syncSettingService = $syncSettingService; - $this->smsBodyService = $smsBodyService; - $this->defaultValueService = $defaultValueService; - $this->smSmsFeedbackWordService = $smSmsFeedbackWordService; - $this->packageInstallationService = $packageInstallationService; - $this->fileSystem = $filesystem; } /** @@ -93,13 +47,12 @@ public function handle(): void $this->info('Spark Meter Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->packageInstallationService->createDefaultSettingRecords(); $this->call('routes:generate'); - $this->createMenuItems(); $this->info('Package updated successfully..'); } @@ -152,13 +105,4 @@ private function publishVueFilesAgain() '--force' => true, ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/spark-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/spark-meter/src/Services/MenuItemService.php deleted file mode 100644 index 5e9f7b038..000000000 --- a/src/backend/packages/inensus/spark-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,61 +0,0 @@ - 'Spark Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/spark-meters/sm-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - $subMenuItem2 = [ - 'name' => 'Sites', - 'url_slug' => '/spark-meters/sm-site/page/1', - ]; - array_push($subMenuItems, $subMenuItem2); - - $subMenuItem3 = [ - 'name' => 'Meter Models', - 'url_slug' => '/spark-meters/sm-meter-model/page/1', - ]; - array_push($subMenuItems, $subMenuItem3); - - $subMenuItem4 = [ - 'name' => 'Tariffs', - 'url_slug' => '/spark-meters/sm-tariff/page/1', - ]; - array_push($subMenuItems, $subMenuItem4); - - $subMenuItem5 = [ - 'name' => 'Customers', - 'url_slug' => '/spark-meters/sm-customer/page/1', - ]; - array_push($subMenuItems, $subMenuItem5); - $subMenuItem6 = [ - 'name' => 'Sales Accounts', - 'url_slug' => '/spark-meters/sm-sales-account/page/1', - ]; - array_push($subMenuItems, $subMenuItem6); - $subMenuItem7 = [ - 'name' => 'Settings', - 'url_slug' => '/spark-meters/sm-setting', - ]; - array_push($subMenuItems, $subMenuItem7); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/steama-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/steama-meter/src/Console/Commands/InstallPackage.php index a0a42d0cc..eaab478b6 100644 --- a/src/backend/packages/inensus/steama-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/steama-meter/src/Console/Commands/InstallPackage.php @@ -4,7 +4,6 @@ use Illuminate\Console\Command; use Inensus\SteamaMeter\Helpers\ApiHelpers; -use Inensus\SteamaMeter\Services\MenuItemService; use Inensus\SteamaMeter\Services\PackageInstallationService; use Inensus\SteamaMeter\Services\SteamaAgentService; use Inensus\SteamaMeter\Services\SteamaCredentialService; @@ -23,52 +22,22 @@ class InstallPackage extends Command protected $signature = 'steama-meter:install'; protected $description = 'Install Steamaco Meter Package'; - private $menuItemService; - private $agentService; - private $credentialService; - private $paymentPlanService; - private $tariffService; - private $userTypeService; - private $apiHelpers; - private $siteService; - private $smsSettingService; - private $syncSettingService; - private $smsBodyService; - private $defaultValueService; - private $steamaSmsFeedbackWordService; - private $packageInstallationService; - public function __construct( - MenuItemService $menuItemService, - SteamaAgentService $agentService, - SteamaCredentialService $credentialService, - SteamaSiteLevelPaymentPlanTypeService $paymentPlanService, - SteamaTariffService $tariffService, - SteamaUserTypeService $userTypeService, - ApiHelpers $apiHelpers, - SteamaSiteService $siteService, - SteamaSmsSettingService $smsSettingService, - SteamaSyncSettingService $syncSettingService, - SteamaSmsBodyService $smsBodyService, - SteamaSmsVariableDefaultValueService $defaultValueService, - SteamaSmsFeedbackWordService $steamaSmsFeedbackWordService, - PackageInstallationService $packageInstallationService + private SteamaAgentService $agentService, + private SteamaCredentialService $credentialService, + private SteamaSiteLevelPaymentPlanTypeService $paymentPlanService, + private SteamaTariffService $tariffService, + private SteamaUserTypeService $userTypeService, + private ApiHelpers $apiHelpers, + private SteamaSiteService $siteService, + private SteamaSmsSettingService $smsSettingService, + private SteamaSyncSettingService $syncSettingService, + private SteamaSmsBodyService $smsBodyService, + private SteamaSmsVariableDefaultValueService $defaultValueService, + private SteamaSmsFeedbackWordService $steamaSmsFeedbackWordService, + private PackageInstallationService $packageInstallationService, ) { parent::__construct(); - $this->apiHelpers = $apiHelpers; - $this->menuItemService = $menuItemService; - $this->agentService = $agentService; - $this->credentialService = $credentialService; - $this->paymentPlanService = $paymentPlanService; - $this->tariffService = $tariffService; - $this->userTypeService = $userTypeService; - $this->siteService = $siteService; - $this->smsSettingService = $smsSettingService; - $this->syncSettingService = $syncSettingService; - $this->smsBodyService = $smsBodyService; - $this->defaultValueService = $defaultValueService; - $this->steamaSmsFeedbackWordService = $steamaSmsFeedbackWordService; - $this->packageInstallationService = $packageInstallationService; } public function handle(): void @@ -87,7 +56,6 @@ public function handle(): void $this->paymentPlanService->createPaymentPlans(); $this->agentService->createSteamaAgentCommission(); // $this->call('routes:generate'); - // $this->createMenuItems(); // $this->call('sidebar:generate'); // $this->info('Package installed successfully..'); if (!$this->siteService->checkLocationAvailability()) { @@ -130,15 +98,4 @@ private function createPluginRecord() 'description' => 'SteamaMeter integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - if (array_key_exists('menuItem', $menuItems)) { - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } - } } diff --git a/src/backend/packages/inensus/steama-meter/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/steama-meter/src/Console/Commands/UpdatePackage.php index 4a98bdcbc..e6a2a4f99 100644 --- a/src/backend/packages/inensus/steama-meter/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/steama-meter/src/Console/Commands/UpdatePackage.php @@ -6,7 +6,6 @@ use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; use Inensus\SteamaMeter\Helpers\ApiHelpers; -use Inensus\SteamaMeter\Services\MenuItemService; use Inensus\SteamaMeter\Services\PackageInstallationService; use Inensus\SteamaMeter\Services\SteamaAgentService; use Inensus\SteamaMeter\Services\SteamaCredentialService; @@ -25,55 +24,23 @@ class UpdatePackage extends Command protected $signature = 'steama-meter:update'; protected $description = 'Install Steamaco Meter Package'; - private $menuItemService; - private $agentService; - private $credentialService; - private $paymentPlanService; - private $tariffService; - private $userTypeService; - private $apiHelpers; - private $siteService; - private $smsSettingService; - private $syncSettingService; - private $smsBodyService; - private $defaultValueService; - private $steamaSmsFeedbackWordService; - private $packageInstallationService; - private $fileSystem; - public function __construct( - MenuItemService $menuItemService, - SteamaAgentService $agentService, - SteamaCredentialService $credentialService, - SteamaSiteLevelPaymentPlanTypeService $paymentPlanService, - SteamaTariffService $tariffService, - SteamaUserTypeService $userTypeService, - ApiHelpers $apiHelpers, - SteamaSiteService $siteService, - SteamaSmsSettingService $smsSettingService, - SteamaSyncSettingService $syncSettingService, - SteamaSmsBodyService $smsBodyService, - SteamaSmsVariableDefaultValueService $defaultValueService, - SteamaSmsFeedbackWordService $steamaSmsFeedbackWordService, - PackageInstallationService $packageInstallationService, - Filesystem $fileSystem + private SteamaAgentService $agentService, + private SteamaCredentialService $credentialService, + private SteamaSiteLevelPaymentPlanTypeService $paymentPlanService, + private SteamaTariffService $tariffService, + private SteamaUserTypeService $userTypeService, + private ApiHelpers $apiHelpers, + private SteamaSiteService $siteService, + private SteamaSmsSettingService $smsSettingService, + private SteamaSyncSettingService $syncSettingService, + private SteamaSmsBodyService $smsBodyService, + private SteamaSmsVariableDefaultValueService $defaultValueService, + private SteamaSmsFeedbackWordService $steamaSmsFeedbackWordService, + private PackageInstallationService $packageInstallationService, + private Filesystem $filesystem, ) { parent::__construct(); - $this->apiHelpers = $apiHelpers; - $this->menuItemService = $menuItemService; - $this->agentService = $agentService; - $this->credentialService = $credentialService; - $this->paymentPlanService = $paymentPlanService; - $this->tariffService = $tariffService; - $this->userTypeService = $userTypeService; - $this->siteService = $siteService; - $this->smsSettingService = $smsSettingService; - $this->syncSettingService = $syncSettingService; - $this->smsBodyService = $smsBodyService; - $this->defaultValueService = $defaultValueService; - $this->steamaSmsFeedbackWordService = $steamaSmsFeedbackWordService; - $this->packageInstallationService = $packageInstallationService; - $this->fileSystem = $fileSystem; } public function handle(): void @@ -82,13 +49,12 @@ public function handle(): void $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->packageInstallationService->createDefaultSettingRecords(); $this->call('routes:generate'); - $this->createMenuItems(); $this->info('Package updated successfully..'); } @@ -141,15 +107,4 @@ private function publishVueFilesAgain() '--force' => true, ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - if (array_key_exists('menuItem', $menuItems)) { - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } - } } diff --git a/src/backend/packages/inensus/steama-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/steama-meter/src/Services/MenuItemService.php deleted file mode 100644 index 47d0682d3..000000000 --- a/src/backend/packages/inensus/steama-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,57 +0,0 @@ - 'Steamaco Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/steama-meters/steama-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - $subMenuItem2 = [ - 'name' => 'Sites', - 'url_slug' => '/steama-meters/steama-site/page/1', - ]; - array_push($subMenuItems, $subMenuItem2); - - $subMenuItem3 = [ - 'name' => 'Customers', - 'url_slug' => '/steama-meters/steama-customer/page/1', - ]; - array_push($subMenuItems, $subMenuItem3); - - $subMenuItem4 = [ - 'name' => 'Meters', - 'url_slug' => '/steama-meters/steama-meter/page/1', - ]; - array_push($subMenuItems, $subMenuItem4); - - $subMenuItem5 = [ - 'name' => 'Agents', - 'url_slug' => '/steama-meters/steama-agent/page/1', - ]; - array_push($subMenuItems, $subMenuItem5); - - $subMenuItem6 = [ - 'name' => 'Settings', - 'url_slug' => '/steama-meters/steama-setting', - ]; - array_push($subMenuItems, $subMenuItem6); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/steama-meter/src/Services/PackageInstallationService.php b/src/backend/packages/inensus/steama-meter/src/Services/PackageInstallationService.php index e577a390b..62cb4f3af 100644 --- a/src/backend/packages/inensus/steama-meter/src/Services/PackageInstallationService.php +++ b/src/backend/packages/inensus/steama-meter/src/Services/PackageInstallationService.php @@ -6,48 +6,20 @@ class PackageInstallationService { - private $menuItemService; - private $agentService; - private $credentialService; - private $paymentPlanService; - private $tariffService; - private $userTypeService; - private $apiHelpers; - private $siteService; - private $smsSettingService; - private $syncSettingService; - private $smsBodyService; - private $defaultValueService; - private $steamaSmsFeedbackWordService; - public function __construct( - MenuItemService $menuItemService, - SteamaAgentService $agentService, - SteamaCredentialService $credentialService, - SteamaSiteLevelPaymentPlanTypeService $paymentPlanService, - SteamaTariffService $tariffService, - SteamaUserTypeService $userTypeService, - ApiHelpers $apiHelpers, - SteamaSiteService $siteService, - SteamaSmsSettingService $smsSettingService, - SteamaSyncSettingService $syncSettingService, - SteamaSmsBodyService $smsBodyService, - SteamaSmsVariableDefaultValueService $defaultValueService, - SteamaSmsFeedbackWordService $steamaSmsFeedbackWordService + private SteamaAgentService $agentService, + private SteamaCredentialService $credentialService, + private SteamaSiteLevelPaymentPlanTypeService $paymentPlanService, + private SteamaTariffService $tariffService, + private SteamaUserTypeService $userTypeService, + private ApiHelpers $apiHelpers, + private SteamaSiteService $siteService, + private SteamaSmsSettingService $smsSettingService, + private SteamaSyncSettingService $syncSettingService, + private SteamaSmsBodyService $smsBodyService, + private SteamaSmsVariableDefaultValueService $defaultValueService, + private SteamaSmsFeedbackWordService $steamaSmsFeedbackWordService, ) { - $this->apiHelpers = $apiHelpers; - $this->menuItemService = $menuItemService; - $this->agentService = $agentService; - $this->credentialService = $credentialService; - $this->paymentPlanService = $paymentPlanService; - $this->tariffService = $tariffService; - $this->userTypeService = $userTypeService; - $this->siteService = $siteService; - $this->smsSettingService = $smsSettingService; - $this->syncSettingService = $syncSettingService; - $this->smsBodyService = $smsBodyService; - $this->defaultValueService = $defaultValueService; - $this->steamaSmsFeedbackWordService = $steamaSmsFeedbackWordService; } public function createDefaultSettingRecords() diff --git a/src/backend/packages/inensus/stron-meter/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/stron-meter/src/Console/Commands/InstallPackage.php index 44b267988..c4f510335 100644 --- a/src/backend/packages/inensus/stron-meter/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/stron-meter/src/Console/Commands/InstallPackage.php @@ -4,7 +4,6 @@ use Illuminate\Console\Command; use Inensus\StronMeter\Helpers\ApiHelpers; -use Inensus\StronMeter\Services\MenuItemService; use Inensus\StronMeter\Services\StronCredentialService; class InstallPackage extends Command @@ -12,19 +11,11 @@ class InstallPackage extends Command protected $signature = 'stron-meter:install'; protected $description = 'Install StronMeter Package'; - private $menuItemService; - private $apiHelpers; - private $credentialService; - public function __construct( - MenuItemService $menuItemService, - ApiHelpers $apiHelpers, - StronCredentialService $credentialService + private ApiHelpers $apiHelpers, + private StronCredentialService $credentialService, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->apiHelpers = $apiHelpers; - $this->credentialService = $credentialService; } public function handle(): void @@ -67,13 +58,4 @@ private function createPluginRecord() 'description' => 'Stron Meter integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/stron-meter/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/stron-meter/src/Console/Commands/UpdatePackage.php index 5ae6a68af..2769774e6 100644 --- a/src/backend/packages/inensus/stron-meter/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/stron-meter/src/Console/Commands/UpdatePackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; -use Inensus\StronMeter\Services\MenuItemService; use Inensus\StronMeter\Services\StronCredentialService; class UpdatePackage extends Command @@ -13,19 +12,11 @@ class UpdatePackage extends Command protected $signature = 'stron-meter:update'; protected $description = 'Update StronMeter Package'; - private $menuItemService; - private $credentialService; - private $fileSystem; - public function __construct( - MenuItemService $menuItemService, - StronCredentialService $credentialService, - Filesystem $fileSystem + private StronCredentialService $credentialService, + private Filesystem $filesystem, ) { parent::__construct(); - $this->menuItemService = $menuItemService; - $this->credentialService = $credentialService; - $this->fileSystem = $fileSystem; } public function handle(): void @@ -33,12 +24,11 @@ public function handle(): void $this->info('Stron Meter Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->call('routes:generate'); - $this->createMenuItems(); $this->info('Package updated successfully..'); } @@ -90,13 +80,4 @@ private function publishVueFilesAgain() '--tag' => 'vue-components', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/stron-meter/src/Services/MenuItemService.php b/src/backend/packages/inensus/stron-meter/src/Services/MenuItemService.php deleted file mode 100644 index ef0f55b12..000000000 --- a/src/backend/packages/inensus/stron-meter/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'Stron Meter', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'mini-grid', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/stron-meters/stron-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/sun-king-shs/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/sun-king-shs/src/Console/Commands/InstallPackage.php index 25f88532b..e45cade62 100644 --- a/src/backend/packages/inensus/sun-king-shs/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/sun-king-shs/src/Console/Commands/InstallPackage.php @@ -4,7 +4,6 @@ use Illuminate\Console\Command; use Inensus\SunKingSHS\Services\ManufacturerService; -use Inensus\SunKingSHS\Services\MenuItemService; use Inensus\SunKingSHS\Services\SunKingCredentialService; class InstallPackage extends Command @@ -13,7 +12,6 @@ class InstallPackage extends Command protected $description = 'Install SunKingSHS Package'; public function __construct( - private MenuItemService $menuItemService, private ManufacturerService $manufacturerService, private SunKingCredentialService $credentialService, ) { @@ -61,13 +59,4 @@ private function createPluginRecord() 'description' => 'SunKingSHS integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/sun-king-shs/src/Services/MenuItemService.php b/src/backend/packages/inensus/sun-king-shs/src/Services/MenuItemService.php deleted file mode 100644 index 76383b86a..000000000 --- a/src/backend/packages/inensus/sun-king-shs/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'SunKing SHS', - 'url_slug' => '', - 'md_icon' => 'bolt', - 'usage_type' => 'shs', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/sun-king-shs/sun-king-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/InstallPackage.php index b6aed80cb..178326aea 100644 --- a/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/InstallPackage.php @@ -10,7 +10,6 @@ use Carbon\Carbon; use Illuminate\Console\Command; use Inensus\SwiftaPaymentProvider\Models\SwiftaAuthentication; -use Inensus\SwiftaPaymentProvider\Services\MenuItemService; use Tymon\JWTAuth\Facades\JWTAuth; class InstallPackage extends Command @@ -24,7 +23,6 @@ public function __construct( private CompanyService $companyService, private CompanyDatabaseService $companyDatabaseService, private DatabaseProxyService $databaseProxyService, - private MenuItemService $menuItemService ) { parent::__construct(); } @@ -32,7 +30,6 @@ public function __construct( public function handle(): void { $this->info('Installing SwiftaPaymentProvider Integration Package\n'); - $this->createMenuItems(); $token = $this->generateAuthenticationToken(); $this->warn("Authentication token for swifta payments generated. token =>\n {$token}"); $this->info('Package installed successfully..'); @@ -115,13 +112,4 @@ private function generateRandomNumber(): string return $number; } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/UpdatePackage.php index aa43596bf..093dda50f 100644 --- a/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/swifta-payment-provider/src/Console/Commands/UpdatePackage.php @@ -14,18 +14,13 @@ class UpdatePackage extends Command { protected $signature = 'swifta-payment-provider:update'; protected $description = 'Update the Swifta Payment Provider Integration Package'; - private $user; - private $fileSystem; - private $authentication; public function __construct( - User $user, - Filesystem $filesystem, SwiftaAuthentication $authentication + private User $user, + private Filesystem $filesystem, + private SwiftaAuthentication $authentication, ) { parent::__construct(); - $this->fileSystem = $filesystem; - $this->user = $user; - $this->authentication = $authentication; } /** @@ -36,7 +31,7 @@ public function handle(): void $this->info('Swifta Payment Provider Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishConfigurations(); $this->publishMigrationsAgain(); $this->updateDatabase(); diff --git a/src/backend/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php b/src/backend/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php deleted file mode 100644 index 92f018268..000000000 --- a/src/backend/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'Swifta', - 'url_slug' => '', - 'md_icon' => 'money', - 'usage_type' => 'general', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/swifta-payment/swifta-payment-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/viber-messaging/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/viber-messaging/src/Console/Commands/InstallPackage.php index 3013ed714..90e344df2 100644 --- a/src/backend/packages/inensus/viber-messaging/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/viber-messaging/src/Console/Commands/InstallPackage.php @@ -3,7 +3,6 @@ namespace Inensus\ViberMessaging\Console\Commands; use Illuminate\Console\Command; -use Inensus\ViberMessaging\Services\MenuItemService; use Inensus\ViberMessaging\Services\ViberCredentialService; class InstallPackage extends Command @@ -12,8 +11,7 @@ class InstallPackage extends Command protected $description = 'Install ViberMessaging Package'; public function __construct( - private MenuItemService $menuItemService, - private ViberCredentialService $credentialService + private ViberCredentialService $credentialService, ) { parent::__construct(); } @@ -21,7 +19,6 @@ public function __construct( public function handle(): void { $this->info('Installing ViberMessaging Integration Package\n'); - $this->createMenuItems(); $this->credentialService->createCredentials(); $this->info('Package installed successfully..'); } @@ -58,13 +55,4 @@ private function createPluginRecord() 'description' => 'Viber Messaging integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/viber-messaging/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/viber-messaging/src/Console/Commands/UpdatePackage.php index 629a58f1b..1c398b3e0 100644 --- a/src/backend/packages/inensus/viber-messaging/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/viber-messaging/src/Console/Commands/UpdatePackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; -use Inensus\ViberMessaging\Services\MenuItemService; use Inensus\ViberMessaging\Services\ViberCredentialService; class UpdatePackage extends Command @@ -13,16 +12,11 @@ class UpdatePackage extends Command protected $signature = 'viber-messaging:update'; protected $description = 'Update ViberMessaging Package'; - private $fileSystem; - public function __construct( - private MenuItemService $menuItemService, private ViberCredentialService $credentialService, - Filesystem $fileSystem + private Filesystem $filesystem, ) { parent::__construct(); - - $this->fileSystem = $fileSystem; } public function handle(): void @@ -30,12 +24,11 @@ public function handle(): void $this->info('Viber Messaging Integration Updating Started\n'); $this->removeOldVersionOfPackage(); $this->installNewVersionOfPackage(); - $this->deleteMigration($this->fileSystem); + $this->deleteMigration($this->filesystem); $this->publishMigrationsAgain(); $this->updateDatabase(); $this->publishVueFilesAgain(); $this->call('routes:generate'); - $this->createMenuItems(); $this->call('sidebar:generate'); $this->info('Package updated successfully..'); } @@ -89,13 +82,4 @@ private function publishVueFilesAgain() '--tag' => 'vue-components', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/viber-messaging/src/Services/MenuItemService.php b/src/backend/packages/inensus/viber-messaging/src/Services/MenuItemService.php deleted file mode 100644 index ace635180..000000000 --- a/src/backend/packages/inensus/viber-messaging/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'Viber Messaging', - 'url_slug' => '', - 'md_icon' => 'message', - 'usage_type' => 'general', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/viber-messaging/viber-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/InstallPackage.php index f2f51a519..69345d2f2 100644 --- a/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/InstallPackage.php @@ -3,7 +3,6 @@ namespace Inensus\WaveMoneyPaymentProvider\Console\Commands; use Illuminate\Console\Command; -use Inensus\WaveMoneyPaymentProvider\Services\MenuItemService; use Inensus\WaveMoneyPaymentProvider\Services\WaveMoneyCredentialService; class InstallPackage extends Command @@ -11,7 +10,8 @@ class InstallPackage extends Command protected $signature = 'wave-money-payment-provider:install'; protected $description = 'Install WaveMoneyPaymentProvider Package'; - public function __construct(private MenuItemService $menuItemService, private WaveMoneyCredentialService $credentialService) + public function __construct( + private WaveMoneyCredentialService $credentialService) { parent::__construct(); } @@ -19,7 +19,6 @@ public function __construct(private MenuItemService $menuItemService, private Wa public function handle(): void { $this->info('Installing WaveMoneyPaymentProvider Integration Package\n'); - $this->createMenuItems(); $this->credentialService->createCredentials(); $this->info('Package installed successfully..'); } @@ -56,13 +55,4 @@ private function createPluginRecord() 'description' => 'WaveMoney integration package for MicroPowerManager', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/UpdatePackage.php b/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/UpdatePackage.php index 5b05ba7df..f44b7c9b7 100644 --- a/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/UpdatePackage.php +++ b/src/backend/packages/inensus/wave-money-payment-provider/src/Console/Commands/UpdatePackage.php @@ -5,7 +5,6 @@ use Illuminate\Console\Command; use Illuminate\Filesystem\Filesystem; use Illuminate\Support\Facades\DB; -use Inensus\WaveMoneyPaymentProvider\Services\MenuItemService; use Inensus\WaveMoneyPaymentProvider\Services\WaveMoneyCredentialService; class UpdatePackage extends Command @@ -14,9 +13,8 @@ class UpdatePackage extends Command protected $description = 'Update WaveMoney Package'; public function __construct( - private MenuItemService $menuItemService, private WaveMoneyCredentialService $credentialService, - private Filesystem $fileSystem + private Filesystem $filesystem, ) { parent::__construct(); } @@ -26,12 +24,11 @@ public function handle(): void $this->info('WaveMoney Integration Updating Started\n'); // $this->removeOldVersionOfPackage(); // $this->installNewVersionOfPackage(); - // $this->deleteMigration($this->fileSystem); + // $this->deleteMigration($this->filesystem); // $this->publishMigrationsAgain(); // $this->updateDatabase(); // $this->publishVueFilesAgain(); // $this->call('routes:generate'); - $this->createMenuItems(); // $this->call('sidebar:generate'); $this->info('Package updated successfully..'); } @@ -85,13 +82,4 @@ private function publishVueFilesAgain() '--tag' => 'vue-components', ]); } - - private function createMenuItems() - { - $menuItems = $this->menuItemService->createMenuItems(); - $this->call('menu-items:generate', [ - 'menuItem' => $menuItems['menuItem'], - 'subMenuItems' => $menuItems['subMenuItems'], - ]); - } } diff --git a/src/backend/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php b/src/backend/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php deleted file mode 100644 index acd7d024c..000000000 --- a/src/backend/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php +++ /dev/null @@ -1,27 +0,0 @@ - 'WaveMoney', - 'url_slug' => '', - 'md_icon' => 'money', - 'usage_type' => 'general', - ]; - $subMenuItems = []; - - $subMenuItem1 = [ - 'name' => 'Overview', - 'url_slug' => '/wave-money/wave-money-overview', - ]; - array_push($subMenuItems, $subMenuItem1); - - return ['menuItem' => $menuItem, 'subMenuItems' => $subMenuItems]; - } -} diff --git a/src/backend/packages/inensus/wavecom-payment-provider/src/Console/Commands/InstallPackage.php b/src/backend/packages/inensus/wavecom-payment-provider/src/Console/Commands/InstallPackage.php index fc80623b1..fb1cba887 100644 --- a/src/backend/packages/inensus/wavecom-payment-provider/src/Console/Commands/InstallPackage.php +++ b/src/backend/packages/inensus/wavecom-payment-provider/src/Console/Commands/InstallPackage.php @@ -3,22 +3,15 @@ namespace Inensus\WavecomPaymentProvider\Console\Commands; use Illuminate\Console\Command; -use Inensus\WavecomPaymentProvider\Services\MenuItemService; class InstallPackage extends Command { protected $signature = 'wavecom-payment-provider:install'; protected $description = 'Install wavecom-money-payment-provider Package'; - public function __construct(private MenuItemService $menuItemService) - { - parent::__construct(); - } - public function handle(): void { $this->info('Installing WavecomPaymentProvider Integration Package\n'); - $this->menuItemService->createMenuItems(); $this->info('Package installed successfully..'); } } diff --git a/src/backend/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php b/src/backend/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php deleted file mode 100644 index 13659d884..000000000 --- a/src/backend/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php +++ /dev/null @@ -1,20 +0,0 @@ - 'Wavecom Payment Provider', - 'url_slug' => '/wavecom/transactions', - 'md_icon' => 'upload_file', - 'usage_type' => 'general', - ]; - - return ['menuItem' => $menuItem, 'subMenuItems' => []]; - } -} diff --git a/src/backend/routes/api.php b/src/backend/routes/api.php index 89e81dc20..0ca8b6385 100644 --- a/src/backend/routes/api.php +++ b/src/backend/routes/api.php @@ -318,10 +318,6 @@ static function () { Route::get('/', 'MpmPluginController@index'); }); -Route::group(['prefix' => 'sidebar'], static function () { - Route::get('/', 'SidebarController@index'); -}); - Route::group(['prefix' => 'registration-tails'], static function () { Route::get('/', 'RegistrationTailController@index'); Route::put('/{registrationTail}', 'RegistrationTailController@update'); diff --git a/src/frontend/src/repositories/SidebarRepository.js b/src/frontend/src/repositories/SidebarRepository.js deleted file mode 100644 index 31ddf8124..000000000 --- a/src/frontend/src/repositories/SidebarRepository.js +++ /dev/null @@ -1,10 +0,0 @@ -import Client from "@/repositories/Client/AxiosClient" -import { baseUrl } from "@/repositories/Client/AxiosClient" - -const resource = `${baseUrl}/api/sidebar` - -export default { - list() { - return Client.get(`${resource}`) - }, -} diff --git a/src/frontend/src/services/SidebarService.js b/src/frontend/src/services/SidebarService.js deleted file mode 100644 index 0b883ca47..000000000 --- a/src/frontend/src/services/SidebarService.js +++ /dev/null @@ -1,25 +0,0 @@ -import { ErrorHandler } from "@/Helpers/ErrorHander" -import SidebarRepository from "@/repositories/SidebarRepository" - -export class SidebarService { - constructor() { - this.repository = SidebarRepository - this.sidebar = [] - } - - async list() { - try { - let response = await this.repository.list() - - if (response.status === 200) { - this.sidebar = response.data.data - return this.sidebar - } else { - return new ErrorHandler(response.error, "http", response.status) - } - } catch (e) { - let errorMessage = e.response.data.data.message - return new ErrorHandler(errorMessage, "http") - } - } -}