diff --git a/app/Models/Estimate.php b/app/Models/Estimate.php
index 050caffe..a3fa3132 100644
--- a/app/Models/Estimate.php
+++ b/app/Models/Estimate.php
@@ -77,7 +77,7 @@ class Estimate extends Model implements HasMedia
     {
         // Get the last created order
         $lastOrder = Estimate::where('estimate_number', 'LIKE', $value . '-%')
-            ->orderBy('created_at', 'desc')
+            ->orderBy('estimate_number', 'desc')
             ->first();
 
         if (!$lastOrder) {
@@ -435,7 +435,7 @@ class Estimate extends Model implements HasMedia
 
         if ($logo && $isLocalhost && $isSystem) {
             $logo = $logo->getPath();
-        } else if($logo) {
+        } else if ($logo) {
             $logo = $logo->getFullUrl();
         }
 
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index cd830e92..f0d36616 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -81,7 +81,7 @@ class Invoice extends Model implements HasMedia
     {
         // Get the last created order
         $lastOrder = Invoice::where('invoice_number', 'LIKE', $value . '-%')
-            ->orderBy('created_at', 'desc')
+            ->orderBy('invoice_number', 'desc')
             ->first();
 
 
@@ -363,11 +363,11 @@ class Invoice extends Model implements HasMedia
         }
 
         $invoice = Invoice::with([
-                'items',
-                'user',
-                'invoiceTemplate',
-                'taxes'
-            ])
+            'items',
+            'user',
+            'invoiceTemplate',
+            'taxes'
+        ])
             ->find($invoice->id);
 
         return $invoice;
@@ -519,7 +519,7 @@ class Invoice extends Model implements HasMedia
 
         if ($logo && $isLocalhost && $isSystem) {
             $logo = $logo->getPath();
-        } else if($logo) {
+        } else if ($logo) {
             $logo = $logo->getFullUrl();
         }