Merge pull request #10774 from snipe/features/added_notes_to_accessories_etc

snipe · web-flow · commit 3e22dce1170f · 2022-03-03T20:41:18.000-08:00
Fixed #6918 - added notes to accessories, components, consumables
diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -78,6 +78,8 @@ public function store(ImageUploadRequest $request)
         $accessory->qty                     = request('qty');
         $accessory->user_id                 = Auth::user()->id;
         $accessory->supplier_id             = request('supplier_id');
+        $accessory->notes                   = request('notes');
+
 
         $accessory = $request->handleImages($accessory);
         
@@ -140,6 +142,7 @@ public function update(ImageUploadRequest $request, $accessoryId = null)
         $accessory->purchase_cost           = Helper::ParseCurrency(request('purchase_cost'));
         $accessory->qty                     = request('qty');
         $accessory->supplier_id             = request('supplier_id');
+        $accessory->notes                   = request('notes');
 
         $accessory = $request->handleImages($accessory);
 
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
@@ -39,7 +39,8 @@ public function index(Request $request)
                 'notes',
                 'created_at',
                 'min_amt',
-                'company_id'
+                'company_id',
+                'notes',
             ];
 
 
@@ -69,6 +70,10 @@ public function index(Request $request)
             $accessories->where('location_id','=',$request->input('location_id'));
         }
 
+        if ($request->filled('notes')) {
+            $accessories->where('notes','=',$request->input('notes'));
+        }
+
         // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
         // case we override with the actual count, so we should return 0 items.
         $offset = (($accessories) && ($request->get('offset') > $accessories->count())) ? $accessories->count() : $request->get('offset', 0);
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
@@ -40,6 +40,7 @@ public function index(Request $request)
                 'purchase_cost',
                 'qty',
                 'image',
+                'notes',
             ];
 
 
@@ -62,6 +63,10 @@ public function index(Request $request)
             $components->where('location_id','=',$request->input('location_id'));
         }
 
+        if ($request->filled('notes')) {
+            $components->where('notes','=',$request->input('notes'));
+        }
+
         // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
         // case we override with the actual count, so we should return 0 items.
         $offset = (($components) && ($request->get('offset') > $components->count())) ? $components->count() : $request->get('offset', 0);
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
@@ -42,6 +42,7 @@ public function index(Request $request)
                 'item_no', 
                 'qty',
                 'image',
+                'notes',
                 ];
 
 
@@ -74,6 +75,10 @@ public function index(Request $request)
             $consumables->where('location_id','=',$request->input('location_id'));
         }
 
+        if ($request->filled('notes')) {
+            $consumables->where('notes','=',$request->input('notes'));
+        }
+
 
         // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
         // case we override with the actual count, so we should return 0 items.
diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php
@@ -78,6 +78,7 @@ public function store(ImageUploadRequest $request)
         $component->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost', null));
         $component->qty                    = $request->input('qty');
         $component->user_id                = Auth::id();
+        $component->notes                  = $request->input('notes');
 
         $component = $request->handleImages($component);
 
@@ -147,6 +148,7 @@ public function update(ImageUploadRequest $request, $componentId = null)
         $component->purchase_date          = $request->input('purchase_date');
         $component->purchase_cost          = Helper::ParseCurrency(request('purchase_cost'));
         $component->qty                    = $request->input('qty');
+        $component->notes                  = $request->input('notes');
 
         $component = $request->handleImages($component);
 
diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -78,6 +78,8 @@ public function store(ImageUploadRequest $request)
         $consumable->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost'));
         $consumable->qty                    = $request->input('qty');
         $consumable->user_id                = Auth::id();
+        $consumable->notes                  = $request->input('notes');
+
 
 
         $consumable = $request->handleImages($consumable);
@@ -143,6 +145,7 @@ public function update(ImageUploadRequest $request, $consumableId = null)
         $consumable->purchase_date          = $request->input('purchase_date');
         $consumable->purchase_cost          = Helper::ParseCurrency($request->input('purchase_cost'));
         $consumable->qty                    = Helper::ParseFloat($request->input('qty'));
+        $consumable->notes                  = $request->input('notes');
 
         $consumable = $request->handleImages($consumable);
 
diff --git a/app/Http/Transformers/ComponentsTransformer.php b/app/Http/Transformers/ComponentsTransformer.php
@@ -43,6 +43,7 @@ public function transformComponent(Component $component)
                 'id' => (int) $component->company->id,
                 'name' => e($component->company->name)
             ] : null,
+            'notes' => ($component->notes) ? e($component->notes) : null,
             'created_at' => Helper::getFormattedDateObject($component->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($component->updated_at, 'datetime'),
             'user_can_checkout' =>  ($component->numRemaining() > 0) ? 1 : 0,
diff --git a/app/Http/Transformers/ConsumablesTransformer.php b/app/Http/Transformers/ConsumablesTransformer.php
@@ -37,6 +37,7 @@ public function transformConsumable (Consumable $consumable)
             'purchase_cost'  => Helper::formatCurrencyOutput($consumable->purchase_cost),
             'purchase_date'  => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
             'qty'           => (int) $consumable->qty,
+            'notes'         => ($consumable->notes) ? e($consumable->notes) : null,
             'created_at' => Helper::getFormattedDateObject($consumable->created_at, 'datetime'),
             'updated_at' => Helper::getFormattedDateObject($consumable->updated_at, 'datetime'),
         ];
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
@@ -35,7 +35,7 @@ class Accessory extends SnipeModel
      * 
      * @var array
      */
-    protected $searchableAttributes = ['name', 'model_number', 'order_number', 'purchase_date'];
+    protected $searchableAttributes = ['name', 'model_number', 'order_number', 'purchase_date', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
@@ -92,7 +92,8 @@ class Accessory extends SnipeModel
         'image',
         'qty',
         'min_amt',
-        'requestable'
+        'requestable',
+        'notes',
     ];
 
 
diff --git a/app/Models/Component.php b/app/Models/Component.php
@@ -60,6 +60,7 @@ class Component extends SnipeModel
         'order_number',
         'qty',
         'serial',
+        'notes',
     ];
 
     use Searchable;
@@ -69,7 +70,7 @@ class Component extends SnipeModel
      * 
      * @var array
      */
-    protected $searchableAttributes = ['name', 'order_number', 'serial', 'purchase_cost', 'purchase_date'];
+    protected $searchableAttributes = ['name', 'order_number', 'serial', 'purchase_cost', 'purchase_date', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
diff --git a/app/Models/Consumable.php b/app/Models/Consumable.php
@@ -69,7 +69,8 @@ class Consumable extends SnipeModel
         'purchase_date',
         'qty',
         'min_amt',
-        'requestable'
+        'requestable',
+        'notes',
     ];
 
     use Searchable;
@@ -79,7 +80,7 @@ class Consumable extends SnipeModel
      * 
      * @var array
      */
-    protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date', 'item_no', 'model_number'];
+    protected $searchableAttributes = ['name', 'order_number', 'purchase_cost', 'purchase_date', 'item_no', 'model_number', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
@@ -109,7 +109,14 @@ public static function dataTableLayout()
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.order_number'),
-            ],[
+            ], [
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
+            ], [
                 "field" => "change",
                 "searchable" => false,
                 "sortable" => false,
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
@@ -104,7 +104,14 @@ public static function dataTableLayout()
                 "title" => trans('general.purchase_cost'),
                 "visible" => true,
                 "footerFormatter" => 'sumFormatter',
-            ],
+            ], [
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
+            ]
         ];
 
         $layout[] = [
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
@@ -118,13 +118,20 @@ public static function dataTableLayout()
                 "visible" => true,
                 "footerFormatter" => 'sumFormatter',
             ],[
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('general.notes'),
+                "formatter" => "notesFormatter"
+            ], [
                 "field" => "change",
                 "searchable" => false,
                 "sortable" => false,
                 "visible" => true,
                 "title" => trans('general.change'),
                 "formatter" => "consumablesInOutFormatter",
-            ], [
+            ],  [
                 "field" => "actions",
                 "searchable" => false,
                 "sortable" => false,
diff --git a/database/migrations/2022_03_03_225655_add_notes_to_accessories.php b/database/migrations/2022_03_03_225655_add_notes_to_accessories.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNotesToAccessories extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            $table->text("notes")->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('accessories', function (Blueprint $table) {
+            if (Schema::hasColumn('accessories', 'notes')) {
+                $table->dropColumn('notes');
+            }
+        });
+    }
+}
diff --git a/database/migrations/2022_03_03_225754_add_notes_to_components.php b/database/migrations/2022_03_03_225754_add_notes_to_components.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNotesToComponents extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            $table->text("notes")->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('components', function (Blueprint $table) {
+            if (Schema::hasColumn('components', 'notes')) {
+                $table->dropColumn('notes');
+            }
+        });
+    }
+}
diff --git a/database/migrations/2022_03_03_225824_add_notes_to_consumables.php b/database/migrations/2022_03_03_225824_add_notes_to_consumables.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddNotesToConsumables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('consumables', function (Blueprint $table) {
+            $table->text("notes")->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('consumables', function (Blueprint $table) {
+            if (Schema::hasColumn('consumables', 'notes')) {
+                $table->dropColumn('notes');
+            }
+        });
+    }
+}
diff --git a/resources/views/accessories/edit.blade.php b/resources/views/accessories/edit.blade.php
@@ -35,6 +35,8 @@
     </div>
 @endif
 
+@include ('partials.forms.edit.notes')
+
 @include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
@@ -102,6 +102,20 @@ class="table table-striped snipe-table"
               <a href="{{ route('checkout/accessory', $accessory->id) }}" style="margin-right:5px;" class="btn btn-primary btn-sm" {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
           @endcan
       </div>
+
+      @if ($accessory->notes)
+
+        <div class="col-md-12">
+          <strong>
+            {{ trans('general.notes') }}
+          </strong>
+        </div>
+        <div class="col-md-12">
+          {!! nl2br(e($accessory->notes)) !!}
+        </div>
+      </div>
+      @endif
+
   </div>
 </div>
 @stop
diff --git a/resources/views/components/edit.blade.php b/resources/views/components/edit.blade.php
@@ -33,6 +33,8 @@
     </div>
 @endif
 
+@include ('partials.forms.edit.notes')
+
 @include ('partials.forms.edit.image-upload')
 
 @stop
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
@@ -135,6 +135,20 @@ class="table table-striped snipe-table"
     <div class="col-md-12" style="padding-bottom: 5px;"><strong>{{ trans('general.order_number') }}:</strong>
     {{ $component->order_number }} </div>
     @endif
+
+    @if ($component->notes)
+
+      <div class="col-md-12">
+        <strong>
+          {{ trans('general.notes') }}
+        </strong>
+      </div>
+      <div class="col-md-12">
+        {!! nl2br(e($component->notes)) !!}
+      </div>
+    </div>
+    @endif
+
   </div>
 </div> <!-- .row-->
 
diff --git a/resources/views/consumables/edit.blade.php b/resources/views/consumables/edit.blade.php
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
