TPS
/
turkmentv
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix materials orders

This commit is contained in:
merdiano 2019-07-19 16:22:10 +05:00
parent 7fb8e0b691
commit 0f8232e6d9
8 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/AdminController.php
View File

@ -38,7 +38,7 @@ class AdminController extends Controller
{
$start_date = request('start_date');
$end_date = request('end_date');
$order = Order::where('payed',1);
$order = Order::where('payed',1);//count with sum
$users = User::select('id');
$filter_by_date ="";

2
app/Http/Controllers/Admin/MaterialCrudController.php
View File

@ -48,7 +48,7 @@ class MaterialCrudController extends CrudController
'model' => "App\Models\Category", // foreign key model
],
['name' => 'view','type' => 'text', 'lable' => trans('admin.view')],
['name' => 'rating','type' => 'text', 'lable' => trans('admin.like')],
['name' => 'like','type' => 'text', 'lable' => trans('admin.like')],
['name' => 'price','type' => 'text', 'lable' => trans('admin.price')],
['name' => 'size','type' => 'text', 'lable' => trans('admin.size')],
['name' => 'duration','type' => 'text', 'lable' => trans('admin.duration')],

19
app/Http/Controllers/Admin/OrderCrudController.php
View File

@ -34,8 +34,23 @@ class OrderCrudController extends CrudController
*/
// TODO: remove setFromDb() and manually define Fields and Columns
$this->crud->setFromDb();
//$this->crud->setFromDb();
$this->crud->addColumns([
['name'=>'title','label'=>'Ady','type'=>'text'],
['name'=>'user_id','type'=>'select','label'=>'Ulanyjy','entity'=>'user','attribute'=>'email'],
['name'=>'price','type'=>'text','label'=>'Tölegi'],
['name'=>'payed','type'=>'check','label'=>'Tölendi'],
['name'=>'registered','type'=>'check','label'=>'Hasaba alyndy'],
['name'=>'downloaded','type'=>'text','label'=>'Indirildi'],
['name'=>'download_count','type'=>'text','label'=>'Maks. Indirim'],
['name'=>'errorCode','type'=>'text','label'=>'Hata kody'],
['name'=>'errorMessage','type'=>'text','label'=>'Hata teksti'],
['name'=>'created_at','type'=>'date','label'=>'Döredilen senesi'],
['name'=>'last_date','type'=>'date','label'=>'Ahyrky indirme senesi'],
]);
$this->crud->denyAccess(['create']);
// $this->crud->removeAllButtons();
$this->crud->addField(['name'=>'orderId','type'=>'text','lable'=>'OrderID']);
// add asterisk for fields that are required in OrderRequest
$this->crud->setRequiredFields(StoreRequest::class, 'create');
$this->crud->setRequiredFields(UpdateRequest::class, 'edit');

1
app/Http/Controllers/OrderController.php
View File

@ -158,6 +158,7 @@ class OrderController extends Controller
request()->session()->flash('status','danger');
request()->session()->flash('status_message','Bank bilen aragatnaşyga geçip bolmady birsalymdan täzeden synanşyp görmegiňizi haýyş edýäris');
redirect()->back();
}
return view('order_complete')->with('order',$order);
}

5
app/Models/Order.php
View File

@ -2,6 +2,7 @@
namespace App\Models;
use App\User;
use Illuminate\Database\Eloquent\Model;
use Backpack\CRUD\CrudTrait;
@ -37,6 +38,10 @@ class Order extends Model
public function material(){
return $this->hasOne(Material::class,'id','material_id');
}
public function user(){
return $this->belongsTo(User::class);
}
/*
|--------------------------------------------------------------------------
| SCOPES

2
config/backpack/base.php
View File

@ -149,5 +149,5 @@ return [
|
*/
'license_code' => env('BACKPACK_LICENSE', false),
'license_code' => env('BACKPACK_LICENSE', true),
];

10
resources/views/order_complete.blade.php
View File

@ -22,17 +22,15 @@
@lang('content.order_complete_text_last')
</p>
@elseif($order->errorCode !=0)
<p class="text-danger h1">@lang('content.order_fail_text',['message' => $order->errorMessage])
</p>
<p class="text-danger h1">@lang('content.order_fail_text',['message' => $order->errorMessage])</p>
@else
<p class="text-danger h1">@lang('content.order_fail_text',['message' => $status_message])
</p>
<p class="text-danger h1">@lang('content.order_fail_text',['message' => $status_message])</p>
@endif
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection

9
resources/views/vendor/backpack/base/inc/sidebar_content.blade.php vendored
View File

@ -4,11 +4,12 @@
<li><a href="{{ backpack_url('category') }}"><i class="fa fa-list"></i> <span>{{ trans('admin.categories') }}</span></a></li>
<li><a href="{{ backpack_url('material') }}"><i class="fa fa-video-camera"></i> <span>{{ trans('admin.materials') }}</span></a></li>
<li><a href="{{ backpack_url('elfinder') }}"><i class="fa fa-files-o"></i> <span>{{ trans('backpack::crud.file_manager') }}</span></a></li>
<li><a href="{{ backpack_url('order') }}"><i class='fa fa-cubes'></i> <span>Orders</span></a></li>
<li><a href="{{ backpack_url('order') }}"><i class='fa fa-cubes'></i> <span>Sargytlar</span></a></li>
<li><a href="{{ backpack_url('user') }}"><i class="fa fa-user"></i> <span>Ulanyjylar</span></a></li>
<li class="header">Web</li>
<li><a href="{{backpack_url('page') }}"><i class="fa fa-file"></i> <span>Pages</span></a></li>
<li><a href="{{backpack_url('menu') }}"><i class="fa fa-cubes"></i> <span>Menus</span></a></li>
<li><a href="{{backpack_url('news') }}"><i class="fa fa-newspaper-o"></i> <span>News</span></a></li>
<li><a href="{{backpack_url('page') }}"><i class="fa fa-file"></i> <span>Sahypalar</span></a></li>
<li><a href="{{backpack_url('menu') }}"><i class="fa fa-cubes"></i> <span>Menýular</span></a></li>
<li><a href="{{backpack_url('news') }}"><i class="fa fa-newspaper-o"></i> <span>Habarlar</span></a></li>
<li><a href="{{backpack_url('show') }}"><i class="fa fa-video-camera"></i> <span>Video Materials</span></a></li>
<li><a href="{{backpack_url('slider') }}"><i class="fa fa-image"></i> <span>Sliders</span></a></li>
<li><a href="{{backpack_url('pagead') }}"><i class="fa fa-bookmark"></i> <span>Page Advertisements</span></a></li>