Merge branch 'develop' into v5-master-develop-integration

# Conflicts: # .env.example # .travis.yml # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Console/Kernel.php # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Middleware/EncryptCookies.php # app/Http/Requests/AssetRequest.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/AssetImporter.php # app/Models/AssetMaintenance.php # app/Models/Location.php # app/Models/User.php # composer.json # composer.lock # config/backup.php # config/database.php # config/version.php # public/mix-manifest.json # resources/lang/en-ID/general.php # resources/lang/vi/admin/settings/general.php # resources/views/accessories/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
parent a73fd24695 957c7f4e79
commit 5290c47e2a
1770 changed files with 176956 additions and 341491 deletions
@@ -6,17 +6,18 @@ use App\Models\Accessory;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetMaintenance;
+use App\Models\CheckoutAcceptance;
 use App\Models\CustomField;
 use App\Models\Depreciation;
 use App\Models\License;
 use App\Models\Setting;
 use Carbon\Carbon;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\View;
 use Input;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Illuminate\Http\Request;

 /**
 * This controller handles all actions related to Reports for
@@ -31,8 +32,6 @@ class ReportsController extends Controller
     */
    public function __construct() {
        parent::__construct();
-
-        $this->authorize('reports.view');
    }

    /**
@@ -44,6 +43,7 @@ class ReportsController extends Controller
    */
    public function getAccessoryReport()
    {
+        $this->authorize('reports.view');
        $accessories = Accessory::orderBy('created_at', 'DESC')->with('company')->get();
        return view('reports/accessories', compact('accessories'));
    }
@@ -59,6 +59,7 @@ class ReportsController extends Controller
    */
    public function exportAccessoryReport()
    {
+        $this->authorize('reports.view');
        $accessories = Accessory::orderBy('created_at', 'DESC')->get();

        $rows = array();
@@ -99,7 +100,7 @@ class ReportsController extends Controller
    */
    public function getDeprecationReport()
    {
-
+        $this->authorize('reports.view');
        $depreciations = Depreciation::get();
        // Grab all the assets
        $assets = Asset::with( 'assignedTo', 'assetstatus', 'defaultLoc', 'location', 'assetlog', 'company', 'model.category', 'model.depreciation')
@@ -118,7 +119,7 @@ class ReportsController extends Controller
    */
    public function exportDeprecationReport()
    {
-
+        $this->authorize('reports.view');
        // Grab all the assets
        $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog')
                       ->orderBy('created_at', 'DESC')->get();
@@ -172,7 +173,7 @@ class ReportsController extends Controller
            if ($asset->location) {
                $currency = e($asset->location->currency);
            } else {
-                $currency = e(Setting::first()->default_currency);
+                $currency = e(Setting::getSettings()->default_currency);
            }

            $row[] = $asset->purchase_date;
@@ -197,6 +198,7 @@ class ReportsController extends Controller
     */
    public function audit()
    {
+        $this->authorize('reports.view');
        return view('reports/audit');
    }

@@ -210,7 +212,7 @@ class ReportsController extends Controller
    */
    public function getActivityReport()
    {
-
+        $this->authorize('reports.view');
        return view('reports/activity');
    }

@@ -224,7 +226,7 @@ class ReportsController extends Controller
     */
    public function getLicenseReport()
    {
-
+        $this->authorize('reports.view');
        $licenses = License::with('depreciation')->orderBy('created_at', 'DESC')
                           ->with('company')
                           ->get();
@@ -242,6 +244,7 @@ class ReportsController extends Controller
    */
    public function exportLicenseReport()
    {
+        $this->authorize('reports.view');
        $licenses = License::orderBy('created_at', 'DESC')->get();

        $rows     = [ ];
@@ -292,6 +295,7 @@ class ReportsController extends Controller
    */
    public function getCustomReport()
    {
+        $this->authorize('reports.view');
        $customfields = CustomField::get();
        return view('reports/custom')->with('customfields', $customfields);
    }
@@ -306,8 +310,8 @@ class ReportsController extends Controller
     */
    public function postCustom(Request $request)
    {
-
        ini_set('max_execution_time', 12000);
+        $this->authorize('reports.view');


        \Debugbar::disable();
@@ -433,6 +437,7 @@ class ReportsController extends Controller
            if ($request->filled('depreciation')) {
                $header[] = 'Value';
                $header[] = 'Diff';
+                $header[] = 'Fully Depreciated';
            }

            if ($request->filled('checkout_date')) {
@@ -506,6 +511,11 @@ class ReportsController extends Controller
                $assets->InCategory($request->input('by_category_id'));
            }

+            if ($request->filled('by_dept_id')) {
+                \Log::debug('Only users in dept '.$request->input('by_dept_id'));
+                $assets->CheckedOutToTargetInDepartment($request->input('by_dept_id'));
+            }
+
            if ($request->filled('by_manufacturer_id')) {
                $assets->ByManufacturer($request->input('by_manufacturer_id'));
            }
@@ -672,6 +682,7 @@ class ReportsController extends Controller
                            $diff = ($asset->purchase_cost - $depreciation);
                            $row[]        = Helper::formatCurrencyOutput($depreciation);
                            $row[]        = Helper::formatCurrencyOutput($diff);
+                            $row[]        = ($asset->depreciated_date()!='') ? $asset->depreciated_date()->format('Y-m-d') : '';
                    }

                    if ($request->filled('checkout_date')) {
@@ -742,6 +753,7 @@ class ReportsController extends Controller
     */
    public function getAssetMaintenancesReport()
    {
+        $this->authorize('reports.view');
        // Grab all the improvements
        $assetMaintenances = AssetMaintenance::with('asset', 'supplier', 'asset.company')
                                              ->orderBy('created_at', 'DESC')
@@ -760,6 +772,7 @@ class ReportsController extends Controller
     */
    public function exportAssetMaintenancesReport()
    {
+        $this->authorize('reports.view');
        // Grab all the improvements
        $assetMaintenances = AssetMaintenance::with('asset', 'supplier')
                                             ->orderBy('created_at', 'DESC')
@@ -820,7 +833,21 @@ class ReportsController extends Controller
     */
    public function getAssetAcceptanceReport()
    {
-        $assetsForReport = Asset::notYetAccepted()->with('company')->get();
+        $this->authorize('reports.view');
+
+        /**
+         * Get all assets with pending checkout acceptances
+         */
+
+        $acceptances = CheckoutAcceptance::pending()->get();
+
+        $assetsForReport = $acceptances
+            ->filter(function($acceptance) {
+                return $acceptance->checkoutable_type == 'App\Models\Asset';
+            })
+            ->map(function($acceptance) {
+                return $acceptance->checkoutable;
+            });

        return view('reports/unaccepted_assets', compact('assetsForReport'));
    }
@@ -834,7 +861,7 @@ class ReportsController extends Controller
     */
    public function exportAssetAcceptanceReport()
    {
-
+        $this->authorize('reports.view');
        // Grab all the improvements
        $assetsForReport = Actionlog::whereIn('id', $this->getAssetsNotAcceptedYet())
                                    ->get();
@@ -883,6 +910,7 @@ class ReportsController extends Controller
     */
    protected function getCheckedOutAssetsRequiringAcceptance($modelsInCategoriesThatRequireAcceptance)
    {
+        $this->authorize('reports.view');
        $assets = Asset::deployed()
                        ->inModelList($modelsInCategoriesThatRequireAcceptance)
                        ->select('id')
@@ -902,7 +930,7 @@ class ReportsController extends Controller
     */
    protected function getModelsInCategoriesThatRequireAcceptance($assetCategoriesRequiringAcceptance)
    {
-
+        $this->authorize('reports.view');
        return array_pluck(Model::inCategory($assetCategoriesRequiringAcceptance)
                                 ->select('id')
                                 ->get()
@@ -918,7 +946,7 @@ class ReportsController extends Controller
     */
    protected function getCategoriesThatRequireAcceptance()
    {
-
+        $this->authorize('reports.view');
        return array_pluck(Category::requiresAcceptance()
                                    ->select('id')
                                    ->get()
@@ -934,7 +962,7 @@ class ReportsController extends Controller
     */
    protected function getAssetsCheckedOutRequiringAcceptance()
    {
-
+        $this->authorize('reports.view');
        return $this->getCheckedOutAssetsRequiringAcceptance(
            $this->getModelsInCategoriesThatRequireAcceptance($this->getCategoriesThatRequireAcceptance())
        );
@@ -949,6 +977,7 @@ class ReportsController extends Controller
     */
    protected function getAssetsNotAcceptedYet()
    {
+        $this->authorize('reports.view');
        return Asset::unaccepted();
    }
 }