Andrew Wallo 1 vuosi sitten
vanhempi
commit
944de5ecb4

+ 1
- 8
app/Services/ReportService.php Näytä tiedosto

@@ -458,13 +458,6 @@ class ReportService
458 458
             $categoryAccounts = [];
459 459
             $subCategoryTotals = [];
460 460
 
461
-            foreach (AccountType::cases() as $accountType) {
462
-                if ($accountType->getCategory() === $category && $accountType !== AccountType::Equity) {
463
-                    $categoryAccountsByType[$accountType->getPluralLabel()] = [];
464
-                    $subCategoryTotals[$accountType->getPluralLabel()] = 0;
465
-                }
466
-            }
467
-
468 461
             /** @var Account $account */
469 462
             foreach ($accounts as $account) {
470 463
                 if ($account->type->getCategory() === $category) {
@@ -489,7 +482,7 @@ class ReportService
489 482
                     } else {
490 483
                         $accountType = $account->type->getPluralLabel();
491 484
                         $categoryAccountsByType[$accountType][] = $accountDTO;
492
-                        $subCategoryTotals[$accountType] += $endingBalance;
485
+                        $subCategoryTotals[$accountType] = ($subCategoryTotals[$accountType] ?? 0) + $endingBalance;
493 486
                     }
494 487
                 }
495 488
             }

+ 15
- 0
app/Transformers/BaseReportTransformer.php Näytä tiedosto

@@ -25,6 +25,21 @@ abstract class BaseReportTransformer implements ExportableReport
25 25
         return 'components.company.reports.report-pdf';
26 26
     }
27 27
 
28
+    public function getAlignment(int $index): string
29
+    {
30
+        $column = $this->getColumns()[$index];
31
+
32
+        if ($column->getAlignment() === Alignment::Right) {
33
+            return 'right';
34
+        }
35
+
36
+        if ($column->getAlignment() === Alignment::Center) {
37
+            return 'center';
38
+        }
39
+
40
+        return 'left';
41
+    }
42
+
28 43
     public function getAlignmentClass(int $index): string
29 44
     {
30 45
         $column = $this->getColumns()[$index];

+ 130
- 130
composer.lock Näytä tiedosto

@@ -497,16 +497,16 @@
497 497
         },
498 498
         {
499 499
             "name": "aws/aws-sdk-php",
500
-            "version": "3.324.1",
500
+            "version": "3.324.5",
501 501
             "source": {
502 502
                 "type": "git",
503 503
                 "url": "https://github.com/aws/aws-sdk-php.git",
504
-                "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc"
504
+                "reference": "052c5d429ccd8775f7eed2855c2ca8cae2be52cb"
505 505
             },
506 506
             "dist": {
507 507
                 "type": "zip",
508
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5b824a9b8015a38f18c53b023975c0f63c7bd3dc",
509
-                "reference": "5b824a9b8015a38f18c53b023975c0f63c7bd3dc",
508
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/052c5d429ccd8775f7eed2855c2ca8cae2be52cb",
509
+                "reference": "052c5d429ccd8775f7eed2855c2ca8cae2be52cb",
510 510
                 "shasum": ""
511 511
             },
512 512
             "require": {
@@ -589,9 +589,9 @@
589 589
             "support": {
590 590
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
591 591
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
592
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.1"
592
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.324.5"
593 593
             },
594
-            "time": "2024-10-11T18:22:01+00:00"
594
+            "time": "2024-10-17T18:12:04+00:00"
595 595
         },
596 596
         {
597 597
             "name": "aws/aws-sdk-php-laravel",
@@ -819,16 +819,16 @@
819 819
         },
820 820
         {
821 821
             "name": "blade-ui-kit/blade-icons",
822
-            "version": "1.7.1",
822
+            "version": "1.7.2",
823 823
             "source": {
824 824
                 "type": "git",
825 825
                 "url": "https://github.com/blade-ui-kit/blade-icons.git",
826
-                "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595"
826
+                "reference": "75a54a3f5a2810fcf6574ab23e91b6cc229a1b53"
827 827
             },
828 828
             "dist": {
829 829
                 "type": "zip",
830
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/8f787baf09d88cdfd6ec4dbaba11ebfa885f0595",
831
-                "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595",
830
+                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/75a54a3f5a2810fcf6574ab23e91b6cc229a1b53",
831
+                "reference": "75a54a3f5a2810fcf6574ab23e91b6cc229a1b53",
832 832
                 "shasum": ""
833 833
             },
834 834
             "require": {
@@ -896,7 +896,7 @@
896 896
                     "type": "paypal"
897 897
                 }
898 898
             ],
899
-            "time": "2024-08-14T14:25:11+00:00"
899
+            "time": "2024-10-17T17:38:00+00:00"
900 900
         },
901 901
         {
902 902
             "name": "brick/math",
@@ -1664,16 +1664,16 @@
1664 1664
         },
1665 1665
         {
1666 1666
             "name": "filament/actions",
1667
-            "version": "v3.2.117",
1667
+            "version": "v3.2.119",
1668 1668
             "source": {
1669 1669
                 "type": "git",
1670 1670
                 "url": "https://github.com/filamentphp/actions.git",
1671
-                "reference": "886108b59ce99edc26f5bc1231134a95ec58718a"
1671
+                "reference": "addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8"
1672 1672
             },
1673 1673
             "dist": {
1674 1674
                 "type": "zip",
1675
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/886108b59ce99edc26f5bc1231134a95ec58718a",
1676
-                "reference": "886108b59ce99edc26f5bc1231134a95ec58718a",
1675
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8",
1676
+                "reference": "addd6a6f5e8e250a34c7c12bcb4060cc5ecbb9e8",
1677 1677
                 "shasum": ""
1678 1678
             },
1679 1679
             "require": {
@@ -1713,20 +1713,20 @@
1713 1713
                 "issues": "https://github.com/filamentphp/filament/issues",
1714 1714
                 "source": "https://github.com/filamentphp/filament"
1715 1715
             },
1716
-            "time": "2024-10-09T11:19:22+00:00"
1716
+            "time": "2024-10-16T12:07:31+00:00"
1717 1717
         },
1718 1718
         {
1719 1719
             "name": "filament/filament",
1720
-            "version": "v3.2.117",
1720
+            "version": "v3.2.119",
1721 1721
             "source": {
1722 1722
                 "type": "git",
1723 1723
                 "url": "https://github.com/filamentphp/panels.git",
1724
-                "reference": "84f839b4b42549c0d4bd231648da17561ada70c2"
1724
+                "reference": "6ab7628f7a0c164d694a540dfe69b8d79484fd7d"
1725 1725
             },
1726 1726
             "dist": {
1727 1727
                 "type": "zip",
1728
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/84f839b4b42549c0d4bd231648da17561ada70c2",
1729
-                "reference": "84f839b4b42549c0d4bd231648da17561ada70c2",
1728
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/6ab7628f7a0c164d694a540dfe69b8d79484fd7d",
1729
+                "reference": "6ab7628f7a0c164d694a540dfe69b8d79484fd7d",
1730 1730
                 "shasum": ""
1731 1731
             },
1732 1732
             "require": {
@@ -1778,20 +1778,20 @@
1778 1778
                 "issues": "https://github.com/filamentphp/filament/issues",
1779 1779
                 "source": "https://github.com/filamentphp/filament"
1780 1780
             },
1781
-            "time": "2024-10-08T14:24:12+00:00"
1781
+            "time": "2024-10-17T09:39:37+00:00"
1782 1782
         },
1783 1783
         {
1784 1784
             "name": "filament/forms",
1785
-            "version": "v3.2.117",
1785
+            "version": "v3.2.119",
1786 1786
             "source": {
1787 1787
                 "type": "git",
1788 1788
                 "url": "https://github.com/filamentphp/forms.git",
1789
-                "reference": "896c868cca474b2e925a3e6162b7c76d8ff3e5fc"
1789
+                "reference": "9eaf88275da18777b1738514db6083e34b1700d4"
1790 1790
             },
1791 1791
             "dist": {
1792 1792
                 "type": "zip",
1793
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/896c868cca474b2e925a3e6162b7c76d8ff3e5fc",
1794
-                "reference": "896c868cca474b2e925a3e6162b7c76d8ff3e5fc",
1793
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/9eaf88275da18777b1738514db6083e34b1700d4",
1794
+                "reference": "9eaf88275da18777b1738514db6083e34b1700d4",
1795 1795
                 "shasum": ""
1796 1796
             },
1797 1797
             "require": {
@@ -1834,20 +1834,20 @@
1834 1834
                 "issues": "https://github.com/filamentphp/filament/issues",
1835 1835
                 "source": "https://github.com/filamentphp/filament"
1836 1836
             },
1837
-            "time": "2024-10-09T11:19:26+00:00"
1837
+            "time": "2024-10-16T12:07:33+00:00"
1838 1838
         },
1839 1839
         {
1840 1840
             "name": "filament/infolists",
1841
-            "version": "v3.2.117",
1841
+            "version": "v3.2.119",
1842 1842
             "source": {
1843 1843
                 "type": "git",
1844 1844
                 "url": "https://github.com/filamentphp/infolists.git",
1845
-                "reference": "fc5f01c094fe25ef906f3e1b88d3d8883a73d6be"
1845
+                "reference": "f107a83c3ac042a4d4608d45173cf88c0c55276c"
1846 1846
             },
1847 1847
             "dist": {
1848 1848
                 "type": "zip",
1849
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/fc5f01c094fe25ef906f3e1b88d3d8883a73d6be",
1850
-                "reference": "fc5f01c094fe25ef906f3e1b88d3d8883a73d6be",
1849
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/f107a83c3ac042a4d4608d45173cf88c0c55276c",
1850
+                "reference": "f107a83c3ac042a4d4608d45173cf88c0c55276c",
1851 1851
                 "shasum": ""
1852 1852
             },
1853 1853
             "require": {
@@ -1885,20 +1885,20 @@
1885 1885
                 "issues": "https://github.com/filamentphp/filament/issues",
1886 1886
                 "source": "https://github.com/filamentphp/filament"
1887 1887
             },
1888
-            "time": "2024-10-08T14:24:09+00:00"
1888
+            "time": "2024-10-16T12:07:29+00:00"
1889 1889
         },
1890 1890
         {
1891 1891
             "name": "filament/notifications",
1892
-            "version": "v3.2.117",
1892
+            "version": "v3.2.119",
1893 1893
             "source": {
1894 1894
                 "type": "git",
1895 1895
                 "url": "https://github.com/filamentphp/notifications.git",
1896
-                "reference": "a5f684b690354630210fc9a90bd06da9b1f6ae82"
1896
+                "reference": "b56b155efd4290459d944a1b3d515b5aaf54846d"
1897 1897
             },
1898 1898
             "dist": {
1899 1899
                 "type": "zip",
1900
-                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/a5f684b690354630210fc9a90bd06da9b1f6ae82",
1901
-                "reference": "a5f684b690354630210fc9a90bd06da9b1f6ae82",
1900
+                "url": "https://api.github.com/repos/filamentphp/notifications/zipball/b56b155efd4290459d944a1b3d515b5aaf54846d",
1901
+                "reference": "b56b155efd4290459d944a1b3d515b5aaf54846d",
1902 1902
                 "shasum": ""
1903 1903
             },
1904 1904
             "require": {
@@ -1937,20 +1937,20 @@
1937 1937
                 "issues": "https://github.com/filamentphp/filament/issues",
1938 1938
                 "source": "https://github.com/filamentphp/filament"
1939 1939
             },
1940
-            "time": "2024-10-08T14:24:11+00:00"
1940
+            "time": "2024-10-16T12:07:28+00:00"
1941 1941
         },
1942 1942
         {
1943 1943
             "name": "filament/support",
1944
-            "version": "v3.2.117",
1944
+            "version": "v3.2.119",
1945 1945
             "source": {
1946 1946
                 "type": "git",
1947 1947
                 "url": "https://github.com/filamentphp/support.git",
1948
-                "reference": "31fcff80b873b4decdba10d5f7010310e12c8e94"
1948
+                "reference": "85d83838ec0290fffba2be3f99a8b0840da1dc01"
1949 1949
             },
1950 1950
             "dist": {
1951 1951
                 "type": "zip",
1952
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/31fcff80b873b4decdba10d5f7010310e12c8e94",
1953
-                "reference": "31fcff80b873b4decdba10d5f7010310e12c8e94",
1952
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/85d83838ec0290fffba2be3f99a8b0840da1dc01",
1953
+                "reference": "85d83838ec0290fffba2be3f99a8b0840da1dc01",
1954 1954
                 "shasum": ""
1955 1955
             },
1956 1956
             "require": {
@@ -1961,7 +1961,7 @@
1961 1961
                 "illuminate/support": "^10.45|^11.0",
1962 1962
                 "illuminate/view": "^10.45|^11.0",
1963 1963
                 "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0",
1964
-                "livewire/livewire": "^3.4.10 <= 3.5.6",
1964
+                "livewire/livewire": "^3.4.10",
1965 1965
                 "php": "^8.1",
1966 1966
                 "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0",
1967 1967
                 "spatie/color": "^1.5",
@@ -1996,20 +1996,20 @@
1996 1996
                 "issues": "https://github.com/filamentphp/filament/issues",
1997 1997
                 "source": "https://github.com/filamentphp/filament"
1998 1998
             },
1999
-            "time": "2024-10-08T14:24:29+00:00"
1999
+            "time": "2024-10-16T12:07:44+00:00"
2000 2000
         },
2001 2001
         {
2002 2002
             "name": "filament/tables",
2003
-            "version": "v3.2.117",
2003
+            "version": "v3.2.119",
2004 2004
             "source": {
2005 2005
                 "type": "git",
2006 2006
                 "url": "https://github.com/filamentphp/tables.git",
2007
-                "reference": "152bf46a8f2c46f047835771a67085c2866b039b"
2007
+                "reference": "fac7e8e9a787aef94f45938fd47b50ea3f9d3bff"
2008 2008
             },
2009 2009
             "dist": {
2010 2010
                 "type": "zip",
2011
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/152bf46a8f2c46f047835771a67085c2866b039b",
2012
-                "reference": "152bf46a8f2c46f047835771a67085c2866b039b",
2011
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/fac7e8e9a787aef94f45938fd47b50ea3f9d3bff",
2012
+                "reference": "fac7e8e9a787aef94f45938fd47b50ea3f9d3bff",
2013 2013
                 "shasum": ""
2014 2014
             },
2015 2015
             "require": {
@@ -2048,11 +2048,11 @@
2048 2048
                 "issues": "https://github.com/filamentphp/filament/issues",
2049 2049
                 "source": "https://github.com/filamentphp/filament"
2050 2050
             },
2051
-            "time": "2024-10-08T14:24:25+00:00"
2051
+            "time": "2024-10-16T12:07:46+00:00"
2052 2052
         },
2053 2053
         {
2054 2054
             "name": "filament/widgets",
2055
-            "version": "v3.2.117",
2055
+            "version": "v3.2.119",
2056 2056
             "source": {
2057 2057
                 "type": "git",
2058 2058
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -2493,16 +2493,16 @@
2493 2493
         },
2494 2494
         {
2495 2495
             "name": "guzzlehttp/promises",
2496
-            "version": "2.0.3",
2496
+            "version": "2.0.4",
2497 2497
             "source": {
2498 2498
                 "type": "git",
2499 2499
                 "url": "https://github.com/guzzle/promises.git",
2500
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
2500
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
2501 2501
             },
2502 2502
             "dist": {
2503 2503
                 "type": "zip",
2504
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
2505
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
2504
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
2505
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
2506 2506
                 "shasum": ""
2507 2507
             },
2508 2508
             "require": {
@@ -2556,7 +2556,7 @@
2556 2556
             ],
2557 2557
             "support": {
2558 2558
                 "issues": "https://github.com/guzzle/promises/issues",
2559
-                "source": "https://github.com/guzzle/promises/tree/2.0.3"
2559
+                "source": "https://github.com/guzzle/promises/tree/2.0.4"
2560 2560
             },
2561 2561
             "funding": [
2562 2562
                 {
@@ -2572,7 +2572,7 @@
2572 2572
                     "type": "tidelift"
2573 2573
                 }
2574 2574
             ],
2575
-            "time": "2024-07-18T10:29:17+00:00"
2575
+            "time": "2024-10-17T10:06:22+00:00"
2576 2576
         },
2577 2577
         {
2578 2578
             "name": "guzzlehttp/psr7",
@@ -2908,16 +2908,16 @@
2908 2908
         },
2909 2909
         {
2910 2910
             "name": "laravel/framework",
2911
-            "version": "v11.27.2",
2911
+            "version": "v11.28.1",
2912 2912
             "source": {
2913 2913
                 "type": "git",
2914 2914
                 "url": "https://github.com/laravel/framework.git",
2915
-                "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9"
2915
+                "reference": "3ef5c8a85b4c598d5ffaf98afd72f6a5d6a0be2c"
2916 2916
             },
2917 2917
             "dist": {
2918 2918
                 "type": "zip",
2919
-                "url": "https://api.github.com/repos/laravel/framework/zipball/a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9",
2920
-                "reference": "a51d1f2b771c542324a3d9b76a98b1bbc75c0ee9",
2919
+                "url": "https://api.github.com/repos/laravel/framework/zipball/3ef5c8a85b4c598d5ffaf98afd72f6a5d6a0be2c",
2920
+                "reference": "3ef5c8a85b4c598d5ffaf98afd72f6a5d6a0be2c",
2921 2921
                 "shasum": ""
2922 2922
             },
2923 2923
             "require": {
@@ -3113,25 +3113,25 @@
3113 3113
                 "issues": "https://github.com/laravel/framework/issues",
3114 3114
                 "source": "https://github.com/laravel/framework"
3115 3115
             },
3116
-            "time": "2024-10-09T04:17:35+00:00"
3116
+            "time": "2024-10-16T16:32:21+00:00"
3117 3117
         },
3118 3118
         {
3119 3119
             "name": "laravel/prompts",
3120
-            "version": "v0.1.25",
3120
+            "version": "v0.3.1",
3121 3121
             "source": {
3122 3122
                 "type": "git",
3123 3123
                 "url": "https://github.com/laravel/prompts.git",
3124
-                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95"
3124
+                "reference": "0f3848a445562dac376b27968f753c65e7e1036e"
3125 3125
             },
3126 3126
             "dist": {
3127 3127
                 "type": "zip",
3128
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/7b4029a84c37cb2725fc7f011586e2997040bc95",
3129
-                "reference": "7b4029a84c37cb2725fc7f011586e2997040bc95",
3128
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/0f3848a445562dac376b27968f753c65e7e1036e",
3129
+                "reference": "0f3848a445562dac376b27968f753c65e7e1036e",
3130 3130
                 "shasum": ""
3131 3131
             },
3132 3132
             "require": {
3133
+                "composer-runtime-api": "^2.2",
3133 3134
                 "ext-mbstring": "*",
3134
-                "illuminate/collections": "^10.0|^11.0",
3135 3135
                 "php": "^8.1",
3136 3136
                 "symfony/console": "^6.2|^7.0"
3137 3137
             },
@@ -3140,6 +3140,7 @@
3140 3140
                 "laravel/framework": ">=10.17.0 <10.25.0"
3141 3141
             },
3142 3142
             "require-dev": {
3143
+                "illuminate/collections": "^10.0|^11.0",
3143 3144
                 "mockery/mockery": "^1.5",
3144 3145
                 "pestphp/pest": "^2.3",
3145 3146
                 "phpstan/phpstan": "^1.11",
@@ -3151,7 +3152,7 @@
3151 3152
             "type": "library",
3152 3153
             "extra": {
3153 3154
                 "branch-alias": {
3154
-                    "dev-main": "0.1.x-dev"
3155
+                    "dev-main": "0.3.x-dev"
3155 3156
                 }
3156 3157
             },
3157 3158
             "autoload": {
@@ -3169,9 +3170,9 @@
3169 3170
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
3170 3171
             "support": {
3171 3172
                 "issues": "https://github.com/laravel/prompts/issues",
3172
-                "source": "https://github.com/laravel/prompts/tree/v0.1.25"
3173
+                "source": "https://github.com/laravel/prompts/tree/v0.3.1"
3173 3174
             },
3174
-            "time": "2024-08-12T22:06:33+00:00"
3175
+            "time": "2024-10-09T19:42:26+00:00"
3175 3176
         },
3176 3177
         {
3177 3178
             "name": "laravel/sanctum",
@@ -4151,16 +4152,16 @@
4151 4152
         },
4152 4153
         {
4153 4154
             "name": "livewire/livewire",
4154
-            "version": "v3.5.6",
4155
+            "version": "v3.5.12",
4155 4156
             "source": {
4156 4157
                 "type": "git",
4157 4158
                 "url": "https://github.com/livewire/livewire.git",
4158
-                "reference": "597a2808d8d3001cc3ed5ce89a6ebab00f83b80f"
4159
+                "reference": "3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d"
4159 4160
             },
4160 4161
             "dist": {
4161 4162
                 "type": "zip",
4162
-                "url": "https://api.github.com/repos/livewire/livewire/zipball/597a2808d8d3001cc3ed5ce89a6ebab00f83b80f",
4163
-                "reference": "597a2808d8d3001cc3ed5ce89a6ebab00f83b80f",
4163
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d",
4164
+                "reference": "3c8d1f9d7d9098aaea663093ae168f2d5d2ae73d",
4164 4165
                 "shasum": ""
4165 4166
             },
4166 4167
             "require": {
@@ -4168,7 +4169,7 @@
4168 4169
                 "illuminate/routing": "^10.0|^11.0",
4169 4170
                 "illuminate/support": "^10.0|^11.0",
4170 4171
                 "illuminate/validation": "^10.0|^11.0",
4171
-                "laravel/prompts": "^0.1.24",
4172
+                "laravel/prompts": "^0.1.24|^0.2|^0.3",
4172 4173
                 "league/mime-type-detection": "^1.9",
4173 4174
                 "php": "^8.1",
4174 4175
                 "symfony/console": "^6.0|^7.0",
@@ -4215,7 +4216,7 @@
4215 4216
             "description": "A front-end framework for Laravel.",
4216 4217
             "support": {
4217 4218
                 "issues": "https://github.com/livewire/livewire/issues",
4218
-                "source": "https://github.com/livewire/livewire/tree/v3.5.6"
4219
+                "source": "https://github.com/livewire/livewire/tree/v3.5.12"
4219 4220
             },
4220 4221
             "funding": [
4221 4222
                 {
@@ -4223,7 +4224,7 @@
4223 4224
                     "type": "github"
4224 4225
                 }
4225 4226
             ],
4226
-            "time": "2024-08-19T11:52:18+00:00"
4227
+            "time": "2024-10-15T19:35:06+00:00"
4227 4228
         },
4228 4229
         {
4229 4230
             "name": "masterminds/html5",
@@ -4896,32 +4897,31 @@
4896 4897
         },
4897 4898
         {
4898 4899
             "name": "nunomaduro/termwind",
4899
-            "version": "v2.1.0",
4900
+            "version": "v2.2.0",
4900 4901
             "source": {
4901 4902
                 "type": "git",
4902 4903
                 "url": "https://github.com/nunomaduro/termwind.git",
4903
-                "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a"
4904
+                "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3"
4904 4905
             },
4905 4906
             "dist": {
4906 4907
                 "type": "zip",
4907
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/e5f21eade88689536c0cdad4c3cd75f3ed26e01a",
4908
-                "reference": "e5f21eade88689536c0cdad4c3cd75f3ed26e01a",
4908
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/42c84e4e8090766bbd6445d06cd6e57650626ea3",
4909
+                "reference": "42c84e4e8090766bbd6445d06cd6e57650626ea3",
4909 4910
                 "shasum": ""
4910 4911
             },
4911 4912
             "require": {
4912 4913
                 "ext-mbstring": "*",
4913 4914
                 "php": "^8.2",
4914
-                "symfony/console": "^7.0.4"
4915
+                "symfony/console": "^7.1.5"
4915 4916
             },
4916 4917
             "require-dev": {
4917
-                "ergebnis/phpstan-rules": "^2.2.0",
4918
-                "illuminate/console": "^11.1.1",
4919
-                "laravel/pint": "^1.15.0",
4920
-                "mockery/mockery": "^1.6.11",
4921
-                "pestphp/pest": "^2.34.6",
4922
-                "phpstan/phpstan": "^1.10.66",
4923
-                "phpstan/phpstan-strict-rules": "^1.5.2",
4924
-                "symfony/var-dumper": "^7.0.4",
4918
+                "illuminate/console": "^11.28.0",
4919
+                "laravel/pint": "^1.18.1",
4920
+                "mockery/mockery": "^1.6.12",
4921
+                "pestphp/pest": "^2.36.0",
4922
+                "phpstan/phpstan": "^1.12.6",
4923
+                "phpstan/phpstan-strict-rules": "^1.6.1",
4924
+                "symfony/var-dumper": "^7.1.5",
4925 4925
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
4926 4926
             },
4927 4927
             "type": "library",
@@ -4964,7 +4964,7 @@
4964 4964
             ],
4965 4965
             "support": {
4966 4966
                 "issues": "https://github.com/nunomaduro/termwind/issues",
4967
-                "source": "https://github.com/nunomaduro/termwind/tree/v2.1.0"
4967
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.2.0"
4968 4968
             },
4969 4969
             "funding": [
4970 4970
                 {
@@ -4980,7 +4980,7 @@
4980 4980
                     "type": "github"
4981 4981
                 }
4982 4982
             ],
4983
-            "time": "2024-09-05T15:25:50+00:00"
4983
+            "time": "2024-10-15T16:15:16+00:00"
4984 4984
         },
4985 4985
         {
4986 4986
             "name": "openspout/openspout",
@@ -9158,16 +9158,16 @@
9158 9158
     "packages-dev": [
9159 9159
         {
9160 9160
             "name": "brianium/paratest",
9161
-            "version": "v7.5.7",
9161
+            "version": "v7.6.0",
9162 9162
             "source": {
9163 9163
                 "type": "git",
9164 9164
                 "url": "https://github.com/paratestphp/paratest.git",
9165
-                "reference": "4890b17f569efea5e034e519dc883da53a67448d"
9165
+                "reference": "68ff89a8de47d086588e391a516d2a5b5fde6254"
9166 9166
             },
9167 9167
             "dist": {
9168 9168
                 "type": "zip",
9169
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/4890b17f569efea5e034e519dc883da53a67448d",
9170
-                "reference": "4890b17f569efea5e034e519dc883da53a67448d",
9169
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/68ff89a8de47d086588e391a516d2a5b5fde6254",
9170
+                "reference": "68ff89a8de47d086588e391a516d2a5b5fde6254",
9171 9171
                 "shasum": ""
9172 9172
             },
9173 9173
             "require": {
@@ -9177,11 +9177,11 @@
9177 9177
                 "ext-simplexml": "*",
9178 9178
                 "fidry/cpu-core-counter": "^1.2.0",
9179 9179
                 "jean85/pretty-package-versions": "^2.0.6",
9180
-                "php": "~8.2.0 || ~8.3.0",
9181
-                "phpunit/php-code-coverage": "^11.0.6",
9180
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
9181
+                "phpunit/php-code-coverage": "^11.0.7",
9182 9182
                 "phpunit/php-file-iterator": "^5.1.0",
9183 9183
                 "phpunit/php-timer": "^7.0.1",
9184
-                "phpunit/phpunit": "^11.4.0",
9184
+                "phpunit/phpunit": "^11.4.1",
9185 9185
                 "sebastian/environment": "^7.2.0",
9186 9186
                 "symfony/console": "^6.4.11 || ^7.1.5",
9187 9187
                 "symfony/process": "^6.4.8 || ^7.1.5"
@@ -9190,7 +9190,6 @@
9190 9190
                 "doctrine/coding-standard": "^12.0.0",
9191 9191
                 "ext-pcov": "*",
9192 9192
                 "ext-posix": "*",
9193
-                "infection/infection": "^0.29.7",
9194 9193
                 "phpstan/phpstan": "^1.12.6",
9195 9194
                 "phpstan/phpstan-deprecation-rules": "^1.2.1",
9196 9195
                 "phpstan/phpstan-phpunit": "^1.4.0",
@@ -9236,7 +9235,7 @@
9236 9235
             ],
9237 9236
             "support": {
9238 9237
                 "issues": "https://github.com/paratestphp/paratest/issues",
9239
-                "source": "https://github.com/paratestphp/paratest/tree/v7.5.7"
9238
+                "source": "https://github.com/paratestphp/paratest/tree/v7.6.0"
9240 9239
             },
9241 9240
             "funding": [
9242 9241
                 {
@@ -9248,7 +9247,7 @@
9248 9247
                     "type": "paypal"
9249 9248
                 }
9250 9249
             ],
9251
-            "time": "2024-10-07T06:27:54+00:00"
9250
+            "time": "2024-10-15T12:38:31+00:00"
9252 9251
         },
9253 9252
         {
9254 9253
             "name": "fakerphp/faker",
@@ -9623,16 +9622,16 @@
9623 9622
         },
9624 9623
         {
9625 9624
             "name": "laravel/sail",
9626
-            "version": "v1.35.0",
9625
+            "version": "v1.36.0",
9627 9626
             "source": {
9628 9627
                 "type": "git",
9629 9628
                 "url": "https://github.com/laravel/sail.git",
9630
-                "reference": "992bc2d9e52174c79515967f30849d21daa334d8"
9629
+                "reference": "f184d3d687155d06bc8cb9ff6dc48596a138460c"
9631 9630
             },
9632 9631
             "dist": {
9633 9632
                 "type": "zip",
9634
-                "url": "https://api.github.com/repos/laravel/sail/zipball/992bc2d9e52174c79515967f30849d21daa334d8",
9635
-                "reference": "992bc2d9e52174c79515967f30849d21daa334d8",
9633
+                "url": "https://api.github.com/repos/laravel/sail/zipball/f184d3d687155d06bc8cb9ff6dc48596a138460c",
9634
+                "reference": "f184d3d687155d06bc8cb9ff6dc48596a138460c",
9636 9635
                 "shasum": ""
9637 9636
             },
9638 9637
             "require": {
@@ -9682,7 +9681,7 @@
9682 9681
                 "issues": "https://github.com/laravel/sail/issues",
9683 9682
                 "source": "https://github.com/laravel/sail"
9684 9683
             },
9685
-            "time": "2024-10-08T14:45:26+00:00"
9684
+            "time": "2024-10-10T13:26:02+00:00"
9686 9685
         },
9687 9686
         {
9688 9687
             "name": "mockery/mockery",
@@ -9829,23 +9828,23 @@
9829 9828
         },
9830 9829
         {
9831 9830
             "name": "nunomaduro/collision",
9832
-            "version": "v8.4.0",
9831
+            "version": "v8.5.0",
9833 9832
             "source": {
9834 9833
                 "type": "git",
9835 9834
                 "url": "https://github.com/nunomaduro/collision.git",
9836
-                "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a"
9835
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
9837 9836
             },
9838 9837
             "dist": {
9839 9838
                 "type": "zip",
9840
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a",
9841
-                "reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a",
9839
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
9840
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
9842 9841
                 "shasum": ""
9843 9842
             },
9844 9843
             "require": {
9845
-                "filp/whoops": "^2.15.4",
9846
-                "nunomaduro/termwind": "^2.0.1",
9844
+                "filp/whoops": "^2.16.0",
9845
+                "nunomaduro/termwind": "^2.1.0",
9847 9846
                 "php": "^8.2.0",
9848
-                "symfony/console": "^7.1.3"
9847
+                "symfony/console": "^7.1.5"
9849 9848
             },
9850 9849
             "conflict": {
9851 9850
                 "laravel/framework": "<11.0.0 || >=12.0.0",
@@ -9853,14 +9852,14 @@
9853 9852
             },
9854 9853
             "require-dev": {
9855 9854
                 "larastan/larastan": "^2.9.8",
9856
-                "laravel/framework": "^11.19.0",
9857
-                "laravel/pint": "^1.17.1",
9858
-                "laravel/sail": "^1.31.0",
9859
-                "laravel/sanctum": "^4.0.2",
9860
-                "laravel/tinker": "^2.9.0",
9861
-                "orchestra/testbench-core": "^9.2.3",
9862
-                "pestphp/pest": "^2.35.0 || ^3.0.0",
9863
-                "sebastian/environment": "^6.1.0 || ^7.0.0"
9855
+                "laravel/framework": "^11.28.0",
9856
+                "laravel/pint": "^1.18.1",
9857
+                "laravel/sail": "^1.36.0",
9858
+                "laravel/sanctum": "^4.0.3",
9859
+                "laravel/tinker": "^2.10.0",
9860
+                "orchestra/testbench-core": "^9.5.3",
9861
+                "pestphp/pest": "^2.36.0 || ^3.4.0",
9862
+                "sebastian/environment": "^6.1.0 || ^7.2.0"
9864 9863
             },
9865 9864
             "type": "library",
9866 9865
             "extra": {
@@ -9922,26 +9921,26 @@
9922 9921
                     "type": "patreon"
9923 9922
                 }
9924 9923
             ],
9925
-            "time": "2024-08-03T15:32:23+00:00"
9924
+            "time": "2024-10-15T16:06:32+00:00"
9926 9925
         },
9927 9926
         {
9928 9927
             "name": "pestphp/pest",
9929
-            "version": "v3.3.2",
9928
+            "version": "v3.4.1",
9930 9929
             "source": {
9931 9930
                 "type": "git",
9932 9931
                 "url": "https://github.com/pestphp/pest.git",
9933
-                "reference": "1513ede73b150b8bcf9def90486e85ecc2bac4e1"
9932
+                "reference": "67f217852ce153134fbea8857487a3829904c086"
9934 9933
             },
9935 9934
             "dist": {
9936 9935
                 "type": "zip",
9937
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/1513ede73b150b8bcf9def90486e85ecc2bac4e1",
9938
-                "reference": "1513ede73b150b8bcf9def90486e85ecc2bac4e1",
9936
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/67f217852ce153134fbea8857487a3829904c086",
9937
+                "reference": "67f217852ce153134fbea8857487a3829904c086",
9939 9938
                 "shasum": ""
9940 9939
             },
9941 9940
             "require": {
9942
-                "brianium/paratest": "^7.5.7",
9943
-                "nunomaduro/collision": "^8.4.0",
9944
-                "nunomaduro/termwind": "^2.1.0",
9941
+                "brianium/paratest": "^7.6.0",
9942
+                "nunomaduro/collision": "^8.5.0",
9943
+                "nunomaduro/termwind": "^2.2.0",
9945 9944
                 "pestphp/pest-plugin": "^3.0.0",
9946 9945
                 "pestphp/pest-plugin-arch": "^3.0.0",
9947 9946
                 "pestphp/pest-plugin-mutate": "^3.0.5",
@@ -9949,12 +9948,13 @@
9949 9948
                 "phpunit/phpunit": "^11.4.1"
9950 9949
             },
9951 9950
             "conflict": {
9951
+                "filp/whoops": "<2.16.0",
9952 9952
                 "phpunit/phpunit": ">11.4.1",
9953 9953
                 "sebastian/exporter": "<6.0.0",
9954 9954
                 "webmozart/assert": "<1.11.0"
9955 9955
             },
9956 9956
             "require-dev": {
9957
-                "pestphp/pest-dev-tools": "^3.2.0",
9957
+                "pestphp/pest-dev-tools": "^3.3.0",
9958 9958
                 "pestphp/pest-plugin-type-coverage": "^3.1.0",
9959 9959
                 "symfony/process": "^7.1.5"
9960 9960
             },
@@ -10021,7 +10021,7 @@
10021 10021
             ],
10022 10022
             "support": {
10023 10023
                 "issues": "https://github.com/pestphp/pest/issues",
10024
-                "source": "https://github.com/pestphp/pest/tree/v3.3.2"
10024
+                "source": "https://github.com/pestphp/pest/tree/v3.4.1"
10025 10025
             },
10026 10026
             "funding": [
10027 10027
                 {
@@ -10033,7 +10033,7 @@
10033 10033
                     "type": "github"
10034 10034
                 }
10035 10035
             ],
10036
-            "time": "2024-10-12T11:36:44+00:00"
10036
+            "time": "2024-10-15T16:17:09+00:00"
10037 10037
         },
10038 10038
         {
10039 10039
             "name": "pestphp/pest-plugin",

+ 15
- 15
package-lock.json Näytä tiedosto

@@ -998,9 +998,9 @@
998 998
             }
999 999
         },
1000 1000
         "node_modules/caniuse-lite": {
1001
-            "version": "1.0.30001668",
1002
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
1003
-            "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
1001
+            "version": "1.0.30001669",
1002
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
1003
+            "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
1004 1004
             "dev": true,
1005 1005
             "funding": [
1006 1006
                 {
@@ -1159,9 +1159,9 @@
1159 1159
             "license": "MIT"
1160 1160
         },
1161 1161
         "node_modules/electron-to-chromium": {
1162
-            "version": "1.5.36",
1163
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.36.tgz",
1164
-            "integrity": "sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==",
1162
+            "version": "1.5.41",
1163
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
1164
+            "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
1165 1165
             "dev": true,
1166 1166
             "license": "ISC"
1167 1167
         },
@@ -1786,9 +1786,9 @@
1786 1786
             }
1787 1787
         },
1788 1788
         "node_modules/picocolors": {
1789
-            "version": "1.1.0",
1790
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
1791
-            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
1789
+            "version": "1.1.1",
1790
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
1791
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
1792 1792
             "dev": true,
1793 1793
             "license": "ISC"
1794 1794
         },
@@ -2417,9 +2417,9 @@
2417 2417
             }
2418 2418
         },
2419 2419
         "node_modules/tailwindcss": {
2420
-            "version": "3.4.13",
2421
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz",
2422
-            "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==",
2420
+            "version": "3.4.14",
2421
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
2422
+            "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
2423 2423
             "dev": true,
2424 2424
             "license": "MIT",
2425 2425
             "dependencies": {
@@ -2550,9 +2550,9 @@
2550 2550
             "license": "MIT"
2551 2551
         },
2552 2552
         "node_modules/vite": {
2553
-            "version": "5.4.8",
2554
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
2555
-            "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
2553
+            "version": "5.4.9",
2554
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
2555
+            "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
2556 2556
             "dev": true,
2557 2557
             "license": "MIT",
2558 2558
             "dependencies": {

+ 24
- 0
resources/views/components/company/tables/container.blade.php Näytä tiedosto

@@ -0,0 +1,24 @@
1
+@props([
2
+    'reportLoaded' => false,
3
+])
4
+
5
+<x-filament-tables::container>
6
+    <div class="es-table__header-ctn"></div>
7
+    <div
8
+        class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
9
+        <div wire:init="applyFilters">
10
+            <div wire:loading.class="flex items-center justify-center w-full h-full absolute inset-0 z-10">
11
+                <div wire:loading wire:target="applyFilters">
12
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
13
+                </div>
14
+            </div>
15
+
16
+            @if($reportLoaded)
17
+                <div wire:loading.remove wire:target="applyFilters">
18
+                    {{ $slot }}
19
+                </div>
20
+            @endif
21
+        </div>
22
+    </div>
23
+    <div class="es-table__footer-ctn border-t border-gray-200"></div>
24
+</x-filament-tables::container>

+ 15
- 0
resources/views/components/company/tables/footer.blade.php Näytä tiedosto

@@ -0,0 +1,15 @@
1
+@props(['totals', 'alignmentClass'])
2
+
3
+@if(!empty($totals))
4
+    <tfoot>
5
+    <tr class="bg-gray-50 dark:bg-white/5">
6
+        @foreach($totals as $totalIndex => $totalCell)
7
+            <x-filament-tables::cell class="{{ $alignmentClass($totalIndex) }}">
8
+                <div class="px-3 py-3 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
9
+                    {{ $totalCell }}
10
+                </div>
11
+            </x-filament-tables::cell>
12
+        @endforeach
13
+    </tr>
14
+    </tfoot>
15
+@endif

+ 16
- 0
resources/views/components/company/tables/header.blade.php Näytä tiedosto

@@ -0,0 +1,16 @@
1
+@props([
2
+    'headers',
3
+    'alignmentClass',
4
+])
5
+
6
+<thead class="divide-y divide-gray-200 dark:divide-white/5">
7
+<tr class="bg-gray-50 dark:bg-white/5">
8
+    @foreach($headers as $headerIndex => $headerCell)
9
+        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $alignmentClass($headerIndex) }}">
10
+            <span class="text-sm font-semibold text-gray-950 dark:text-white">
11
+                {{ $headerCell }}
12
+            </span>
13
+        </th>
14
+    @endforeach
15
+</tr>
16
+</thead>

+ 7
- 29
resources/views/components/company/tables/reports/balance-sheet.blade.php Näytä tiedosto

@@ -1,21 +1,11 @@
1 1
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
2
-    <thead class="divide-y divide-gray-200 dark:divide-white/5">
3
-    <tr class="bg-gray-50 dark:bg-white/5">
4
-        @foreach($report->getHeaders() as $reportHeaderIndex => $reportHeaderCell)
5
-            <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $report->getAlignmentClass($reportHeaderIndex) }}">
6
-                <span class="text-sm font-semibold text-gray-950 dark:text-white">
7
-                    {{ $reportHeaderCell }}
8
-                </span>
9
-            </th>
10
-        @endforeach
11
-    </tr>
12
-    </thead>
2
+    <x-company.tables.header :headers="$report->getHeaders()" :alignmentClass="[$report, 'getAlignmentClass']"/>
13 3
     @foreach($report->getCategories() as $accountCategory)
14 4
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
15 5
         <tr class="bg-gray-50 dark:bg-white/5">
16 6
             @foreach($accountCategory->header as $accountCategoryHeaderIndex => $accountCategoryHeaderCell)
17 7
                 <x-filament-tables::cell class="{{ $report->getAlignmentClass($accountCategoryHeaderIndex) }}">
18
-                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
8
+                    <div class="px-3 py-3 leading-6 text-sm font-semibold text-gray-950 dark:text-white">
19 9
                         {{ $accountCategoryHeaderCell }}
20 10
                     </div>
21 11
                 </x-filament-tables::cell>
@@ -73,7 +63,7 @@
73 63
                 @foreach($accountType->header as $accountTypeHeaderIndex => $accountTypeHeaderCell)
74 64
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($accountTypeHeaderIndex) }}"
75 65
                                              style="padding-left: 1.5rem;">
76
-                        <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
66
+                        <div class="px-3 py-3 leading-6 text-sm font-semibold text-gray-950 dark:text-white">
77 67
                             {{ $accountTypeHeaderCell }}
78 68
                         </div>
79 69
                     </x-filament-tables::cell>
@@ -130,7 +120,7 @@
130 120
                 @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
131 121
                     <x-filament-tables::cell class="{{ $report->getAlignmentClass($accountTypeSummaryIndex) }}"
132 122
                                              style="padding-left: 1.5rem;">
133
-                        <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
123
+                        <div class="px-3 py-3 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
134 124
                             {{ $accountTypeSummaryCell }}
135 125
                         </div>
136 126
                     </x-filament-tables::cell>
@@ -140,7 +130,7 @@
140 130
         <tr>
141 131
             @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
142 132
                 <x-filament-tables::cell class="{{ $report->getAlignmentClass($accountCategorySummaryIndex) }}">
143
-                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
133
+                    <div class="px-3 py-3 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
144 134
                         {{ $accountCategorySummaryCell }}
145 135
                     </div>
146 136
                 </x-filament-tables::cell>
@@ -148,22 +138,10 @@
148 138
         </tr>
149 139
         <tr>
150 140
             <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}">
151
-                <div class="px-3 py-2 leading-6 invisible">Hidden Text</div>
141
+                <div class="px-3 py-3 leading-6 invisible">Hidden Text</div>
152 142
             </x-filament-tables::cell>
153 143
         </tr>
154 144
         </tbody>
155 145
     @endforeach
156
-    @if(! empty($report->getOverallTotals()))
157
-        <tfoot>
158
-        <tr class="bg-gray-50 dark:bg-white/5">
159
-            @foreach($report->getOverallTotals() as $reportOverallTotalIndex => $reportOverallTotalCell)
160
-                <x-filament-tables::cell class="{{ $report->getAlignmentClass($reportOverallTotalIndex) }}">
161
-                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
162
-                        {{ $reportOverallTotalCell }}
163
-                    </div>
164
-                </x-filament-tables::cell>
165
-            @endforeach
166
-        </tr>
167
-        </tfoot>
168
-    @endif
146
+    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignmentClass="[$report, 'getAlignmentClass']"/>
169 147
 </table>

+ 12
- 27
resources/views/filament/company/pages/reports/account-transactions.blade.php Näytä tiedosto

@@ -5,31 +5,16 @@
5 5
         @endif
6 6
     </x-filament::section>
7 7
 
8
-    <x-filament-tables::container>
9
-        <div class="es-table__header-ctn"></div>
10
-        <div
11
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
12
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
13
-                <div wire:loading wire:target="applyFilters">
14
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
15
-                </div>
16
-            </div>
17
-
18
-            @if($this->reportLoaded)
19
-                <div wire:loading.remove wire:target="applyFilters">
20
-                    @if($this->report && !$this->tableHasEmptyState())
21
-                        <x-company.tables.reports.account-transactions :report="$this->report"/>
22
-                    @else
23
-                        <x-filament-tables::empty-state
24
-                            :actions="$this->getEmptyStateActions()"
25
-                            :description="$this->getEmptyStateDescription()"
26
-                            :heading="$this->getEmptyStateHeading()"
27
-                            :icon="$this->getEmptyStateIcon()"
28
-                        />
29
-                    @endif
30
-                </div>
31
-            @endif
32
-        </div>
33
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
34
-    </x-filament-tables::container>
8
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
9
+        @if($this->report && ! $this->tableHasEmptyState())
10
+            <x-company.tables.reports.account-transactions :report="$this->report"/>
11
+        @else
12
+            <x-filament-tables::empty-state
13
+                :actions="$this->getEmptyStateActions()"
14
+                :description="$this->getEmptyStateDescription()"
15
+                :heading="$this->getEmptyStateHeading()"
16
+                :icon="$this->getEmptyStateIcon()"
17
+            />
18
+        @endif
19
+    </x-company.tables.container>
35 20
 </x-filament-panels::page>

+ 8
- 23
resources/views/filament/company/pages/reports/balance-sheet.blade.php Näytä tiedosto

@@ -76,29 +76,14 @@
76 76
         </x-filament::tabs.item>
77 77
     </x-filament::tabs>
78 78
 
79
-    <x-filament-tables::container>
80
-        <div class="es-table__header-ctn"></div>
81
-        <div
82
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
83
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
84
-                <div wire:loading wire:target="applyFilters">
85
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
86
-                </div>
87
-            </div>
88
-
89
-            @if($this->reportLoaded)
90
-                <div wire:loading.remove wire:target="applyFilters">
91
-                    @if($this->report)
92
-                        @if($activeTab === 'summary')
93
-                            <x-company.tables.reports.balance-sheet-summary :report="$this->report"/>
94
-                        @elseif($activeTab === 'details')
95
-                            <x-company.tables.reports.balance-sheet :report="$this->report"/>
96
-                        @endif
97
-                    @endif
98
-                </div>
79
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
80
+        @if($this->report)
81
+            @if($activeTab === 'summary')
82
+                <x-company.tables.reports.balance-sheet-summary :report="$this->report"/>
83
+            @elseif($activeTab === 'details')
84
+                <x-company.tables.reports.balance-sheet :report="$this->report"/>
99 85
             @endif
100
-        </div>
101
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
102
-    </x-filament-tables::container>
86
+        @endif
87
+    </x-company.tables.container>
103 88
 </x-filament-panels::page>
104 89
 

+ 5
- 20
resources/views/filament/company/pages/reports/detailed-report.blade.php Näytä tiedosto

@@ -20,24 +20,9 @@
20 20
         </div>
21 21
     </x-filament::section>
22 22
 
23
-    <x-filament-tables::container>
24
-        <div class="es-table__header-ctn"></div>
25
-        <div
26
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
27
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
28
-                <div wire:loading wire:target="applyFilters">
29
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
30
-                </div>
31
-            </div>
32
-
33
-            @if($this->reportLoaded)
34
-                <div wire:loading.remove wire:target="applyFilters">
35
-                    @if($this->report)
36
-                        <x-company.tables.reports.detailed-report :report="$this->report"/>
37
-                    @endif
38
-                </div>
39
-            @endif
40
-        </div>
41
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
42
-    </x-filament-tables::container>
23
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
24
+        @if($this->report)
25
+            <x-company.tables.reports.detailed-report :report="$this->report"/>
26
+        @endif
27
+    </x-company.tables.container>
43 28
 </x-filament-panels::page>

+ 5
- 20
resources/views/filament/company/pages/reports/income-statement.blade.php Näytä tiedosto

@@ -58,24 +58,9 @@
58 58
         @endif
59 59
     </x-filament::section>
60 60
 
61
-    <x-filament-tables::container>
62
-        <div class="es-table__header-ctn"></div>
63
-        <div
64
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
65
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
66
-                <div wire:loading wire:target="applyFilters">
67
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
68
-                </div>
69
-            </div>
70
-
71
-            @if($this->reportLoaded)
72
-                <div wire:loading.remove wire:target="applyFilters">
73
-                    @if($this->report)
74
-                        <x-company.tables.reports.detailed-report :report="$this->report"/>
75
-                    @endif
76
-                </div>
77
-            @endif
78
-        </div>
79
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
80
-    </x-filament-tables::container>
61
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
62
+        @if($this->report)
63
+            <x-company.tables.reports.detailed-report :report="$this->report"/>
64
+        @endif
65
+    </x-company.tables.container>
81 66
 </x-filament-panels::page>

+ 5
- 20
resources/views/filament/company/pages/reports/trial-balance.blade.php Näytä tiedosto

@@ -22,24 +22,9 @@
22 22
         </div>
23 23
     </x-filament::section>
24 24
 
25
-    <x-filament-tables::container>
26
-        <div class="es-table__header-ctn"></div>
27
-        <div
28
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
29
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
30
-                <div wire:loading wire:target="applyFilters">
31
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
32
-                </div>
33
-            </div>
34
-
35
-            @if($this->reportLoaded)
36
-                <div wire:loading.remove wire:target="applyFilters">
37
-                    @if($this->report)
38
-                        <x-company.tables.reports.detailed-report :report="$this->report"/>
39
-                    @endif
40
-                </div>
41
-            @endif
42
-        </div>
43
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
44
-    </x-filament-tables::container>
25
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
26
+        @if($this->report)
27
+            <x-company.tables.reports.detailed-report :report="$this->report"/>
28
+        @endif
29
+    </x-company.tables.container>
45 30
 </x-filament-panels::page>

Loading…
Peruuta
Tallenna