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

Merge pull request #8735 from turbo124/v5-develop

Browse Source 
v5.7.0
This commit is contained in:
David Bomba 2023-08-21 21:15:54 +10:00 committed by GitHub
commit 39471152fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.6.31 5.7.0

8
app/Http/Controllers/StripeConnectController.php
View File

@ -125,11 +125,11 @@ class StripeConnectController extends BaseController
$company_gateway->save(); $company_gateway->save();
// StripeWebhook::dispatch($company->company_key, $company_gateway->id); // StripeWebhook::dispatch($company->company_key, $company_gateway->id);
if(isset($request->getTokenContent()['is_react']) && $request->getTokenContent()['is_react']) { // if(isset($request->getTokenContent()['is_react']) && $request->getTokenContent()['is_react']) {
$redirect_uri = 'https://app.invoicing.co/#/settings/online_payments'; $redirect_uri = 'https://app.invoicing.co/#/settings/online_payments';
} else { // } else {
$redirect_uri = 'https://invoicing.co/stripe/completed'; // $redirect_uri = 'https://invoicing.co/stripe/completed';
} // }
//response here //response here
return view('auth.connect.completed', ['url' => $redirect_uri]); return view('auth.connect.completed', ['url' => $redirect_uri]);

7
app/Http/Livewire/DocumentsTable.php
View File

@ -118,11 +118,8 @@ class DocumentsTable extends Component
protected function documents() protected function documents()
{ {
return Document::query() return $this->client->documents()
->where('is_public', true) ->where('is_public', true);
->whereHasMorph('documentable', [Client::class], function ($query) {
$query->where('client_id', $this->client->id);
});
} }
protected function credits() protected function credits()

1
app/Jobs/Bank/ProcessBankTransactions.php
View File

@ -111,6 +111,7 @@ class ProcessBankTransactions implements ShouldQueue
if($account[0]['current_balance']) { if($account[0]['current_balance']) {
$this->bank_integration->balance = $account[0]['current_balance']; $this->bank_integration->balance = $account[0]['current_balance'];
$this->bank_integration->currency = $account[0]['account_currency']; $this->bank_integration->currency = $account[0]['account_currency'];
$this->bank_integration->bank_account_status = $account[0]['account_status'];
$this->bank_integration->save(); $this->bank_integration->save();
} }

7
app/Models/Company.php
View File

@ -880,6 +880,13 @@ class Company extends BaseModel
return $data; return $data;
} }
public function utc_offset(): int
{
$timezone = $this->timezone();
return $timezone->utc_offset ?? 0;
}
public function timezone_offset(): int public function timezone_offset(): int
{ {
$offset = 0; $offset = 0;

8
app/Repositories/TaskRepository.php
View File

@ -118,7 +118,7 @@ class TaskRepository extends BaseRepository
$task->is_running = $data['is_running'] ? 1 : 0; $task->is_running = $data['is_running'] ? 1 : 0;
} }
$task->calculated_start_date = $this->harvestStartDate($time_log); $task->calculated_start_date = $this->harvestStartDate($time_log, $task);
$task->time_log = json_encode($time_log); $task->time_log = json_encode($time_log);
@ -133,11 +133,11 @@ class TaskRepository extends BaseRepository
return $task; return $task;
} }
private function harvestStartDate($time_log) private function harvestStartDate($time_log, $task)
{ {
if(isset($time_log[0][0])){ if(isset($time_log[0][0])){
return \Carbon\Carbon::createFromTimestamp($time_log[0][0]); return \Carbon\Carbon::createFromTimestamp($time_log[0][0])->addSeconds($task->company->utc_offset());
} }
return null; return null;
@ -218,7 +218,7 @@ class TaskRepository extends BaseRepository
$log = array_merge($log, [[$start_time, 0]]); $log = array_merge($log, [[$start_time, 0]]);
$task->time_log = json_encode($log); $task->time_log = json_encode($log);
$task->calculated_start_date = \Carbon\Carbon::createFromTimestamp($start_time); $task->calculated_start_date = \Carbon\Carbon::createFromTimestamp($start_time)->addSeconds($task->company->utc_offset());
$task->saveQuietly(); $task->saveQuietly();
} }

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.6.31'), 'app_version' => env('APP_VERSION','5.7.0'),
'app_tag' => env('APP_TAG','5.6.31'), 'app_tag' => env('APP_TAG','5.7.0'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),

2
tests/Feature/RecurringInvoicesCronTest.php
View File

@ -46,6 +46,6 @@ class RecurringInvoicesCronTest extends TestCase
$this->assertEquals(5, $recurring_invoices->count()); $this->assertEquals(5, $recurring_invoices->count());
$this->assertEquals(6, $recurring_all->count()); $this->assertEquals(7, $recurring_all->count());
} }
} }