Andrew Wallo 10 月之前
父節點
當前提交
d0dd6402e6
共有 4 個檔案被更改,包括 46 行新增40 行删除
  1. 18
    2
      app/Services/AccountService.php
  2. 9
    9
      composer.lock
  3. 18
    28
      package-lock.json
  4. 1
    1
      resources/views/components/company/layout/custom-simple.blade.php

+ 18
- 2
app/Services/AccountService.php 查看文件

@@ -170,7 +170,15 @@ class AccountService
170 170
                 $join->on('transactions.id', '=', 'journal_entries.transaction_id')
171 171
                     ->where('transactions.posted_at', '<=', $endDate);
172 172
             })
173
-            ->groupBy('accounts.id')
173
+            ->groupBy([
174
+                'accounts.id',
175
+                'accounts.name',
176
+                'accounts.category',
177
+                'accounts.type',
178
+                'accounts.subtype_id',
179
+                'accounts.currency_code',
180
+                'accounts.code',
181
+            ])
174 182
             ->with(['subtype:id,name,inverse_cash_flow']);
175 183
 
176 184
         if (! empty($accountIds)) {
@@ -230,7 +238,15 @@ class AccountService
230 238
                     ->whereNotNull('bank_accounts.id') // Ensure there is a linked BankAccount
231 239
                     ->whereColumn('je.transaction_id', 'journal_entries.transaction_id');
232 240
             })
233
-            ->groupBy('accounts.id')
241
+            ->groupBy([
242
+                'accounts.id',
243
+                'accounts.name',
244
+                'accounts.category',
245
+                'accounts.type',
246
+                'accounts.subtype_id',
247
+                'accounts.currency_code',
248
+                'accounts.code',
249
+            ])
234 250
             ->with(['subtype:id,name,inverse_cash_flow']);
235 251
 
236 252
         if (! empty($accountIds)) {

+ 9
- 9
composer.lock 查看文件

@@ -497,16 +497,16 @@
497 497
         },
498 498
         {
499 499
             "name": "aws/aws-sdk-php",
500
-            "version": "3.332.0",
500
+            "version": "3.333.0",
501 501
             "source": {
502 502
                 "type": "git",
503 503
                 "url": "https://github.com/aws/aws-sdk-php.git",
504
-                "reference": "3b4972a465b66fe3da461a3febdcc363954a0969"
504
+                "reference": "11bb2709885c9954004620d3648e9355feb92a41"
505 505
             },
506 506
             "dist": {
507 507
                 "type": "zip",
508
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3b4972a465b66fe3da461a3febdcc363954a0969",
509
-                "reference": "3b4972a465b66fe3da461a3febdcc363954a0969",
508
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/11bb2709885c9954004620d3648e9355feb92a41",
509
+                "reference": "11bb2709885c9954004620d3648e9355feb92a41",
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.332.0"
592
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.333.0"
593 593
             },
594
-            "time": "2024-12-02T03:48:16+00:00"
594
+            "time": "2024-12-03T19:06:47+00:00"
595 595
         },
596 596
         {
597 597
             "name": "aws/aws-sdk-php-laravel",
@@ -12670,13 +12670,13 @@
12670 12670
             },
12671 12671
             "type": "library",
12672 12672
             "extra": {
12673
-                "branch-alias": {
12674
-                    "dev-main": "1.x-dev"
12675
-                },
12676 12673
                 "laravel": {
12677 12674
                     "providers": [
12678 12675
                         "Spatie\\LaravelRay\\RayServiceProvider"
12679 12676
                     ]
12677
+                },
12678
+                "branch-alias": {
12679
+                    "dev-main": "1.x-dev"
12680 12680
                 }
12681 12681
             },
12682 12682
             "autoload": {

+ 18
- 28
package-lock.json 查看文件

@@ -1043,9 +1043,9 @@
1043 1043
             }
1044 1044
         },
1045 1045
         "node_modules/caniuse-lite": {
1046
-            "version": "1.0.30001685",
1047
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001685.tgz",
1048
-            "integrity": "sha512-e/kJN1EMyHQzgcMEEgoo+YTCO1NGCmIYHk5Qk8jT6AazWemS5QFKJ5ShCJlH3GZrNIdZofcNCEwZqbMjjKzmnA==",
1046
+            "version": "1.0.30001686",
1047
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001686.tgz",
1048
+            "integrity": "sha512-Y7deg0Aergpa24M3qLC5xjNklnKnhsmSyR/V89dLZ1n0ucJIFNs7PgR2Yfa/Zf6W79SbBicgtGxZr2juHkEUIA==",
1049 1049
             "dev": true,
1050 1050
             "funding": [
1051 1051
                 {
@@ -1565,9 +1565,9 @@
1565 1565
             }
1566 1566
         },
1567 1567
         "node_modules/laravel-vite-plugin": {
1568
-            "version": "1.1.0",
1569
-            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.1.0.tgz",
1570
-            "integrity": "sha512-jo0PQGvAxbhUwNPEBKwNV8cS5kEsrCHPKrUtIBAuPrWODNCKcM4a/7dq2Hq4vzHaXdE7qOoasFs6GNQZecfZqw==",
1568
+            "version": "1.1.1",
1569
+            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.1.1.tgz",
1570
+            "integrity": "sha512-HMZXpoSs1OR+7Lw1+g4Iy/s3HF3Ldl8KxxYT2Ot8pEB4XB/QRuZeWgDYJdu552UN03YRSRNK84CLC9NzYRtncA==",
1571 1571
             "dev": true,
1572 1572
             "license": "MIT",
1573 1573
             "dependencies": {
@@ -1581,17 +1581,20 @@
1581 1581
                 "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
1582 1582
             },
1583 1583
             "peerDependencies": {
1584
-                "vite": "^6.0.0"
1584
+                "vite": "^5.0.0 || ^6.0.0"
1585 1585
             }
1586 1586
         },
1587 1587
         "node_modules/lilconfig": {
1588
-            "version": "2.1.0",
1589
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
1590
-            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
1588
+            "version": "3.1.3",
1589
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
1590
+            "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
1591 1591
             "dev": true,
1592 1592
             "license": "MIT",
1593 1593
             "engines": {
1594
-                "node": ">=10"
1594
+                "node": ">=14"
1595
+            },
1596
+            "funding": {
1597
+                "url": "https://github.com/sponsors/antonk52"
1595 1598
             }
1596 1599
         },
1597 1600
         "node_modules/lines-and-columns": {
@@ -1974,19 +1977,6 @@
1974 1977
                 }
1975 1978
             }
1976 1979
         },
1977
-        "node_modules/postcss-load-config/node_modules/lilconfig": {
1978
-            "version": "3.1.2",
1979
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
1980
-            "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
1981
-            "dev": true,
1982
-            "license": "MIT",
1983
-            "engines": {
1984
-                "node": ">=14"
1985
-            },
1986
-            "funding": {
1987
-                "url": "https://github.com/sponsors/antonk52"
1988
-            }
1989
-        },
1990 1980
         "node_modules/postcss-nested": {
1991 1981
             "version": "6.2.0",
1992 1982
             "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
@@ -2465,9 +2455,9 @@
2465 2455
             }
2466 2456
         },
2467 2457
         "node_modules/tailwindcss": {
2468
-            "version": "3.4.15",
2469
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz",
2470
-            "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==",
2458
+            "version": "3.4.16",
2459
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.16.tgz",
2460
+            "integrity": "sha512-TI4Cyx7gDiZ6r44ewaJmt0o6BrMCT5aK5e0rmJ/G9Xq3w7CX/5VXl/zIPEJZFUK5VEqwByyhqNPycPlvcK4ZNw==",
2471 2461
             "dev": true,
2472 2462
             "license": "MIT",
2473 2463
             "dependencies": {
@@ -2480,7 +2470,7 @@
2480 2470
                 "glob-parent": "^6.0.2",
2481 2471
                 "is-glob": "^4.0.3",
2482 2472
                 "jiti": "^1.21.6",
2483
-                "lilconfig": "^2.1.0",
2473
+                "lilconfig": "^3.1.3",
2484 2474
                 "micromatch": "^4.0.8",
2485 2475
                 "normalize-path": "^3.0.0",
2486 2476
                 "object-hash": "^3.0.0",

+ 1
- 1
resources/views/components/company/layout/custom-simple.blade.php 查看文件

@@ -26,7 +26,7 @@
26 26
 
27 27
         <div class="relative hidden w-0 flex-1 lg:block">
28 28
             <img class="absolute inset-0 size-full object-cover"
29
-                 src="https://img.freepik.com/free-vector/abstract-cyber-background-with-flowing-particles-design_1048-15243.jpg?t=st=1731895585~exp=1731899185~hmac=3397976be08b5dabed940a75fb1fd957cee7f1a32cd1da1f5951435265cf36f9&w=2000"
29
+                 src="https://images.unsplash.com/photo-1511376868136-742c0de8c9a8?q=80&w=3870&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D"
30 30
                  alt="">
31 31
         </div>
32 32
 

Loading…
取消
儲存