From 179f8f91056b963d874c6d2ac71424f2e6f70cd9 Mon Sep 17 00:00:00 2001
From: yuki <yukiyukiyu@github.com>
Date: Sat, 10 Jun 2017 17:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E4=B8=BE=E6=8A=A5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E6=B7=BB=E5=8A=A0=E4=BA=86tickets,=20admi?=
 =?UTF-8?q?n=5Fevents=E4=B8=A4=E5=BC=A0=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserController.php       | 26 +++++++++++++
 app/Http/routes.php                           |  3 ++
 app/Ticket.php                                | 10 +++++
 ...2017_06_10_004958_create_tickets_table.php | 38 +++++++++++++++++++
 ...06_10_010041_create_admin_events_table.php | 36 ++++++++++++++++++
 resources/views/good/editPage.blade.php       |  2 +-
 resources/views/good/goodInfo.blade.php       |  9 ++++-
 resources/views/user/report.blade.php         | 17 +++++++++
 8 files changed, 139 insertions(+), 2 deletions(-)
 create mode 100644 app/Ticket.php
 create mode 100644 database/migrations/2017_06_10_004958_create_tickets_table.php
 create mode 100644 database/migrations/2017_06_10_010041_create_admin_events_table.php
 create mode 100644 resources/views/user/report.blade.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 54d92db..f3afa87 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -27,6 +27,7 @@ use App\Http\Controllers\Controller;
 use Hash;
 use Mail;
 use Image;
+use App\Ticket;
 
 class UserController extends Controller
 {
@@ -272,4 +273,29 @@ class UserController extends Controller
         return view::make('user.buyer')->with($data);
     }
 
+	public function reportSeller(Request $request, $seller_id)
+	{
+		$data = [];
+		$data['seller_id'] = $seller_id;
+		return view::make('user.report')->with($data);
+	}
+
+	/*
+	 * 评价type=1  举报type=2
+	 * 发布未领取state=0
+	 * 已领取未处理state=1
+	 * 已处理state=2
+	 */
+	public function sendRepo(Request $request, $seller_id)
+	{
+		$input = $request->all();
+		$ticket = new Ticket;
+		$ticket->sender_id = $request->session()->get('user_id');
+		$ticket->receiver_id = $seller_id;
+		$ticket->type = 2;
+		$ticket->message = $input['reason'];
+		$ticket->save();
+		return View::make('common.errorPage')->withErrors('举报成功！');
+	}
+
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 53a0bf9..956b1ea 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -81,6 +81,9 @@ Route::group(['middleware' => ['web']],function () {
     Route::get('/avatar/{user_id}', "UserController@getSimpleAvatar");
     Route::get('/avatar/{user_id}/{width}/{height}', "UserController@getAvatar");
 
+	Route::get('/report/{seller_id}', "UserController@reportSeller")->middleware('auth');
+	Route::post('/sendRepo/{seller_id}', "UserController@sendRepo");
+
     Route::get('/good', "GoodController@getList");
 
     Route::get('/good/add', "GoodController@showAddGood")->middleware('auth');
diff --git a/app/Ticket.php b/app/Ticket.php
new file mode 100644
index 0000000..02dcf30
--- /dev/null
+++ b/app/Ticket.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Ticket extends Model
+{
+    //
+}
diff --git a/database/migrations/2017_06_10_004958_create_tickets_table.php b/database/migrations/2017_06_10_004958_create_tickets_table.php
new file mode 100644
index 0000000..2767de5
--- /dev/null
+++ b/database/migrations/2017_06_10_004958_create_tickets_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateTicketsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+		Schema::create('tickets', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('sender_id');
+			$table->integer('trans_id');
+			$table->integer('receiver_id');
+			$table->tinyInteger('type');
+			$table->string('message');
+			$table->integer('assignee');
+			$table->integer('state');
+			$table->timestamps();
+		});
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+		Schema::drop('tickets');
+    }
+}
diff --git a/database/migrations/2017_06_10_010041_create_admin_events_table.php b/database/migrations/2017_06_10_010041_create_admin_events_table.php
new file mode 100644
index 0000000..52fbcd7
--- /dev/null
+++ b/database/migrations/2017_06_10_010041_create_admin_events_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateAdminEventsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+		Schema::create('admin_events', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('admin_id');
+			$table->integer('target_user');
+			$table->string('event');
+			$table->integer('ticket_id')->nullable();
+			$table->text('message');
+			$table->timestamps();
+		});
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+		Schema::drop('admin_events');
+    }
+}
diff --git a/resources/views/good/editPage.blade.php b/resources/views/good/editPage.blade.php
index 9bf9569..ab1b0fd 100644
--- a/resources/views/good/editPage.blade.php
+++ b/resources/views/good/editPage.blade.php
@@ -167,4 +167,4 @@
             }
         }
     </script>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/good/goodInfo.blade.php b/resources/views/good/goodInfo.blade.php
index c4c29de..097037e 100644
--- a/resources/views/good/goodInfo.blade.php
+++ b/resources/views/good/goodInfo.blade.php
@@ -30,6 +30,7 @@
 
     <div class="row">
         <div class="small-12 medium-5 columns block" style="background-color: white;">
+			<a href="/user/{{ $good->user_id }}">卖家</a>
             <a id="pic" href="/good/{{ sha1($good->id) }}/titlepic"><img alt="" class="thumbnail" src="/good/{{ sha1($good->id) }}/titlepic" /></a>
         </div>
         <div class="small-12 medium-6 medium-offset-1 columns block" style="background-color: white;margin-bottom: 10px;margin-top:10px">
@@ -86,6 +87,12 @@
             @endif
         </div>
     </div>
+	
+	<div class="row hide-for-small-only">
+		@if($good->user_id != Session::get('user_id'))
+			<a class="button" href="/report/{{ $good->user_id }}">举报该卖家</a>
+		@endif
+	</div>
 
     <div class="row">
         <div id="" class="small-12 medium-12 columns" style="background-color: white">
@@ -183,4 +190,4 @@
             </div>
         </div>
     </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/user/report.blade.php b/resources/views/user/report.blade.php
new file mode 100644
index 0000000..f19b1aa
--- /dev/null
+++ b/resources/views/user/report.blade.php
@@ -0,0 +1,17 @@
+@extends('layout.master')
+
+@section('title', "举报")
+
+@section('content')
+
+<div class="row">
+	<form action="/sendRepo/{{ $seller_id }}" method="POST">
+	{!! csrf_field() !!}
+		<label class="right inline">举报理由：</label>
+		<textarea name="reason"></textarea>
+		<input class="button" type="submit" name="submit1"
+			   value="确认举报"/>
+	</form>
+</div>
+
+@endsection