Commit e0ec7180 by Francisco Salazar

Merge branch 'master' of bunkrbit.com:bsabbath/onestartup-shop

parents 771685d1 c6c5e025
<?php <?php
return [ return [
"slug-shop" => "tienda", "slug-shop" => "tienda",
"billing_enabled"=>false,
"slug-shop-category" => "categoria", "slug-shop-category" => "categoria",
"product-index" => [ "product-index" => [
"pagination" => 15, "pagination" => 15,
......
...@@ -33,9 +33,15 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -33,9 +33,15 @@ setlocale(LC_MONETARY, 'en_US');
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
@if(config("shop.billing_enabled"))
<a class="nav-link block" href="" data-toggle="tab" data-target="#tab-3"> <a class="nav-link block" href="" data-toggle="tab" data-target="#tab-3">
<h6>Envio y factura</h6> <h6>Envio y factura</h6>
</a> </a>
@else
<a class="nav-link block" href="" data-toggle="tab" data-target="#tab-3">
<h6>Envio</h6>
</a>
@endif
</li> </li>
@if($variable->count() > 0) @if($variable->count() > 0)
<li class="nav-item"> <li class="nav-item">
...@@ -65,8 +71,10 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -65,8 +71,10 @@ setlocale(LC_MONETARY, 'en_US');
<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>
@if($shipping != null) @if($shipping != null)
@if(config("shop.billing_enabled"))
<p>Requiere factura: <b>{{$shipping->facturacion}}</b></p> <p>Requiere factura: <b>{{$shipping->facturacion}}</b></p>
@endif @endif
@endif
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -223,6 +231,7 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -223,6 +231,7 @@ setlocale(LC_MONETARY, 'en_US');
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
@if(config("shop.billing_enabled"))
<div class="col-md-6"> <div class="col-md-6">
<h4>Datos de facturación</h4> <h4>Datos de facturación</h4>
<p> <p>
...@@ -283,6 +292,7 @@ setlocale(LC_MONETARY, 'en_US'); ...@@ -283,6 +292,7 @@ setlocale(LC_MONETARY, 'en_US');
</a> </a>
@endif @endif
</div> </div>
@endif
<div class="col-md-6"> <div class="col-md-6">
......
...@@ -41,12 +41,16 @@ Datos del comprador: ...@@ -41,12 +41,16 @@ Datos del comprador:
@component('mail::panel') @component('mail::panel')
@if(config("shop.billing_enabled"))
Facturación: Facturación:
- Requiere factura: *** {{$order->facturacion}} *** - Requiere factura: *** {{$order->facturacion}} ***
@if($order->facturacion == 'Si') @if($order->facturacion == 'Si')
[Rellenar formulario de facturación]({{route('cart.facturacion', \Crypt::encryptString($order->id))}}) [Rellenar formulario de facturación]({{route('cart.facturacion', \Crypt::encryptString($order->id))}})
@endif @endif
@endif
@if($shipping != null) @if($shipping != null)
Datos de envio: Datos de envio:
......
...@@ -56,9 +56,9 @@ ...@@ -56,9 +56,9 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group" > <div class="form-group">
{!! Form::label('category_sat_id', 'Categoría del sat', ['class'=>'control-label'])!!} {!! Form::label('publication_date', 'Fecha de publicación', ['class'=>'control-label'])!!}
{!! Form::select('category_sat_id', $categoria_sat, null, ["class"=>"form-control", 'placeholder'=>'Elije una categoria']) !!} {!! Form::text('publication_date', isset($product) ? null: date('Y-m-d'), ["class"=>"form-control", "required"=>"required", "id"=>"publication_date"]) !!}
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
...@@ -69,14 +69,17 @@ ...@@ -69,14 +69,17 @@
</div> </div>
</div> </div>
<div class="row">
@if(config("shop.billing_enabled"))
<div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group" >
{!! Form::label('publication_date', 'Fecha de publicación', ['class'=>'control-label'])!!} {!! Form::label('category_sat_id', 'Categoría del sat', ['class'=>'control-label'])!!}
{!! Form::text('publication_date', isset($product) ? null: date('Y-m-d'), ["class"=>"form-control", "required"=>"required", "id"=>"publication_date"]) !!} {!! Form::select('category_sat_id', $categoria_sat, null, ["class"=>"form-control", 'placeholder'=>'Elije una categoria']) !!}
</div> </div>
</div> </div>
</div> </div>
@endif
<div class="row"> <div class="row">
@if($extras->count() > 0) @if($extras->count() > 0)
......
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