ソースを参照

Settings for Gozap

Rosy Stephen 3 年 前
コミット
126505c0e0

+ 2 - 2
app/Http/Controllers/Admin/AssetController.php

@@ -61,7 +61,7 @@ class AssetController extends BaseController
         
         Asset::create($requestData);
 
-        return redirect('admin/assets')->with('flash_message', 'Post added!');
+        return redirect('admin/assets')->with('flash_message', 'Assets added!');
     }
 
     /**
@@ -122,6 +122,6 @@ class AssetController extends BaseController
     {
         Asset::destroy($id);
 
-        return redirect('admin/assets')->with('flash_message', 'Post deleted!');
+        return redirect('admin/assets')->with('flash_message', 'Assets deleted!');
     }
 }

+ 37 - 0
app/Http/Controllers/Admin/SettingController.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redirect;
+use App\Models\User;
+use App\Models\Settings;
+use App\Models\UserDocuments;
+use App\Models\WalletHistoryUsers;
+use Illuminate\Support\Facades\Validator;
+
+class SettingController extends BaseController
+{
+    public function index(){
+
+        $settings = Settings::select('key', 'value')->get()->keyBy('key')->toArray();
+        //print_r($settings); exit;
+        return view('admin.settings.index', compact('settings'));
+    }
+    public function store(Request $request)
+    {
+        
+        $requestData = $request->all();
+        
+        foreach($requestData as $key => $value){
+            $setting = Settings::where('key', $key);
+            $settaingData = [
+                'key' => $key,
+                'value' => $value,
+            ];
+            $setting->update($settaingData);
+        }
+        return redirect('admin/settings')->with('flash_message', 'Settings Updated');
+    }
+}

+ 26 - 14
app/Http/Controllers/Admin/UserController.php

@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Redirect;
 use App\Models\User;
 use App\Models\UserData;
 use App\Models\UserDocuments;
+use App\Models\UserCorporate;
 use App\Models\WalletHistoryUsers;
 use Illuminate\Support\Facades\Validator;
 
@@ -30,7 +31,7 @@ class UserController extends BaseController
      */
     public function angels(){
 
-        $users = User::with('UserData')->where('user_type', '=', 'Corporate')->get();
+        $users = User::with('UserData')->where('user_type', '=', 'Driver')->get();
 
         return view('admin.users.customers', compact('users'));
     }
@@ -102,7 +103,7 @@ class UserController extends BaseController
                 'business_for' => $postData['business_for'],
             ];
             
-            $userCorporate = WalletHistoryUsers::create($userCorporate);
+            $userCorporate = UserCorporate::create($userCorporate);
         }
         if($postData['wallet_amount'] > 0){
             $walletHistory = [
@@ -114,6 +115,9 @@ class UserController extends BaseController
             
             $walletHistory = WalletHistoryUsers::create($walletHistory);
         }
+        if($postData['user_type'] == 'Driver'){
+            return Redirect::to(route('admin.angels'));
+        }
         return Redirect::to(route('admin.customers'));
         
     }
@@ -194,9 +198,29 @@ class UserController extends BaseController
             }
         }
         
+        if($postData['user_type'] == 'Driver'){
+            return Redirect::to(route('admin.angels'));
+        }
         return Redirect::to(route('admin.customers'));
         
     }
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     *
+     * @return \Illuminate\View\View
+     */
+    public function show($id)
+    {
+        $user = User::with(['UserData'])->where('id', '=', $id)->first();
+        $userDocuments = UserDocuments::where('user_id', $id)->get()->toArray();
+        $walletHistories = WalletHistoryUsers::where('user_id', $id)->get();
+        $userCorporate = UserCorporate::where('user_id', $id)->get()->toArray();
+
+
+        return view('admin.users.show', compact('user', 'userDocuments', 'walletHistories', 'userCorporate'));
+    }
     public function admin_login(Request $request){
         if (Auth::check()) {
             return Redirect::to('admin/dashboard');
@@ -240,16 +264,4 @@ class UserController extends BaseController
             return true;
         }
     }
-    /**
-     * Display the specified resource.
-     *
-     * @param  int  $id
-     *
-     * @return \Illuminate\View\View
-     */
-    public function show($id)
-    {
-        
-
-    }
 }

+ 2 - 1
app/Http/Controllers/Api/v1/LoginController.php

@@ -30,6 +30,7 @@ class LoginController extends AppController
             //Validated
             $validate = Validator::make($request->all(), 
             [
+                'user_type' => 'required',
                 'user_name' => 'required',
               //  'email' => 'required|email|unique:users,email',
                // 'password' => 'required'
@@ -56,7 +57,7 @@ class LoginController extends AppController
                     $user = User::create([
                         'phone_number' => $phoneNumber,
                         'email' => $email,
-
+                        'user_type' => $request->user_type
                     ]);
                 }else{
                     return response()->json([

+ 84 - 0
app/Http/Controllers/Api/v1/OrderController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers\Api\v1;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+use App\Http\Controllers\AppController;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use App\Models\User;
+use App\Models\UserData;
+use App\Models\UserDocuments;
+use App\Http\Resources\User as UserResource;
+
+class OrderController extends AppController
+{
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function checkout(Request $request){
+        try {
+            //Validated
+            $validate = Validator::make($request->all(), 
+            [
+                'user_type' => 'required',
+                'user_name' => 'required',
+              //  'email' => 'required|email|unique:users,email',
+               // 'password' => 'required'
+            ]);
+
+            if($validate->fails()){
+                return response()->json([
+                    'status' => false,
+                    'message' => 'validation error',
+                    'errors' => $validate->errors()
+                ], 400);
+            }
+
+        } catch (\Throwable $e) {
+            return response()->json([
+                'status' => false,
+                'message' => $e->getMessage()
+            ], 500);
+        }
+    }
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function place_order(Request $request){
+        try {
+            //Validated
+            $validate = Validator::make($request->all(), 
+            [
+                'user_type' => 'required',
+                'user_name' => 'required',
+              //  'email' => 'required|email|unique:users,email',
+               // 'password' => 'required'
+            ]);
+
+            if($validate->fails()){
+                return response()->json([
+                    'status' => false,
+                    'message' => 'validation error',
+                    'errors' => $validate->errors()
+                ], 400);
+            }
+
+        } catch (\Throwable $e) {
+            return response()->json([
+                'status' => false,
+                'message' => $e->getMessage()
+            ], 500);
+        }
+    }
+}

+ 1 - 0
app/Models/Settings.php

@@ -23,6 +23,7 @@ class Settings extends Model
     */
     protected $primaryKey = 'id';
 
+    public $timestamps = false;
     /**
      * Attributes that should be mass-assignable.
      *

+ 7 - 0
app/Models/UserCorporate.php

@@ -9,6 +9,13 @@ class UserCorporate extends Model
 {
     use HasFactory;
     
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'user_corporate';
+
     protected $fillable = [
         'user_id',
         'employee_id',

+ 4 - 0
resources/lang/en/translation.php

@@ -211,6 +211,10 @@ return [
   'Referrals' => 'Referrals',
   'CMS' => 'CMS',
   'Zap Pages' => 'Zap Pages',
+  'Settings' => 'Settings',
+  'Site Settings' => 'Site Settings',
+
+
 
 
 ];

+ 1 - 1
resources/views/admin/assets/create.blade.php

@@ -143,7 +143,7 @@
 
                     <div class="d-flex flex-wrap gap-2">
                         <button type="submit" class="btn btn-primary waves-effect waves-light">Save Changes</button>
-                        <button type="submit" class="btn btn-secondary waves-effect waves-light">Cancel</button>
+                        <a href="{{ route('assets.index') }}" class="btn btn-secondary waves-effect waves-light">Cancel</a>
                     </div>
                 </form>
 

+ 1 - 5
resources/views/admin/assets/edit.blade.php

@@ -119,8 +119,6 @@
 
                 <h4 class="card-title">Meta Data</h4>
                 <p class="card-title-desc">Fill all information below</p>
-
-                <form>
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="mb-3">
@@ -143,10 +141,8 @@
 
                     <div class="d-flex flex-wrap gap-2">
                         <button type="submit" class="btn btn-primary waves-effect waves-light">Save Changes</button>
-                        <a href="{{ route('assets.index') }}" class="btn btn-secondary waves-effect waves-light">Cancel</button>
+                        <a href="{{ route('assets.index') }}" class="btn btn-secondary waves-effect waves-light">Cancel</a>
                     </div>
-                </form>
-
             </div>
         </div>
     </form>

+ 5 - 1
resources/views/admin/assets/index.blade.php

@@ -33,7 +33,7 @@
 
                     <?php $i = 0 ?>
                     <div class="table-responsive">
-                        <table id="datatable-assets" class="table align-middle table-nowrap">
+                        <table id="datatable-buttons" class="table align-middle table-nowrap">
                             <thead>
                                 <tr>
                                     <th>#</th>
@@ -62,6 +62,10 @@
                                                     <li><a href="{{ url('edit/'. $asset->id) }}" class="dropdown-item"><i
                                                                 class="mdi mdi-trash-can font-size-16 text-danger me-1"></i>
                                                             Delete</a></li>
+                                                    <li><a href="{{ route('assets.show', ['asset' => $asset->id]) }}" class="dropdown-item"><i
+                                                                class="mdi mdi-eye font-size-16 text-danger me-1"></i>
+                                                            View</a></li>
+                                                            
                                                 </ul>
                                             </div>
                                         </td>

+ 57 - 14
resources/views/admin/assets/show.blade.php

@@ -1,22 +1,32 @@
-@extends('layouts.app')
+@extends('layouts.master')
 
+@section('title') @lang('translation.Customers') @endsection
+
+@section('css')
+    <!-- DataTables -->
+    <link href="{{ URL::asset('/assets/libs/datatables/datatables.min.css') }}" rel="stylesheet" type="text/css" />
+    <!-- <link href="https://cdn.datatables.net/searchpanes/2.1.0/css/searchPanes.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="https://cdn.datatables.net/select/1.5.0/css/select.bootstrap4.min.css" rel="stylesheet" type="text/css" /> -->
+@endsection
 @section('content')
-    <div class="container">
-        <div class="row">
-            @include('admin.sidebar')
 
-            <div class="col-md-9">
+    @component('components.breadcrumb')
+        @slot('li_1') Ecommerce @endslot
+        @slot('title') Customers @endslot
+    @endcomponent
+
+            <div class="col-md-12">
                 <div class="card">
-                    <div class="card-header">Post {{ $post->id }}</div>
+                    <div class="card-header">Asset {{ $asset->id }}</div>
                     <div class="card-body">
 
-                        <a href="{{ url('/admin/posts') }}" title="Back"><button class="btn btn-warning btn-sm"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button></a>
-                        <a href="{{ url('/admin/posts/' . $post->id . '/edit') }}" title="Edit Post"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
+                        <a href="{{ url('/admin/assets') }}" title="Back"><button class="btn btn-warning btn-sm"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button></a>
+                        <a href="{{ url('/admin/assets/' . $asset->id . '/edit') }}" title="Edit Asset"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
 
-                        <form method="POST" action="{{ url('admin/posts' . '/' . $post->id) }}" accept-charset="UTF-8" style="display:inline">
+                        <form method="POST" action="{{ url('admin/assets' . '/' . $asset->id) }}" accept-charset="UTF-8" style="display:inline">
                             {{ method_field('DELETE') }}
                             {{ csrf_field() }}
-                            <button type="submit" class="btn btn-danger btn-sm" title="Delete Post" onclick="return confirm(&quot;Confirm delete?&quot;)"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</button>
+                            <button type="submit" class="btn btn-danger btn-sm" title="Delete Asset" onclick="return confirm(&quot;Confirm delete?&quot;)"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</button>
                         </form>
                         <br/>
                         <br/>
@@ -25,9 +35,23 @@
                             <table class="table">
                                 <tbody>
                                     <tr>
-                                        <th>ID</th><td>{{ $post->id }}</td>
+                                        <th>ID</th><td>{{ $asset->id }}</td>
                                     </tr>
-                                    <tr><th> Vendor Id </th><td> {{ $post->vendor_id }} </td></tr><tr><th> Category Id </th><td> {{ $post->category_id }} </td></tr><tr><th> Name </th><td> {{ $post->name }} </td></tr>
+                                    <!--<tr><th> Vendor Id </th><td> {{ $asset->vendor_id }} </td></tr><tr><th> Category Id </th><td> {{ $asset->category_id }} </td></tr>-->
+                                    <tr><th> Name </th><td> {{ $asset->name }} </td></tr>
+                                    <tr><th>Manufacturer Name </th><td> {{ $asset->manufacturer_name }} </td></tr>
+                                    <tr><th>Model Name </th><td> {{ $asset->model_name }} </td></tr>
+                                    <tr><th>Model Number </th><td> {{ $asset->model_number }} </td></tr>
+                                    <tr><th>Registered Name </th><td> {{ $asset->registered_number }} </td></tr>
+                                    <tr><th> Brand </th><td> {{ $asset->brand }} </td></tr>
+                                    <tr><th> Duration </th><td> {{ $asset->duration }} </td></tr>
+                                    <tr><th> Asset Type </th><td> {{ $asset->asset_type }} </td></tr>
+                                    <tr><th> Cost </th><td> {{ $asset->cost }} </td></tr>
+                                    <tr><th> Description </th><td> {{ $asset->description }} </td></tr>
+                                    <tr><th> Image </th><td><img src="{{ $asset->image }}" /> </td></tr>
+                                    <tr><th> Name </th><td> {{ $asset->slug }} </td></tr>
+
+
                                 </tbody>
                             </table>
                         </div>
@@ -35,6 +59,25 @@
                     </div>
                 </div>
             </div>
-        </div>
-    </div>
+    <!-- end row -->
+@endsection
+@section('script')
+    <!-- Required datatable js -->
+    <script src="{{ URL::asset('/assets/libs/datatables/datatables.min.js') }}"></script>
+    <script src="{{ URL::asset('/assets/libs/jszip/jszip.min.js') }}"></script>
+    <script src="{{ URL::asset('/assets/libs/pdfmake/pdfmake.min.js') }}"></script>
+    <!-- Datatable init js -->
+    <script src="{{ URL::asset('/assets/js/pages/datatables.init.js') }}"></script>
+    <!-- <script src="https://cdn.datatables.net/searchpanes/2.1.0/js/dataTables.searchPanes.min.js"></script>
+    <script src="https://cdn.datatables.net/searchpanes/2.1.0/js/searchPanes.bootstrap4.min.js"></script>
+    <script src="https://cdn.datatables.net/select/1.5.0/js/dataTables.select.min.js"></script> -->
+    <script type="text/javascript">
+        $(document).ready(function(){
+            // var table = $('#datatable-assets').DataTable({
+            //     searchPanes: true
+            // });
+            // table.searchPanes.container().prependTo(table.table().container());
+            // table.searchPanes.resizePanes();
+        });
+    </script>
 @endsection

+ 235 - 0
resources/views/admin/settings/index.blade.php

@@ -0,0 +1,235 @@
+@extends('layouts.master')
+
+@section('title') @lang('translation.Add_Asset') @endsection
+
+@section('css')
+<!-- select2 css -->
+<link href="{{ URL::asset('/assets/libs/select2/select2.min.css') }}" rel="stylesheet" type="text/css" />
+
+<!-- dropzone css -->
+<link href="{{ URL::asset('/assets/libs/dropzone/dropzone.min.css') }}" rel="stylesheet" type="text/css" />
+@endsection
+
+@section('content')
+
+@component('components.breadcrumb')
+@slot('li_1') Ecommerce @endslot
+@slot('title') Settings @endslot
+@endcomponent
+
+
+<form  class="needs-validation" id="settings_form" action="{{ route('settings.store') }}" method="post" enctype="multipart/form-data" novalidate>
+@csrf
+    <div class="row">
+        <div class="col-12">
+            <div class="card">
+                <div class="card-body">
+
+                    <h4 class="card-title">Settings</h4>
+                    
+
+                    <!-- Nav tabs -->
+                    <ul class="nav nav-tabs" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-bs-toggle="tab" href="#site_settings" role="tab">
+                                <span class="d-block d-sm-none"><i class="fas fa-home"></i></span>
+                                <span class="d-none d-sm-block">Site Settings</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-bs-toggle="tab" href="#email_settings" role="tab">
+                                <span class="d-block d-sm-none"><i class="far fa-user"></i></span>
+                                <span class="d-none d-sm-block">Email Settings</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-bs-toggle="tab" href="#web_settings" role="tab">
+                                <span class="d-block d-sm-none"><i class="far fa-envelope"></i></span>
+                                <span class="d-none d-sm-block">Web Settings</span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-bs-toggle="tab" href="#location" role="tab">
+                                <span class="d-block d-sm-none"><i class="fas fa-cog"></i></span>
+                                <span class="d-none d-sm-block">Location</span>
+                            </a>
+                        </li>
+                    </ul>
+
+                    <!-- Tab panes -->
+                    <div class="tab-content p-3 text-muted">
+                        <div class="tab-pane active" id="site_settings" role="tabpanel">
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label for="site_name" class="form-label">Site Name</label>
+                                    <input type="text" name="site_name" class="form-control" id="site_name" placeholder="Enter Your First Name" value="{{ $settings['site_name']['value']}}" />
+                                    <div id="first_name_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="site_title" class="form-label">Site Title</label>
+                                    <input type="text" name="site_title" class="form-control" id="site_title" placeholder="Enter Your First Name" value="{{ $settings['site_title']['value']}}" />
+                                    <div id="first_name_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="site_url" class="form-label">Site Url</label>
+                                    <input type="text" name="site_url" class="form-control" id="site_url" placeholder="Enter Your First Name" value="{{ $settings['site_url']['value']}}" />
+                                    <div id="first_name_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="site_logo" class="form-label">Site Lgogo</label>
+                                    <input type="file" name="site_logo" class="form-control" id="site_logo" />
+                                    <img src="{{ $settings['site_logo']['value'] }}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="site_icon" class="form-label">Site Icon</label>
+                                    <input type="file" name="site_icon" class="form-control" id="site_icon" />
+                                    <img src="{{ $settings['site_icon']['value'] }}" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="tab-pane" id="email_settings" role="tabpanel">
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label for="smtp_host" class="form-label">Host Name</label>
+                                    <input type="text" name="smtp_host" class="form-control" id="smtp_host" placeholder="Enter Your Host Name" value="{{ $settings['smtp_host']['value']}}" />
+                                    <div id="smtp_host_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="smtp_user" class="form-label">SMTP Username</label>
+                                    <input type="text" name="smtp_user" class="form-control" id="smtp_user" placeholder="Enter Your SMTP Username" value="{{ $settings['smtp_user']['value']}}" />
+                                    <div id="smtp_user_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="smtp_password" class="form-label">SMTP Password</label>
+                                    <input type="text" name="smtp_password" class="form-control" id="smtp_password" placeholder="Enter Your SMTP Password" value="{{ $settings['smtp_password']['value']}}" />
+                                    <div id="smtp_password_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="smtp_port" class="form-label">SMTP Port</label>
+                                    <input type="text" name="smtp_port" class="form-control" id="smtp_port" placeholder="Enter Your SMTP Port" value="{{ $settings['smtp_port']['value']}}" />
+                                    <div id="smtp_port_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                
+                                <div class="mb-3">
+                                    <label for="contact_us_email" class="form-label">Contact Us Receive Email</label>
+                                    <input type="text" name="contact_us_email" class="form-control" id="contact_us_email" placeholder="Enter Your Contact Us Receive Email" value="{{ $settings['contact_us_email']['value']}}" />
+                                    <div id="contact_us_email_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="admin_email" class="form-label">Admin Email</label>
+                                    <input type="text" name="admin_email" class="form-control" id="admin_email" placeholder="Enter Your First Name" value="{{ $settings['admin_email']['value']}}" />
+                                    <div id="admin_email_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="site_email_logo" class="form-label">Email Logo</label>
+                                    <input type="file" name="site_email_logo" class="form-control" id="site_email_logo" />
+                                    <img src="{{ $settings['site_email_logo']['value'] }}" />
+                                </div>
+                            </div>
+                        </div>
+                        <div class="tab-pane" id="web_settings" role="tabpanel">
+                        <div class="row">
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label for="site_copyright" class="form-label">Site Copy Right text</label>
+                                    <input type="text" name="site_copyright" class="form-control" id="site_copyright" placeholder="Enter Your Host Name" value="{{ $settings['site_copyright']['value']}}" />
+                                    <div id="smtp_host_errors" class="invalid-feedback">
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <label for="default_lang" class="form-label">Default Language</label>
+                                    <input type="text" name="default_lang" class="form-control" id="default_lang" placeholder="Enter Your SMTP Username" value="{{ $settings['default_lang']['value']}}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="currency" class="form-label">Currency Symbol</label>
+                                    <input type="text" name="currency" class="form-control" id="currency" placeholder="Enter Your SMTP Username" value="{{ $settings['currency']['value']}}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="country_code" class="form-label">Country Code</label>
+                                    <input type="text" name="country_code" class="form-control" id="country_code" placeholder="Enter Your Country Code" value="{{ $settings['country_code']['value']}}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="date_format" class="form-label">Date Format</label>
+                                    <input type="text" name="date_format" class="form-control" id="date_format" placeholder="Enter Your ate Format" value="{{ $settings['date_format']['value']}}" />
+                                </div>
+                            </div>
+                            <div class="col-lg-6">
+                                <div class="mb-3">
+                                    <label for="facebook_link" class="form-label">Face Book Link</label>
+                                    <input type="text" name="facebook_link" class="form-control" id="facebook_link" placeholder="Enter Your SMTP Password" value="{{ $settings['facebook_link']['value']}}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="twitter_link" class="form-label">Twitter Link</label>
+                                    <input type="text" name="twitter_link" class="form-control" id="twitter_link" placeholder="Enter Your SMTP Port" value="{{ $settings['twitter_link']['value']}}" />
+                                </div>
+                                
+                                <div class="mb-3">
+                                    <label for="instagram_link" class="form-label">Instagram Link</label>
+                                    <input type="text" name="instagram_link" class="form-control" id="instagram_link" placeholder="Enter Your Contact Us Receive Email" value="{{ $settings['instagram_link']['value']}}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="google_play_store" class="form-label">Google Play Store Link</label>
+                                    <input type="text" name="google_play_store" class="form-control" id="google_play_store" placeholder="Enter Your Contact Google Play Store Link" value="{{ $settings['google_play_store']['value']}}" />
+                                </div>
+                                <div class="mb-3">
+                                    <label for="apple_store" class="form-label">Apple Sore Link</label>
+                                    <input type="text" name="apple_store" class="form-control" id="apple_store" placeholder="Enter Your Apple Sore Link" value="{{ $settings['apple_store']['value']}}" />
+                                </div>
+                            </div>
+                        </div>
+                        </div>
+                        
+                        <div class="tab-pane" id="location" role="tabpanel">
+                            <div class="row">
+                                <div class="col-lg-6">
+                                    <div class="mb-3">
+                                        <label for="google_map_api_id" class="form-label">Google Map API key</label>
+                                        <input type="text" name="google_map_api_id" class="form-control" id="google_map_api_id" value="{{ $settings['google_map_api_id']['value'] }}" />
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                    </div>
+
+                    <div class="d-flex flex-wrap gap-2">
+                        <button type="submit" class="btn btn-primary waves-effect waves-light">Save Changes</button>
+                        <a href="{{ route('settings.index') }}" class="btn btn-secondary waves-effect waves-light">Cancel</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+<!-- end row -->
+
+@endsection
+@section('script')
+    <!-- select 2 plugin -->
+    <script src="{{ URL::asset('/assets/libs/select2/select2.min.js') }}"></script>
+
+    <!-- dropzone plugin -->
+    <script src="{{ URL::asset('/assets/libs/dropzone/dropzone.min.js') }}"></script>
+
+    <!-- init js -->
+    <script src="{{ URL::asset('/assets/js/pages/ecommerce-select2.init.js') }}"></script>
+    <!--tinymce js-->
+    <script src="{{ URL::asset('/assets/libs/tinymce/tinymce.min.js') }}"></script>
+
+    <!-- init js -->
+    <script src="{{ URL::asset('/assets/js/pages/form-editor.init.js') }}"></script>
+    <script src="{{ URL::asset('/assets/libs/parsleyjs/parsleyjs.min.js') }}"></script>
+
+    <script src="{{ URL::asset('/assets/js/pages/form-validation.init.js') }}"></script>
+    <script type="text/javascript">
+    
+@endsection

+ 3 - 0
resources/views/admin/users/customers.blade.php

@@ -70,6 +70,9 @@
                                                     <li><a href="{{ route('user.destroy', ['user' => $user->id] ) }}" class="dropdown-item"><i
                                                                 class="mdi mdi-trash-can font-size-16 text-danger me-1"></i>
                                                             Delete</a></li>
+                                                    <li><a href="{{ route('user.show', ['user' => $user->id]) }}" class="dropdown-item"><i
+                                                                class="mdi mdi-eye font-size-16 text-danger me-1"></i>
+                                                            View</a></li>
                                                 </ul>
                                             </div>
                                         </td>

+ 119 - 0
resources/views/admin/users/show.blade.php

@@ -0,0 +1,119 @@
+@extends('layouts.master')
+
+@section('title') @lang('translation.Customers') @endsection
+
+@section('css')
+    <!-- DataTables -->
+    <link href="{{ URL::asset('/assets/libs/datatables/datatables.min.css') }}" rel="stylesheet" type="text/css" />
+    <!-- <link href="https://cdn.datatables.net/searchpanes/2.1.0/css/searchPanes.bootstrap4.min.css" rel="stylesheet" type="text/css" />
+    <link href="https://cdn.datatables.net/select/1.5.0/css/select.bootstrap4.min.css" rel="stylesheet" type="text/css" /> -->
+@endsection
+@section('content')
+
+    @component('components.breadcrumb')
+        @slot('li_1') Ecommerce @endslot
+        @slot('title') {{ $user->user_type }} @endslot
+    @endcomponent
+
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header">Asset {{ $user->id }}</div>
+                    <div class="card-body">
+
+                        @if($user->user_type == 'Subscribers' || $user->user_type == 'Corporate')
+                            <?php $link = route('admin.customers') ?>
+                        @elseif($user->user_type == 'Driver')
+                        <?php  $link = route('admin.angels') ?>
+                        @else
+                        <?php  $link = '#' ?>
+                        @endif
+
+                        <a href="{{ $link }}" title="Back"><button class="btn btn-warning btn-sm"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button></a>
+                        <a href="{{ url('/admin/assets/' . $user->id . '/edit') }}" title="Edit Asset"><button class="btn btn-primary btn-sm"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit</button></a>
+
+                        <form method="POST" action="{{ url('admin/assets' . '/' . $user->id) }}" accept-charset="UTF-8" style="display:inline">
+                            {{ method_field('DELETE') }}
+                            {{ csrf_field() }}
+                            <button type="submit" class="btn btn-danger btn-sm" title="Delete Asset" onclick="return confirm(&quot;Confirm delete?&quot;)"><i class="fa fa-trash-o" aria-hidden="true"></i> Delete</button>
+                        </form>
+                        <br/>
+                        <br/>
+
+                        <div class="table-responsive">
+                            <table class="table">
+                                <tbody>
+                                    <tr><th>ID</th><td>{{ $user->id }}</td></tr>
+                                    <tr><th> Name </th><td> {{ $user->name }} </td></tr>
+                                    <tr><th>Email</th><td> {{ $user->email }} </td></tr>
+                                    <tr><th>User Country Code</th><td> {{ $user->userData->user_country_code }} </td></tr>
+                                    <tr><th>Phone Number</th><td> {{ $user->phone_number }} </td></tr>
+                                    <tr><th>User Type </th><td> {{ $user->user_type }} </td></tr>
+                                    <tr><th>Referral Code</th><td> {{ $user->userData->referral_code }} </td></tr>
+                                    <tr><th>Referred By</th><td> {{ $user->userData->referred_by }} </td></tr>
+                                    <tr><th> Wallet Amount </th><td> {{ $user->userData->wallet_amount }}  </td></tr>
+                                    <tr><th> Device Type </th><td> {{ $user->userData->device_type }}  </td></tr>
+                                    <tr><th> Device ID </th><td> {{ $user->userData->device_id }}  </td></tr>
+                                    <tr><th> Image </th><td> {{ $user->userData->image }}  </td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+
+                        <h4>Wallet Histry</h4>
+                        <?php $i=0 ?> 
+                        <div class="table-responsive">
+                            <table id="datatable" class="table align-middle table-nowrap">
+                                <thead>
+                                    <tr>
+                                        <th>#</th>
+                                        <th>Transaction Type</th>
+                                        <th> Purpose</th>
+                                        <th> Transaction Details</th>
+                                        <th>Transaction ID</th>
+                                        <th>Amount</th>
+                                        <th>Amount Added At</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                @if($walletHistories)
+                                    @foreach ($walletHistories as $walletHistory)
+                                        <tr>
+                                            <td>{{ ++$i }}</td>
+                                            <td>{{ $walletHistory->transaction_type }}</td>
+                                            <td>{{ $walletHistory->purpose }}</td>
+                                            <td>{{ $walletHistory->transaction_details }}</td>
+                                            <td>{{ $walletHistory->UserData }}</td>
+                                            <td>{{ $walletHistory->transaction_id }}</td>
+                                            <td>{{ $walletHistory->amount }}</td>
+                                            <td>{{ $walletHistory->created_at }}</td>
+
+                                        </tr>
+                                    @endforeach
+                                @endif
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+    <!-- end row -->
+@endsection
+@section('script')
+    <!-- Required datatable js -->
+    <script src="{{ URL::asset('/assets/libs/datatables/datatables.min.js') }}"></script>
+    <script src="{{ URL::asset('/assets/libs/jszip/jszip.min.js') }}"></script>
+    <script src="{{ URL::asset('/assets/libs/pdfmake/pdfmake.min.js') }}"></script>
+    <!-- Datatable init js -->
+    <script src="{{ URL::asset('/assets/js/pages/datatables.init.js') }}"></script>
+    <!-- <script src="https://cdn.datatables.net/searchpanes/2.1.0/js/dataTables.searchPanes.min.js"></script>
+    <script src="https://cdn.datatables.net/searchpanes/2.1.0/js/searchPanes.bootstrap4.min.js"></script>
+    <script src="https://cdn.datatables.net/select/1.5.0/js/dataTables.select.min.js"></script> -->
+    <script type="text/javascript">
+        $(document).ready(function(){
+            // var table = $('#datatable-assets').DataTable({
+            //     searchPanes: true
+            // });
+            // table.searchPanes.container().prependTo(table.table().container());
+            // table.searchPanes.resizePanes();
+        });
+    </script>
+@endsection

+ 2 - 2
resources/views/layouts/footer.blade.php

@@ -2,11 +2,11 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-sm-6">
-                <script>document.write(new Date().getFullYear())</script> © Skote.
+                <script>document.write(new Date().getFullYear())</script> © Go-zap.
             </div>
             <div class="col-sm-6">
                 <div class="text-sm-end d-none d-sm-block">
-                    Design & Develop by Themesbrand
+                    gozap......
                 </div>
             </div>
         </div>

+ 14 - 5
resources/views/layouts/sidebar.blade.php

@@ -21,8 +21,8 @@
                         <span key="t-dashboards">@lang('translation.Location')</span>
                     </a>
                     <ul class="sub-menu" aria-expanded="false">
-                        <li><a href="calendar" key="t-tui-calendar">@lang('translation.TUI_Calendar')</a></li>
-                        <li><a href="calendar-full" key="t-full-calendar">@lang('translation.Full_Calendar')</a></li>
+                        <li><a href="calendar" key="t-tui-calendar">@lang('translation.User Location')</a></li>
+                        <li><a href="calendar-full" key="t-full-calendar">@lang('translation.Driver Location')</a></li>
                     </ul>
                 </li>
                 <li>
@@ -57,7 +57,7 @@
                 </li>
                 <li>
                     <a href="javascript: void(0);" class="has-arrow waves-effect">
-                        <i class="bx bxs-user-detail"></i>
+                        <i class="bx bx-cart-alt"></i>
                         <span key="t-dashboards">@lang('translation.Orders')</span>
                     </a>
                     <ul class="sub-menu" aria-expanded="false">
@@ -67,7 +67,7 @@
                 </li>
                 <li>
                     <a href="javascript: void(0);" class="has-arrow waves-effect">
-                        <i class="bx bxs-user-detail"></i>
+                        <i class="bx bx-receipt"></i>
                         <span key="t-dashboards">@lang('translation.Reports')</span>
                     </a>
                     <ul class="sub-menu" aria-expanded="false">
@@ -88,12 +88,21 @@
                 <li>
                     <a href="javascript: void(0);" class="has-arrow waves-effect">
                         <i class="bx bxs-user-detail"></i>
-                        <span key="t-dashboards">@lang('translation.CMS')</span>
+                        <span key="t-cms">@lang('translation.CMS')</span>
                     </a>
                     <ul class="sub-menu" aria-expanded="false">
                         <li><a href="{{ route('zap-pages.index')}}" key="t-tui-calendar">@lang('translation.Zap Pages')</a></li>
                     </ul>
                 </li>
+                <li>
+                    <a href="javascript: void(0);" class="has-arrow waves-effect">
+                        <i class="bx bx-cog"></i>
+                        <span key="t-settings">@lang('translation.Settings')</span>
+                    </a>
+                    <ul class="sub-menu" aria-expanded="false">
+                        <li><a href="{{ route('settings.index')}}" key="t-tui-calendar">@lang('translation.Site Settings')</a></li>
+                    </ul>
+                </li>
 
             </ul>
         </div>

+ 6 - 0
routes/web.php

@@ -77,6 +77,8 @@ Route::group([
         ->name('list_usersss');
     Route::get('users/delete-kyc/{id}', [Admin::class, 'destroyUserDoc'])->name('user.delete-kyc');
     Route::get('/users/destroy/{user}', [Admin::class, 'customers'])->name('user.destroy');
+    Route::get('/users/{user}/show', [Admin::class, 'show'])->name('user.show');
+
 
 
     Route::resource('assets', 'App\Http\Controllers\Admin\AssetController');
@@ -92,6 +94,10 @@ Route::group([
     Route::get('zap-pages/delete-form-button/{id}', [App\Http\Controllers\Admin\CmsController::class, 'destroyFormButton'])->name('zap-pages.delete-form-button');
 
 
+    
+    Route::get('settings', [App\Http\Controllers\Admin\SettingController::class, 'index'])->name('settings.index');
+    Route::post('settings/store', [App\Http\Controllers\Admin\SettingController::class, 'store'])->name('settings.store');
+