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

src/controllers/AdminProductController.php

@@ -187,7 +187,7 @@ class AdminProductController extends Controller
             "<p class='mb0'>Fecha creación: <b>".$product->created_at->format('d/m/Y')."</b></p>";
         })
         ->addColumn('form', function ($product) {
-            return "<form method='POST' action='".route('admin.shop.product.destroy',$product->id)."'>".
+            return "<center><form method='POST' action='".route('admin.shop.product.destroy',$product->id)."'>".
             "<input name='_method' type='hidden' value='DELETE' class='has-value'>".
             csrf_field() .
             "<button class='btn btn-danger btn-xs button-mb' onclick='return confirm();' type='submit'>".
@@ -196,7 +196,7 @@ class AdminProductController extends Controller
             "<a href='".route('show.shop', $product->slug)."' class='btn btn-xs info button-mb' target='new'>".
             "<i class='fas fa-eye icon-special-size'></i>Ver</a>".
             "<br><a href='".route('admin.shop.product.edit', $product->id)."' class='btn btn-xs accent mb0'>".
-            "<i class='fas fa-edit icon-special-size'></i>Editar</a>";
+            "<i class='fas fa-edit icon-special-size'></i>Editar</a></center>";
         })
         ->rawColumns(['main', 'description', 'features', 'specifications', 'form'])
         ->make();

src/lib/StockDataTable.php

@@ -35,7 +35,7 @@ class StockDataTable extends DataTable
                         
                         $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>";
                     }else{
-                        $html = "<b>Sin informacion de venta</b>";
+                        $html = "<b>Sin información de ventas</b>";
                     }
                     return $html;
                 })

src/views/category/index.blade.php

@@ -72,7 +72,7 @@
               </td>
               <td> {{$category->description}}</td>
               <td> {{$category->products->count()}}</td>
-              <td>
+              <td class="text-center">
                 {!! Form::open(['route'=> ['admin.shop.category.destroy',$category->id],'method'=>'DELETE'])!!}
                 <button class='btn btn-danger btn-xs button-mb' onclick="return confirm('¿Estás seguro de eliminar este elemento?');" type='submit'>
                   <i class='fas fa-trash-alt icon-special-size'></i>

src/views/categorysat/index.blade.php

@@ -8,7 +8,7 @@
     <a href="{{route('admin-shop-client.orders')}}">Tienda</a>
   </li>
   <li class="breadcrumb-item active">
-    Listado de categorias
+    Listado de categorías del SAT
   </li>
 @endsection 
 @section('content')
@@ -17,7 +17,7 @@
     <div class='box'>
       <div class='box-header dark'>
         <h2>
-          Agregar nueva categoria
+          Agregar nueva categoría
           <span></span>
           <a aria-expanded='false' class='btn btn-xs btn-danger button-ml' data-toggle='collapse' href='#agregarCategoria'>
             Cancelar
@@ -42,7 +42,7 @@
     <div class='box'>
       <div class='box-header dark'>
         <h2>
-          Listado de Categorias de productos de la tienda
+          Listado de Categorías de productos (SAT)
           <span>
             <a aria-expanded='false' class='btn btn-xs btn-info button-ml' data-toggle='collapse' href='#agregarCategoria'>
               <i class='fas fa-plus'></i>
@@ -76,7 +76,7 @@
                Unidad: <b>{{$category->unidad}}</b>
               </td>
               <td> {{$category->products->count()}}</td>
-              <td>
+              <td class="text-center">
                 {!! Form::open(['route'=> ['admin.shop.categoriasat.destroy',$category->id],'method'=>'DELETE'])!!}
                 <button class='btn btn-danger btn-xs button-mb' onclick="return confirm('¿Estás seguro de eliminar este elemento?');" type='submit'>
                   <i class='fas fa-trash-alt icon-special-size'></i>

src/views/clients/orders.blade.php

@@ -7,7 +7,7 @@
     <a href="{{route('admin-shop-client.orders')}}">Tienda</a>
   </li>
   <li class="breadcrumb-item active">
-    Listado de ordenes
+    Listado de órdenes
   </li>
 @endsection 
 @section('content')
@@ -15,7 +15,7 @@
   <div class="col-md-12">
     <div class="box">
       <div class="box-header dark">
-        <h2>Listado de Ordenes</h2>
+        <h2>Listado de Órdenes</h2>
       </div>
 
         <div class="box-body">

src/views/coupon/fields.blade.php

@@ -23,7 +23,7 @@
 
 	<div class="col-md-6">
 		<div class="form-group">
-			{!! Form::label('min_sale', 'Valor minimo de compra') !!}
+			{!! Form::label('min_sale', 'Valor mínimo de compra') !!}
 			<div class="input-group">
       			<div class="input-group-addon">$</div>
 				{!! Form::text('min_sale', null, ["class"=>"form-control", "placeholder"=>"Valor minimo de compra", 'required'=>'required']) !!}

src/views/coupon/index.blade.php

@@ -94,14 +94,13 @@ setlocale(LC_MONETARY, 'en_US');
                 @endif
                 </b>
                 <br>
-                Compra minima: 
+                Compra mínima: 
                 <b>
                   {{money_format('%(#10n', $coupon->min_sale)}}
                 </b>
                
-               
               </td>
-              <td>
+              <td class="text-center">
                 {!! Form::open(['route'=> ['admin.shop.coupon.destroy',$coupon->id],'method'=>'DELETE'])!!}
                 <button class='btn btn-danger btn-xs button-mb' onclick="return confirm('¿Estás seguro de eliminar este elemento?');" type='submit'>
                   <i class='fas fa-trash-alt icon-special-size'></i>

src/views/extra/index.blade.php

@@ -69,7 +69,7 @@
                 Estatus: <b>{{$extra->active ? "Activo" : "Inactivo"}}</b>
               </td>
               <td> Opciones: <br><b>{{$extra->values != null ? $extra->values : "No aplica"}}</b></td>
-              <td>
+              <td class="text-center">
                 {!! Form::open(['route'=> ['admin.shop.extra-fields.destroy',$extra->id],'method'=>'DELETE'])!!}
                 <button class='btn btn-danger btn-xs button-mb' onclick="return confirm('¿Estás seguro de eliminar este elemento?');" type='submit'>
                   <i class='fas fa-trash-alt icon-special-size'></i>

src/views/product/edit.blade.php

@@ -36,7 +36,7 @@
           </li>
           <li class="nav-item">
             <a class="nav-link block" href="" data-toggle="tab" data-target="#tab-3">
-              <h6>Galeria de imagénes</h6>
+              <h6>Galería de imagénes</h6>
             </a>
           </li>
         </ul>
@@ -91,7 +91,7 @@
 
               {!! Form::open(['route'=> ['admin-shop-product.store.gallery', $product->id], 'method' => 'POST', 'files'=>'true', 'id' => 'my-dropzone' , 'class' => 'dropzone']) !!}
               <div class="dz-message" style="height:200px;">
-                Arrastra las imagenes aqui
+                Arrastra las imágenes aqui.
               </div>
               <div class="dropzone-previews"></div>
               <button type="submit" class="btn btn-success" id="submitFiles" style="display: none;">Save</button>
@@ -135,7 +135,7 @@
       <div class='modal-content box-shadow-z3'>
         <div class='modal-body text-center p-lg'>
           @if ($product->cover == null)
-          <h4>No hay imagen asignada</h4>
+          <h4>No hay imagen asignada.</h4>
           @else
           <img class='image-modal-preview' src="{{asset('storage/'.$product->cover)}}">
           @endif

src/views/product/index.blade.php

@@ -31,8 +31,8 @@
             <tr>
               <th>#</th>
               <th>Producto</th>
-              <th>Descripcion</th>
-              <th>Caracteristicas</th>
+              <th>Descripción</th>
+              <th>Características</th>
               <th>Especificaciones</th>
               <th></th>
             </tr>

src/views/shipping/edit.blade.php

@@ -7,7 +7,7 @@
     <a href="{{route('admin-shop-client.orders')}}">Tienda</a>
   </li>
   <li class="breadcrumb-item">
-    <a href="{{route('admin.shop.shipping.index')}}">Listado de formas de envio</a>
+    <a href="{{route('admin.shop.shipping.index')}}">Listado de formas de envío</a>
   </li>
   <li class="breadcrumb-item active">
     {{$shipping->name}}

src/views/shipping/fields.blade.php

@@ -4,7 +4,7 @@
 </div>
 
 <div class="form-group">
-	{!! Form::label('cost', 'Costo del envio*') !!}
+	{!! Form::label('cost', 'Costo del envío*') !!}
 	<div class="input-group">
 		<div class="input-group-addon">$</div>
 		{!! Form::text('cost', null, ["class"=>"form-control", "required"=>"required", "placeholder"=>"Coloque aquí el costo para el cliente"]) !!}

src/views/shipping/index.blade.php

@@ -7,7 +7,7 @@
     <a href="{{route('admin-shop-client.orders')}}">Tienda</a>
   </li>
   <li class="breadcrumb-item active">
-    Listado de formas de envio
+    Listado de formas de envío
   </li> 
 @endsection
 @section('content')
@@ -16,7 +16,7 @@
     <div class='box'>
       <div class='box-header dark'>
         <h2>
-          Agregar nueva forma de envio
+          Agregar nueva forma de envío
           <span></span>
           <a aria-expanded='false' class='btn btn-xs btn-danger button-ml' data-toggle='collapse' href='#agregarCategoria'>
             Cancelar
@@ -41,11 +41,11 @@
     <div class='box'>
       <div class='box-header dark'>
         <h2>
-          Listado de formas de envio
+          Listado de formas de envío
           <span>
             <a aria-expanded='false' class='btn btn-xs btn-info button-ml' data-toggle='collapse' href='#agregarCategoria'>
               <i class='fas fa-plus'></i>
-              Agregar forma de envio
+              Agregar forma de envío
             </a>
           </span>
         </h2>
@@ -67,7 +67,7 @@
               <td> {{money_format('%(#10n', $shipping->cost)}}
               <td> {{$shipping->active ? 'Activo': 'Inactivo'}}</td>
 
-              <td>
+              <td class="text-center">
                 {!! Form::open(['route'=> ['admin.shop.shipping.destroy',$shipping->id],'method'=>'DELETE'])!!}
                 <button class='btn btn-danger btn-xs button-mb' onclick="return confirm('¿Estás seguro de eliminar este elemento?');" type='submit'>
                   <i class='fas fa-trash-alt icon-special-size'></i>