sipo/Teren-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sipo:e5902706f19850c0e294a871f8d959ff8adc9c58
Branches Tags
sipo:master
sipo:Development
sipo:production
sipo:previous
sipo:main
sipo:prerelease
sipo:release
..
compare: sipo:d64a67cf7656e201c204de85c3897cafa3b4ecb4
Branches Tags
sipo:Development
sipo:master
sipo:production
sipo:previous
sipo:main
sipo:prerelease
sipo:release

No commits in common. "e5902706f19850c0e294a871f8d959ff8adc9c58" and "d64a67cf7656e201c204de85c3897cafa3b4ecb4" have entirely different histories.
e5902706f1 ... d64a67cf76

1 changed files with 5 additions and 17 deletions
Show Stats Expand all files Collapse all files

22
app/Services/ImportProcessor.php
View File

@ -1656,10 +1656,6 @@ private function upsertAccount(Import $import, array $mapped, $mappings, bool $h
$value = $acc[$field] ?? null; $value = $acc[$field] ?? null;
if (in_array($field, ['balance_amount', 'initial_amount'], true) && is_string($value)) { if (in_array($field, ['balance_amount', 'initial_amount'], true) && is_string($value)) {
$value = $this->normalizeDecimal($value); $value = $this->normalizeDecimal($value);
// Ensure the normalized value is numeric, otherwise default to 0
if ($value === '' || $value === '-' || ! is_numeric($value)) {
$value = 0;
}
} }
// Convert empty string to 0 for amount fields // Convert empty string to 0 for amount fields
if (in_array($field, ['balance_amount', 'initial_amount'], true) && ($value === '' || $value === null)) { if (in_array($field, ['balance_amount', 'initial_amount'], true) && ($value === '' || $value === null)) {
@ -1693,12 +1689,8 @@ private function upsertAccount(Import $import, array $mapped, $mappings, bool $h
if ($existing) { if ($existing) {
// Build non-null changes for account fields // Build non-null changes for account fields
$changes = array_filter($applyUpdate, fn ($v) => ! is_null($v)); $changes = array_filter($applyUpdate, fn ($v) => ! is_null($v));
// Track balance change - normalize in case DB has malformed data // Track balance change
$rawBalance = $existing->balance_amount ?? 0; $oldBalance = (float) ($existing->balance_amount ?? 0);
if (is_string($rawBalance) && $rawBalance !== '') {
$rawBalance = $this->normalizeDecimal($rawBalance);
}
$oldBalance = is_numeric($rawBalance) ? (float) $rawBalance : 0;
// Note: meta merging for contracts is handled in upsertContractChain, not here // Note: meta merging for contracts is handled in upsertContractChain, not here
if (! empty($changes)) { if (! empty($changes)) {
$existing->fill($changes); $existing->fill($changes);
@ -1707,11 +1699,7 @@ private function upsertAccount(Import $import, array $mapped, $mappings, bool $h
// If balance_amount changed and this wasn't caused by a payment (we are in account upsert), log an activity with before/after // If balance_amount changed and this wasn't caused by a payment (we are in account upsert), log an activity with before/after
if (array_key_exists('balance_amount', $changes)) { if (array_key_exists('balance_amount', $changes)) {
$rawNewBalance = $existing->balance_amount ?? 0; $newBalance = (float) ($existing->balance_amount ?? 0);
if (is_string($rawNewBalance) && $rawNewBalance !== '') {
$rawNewBalance = $this->normalizeDecimal($rawNewBalance);
}
$newBalance = is_numeric($rawNewBalance) ? (float) $rawNewBalance : 0;
if ($newBalance !== $oldBalance) { if ($newBalance !== $oldBalance) {
try { try {
$contractId = $existing->contract_id; $contractId = $existing->contract_id;
@ -3206,7 +3194,7 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
->first();*/ ->first();*/
// Build search query combining address, post_code and city // Build search query combining address, post_code and city
$searchParts = [$addrData['address']]; $searchParts = [$addrData['post_code']];
if (!empty($addrData['post_code'])) { if (!empty($addrData['post_code'])) {
$searchParts[] = $addrData['post_code']; $searchParts[] = $addrData['post_code'];
} }
@ -3216,7 +3204,7 @@ private function upsertAddress(int $personId, array $addrData, $mappings): array
$searchQuery = implode(' ', $searchParts); $searchQuery = implode(' ', $searchParts);
// Use fulltext search (GIN index optimized) // Use fulltext search (GIN index optimized)
$existing = PersonAddress::query()->where('person_id', $personId) $existing = PersonAddress::where('person_id', $personId)
->whereRaw("search_vector @@ plainto_tsquery('simple', ?)", [$searchQuery]) ->whereRaw("search_vector @@ plainto_tsquery('simple', ?)", [$searchQuery])
->first(); ->first();