Merge pull request #5 from subhashladumor1/dev

item table html

Author: subhashladumor1

composer.json

@@ -3,7 +3,7 @@
     "description": "💼 Laravel InvoiceLite — Multi-language, multi-country, professional invoice generator with PDF/Image export, templates, taxes & sharing 🚀",
     "type": "library",
     "license": "MIT",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "keywords": [
         "laravel invoice",
         "invoice generator",

src/Services/TemplateManager.php

@@ -13,7 +13,7 @@ class TemplateManager
     public function render(string $template, array $data, string $language = 'en'): string
     {
         // Set the application locale
-        App::setLocale($language);
+        app()->setLocale($language);
 
         // Ensure required data is present
         $data = array_merge([
@@ -64,6 +64,9 @@ public function render(string $template, array $data, string $language = 'en'):
             $data['qr_code'] = ''; // QR code package not available
         }
 
+        // Generate items table HTML for both View system and fallback
+        $data['itemsHtml'] = $this->generateItemsHtml($data['items'] ?? []);
+        
         // Try to render using Laravel's view system
         try {
             // Check if custom template exists
@@ -81,6 +84,30 @@ public function render(string $template, array $data, string $language = 'en'):
         }
     }
 
+    /**
+     * Generate HTML for items table
+     */
+    protected function generateItemsHtml(array $items): string
+    {
+        $itemsHtml = '';
+        if (isset($items) && is_array($items)) {
+            foreach ($items as $item) {
+                $itemName = $item['name'] ?? '';
+                $itemQty = $item['qty'] ?? 0;
+                $itemPrice = $item['price'] ?? 0;
+                $itemTotal = (($item['price'] ?? 0) * ($item['qty'] ?? 1));
+                
+                $itemsHtml .= "<tr>";
+                $itemsHtml .= "<td>{$itemName}</td>";
+                $itemsHtml .= "<td>{$itemQty}</td>";
+                $itemsHtml .= "<td>" . number_format($itemPrice, 2) . "</td>";
+                $itemsHtml .= "<td>" . number_format($itemTotal, 2) . "</td>";
+                $itemsHtml .= "</tr>";
+            }
+        }
+        return $itemsHtml;
+    }
+    
     /**
      * Fallback rendering method using file content
      */
@@ -122,24 +149,7 @@ protected function renderFromFile(string $template, array $data): string
         $content = str_replace('{{ $tax }}', $data['tax'] ?? 0, $content);
 
         // Add items table
-        $itemsHtml = '';
-        if (isset($data['items']) && is_array($data['items'])) {
-            foreach ($data['items'] as $item) {
-                $itemName = $item['name'] ?? '';
-                $itemQty = $item['qty'] ?? 0;
-                $itemPrice = $item['price'] ?? 0;
-                $itemTotal = (($item['price'] ?? 0) * ($item['qty'] ?? 1));
-                
-                $itemsHtml .= "<tr>";
-                $itemsHtml .= "<td>{$itemName}</td>";
-                $itemsHtml .= "<td>{$itemQty}</td>";
-                $itemsHtml .= "<td>" . number_format($itemPrice, 2) . "</td>";
-                $itemsHtml .= "<td>" . number_format($itemTotal, 2) . "</td>";
-                $itemsHtml .= "</tr>";
-            }
-        }
-        
-        $content = str_replace('@itemsTable', $itemsHtml, $content);
+        $content = str_replace('@itemsTable', $data['itemsHtml'] ?? '', $content);
 
         // Replace totals with proper formatting
         $content = str_replace('{{ $subtotal }}', number_format($data['subtotal'] ?? 0, 2), $content);

src/Templates/business.blade.php

@@ -284,7 +284,7 @@
                 </tr>
             </thead>
             <tbody>
-                @itemsTable
+                {!! $itemsHtml !!}
             </tbody>
         </table>
 

src/Templates/classic.blade.php

@@ -193,7 +193,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @itemsTable
+                    {!! $itemsHtml !!}
                 </tbody>
             </table>
 

src/Templates/corporate.blade.php

@@ -301,7 +301,7 @@
                 </tr>
             </thead>
             <tbody>
-                @itemsTable
+                {!! $itemsHtml !!}
             </tbody>
         </table>
 

src/Templates/minimal.blade.php

@@ -210,7 +210,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @itemsTable
+                    {!! $itemsHtml !!}
                 </tbody>
             </table>
 

src/Templates/modern.blade.php

@@ -218,7 +218,7 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @itemsTable
+                    {!! $itemsHtml !!}
                 </tbody>
             </table>