diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 59c20943..be339433 100755
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -190,9 +190,9 @@ abstract class BaseController extends Controller
 
         $headerInfo['pageTitle'] = $this->CompanyName ." : ".$headerInfo['pageTitle'];
         
-        $header = view('includes/header', $headerInfo);
+        $header = view('includes/new_header', $headerInfo);
         $content = view($viewName, $pageInfo);
-        $footer = view('includes/footer', $headerInfo);
+        $footer = view('includes/new_footer', $headerInfo);
 
         echo $header . $content . $footer;
     }
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index f35fea79..01c0cf1a 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -25,16 +25,40 @@ class Sales extends BaseController
     {
         $this->global['pageTitle'] = 'Sales Dashboard';
         $data = [];
-        $data['today_sales'] =  $this->ipinvoice_model->todaySales();
-        $data['this_month_sales'] =  $this->ipinvoice_model->thisMonthSales();
-        $data['this_year_sales'] =  $this->ipinvoice_model->thisYearSales();
-        $data['this_year_sales_trend'] =  $this->ipinvoice_model->thisYearSalesTrend();
-        $data['get_today_invoices'] =  $this->ipinvoice_model->getTodayInvoices();
-        echo "<pre>";
-        print_r($data);die;
+        $data['today_sales'] = $this->ipinvoice_model->todaySales();
+        $data['this_month_sales'] = $this->ipinvoice_model->thisMonthSales();
+        $data['this_year_sales'] = $this->ipinvoice_model->thisYearSales();
+        $data['this_year_sales_trend'] = $this->ipinvoice_model->thisYearSalesTrend();
+        $data['get_today_invoices'] = $this->ipinvoice_model->getTodayInvoices();
+    
+        // Define months from April to March
+        $months = ['Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec', 'Jan', 'Feb', 'Mar'];
+    
+        // Initialize arrays for current and last year sales
+        $currentYearSales = array_fill(0, 12, 0);
+        $lastYearSales = array_fill(0, 12, 0);
+    
+        // Populate arrays with data
+        foreach ($months as $index => $month) {
+            if (isset($data['this_year_sales_trend'][$month]['Current Year'])) {
+                $currentYearSales[$index] = $data['this_year_sales_trend'][$month]['Current Year'];
+            }
+            if (isset($data['this_year_sales_trend'][$month]['Last Year'])) {
+                $lastYearSales[$index] = $data['this_year_sales_trend'][$month]['Last Year'];
+            }
+        }
+    
+        // Assign to data array
+        $data['currentYearSales'] = $currentYearSales;
+        $data['lastYearSales'] = $lastYearSales;
+    
+        // echo "<pre>";
+        // print_r($data);
+        // die;
+    
         $this->loadViews("sales_dashboard", $this->global, $data, NULL);
     }
-
+    
     //  Sales Invoice List 
     function sales_invoice(){
         $this->global['pageTitle'] = 'Sales Invoice';
diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php
index 5cda73e9..52b50afe 100644
--- a/app/Models/Ipinvoice_model.php
+++ b/app/Models/Ipinvoice_model.php
@@ -31,7 +31,8 @@ class Ipinvoice_model extends Model
             ->join('ip_invoice_items', 'ip_invoices.invoice_id = ip_invoice_items.invoice_id', 'left')
             ->join('ip_products', 'ip_invoice_items.item_product_id = ip_products.product_id', 'left')
             ->join('ip_invoice_amounts', 'ip_invoices.invoice_id = ip_invoice_amounts.invoice_id', 'left')
-            ->orderBy('ip_invoices.invoice_number', 'DESC');
+            ->orderBy('ip_invoices.invoice_number', 'DESC')
+            ->limit(100);
     
         $query = $builder->get();
         $result = $query->getResult();
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index 08b65a19..1a898a86 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -1,4 +1,4 @@
-<?php
+<div?php
 //print_r($getTotalServicePoCount);
 $Empcnt = '';
 //echo $DEPCode;
@@ -223,28 +223,17 @@ function synczohobooks(){
                        <a  class="small-box-footer" style="z-index:0; "> THIS MONTH : <i class="fa fa-rupee"></i> <div id="totalSalary"> <?php echo $totalSalary;?> </div>
                           </a>
                   </div>
-
           </div>
-
-
-
-
                   <!--  /col next -->
     <div class="col-lg-3 col-xs-6">
                     <!-- small box -->
       <div class="small-box bg-green">
                 <a href="#" class="small-box-footer">  <p>  <strong>TOTAL  EMPLOYEES ABSENT</strong> </p></a>
-                 
                  <h3>
                     <div class="inner" id="today_abs" >
-                   
                     <h3> <?php echo $today;?></h3> 
-                    
-              
-
                        </div></h3>
                       <p>ABSENT</p><br>
-       
             <div class="icon">
               <i class="ion ion-android-calendar"></i>
             </div> <a href="#" class="small-box-footer"><br> </a>      
@@ -264,80 +253,53 @@ function synczohobooks(){
                   <i class="fa fa-minus"></i></button>
               </div>
               <!-- /. tools -->
- 
               <h3 class="box-title">
-                 
                                  <?php
                           $options = array("0"=>'Select Employee');     
                           //print_r(  $options);
-                          
                           if(!empty($emplist))
                           {
                           foreach ($emplist as $SID):
-                            
-                           
                             $options[$SID->EmpID] =  $SID->name.' '.' - '.' '.$SID->EmpID;
-
                           endforeach;
                           }                   
-                    
                           echo form_dropdown('emp', $options,set_value('emp'),'id="emp"' ,'class="form-control select2');
-
                           ?>      
-                 
               </h3>
-
-
 <!-- <input type="text" id="datepic" name="datepic" placeholder="Select Date" style="color:#000;width:15%" /> -->
-           
 <!-- <input type="button" id="but" value="ok" style="color:blue; width:15%" /> -->
 						<a href="<?php echo base_url()?>Empperform" target="_blank">Click here to Employee Performance Report</a>
             </div>
-
-             
-                          
             <div class="box-body">
                 <div class="row">
-
             <div class="col-md-6 col-sm-6" style="padding:0px;">
-         
                   <div class="col-md-7 col-sm-7">
                   <div id="chart_div"></div>
                   </div>
-
                   <div class="col-md-5 col-sm-5">
                   <br>
                   <div class="pad box-pane-right bg-green">
-                    
                   <div class="description-block margin-bottom"> 
                   <h3 id="totaldays"><b>0</b></h3>                      
                     <h5 class="description-header">Working Days</h5>
-                    
                   </div>
                   <!-- /.description-block -->
                   <div class="description-block margin-bottom">
                     <h3 id="worked"><b>0</b></h3>
                     <h5 class="description-header">Days Present</h5>
-                   
                   </div>
                   <!-- /.description-block -->                    
                   </div>
-
                   </div>
-
              </div>
             <script type="text/javascript">
                 google.charts.load('current', {'packages':['gauge']});
                 google.charts.setOnLoadCallback(drawChart);
-
                   function drawChart() {
-
                   var data = google.visualization.arrayToDataTable([
                     ['Label', 'Value'],
                     ['Year', 0]
-                    
                   ]);
-
                   var options = {
                     width: 600, height: 250,
                     redFrom: 0, redTo: 20,
@@ -345,14 +307,11 @@ function synczohobooks(){
                     greenFrom:50, greenTo: 100,
                     minorTicks: 5
                   };
-
                   var chart = new google.visualization.Gauge(document.getElementById('chart_div'));
-
                   chart.draw(data, options);
                   $('#emp').change(function() {
                       //var datepick = $('#datepic').val();
                    var id = $('#emp').val(); 
-
                   $("#yearabs").val('');
 
                     if(id != 0)
@@ -651,75 +610,62 @@ $('#datepick').change(function() {
   if($role == ROLE_ADMIN  && $DEPCode != MANAGEMENT && $DEPCode != HR)
     {
     ?>
-  <div class="content">
+   <div class="content-page">
+        <div class="content">
+            <!-- Start Content -->
+            <div class="container-fluid">
+                <div id="loader_wrapper">
+                    <div id="loadingDiv">
+                        <div id="load-img">
+                            <img src="<?php echo base_url();?>public/assets/images/spinner.gif" class="img-fluid" alt="Loading...">
+                            <h3>Syncing with Zoho Books...</h3>
+                        </div>
+                    </div>
+                </div>
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1>Admin Dashboard</h1>      
+                </section>
+                <!-- Main content -->
+                <section class="content">
+                  <div class="row">
+                      <div class="col-xl-3 col-md-6">
+                          <div class="card">
+                              <div class="card-body">
+                                  <div class="d-flex justify-content-between">
+                                      <div>
+                                          <h5 class="text-muted font-weight-normal mt-0 text-truncate" title="User Registrations">User Registrations</h5>
+                                          <h3 class="my-2 py-1"><span data-plugin="counterup"><?php $users = isset($UserCount[0]->users) ? $UserCount[0]->users : 0 ;?>
+                                          <h3><?= $users; ?></h3></span></h3>
+                                          <p class="mb-0 text-muted">
+                                               <?php $employees = isset($EmpCount[0]->EmpCount) ? $EmpCount[0]->EmpCount : 0 ;?>
+                                              <?php echo $employees > 1 ? '<small>' . $employees . ' Employees </small>' : ($employees == 1 ? '<small>' . $employees . ' Employee</small>' : ''); ?></span>
+                                          </p>
+                                      </div>
+                                      <div class="avatar-sm">
+                                        <span class="avatar-title bg-soft-primary rounded">
+                                            <i class="ri-arrow-right-left-line font-20 text-primary">                                <a href="<?php echo base_url(); ?>userListing" class="small-box-footer"></a></i>
+                                        </span>
+                                    </div>
 
-    <div id="loader_wrapper" style="display:none;">
-      <div id="loadingDiv" style="height: 120%;position: absolute;width: 100%;top: 0px;background: white;text-align: center;z-index: 9999999999999999999999999999999999;left: -0px;">
-
-<div style="position: relative;top:200px" id="load-img">
-
-<img src="<?php echo base_url();?>public/assets/images/spinner.gif" class="img-fluid">
-<h3>Syncing with zoho books...</h3>
-
-</div>
-
-</div>
-</div>
-
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>      Admin Dashboard        </h1>      
-    </section>
-    <!-- Main content -->
-    <section class="content">
-         <div class="row">
-        
-         
-        <!-- ./col -->
-        <div class=" col-xs-12 col-md-4 col-md-offset-4">
-          <!-- small box -->
-          <div class="small-box bg-yellow">
-            <div class="inner">
-              <?php $users = isset($UserCount[0]->users) ? $UserCount[0]->users : 0 ;?>
-              <h3><?= $users; ?></h3>
-              <p>User Registrations</p>
-              <?php $employees = isset($EmpCount[0]->EmpCount) ? $EmpCount[0]->EmpCount : 0 ;?>
-              <?php echo $employees > 1 ? '<small>' . $employees . ' Employees </small>' : ($employees == 1 ? '<small>' . $employees . ' Employee</small>' : ''); ?>
+                                  </div>
+                              </div>
+                          </div>
+                      </div><!-- end col -->
+                    </div>
+                    <div class="row">
+                      
+                        
+                        <div class="col-xs-12 col-md-4 col-md-offset-4">
+                            <a href="javascript:void(0)" type="button" class="btn btn-success" onclick="synczohobooks()">Sync With Zoho Books</a>
+                        </div>
+                        
+                    </div>
+                </section>
+                <!-- /.content -->
             </div>
-            <div class="icon">
-              <i class="ion ion-person-add"></i>
-            </div>
-            <a href="<?php echo base_url(); ?>userListing" class="small-box-footer">More info <i class="fa fa-arrow-circle-right"></i></a>
-          </div>
         </div>
-
-
-        <div class="row">
-        
-         
-        <!-- ./col -->
-        <div class=" col-xs-12 col-md-4 col-md-offset-4">
-          <!-- small box -->
-                    <a href=" javascript:void(0)" type="button" class="btn btn-success" onclick="synczohobooks()">Sync With Zoho Books</a>
-                    <?php //echo session()->getFlashdata('error'); ?>                    
-                    <!-- <br/>
-                    <a class="btn btn-success" href="<?php echo base_url(); ?>pdf/preview" target="_blank">MPDF preview</a>
-                    <br/>
-                    <a class="btn btn-success" href="<?php echo base_url(); ?>pdf/download">MPDF Download</a>
-                    <br/>
-                    <br/>
-                    <a class="btn btn-success" href="<?php echo base_url(); ?>pdf/po" target="_blank">PO preview</a> -->
-
-                    
-        </div>
-
-        
-       
-        <!-- ./col -->
-      </div>
-     </section>
-    <!-- /.content -->
-  </div>
+    </div>
 
   
     <?php
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index 05486071..02a4f490 100644
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -45,6 +45,7 @@
         <script src="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-select/js/dataTables.select.min.js"></script>
         <script src="<?php echo base_url(); ?>public/new_assets/libs/pdfmake/build/pdfmake.min.js"></script>
         <script src="<?php echo base_url(); ?>public/new_assets/libs/pdfmake/build/vfs_fonts.js"></script>
+       
         <!-- third party js ends -->
 
         <!-- Datatables init -->
@@ -53,5 +54,12 @@
         <!-- App js -->
         <script src="<?php echo base_url(); ?>public/new_assets/js/app.min.js"></script>
         
+                <!--Morris Chart-->
+        <script src="<?php echo base_url(); ?>public/new_assets/libs/morris.js06/morris.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/new_assets/libs/raphael/raphael.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/new_assets/js/pages/morris.init.js"></script>
+        <script src="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.js"></script>
+        <script src="<?php echo base_url(); ?>public/new_assets/js/pages/c3.init.js"></script>
+
     </body>
 </html>
\ No newline at end of file
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 9f002434..1fe98f0a 100644
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -10,6 +10,9 @@
         <!-- App favicon -->
         <link rel="shortcut icon" href="<?php echo base_url(); ?>public/new_assets/images/RI_favicon.png">
 
+
+		<!-- icons -->
+		<link href="../assets/css/icons.min.css" rel="stylesheet" type="text/css" />
         <!-- third party css -->
         <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css" rel="stylesheet" type="text/css" />
         <link href="<?php echo base_url(); ?>public/new_assets/libs/datatables.net-responsive-bs4/css/responsive.bootstrap4.min.css" rel="stylesheet" type="text/css" />
@@ -29,6 +32,151 @@
 
         <!-- jquery -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js" integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+        <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+
+		<link href="<?php echo base_url(); ?>public/new_assets/libs/c3/c3.min.css" rel="stylesheet" type="text/css" />
+
+
+        <link href="https://cdn.datatables.net/1.13.4/css/jquery.dataTables.min.css" rel="stylesheet">
+    <!-- DataTables Buttons CSS -->
+    <link href="https://cdn.datatables.net/buttons/2.3.6/css/buttons.dataTables.min.css" rel="stylesheet">
+
+    <!-- jQuery -->
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <!-- DataTables JS -->
+    <script src="https://cdn.datatables.net/1.13.4/js/jquery.dataTables.min.js"></script>
+    <!-- DataTables Buttons JS -->
+    <script src="https://cdn.datatables.net/buttons/2.3.6/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.html5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/2.3.6/js/buttons.print.min.js"></script>
+
+    <!-- JSZip for Excel export -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.1.3/jszip.min.js"></script>
+    <!-- pdfmake for PDF export -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/pdfmake.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.53/vfs_fonts.js"></script>
+    <link href="https://cdn.jsdelivr.net/npm/remixicon@2.5.0/fonts/remixicon.css" rel="stylesheet">
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
+
+    <style>
+        
+        .content-page {
+            padding: 20px;
+        }
+        #loader_wrapper {
+            display: none;
+            position: fixed;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            background: white;
+            z-index: 9999;
+            text-align: center;
+        }
+        #loadingDiv {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+        .small-box {
+            border-radius: 5px;
+            padding: 20px;
+            color: #fff;
+            margin-bottom: 20px;
+        }
+        .bg-yellow {
+            background-color: #f39c12;
+        }
+        .small-box .inner {
+            padding: 10px;
+        }
+        .small-box .icon {
+            font-size: 60px;
+            line-height: 60px;
+            color: rgba(0,0,0,0.2);
+        }
+        .small-box-footer {
+            display: block;
+            background: rgba(0,0,0,0.1);
+            color: #fff;
+            text-align: center;
+            padding: 10px;
+            text-decoration: none;
+        }
+        .btn-success {
+            margin: 10px 0;
+        }
+    </style>
+    <style>
+       .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
+            color: black !important; /* Text color */
+            border: 1px solid white; /* Light border color */
+            background-color: white; /* White background */
+            background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #f0f0f0));
+            background: -webkit-linear-gradient(top, white 0%, #f0f0f0 100%);
+            background: -moz-linear-gradient(top, white 0%, #f0f0f0 100%);
+            background: -ms-linear-gradient(top, white 0%, #f0f0f0 100%);
+            background: -o-linear-gradient(top, white 0%, #f0f0f0 100%);
+            background: linear-gradient(to bottom, white 0%, #f0f0f0 100%);
+        }
+
+    </style>
+        <style>
+        /* Style for DataTable buttons */
+        .dt-buttons .btn {
+            background-color: white; /* White background for buttons */
+            color: black; /* Black text color */
+            border: 1px solid white; /* Light gray border */
+            padding: 5px 10px; /* Padding for buttons */
+            margin-right: 10px; /* Space between buttons */
+        }
+
+        /* Space between buttons and length menu */
+        .dataTables_length {
+            margin-left: 20px; /* Adjust this value for spacing */
+        }
+
+        /* Additional button hover styles */
+        .dt-buttons .btn:hover {
+            color: #343a40;
+            background-color: #d8eaf1;
+            border-color: #cfe5ed;
+        }
+        div.dataTables_wrapper div.dataTables_length select {
+            width: 87px !important;
+            display: inline-block;
+        }
+    </style>
+<style>
+
+    .card_font_colorset_green{
+        font-size: 23.7215px;
+        font-weight: 500;
+        line-height: 1.2;
+        position: relative;
+        z-index: 1;
+        color: rgb(86, 166, 75);
+    }
+    .card_font_colorset_bule{
+        font-size: 23.7215px;
+        font-weight: 500;
+        line-height: 1.2;
+        position: relative;
+        z-index: 1;
+        color: rgb(31, 96, 196);
+    }
+    .card_font_colorset_red{
+        font-size: 23.7215px;
+        font-weight: 500;
+        line-height: 1.2;
+        position: relative;
+        z-index: 1;
+        color: rgb(173, 3, 23);
+    }
+    
+</style>
 
     </head>
 
@@ -69,11 +217,7 @@
                                 </a>
 
                                 <!-- item-->
-                                <a href="javascript:void(0);" class="dropdown-item notify-item">
-                                    <i class="ri-lock-line"></i>
-                                    <span>Lock Screen</span>
-                                </a>
-
+                        
                                 <div class="dropdown-divider"></div>
 
                                 <!-- item-->
@@ -148,7 +292,8 @@
                                     </a>
                                     <div class="dropdown-menu" aria-labelledby="topnav-dashboard">
                                         <a href="<?php echo base_url(); ?>dashboard" class="dropdown-item">Home</a>
-                                        <a href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" class="dropdown-item">Sales</a>
+                                        <!-- <a href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" class="dropdown-item">Sales</a> -->
+                                        <a href="<?php echo base_url(); ?>sales_dashboard" class="dropdown-item">Sales</a>
                                     </div>
                                 </li>
                                 
diff --git a/app/Views/login.php b/app/Views/login.php
index cebd8f33..58bbdaa7 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -4,13 +4,19 @@
     <meta charset="UTF-8">
     <title>Resico (India) Pvt Ltd | Admin System Log in</title>
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <link href="<?php echo base_url(); ?>public/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+    <!-- <link href="<?php echo base_url(); ?>public/assets/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" /> -->
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
-    <link href="<?php echo base_url(); ?>public/assets/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
-    <link href="<?php echo base_url(); ?>public/assets/dist/css/skins/skin-green.min.css" rel="stylesheet" type="text/css" />
+    <!-- <link href="<?php echo base_url(); ?>public/assets/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" /> -->
+    <!-- <link href="<?php echo base_url(); ?>public/assets/dist/css/skins/skin-green.min.css" rel="stylesheet" type="text/css" /> -->
     <!-- web favicon -->
     <!-- This is needed for IE -->
     <link rel="icon" href="<?php echo base_url(); ?>public/assets/dist/img/RI_favicon.png"/>
+    <link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative.min.css" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
+		<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative.min.css" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
+
+		<link href="<?php echo base_url(); ?>public/new_assets/css/bootstrap-creative-dark.min.css" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
+		<link href="<?php echo base_url(); ?>public/new_assets/css/app-creative-dark.min.css" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
+    <link href="<?php echo base_url(); ?>public/new_assets/css/icons.min.css" rel="stylesheet" type="text/css" />
     <style>
 		  .debug-bar-dinlineBlock {display: none !important;}
       .a-tag-link {
@@ -28,91 +34,77 @@
         <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
-  <body class="login-page">
-    <div class="login-box">
-    <div class="login-logo">
-        <a href="#"><b style="color: #00a65a;">Resico (India) Pvt Ltd</b><br>Admin System</a> 
-      </div><!-- /.login-logo -->
-      <div class="login-box-body">
-        <p class="login-box-msg">Log In</p>
-        <?php helper('form'); ?>
-        <div class="row">
-            <div class="col-md-12">
-              <?php if (session()->has('errors')) : ?>
-                <div class="alert alert-danger alert-dismissable">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                    <?= session('errors') ?>
-                </div>
-              <?php endif ?>
-            </div>
-        </div>
-        <?php
-        
+  <body class="loading">
 
-        $error = session()->getFlashdata('error');
-        if($error)
-        {
-            ?>
-            <div class="alert alert-danger alert-dismissable">
-                <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-                <?php echo $error; ?>                    
-            </div>
-        <?php } ?>
-        
-        <form action="<?php echo base_url(); ?>loginMe" method="post">
-          <div class="form-group has-feedback">
-          <div class="input-group"> 
-              <input type="text" class="form-control" placeholder="Email" name="email" required />
-              <span class="input-group-addon"> 
-                <span class="glyphicon glyphicon-envelope"></span>
-              </span>
-            </div>
+  <div class="account-pages mt-5 mb-5">
+      <div class="container">
+          <div class="row justify-content-center">
+              <div class="col-md-8 col-lg-6 col-xl-5">
+                  <div class="card">
+
+                      <div class="card-body p-4">
+                          
+                          <div class="text-center w-75 m-auto">
+                              <div class="auth-logo">
+                                  <a href="index.html" class="logo logo-dark text-center">
+                                      <span class="logo-lg"> 
+                                          <img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt="" height="40">
+                                      </span>
+                                  </a>
+              
+                                  <a href="index.html" class="logo logo-light text-center">
+                                      <span class="logo-lg">cfd
+                                          <img src="<?php echo base_url(); ?> " alt="" height="22">
+                                      </span>
+                                  </a>
+                              </div>
+                          </div>
+
+                          <form action="<?php echo base_url(); ?>loginMe" method="post">
+
+                              <div class="form-group mb-3">
+                                  <label for="emailaddress">Email address</label>
+                                  <input type="email" class="form-control"  placeholder="Enter your email" name="email" required="" />
+                              </div>
+
+                              <div class="form-group mb-3">
+                                  <label for="password">Password</label>
+                                  <div class="input-group input-group-merge">
+                                      <input type="password" class="form-control" placeholder="Enter your password" name="password" id="password" required />
+                                      <div class="input-group-append" data-password="false">
+                                          <div class="input-group-text">
+                                              <span class="password-eye"></span>
+                                          </div>
+                                      </div>
+                                  </div>
+                              </div>
+                              <div class="form-group mb-0 text-center">
+                                  <input type="submit" class="btn btn-primary btn-block" value="Sign In" />
+
+                              </div>
+
+                          </form>
+
+                      </div> <!-- end card-body -->
+                  </div>
+                  <!-- end card -->
+              </div> <!-- end col -->
           </div>
-          <div class="form-group has-feedback">
-            <div class="input-group"> 
-              <input type="password" class="form-control" placeholder="Password" name="password" id="password" required />
-              <span class="input-group-addon"> 
-                  <span class="glyphicon glyphicon-eye-open" id="togglePassword"></span>
-              </span>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-xs-8">    
-              <!-- <div class="checkbox icheck">
-                <label>
-                  <input type="checkbox"> Remember Me
-                </label>
-              </div>  -->                       
-            </div><!-- /.col -->
-            <div class="col-xs-4">
-              <input type="submit" class="btn btn-success btn-block btn-flat" value="Sign In" />
-            </div><!-- /.col -->
-          </div>
-        </form>
+          <!-- end row -->
+      </div>
+      <!-- end container -->
+  </div>
+<!-- end page -->
 
-       <a class="a-tag-link" href="<?php echo base_url() ?>forgotPassword">Forgot Password</a><br>
-        
-      </div><!-- /.login-box-body -->
-    </div><!-- /.login-box -->
+<footer class="footer footer-alt">
+    <script>document.write(new Date().getFullYear())</script> &copy; Resico <a href="" class="text-dark"></a> 
+</footer>
 
-    <script src="<?php echo base_url(); ?>public/assets/js/jQuery-2.1.4.min.js"></script>
-    <script src="<?php echo base_url(); ?>public/assets/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-    <script>
-    $(document).ready(function() {
-        $("#togglePassword").click(function() {
-          
-            var passwordField = $("#password");
-            var icon = $(this);
+<!-- Vendor js -->
+<script src="<?php echo base_url(); ?>public/new_assets/js/vendor.min.js"></script>
 
-            if (passwordField.attr("type") === "password") {
-                passwordField.attr("type", "text");
-                icon.removeClass("glyphicon-eye-open").addClass("glyphicon-eye-close");
-            } else {
-                passwordField.attr("type", "password");
-                icon.removeClass("glyphicon-eye-close").addClass("glyphicon-eye-open");
-            }
-        });
-    });
-</script>
-  </body>
+<!-- App js -->
+<script src="<?php echo base_url(); ?>public/new_assets/js/app.min.js"></script>
+
+</body>
 </html>
diff --git a/app/Views/sales_dashboard.php b/app/Views/sales_dashboard.php
index 769b578f..4c280fc6 100644
--- a/app/Views/sales_dashboard.php
+++ b/app/Views/sales_dashboard.php
@@ -1,23 +1,240 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
 
-<div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-        <h1><center>Sales Dashboard</center></h1>
-    </section>
-    <section class="content">
-        <div class="row">
-            <div class="col-xs-12 text-right">
-                <div class="form-group"></div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-xs-12">
-                <div class="box">
-                    <div class="box-header"></div><!-- /.box-header -->
-                    <div class="box-body"></div><!-- /.box-body -->
-                </div><!-- /.box -->
-            </div>
-        </div>
-    </section>
+<div class="content-page">
+    <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+            
+            <!-- start page title -->
+            <div>
+                <div class="row">
+                    <div class="col-12">
+                        <div class="page-title-box page-title-box-alt">
+                            
+                            
+                        </div>
+                    </div>
+                </div>   
+                <div class="row">
+                    <div class="col-xl-4 col-md-6">
+                        <div class="card">
+                            <div class="card-body" style="height: 150px;">  
+                                <h4 class="header-title" style="margin-bottom: 22px;">Today Sales</h4>
+                                <div class="d-flex justify-content-between align-items-center">
+                                    <div class="knob-chart" dir="ltr">
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Invoices</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo $today_sales->Invoices ?></span> </h4>
+                                    </div>
+                                    </div>
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Qty in Kgs</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo $today_sales->Qty ?></span> </h4>
+                                    </div>
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Sales in Rs.</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_green"><?php echo number_format($today_sales->Sales, 2); ?></span> </h4>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xl-4 col-md-6">
+                        <div class="card">
+                            <div class="card-body" style="height: 150px;">  
+                                <h4 class="header-title" style="margin-bottom: 22px;">This Month Sales</h4>
+                                <div class="d-flex justify-content-between align-items-center">
+                                    <div class="knob-chart" dir="ltr">
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Invoices</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo $this_month_sales->Invoices ?></span> </h4>
+                                    </div>
+                                    </div>
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Qty in Kgs</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo $this_month_sales->Qty ?></span> </h4>
+                                    </div>
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Sales in Rs.</p>
+                                        <h class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_bule"><?php echo number_format($this_month_sales->Sales, 2); ?></span> </h4>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-xl-4 col-md-6">
+                        <div class="card">
+                            <div class="card-body" style="height: 150px;">  
+                                <h4 class="header-title" style="margin-bottom: 22px;">This year Sales</h4>
+                                <div class="d-flex justify-content-between align-items-center">
+                                    <div class="knob-chart" dir="ltr">
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Invoices</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo $this_year_sales->Invoices ?></span> </h4>
+                                    </div>
+                                    </div>
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Qty in Kgs</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo $this_year_sales->Qty ?></span> </h4>
+                                    </div>
+                                    <div class="text-left">
+                                        <p class="text-muted mb-0">Sales in Rs.</p>
+                                        <h4 class="mb-1 mt-0"> <span data-plugin="counterup" class="card_font_colorset_red"><?php echo number_format($this_year_sales->Sales, 2); ?></span> </h4>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    
+                </div>
+                <div class="row">
+                    <div class="col-xl-12 col-md-12">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="header-title">This Year Sales Trend</h4>
+                                <canvas id="salesComparisonChart" height="60"></canvas>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+                <div class="row">
+                                <div class="col-12">
+                                    <div class="card">
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-12">
+                                                    <div class="page-title-box page-title-box-alt">
+                                                        <h4 class="page-title">Invoices Table</h4>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <table id="datatable-buttonss" class="table dt-responsive nowrap w-100">
+                                                <thead>
+                                                    <tr>
+                                                        <th>Invoice No.</th>
+                                                        <th>Invoice Date</th>
+                                                        <th>Invoice Time</th>
+                                                        <th>Vehicle No.</th>
+                                                        <th>Product</th>
+                                                        <th>Client</th>
+                                                        <th>Quantity</th>
+                                                        <th>Rate</th>
+                                                        <th>Value</th>
+                                                        <th>CGST</th>
+                                                        <th>SGST</th>
+                                                        <th>IGST</th>
+                                                        <th>TCS</th>
+                                                        <th>Total</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    <?php foreach ($get_today_invoices as $invoice) : ?>
+                                                        <tr>
+                                                            <td><?php echo $invoice['Invoice No.']; ?></td>
+                                                            <td><?php echo $invoice['Invoice Date']; ?></td>
+                                                            <td><?php echo $invoice['Invoice Time']; ?></td>
+                                                            <td><?php echo $invoice['Vehicle No.']; ?></td>
+                                                            <td><?php echo $invoice['Product']; ?></td>
+                                                            <td><?php echo $invoice['Client']; ?></td>
+                                                            <td><?php echo $invoice['Quantity']; ?></td>
+                                                            <td><?php echo $invoice['Rate']; ?></td>
+                                                            <td><?php echo $invoice['Value']; ?></td>
+                                                            <td><?php echo $invoice['CGST']; ?></td>
+                                                            <td><?php echo $invoice['SGST']; ?></td>
+                                                            <td><?php echo $invoice['IGST']; ?></td>
+                                                            <td><?php echo $invoice['TCS']; ?></td>
+                                                            <td><?php echo $invoice['Total']; ?></td>
+                                                        </tr>
+                                                    <?php endforeach; ?>
+                                                </tbody>
+                                            </table>
+
+                                        </div> <!-- end card body-->
+                                    </div> <!-- end card -->
+                                </div><!-- end col-->
+                </div>
+                </div>
+            <!-- end row -->
+            <!-- end page title -->  
+        </div> <!-- container -->
+    </div> <!-- content -->
 </div>
+<script>$(document).ready(function() {
+    $('#datatable-buttonss').DataTable({
+        dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+        buttons: [
+            'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
+        ],
+        pageLength: 10, // Default rows per page
+        lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
+        responsive: true, // Responsive table
+        order: [[0, 'desc']], // Default ordering (column index 0, ascending)
+        language: {
+            paginate: {
+                next: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+            }
+        }
+    });
+});
+
+    </script>
+
+
+<script>
+    const currentYearSales = <?php echo json_encode($currentYearSales); ?>;
+    const lastYearSales = <?php echo json_encode($lastYearSales); ?>;
+
+    const ctx = document.getElementById('salesComparisonChart').getContext('2d');
+    const salesComparisonChart = new Chart(ctx, {
+        type: 'bar', // Bar chart
+        data: {
+            labels: ['April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December', 'January', 'February', 'March'], // Months of the year
+            datasets: [
+                {
+                    label: 'Current Year Sales',
+                    data: currentYearSales,
+                    backgroundColor: 'rgba(86, 166, 75, 0.6)', // Green color with opacity
+                    borderColor: 'rgb(86, 166, 75)', // Green border color
+                    borderWidth: 1,
+                },
+                {
+                    label: 'Last Year Sales',
+                    data: lastYearSales,
+                    backgroundColor: 'rgba(173, 3, 23, 0.6)', // Red color with opacity
+                    borderColor: 'rgb(173, 3, 23)', // Red border color
+                    borderWidth: 1,
+                }
+            ]
+        },
+        options: {
+            scales: {
+                y: {
+                    beginAtZero: true, // Ensures the y-axis starts at zero
+                    ticks: {
+                        stepSize: 10000000, // Sets the interval between ticks
+                        callback: function(value) {
+                            return value; // Return plain number without formatting
+                        }
+                    },
+                    min: 0, // Minimum value for y-axis
+                    max: 30000000 // Maximum value for y-axis
+                }
+            },
+            plugins: {
+                legend: {
+                    display: true,
+                    labels: {
+                        color: '#495057' // Color of legend text
+                    }
+                }
+            }
+        }
+    });
+</script>
+
+
+
+
+
diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index 5b82f841..1429b30a 100644
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -1,81 +1,78 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
 <style>
-    .invoice-link {
-        text-decoration: underline;
-        color: #007bff; /* Adjust color as needed */
+/* Target the first child element of #datatable-buttons_wrapper */
+#datatable-buttons_wrapper.dataTables_wrapper.dt-bootstrap4.no-footer > :nth-child(1) {
+    display: none;
+}
+
+/* Target the third child element of #datatable-buttons_wrapper */
+#datatable-buttons_wrapper.dataTables_wrapper.dt-bootstrap4.no-footer> :nth-child(3) {
+   display: none;
+}
+
+    .card_font_colorset_green{
+        font-size: 23.7215px;
+        font-weight: 500;
+        line-height: 1.2;
+        position: relative;
+        z-index: 1;
+        color: rgb(86, 166, 75);
     }
-    .custom-button {
-    display: inline-block;
-    padding: 6px 8px;
-    margin-bottom: 0;
-    font-size: 14px;
-    font-weight: normal;
-    line-height: 1.42857143;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    cursor: pointer;
-    background-color: #007bff;
-    border: 1px solid transparent;
-    border-radius: 4px;
-    color: #fff;
-    text-decoration: none;
-    width: 72px;
-    margin-left: -12px;
-    margin-top: -3px;
-    height: 32px;
-    font-size: 12px;
-}
-
-.custom-button:hover {
-    color: #fff;
-    text-decoration: none;
-    /* color: #007bff !important; */
-    /* background-color: white; */
-    /* border: 1px solid; */
-}
-
+    .card_font_colorset_bule{
+        font-size: 23.7215px;
+        font-weight: 500;
+        line-height: 1.2;
+        position: relative;
+        z-index: 1;
+        color: rgb(31, 96, 196);
+    }
+    .card_font_colorset_red{
+        font-size: 23.7215px;
+        font-weight: 500;
+        line-height: 1.2;
+        position: relative;
+        z-index: 1;
+        color: rgb(173, 3, 23);
+    }
+    
 </style>
-<div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-           <center>Sales Invoice</center>       
-      </h1>
-    </section>
-    <section class="content">
-        <div class="row">
-            <div class="col-xs-12 text-right">
-                <div class="form-group">
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-                
-                </div><!-- /.box-header -->
-                <div class="box-body">
-                    <table id="datatable_sales_invoice_list" class="table table-striped dt-responsive nowrap w-100" style="background-color:#fff;font-size:12px;text-align: right;" >
-				        <thead style="background-color: #ddd;">
-                            <tr >
-                                <th width="10%">Invoice Date</th>
-                                <th width="10%">Invoice No</th>
-                                <th width="10%">Client Name</th>
-                                <th width="10%">Product</th>
-                                <th width="10%">Rate</th>
-                                <th width="10%">Quantity</th>
-                                <th width="10%">Sub Total</th>
-                                <th width="10%">GST</th>
-                                <th width="10%">Total</th>
-                                <th width="10%">Status</th>
-                                <th width="10%" >E-Invoice Number</th>
-                                <th width="5%">Action</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <input type="text" id="invoice_id_set" name="invoice_id_set" hidden>
+<div class="content-page">
+    <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+            
+            <!-- start page title -->
+            <div>
+                <div class="row">
+                                <div class="col-12">
+                                    <div class="card">
+                                        <div class="card-body">
+                                            <div class="row">
+                                                <div class="col-12">
+                                                    <div class="page-title-box page-title-box-alt">
+                                                        <h4 class="page-title">Invoices Table</h4>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <table id="datatable-buttons" class="table table-striped dt-responsive nowrap w-100">
+                                            <thead>
+                                                    <tr>
+                                                    <th >Invoice Date</th>
+                                                    <th>Invoice No</th>
+                                                    <th>Client Name</th>
+                                                    <th >Product</th>
+                                                    <th>Rate</th>
+                                                    <th>Quantity</th>
+                                                    <th>Sub Total</th>
+                                                    <th>GST</th>
+                                                    <th>Total</th>
+                                                    <th>Status</th>
+                                                    <th >E-Invoice Number</th>
+                                                    <th >Action</th>
+                                                    </tr>
+                                                </thead>
+                                               <tbody>
+                                               <input type="text" id="invoice_id_set" name="invoice_id_set" hidden>
                             <?php if(!empty($sales_invoice)){ foreach($sales_invoice as $invoice){ 
                                
                                 $subtotal = $invoice->item_price * $invoice->item_quantity;
@@ -111,314 +108,38 @@
                                     </td>
                                 </tr>
                             <?php } } ?>
-                        </tbody>
-                    </table>
-                    </div><!-- /.box-body -->
-                    <!-- <div class="box-footer clearfix">
-                    </div> -->
-                </div><!-- /.box -->
+
+                                               </tbody>
+                                            </table>
+
+                                        </div> <!-- end card body-->
+                                    </div> <!-- end card -->
+                                </div><!-- end col-->
+                </div>
             </div>
-        </div>
-    </section>
+        </div> <!-- container -->
+    </div> <!-- content -->
 </div>
-
-<!-- Modal Structure -->
-<div class="modal fade" id="invoiceModal" tabindex="-1" role="dialog" aria-labelledby="invoiceModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                <h3><span id="invoice_number_display_model"></span>  -  <span id="date_display_model"></span><br></h3>
-                <span id="client_name_display_model"></span> 
-                
-                               
-                <div class="col-md-12">
-                    <div class="col-md-10"></div>
-                    <div class="col-md-2">
-                        <!-- <button  type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()" id="day" >
-                            Add New File
-                        </button> -->
-                    </div>
-                </div>
-            </div>
-            <div class="modal-body" style="margin-top: 23px;">
-                <div id="filesContainer">
-                    
-                    <!-- Rows will be dynamically appended here -->
-                </div>
-                
-                <?php if(isset($invoice_data)){ foreach ($invoice_data as $key => $value) { ?>
-
-                <div class="col-md-12 pad ">
-                    <div class="col-md-6">
-                        <span>File Name</span>
-                        <input type="text" maxlength="255" class="form-control file_name"
-                            value="<?php echo $value['file_name']; ?>" readonly>
-                            <div class="error-message"></div>
-                    </div>
-                    <div class="col-md-1" style="margin-top: 25px;">
-                        
-                        <a class="custom-button"  href="<?php echo base_url() . 'public/uploads/images/emp_files/' . $value['emp_file']; ?>"
-                            download>
-                            Download
-                        </a>
-                    </div>
-                    <div class="col-md-5" style="margin-top: 23px;">
-                        <button type="button" class="btn btn-danger btn-sm"
-                            id="<?= $value['id']; ?>"
-                            onclick="removeContact(this)" style="margin-left: 22px;">Delete </button>
-                    </div>
-                </div>
-
-                <?php } } ?>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                <button type="button" onclick="saveAttachment()" class="btn btn-primary">Save changes</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-
-
-<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
-<script type="text/javascript">
-   
-   $(document).ready(function() {
-    var table = $('#datatable_sales_invoice_list').DataTable({
-        "paging": true,
-        "lengthChange": true,
-        "searching": true,
-        "ordering": true,
-        "columnDefs": [{
-            "targets": 0,
-            "type": "date-eu"
-        }],
-        "aaSorting": [
-            [0, "desc"]
-        ],
-        "info": true,
-        "autoWidth": true,
-        "pageLength": 10,
-        "lengthMenu": [10, 25, 50, 100],
-        "rowCallback": function(row, data, index) {
-            // Ignore child rows
-            if ($(row).hasClass('child-row')) {
-                return;
-            }
-        }
-    });
-});
-
-</script>
+ 
 
 <script>
 
-function saveAttachment() {
-
-    var file_name_classes = $('.file_name');
-    var hasEmptyInput = false;
-
-    file_name_classes.each(function() {
-        if ($(this).val().trim() === '') {
-            hasEmptyInput = true;
-            $(this).focus(); // Focus on the empty input field
-            $(this).addClass('error'); // Add an error class to the empty input
-            $('.error-message').text('Please fill out this field.').show(); // Show the error message
-            return false; // Break the loop
-        }
-    });
-    if (!hasEmptyInput) {
-        $('.error-message').hide();
-    console.log('All inputs are filled.');
-        var formData = new FormData();
-        var invoiceId = $('#invoice_id_set').val();
-        formData.append('invoice_id', invoiceId);
-
-        // Append files
-        $('input[name="emp_file[]"]').each(function(index, input) {
-            var files = $(input)[0].files;
-            if (files.length > 0) {
-                formData.append('emp_file[]', files[0]);
+$('#datatable-buttons').DataTable({
+        dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+        buttons: [
+            'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
+        ],
+        pageLength: 10, // Default rows per page
+        lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
+        responsive: true, // Responsive table
+        order: [[0, 'desc']], // Default ordering (column index 0, ascending)
+        language: {
+            paginate: {
+                next: '<i class="fas fa-angle-right"></i>', // Next button icon
+                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
             }
-        });
-
-        // Append other fields
-        $('input[name="file_name[]"]').each(function(index, input) {
-            formData.append('file_name[]', $(input).val());
-        });
-
-        // AJAX request using FormData
-        $.ajax({
-            url: '<?php echo base_url() ?>saveAttachment',
-            type: 'POST',
-            data: formData,
-            processData: false, // Prevent jQuery from converting the data
-            contentType: false, // Prevent jQuery from overriding the content type
-            success: function(response) {
-                console.log(response);
-                if (response.success) {
-                    $('#invoiceModal').modal('hide');
-                    // Handle success
-                } else {
-                    alert(response.message);
-                }
-            },
-            error: function() {
-                alert('An error occurred while saving the attachment.');
-            }
-        });
-    }
-}
-
-
-function openInvoiceModal(invoiceNumber, clientName, invoiceDate, invoiceId) {
-
-    function formatDate(date) {
-        let d = new Date(date); // Ensure the date is a Date object
-        let day = String(d.getDate()).padStart(2, '0');
-        let month = String(d.getMonth() + 1).padStart(2, '0'); // Months are 0-based
-        let year = d.getFullYear();
-        return `${day}/${month}/${year}`;
-    }
-    let formattedDate = formatDate(invoiceDate);
-
-    $('#invoice_number_display_model').html(invoiceNumber);
-    $('#client_name_display_model').html(clientName);
-    $('#date_display_model').html(formattedDate);
-    
-    // document.getElementById('modalInvoiceNumber').innerText = invoiceNumber;
-    // $('#day').show();
-    // $('#invoiceModal').modal('show');
-    // url:"<?php echo base_url() ?>servicepurchaseorder/getPODetails", 		
-    $('#invoice_id_set').val(invoiceId);
-    // console.log(invoiceId);
-    
-    $.ajax({
-        url: '<?php echo base_url() ?>getInvoiceAttachments',
-        type: 'GET', 
-        data: { invoice_id: invoiceId }, 
-        success: function(response) {
-            console.log(response);
-            
-            console.log(JSON.parse(response).invoiceAttachment);
-            var list = JSON.parse(response).invoiceAttachment;
-            var attachmentsHtml = '';
-
-            list.forEach(element => {
-              console.log(element);
-              var fileName = element.file_name;
-              var attachmentName = element.attachment_name;
-              attachmentsHtml += `
-                <div class="col-md-12 pad">
-                    <div class="col-md-4">
-                        <span>File Name</span>
-                        <input type="text" maxlength="255" class="form-control file_name"
-                            value="${attachmentName}" readonly>
-                            <div class="error-message"></div>
-
-                    </div>
-                    <div class="col-md-1" style="margin-top: 25px;">
-                       <a class="custom-button"  href="<?php echo base_url() . 'public/uploads/images/invoice_files/' ?>${fileName}" download>
-                            Download
-                        </a>
-                    </div>
-                    <div class="col-md-5" style="margin-top: 23px;">
-                        <button type="button" class="btn btn-danger btn-sm"
-                            id="${element.invoice_attachment_id}"
-                            onclick="removeContact(this)"  style="margin-left: 22px;">Delete</button>
-                    </div>
-                </div>`;
-            });
-            attachmentsHtml += `<div class="col-md-12 pad">
-            <div class="col-md-4">
-                <span for="file_name">File name</span>
-                <input type="text" id="file_name" name="file_name[]" maxlength="255" class="form-control file_name" value="">
-                <div class="error-message"></div>
-            </div>
-            <div class="col-md-4">
-                <span for="emp_file">File</span>
-                <input type="file" name="emp_file[]" class="form-control">
-            </div>
-            <div class="col-md-4" style="margin-top: 23px;">
-                <button type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()">Add</button>
-            </div>
-        </div>`;
-            $('#filesContainer').html(attachmentsHtml);
-            $('#invoiceModal').modal('show');
-        },
-        error: function() {
-            // Handle any errors during the AJAX request
-            $('#filesContainer').html('<p>There was an error loading the attachments.</p>');
-            $('#invoiceModal').modal('show');
         }
     });
-    console.log("day trigger works");
-    
-}
-
-
-function appendFilesFileds(data) {
-    var newRowHtml = `
-         <div class="col-md-12 pad">
-            <div class="col-md-4">
-                <span for="file_name">File name</span>
-                <input type="text" id="file_name" name="file_name[]" maxlength="255" class="form-control file_name" value="${data != null && data != '' ? data.file_name : ''}">
-                <div class="error-message"></div>
-            </div>
-            <div class="col-md-4">
-                <span for="emp_file">File</span>
-                <input type="file" name="emp_file[]" class="form-control">
-            </div>
-            <div class="col-md-4" style="margin-top: 23px;">
-                <button type="button" class="btn btn-danger btn-sm" onclick="removeContact(this)">Remove</button>
-                <button type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()">Add</button>
-            </div>
-        </div>`;
-
-    // Append the new row to the container
-    $('#filesContainer').append(newRowHtml);
-
-    // Hide all "Add" buttons except the last one
-    $('.a1').hide();
-    $('#filesContainer .pad:last .a1').show();
-}
-
-function removeContact(button) {
-    
-    $(button).closest('.pad').remove();
-    $('#filesContainer .a1').hide();
-    $('#filesContainer .pad:last .a1').show();
-    var len = $('#filesContainer .pad:last .a1')
-    var length = len.length;
-    if (length == 0) {
-        // $('#day').show()
-    } else {
-        $('#day').hide()
-    }
-    console.log("-------------------");
-    console.log(button);
-    console.log($(button).val());
-    console.log($(button).attr('id'));
-    
-    
-    
-    
-    $.ajax({
-        url: '<?php echo base_url() ?>deleteAttachment',
-        type: 'GET', 
-        data: { invoice_attachment_id: $(button).attr('id') }, 
-        success: function(response) {
-            console.log(response);
-        },
-        error: function() {
-            
-        }
-    });
-}
 
 </script>
 
diff --git a/public/uploads/spinner.gif b/public/spinner.gif
old mode 100755
new mode 100644
similarity index 100%
rename from public/uploads/spinner.gif
rename to public/spinner.gif
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 1186f935..2828d741 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -421,7 +421,6 @@ return array(
     'Composer\\Pcre\\PHPStan\\PregMatchFlags' => $vendorDir . '/composer/pcre/src/PHPStan/PregMatchFlags.php',
     'Composer\\Pcre\\PHPStan\\PregMatchParameterOutTypeExtension' => $vendorDir . '/composer/pcre/src/PHPStan/PregMatchParameterOutTypeExtension.php',
     'Composer\\Pcre\\PHPStan\\PregMatchTypeSpecifyingExtension' => $vendorDir . '/composer/pcre/src/PHPStan/PregMatchTypeSpecifyingExtension.php',
-    'Composer\\Pcre\\PHPStan\\PregReplaceCallbackClosureTypeExtension' => $vendorDir . '/composer/pcre/src/PHPStan/PregReplaceCallbackClosureTypeExtension.php',
     'Composer\\Pcre\\PHPStan\\UnsafeStrictGroupsCallRule' => $vendorDir . '/composer/pcre/src/PHPStan/UnsafeStrictGroupsCallRule.php',
     'Composer\\Pcre\\PcreException' => $vendorDir . '/composer/pcre/src/PcreException.php',
     'Composer\\Pcre\\Preg' => $vendorDir . '/composer/pcre/src/Preg.php',
@@ -2351,7 +2350,6 @@ return array(
     'PhpCsFixer\\Console\\Command\\ListFilesCommand' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/Command/ListFilesCommand.php',
     'PhpCsFixer\\Console\\Command\\ListSetsCommand' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/Command/ListSetsCommand.php',
     'PhpCsFixer\\Console\\Command\\SelfUpdateCommand' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/Command/SelfUpdateCommand.php',
-    'PhpCsFixer\\Console\\Command\\WorkerCommand' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/Command/WorkerCommand.php',
     'PhpCsFixer\\Console\\ConfigurationResolver' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/ConfigurationResolver.php',
     'PhpCsFixer\\Console\\Output\\ErrorOutput' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/Output/ErrorOutput.php',
     'PhpCsFixer\\Console\\Output\\OutputContext' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Console/Output/OutputContext.php',
@@ -2401,7 +2399,6 @@ return array(
     'PhpCsFixer\\Documentation\\RuleSetDocumentationGenerator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Documentation/RuleSetDocumentationGenerator.php',
     'PhpCsFixer\\Error\\Error' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Error/Error.php',
     'PhpCsFixer\\Error\\ErrorsManager' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Error/ErrorsManager.php',
-    'PhpCsFixer\\Error\\SourceExceptionFactory' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Error/SourceExceptionFactory.php',
     'PhpCsFixer\\ExecutorWithoutErrorHandler' => $vendorDir . '/friendsofphp/php-cs-fixer/src/ExecutorWithoutErrorHandler.php',
     'PhpCsFixer\\ExecutorWithoutErrorHandlerException' => $vendorDir . '/friendsofphp/php-cs-fixer/src/ExecutorWithoutErrorHandlerException.php',
     'PhpCsFixer\\FileReader' => $vendorDir . '/friendsofphp/php-cs-fixer/src/FileReader.php',
@@ -2456,7 +2453,6 @@ return array(
     'PhpCsFixer\\Fixer\\ArrayNotation\\WhitespaceAfterCommaInArrayFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/WhitespaceAfterCommaInArrayFixer.php',
     'PhpCsFixer\\Fixer\\ArrayNotation\\YieldFromArrayToYieldsFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/YieldFromArrayToYieldsFixer.php',
     'PhpCsFixer\\Fixer\\AttributeNotation\\AttributeEmptyParenthesesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/AttributeEmptyParenthesesFixer.php',
-    'PhpCsFixer\\Fixer\\AttributeNotation\\OrderedAttributesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/OrderedAttributesFixer.php',
     'PhpCsFixer\\Fixer\\Basic\\BracesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesFixer.php',
     'PhpCsFixer\\Fixer\\Basic\\BracesPositionFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesPositionFixer.php',
     'PhpCsFixer\\Fixer\\Basic\\CurlyBracesPositionFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/CurlyBracesPositionFixer.php',
@@ -2513,7 +2509,6 @@ return array(
     'PhpCsFixer\\Fixer\\Comment\\SingleLineCommentSpacingFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Comment/SingleLineCommentSpacingFixer.php',
     'PhpCsFixer\\Fixer\\Comment\\SingleLineCommentStyleFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Comment/SingleLineCommentStyleFixer.php',
     'PhpCsFixer\\Fixer\\ConfigurableFixerInterface' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ConfigurableFixerInterface.php',
-    'PhpCsFixer\\Fixer\\ConfigurableFixerTrait' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ConfigurableFixerTrait.php',
     'PhpCsFixer\\Fixer\\ConstantNotation\\NativeConstantInvocationFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ConstantNotation/NativeConstantInvocationFixer.php',
     'PhpCsFixer\\Fixer\\ControlStructure\\ControlStructureBracesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ControlStructure/ControlStructureBracesFixer.php',
     'PhpCsFixer\\Fixer\\ControlStructure\\ControlStructureContinuationPositionFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/ControlStructure/ControlStructureContinuationPositionFixer.php',
@@ -2576,7 +2571,6 @@ return array(
     'PhpCsFixer\\Fixer\\Import\\SingleImportPerStatementFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Import/SingleImportPerStatementFixer.php',
     'PhpCsFixer\\Fixer\\Import\\SingleLineAfterImportsFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Import/SingleLineAfterImportsFixer.php',
     'PhpCsFixer\\Fixer\\Indentation' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/Indentation.php',
-    'PhpCsFixer\\Fixer\\InternalFixerInterface' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/InternalFixerInterface.php',
     'PhpCsFixer\\Fixer\\LanguageConstruct\\ClassKeywordFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/LanguageConstruct/ClassKeywordFixer.php',
     'PhpCsFixer\\Fixer\\LanguageConstruct\\ClassKeywordRemoveFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/LanguageConstruct/ClassKeywordRemoveFixer.php',
     'PhpCsFixer\\Fixer\\LanguageConstruct\\CombineConsecutiveIssetsFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php',
@@ -2627,7 +2621,6 @@ return array(
     'PhpCsFixer\\Fixer\\PhpTag\\FullOpeningTagFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpTag/FullOpeningTagFixer.php',
     'PhpCsFixer\\Fixer\\PhpTag\\LinebreakAfterOpeningTagFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpTag/LinebreakAfterOpeningTagFixer.php',
     'PhpCsFixer\\Fixer\\PhpTag\\NoClosingTagFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpTag/NoClosingTagFixer.php',
-    'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAssertNewNamesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAssertNewNamesFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAttributesFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAttributesFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitConstructFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitConstructFixer.php',
     'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderNameFixer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderNameFixer.php',
@@ -2741,7 +2734,6 @@ return array(
     'PhpCsFixer\\Linter\\TokenizerLinter' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Linter/TokenizerLinter.php',
     'PhpCsFixer\\Linter\\TokenizerLintingResult' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Linter/TokenizerLintingResult.php',
     'PhpCsFixer\\Linter\\UnavailableLinterException' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Linter/UnavailableLinterException.php',
-    'PhpCsFixer\\ParallelAwareConfigInterface' => $vendorDir . '/friendsofphp/php-cs-fixer/src/ParallelAwareConfigInterface.php',
     'PhpCsFixer\\PharChecker' => $vendorDir . '/friendsofphp/php-cs-fixer/src/PharChecker.php',
     'PhpCsFixer\\PharCheckerInterface' => $vendorDir . '/friendsofphp/php-cs-fixer/src/PharCheckerInterface.php',
     'PhpCsFixer\\Preg' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Preg.php',
@@ -2792,7 +2784,6 @@ return array(
     'PhpCsFixer\\RuleSet\\Sets\\PHPUnit60MigrationRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit60MigrationRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHPUnit75MigrationRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit75MigrationRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PHPUnit84MigrationRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit84MigrationRiskySet.php',
-    'PhpCsFixer\\RuleSet\\Sets\\PHPUnit91MigrationRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit91MigrationRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PSR12RiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PSR12RiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\PSR12Set' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PSR12Set.php',
     'PhpCsFixer\\RuleSet\\Sets\\PSR1Set' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PSR1Set.php',
@@ -2801,21 +2792,8 @@ return array(
     'PhpCsFixer\\RuleSet\\Sets\\PhpCsFixerSet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PhpCsFixerSet.php',
     'PhpCsFixer\\RuleSet\\Sets\\SymfonyRiskySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonyRiskySet.php',
     'PhpCsFixer\\RuleSet\\Sets\\SymfonySet' => $vendorDir . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonySet.php',
-    'PhpCsFixer\\Runner\\FileCachingLintingFileIterator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/FileCachingLintingFileIterator.php',
     'PhpCsFixer\\Runner\\FileFilterIterator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/FileFilterIterator.php',
-    'PhpCsFixer\\Runner\\LintingFileIterator' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/LintingFileIterator.php',
-    'PhpCsFixer\\Runner\\LintingResultAwareFileIteratorInterface' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/LintingResultAwareFileIteratorInterface.php',
-    'PhpCsFixer\\Runner\\Parallel\\ParallelAction' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelAction.php',
-    'PhpCsFixer\\Runner\\Parallel\\ParallelConfig' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelConfig.php',
-    'PhpCsFixer\\Runner\\Parallel\\ParallelConfigFactory' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelConfigFactory.php',
-    'PhpCsFixer\\Runner\\Parallel\\ParallelisationException' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelisationException.php',
-    'PhpCsFixer\\Runner\\Parallel\\Process' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/Process.php',
-    'PhpCsFixer\\Runner\\Parallel\\ProcessFactory' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ProcessFactory.php',
-    'PhpCsFixer\\Runner\\Parallel\\ProcessIdentifier' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ProcessIdentifier.php',
-    'PhpCsFixer\\Runner\\Parallel\\ProcessPool' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ProcessPool.php',
-    'PhpCsFixer\\Runner\\Parallel\\WorkerException' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/WorkerException.php',
     'PhpCsFixer\\Runner\\Runner' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/Runner.php',
-    'PhpCsFixer\\Runner\\RunnerConfig' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Runner/RunnerConfig.php',
     'PhpCsFixer\\StdinFileInfo' => $vendorDir . '/friendsofphp/php-cs-fixer/src/StdinFileInfo.php',
     'PhpCsFixer\\Tokenizer\\AbstractTransformer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/AbstractTransformer.php',
     'PhpCsFixer\\Tokenizer\\AbstractTypeTransformer' => $vendorDir . '/friendsofphp/php-cs-fixer/src/Tokenizer/AbstractTypeTransformer.php',
@@ -4657,7 +4635,6 @@ return array(
     'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => $vendorDir . '/symfony/process/Exception/ProcessSignaledException.php',
-    'Symfony\\Component\\Process\\Exception\\ProcessStartFailedException' => $vendorDir . '/symfony/process/Exception/ProcessStartFailedException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
     'Symfony\\Component\\Process\\Exception\\RunProcessFailedException' => $vendorDir . '/symfony/process/Exception/RunProcessFailedException.php',
     'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index e37225b2..0e5e7d90 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -755,12 +755,15 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'Composer\\Pcre\\MatchResult' => __DIR__ . '/..' . '/composer/pcre/src/MatchResult.php',
         'Composer\\Pcre\\MatchStrictGroupsResult' => __DIR__ . '/..' . '/composer/pcre/src/MatchStrictGroupsResult.php',
         'Composer\\Pcre\\MatchWithOffsetsResult' => __DIR__ . '/..' . '/composer/pcre/src/MatchWithOffsetsResult.php',
+<<<<<<< HEAD
         'Composer\\Pcre\\PHPStan\\InvalidRegexPatternRule' => __DIR__ . '/..' . '/composer/pcre/src/PHPStan/InvalidRegexPatternRule.php',
         'Composer\\Pcre\\PHPStan\\PregMatchFlags' => __DIR__ . '/..' . '/composer/pcre/src/PHPStan/PregMatchFlags.php',
         'Composer\\Pcre\\PHPStan\\PregMatchParameterOutTypeExtension' => __DIR__ . '/..' . '/composer/pcre/src/PHPStan/PregMatchParameterOutTypeExtension.php',
         'Composer\\Pcre\\PHPStan\\PregMatchTypeSpecifyingExtension' => __DIR__ . '/..' . '/composer/pcre/src/PHPStan/PregMatchTypeSpecifyingExtension.php',
         'Composer\\Pcre\\PHPStan\\PregReplaceCallbackClosureTypeExtension' => __DIR__ . '/..' . '/composer/pcre/src/PHPStan/PregReplaceCallbackClosureTypeExtension.php',
         'Composer\\Pcre\\PHPStan\\UnsafeStrictGroupsCallRule' => __DIR__ . '/..' . '/composer/pcre/src/PHPStan/UnsafeStrictGroupsCallRule.php',
+=======
+>>>>>>> 6ab523fc284ca7252530c2e19d828c23353956de
         'Composer\\Pcre\\PcreException' => __DIR__ . '/..' . '/composer/pcre/src/PcreException.php',
         'Composer\\Pcre\\Preg' => __DIR__ . '/..' . '/composer/pcre/src/Preg.php',
         'Composer\\Pcre\\Regex' => __DIR__ . '/..' . '/composer/pcre/src/Regex.php',
@@ -2689,7 +2692,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Console\\Command\\ListFilesCommand' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/Command/ListFilesCommand.php',
         'PhpCsFixer\\Console\\Command\\ListSetsCommand' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/Command/ListSetsCommand.php',
         'PhpCsFixer\\Console\\Command\\SelfUpdateCommand' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/Command/SelfUpdateCommand.php',
-        'PhpCsFixer\\Console\\Command\\WorkerCommand' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/Command/WorkerCommand.php',
         'PhpCsFixer\\Console\\ConfigurationResolver' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/ConfigurationResolver.php',
         'PhpCsFixer\\Console\\Output\\ErrorOutput' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/Output/ErrorOutput.php',
         'PhpCsFixer\\Console\\Output\\OutputContext' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Console/Output/OutputContext.php',
@@ -2739,7 +2741,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Documentation\\RuleSetDocumentationGenerator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Documentation/RuleSetDocumentationGenerator.php',
         'PhpCsFixer\\Error\\Error' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Error/Error.php',
         'PhpCsFixer\\Error\\ErrorsManager' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Error/ErrorsManager.php',
-        'PhpCsFixer\\Error\\SourceExceptionFactory' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Error/SourceExceptionFactory.php',
         'PhpCsFixer\\ExecutorWithoutErrorHandler' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/ExecutorWithoutErrorHandler.php',
         'PhpCsFixer\\ExecutorWithoutErrorHandlerException' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/ExecutorWithoutErrorHandlerException.php',
         'PhpCsFixer\\FileReader' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/FileReader.php',
@@ -2794,7 +2795,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Fixer\\ArrayNotation\\WhitespaceAfterCommaInArrayFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/WhitespaceAfterCommaInArrayFixer.php',
         'PhpCsFixer\\Fixer\\ArrayNotation\\YieldFromArrayToYieldsFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ArrayNotation/YieldFromArrayToYieldsFixer.php',
         'PhpCsFixer\\Fixer\\AttributeNotation\\AttributeEmptyParenthesesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/AttributeEmptyParenthesesFixer.php',
-        'PhpCsFixer\\Fixer\\AttributeNotation\\OrderedAttributesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/AttributeNotation/OrderedAttributesFixer.php',
         'PhpCsFixer\\Fixer\\Basic\\BracesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesFixer.php',
         'PhpCsFixer\\Fixer\\Basic\\BracesPositionFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/BracesPositionFixer.php',
         'PhpCsFixer\\Fixer\\Basic\\CurlyBracesPositionFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Basic/CurlyBracesPositionFixer.php',
@@ -2851,7 +2851,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Fixer\\Comment\\SingleLineCommentSpacingFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Comment/SingleLineCommentSpacingFixer.php',
         'PhpCsFixer\\Fixer\\Comment\\SingleLineCommentStyleFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Comment/SingleLineCommentStyleFixer.php',
         'PhpCsFixer\\Fixer\\ConfigurableFixerInterface' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ConfigurableFixerInterface.php',
-        'PhpCsFixer\\Fixer\\ConfigurableFixerTrait' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ConfigurableFixerTrait.php',
         'PhpCsFixer\\Fixer\\ConstantNotation\\NativeConstantInvocationFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ConstantNotation/NativeConstantInvocationFixer.php',
         'PhpCsFixer\\Fixer\\ControlStructure\\ControlStructureBracesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ControlStructure/ControlStructureBracesFixer.php',
         'PhpCsFixer\\Fixer\\ControlStructure\\ControlStructureContinuationPositionFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/ControlStructure/ControlStructureContinuationPositionFixer.php',
@@ -2914,7 +2913,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Fixer\\Import\\SingleImportPerStatementFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Import/SingleImportPerStatementFixer.php',
         'PhpCsFixer\\Fixer\\Import\\SingleLineAfterImportsFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Import/SingleLineAfterImportsFixer.php',
         'PhpCsFixer\\Fixer\\Indentation' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/Indentation.php',
-        'PhpCsFixer\\Fixer\\InternalFixerInterface' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/InternalFixerInterface.php',
         'PhpCsFixer\\Fixer\\LanguageConstruct\\ClassKeywordFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/LanguageConstruct/ClassKeywordFixer.php',
         'PhpCsFixer\\Fixer\\LanguageConstruct\\ClassKeywordRemoveFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/LanguageConstruct/ClassKeywordRemoveFixer.php',
         'PhpCsFixer\\Fixer\\LanguageConstruct\\CombineConsecutiveIssetsFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/LanguageConstruct/CombineConsecutiveIssetsFixer.php',
@@ -2965,7 +2963,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Fixer\\PhpTag\\FullOpeningTagFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpTag/FullOpeningTagFixer.php',
         'PhpCsFixer\\Fixer\\PhpTag\\LinebreakAfterOpeningTagFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpTag/LinebreakAfterOpeningTagFixer.php',
         'PhpCsFixer\\Fixer\\PhpTag\\NoClosingTagFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpTag/NoClosingTagFixer.php',
-        'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAssertNewNamesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAssertNewNamesFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitAttributesFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitAttributesFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitConstructFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitConstructFixer.php',
         'PhpCsFixer\\Fixer\\PhpUnit\\PhpUnitDataProviderNameFixer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Fixer/PhpUnit/PhpUnitDataProviderNameFixer.php',
@@ -3079,7 +3076,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\Linter\\TokenizerLinter' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Linter/TokenizerLinter.php',
         'PhpCsFixer\\Linter\\TokenizerLintingResult' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Linter/TokenizerLintingResult.php',
         'PhpCsFixer\\Linter\\UnavailableLinterException' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Linter/UnavailableLinterException.php',
-        'PhpCsFixer\\ParallelAwareConfigInterface' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/ParallelAwareConfigInterface.php',
         'PhpCsFixer\\PharChecker' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/PharChecker.php',
         'PhpCsFixer\\PharCheckerInterface' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/PharCheckerInterface.php',
         'PhpCsFixer\\Preg' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Preg.php',
@@ -3130,7 +3126,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\RuleSet\\Sets\\PHPUnit60MigrationRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit60MigrationRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHPUnit75MigrationRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit75MigrationRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PHPUnit84MigrationRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit84MigrationRiskySet.php',
-        'PhpCsFixer\\RuleSet\\Sets\\PHPUnit91MigrationRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PHPUnit91MigrationRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PSR12RiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PSR12RiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\PSR12Set' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PSR12Set.php',
         'PhpCsFixer\\RuleSet\\Sets\\PSR1Set' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PSR1Set.php',
@@ -3139,21 +3134,8 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'PhpCsFixer\\RuleSet\\Sets\\PhpCsFixerSet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/PhpCsFixerSet.php',
         'PhpCsFixer\\RuleSet\\Sets\\SymfonyRiskySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonyRiskySet.php',
         'PhpCsFixer\\RuleSet\\Sets\\SymfonySet' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/RuleSet/Sets/SymfonySet.php',
-        'PhpCsFixer\\Runner\\FileCachingLintingFileIterator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/FileCachingLintingFileIterator.php',
         'PhpCsFixer\\Runner\\FileFilterIterator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/FileFilterIterator.php',
-        'PhpCsFixer\\Runner\\LintingFileIterator' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/LintingFileIterator.php',
-        'PhpCsFixer\\Runner\\LintingResultAwareFileIteratorInterface' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/LintingResultAwareFileIteratorInterface.php',
-        'PhpCsFixer\\Runner\\Parallel\\ParallelAction' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelAction.php',
-        'PhpCsFixer\\Runner\\Parallel\\ParallelConfig' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelConfig.php',
-        'PhpCsFixer\\Runner\\Parallel\\ParallelConfigFactory' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelConfigFactory.php',
-        'PhpCsFixer\\Runner\\Parallel\\ParallelisationException' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ParallelisationException.php',
-        'PhpCsFixer\\Runner\\Parallel\\Process' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/Process.php',
-        'PhpCsFixer\\Runner\\Parallel\\ProcessFactory' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ProcessFactory.php',
-        'PhpCsFixer\\Runner\\Parallel\\ProcessIdentifier' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ProcessIdentifier.php',
-        'PhpCsFixer\\Runner\\Parallel\\ProcessPool' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/ProcessPool.php',
-        'PhpCsFixer\\Runner\\Parallel\\WorkerException' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Parallel/WorkerException.php',
         'PhpCsFixer\\Runner\\Runner' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/Runner.php',
-        'PhpCsFixer\\Runner\\RunnerConfig' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Runner/RunnerConfig.php',
         'PhpCsFixer\\StdinFileInfo' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/StdinFileInfo.php',
         'PhpCsFixer\\Tokenizer\\AbstractTransformer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/AbstractTransformer.php',
         'PhpCsFixer\\Tokenizer\\AbstractTypeTransformer' => __DIR__ . '/..' . '/friendsofphp/php-cs-fixer/src/Tokenizer/AbstractTypeTransformer.php',
@@ -4995,7 +4977,6 @@ class ComposerStaticInitb6668d4a545a8f860d35d17ef0fdd011
         'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessFailedException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessSignaledException.php',
-        'Symfony\\Component\\Process\\Exception\\ProcessStartFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessStartFailedException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessTimedOutException.php',
         'Symfony\\Component\\Process\\Exception\\RunProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/RunProcessFailedException.php',
         'Symfony\\Component\\Process\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/process/Exception/RuntimeException.php',
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 797c1610..52ba2af3 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,11 @@
         'name' => 'codeigniter4/framework',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+<<<<<<< HEAD
         'reference' => 'd0795dd6b2062d8b38fbda8ff9953284fcc8259d',
+=======
+        'reference' => 'a58927e2175f37504049df13fe713b885ee82d4a',
+>>>>>>> 6ab523fc284ca7252530c2e19d828c23353956de
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -31,7 +35,11 @@
         'codeigniter4/framework' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+<<<<<<< HEAD
             'reference' => 'd0795dd6b2062d8b38fbda8ff9953284fcc8259d',
+=======
+            'reference' => 'a58927e2175f37504049df13fe713b885ee82d4a',
+>>>>>>> 6ab523fc284ca7252530c2e19d828c23353956de
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),