Skip to content

O
onestartup-shop
Commit 2b3ac039 by Angel MAS
Options

seguimiento de ordenes

parent b0d9029a
Showing with 237 additions and 80 deletions
src/controllers/AdminProductController.php
...@@ -14,6 +14,7 @@ use Onestartup\Shop\Model\ProductShopInfo as ProductInfo; ...@@ -14,6 +14,7 @@ use Onestartup\Shop\Model\ProductShopInfo as ProductInfo;
use Onestartup\Shop\DataTables\ClientDataTable; use Onestartup\Shop\DataTables\ClientDataTable;
use Onestartup\Shop\DataTables\OrderDataTable; use Onestartup\Shop\DataTables\OrderDataTable;
use Onestartup\Shop\Model\SaleShop as Sale; use Onestartup\Shop\Model\SaleShop as Sale;
use Onestartup\Shop\Model\OrderTracking as Tracking;
class AdminProductController extends Controller class AdminProductController extends Controller
...@@ -312,4 +313,17 @@ class AdminProductController extends Controller ...@@ -312,4 +313,17 @@ class AdminProductController extends Controller
return redirect()->back()->with('message_success', 'Estatus actualizado correctamente'); return redirect()->back()->with('message_success', 'Estatus actualizado correctamente');
} }
public function trackingStore(Request $request, $id)
{
$sale = Sale::find($id);
$comment = new Tracking($request->all());
$comment->user_id = \Auth::user()->id;
$sale->tracking_sales()->save($comment);
return redirect()
->back()
->with('message_success', 'Información agregada correctamente');
}
} }
src/migrations/2018_05_29_211921_create_order_trackings_table.php 0 → 100644
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateOrderTrackingsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('order_trackings', function (Blueprint $table) {
$table->increments('id');
$table->string('type', 355);
$table->string('detail', 555);
$table->integer('sale_id')->unsigned();
$table->foreign('sale_id')->references('id')->on('sale_shops');
$table->integer('user_id')->unsigned();
$table->foreign('user_id')->references('id')->on('users');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('order_trackings');
}
}
src/models/OrderTracking.php 0 → 100644
<?php
namespace Onestartup\Shop\Model;
use Illuminate\Database\Eloquent\Model;
class OrderTracking extends Model
{
protected $table = 'order_trackings';
protected $fillable = [
'type',
'detail',
'sale_id',
'user_id'
];
public function user()
{
return $this->belongsTo('App\User', 'user_id');
}
public function sale()
{
return $this->belongsTo('Onestartup\Shop\Model\SaleShop', 'sale_id');
}
}
src/models/SaleShop.php
...@@ -19,4 +19,9 @@ class SaleShop extends Model ...@@ -19,4 +19,9 @@ class SaleShop extends Model
{ {
return $this->hasMany('Onestartup\Shop\Model\DetailShop', 'sale_id'); return $this->hasMany('Onestartup\Shop\Model\DetailShop', 'sale_id');
} }
public function tracking_sales()
{
return $this->hasMany('Onestartup\Shop\Model\OrderTracking', 'sale_id');
}
} }
src/routes.php
...@@ -61,6 +61,10 @@ Route::group(['middleware' => ['web', 'auth', 'is_admin']], function(){ ...@@ -61,6 +61,10 @@ Route::group(['middleware' => ['web', 'auth', 'is_admin']], function(){
'Onestartup\Shop\Controller\AdminProductController@updateStatusSale') 'Onestartup\Shop\Controller\AdminProductController@updateStatusSale')
->name('admin-shop-client.statussale'); ->name('admin-shop-client.statussale');
Route::post('admin/shop/client/sale/{id}/tracking',
'Onestartup\Shop\Controller\AdminProductController@trackingStore')
->name('admin-shop-client.trackingStore');
}); });
......
src/views/clients/orden.blade.php
...@@ -49,113 +49,155 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -49,113 +49,155 @@ setlocale(LC_MONETARY, 'en_US');
<h6>Datos de facturación</h6> <h6>Datos de facturación</h6>
</div> </div>
<div class="row"> <div class="col-md-6">
<h6>Seguimiento</h6>
<h6>
Seguimiento
<span>
<a class="btn btn-xs btn-info" data-target="#add-comment" data-toggle="modal" href="javascript::void()" ui-target="#animate" ui-toggle-class="zoom">
Agregar seguimiento
</a>
</span>
</h6>
@if($sale->tracking_sales()->count() > 0)
<ul class="timeline">
@foreach( $sale->tracking_sales as $comment)
<li class="tl-item">
<div class="tl-wrap b-primary">
<span class="tl-date text-muted">{{$comment->created_at->format('d/m/Y')}}</span>
<div class="tl-content box-color text-color w-xl w-auto-xs">
<span class="arrow b-white left pull-top"></span>
<div class="text-lt p-x m-b-sm">
{{$comment->type}}
</div>
<div class="p-a b-t b-light">
{{$comment->detail}}
</div>
<div class="b-t b-light">
<i class="fa fa-user m-l" ></i>
{{$comment->user->name}}
</div>
</div>
</div>
</li>
@endforeach
</ul>
@else
<br>
<p>No se han agregado registros</p>
@endif
</div> </div>
</div> </div>
</div> </div>
<div class='dker p-a text-right'> <div class='dker p-a text-right'>
<div class='col-md-12'> <div class='col-md-12'>
</div>
</div>
</div>
</div><!-- end tab-1 -->
<div class="tab-pane" id="tab-2">
<div class="p-a-md dark _600">Resumen de la Ordén</div>
<div class="box">
<div class="box-body">
<div class="row">
<div class="col-md-4">
Estatus de la compra: <a href="javascript::void()" data-target="#status_sale" data-toggle="modal" href="#" ui-target="#animate" ui-toggle-class="zoom"><i class="fa fa-edit"></i></a><br>
<span class="label warning">{{$estado}}</span>
<br>Medio de pago:<br>
<b>{{$sale->payment_type}}</b>
<br>Id Transaccion:<br>
<b>{{$sale->transaction_id}}</b>
<br>Fecha de orden:<br>
<b>{{$sale->created_at}}</b>
</div> </div>
<div class="col-md-8"> </div>
</div>
<table class="table table-hover"> </div><!-- end tab-1 -->
<thead>
<tr> <div class="tab-pane" id="tab-2">
<th>Cantidad</th> <div class="p-a-md dark _600">Resumen de la Ordén</div>
<th>Producto</th> <div class="box">
<th>Precio</th> <div class="box-body">
<th>Subtotal</th> <div class="row">
</tr>
</thead> <div class="col-md-4">
<tbody> Estatus de la compra: <a href="javascript::void()" data-target="#status_sale" data-toggle="modal" href="#" ui-target="#animate" ui-toggle-class="zoom"><i class="fa fa-edit"></i></a><br>
@foreach($orden as $item) <span class="label warning">{{$estado}}</span>
<tr> <br>Medio de pago:<br>
<td>{{$item->quantity}}</td> <b>{{$sale->payment_type}}</b>
<td>{{$item->product->name}}</td> <br>Id Transaccion:<br>
<td>{{money_format('%(#10n', $item->product->infoSale->sale_price)}}</td> <b>{{$sale->transaction_id}}</b>
<td>{{money_format('%(#10n', ($item->product->infoSale->sale_price * $item->quantity))}}</td> <br>Fecha de orden:<br>
</tr> <b>{{$sale->created_at}}</b>
@endforeach </div>
<tr> <div class="col-md-8">
<td>1</td>
<td>{{$shipping_price->name}}</td> <table class="table table-hover">
<td>{{money_format('%(#10n', $shipping_price->cost)}}</td> <thead>
<td>{{money_format('%(#10n', $shipping_price->cost)}}</td> <tr>
</tr> <th>Cantidad</th>
<tfoot> <th>Producto</th>
<th>Precio</th>
<th>Subtotal</th>
</tr>
</thead>
<tbody>
@foreach($orden as $item)
<tr>
<td>{{$item->quantity}}</td>
<td>{{$item->product->name}}</td>
<td>{{money_format('%(#10n', $item->product->infoSale->sale_price)}}</td>
<td>{{money_format('%(#10n', ($item->product->infoSale->sale_price * $item->quantity))}}</td>
</tr>
@endforeach
<tr> <tr>
<td></td> <td>1</td>
<td></td> <td>{{$shipping_price->name}}</td>
<td>Total</td> <td>{{money_format('%(#10n', $shipping_price->cost)}}</td>
<td><b>{{money_format('%(#10n', $sale->total)}}</b></td> <td>{{money_format('%(#10n', $shipping_price->cost)}}</td>
</tr> </tr>
</tfoot> <tfoot>
</tbody> <tr>
</table> <td></td>
<td></td>
<td>Total</td>
<td><b>{{money_format('%(#10n', $sale->total)}}</b></td>
</tr>
</tfoot>
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</div> <div class='dker p-a text-right'>
<div class='dker p-a text-right'> <div class='col-md-12'>
<div class='col-md-12'>
</div>
</div> </div>
</div> </div>
</div> </div><!-- end tab-2 -->
</div><!-- end tab-2 -->
<div class="tab-pane" id="tab-3">
<div class="p-a-md dark _600">Direccion de Envio y estatus</div>
<div class="box">
<div class="box-body">
<div class="row">
<div class="col-md-8 offset-2">
<div class="tab-pane" id="tab-3"> Direccion de entrega:<br>
<div class="p-a-md dark _600">Direccion de Envio y estatus</div> <b>{{$shipping->calle}}, # {{$shipping->numero}}, col. {{$shipping->colonia}}</b><br>
<div class="box"> <b>{{$shipping->ciudad}}, {{$shipping->estado}}</b><br>
<div class="box-body"> C.P. <b>{{$shipping->cp}}</b><br>
<div class="row"> Referencias:<br>
<div class="col-md-8 offset-2"> <b>Callejon en barda azul</b><br>
Direccion de entrega:<br> Estatus del envio: <a href="javascript::void()" data-target="#m-a-a" data-toggle="modal" href="#" ui-target="#animate" ui-toggle-class="zoom"><i class="fa fa-edit"></i></a><br>
<b>{{$shipping->calle}}, # {{$shipping->numero}}, col. {{$shipping->colonia}}</b><br>
<b>{{$shipping->ciudad}}, {{$shipping->estado}}</b><br>
C.P. <b>{{$shipping->cp}}</b><br>
Referencias:<br>
<b>Callejon en barda azul</b><br>
Estatus del envio: <a href="javascript::void()" data-target="#m-a-a" data-toggle="modal" href="#" ui-target="#animate" ui-toggle-class="zoom"><i class="fa fa-edit"></i></a><br> <span class="label warning">{{$sale->shipping_status}}</span>
<span class="label warning">{{$sale->shipping_status}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div><!-- end tab-3 -->
</div><!-- end tab-3 -->
</div>
</div> </div>
</div> </div>
</div>
<div class="modal fade animate" data-backdrop="true" id="m-a-a"> <div class="modal fade animate" data-backdrop="true" id="m-a-a">
<div class="modal-dialog" id="animate"> <div class="modal-dialog" id="animate">
...@@ -199,4 +241,31 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -199,4 +241,31 @@ setlocale(LC_MONETARY, 'en_US');
</div> </div>
</div> </div>
<div class="modal fade animate" data-backdrop="true" id="add-comment">
<div class="modal-dialog" id="animate">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Agregar seguimiento</h5>
</div>
<div class="modal-body text-center p-lg">
{!! Form::open(['route'=> ['admin-shop-client.trackingStore', $sale->id],"method"=>"POST"]) !!}
<div class="form-group">
{!! Form::label('type', 'Tipo', ['class'=>'form-control-label']) !!}
{!! Form::select('type', ['Llamada'=>'Llamada','WhatsApp'=>'WhatsApp','SMS'=>'SMS','Email'=>'Email','Comentarios'=>'Comentarios'], null, ['class' => 'form-control select2', 'required'=>'required']) !!}
</div>
<div class="form-group">
{!! Form::label('detail', 'Detalle', ['class'=>'form-control-label']) !!}
{!! Form::text('detail', null, ['class' => 'form-control', 'required'=>'required']) !!}
</div>
<br>
{!! Form::submit('Agregar', ['class'=>'btn btn-danger btn-block']) !!}
{!! Form::close() !!}
</div>
</div>
</div>
</div>
@endsection @endsection
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