diff --git a/app/Http/Controllers/Admin/AdminController.php b/app/Http/Controllers/Admin/AdminController.php index acd31754..dc778473 100644 --- a/app/Http/Controllers/Admin/AdminController.php +++ b/app/Http/Controllers/Admin/AdminController.php @@ -11,6 +11,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\Category; +use App\Models\CategoryMaterial; use App\Models\Material; use App\Models\Order; use App\User; @@ -56,18 +57,24 @@ class AdminController extends Controller $this->data['field']['start_name'] = 'start'; $this->data['field']['end_name'] = 'end'; $this->data['field']['label'] = 'range'; - $this->data['categories'] = Category::where('depth',1) - ->select('categories.*', - DB::raw("(Select COUNT(orders.id) From orders - Where orders.category_id = categories.id and orders.payed = 1{$filter_by_date}) as orders"), - DB::raw("(Select SUM(orders.price) From orders - Where orders.category_id = categories.id and orders.payed = 1{$filter_by_date}) as total"), - DB::raw('SUM(materials.view) as views'), - DB::raw('SUM(materials.like) as likes')) - ->leftJoin('materials','categories.id','=','materials.category_id') - ->groupBy('categories.id') - ->get(); +// $this->data['categories'] = Category::where('depth',1) +// ->select('categories.*', +// //DB::raw("(Select COUNT(orders.id) From orders +// //Where orders.category_id = categories.id and orders.payed = 1{$filter_by_date}) as orders"), +// //DB::raw("(Select SUM(orders.price) From orders +// //Where orders.category_id = categories.id and orders.payed = 1{$filter_by_date}) as total"), +// DB::raw('SUM(materials.view) as views'), +// DB::raw('SUM(materials.like) as likes')) +//// ->leftJoin('materials','categories.id','=','materials.category_id') +// ->groupBy('categories.id') +// ->get(); + $this->data['categories'] = CategoryMaterial::with(['category:name,id']) + ->selectRaw('category_id, SUM(orders_count) as orders, SUM(orders_payed_count) as total, SUM(views) as views, SUM(likes) as likes') + ->groupBy('category_id') + ->distinct('category_id') + ->get(); + //dd($this->data['categories']); return view('backpack::dashboard', $this->data); } @@ -79,7 +86,7 @@ class AdminController extends Controller $filter_by_date = " and (orders.created_at BETWEEN {$start_date} and {$end_date})"; $category = Category::findOrfail($cat_id); - $materials= Material::where('category_id',$cat_id) + $materials= $category->materials() ->select('materials.title','materials.view','materials.like', DB::raw("(Select COUNT(orders.id) From orders Where orders.material_id = materials.id and orders.payed = 1{$filter_by_date}) as orders"), diff --git a/app/Http/Controllers/Admin/MaterialCrudController.php b/app/Http/Controllers/Admin/MaterialCrudController.php index a74ff160..1ff2c504 100644 --- a/app/Http/Controllers/Admin/MaterialCrudController.php +++ b/app/Http/Controllers/Admin/MaterialCrudController.php @@ -6,7 +6,7 @@ use Backpack\CRUD\app\Http\Controllers\CrudController; // VALIDATION: change the requests to match your own file names if you need form validation use App\Http\Requests\MaterialRequest as StoreRequest; -use App\Http\Requests\MaterialRequest as UpdateRequest; + use App\Http\Requests\MaterialRequest as UpdateRequest; use Backpack\CRUD\CrudPanel; /** @@ -38,6 +38,15 @@ class MaterialCrudController extends CrudController $this->crud->addColumns([ ['name' => 'title','type' => 'text', 'lable' => trans('admin.title')], + [ + // n-n relationship (with pivot table) + 'label' => "Categories", // Table column heading + 'type' => "select_multiple", + 'name' => 'categories', // the method that defines the relationship in your Model + 'entity' => 'categories', // the method that defines the relationship in your Model + 'attribute' => "name", // foreign key attribute that is shown to user + 'model' => "App\Models\Category", // foreign key model + ], ['name' => 'view','type' => 'text', 'lable' => trans('admin.view')], ['name' => 'rating','type' => 'text', 'lable' => trans('admin.like')], ['name' => 'price','type' => 'text', 'lable' => trans('admin.price')], @@ -49,24 +58,25 @@ class MaterialCrudController extends CrudController $this->crud->addFields([ ['name' => 'title','type' => 'text', 'lable' => trans('admin.title'),'tab' => trans('admin.material.firsttab')], - ['name' => 'category_id', 'type' => 'select', 'entity' => 'category', 'attribute' =>'name', 'model' => 'App\Models\Category', - 'lable'=>trans('admin.category'), 'tab' => trans('admin.material.firsttab')], + [ + 'name' => 'categories', + 'type' => 'select2_multiple', + 'entity' => 'categories', + 'attribute' =>'name', + 'model' => 'App\Models\Category', + 'pivot' => true, + 'lable'=>trans('admin.category'), 'tab' => trans('admin.material.firsttab') + ], ['name' => 'desc','type' => 'textarea', 'lable' => trans('admin.desc'),'tab' => trans('admin.material.firsttab')], - ['suffix' => 'manat','name' => 'price','type' => 'number', 'lable' => trans('admin.price'),'tab' => trans('admin.material.secondtab')], - ['suffix'=>'kilobyte','name' => 'size','type' => 'number', 'lable' => trans('admin.size'),'tab' => trans('admin.material.secondtab')], - ['suffix'=>'minut','name' => 'duration','type' => 'number', 'lable' => trans('admin.duration'),'tab' => trans('admin.material.secondtab')], + ['suffix' => 'man.','attributes' => ["step" => "any"],'name' => 'price','type' => 'number', 'lable' => trans('admin.price'),'tab' => trans('admin.material.secondtab')], + ['suffix'=>'Mb','attributes' => ["step" => "any"],'name' => 'size','type' => 'number', 'lable' => trans('admin.size'),'tab' => trans('admin.material.secondtab')], + ['suffix'=>'min.','attributes' => ["step" => "any"],'name' => 'duration','type' => 'number', 'lable' => trans('admin.duration'),'tab' => trans('admin.material.secondtab')], [ // image 'tab' => trans('admin.material.thirdtab'), - 'label' => "Material Image", + 'label' => trans('admin.material_image'), 'name' => "banner_url", - 'type' => 'image', - 'upload' => true, - 'crop' => true, // set to true to allow cropping, false to disable - 'aspect_ratio' => 2, // ommit or set to 0 to allow any aspect ratio - //'disk' => 'uploads', // in case you need to show images from a different disk - 'prefix' => 'uploads/' // in case your db value is only the file name (no path), you can use this to prepend your path to the image src (in HTML), before it's shown to the user; - ], + 'type' => 'browse'], ['name' => 'trailer_url','type' => 'browse', 'lable' => trans('admin.trailer_url'),'tab' => trans('admin.material.thirdtab')], ['name' => 'content_url','type' => 'browse', 'lable' => trans('admin.content_url'),'tab' => trans('admin.material.thirdtab')], ['name' => 'day_count','type' => 'number', 'lable' => trans('admin.day_count'),'tab' => trans('admin.material.secondtab')], diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 43846522..985ab74a 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -4,11 +4,13 @@ namespace App\Http\Controllers; use App\Http\Requests\ProfileRequest; use App\Models\Category; +use App\Models\CategoryMaterial; use App\Models\Material; use App\Models\Order; use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cookie; +use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; class HomeController extends Controller @@ -27,18 +29,16 @@ class HomeController extends Controller */ public function index(){ - $cat = Category::where('depth',1) - ->orderBy('lft')->firstOrFail(); - $materials = Material::where('category_id',$cat->id)->paginate(6); +// $cat = Category::where('depth',1) +// ->orderBy('lft')->firstOrFail(); + $materials = Material::paginate(6); return view('main')->with([ - 'cat' => $cat, + 'cat' => "", 'materials' => $materials, 'sort' => 'all' ]); } - - public function category($cat_id){ //dd(\request()); $request = \request(); @@ -46,8 +46,15 @@ class HomeController extends Controller $sort = $sort ?? 'all'; //dd($request['sort']); //todo restrict sort to be only {'all','rate','date'} - $cat = Category:: findOrFail($cat_id); - $materials = Material::where('category_id',$cat_id); + if($cat_id != 0){ + $cat = Category:: findOrFail($cat_id); + $materials = $cat->materials(); + + } + else{ + $cat = ''; + $materials = Material::query(); + } switch ($sort){ case 'rate': $materials->orderBy('like','DESC'); @@ -64,10 +71,10 @@ class HomeController extends Controller 'sort' => $sort ]); } + public function download($material_id){ //todo check limits $material = Material::findOrFail($material_id); - $order = Order::where('user_id',auth()->id()) ->where('material_id',$material_id) ->where('payed',1) @@ -102,6 +109,8 @@ class HomeController extends Controller $material->view ++; $material->save(); + CategoryMaterial::where('material_id',$material_id) + ->update(['views'=> DB::raw('views + 1')]); // dd($material->details); if(!$watch_list_cookie){ $watch_list = [1 => $material_id]; @@ -119,11 +128,10 @@ class HomeController extends Controller // Cookie::queue('watchlist', json_encode([$material_id]), 450000); // Cookie::queue('wishlist', $material_id, 450000); -// cookie()->forever('watchlist',$material_id,450000); // dd(Cookie::get('watchlist')); +// cookie()->forever('watchlist',$material_id,450000); $like_list_cookie = Cookie::get('likelist'); - $order = Order::where('user_id',auth()->id()) ->where('material_id',$material_id) ->where('payed',1) @@ -143,8 +151,8 @@ class HomeController extends Controller return view('material',compact('material')) ->with('liked',$liked) - ->with('order',$order) - ->with('cat',$material->category); + ->with('order',$order); +// ->with('cat',$material->category); } public function like($material_id){ @@ -157,6 +165,8 @@ class HomeController extends Controller Cookie::queue('likelist', json_encode($like_list), 450000); $material->like ++; $material->save(); + CategoryMaterial::where('material_id',$material_id) + ->update(['likes'=> DB::raw('likes + 1')]); } else{ $like_list = json_decode($like_list_cookie,true); @@ -165,6 +175,8 @@ class HomeController extends Controller $like_list[]=$material_id; $material->like ++; $material->save(); + CategoryMaterial::where('material_id',$material_id) + ->update(['likes'=> DB::raw('likes + 1')]); Cookie::queue('likelist', json_encode($like_list), 450000); } } @@ -205,13 +217,16 @@ class HomeController extends Controller return view('liked',compact('materials'))->with('sort',$sort); } + public function orders_list(){ + $orders = Order::where('user_id',auth()->id())->paginate(20); + return view('orders',compact('orders')); + } public function bought_list(){ $orders = Order::with('material') ->where('user_id',auth()->id()) -// ->where('payed',0) + ->where('payed',1) ->paginate(6); -// dd($orders);/ - //todo change payed true + return view('bought',compact('orders')); } diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index 36eb6e2d..510abdbe 100644 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -34,6 +34,7 @@ class OrderController extends Controller $order->oid = str_replace('-','',Str::orderedUuid()); $order->save(); + //todo update order_count on category_material return $this->register($order); } @@ -94,6 +95,9 @@ class OrderController extends Controller public function result($order_id){ $order = Order::findOrFail($order_id); + if($order->payed){ + return view('order_complete')->with('order',$order); + } $url = config('app.gateway_url'); $user = config('app.gateway_user'); $pwd = config('app.gateway_password'); @@ -116,17 +120,36 @@ class OrderController extends Controller ] ]); $data = json_decode($response->getBody(), true); + $order->errorCode = $data['ErrorCode']; + $order->orderStatus = $data['OrderStatus']; if($data['ErrorCode'] == 0){ if($data['OrderStatus'] == 2){ //payment successfull $order->payed = 1; // $this->makePayment($order); request()->session()->flash('status','success'); request()->session()->flash('status_message',trans('abonent.payment_successfull')); + //$order->errorMessage = trans('abonent.payment_successfull'); + $status_message = 'Проведена полная авторизация суммы заказа'; + } + elseif($data['OrderStatus'] == 0){//order registered but not payed yet + $status_message = 'Заказ зарегистрирован, но не оплачен'; + } + elseif ($data['OrderStatus'] == 1){//Предавторизованная сумма захолдирована (для двухстадийных платежей) + $status_message ='Предавторизованная сумма захолдирована (для двухстадийных платежей)'; + } + elseif ($data['OrderStatus'] == 4){//Предавторизованная сумма захолдирована (для двухстадийных платежей) + $status_message ='По транзакции была проведена операция возврата'; + } + elseif ($data['OrderStatus'] == 5){//Предавторизованная сумма захолдирована (для двухстадийных платежей) + $status_message ='Инициирована авторизация через ACS банка-эмитента'; + } + else{//unsuccessfull Авторизация отменена + $status_message ='Авторизация отменена'; } } else{ // $order->status = 'payment_failed'; - $order->errorCode = $data['ErrorCode']; + $order->errorMessage = $data['ErrorMessage']; } $order->save(); diff --git a/app/Http/Requests/MaterialRequest.php b/app/Http/Requests/MaterialRequest.php index b9ad7f68..30cfda1e 100644 --- a/app/Http/Requests/MaterialRequest.php +++ b/app/Http/Requests/MaterialRequest.php @@ -27,7 +27,11 @@ class MaterialRequest extends FormRequest { return [ 'title' => 'required|min:5|max:255', - 'category_id' => 'required|integer' + 'desc' => 'required', + 'price' => 'required|numeric', + 'size' => 'required|numeric', + 'duration' => 'required|numeric', +// 'category_id' => 'required|integer' ]; } diff --git a/app/Models/Category.php b/app/Models/Category.php index 863cd7c7..361c551e 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -36,7 +36,7 @@ class Category extends Model */ public function materials(){ - return $this->hasMany(Material::class); + return $this->belongsToMany(Material::class,'category_material'); } /* |-------------------------------------------------------------------------- diff --git a/app/Models/CategoryMaterial.php b/app/Models/CategoryMaterial.php new file mode 100644 index 00000000..98d3edb1 --- /dev/null +++ b/app/Models/CategoryMaterial.php @@ -0,0 +1,17 @@ +belongsTo(Category::class); + } + public function material(){ + return $this->belongsTo(Material::class); + } +} diff --git a/app/Models/Material.php b/app/Models/Material.php index bf25de84..9fbe767c 100644 --- a/app/Models/Material.php +++ b/app/Models/Material.php @@ -4,6 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; use Backpack\CRUD\CrudTrait; +use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Support\Str; //use Illuminate\Support\Facades\Storage; @@ -11,7 +12,7 @@ use Illuminate\Support\Str; class Material extends Model { use CrudTrait; - + use SoftDeletes; /* |-------------------------------------------------------------------------- | GLOBAL VARIABLES @@ -46,8 +47,8 @@ class Material extends Model |-------------------------------------------------------------------------- */ - public function category(){ - return $this->belongsTo(Category::class); + public function categories(){ + return $this->belongsToMany(Category::class,'category_material'); } public function orders(){ return $this->belongsTo(Order::class); diff --git a/database/migrations/2019_06_25_145511_add_to_orders_table.php b/database/migrations/2019_06_25_145511_add_to_orders_table.php new file mode 100644 index 00000000..73b669fe --- /dev/null +++ b/database/migrations/2019_06_25_145511_add_to_orders_table.php @@ -0,0 +1,34 @@ +smallInteger('orderStatus')->nullable(); + // + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('orders', function (Blueprint $table) { + // + $table->dropColumn('orderStatus'); + }); + } +} diff --git a/database/migrations/2019_06_26_054831_alter_materials_table.php b/database/migrations/2019_06_26_054831_alter_materials_table.php new file mode 100644 index 00000000..b412209b --- /dev/null +++ b/database/migrations/2019_06_26_054831_alter_materials_table.php @@ -0,0 +1,48 @@ +dropColumn('duration'); + $table->dropForeign(['category_id']); + $table->dropColumn('category_id'); +// $table->unsignedDecimal('duration')->nullable(); + // + }); + Schema::table('materials', function (Blueprint $table) { +// $table->dropColumn('duration'); + $table->unsignedDecimal('duration')->nullable(); + // + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('materials', function (Blueprint $table) { + // + $table->dropColumn('duration'); +// $table->unsignedInteger('duration')->nullable(); + }); + Schema::table('materials', function (Blueprint $table) { + // +// $table->dropColumn('duration'); + $table->unsignedInteger('duration')->nullable(); + }); + } +} diff --git a/database/migrations/2019_07_09_122943_add_to_materials_table.php b/database/migrations/2019_07_09_122943_add_to_materials_table.php new file mode 100644 index 00000000..3c0d2abe --- /dev/null +++ b/database/migrations/2019_07_09_122943_add_to_materials_table.php @@ -0,0 +1,32 @@ +softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('materials', function (Blueprint $table) { + $table->dropSoftDeletes(); + }); + } +} diff --git a/database/migrations/2019_07_10_081929_create_category_material_table.php b/database/migrations/2019_07_10_081929_create_category_material_table.php new file mode 100644 index 00000000..c33296c3 --- /dev/null +++ b/database/migrations/2019_07_10_081929_create_category_material_table.php @@ -0,0 +1,34 @@ +bigIncrements('id'); + $table->unsignedBigInteger('category_id'); + $table->unsignedBigInteger('material_id'); + +// $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('category_material'); + } +} diff --git a/database/migrations/2019_07_10_114639_add_to_category_material_table.php b/database/migrations/2019_07_10_114639_add_to_category_material_table.php new file mode 100644 index 00000000..b2a69ea6 --- /dev/null +++ b/database/migrations/2019_07_10_114639_add_to_category_material_table.php @@ -0,0 +1,42 @@ +unsignedBigInteger('views')->nullable(); + $table->unsignedBigInteger('likes')->nullable(); + $table->unsignedBigInteger('orders_count')->nullable(); + $table->unsignedBigInteger('orders_payed_count')->nullable(); + $table->unsignedBigInteger('orders_total_amount')->nullable(); + + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('category_material', function (Blueprint $table) { + $table->dropColumn('view'); + $table->dropColumn('like'); + $table->dropColumn('orders_count'); + $table->dropColumn('orders_payed_count'); + $table->dropColumn('orders_total_amount'); + }); + } +} diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDE2NDI1NjY0YzAzNWFjMTAzMjFiNTY2MGU1M2RhNGYzLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDE2NDI1NjY0YzAzNWFjMTAzMjFiNTY2MGU1M2RhNGYzLmpwZw1559346951.png new file mode 100644 index 00000000..0d8e5ab7 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDE2NDI1NjY0YzAzNWFjMTAzMjFiNTY2MGU1M2RhNGYzLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDExNTIxM2YwYzRiMGUwZmQ1N2Q5NWFiNzg5NzJlZmFjLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDExNTIxM2YwYzRiMGUwZmQ1N2Q5NWFiNzg5NzJlZmFjLmpwZw1559346951.png new file mode 100644 index 00000000..698572b5 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDExNTIxM2YwYzRiMGUwZmQ1N2Q5NWFiNzg5NzJlZmFjLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDEyM2ExMjljMmVkYjljYjc4MDQ4OTA0ODAzOTJmYzljLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDEyM2ExMjljMmVkYjljYjc4MDQ4OTA0ODAzOTJmYzljLmpwZw1559346951.png new file mode 100644 index 00000000..fedd5804 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDEyM2ExMjljMmVkYjljYjc4MDQ4OTA0ODAzOTJmYzljLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDFlODIyNDVkY2EzN2RmZmM1OGE5NmZlY2M2ZDY2ZGM1LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDFlODIyNDVkY2EzN2RmZmM1OGE5NmZlY2M2ZDY2ZGM1LmpwZw1559346951.png new file mode 100644 index 00000000..59f4c77c Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDFlODIyNDVkY2EzN2RmZmM1OGE5NmZlY2M2ZDY2ZGM1LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDI2NGU4NWFkMGIwMGI0ZDA0MWYzODQwYWQwZGEyMTMwLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDI2NGU4NWFkMGIwMGI0ZDA0MWYzODQwYWQwZGEyMTMwLmpwZw1559346951.png new file mode 100644 index 00000000..fedd5804 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDI2NGU4NWFkMGIwMGI0ZDA0MWYzODQwYWQwZGEyMTMwLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDJjMGNlZWQxMjQ3ZDRhOTZiNjdhZGJkYzhiYmY4YWJhLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDJjMGNlZWQxMjQ3ZDRhOTZiNjdhZGJkYzhiYmY4YWJhLmpwZw1559346951.png new file mode 100644 index 00000000..591f5c0f Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDJjMGNlZWQxMjQ3ZDRhOTZiNjdhZGJkYzhiYmY4YWJhLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDM1ZmExNjRjYjZiMDEzMmMxMmUzOTQzNWM3NGJmZDg0LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDM1ZmExNjRjYjZiMDEzMmMxMmUzOTQzNWM3NGJmZDg0LmpwZw1559346951.png new file mode 100644 index 00000000..3999d393 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDM1ZmExNjRjYjZiMDEzMmMxMmUzOTQzNWM3NGJmZDg0LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDM4NWJlOTc3NTZmZjMzODE2ZDQ5YmFhNGU5YTBkZWZkLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDM4NWJlOTc3NTZmZjMzODE2ZDQ5YmFhNGU5YTBkZWZkLmpwZw1559346951.png new file mode 100644 index 00000000..9bb8f9c4 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDM4NWJlOTc3NTZmZjMzODE2ZDQ5YmFhNGU5YTBkZWZkLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDQ5NzBjYjFiYjgyZTNlYzBkOTI5MDk1MjJmYzQxYzY3LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDQ5NzBjYjFiYjgyZTNlYzBkOTI5MDk1MjJmYzQxYzY3LmpwZw1559346951.png new file mode 100644 index 00000000..bdf93eb8 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDQ5NzBjYjFiYjgyZTNlYzBkOTI5MDk1MjJmYzQxYzY3LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDU3OWMwOWY0OGYwMWU3YTc0N2MyMjE0ODVmYTdhMzU3LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDU3OWMwOWY0OGYwMWU3YTc0N2MyMjE0ODVmYTdhMzU3LmpwZw1559346951.png new file mode 100644 index 00000000..f555809c Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDU3OWMwOWY0OGYwMWU3YTc0N2MyMjE0ODVmYTdhMzU3LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDUxMjg4YTY0ODc0ZWVlYzRiNzZlMWU2NzViOThlZmFkLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDUxMjg4YTY0ODc0ZWVlYzRiNzZlMWU2NzViOThlZmFkLmpwZw1559346951.png new file mode 100644 index 00000000..737d9092 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDUxMjg4YTY0ODc0ZWVlYzRiNzZlMWU2NzViOThlZmFkLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDVmN2I1ODgyNTU2ZmMxNmE3NmEwMDhiYWE2YzEwOTMxLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDVmN2I1ODgyNTU2ZmMxNmE3NmEwMDhiYWE2YzEwOTMxLmpwZw1559346951.png new file mode 100644 index 00000000..59f4c77c Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDVmN2I1ODgyNTU2ZmMxNmE3NmEwMDhiYWE2YzEwOTMxLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDZlNzBhNjcxMjA5MjhiMzc2NGM1MDQ4MmY5YTQ3YmVmLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDZlNzBhNjcxMjA5MjhiMzc2NGM1MDQ4MmY5YTQ3YmVmLmpwZw1559346951.png new file mode 100644 index 00000000..b197fc08 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDZlNzBhNjcxMjA5MjhiMzc2NGM1MDQ4MmY5YTQ3YmVmLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDc3MWI0NTlmMTNhMWQyYjQ5YWVkMjc5OWNjMmJhNDBiLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDc3MWI0NTlmMTNhMWQyYjQ5YWVkMjc5OWNjMmJhNDBiLmpwZw1559346951.png new file mode 100644 index 00000000..afd1e385 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDc3MWI0NTlmMTNhMWQyYjQ5YWVkMjc5OWNjMmJhNDBiLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDc3NmVhYzM4ZmJiMTA0NWEzZjcyZDZkZDVmOThjM2IwLmpwZw1557447637.png b/public/uploads/.tmb/l1_aW1hZ2VzXDc3NmVhYzM4ZmJiMTA0NWEzZjcyZDZkZDVmOThjM2IwLmpwZw1557447637.png new file mode 100644 index 00000000..04a69176 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDc3NmVhYzM4ZmJiMTA0NWEzZjcyZDZkZDVmOThjM2IwLmpwZw1557447637.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDc4MmZiMmQxZWMyODE1NTVmNWVmYWY0ZWIwYTMyNjUxLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDc4MmZiMmQxZWMyODE1NTVmNWVmYWY0ZWIwYTMyNjUxLmpwZw1559346951.png new file mode 100644 index 00000000..b197fc08 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDc4MmZiMmQxZWMyODE1NTVmNWVmYWY0ZWIwYTMyNjUxLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDdjNmZkOGQ1N2MwZjExMzBjNTFmMjU0YjZiMDQxNTI0LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDdjNmZkOGQ1N2MwZjExMzBjNTFmMjU0YjZiMDQxNTI0LmpwZw1559346951.png new file mode 100644 index 00000000..591f5c0f Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDdjNmZkOGQ1N2MwZjExMzBjNTFmMjU0YjZiMDQxNTI0LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDg0N2ZjM2MzYzIxMTRhNmM3YzQwYzZkMmJjNGM1NWJmLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDg0N2ZjM2MzYzIxMTRhNmM3YzQwYzZkMmJjNGM1NWJmLmpwZw1559346951.png new file mode 100644 index 00000000..f4c72637 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDg0N2ZjM2MzYzIxMTRhNmM3YzQwYzZkMmJjNGM1NWJmLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXDliMzc3YzE3YTNhYjMyZmE0ODhjMTI4ZjFiMmU0YjM1LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXDliMzc3YzE3YTNhYjMyZmE0ODhjMTI4ZjFiMmU0YjM1LmpwZw1559346951.png new file mode 100644 index 00000000..6dc11fda Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXDliMzc3YzE3YTNhYjMyZmE0ODhjMTI4ZjFiMmU0YjM1LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGE2ZTUyOGQyNzgyYzRhMWU3YzIzOTM4MTg1ZmFmODk2LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGE2ZTUyOGQyNzgyYzRhMWU3YzIzOTM4MTg1ZmFmODk2LmpwZw1559346951.png new file mode 100644 index 00000000..bdf93eb8 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGE2ZTUyOGQyNzgyYzRhMWU3YzIzOTM4MTg1ZmFmODk2LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGE3ZjBjOWVmMzNmNjQ3ODQyZDNmMjcwOGE0NmQzNGQxLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGE3ZjBjOWVmMzNmNjQ3ODQyZDNmMjcwOGE0NmQzNGQxLmpwZw1559346951.png new file mode 100644 index 00000000..b7449364 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGE3ZjBjOWVmMzNmNjQ3ODQyZDNmMjcwOGE0NmQzNGQxLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGE5NmRhZmI4OGY0NmNjNjYwNTIzZmI0YTk1Yzk2ZjVlLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGE5NmRhZmI4OGY0NmNjNjYwNTIzZmI0YTk1Yzk2ZjVlLmpwZw1559346951.png new file mode 100644 index 00000000..6dc11fda Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGE5NmRhZmI4OGY0NmNjNjYwNTIzZmI0YTk1Yzk2ZjVlLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGFkYzY4YTFhNTdjNmE3NTRmYWIzNDJlMGQ5ZDYzMDM1LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGFkYzY4YTFhNTdjNmE3NTRmYWIzNDJlMGQ5ZDYzMDM1LmpwZw1559346951.png new file mode 100644 index 00000000..6dc11fda Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGFkYzY4YTFhNTdjNmE3NTRmYWIzNDJlMGQ5ZDYzMDM1LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGI5MjY3YWZkMjBjZGM3YzMzY2NlYTBiNjgyNWQ0OWJkLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGI5MjY3YWZkMjBjZGM3YzMzY2NlYTBiNjgyNWQ0OWJkLmpwZw1559346951.png new file mode 100644 index 00000000..09145b5f Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGI5MjY3YWZkMjBjZGM3YzMzY2NlYTBiNjgyNWQ0OWJkLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGIyMDFiZTRjNzE2YjRjZGU2NDEzNzcyYzkyMTQ5YmQ5LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGIyMDFiZTRjNzE2YjRjZGU2NDEzNzcyYzkyMTQ5YmQ5LmpwZw1559346951.png new file mode 100644 index 00000000..afd1e385 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGIyMDFiZTRjNzE2YjRjZGU2NDEzNzcyYzkyMTQ5YmQ5LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGJiNzAwYzBhYjkzMzg0YmJjZmIwYTU1OTZkMmYzOWIzLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGJiNzAwYzBhYjkzMzg0YmJjZmIwYTU1OTZkMmYzOWIzLmpwZw1559346951.png new file mode 100644 index 00000000..737d9092 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGJiNzAwYzBhYjkzMzg0YmJjZmIwYTU1OTZkMmYzOWIzLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGMyM2NhYmU3Zjk3OTk2ZDQyYmE4YTdhNGNjNjUxOWM2LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGMyM2NhYmU3Zjk3OTk2ZDQyYmE4YTdhNGNjNjUxOWM2LmpwZw1559346951.png new file mode 100644 index 00000000..f555809c Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGMyM2NhYmU3Zjk3OTk2ZDQyYmE4YTdhNGNjNjUxOWM2LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGMzMTQ5MDg0ZTRiNmI3OWExMzAzNGNkYjY5ZmQyYmNhLmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGMzMTQ5MDg0ZTRiNmI3OWExMzAzNGNkYjY5ZmQyYmNhLmpwZw1559346951.png new file mode 100644 index 00000000..f555809c Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGMzMTQ5MDg0ZTRiNmI3OWExMzAzNGNkYjY5ZmQyYmNhLmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGRhNzYzMTFiYzIzODNjOTI4ZjYzN2FkYjEyODBkYzY1LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGRhNzYzMTFiYzIzODNjOTI4ZjYzN2FkYjEyODBkYzY1LmpwZw1559346951.png new file mode 100644 index 00000000..7adcca3d Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGRhNzYzMTFiYzIzODNjOTI4ZjYzN2FkYjEyODBkYzY1LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGU1ODczYTlhMjUzNDIxODFhNzcwZWI0Yjg0ZmRkZTE2LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGU1ODczYTlhMjUzNDIxODFhNzcwZWI0Yjg0ZmRkZTE2LmpwZw1559346951.png new file mode 100644 index 00000000..f555809c Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGU1ODczYTlhMjUzNDIxODFhNzcwZWI0Yjg0ZmRkZTE2LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGVkM2EzMmU1NDM4ZGE1NmYwZDhiMWJiYzlmZWVjMmRjLmpwZw1557533483.png b/public/uploads/.tmb/l1_aW1hZ2VzXGVkM2EzMmU1NDM4ZGE1NmYwZDhiMWJiYzlmZWVjMmRjLmpwZw1557533483.png new file mode 100644 index 00000000..22c37141 Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGVkM2EzMmU1NDM4ZGE1NmYwZDhiMWJiYzlmZWVjMmRjLmpwZw1557533483.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGVlNTA3ZGJkOGM2ZmI3MWFmYjlmOWZiZTljZmIyMjc1LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGVlNTA3ZGJkOGM2ZmI3MWFmYjlmOWZiZTljZmIyMjc1LmpwZw1559346951.png new file mode 100644 index 00000000..09145b5f Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGVlNTA3ZGJkOGM2ZmI3MWFmYjlmOWZiZTljZmIyMjc1LmpwZw1559346951.png differ diff --git a/public/uploads/.tmb/l1_aW1hZ2VzXGZlOTE0NWU1OWNiNTk4YjBhOWM5YzlmMDc3Nzc5NzQ0LmpwZw1559346951.png b/public/uploads/.tmb/l1_aW1hZ2VzXGZlOTE0NWU1OWNiNTk4YjBhOWM5YzlmMDc3Nzc5NzQ0LmpwZw1559346951.png new file mode 100644 index 00000000..b9c6db6f Binary files /dev/null and b/public/uploads/.tmb/l1_aW1hZ2VzXGZlOTE0NWU1OWNiNTk4YjBhOWM5YzlmMDc3Nzc5NzQ0LmpwZw1559346951.png differ diff --git a/resources/lang/tk/admin.php b/resources/lang/tk/admin.php index 2b34171e..d92a76d7 100644 --- a/resources/lang/tk/admin.php +++ b/resources/lang/tk/admin.php @@ -15,6 +15,7 @@ return[ 'material.thirdtab' => 'Üçünji', 'material.fourthtab' => 'Dördünji', 'material.extras' => 'Goşmaça', + 'material.image' => 'Cover Image', 'download_count' => 'Download limidy', 'day_count' => 'Download gün limidy', 'duration' => 'Dowam wagty', @@ -22,7 +23,7 @@ return[ 'price' => 'Bahasy', 'like' => 'Halandy', 'view' => 'Görüldi', - 'title' => 'Mazmuny', + 'title' => 'Ady', 'desc' => 'Beýany', 'banner_url' => 'Suraty', 'trailer_url' => 'Media treýleri', diff --git a/resources/lang/tk/content.php b/resources/lang/tk/content.php index bfcec4a4..ba0bc127 100644 --- a/resources/lang/tk/content.php +++ b/resources/lang/tk/content.php @@ -8,6 +8,7 @@ return [ 'profile' => 'Şahsy maglumatlar', 'bought' => 'Satyn alynanlar', + 'orders' => 'Sargytlar', 'liked' => 'Halananlar', 'watched' => 'Seredilenler', 'sort_desc' => 'Köpden aza', diff --git a/resources/views/account.blade.php b/resources/views/account.blade.php index f66b5e1f..c5271299 100644 --- a/resources/views/account.blade.php +++ b/resources/views/account.blade.php @@ -10,6 +10,9 @@