From 2ede610ccf98efd1cc98d31b44b62c8c9ae9cab5 Mon Sep 17 00:00:00 2001 From: InensusDev Date: Wed, 7 Feb 2024 15:26:12 +0300 Subject: [PATCH] MPM-7 update menu items & mpm plugins --- ...usage_type_column_to_mpm_plugins_table.php | 37 +++++++++++++++++++ ..._usage_type_column_to_menu_items_table.php | 32 ++++++++++++++++ .../database/seeders/MenuItemsSeeder.php | 17 ++++++++- .../database/seeders/SubMenuItemsSeeder.php | 10 ----- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../daly-bms/src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- .../src/Services/MenuItemService.php | 3 +- 20 files changed, 116 insertions(+), 28 deletions(-) create mode 100644 Website/htdocs/mpmanager/database/migrations/base/2024_02_07_113319_add_usage_type_column_to_mpm_plugins_table.php create mode 100644 Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_113710_add_usage_type_column_to_menu_items_table.php diff --git a/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_113319_add_usage_type_column_to_mpm_plugins_table.php b/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_113319_add_usage_type_column_to_mpm_plugins_table.php new file mode 100644 index 000000000..3116e5941 --- /dev/null +++ b/Website/htdocs/mpmanager/database/migrations/base/2024_02_07_113319_add_usage_type_column_to_mpm_plugins_table.php @@ -0,0 +1,37 @@ +table('mpm_plugins', function (Blueprint $table) { + $table->enum('usage_type', [ + 'mini-grid', + 'shs', + 'e-bike', + 'general', + ])->default('general')->after('id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('micro_power_manager')->table('mpm_plugins', function (Blueprint $table) { + // + }); + } +}; diff --git a/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_113710_add_usage_type_column_to_menu_items_table.php b/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_113710_add_usage_type_column_to_menu_items_table.php new file mode 100644 index 000000000..3cb56cc02 --- /dev/null +++ b/Website/htdocs/mpmanager/database/migrations/micropowermanager/2024_02_07_113710_add_usage_type_column_to_menu_items_table.php @@ -0,0 +1,32 @@ +table('menu_items', function (Blueprint $table) { + $table->string('usage_type')->default('general')->after('id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::connection('shard')->table('menu_items', function (Blueprint $table) { + $table->dropColumn('usage_type'); + }); + } +}; diff --git a/Website/htdocs/mpmanager/database/seeders/MenuItemsSeeder.php b/Website/htdocs/mpmanager/database/seeders/MenuItemsSeeder.php index 0cd8b27b6..1ca446d67 100644 --- a/Website/htdocs/mpmanager/database/seeders/MenuItemsSeeder.php +++ b/Website/htdocs/mpmanager/database/seeders/MenuItemsSeeder.php @@ -17,88 +17,101 @@ public function run() DB::connection('shard')->table('menu_items')->insert(array( [ 'name' => 'Dashboard', - 'url_slug' => '', + 'url_slug' => '/', 'md_icon' => 'home', 'menu_order' => '1', - + 'usage_type' => 'general', ], [ 'name' => 'Customers', 'url_slug' => '/people/page/1', 'md_icon' => 'supervisor_account', 'menu_order' => '2', + 'usage_type' => 'general', ], [ 'name' => 'Agents', 'url_slug' => '', 'md_icon' => 'support_agent', 'menu_order' => '3', + 'usage_type' => 'general', ], [ 'name' => 'Meters', 'url_slug' => '', 'md_icon' => 'bolt', 'menu_order' => '4', + 'usage_type' => 'mini-grid', ], [ 'name' => 'Transactions', 'url_slug' => '/transactions/page/1', 'md_icon' => 'account_balance', 'menu_order' => '5', + 'usage_type' => 'general', ], [ 'name' => 'Tickets', 'url_slug' => '', 'md_icon' => 'confirmation_number', 'menu_order' => '6', + 'usage_type' => 'general', ], [ 'name' => 'Tariffs', 'url_slug' => '/tariffs', 'md_icon' => 'widgets', 'menu_order' => '7', + 'usage_type' => 'mini-grid', ], [ 'name' => 'Targets', 'url_slug' => '/targets', 'md_icon' => 'gps_fixed', 'menu_order' => '8', + 'usage_type' => 'mini-grid', ], [ 'name' => 'Reports', 'url_slug' => '/reports', 'md_icon' => 'text_snippet', 'menu_order' => '9', + 'usage_type' => 'general', ], [ 'name' => 'Messages', 'url_slug' => '', 'md_icon' => 'sms', 'menu_order' => '10', + 'usage_type' => 'general', ], [ 'name' => 'Appliances', 'url_slug' => '/assets/page/1', 'md_icon' => 'devices_other', 'menu_order' => '11', + 'usage_type' => 'general', ], [ 'name' => 'Maintenance', 'url_slug' => '/maintenance', 'md_icon' => 'home_repair_service', 'menu_order' => '12', + 'usage_type' => 'mini-grid', ], [ 'name' => 'Solar Home Systems', 'url_slug' => '/solar-home-systems/page/1', 'md_icon' => 'solar_power', 'menu_order' => '13', + 'usage_type' => 'shs', ], [ 'name' => 'E-Bikes', 'url_slug' => '/e-bikes/page/1', 'md_icon' => 'electric_bike', 'menu_order' => '14', + 'usage_type' => 'e-bike', ] ) ); diff --git a/Website/htdocs/mpmanager/database/seeders/SubMenuItemsSeeder.php b/Website/htdocs/mpmanager/database/seeders/SubMenuItemsSeeder.php index 13e97364f..9aac74c07 100644 --- a/Website/htdocs/mpmanager/database/seeders/SubMenuItemsSeeder.php +++ b/Website/htdocs/mpmanager/database/seeders/SubMenuItemsSeeder.php @@ -10,16 +10,6 @@ class SubMenuItemsSeeder extends Seeder public function run(): void { DB::connection('shard')->table('sub_menu_items')->insert(array( - [ - 'name' => 'Clusters', - 'url_slug' => '/', - 'parent_id' => '1', - ], - [ - 'name' => 'Mini-Grid', - 'url_slug' => '/dashboards/mini-grid', - 'parent_id' => '1', - ], [ 'name' => 'List', 'url_slug' => '/agents/page/1', diff --git a/Website/htdocs/mpmanager/packages/inensus/angaza-shs/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/angaza-shs/src/Services/MenuItemService.php index c645ce5d4..722e6e564 100644 --- a/Website/htdocs/mpmanager/packages/inensus/angaza-shs/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/angaza-shs/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Angaza SHS', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'shs', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/bulk-registration/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/bulk-registration/src/Services/MenuItemService.php index f97eeb48d..e9c4fe5f3 100644 --- a/Website/htdocs/mpmanager/packages/inensus/bulk-registration/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/bulk-registration/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' =>'Bulk Registration', 'url_slug' =>'/bulk-registration/bulk-registration', - 'md_icon' =>'upload_file' + 'md_icon' =>'upload_file', + 'usage_type' =>'general', ]; return ['menuItem'=>$menuItem,'subMenuItems'=>[]]; } diff --git a/Website/htdocs/mpmanager/packages/inensus/calin-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/calin-meter/src/Services/MenuItemService.php index 38377b275..de3152eda 100644 --- a/Website/htdocs/mpmanager/packages/inensus/calin-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/calin-meter/src/Services/MenuItemService.php @@ -14,7 +14,8 @@ public function createMenuItems() $menuItem = [ 'name' =>'Calin Meter', 'url_slug' =>'', - 'md_icon' =>'bolt' + 'md_icon' =>'bolt', + 'usage_type' =>'mini-grid', ]; $subMenuItems= array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php index 12f27a3a9..161c33740 100644 --- a/Website/htdocs/mpmanager/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/calin-smart-meter/src/Services/MenuItemService.php @@ -13,7 +13,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'CalinSmart Meter', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'mini-grid', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/daly-bms/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/daly-bms/src/Services/MenuItemService.php index 1bdf3e90c..4983aac20 100644 --- a/Website/htdocs/mpmanager/packages/inensus/daly-bms/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/daly-bms/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Daly Bms', 'url_slug' => '', - 'md_icon' => 'charging_station' + 'md_icon' => 'charging_station', + 'usage_type' => 'e-bike', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/gome-long-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/gome-long-meter/src/Services/MenuItemService.php index 3a613af29..372bbdef1 100644 --- a/Website/htdocs/mpmanager/packages/inensus/gome-long-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/gome-long-meter/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'GomeLong Meter', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'mini-grid', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/kelin-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/kelin-meter/src/Services/MenuItemService.php index 559872e03..86e126751 100644 --- a/Website/htdocs/mpmanager/packages/inensus/kelin-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/kelin-meter/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Kelin Meter', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'mini-grid', ]; $subMenuItems= array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/micro-star-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/micro-star-meter/src/Services/MenuItemService.php index a254caaf8..c81f3a735 100644 --- a/Website/htdocs/mpmanager/packages/inensus/micro-star-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/micro-star-meter/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' =>'MicroStar Meter', 'url_slug' =>'', - 'md_icon' =>'bolt' + 'md_icon' =>'bolt', + 'usage_type' =>'mini-grid', ]; $subMenuItems= array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/spark-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/spark-meter/src/Services/MenuItemService.php index 09baf8440..65b57077f 100644 --- a/Website/htdocs/mpmanager/packages/inensus/spark-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/spark-meter/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Spark Meter', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'mini-grid', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/steama-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/steama-meter/src/Services/MenuItemService.php index b64614ebf..abe24a8ca 100644 --- a/Website/htdocs/mpmanager/packages/inensus/steama-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/steama-meter/src/Services/MenuItemService.php @@ -13,7 +13,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Steamaco Meter', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'mini-grid', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/stron-meter/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/stron-meter/src/Services/MenuItemService.php index 2144f896a..ddd1c23b4 100644 --- a/Website/htdocs/mpmanager/packages/inensus/stron-meter/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/stron-meter/src/Services/MenuItemService.php @@ -13,7 +13,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Stron Meter', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'mini-grid', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/sun-king-shs/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/sun-king-shs/src/Services/MenuItemService.php index 458e586f8..432e08c82 100644 --- a/Website/htdocs/mpmanager/packages/inensus/sun-king-shs/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/sun-king-shs/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'SunKing SHS', 'url_slug' => '', - 'md_icon' => 'bolt' + 'md_icon' => 'bolt', + 'usage_type' => 'shs', ]; $subMenuItems = array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php index 29bc67864..428a95531 100644 --- a/Website/htdocs/mpmanager/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/swifta-payment-provider/src/Services/MenuItemService.php @@ -10,7 +10,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Swifta', 'url_slug' => '', - 'md_icon' => 'money' + 'md_icon' => 'money', + 'usage_type' => 'general', ]; $subMenuItems= array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/viber-messaging/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/viber-messaging/src/Services/MenuItemService.php index 6c0e1b52b..a36eed8b7 100644 --- a/Website/htdocs/mpmanager/packages/inensus/viber-messaging/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/viber-messaging/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'Viber Messaging', 'url_slug' => '', - 'md_icon' => 'message' + 'md_icon' => 'message', + 'usage_type' => 'general', ]; $subMenuItems= array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php index bf8c5f0e1..2d99f5a1b 100644 --- a/Website/htdocs/mpmanager/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/wave-money-payment-provider/src/Services/MenuItemService.php @@ -12,7 +12,8 @@ public function createMenuItems() $menuItem = [ 'name' => 'WaveMoney', 'url_slug' => '', - 'md_icon' => 'money' + 'md_icon' => 'money', + 'usage_type' => 'general', ]; $subMenuItems= array(); diff --git a/Website/htdocs/mpmanager/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php b/Website/htdocs/mpmanager/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php index 331487a1c..56210f7c6 100644 --- a/Website/htdocs/mpmanager/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php +++ b/Website/htdocs/mpmanager/packages/inensus/wavecom-payment-provider/src/Services/MenuItemService.php @@ -11,7 +11,8 @@ public function createMenuItems() $menuItem = [ 'name' =>'Wavecom Payment Provider', 'url_slug' =>'/wavecom/transactions', - 'md_icon' =>'upload_file' + 'md_icon' =>'upload_file', + 'usage_type' =>'general', ]; return ['menuItem'=>$menuItem,'subMenuItems'=>[]]; }