feat: separated all modals

kamgrzeski · Sep 11, 2024 · 45bc205 · 45bc205
1 parent e1103d8
commit 45bc205
Show file tree

Hide file tree

Showing 23 changed files with 163 additions and 208 deletions.
diff --git a/app/Http/Controllers/CRM/ProductsController.php b/app/Http/Controllers/CRM/ProductsController.php
@@ -130,7 +130,7 @@ public function processDeleteProduct(ProductsModel $product): \Illuminate\Http\R
     {
         // Check if the product has any sales records.
         if ($product->sales()->count() > 0) {
-            return redirect()->back()->with('message_error', $this->getMessage('messages.ProductsCannotBeDeleted'));
+            return redirect()->back()->with('message_error', $this->getMessage('messages.product_first_delete_sales'));
         }
 
         // Delete the product.

diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
@@ -55,4 +55,5 @@
     'product_store' => 'Product has been added.',
     'product_delete' => 'Product has been deleted.',
     'product_update' => 'Product has been deactivated.',
+    'product_first_delete_sales' => 'Cannot delete this product, have assigned sales.',
 ];
diff --git a/resources/views/crm/clients/modals/delete_client_modal.blade.php b/resources/views/crm/clients/modals/delete_client_modal.blade.php
@@ -0,0 +1,19 @@
+<div class="modal fade" id="deleteClientModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">You want delete this client?</h4>
+            </div>
+            <div class="modal-body">
+                Action will delete permanently this client.
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal" style="margin-right: 15px;">
+                    Close
+                </button>
+                @include('crm.clients.forms.delete_client_form')
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/crm/clients/show.blade.php b/resources/views/crm/clients/show.blade.php
@@ -14,14 +14,14 @@
                     <ul class="nav nav-tabs">
                         <li class="active"><a href="#home" data-toggle="tab">Basic information</a>
                         </li>
-                        <li class=""><a href="#profile" data-toggle="tab">Assigned companies <span
-                                        class="badge badge-warning">{{ count($clientDetails->companies) }}</span></a>
+                        <li class="">
+                            <a href="#profile" data-toggle="tab">Assigned companies <span class="badge badge-warning">{{ count($clientDetails->companies) }}</span></a>
                         </li>
-                        <li class=""><a href="#messages" data-toggle="tab">Assigned employees <span
-                                        class="badge badge-warning">{{ count($clientDetails->employees) }}</span></a>
+                        <li class="">
+                            <a href="#messages" data-toggle="tab">Assigned employees <span class="badge badge-warning">{{ count($clientDetails->employees) }}</span></a>
                         </li>
                         <div class="text-right">
-                            <button class="btn btn-danger" data-toggle="modal" data-target="#myModal">
+                            <button class="btn btn-danger" data-toggle="modal" data-target="#deleteClientModal">
                                 Delete this client
                                 <li class="fa fa-trash-o"></li>
                             </button>
@@ -51,8 +51,7 @@ class="badge badge-warning">{{ count($clientDetails->employees) }}</span></a>
                                 <tr>
                                     <th>Budget</th>
                                     <td>
-                                        <button type="submit"
-                                                class="btn btn-default">{{ $clientDetails->formattedBudget }}</button>
+                                        <button type="submit" class="btn btn-default">{{ $clientDetails->formattedBudget }}</button>
                                     </td>
                                 </tr>
                                 <tr>
@@ -114,23 +113,6 @@ class="btn btn-default">{{ $clientDetails->formattedBudget }}</button>
             </div>
         </div>
     </div>
-    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="myModalLabel">You want delete this client?</h4>
-                </div>
-                <div class="modal-body">
-                    Action will delete permanently this client.
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal" style="margin-right: 15px;">
-                        Close
-                    </button>
-                    @include('crm.clients.forms.delete_client_form')
-                </div>
-            </div>
-        </div>
-    </div>
+
+    @include('crm.clients.modals.delete_client_modal')
 @endsection
diff --git a/resources/views/crm/companies/index.blade.php b/resources/views/crm/companies/index.blade.php
@@ -50,14 +50,12 @@
                                     <td class="text-center">
                                             @if($value->is_active)
                                                 <label class="switch">
-                                                    <input type="checkbox"
-                                                           onchange='window.location.assign("{{ URL::to('companies/set-active/' . $value->id . '/0') }}")' checked>
+                                                    <input type="checkbox" onchange='window.location.assign("{{ URL::to('companies/set-active/' . $value->id . '/0') }}")' checked>
                                                     <span class="slider"></span>
                                                 </label>
                                             @else
                                                 <label class="switch">
-                                                    <input type="checkbox"
-                                                           onchange='window.location.assign("{{ URL::to('companies/set-active/' . $value->id . '/1') }}")'>
+                                                    <input type="checkbox" onchange='window.location.assign("{{ URL::to('companies/set-active/' . $value->id . '/1') }}")'>
                                                     <span class="slider"></span>
                                                 </label>
                                             @endif

diff --git a/resources/views/crm/companies/modals/delete_company_modal.blade.php b/resources/views/crm/companies/modals/delete_company_modal.blade.php
@@ -0,0 +1,16 @@
+<div class="modal fade" id="deleteCompanyModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">You want delete this company?</h4>
+            </div>
+            <div class="modal-body">
+                Action will delete permanently this company.
+            </div>
+            <div class="modal-footer">
+                @include('crm.companies.forms.delete_company_form')
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/crm/companies/show.blade.php b/resources/views/crm/companies/show.blade.php
@@ -16,18 +16,17 @@
                 </div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs">
-                        <li class="active"><a href="#home" data-toggle="tab">Basic information</a>
+                        <li class="active">
+                            <a href="#home" data-toggle="tab">Basic information</a>
                         </li>
                         <div class="text-right">
-                            <button class="btn btn-danger" data-toggle="modal" data-target="#myModal">
+                            <button class="btn btn-danger" data-toggle="modal" data-target="#deleteCompanyModal">
                                 Delete this company <li class="fa fa-trash-o"></li>
                             </button>
                         </div>
                     </ul>
                     <div class="tab-content">
                         <div class="tab-pane fade active in" id="home">
-
-
                             <table class="table table-striped table-bordered">
                                 <tbody class="text-right">
                                 <tr>
@@ -91,20 +90,6 @@
             </div>
         </div>
     </div>
-    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="myModalLabel">You want delete this company?</h4>
-                </div>
-                <div class="modal-body">
-                    Action will delete permanently this company.
-                </div>
-                <div class="modal-footer">
-                    @include('crm.companies.forms.delete_company_form')
-                </div>
-            </div>
-        </div>
-    </div>
+
+    @include('crm.companies.modals.delete_company_modal')
 @endsection
diff --git a/resources/views/crm/deals/create.blade.php b/resources/views/crm/deals/create.blade.php
@@ -9,8 +9,7 @@
 @section('content')
     @if(count($companies) == 0)
         <div class="alert alert-danger">
-            <strong>Danger!</strong> There is no company in system. Please create one. <a
-                    href="{{ URL::to('companies/create') }}">Click here!</a>
+            <strong>Danger!</strong> There is no company in system. Please create one. <a href="{{ URL::to('companies/create') }}">Click here!</a>
         </div>
     @endif
 

diff --git a/resources/views/crm/deals/show.blade.php b/resources/views/crm/deals/show.blade.php
@@ -17,11 +17,14 @@
 
                 <div class="panel-body">
                     <ul class="nav nav-tabs">
-                        <li class="active"><a href="#home" data-toggle="tab">The basic information</a>
+                        <li class="active">
+                            <a href="#home" data-toggle="tab">The basic information</a>
                         </li>
-                        <li class=""><a href="#profile" data-toggle="tab">Company</a>
+                        <li class="">
+                            <a href="#profile" data-toggle="tab">Company</a>
                         </li>
-                        <li class=""><a href="#storeDealTerm" data-toggle="tab">Terms of agreement <span class="badge badge-danger">VERY IMPORTANT</span></a>
+                        <li class="">
+                            <a href="#storeDealTerm" data-toggle="tab">Terms of agreement <span class="badge badge-danger">VERY IMPORTANT</span></a>
                         </li>
                         <div class="text-right">
                             <button class="btn btn-danger" data-toggle="modal" data-target="#deleteDealTermModal">
@@ -32,8 +35,6 @@
 
                     <div class="tab-content">
                         <div class="tab-pane fade active in" id="home">
-
-
                             <table class="table table-striped table-bordered">
                                 <tbody class="text-right">
                                 <tr>

diff --git a/resources/views/crm/employees/index.blade.php b/resources/views/crm/employees/index.blade.php
@@ -45,22 +45,19 @@
                                     <td class="text-center">
                                             @if($value->is_active)
                                                 <label class="switch">
-                                                    <input type="checkbox"
-                                                           onchange='window.location.assign("{{ URL::to('employees/set-active/' . $value->id . '/0') }}")' checked>
+                                                    <input type="checkbox" onchange='window.location.assign("{{ URL::to('employees/set-active/' . $value->id . '/0') }}")' checked>
                                                     <span class="slider"></span>
                                                 </label>
                                             @else
                                                 <label class="switch">
-                                                    <input type="checkbox"
-                                                           onchange='window.location.assign("{{ URL::to('employees/set-active/' . $value->id . '/1') }}")'>
+                                                    <input type="checkbox" onchange='window.location.assign("{{ URL::to('employees/set-active/' . $value->id . '/1') }}")'>
                                                     <span class="slider"></span>
                                                 </label>
                                             @endif
                                     </td>
                                     <td class="text-right" style="text-align: center">
                                         <div class="btn-group">
-                                            <a class="btn btn-small btn-primary"
-                                               href="{{ URL::to('employees/view/' . $value->id) }}">More information</a>
+                                            <a class="btn btn-small btn-primary" href="{{ URL::to('employees/view/' . $value->id) }}">More information</a>
                                             <button data-toggle="dropdown" class="btn btn-primary dropdown-toggle"><span class="caret"></span></button>
                                             <ul class="dropdown-menu">
                                                 <li><a href="{{ URL::to('employees/form/update/' . $value->id) }}">Edit</a></li>

diff --git a/resources/views/crm/employees/modals/delete_employee_modal.blade.php b/resources/views/crm/employees/modals/delete_employee_modal.blade.php
@@ -0,0 +1,16 @@
+<div class="modal fade" id="deleteEmployeeModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <h4 class="modal-title" id="myModalLabel">You want delete this employee?</h4>
+            </div>
+            <div class="modal-body">
+                Action will delete permanently this employees.
+            </div>
+            <div class="modal-footer">
+                @include('crm.employees.forms.delete_employee')
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/crm/employees/show.blade.php b/resources/views/crm/employees/show.blade.php
@@ -16,22 +16,21 @@
                 </div>
                 <div class="panel-body">
                     <ul class="nav nav-tabs">
-                        <li class="active"><a href="#home" data-toggle="tab">Basic information</a>
+                        <li class="active">
+                            <a href="#home" data-toggle="tab">Basic information</a>
                         </li>
-                        <li class=""><a href="#profile" data-toggle="tab">Tasks <span
-                                        class="badge badge-warning">{{ $employee->taskCount }}</span></a>
+                        <li class="">
+                            <a href="#profile" data-toggle="tab">Tasks <span class="badge badge-warning">{{ $employee->taskCount }}</span></a>
                         </li>
                         <div class="text-right">
-                            <button class="btn btn-danger" data-toggle="modal" data-target="#myModal">
+                            <button class="btn btn-danger" data-toggle="modal" data-target="#deleteEmployeeModal">
                                 Delete this employee <li class="fa fa-trash-o"></li>
                             </button>
                         </div>
                     </ul>
 
                     <div class="tab-content">
                         <div class="tab-pane fade active in" id="home">
-
-
                             <table class="table table-striped table-bordered">
                                 <tbody class="text-right">
                                 <tr>
@@ -69,22 +68,21 @@ class="badge badge-warning">{{ $employee->taskCount }}</span></a>
                             </table>
                         </div>
                         <div class="tab-pane fade" id="profile">
-                            <br>
                             <table class="table table-striped table-bordered table-hover" id="dataTables-example" data-sortable>
                                 <thead>
                                 <tr>
                                     <th>Name</th>
                                     <th>Action</th>
                                 </tr>
                                 </thead>
-                                </tr>
                                 @foreach($employee->tasks as $tasks)
                                     <tbody>
                                     <tr class="odd gradeX">
                                         <td>{{ $tasks->name }}</td>
                                         <td>
                                             <a class="btn btn-small btn-primary" href="{{ URL::to('tasks/view/' . $tasks->id) }}">More information</a>
                                         </td>
+                                    </tr>
                                     @endforeach
                                     </tbody>
                             </table>
@@ -95,20 +93,5 @@ class="badge badge-warning">{{ $employee->taskCount }}</span></a>
         </div>
     </div>
 
-    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">&times;</button>
-                    <h4 class="modal-title" id="myModalLabel">You want delete this employee?</h4>
-                </div>
-                <div class="modal-body">
-                    Action will delete permanently this employees.
-                </div>
-                <div class="modal-footer">
-                    @include('crm.employees.forms.delete_employee')
-                </div>
-            </div>
-        </div>
-    </div>
+    @include('crm.employees.modals.delete_employee_modal')
 @endsection
diff --git a/resources/views/crm/finances/create.blade.php b/resources/views/crm/finances/create.blade.php
@@ -9,8 +9,7 @@
 @section('content')
     @if(count($companies) == 0)
         <div class="alert alert-danger">
-            <strong>Danger!</strong> There is no companies in system. Please create any client. <a
-                    href="{{ URL::to('companies/create') }}">Click here!</a>
+            <strong>Danger!</strong> There is no companies in system. Please create any client. <a href="{{ URL::to('companies/create') }}">Click here!</a>
         </div>
     @endif
 

diff --git a/resources/views/crm/finances/edit.blade.php b/resources/views/crm/finances/edit.blade.php
@@ -1,10 +1,10 @@
 @extends('layouts.base')
 
-@section('caption', 'Edit empoloyees')
+@section('caption', 'Edit employees')
 
-@section('title', 'Edit empoloyees')
+@section('title', 'Edit employees')
 
-@section('lyric', 'lorem ipsum')
+@section('lyric', '')
 
 @section('content')