DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix rebase errors

Browse source
This commit is contained in:
Dampfklon 2021-10-07 21:32:57 +02:00
parent 7645f23f5c
commit ab4a234e20
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Notifications/CheckoutAssetNotification.php
View file

@ -2,6 +2,7 @@
namespace App\Notifications; namespace App\Notifications;
use App\Helpers\Helper;
use App\Models\Asset; use App\Models\Asset;
use App\Models\Setting; use App\Models\Setting;
use App\Models\User; use App\Models\User;

8
resources/lang/en/admin/reports/general.php
View file

@ -1,16 +1,10 @@
<?php <?php
<<<<<<< HEAD
return [ return [
'info' => 'Select the options you want for your asset report.', 'info' => 'Select the options you want for your asset report.',
];
=======
return array(
'info' => 'Select the options you want for your asset report.',
'deleted_user' => 'Deleted user', 'deleted_user' => 'Deleted user',
'send_reminder' => 'Send reminder', 'send_reminder' => 'Send reminder',
'reminder_sent' => 'Reminder sent', 'reminder_sent' => 'Reminder sent',
'acceptance_deleted' => 'Acceptance request deleted', 'acceptance_deleted' => 'Acceptance request deleted',
'acceptance_request' => 'Acceptance request' 'acceptance_request' => 'Acceptance request'
); ];
>>>>>>> Unaccepted Assets Report Actions (send reminder, delete) added

2
routes/web.php
View file

@ -332,7 +332,7 @@ Route::group(['middleware' => ['auth']], function () {
)->name('reports/unaccepted_assets_delete'); )->name('reports/unaccepted_assets_delete');
Route::post( Route::post(
'reports/unaccepted_assets/{deleted?}', 'reports/unaccepted_assets/{deleted?}',
[ReportsController::class, 'exportAssetAcceptanceReport'] [ReportsController::class, 'postAssetAcceptanceReport']
)->name('reports/export/unaccepted_assets'); )->name('reports/export/unaccepted_assets');
}); });