fix report ۴

2026-06-24 01:44:38 +03:30
parent 38dd8253f0
commit 75db07dbda
3 changed files with 76 additions and 50 deletions
@@ -395,10 +395,21 @@ class WalletController extends Controller
            ])->export($records);

        if (isset($records['rows'])) {
-            foreach ($records['rows'] as &$row) {
+            $records['rows'] = collect($records['rows'])->map(function ($row) use ($balanceReport, $catalogMetalIds) {
                $balanceReport->enrichTransactionTableRow($row, $catalogMetalIds);
-            }
-            unset($row);
+
+                if ($row instanceof Transaction) {
+                    $array = $row->toArray();
+                    $rawTypeStr = $row->getAttributes()['type_str'] ?? null;
+                    if (is_string($rawTypeStr) && !is_numeric(trim($rawTypeStr))) {
+                        $array['type_str'] = $rawTypeStr;
+                    }
+
+                    return $array;
+                }
+
+                return is_array($row) ? $row : (array) $row;
+            })->values()->all();
        }

        $records['catalogMetals'] = $balanceReport->catalogMetalsMeta();