improved tenant identification

resources/lang/en-GB/messages.php

@@ -8,7 +8,9 @@ return [
         'deleted'           => ':type deleted!',
         'duplicated'        => ':type duplicated!',
         'imported'          => ':type imported!',
+        'import_queued'     => ':type import has been scheduled! You will receive an email when it is finished.',
         'exported'          => ':type exported!',
+        'export_queued'     => ':type export has been scheduled! You will receive an email when it is ready to download.',
         'enabled'           => ':type enabled!',
         'disabled'          => ':type disabled!',
     ],
@@ -21,7 +23,7 @@ return [
         'last_category'     => 'Error: Can not delete the last :type category!',
         'change_type'       => 'Error: Can not change the type because it has :text related!',
         'invalid_apikey'    => 'Error: The API Key entered is invalid!',
-        'import_column'     => 'Error: :message Sheet name: :sheet. Line number: :line.',
+        'import_column'     => 'Error: :message Column name: :column. Line number: :line.',
         'import_sheet'      => 'Error: Sheet name is not valid. Please, check the sample file.',
     ],
 

resources/lang/en-GB/notifications.php

@@ -24,4 +24,31 @@ return [
 
     ],
 
+    'import' => [
+
+        'completed' => [
+            'subject'           => 'Import completed',
+            'description'       => 'The import has been completed and the records are available in your panel.',
+        ],
+
+        'failed' => [
+            'subject'           => 'Import failed',
+            'description'       => 'Not able to import the file due to the following issues:',
+        ],
+    ],
+
+    'export' => [
+
+        'completed' => [
+            'subject'           => 'Export is ready',
+            'description'       => 'The export file is ready to download from the following link:',
+        ],
+
+        'failed' => [
+            'subject'           => 'Export failed',
+            'description'       => 'Not able to create the export file due to the following issue:',
+        ],
+
+    ],
+
 ];

resources/views/common/companies/index.blade.php

@@ -43,7 +43,7 @@
                     @foreach($companies as $item)
                         <tr class="row align-items-center border-top-1">
                             <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">
-                                @if ((session('company_id') != $item->id))
+                                @if ((company_id() != $item->id))
                                     {{ Form::bulkActionGroup($item->id, $item->name) }}
                                 @else
                                     {{ Form::bulkActionGroup($item->id, $item->name, ['disabled' => 'true']) }}
@@ -54,7 +54,7 @@
                             <td class="col-md-2 col-lg-2 col-xl-2 d-none d-md-block long-texts">{{ $item->email }}</td>
                             <td class="col-lg-2 col-xl-2 d-none d-lg-block">@date($item->created_at)</td>
                             <td class="col-xs-4 col-sm-3 col-md-2 col-lg-2 col-xl-2">
-                                @if ((session('company_id') != $item->id) && user()->can('update-common-companies'))
+                                @if ((company_id() != $item->id) && user()->can('update-common-companies'))
                                     {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }}
                                 @else
                                     @if ($item->enabled)

resources/views/components/documents/form/company.blade.php

@@ -23,7 +23,7 @@
                         @endif
 
                         @if (!$hideCompanyEdit)
-                            <akaunting-company-edit company-id="{{ session('company_id') }}"
+                            <akaunting-company-edit company-id="{{ company_id() }}"
                             button-text="{{ trans('settings.company.edit_your_business_address') }}"
                             tax-number-text="{{ trans('general.tax_number') }}"
                             :company="{{ json_encode($company) }}"

resources/views/errors/403.blade.php

@@ -13,7 +13,7 @@
         <div class="card-body">
             <p>{{ trans('errors.message.403') }}</p>
 
-            @php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
+            @php $landing_page = user() ? user()->getLandingPageOfUser() : route('login'); @endphp
 
             <a href="{{ $landing_page }}" class="btn btn-success">{{ trans('general.go_to_dashboard') }}</a>
         </div>

resources/views/errors/404.blade.php

@@ -13,7 +13,7 @@
         <div class="card-body">
             <p>{{ trans('errors.message.404') }}</p>
 
-            @php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
+            @php $landing_page = user() ? user()->getLandingPageOfUser() : route('login'); @endphp
 
             <a href="{{ $landing_page }}" class="btn btn-success">{{ trans('general.go_to_dashboard') }}</a>
         </div>

resources/views/errors/500.blade.php

@@ -13,7 +13,7 @@
         <div class="card-body">
             <p>{{ trans('errors.message.500') }}</p>
 
-            @php $landing_page = user() ? route(user()->landing_page) : route('login'); @endphp
+            @php $landing_page = user() ? user()->getLandingPageOfUser() : route('login'); @endphp
 
             <a href="{{ $landing_page }}" class="btn btn-success">{{ trans('general.go_to_dashboard') }}</a>
         </div>

resources/views/partials/admin/head.blade.php

@@ -35,7 +35,7 @@
     @livewireStyles
 
     <script type="text/javascript"><!--
-        var url = '{{ url("/") }}';
+        var url = '{{ url("/" . company_id()) }}';
         var app_url = '{{ config("app.url") }}';
         var aka_currency = {!! !empty($currency) ? $currency : 'false' !!};
     //--></script>