From c451fde466660e00699902e98e77def21cf3ee67 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 14:27:59 -0800 Subject: [PATCH 01/12] Fixed exception namespace --- app/Http/Controllers/Api/SettingsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php index 71741bb6a..deb14fb5f 100644 --- a/app/Http/Controllers/Api/SettingsController.php +++ b/app/Http/Controllers/Api/SettingsController.php @@ -137,7 +137,7 @@ class SettingsController extends Controller try { Notification::send(Setting::first(), new MailTest()); return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200); - } catch (Exception $e) { + } catch (\Exception $e) { return response()->json(['message' => $e->getMessage()], 500); } } From 8a65081768a590490590d04c272d7bd21d8e63f3 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 14:47:38 -0800 Subject: [PATCH 02/12] Possible fix for #8732 --- app/Console/Commands/MoveUploadsToNewDisk.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/MoveUploadsToNewDisk.php b/app/Console/Commands/MoveUploadsToNewDisk.php index 6794a09f4..95689a803 100644 --- a/app/Console/Commands/MoveUploadsToNewDisk.php +++ b/app/Console/Commands/MoveUploadsToNewDisk.php @@ -91,7 +91,7 @@ class MoveUploadsToNewDisk extends Command for ($l = 0; $l < count($logos); $l++) { $type_count++; $filename = basename($logos[$l]); - $new_url = Storage::disk('public')->url($logos[$l], file_get_contents($public_upload[$i])); + $new_url = Storage::disk('public')->url($logos[$l], file_get_contents($public_upload[$l])); $this->info($type_count.'. LOGO: '.$filename.' was copied to '.$new_url); } @@ -116,7 +116,7 @@ class MoveUploadsToNewDisk extends Command $filename = basename($private_upload[$x]); try { - Storage::disk('private_uploads')->put($private_type.'/'.$filename, file_get_contents($public_upload[$i])); + Storage::put($private_type.'/'.$filename, file_get_contents($private_upload[$i])); $new_url = Storage::url($private_type.'/'.$filename, $filename); $this->info($type_count.'. PRIVATE: '.$filename.' was copied to '.$new_url); From f0e04ab9e4e60fbf16d266baefe0ef16097aa34c Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 15:01:13 -0800 Subject: [PATCH 03/12] Fixed #8726 - disallow archived assets to be checked out --- app/Models/Asset.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 8404a0e1d..376be08fc 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -244,11 +244,12 @@ class Asset extends Depreciable */ public function availableForCheckout() { + \Log::debug($this->assetstatus); if ( - (!$this->assignedTo) || + ((!$this->assignedTo) && ($this->assetstatus->archived == 0)) || ((empty($this->assigned_to)) && (empty($this->deleted_at)) && - (($this->assetstatus) && ($this->assetstatus->deployable == 1)))) + (($this->assetstatus) && ($this->assetstatus->deployable == 1)))) { return true; } From 5fb31a5a3f569441c02d424d6e8d85e98e2dec8c Mon Sep 17 00:00:00 2001 From: Dampfklon Date: Fri, 13 Nov 2020 00:05:22 +0100 Subject: [PATCH 04/12] Use translated salutation from other notifications (#8234) --- .../views/notifications/markdown/asset-requested.blade.php | 2 +- .../views/notifications/markdown/checkin-accessory.blade.php | 2 +- resources/views/notifications/markdown/checkin-asset.blade.php | 2 +- .../views/notifications/markdown/checkin-license.blade.php | 2 +- .../views/notifications/markdown/checkout-accessory.blade.php | 2 +- resources/views/notifications/markdown/checkout-asset.blade.php | 2 +- .../views/notifications/markdown/checkout-consumable.blade.php | 2 +- .../views/notifications/markdown/checkout-license.blade.php | 2 +- .../notifications/markdown/report-expected-checkins.blade.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/notifications/markdown/asset-requested.blade.php b/resources/views/notifications/markdown/asset-requested.blade.php index 0fe0c6298..1bf8eeaee 100644 --- a/resources/views/notifications/markdown/asset-requested.blade.php +++ b/resources/views/notifications/markdown/asset-requested.blade.php @@ -55,7 +55,7 @@ @endif @endcomponent -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkin-accessory.blade.php b/resources/views/notifications/markdown/checkin-accessory.blade.php index b4f7163d6..cf1536518 100644 --- a/resources/views/notifications/markdown/checkin-accessory.blade.php +++ b/resources/views/notifications/markdown/checkin-accessory.blade.php @@ -25,7 +25,7 @@ @endif @endcomponent -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkin-asset.blade.php b/resources/views/notifications/markdown/checkin-asset.blade.php index 3d313f51d..01ab12f32 100644 --- a/resources/views/notifications/markdown/checkin-asset.blade.php +++ b/resources/views/notifications/markdown/checkin-asset.blade.php @@ -42,7 +42,7 @@ @endif @endcomponent -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkin-license.blade.php b/resources/views/notifications/markdown/checkin-license.blade.php index 6a40cd453..0f14c4bfd 100644 --- a/resources/views/notifications/markdown/checkin-license.blade.php +++ b/resources/views/notifications/markdown/checkin-license.blade.php @@ -24,7 +24,7 @@ @endif @endcomponent -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkout-accessory.blade.php b/resources/views/notifications/markdown/checkout-accessory.blade.php index 421489914..a3126f7aa 100644 --- a/resources/views/notifications/markdown/checkout-accessory.blade.php +++ b/resources/views/notifications/markdown/checkout-accessory.blade.php @@ -47,7 +47,7 @@ @endif -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkout-asset.blade.php b/resources/views/notifications/markdown/checkout-asset.blade.php index ba8939007..8e6297897 100644 --- a/resources/views/notifications/markdown/checkout-asset.blade.php +++ b/resources/views/notifications/markdown/checkout-asset.blade.php @@ -64,7 +64,7 @@ @endif -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkout-consumable.blade.php b/resources/views/notifications/markdown/checkout-consumable.blade.php index b4362d69b..06e73243c 100644 --- a/resources/views/notifications/markdown/checkout-consumable.blade.php +++ b/resources/views/notifications/markdown/checkout-consumable.blade.php @@ -44,7 +44,7 @@ @endif -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/checkout-license.blade.php b/resources/views/notifications/markdown/checkout-license.blade.php index f83875112..08e1e5c76 100644 --- a/resources/views/notifications/markdown/checkout-license.blade.php +++ b/resources/views/notifications/markdown/checkout-license.blade.php @@ -47,7 +47,7 @@ @endif -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} diff --git a/resources/views/notifications/markdown/report-expected-checkins.blade.php b/resources/views/notifications/markdown/report-expected-checkins.blade.php index 907c82607..f27555f97 100644 --- a/resources/views/notifications/markdown/report-expected-checkins.blade.php +++ b/resources/views/notifications/markdown/report-expected-checkins.blade.php @@ -14,7 +14,7 @@ $checkin = \App\Helpers\Helper::getFormattedDateObject($asset->expected_checkin, @endforeach @endcomponent -Thanks, +{{ trans('mail.best_regards') }} {{ $snipeSettings->site_name }} From 4ef11c463c78f6adc005615b8eaf85ff27ae5684 Mon Sep 17 00:00:00 2001 From: Dampfklon Date: Fri, 13 Nov 2020 00:05:57 +0100 Subject: [PATCH 05/12] Enable translations of checkin notifications (#8235) --- app/Notifications/CheckinAccessoryNotification.php | 4 ++-- app/Notifications/CheckinAssetNotification.php | 4 ++-- app/Notifications/CheckinLicenseSeatNotification.php | 4 ++-- app/Notifications/ExpectedCheckinAdminNotification.php | 2 +- resources/lang/en/mail.php | 5 ++++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php index cc712e271..ba7c3b201 100644 --- a/app/Notifications/CheckinAccessoryNotification.php +++ b/app/Notifications/CheckinAccessoryNotification.php @@ -111,7 +111,7 @@ class CheckinAccessoryNotification extends Notification ]; return (new SlackMessage) - ->content(':arrow_down: :keyboard: Accessory Checked In') + ->content(':arrow_down: :keyboard: '.trans('mail.Accessory_Checkin_Notification')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $admin, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) @@ -135,7 +135,7 @@ class CheckinAccessoryNotification extends Notification 'note' => $this->note, 'target' => $this->target, ]) - ->subject('Accessory checked in'); + ->subject(trans('mail.Accessory_Checkin_Notification')); } } diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php index 0b0c29d7b..e0f1e66f3 100644 --- a/app/Notifications/CheckinAssetNotification.php +++ b/app/Notifications/CheckinAssetNotification.php @@ -79,7 +79,7 @@ class CheckinAssetNotification extends Notification ]; return (new SlackMessage) - ->content(':arrow_down: :computer: Asset Checked In') + ->content(':arrow_down: :computer: '.trans('mail.Asset_Checkin_Notification')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $admin, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) @@ -113,7 +113,7 @@ class CheckinAssetNotification extends Notification 'fields' => $fields, 'expected_checkin' => $this->expected_checkin, ]) - ->subject('Asset checked in'); + ->subject(trans('mail.Asset_Checkin_Notification')); return $message; diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php index f9d4914c3..a3bfb039e 100644 --- a/app/Notifications/CheckinLicenseSeatNotification.php +++ b/app/Notifications/CheckinLicenseSeatNotification.php @@ -83,7 +83,7 @@ class CheckinLicenseSeatNotification extends Notification return (new SlackMessage) - ->content(':arrow_down: :floppy_disk: License Checked In') + ->content(':arrow_down: :floppy_disk: '.trans('mail.License_Checkin_Notification')) ->from($botname) ->attachment(function ($attachment) use ($item, $note, $admin, $fields) { $attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl()) @@ -106,7 +106,7 @@ class CheckinLicenseSeatNotification extends Notification 'note' => $this->note, 'target' => $this->target, ]) - ->subject('License checked in'); + ->subject(trans('mail.License_Checkin_Notification')); } diff --git a/app/Notifications/ExpectedCheckinAdminNotification.php b/app/Notifications/ExpectedCheckinAdminNotification.php index c90c2fa3e..7f29a915f 100644 --- a/app/Notifications/ExpectedCheckinAdminNotification.php +++ b/app/Notifications/ExpectedCheckinAdminNotification.php @@ -48,7 +48,7 @@ class ExpectedCheckinAdminNotification extends Notification [ 'assets' => $this->assets, ]) - ->subject('Expected asset checkin report'); + ->subject(trans('mail.Expected_Checkin_Report')); return $message; diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index f8c781c8e..837d71fa6 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -70,5 +70,8 @@ return array( 'welcome' => 'Welcome :name', 'welcome_to' => 'Welcome to :web!', 'your_credentials' => 'Your Snipe-IT credentials', - + 'Accessory_Checkin_Notification' => 'Accessory checked in', + 'Asset_Checkin_Notification' => 'Asset checked in', + 'License_Checkin_Notification' => 'License checked in', + 'Expected_Checkin_Report' => 'Expected asset checkin report' ); From 1f9b04405cf7e5a035dc32ad462e1eb5fbc63e4b Mon Sep 17 00:00:00 2001 From: Dampfklon Date: Fri, 13 Nov 2020 00:07:45 +0100 Subject: [PATCH 06/12] Enable translation of accept-asset page (#8237) --- resources/lang/en/general.php | 5 +++++ resources/views/account/accept-asset.blade.php | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 8b60aa7d7..e756ef79f 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -242,4 +242,9 @@ 'login_enabled' => 'Login Enabled', 'audit_due' => 'Due for Audit', 'audit_overdue' => 'Overdue for Audit', + 'accept' => 'Accept :asset', + 'i_accept' => 'I accept', + 'i_decline' => 'I decline', + 'sign_tos' => 'Sign below to indicate that you agree to the terms of service:', + 'clear_signature' => 'Clear Signature' ]; diff --git a/resources/views/account/accept-asset.blade.php b/resources/views/account/accept-asset.blade.php index 780b9408e..ca27f1880 100644 --- a/resources/views/account/accept-asset.blade.php +++ b/resources/views/account/accept-asset.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') - Accept {{ $item->present()->name() }} + {{trans('general.accept', ['asset' => $item->present()->name()])}} @parent @stop @@ -42,14 +42,14 @@
@@ -64,7 +64,7 @@ @if ($snipeSettings->require_accept_signature=='1')
-

Sign below to indicate that you agree to the terms of service:

+

{{trans('general.sign_tos')}}

@@ -72,7 +72,7 @@
- +
From be114176a25664399a78d3454df47b7ee4f628e1 Mon Sep 17 00:00:00 2001 From: Dampfklon Date: Fri, 13 Nov 2020 00:09:40 +0100 Subject: [PATCH 07/12] Refactor Expected Checkin Notification into markdown and enable translation (#8236) Co-authored-by: snipe --- .../ExpectedCheckinNotification.php | 24 ++++++++++--------- resources/lang/en/mail.php | 3 +++ .../markdown/expected-checkin.blade.php | 20 ++++++++++++++++ 3 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 resources/views/notifications/markdown/expected-checkin.blade.php diff --git a/app/Notifications/ExpectedCheckinNotification.php b/app/Notifications/ExpectedCheckinNotification.php index e7262ae54..dadd920cf 100644 --- a/app/Notifications/ExpectedCheckinNotification.php +++ b/app/Notifications/ExpectedCheckinNotification.php @@ -2,7 +2,7 @@ namespace App\Notifications; -use Carbon\Carbon; +use App\Helpers\Helper; use Illuminate\Bus\Queueable; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; @@ -46,16 +46,18 @@ class ExpectedCheckinNotification extends Notification */ public function toMail() { - $formatted_due = Carbon::parse($this->params->expected_checkin)->format('D, M j, Y'); - return (new MailMessage) - ->error() - ->subject('Reminder: '.$this->params->present()->name().' checkin deadline approaching') - ->line('Hi, '.$this->params->assignedto->first_name.' '.$this->params->assignedto->last_name) - ->greeting('An asset checked out to you is due to be checked back in on '.$formatted_due.'.') - ->line('Asset: '.$this->params->present()->name()) - ->line('Serial: '.$this->params->serial) - ->line('Asset Tag: '.$this->params->asset_tag) - ->action('View Your Assets', route('view-assets')); + + $message = (new MailMessage)->markdown('notifications.markdown.expected-checkin', + [ + 'date' => Helper::getFormattedDateObject($this->params->expected_checkin, 'date', false), + 'asset' => $this->params->present()->name(), + 'serial' => $this->params->serial, + 'asset_tag' => $this->params->asset_tag + ]) + ->subject(trans('mail.Expected_Checkin_Notification', ['name' => $this->params->present()->name()])); + + return $message; + } } diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index 837d71fa6..23cc8e58b 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -74,4 +74,7 @@ return array( 'Asset_Checkin_Notification' => 'Asset checked in', 'License_Checkin_Notification' => 'License checked in', 'Expected_Checkin_Report' => 'Expected asset checkin report' + 'Expected_Checkin_Notification' => 'Reminder: :name checkin deadline approaching', + 'Expected_Checkin_Date' => 'An asset checked out to you is due to be checked back in on :date', + 'your_assets' => 'View Your Assets' ); diff --git a/resources/views/notifications/markdown/expected-checkin.blade.php b/resources/views/notifications/markdown/expected-checkin.blade.php new file mode 100644 index 000000000..182f88ec1 --- /dev/null +++ b/resources/views/notifications/markdown/expected-checkin.blade.php @@ -0,0 +1,20 @@ +@component('mail::message') +# {{ trans('mail.hello') }}, + +{{ trans('mail.Expected_Checkin_Date', ['date' => $date]) }} + +@if ((isset($asset)) && ($asset!='')) +{{ trans('mail.asset_name') }} {{ $asset }} +@endif +{{ trans('mail.asset_tag') }} {{ $asset_tag }} +@if (isset($serial)) +{{ trans('mail.serial') }}: {{ $serial }} +@endif + +**[{{ trans('mail.your_assets') }}]({{ route('view-assets') }})** + +{{ trans('mail.best_regards') }} + +{{ $snipeSettings->site_name }} + +@endcomponent From 57d25ebb207d146723f177db762996cf9af3387c Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 15:13:45 -0800 Subject: [PATCH 08/12] Fixed #8719 - use same convention for file names on licenses as we do on assets --- app/Http/Controllers/Licenses/LicenseFilesController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php index 817fbb329..1e3ade907 100644 --- a/app/Http/Controllers/Licenses/LicenseFilesController.php +++ b/app/Http/Controllers/Licenses/LicenseFilesController.php @@ -39,7 +39,8 @@ class LicenseFilesController extends Controller $upload_success = false; foreach ($request->file('file') as $file) { - $file_name = 'license-'.date('Y-m-d-His').'-'.$file->getBasename().'.'.$file->getClientOriginalExtension(); + + $file_name = 'license-'.$license->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$file->getClientOriginalExtension())).'.'.$file->getClientOriginalExtension(); $upload_success = $file->storeAs('private_uploads/licenses', $file_name); From 5ea9c31eabc025aed4faeb0149ebb56538575832 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 15:14:56 -0800 Subject: [PATCH 09/12] Removed debugging --- app/Models/Asset.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 376be08fc..724157723 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -244,7 +244,6 @@ class Asset extends Depreciable */ public function availableForCheckout() { - \Log::debug($this->assetstatus); if ( ((!$this->assignedTo) && ($this->assetstatus->archived == 0)) || ((empty($this->assigned_to)) && From 9164dda64f65ef6d4a8066e08c24c35401627938 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 15:20:15 -0800 Subject: [PATCH 10/12] Added artisan command to purge logins --- app/Console/Commands/PurgeLoginAttempts.php | 44 +++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 app/Console/Commands/PurgeLoginAttempts.php diff --git a/app/Console/Commands/PurgeLoginAttempts.php b/app/Console/Commands/PurgeLoginAttempts.php new file mode 100644 index 000000000..b49f32430 --- /dev/null +++ b/app/Console/Commands/PurgeLoginAttempts.php @@ -0,0 +1,44 @@ +confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE YOUR LOGIN ATTEMPT RECORDS. There is NO undo. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) { + \DB::statement('delete from login_attempts'); + } + } +} From d537fc5c328ba9baca9a00403b6613cb206d2026 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 15:21:00 -0800 Subject: [PATCH 11/12] Added linebreak to console confirmation --- app/Console/Commands/PurgeLoginAttempts.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/PurgeLoginAttempts.php b/app/Console/Commands/PurgeLoginAttempts.php index b49f32430..7a7a1394d 100644 --- a/app/Console/Commands/PurgeLoginAttempts.php +++ b/app/Console/Commands/PurgeLoginAttempts.php @@ -37,7 +37,7 @@ class PurgeLoginAttempts extends Command */ public function handle() { - if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE YOUR LOGIN ATTEMPT RECORDS. There is NO undo. \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) { + if ($this->confirm("\n****************************************************\nTHIS WILL DELETE ALL OF THE YOUR LOGIN ATTEMPT RECORDS. \nThere is NO undo! \n****************************************************\n\nDo you wish to continue? No backsies! [y|N]")) { \DB::statement('delete from login_attempts'); } } From 0fdfd013e705dd7cf317099bfa2af458fc99adc5 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 12 Nov 2020 15:26:50 -0800 Subject: [PATCH 12/12] Fixed #8715 - wrong API url for unaccepted assets --- resources/views/layouts/default.blade.php | 2 +- resources/views/reports/unaccepted_assets.blade.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 689d2e685..6c40babe1 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -17,7 +17,7 @@ - + diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php index e1ab7f044..c87596a7a 100644 --- a/resources/views/reports/unaccepted_assets.blade.php +++ b/resources/views/reports/unaccepted_assets.blade.php @@ -28,7 +28,6 @@ data-show-refresh="true" data-sort-order="asc" id="unacceptedAssetsReport" - data-url="{{route('api.maintenances.index') }}" class="table table-striped snipe-table" data-export-options='{ "fileName": "maintenance-report-{{ date('Y-m-d') }}",