KPI /issues/477

Author: SMEWebify

app/Http/Controllers/Workflow/OrdersController.php

@@ -52,6 +52,7 @@ public function index()
         $lateOrdersCount = $this->orderKPIService->getLateOrdersCount();
         $remainingDeliveryOrder =   $this->orderKPIService->getOrderMonthlyRemainingToDelivery(now()->month, $CurentYear);
         $remainingInvoiceOrder =   $this->orderKPIService->getOrderMonthlyRemainingToInvoice();
+        $serviceRate =   $this->orderKPIService->getServiceRate();
         $data['ordersDataRate']= $this->orderKPIService->getOrdersDataRate();
         $data['orderMonthlyRecap'] = $this->orderKPIService->getOrderMonthlyRecap($CurentYear);
         $data['orderMonthlyRecapPreviousYear'] = $this->orderKPIService->getOrderMonthlyRecapPreviousYear($CurentYear);
@@ -63,6 +64,7 @@ public function index()
             'lateOrdersCount',
             'remainingDeliveryOrder',
             'remainingInvoiceOrder',
+            'serviceRate',
             'data',
         ));
     }

app/Services/OrderKPIService.php

@@ -267,15 +267,29 @@ public function getTopCustomersByOrderVolume($limit = 5)
     }
 
     /**
-    * Get the number of pending orders for the current year.
+    * Calculate the Service Rate.
     *
-    * An order is pending if it is not fully delivered and the remaining quantity to be delivered is > 0.
+    * The Service Rate is calculated by dividing the number of requests (order lines)
+    * fulfilled on time (those with a delivery date less than or equal to the
+    * expected date) by the total number of requests, then multiplying the result by 100
     *
-    * @return int The number of pending orders.
+    * @return float Service Rate as a percentage
     */
-    public function getPendingOrdersCount()
+    public function getServiceRate()
     {
-        return Orders::whereYear('created_at', now()->year)->where('statu', '!=', 3)->count();
-    }
+        $totalOrderLines = OrderLines::where('delivery_status', 3)->count();
+
+        $onTimeDeliveries = OrderLines::where('delivery_status', 3)
+                                        ->whereHas('DeliveryLines', function ($query) {
+                                            $query->whereColumn('delivery_lines.created_at', '<=', 'order_lines.delivery_date');
+                                        })->count();
+
+        if ($totalOrderLines === 0) {
+            return 0; // Éviter la division par zéro
+        }
+
+        $serviceRate = round(($onTimeDeliveries / $totalOrderLines) * 100,2);
 
+        return $serviceRate;
+    }
 }

resources/lang/en/general_content.php

@@ -595,6 +595,7 @@
     'delivered_month_in_progress_trans_key'    => 'Total Delivered for the month',
     'remaining_month_trans_key'                => 'Total remaining to deliver',
     'remaining_invoice_month_trans_key'        => 'Total remaining to invoice',
+    'service_rate_trans_key'                   => 'Service rate',
     'niko_niko_team_trans_key'                 => 'Niko Niko - Team Moods Today',
     'no_niko_niko_team_trans_key'              => 'No team mood today',
 

resources/lang/fr/general_content.php

@@ -595,6 +595,7 @@
     'delivered_month_in_progress_trans_key'    => 'Total livré du mois',
     'remaining_month_trans_key'                => 'Total restant à livrer',
     'remaining_invoice_month_trans_key'        => 'Total restant à facturer',
+    'service_rate_trans_key'                   => 'Taux de service',
     'niko_niko_team_trans_key'                 => 'Niko Niko - Humeur de l\'équipe aujourd\'hui',
     'no_niko_niko_team_trans_key'              => 'Aucune humeur aujourd\'hui',
 

resources/views/workflow/orders-index.blade.php

@@ -42,6 +42,12 @@
               icon="icon fas fa-info"
               theme="warning" />
         <x-adminlte-small-box title="{{ $lateOrdersCount }}" text="{{ __('general_content.late_orders_trans_key') }}" icon="fas fa-exclamation-triangle" theme="orange"/>
+        <x-adminlte-small-box 
+              title="{{ $serviceRate }}%" 
+              text="{{ __('general_content.service_rate_trans_key') }}" 
+              icon="fas fa-chart-line" 
+              theme="primary"
+          />
       </div>
       <div class="col-lg-8 col-8">
         <!-- CHART: TOTAL OVERVIEW -->