diff --git a/VERSION.txt b/VERSION.txt index f3cb8c412987..3b867ccd76c3 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.6.31 \ No newline at end of file +5.7.0 \ No newline at end of file diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php index b2e2bf70d421..d9ab04eccf17 100644 --- a/app/Http/Controllers/StripeConnectController.php +++ b/app/Http/Controllers/StripeConnectController.php @@ -125,11 +125,11 @@ class StripeConnectController extends BaseController $company_gateway->save(); // 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'; - } else { - $redirect_uri = 'https://invoicing.co/stripe/completed'; - } + // } else { + // $redirect_uri = 'https://invoicing.co/stripe/completed'; + // } //response here return view('auth.connect.completed', ['url' => $redirect_uri]); diff --git a/app/Http/Livewire/DocumentsTable.php b/app/Http/Livewire/DocumentsTable.php index b9eac247d1e2..ae0500bfeebe 100644 --- a/app/Http/Livewire/DocumentsTable.php +++ b/app/Http/Livewire/DocumentsTable.php @@ -118,11 +118,8 @@ class DocumentsTable extends Component protected function documents() { - return Document::query() - ->where('is_public', true) - ->whereHasMorph('documentable', [Client::class], function ($query) { - $query->where('client_id', $this->client->id); - }); + return $this->client->documents() + ->where('is_public', true); } protected function credits() diff --git a/app/Jobs/Bank/ProcessBankTransactions.php b/app/Jobs/Bank/ProcessBankTransactions.php index 2015b19d74d8..d6b6d8582ab7 100644 --- a/app/Jobs/Bank/ProcessBankTransactions.php +++ b/app/Jobs/Bank/ProcessBankTransactions.php @@ -111,6 +111,7 @@ class ProcessBankTransactions implements ShouldQueue if($account[0]['current_balance']) { $this->bank_integration->balance = $account[0]['current_balance']; $this->bank_integration->currency = $account[0]['account_currency']; + $this->bank_integration->bank_account_status = $account[0]['account_status']; $this->bank_integration->save(); } diff --git a/app/Models/Company.php b/app/Models/Company.php index 644dcab807e1..1de20b8d694b 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -880,6 +880,13 @@ class Company extends BaseModel return $data; } + public function utc_offset(): int + { + $timezone = $this->timezone(); + + return $timezone->utc_offset ?? 0; + } + public function timezone_offset(): int { $offset = 0; diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php index 051a2c1c5689..f3f5642dc198 100644 --- a/app/Repositories/TaskRepository.php +++ b/app/Repositories/TaskRepository.php @@ -118,7 +118,7 @@ class TaskRepository extends BaseRepository $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); @@ -133,11 +133,11 @@ class TaskRepository extends BaseRepository return $task; } - private function harvestStartDate($time_log) + private function harvestStartDate($time_log, $task) { 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; @@ -218,7 +218,7 @@ class TaskRepository extends BaseRepository $log = array_merge($log, [[$start_time, 0]]); $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(); } diff --git a/config/ninja.php b/config/ninja.php index 233559f73bbf..646f456a9cd1 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -15,8 +15,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => env('APP_VERSION','5.6.31'), - 'app_tag' => env('APP_TAG','5.6.31'), + 'app_version' => env('APP_VERSION','5.7.0'), + 'app_tag' => env('APP_TAG','5.7.0'), 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), diff --git a/tests/Feature/RecurringInvoicesCronTest.php b/tests/Feature/RecurringInvoicesCronTest.php index 5a62db9a5dd7..0e446febfe0e 100644 --- a/tests/Feature/RecurringInvoicesCronTest.php +++ b/tests/Feature/RecurringInvoicesCronTest.php @@ -46,6 +46,6 @@ class RecurringInvoicesCronTest extends TestCase $this->assertEquals(5, $recurring_invoices->count()); - $this->assertEquals(6, $recurring_all->count()); + $this->assertEquals(7, $recurring_all->count()); } }