Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
onestartup-shop
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Angel Martin
onestartup-shop
Commits
439a936e
Commit
439a936e
authored
May 29, 2018
by
Angel MAS
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
list clients
parent
e8ddd99a
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
157 additions
and
1 deletions
+157
-1
AdminProductController.php
src/controllers/AdminProductController.php
+6
-0
CartController.php
src/controllers/CartController.php
+3
-0
ClientDataTable.php
src/lib/ClientDataTable.php
+77
-0
2018_05_28_194318_add_payment_type_to_sale_shops_table.php
...018_05_28_194318_add_payment_type_to_sale_shops_table.php
+32
-0
SaleShop.php
src/models/SaleShop.php
+1
-1
routes.php
src/routes.php
+5
-0
list.blade.php
src/views/clients/list.blade.php
+33
-0
No files found.
src/controllers/AdminProductController.php
View file @
439a936e
...
@@ -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'
);
}
}
}
src/controllers/CartController.php
View file @
439a936e
...
@@ -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
();
...
...
src/lib/ClientDataTable.php
0 → 100644
View file @
439a936e
<?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'
);
}
}
src/migrations/2018_05_28_194318_add_payment_type_to_sale_shops_table.php
0 → 100644
View file @
439a936e
<?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'
);
});
}
}
src/models/SaleShop.php
View file @
439a936e
...
@@ -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
()
...
...
src/routes.php
View file @
439a936e
...
@@ -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
(){
...
...
src/views/clients/list.blade.php
0 → 100644
View file @
439a936e
@
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment