Commit 926dc40b by Angel MAS

fixes

parent 185bae97
...@@ -280,6 +280,10 @@ class AdminProductController extends Controller ...@@ -280,6 +280,10 @@ class AdminProductController extends Controller
public function showOrder($id) public function showOrder($id)
{ {
$sale = Sale::find($id); $sale = Sale::find($id);
$promo = null;
if ($sale->coupon != null) {
$promo = $this->util->getDiscount($sale, $sale->coupon);
}
$client = $sale->client; $client = $sale->client;
$orden = $sale->items; $orden = $sale->items;
$shipping = $client->shipping; $shipping = $client->shipping;
...@@ -306,6 +310,7 @@ class AdminProductController extends Controller ...@@ -306,6 +310,7 @@ class AdminProductController extends Controller
->with('client', $client) ->with('client', $client)
->with('orden', $orden) ->with('orden', $orden)
->with('estado', $estado) ->with('estado', $estado)
->with('promo', $promo)
->with('shipping_price', $shipping_price) ->with('shipping_price', $shipping_price)
->with('shipping', $shipping); ->with('shipping', $shipping);
} }
......
...@@ -32,7 +32,7 @@ class StockDataTable extends DataTable ...@@ -32,7 +32,7 @@ class StockDataTable extends DataTable
$existencia = "<span class='badge primary'>".$product->infoSale->quantity."</span>"; $existencia = "<span class='badge primary'>".$product->infoSale->quantity."</span>";
} }
$html = "Precio venta: <b>".$product->infoSale->sale_price."</b><br>Precio compra: <b>".$product->infoSale->purchase_price."</b><br>Alerta de reserva: <b><span class='badge info'>".$product->infoSale->reserve_amount."</b></span><br>Existencias: $existencia<br>"; $html = "Precio venta: <b>".money_format('%(#10n', $product->infoSale->sale_price)."</b><br>Precio compra: <b>".money_format('%(#10n', $product->infoSale->purchase_price)."</b><br>Alerta de reserva: <b><span class='badge info'>".$product->infoSale->reserve_amount."</b></span><br>Existencias: $existencia<br>";
return $html; return $html;
}) })
......
...@@ -17,7 +17,7 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -17,7 +17,7 @@ setlocale(LC_MONETARY, 'en_US');
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link block" href="" data-toggle="tab" data-target="#tab-2"> <a class="nav-link block" href="" data-toggle="tab" data-target="#tab-2">
<h6>Ordén</h6> <h6>Orden</h6>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
...@@ -45,8 +45,8 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -45,8 +45,8 @@ setlocale(LC_MONETARY, 'en_US');
<p>Teléfono: <b>{{$client->phone}}</b></p> <p>Teléfono: <b>{{$client->phone}}</b></p>
<p>Correo: <b>{{$client->email}}</b></p> <p>Correo: <b>{{$client->email}}</b></p>
<p>Fecha de registro: <b>{{$client->created_at}}</b></p> <p>Fecha de registro: <b>{{$client->created_at}}</b></p>
<p>Requiere factura: <b>{{$shipping->facturacion}}</b></p>
<h6>Datos de facturación</h6>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -105,7 +105,7 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -105,7 +105,7 @@ setlocale(LC_MONETARY, 'en_US');
</div><!-- end tab-1 --> </div><!-- end tab-1 -->
<div class="tab-pane" id="tab-2"> <div class="tab-pane" id="tab-2">
<div class="p-a-md dark _600">Resumen de la Ordén</div> <div class="p-a-md dark _600">Resumen de la Orden</div>
<div class="box"> <div class="box">
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
...@@ -119,6 +119,9 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -119,6 +119,9 @@ setlocale(LC_MONETARY, 'en_US');
<b>{{$sale->transaction_id}}</b> <b>{{$sale->transaction_id}}</b>
<br>Fecha de orden:<br> <br>Fecha de orden:<br>
<b>{{$sale->created_at}}</b> <b>{{$sale->created_at}}</b>
<br>Cupon de descuento <br>
<b>{{$sale->coupon != null ? $sale->coupon : 'N/A'}}</b>
<b></b>
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
...@@ -140,6 +143,14 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -140,6 +143,14 @@ setlocale(LC_MONETARY, 'en_US');
<td>{{money_format('%(#10n', ($item->product->infoSale->sale_price * $item->quantity))}}</td> <td>{{money_format('%(#10n', ($item->product->infoSale->sale_price * $item->quantity))}}</td>
</tr> </tr>
@endforeach @endforeach
@if($sale->coupon != null)
<tr>
<td>1</td>
<td>Descuento {{$sale->coupon}}</td>
<td> - {{$promo['amount']}}</td>
<td> - {{$promo['amount']}}</td>
</tr>
@endif
<tr> <tr>
<td>1</td> <td>1</td>
<td>{{$shipping_price->name}}</td> <td>{{$shipping_price->name}}</td>
......
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