Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for translations

Browse Source
This commit is contained in:
David Bomba 2023-10-13 21:14:37 +11:00
parent 7a96c25f8b
commit 999ead0fec
2 changed files with 46 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Services/Client/ClientService.php
View File

@ -44,6 +44,19 @@ class ClientService
}, 2); }, 2);
} catch (\Throwable $throwable) { } catch (\Throwable $throwable) {
nlog("DB ERROR " . $throwable->getMessage()); nlog("DB ERROR " . $throwable->getMessage());
DB::connection(config('database.default'))->rollBack();
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
} catch(\Exception $exception){
nlog("DB ERROR " . $exception->getMessage());
DB::connection(config('database.default'))->rollBack();
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
} }
return $this; return $this;
@ -60,6 +73,17 @@ class ClientService
}, 2); }, 2);
} catch (\Throwable $throwable) { } catch (\Throwable $throwable) {
nlog("DB ERROR " . $throwable->getMessage()); nlog("DB ERROR " . $throwable->getMessage());
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
} catch(\Exception $exception){
nlog("DB ERROR " . $exception->getMessage());
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
} }
return $this; return $this;
@ -67,11 +91,27 @@ class ClientService
public function updatePaidToDate(float $amount) public function updatePaidToDate(float $amount)
{ {
try {
DB::connection(config('database.default'))->transaction(function () use ($amount) { DB::connection(config('database.default'))->transaction(function () use ($amount) {
$this->client = Client::withTrashed()->where('id', $this->client->id)->lockForUpdate()->first(); $this->client = Client::withTrashed()->where('id', $this->client->id)->lockForUpdate()->first();
$this->client->paid_to_date += $amount; $this->client->paid_to_date += $amount;
$this->client->saveQuietly(); $this->client->saveQuietly();
}, 2); }, 2);
}
catch (\Throwable $throwable) {
nlog("DB ERROR " . $throwable->getMessage());
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
} catch(\Exception $exception){
nlog("DB ERROR " . $exception->getMessage());
if (DB::connection(config('database.default'))->transactionLevel() > 0) {
DB::connection(config('database.default'))->rollBack();
}
}
return $this; return $this;
} }

1
lang/en/texts.php
View File

@ -5179,6 +5179,7 @@ $LANG = array(
'stock_quantity_number' => 'Stock :quantity', 'stock_quantity_number' => 'Stock :quantity',
'upcoming' => 'Upcoming', 'upcoming' => 'Upcoming',
'client_contact' => 'Client Contact', 'client_contact' => 'Client Contact',
'uncategorized' => 'Uncategorized',
); );
return $LANG; return $LANG;