new class

3x1io · Jul 19, 2022 · 671522d · 671522d
1 parent ec430eb
commit 671522d
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Modules/Menu/Resources/MenuGroupsResource.php b/Modules/Menu/Resources/MenuGroupsResource.php
@@ -12,7 +12,7 @@ class MenuGroupsResource extends Resource
 {
     public $model = MenusGroups::class;
     public $icon = "bx bx-bookmarks";
-    public $group = "Settings";
+    public $group = "Menus";
 
     public function rows()
     {

diff --git a/Modules/Menu/Resources/MenuResource.php b/Modules/Menu/Resources/MenuResource.php
@@ -16,7 +16,7 @@ class MenuResource extends Resource
 {
     public $model = Menus::class;
     public $icon = "bx bx-menu";
-    public $group = "Settings";
+    public $group = "Menus";
 
     public function rows()
     {

diff --git a/Modules/Notifications/Providers/NotificationsServiceProvider.php b/Modules/Notifications/Providers/NotificationsServiceProvider.php
@@ -30,12 +30,12 @@ class NotificationsServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        Core::registerResource(NotificationsResource::class);
-        Core::registerResource(TemplatesResource::class);
         $this->registerTranslations();
         $this->registerConfig();
         $this->registerViews();
         $this->loadMigrationsFrom(module_path($this->moduleName, 'Database/Migrations'));
+
+        Core::loadResources($this->moduleName);
     }
 
     /**

diff --git a/Modules/Notifications/Resources/NotificationsLogsResource.php b/Modules/Notifications/Resources/NotificationsLogsResource.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Modules\Notifications\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cookie;
+use Modules\Base\Helpers\Resources\Alert;
+use Modules\Base\Helpers\Resources\Row;
+use Modules\Base\Helpers\Resources\Resource;
+use Modules\Notifications\Entities\NotificationsLogs;
+use Modules\Notifications\Helpers\SendNotification;
+use Modules\Notifications\Entities\UserNotification;
+
+class NotificationsLogsResource extends Resource
+{
+    public $model = NotificationsLogs::class;
+    public $icon = "bx bx-history";
+    public $group = "Notifications";
+
+    public function rows()
+    {
+        $this->canCreate = false;
+        $this->canEdit = false;
+        return [
+            Row::make('id')->label(__('Id '))->create(false)->edit(false)->get(),
+
+            Row::make('model_type')->list(false)->view(false)->label(__('Model Type '))->get(),
+
+            Row::make('model_id')->type('hasOne')->options([])->label(__('User'))->get(),
+
+            Row::make('title')->label(__('Title '))->get(),
+
+            Row::make('description')->list(false)->label(__('Description '))->get(),
+
+            Row::make('type')->list(false)->label(__('Type '))->get(),
+            Row::make('provider')->label(__('Provider'))->get(),
+            Row::make('created_at')->label(__('Date'))->type('datetime')->get(),
+        ];
+    }
+
+    public function afterLoad($data)
+    {
+        foreach ($data['data'] as $item) {
+            if ($item['model_id'] && $item['model_type']) {
+                $item['model_id'] = $item['model_type']::find($item['model_id']);
+            } else {
+                $item['model_id'] = "";
+            }
+            $item['template_id'] = NotifiactionsTemplates::find($item['template_id']);
+        }
+
+        return $data;
+    }
+
+    public function beforeStore(Request $request)
+    {
+        $local = Cookie::get('lang');
+        if (empty($local)) {
+            $local = "en";
+        }
+        $getRequest = $request->all();
+        $getRequest['model_type'] = $getRequest['model_type']['id'];
+        if ($getRequest['model_id']) {
+            $getRequest['model_id'] = $getRequest['model_id']['id'];
+        } else {
+            $getRequest['model_id'] = null;
+        }
+
+        SendNotification::make($getRequest['template_id']['title'][$local])
+            ->template($getRequest['template_id']['key'])
+            ->database(true)
+            ->privacy($getRequest['privacy'])
+            ->model($getRequest['model_type'])
+            ->model_id($getRequest['model_id'])
+            ->provider([$request->get('provider')])
+            ->lang($local)
+            ->send();
+
+        return Alert::make(__());
+    }
+}
diff --git a/Modules/Notifications/Resources/NotificationsResource.php b/Modules/Notifications/Resources/NotificationsResource.php
@@ -14,8 +14,8 @@
 class NotificationsResource extends Resource
 {
     public $model = UserNotification::class;
-    public $icon = "bx bx-menu";
-    public $group = "Settings";
+    public $icon = "bx bxs-bell";
+    public $group = "Notifications";
 
     public function rows()
     {

diff --git a/Modules/Notifications/Resources/TemplatesResource.php b/Modules/Notifications/Resources/TemplatesResource.php
@@ -15,8 +15,8 @@
 class TemplatesResource extends Resource
 {
     public $model = NotifiactionsTemplates::class;
-    public $icon = "bx bx-menu";
-    public $group = "Settings";
+    public $icon = "bx bxs-notification";
+    public $group = "Notifications";
 
     public function rows()
     {

diff --git a/Modules/Settings/Http/Controllers/SettingsController.php b/Modules/Settings/Http/Controllers/SettingsController.php
@@ -75,7 +75,6 @@ public function settingsSave(Request $request)
             "site_location" => "required|string",
             "site_currency" => "required|string",
             "site_language" => "required|string",
-            "sap_functionality" => "required",
         ];
         $validator = Validator::make($request->all(), $rules);
         $validator->validate();

diff --git a/public/placeholder.webp b/public/placeholder.webp
diff --git a/resources/js/Components/Themes/Main/Aside.vue b/resources/js/Components/Themes/Main/Aside.vue
@@ -64,11 +64,13 @@
                         <span class="ml-1 rtl:mr-1" v-if="!menu.lang">{{ menu.title }}</span>
                         <span class="ml-1 rtl:mr-1" v-else>{{ trans(menu.lang) }}</span>
                     </a>
+
                 </li>
                 <div
                     class="mt-6 border-b dark:border-gray-700"
                     v-if="key !== $page.props.data.menu.length - 1"
                 ></div>
+                <br>
             </ul>
         </div>
     </aside>