Commit 439a936e by Angel MAS

list clients

parent e8ddd99a
...@@ -11,6 +11,7 @@ use Onestartup\Shop\Model\ProductImageShop as Gallery; ...@@ -11,6 +11,7 @@ use Onestartup\Shop\Model\ProductImageShop as Gallery;
use Onestartup\Shop\Model\ProductShop as Product; use Onestartup\Shop\Model\ProductShop as Product;
use Onestartup\Shop\Model\ExtraField as Extra; use Onestartup\Shop\Model\ExtraField as Extra;
use Onestartup\Shop\Model\ProductShopInfo as ProductInfo; use Onestartup\Shop\Model\ProductShopInfo as ProductInfo;
use Onestartup\Shop\DataTables\ClientDataTable;
class AdminProductController extends Controller class AdminProductController extends Controller
...@@ -277,4 +278,9 @@ class AdminProductController extends Controller ...@@ -277,4 +278,9 @@ class AdminProductController extends Controller
} }
public function listClient(ClientDataTable $dataTable)
{
return $dataTable->render('shop::clients.list');
}
} }
...@@ -288,6 +288,7 @@ class CartController extends Controller ...@@ -288,6 +288,7 @@ class CartController extends Controller
); );
$payment = $mp->post("/v1/payments", $payment_data); $payment = $mp->post("/v1/payments", $payment_data);
$sale->payment_type = 'Tarjeta';
if ($payment['response']['status'] == 'approved') { if ($payment['response']['status'] == 'approved') {
$sale->status = 2; $sale->status = 2;
...@@ -388,6 +389,7 @@ class CartController extends Controller ...@@ -388,6 +389,7 @@ class CartController extends Controller
$url_ficha = $payment['response']['transaction_details']['external_resource_url']; $url_ficha = $payment['response']['transaction_details']['external_resource_url'];
$sale->status = 3; $sale->status = 3;
$sale->transaction_id = $payment['response']['id']; $sale->transaction_id = $payment['response']['id'];
$sale->payment_type = $request->payment_id;
$sale->save(); $sale->save();
\Session::forget('client'); \Session::forget('client');
...@@ -462,6 +464,7 @@ class CartController extends Controller ...@@ -462,6 +464,7 @@ class CartController extends Controller
$addres = $client->shipping; $addres = $client->shipping;
$sale->status = 2; $sale->status = 2;
$sale->payment_type = 'Pay Pal';
$sale->save(); $sale->save();
$user = \App\User::first(); $user = \App\User::first();
......
<?php
namespace Onestartup\Shop\DataTables;
use Onestartup\Shop\Model\ClientShop as Client;
use Yajra\DataTables\Services\DataTable;
class ClientDataTable extends DataTable
{
/**
* Build DataTable class.
*
* @param mixed $query Results from query() method.
* @return \Yajra\DataTables\DataTableAbstract
*/
public function dataTable($query)
{
return datatables($query);
//->addColumn('action', function(Interested $interested) {
// return "<a href='".route('crm.show',$interested->id)."'>Ver Detalle</a>";
// });
//->addColumn('action', 'interested.action');
}
/**
* Get query source of dataTable.
*
* @param \App\Interested $model
* @return \Illuminate\Database\Eloquent\Builder
*/
public function query(Client $model)
{
return $model->select(['id','name', 'lastname','email', 'phone','created_at'])->orderBy('id', 'desc');
}
/**
* Optional method if you want to use html builder.
*
* @return \Yajra\DataTables\Html\Builder
*/
public function html()
{
return $this->builder()
->columns($this->getColumns())
->parameters([
'dom' => 'Bfrtip',
'buttons' => ['excel', 'csv','reset', 'reload'],
]);
}
/**
* Get columns.
*
* @return array
*/
protected function getColumns()
{
return [
'id',
'name',
'lastname',
'phone',
'email',
'created_at'
];
}
/**
* Get filename for export.
*
* @return string
*/
protected function filename()
{
return 'clients' . date('YmdHis');
}
}
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddPaymentTypeToSaleShopsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('sale_shops', function (Blueprint $table) {
$table->string('payment_type')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('sale_shops', function (Blueprint $table) {
$table->dropColumn('payment_type');
});
}
}
...@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; ...@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
class SaleShop extends Model class SaleShop extends Model
{ {
protected $table = 'sale_shops'; protected $table = 'sale_shops';
protected $fillable = ['status', 'total', 'client_id', 'transaction_id']; protected $fillable = ['status', 'total', 'client_id', 'transaction_id', 'payment_type'];
public function client() public function client()
......
...@@ -41,6 +41,11 @@ Route::group(['middleware' => ['web', 'auth', 'is_admin']], function(){ ...@@ -41,6 +41,11 @@ Route::group(['middleware' => ['web', 'auth', 'is_admin']], function(){
'Onestartup\Shop\Controller\AdminProductController@extraInfo') 'Onestartup\Shop\Controller\AdminProductController@extraInfo')
->name('admin-shop-product.extra.info'); ->name('admin-shop-product.extra.info');
Route::get('admin/shop/client/list',
'Onestartup\Shop\Controller\AdminProductController@listClient')
->name('admin-shop-client.list');
}); });
Route::group(['middleware' => ['web']], function(){ Route::group(['middleware' => ['web']], function(){
......
@extends('crm-admin::main-layout')
@section('content')
<div class="row">
<div class="col-md-12">
<div class="box">
<div class="box-header dark">
<h2>Listado de clientes</h2>
</div>
<div class="box-body">
<div class='table-responsive'>
{!! $dataTable->table() !!}
</div>
</div>
<div class="dker p-a text-right">
</div>
</div>
</div>
</div>
@endsection
@push('scripts')
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.0.3/css/buttons.dataTables.min.css">
<script src="https://cdn.datatables.net/buttons/1.0.3/js/dataTables.buttons.min.js"></script>
<script src="/vendor/datatables/buttons.server-side.js"></script>
{!! $dataTable->scripts() !!}
@endpush
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment