Ver Fonte

check input search

azam há 4 anos atrás
pai
commit
502e1ea531

+ 20 - 27
app/Http/Controllers/Panel/Categories/CategoryController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Panel\Categories;
 use App\Http\Requests\CategoryRequest;
 use App\Models\Category;
 use App\Http\Controllers\Controller;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 
 
@@ -16,16 +17,17 @@ class CategoryController extends Controller
      */
     public function index()
     {
-     $categories=Category::orderBy('id','DESC');
+        $categories = Category::orderBy('id','DESC');
+
              if (request()->has('categoryName') && request('categoryName') != '')
-            $categories = $categories->whereRaw('status = ?', [request('categoryName')]);
+            $categories = $categories->whereRaw('title = ?', [request('categoryName')]);
 
        if (request()->has('categorySlug') && request('categorySlug') != '')
-            $categories = $categories->whereRaw('title = ?', [request('categorySlug')]);
+            $categories = $categories->whereRaw('slug = ?', [request('categorySlug')]);
 
-        if (request()->has('productCreator_id') && request('productCreator_id') != '')
+        if (request()->has('creatorId') && request('creatorId') != '')
           $categories = $categories->whereHas('users', function (Builder $query) {
-              $query->whereRaw('id = ?', [request('productCreator_id')]);
+              $query->whereRaw('id = ?', [request('creatorId')]);
            });
         $categories = $categories->paginate();
         return view('panel.categories.index',compact('categories'));
@@ -38,6 +40,7 @@ class CategoryController extends Controller
      */
     public function create()
     {
+
         return view('panel.categories.create');
     }
 
@@ -49,18 +52,17 @@ class CategoryController extends Controller
      */
     public function store(CategoryRequest $request)
     {
-//        $data = array_merge($request->all(),['creator_id' => auth()->user()->id]);
+
         $data = [
             'title' => $request->title,
             'slug' => $request->slug,
-            'sku' => $request->sku,
-            'price' => $request->price,
+            'parent' => $request->parent,
+            'category_type' => $request->category_type,
             'discription' => $request->discription,
             'creator_id' => auth()->user()->id
         ];
-        $category = Category::create($data);
-
 
+        $category = Category::create($data);
         $msg = 'ذخیره محصول با موفقیت انجام شد ';
         return redirect(route('categories.edit', $category->id))->with('success', $msg);
     }
@@ -97,25 +99,16 @@ class CategoryController extends Controller
      */
     public function update(CategoryRequest $request, Category $category)
     {
-        $validatedData= $request->validate([
-            'title' => 'required|max:100',
-            'parent' => 'required',
-            'category_type' => 'required',
-            'discription' => 'required',
-
-
-
-        ],[
-            'title.required' => 'فیلد عنوان الزامی می باشد.',
-            'parent.required' => 'فیلد وضعیت الزامی می باشد.',
-            'discription.required' => 'فیلد توضیحات الزامی می باشد.',
-            'category_type.required' => 'فیلد نوع دسته بندی الزامی می باشد.',
+        $data = [
+            'title' => $request->title,
+            'slug' => $request->slug,
+            'parent' => $request->parent,
+            'category_type' => $request->category_type,
+            'discription' => $request->discription,
+            'creator_id' => auth()->user()->id
+        ];
 
-        ]);
-        $data = array_merge($request->all(),['creator_id'=>auth()->user()->id]);
         $category->update($data);
-
-
         $msg = 'ویرایش محصول با موفقیت انجام شد ';
         return redirect(route('categories.index'))->with('success', $msg);
     }

+ 23 - 0
app/Models/Category.php

@@ -9,6 +9,7 @@ class Category extends Model
 {
     protected $fillable = ['title', 'parent', 'category_type', 'creator_id', 'slug', 'discription'];
 
+
     use SoftDeletes;
 
 
@@ -22,4 +23,26 @@ class Category extends Model
     {
         return $this->morphedByMany(Product::class, 'categorizable');
     }
+    public function getCategoryTypeAttribute($value)
+    {
+
+        switch ($value) {
+            case 0:
+                $category_type = 'محصولات';
+                break;
+            case 1:
+                $category_type = 'اخبار';
+                break;
+            case 2:
+                $category_type = 'مطالب';
+                break;
+
+            default:
+                $category_type = '';
+
+        }
+        return $category_type;
+    }
+
+
 }

+ 2 - 2
app/Providers/AppServiceProvider.php

@@ -3,7 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
-
+use Illuminate\Support\Facades\Schema;
 class AppServiceProvider extends ServiceProvider
 {
     /**
@@ -23,6 +23,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Schema::defaultStringLength(191);
     }
 }

+ 1 - 1
database/migrations/2020_06_22_085956_create_categories_table.php

@@ -20,7 +20,7 @@ class CreateCategoriesTable extends Migration
             $table->string('creator_id');
             $table->string('slug')->unique()->nullable();
             $table->string('category_type');
-            $table->integer('parent')->default(0);
+            $table->string('parent')->default("0");
             $table->timestamps();
             $table->softDeletes();
 

+ 3 - 4
packages/product/src/Http/Controllers/ProductController.php

@@ -10,7 +10,7 @@ use Packages\Product\Models\Product;
 use Illuminate\Http\Request;
 use App\Models\Category;
 use phpDocumentor\Reflection\Types\Compound;
-//use PhpParser\Builder;
+
 
 class ProductController extends Controller
 {
@@ -18,11 +18,9 @@ class ProductController extends Controller
     {
 
     }
-
 //  *******************************************show  page product ************
     public function index()
     {
-
         $categories = Category::orderBy('id', 'DESC')->get();
 
         $products = Product::query()->orderBy('id', 'DESC');
@@ -48,6 +46,7 @@ class ProductController extends Controller
     public function create()
     {
         $categories = Category::orderBy('id', 'DESC')->get();
+
         return view('product::product.create', compact('categories'));
     }
 
@@ -55,7 +54,6 @@ class ProductController extends Controller
 
     public function store(ProductRequest $request)
     {
-//        dd($request->all());
 
         $request->merge([
             'price' => preg_replace('/[^0-9]+/', '', $request->price),
@@ -76,6 +74,7 @@ class ProductController extends Controller
         ];
         $product = Product::create($data);
         $product->categories()->sync($request->categories);
+
         $msg = 'ذخیره محصول با موفقیت انجام شد ';
         return redirect(route('products.edit', $product->id))->with('success', $msg);
     }

+ 3 - 3
packages/product/src/views/index.blade.php

@@ -64,9 +64,9 @@
                                     </div>
                                 </div>
 
-                                <button type="submit" class="btn btn-primary float-left btnSearch" id="show">جستجو
+                                <button type="submit" class="btn btn-primary float-left btnSearch" id="showProduct">جستجو
                                 </button>
-                                <p class="searchNaum">{{$products->count()}}{{ __(' :مورد یافت شد.') }}</p>
+                                <p class="searchNaum">{{$products->total()}}{{ __(' :مورد یافت شد.') }}</p>
                             </form>
 
                             <div class="mt-4">
@@ -141,7 +141,7 @@
         <script>
 
 
-            $("#show").click(function(e){
+            $("#showProduct").click(function(e){
                 e.preventDefault();
                 $(".searchNaum").show();
             });

+ 2 - 6
packages/product/src/views/product/create.blade.php

@@ -175,7 +175,7 @@
 
                                             @foreach($categories as $cat)
 
-                                                <option value="{{$cat->id (old('type') == '2') ? 'selected' : '' }}  ">{{$cat->title}}</option>
+                                                <option value="{{$cat->id }}">{{$cat->title}}</option>
                                             @endforeach
                                         </select>
 
@@ -210,11 +210,7 @@
     @endslot
 
     @slot('script')
-        {{--        <script>--}}
-        {{--            $(document).ready(function () {--}}
-        {{--                $('.select2').select2();--}}
-        {{--            });--}}
-        {{--        </script>--}}
+
     @endslot
 
 @endcomponent

+ 1 - 1
resources/views/panel/categories/create.blade.php

@@ -93,7 +93,7 @@
                                             <option value="">انتخاب کنید</option>
                                             <option value="0">محصولات</option>
                                             <option value="1">اخبار</option>
-                                            <option value="2">دسته بندی</option>
+                                            <option value="2">مطالب</option>
                                         </select>
 
                                         @error('category_type')

+ 4 - 2
resources/views/panel/categories/edit.blade.php

@@ -91,8 +91,10 @@
                                                 class="form-control @error('category_type') is-invalid @enderror"
                                                 name="category_type"
                                                  autocomplete="category_type">
-                                            <option value="1">محصولات</option>
-                                            <option value="0">دسته بندی</option>
+                                            <option value="">انتخاب کنید</option>
+                                            <option value="0">محصولات</option>
+                                            <option value="1">اخبار</option>
+                                            <option value="2">دسته بندی</option>
                                         </select>
 
                                         @error('category_type')

+ 2 - 2
resources/views/panel/categories/index.blade.php

@@ -35,7 +35,7 @@
                 <div class="col">
                     <label for="categories">{{ __('  نام ثبت کننده:') }}</label>
                     <input type="text" class="form-control" placeholder="ایجاد کننده دسته بندی..."
-                            name="productCreator_id" value="{{ request()->query('productCreator_id') }}">
+                            name="creatorId" value="{{ request()->query('creatorId') }}">
 
 
                 </div>
@@ -43,7 +43,7 @@
 
             <button type="submit" class="btn btn-primary float-left btnSearch" id="show">جستجو
             </button>
-{{--            <p class="searchNaum">{{$products->count()}}{{ __(' :مورد یافت شد.') }}</p>--}}
+            <p class="searchNaum">{{$categories->count()}}{{ __(' :مورد یافت شد.') }}</p>
         </form>
 
                         <div class="mt-4">