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

src/controllers/AdminProductController.php

@@ -21,6 +21,8 @@ use Onestartup\Shop\Model\SaleShop as Sale;
 use Onestartup\Shop\Model\OrderTracking as Tracking;
 use Onestartup\Shop\Libs\Util;
 
+use Onestartup\Shop\Requests\RequestProduct;
+use Onestartup\Shop\Requests\RequestProductInfo;
 use Onestartup\Shop\Payment\MP;
 
 use PayPal\Api\Amount;
@@ -66,7 +68,7 @@ class AdminProductController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function store(Request $request)
+    public function store(RequestProduct $request)
     {
 
         $product = new Product($request->all());
@@ -123,7 +125,7 @@ class AdminProductController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(RequestProduct $request, $id)
     {
         $product = Product::find($id);
         $product->fill($request->all());
@@ -258,7 +260,7 @@ class AdminProductController extends Controller
 
 
 
-    public function extraInfo(Request $request)
+    public function extraInfo(RequestProductInfo $request)
     {
 
         $info = ProductInfo::find($request->product_id);

src/controllers/CategoryController.php

@@ -9,6 +9,8 @@ use Yajra\Datatables\Datatables;
 
 use Onestartup\Shop\Model\ProductCategoryShop as Category;
 
+use Onestartup\Shop\Requests\RequestCategory;
+
 class CategoryController extends Controller
 {    
     /**
@@ -28,7 +30,7 @@ class CategoryController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function store(Request $request)
+    public function store(RequestCategory $request)
     {
         $category = new Category($request->all());
 
@@ -67,7 +69,7 @@ class CategoryController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(RequestCategory $request, $id)
     {
         $category = Category::find($id);
         $category->fill($request->all());

src/controllers/DiscountCouponController.php

@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use Yajra\Datatables\Datatables;
 
 use Onestartup\Shop\Model\DiscountCoupon as Coupon;
+use Onestartup\Shop\Requests\RequestCoupon;
 
 class DiscountCouponController extends Controller
 {    
@@ -28,7 +29,7 @@ class DiscountCouponController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function store(Request $request)
+    public function store(RequestCoupon $request)
     {
         $coupon = new Coupon($request->all());
         $coupon->save();
@@ -55,7 +56,7 @@ class DiscountCouponController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(RequestCoupon $request, $id)
     {
         $coupon = Coupon::find($id);
         $coupon->fill($request->all());

src/controllers/ExtraFieldController.php

@@ -8,6 +8,7 @@ use App\Http\Controllers\Controller;
 use Yajra\Datatables\Datatables;
 
 use Onestartup\Shop\Model\ExtraField as Extra;
+use Onestartup\Shop\Requests\RequestExtraFields;
 
 class ExtraFieldController extends Controller
 {    
@@ -41,7 +42,7 @@ class ExtraFieldController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function store(Request $request)
+    public function store(RequestExtraFields $request)
     {
         
         //$values = implode(",", $request->values);
@@ -107,7 +108,7 @@ class ExtraFieldController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(RequestExtraFields $request, $id)
     {
         $extra = Extra::find($id);
         $extra->fill($request->all());

src/controllers/ShippingPriceController.php

@@ -9,6 +9,8 @@ use Yajra\Datatables\Datatables;
 
 use Onestartup\Shop\Model\ShippingPrice as Shipping;
 
+use Onestartup\Shop\Requests\RequestShipping;
+
 class ShippingPriceController extends Controller
 {    
     /**
@@ -28,7 +30,7 @@ class ShippingPriceController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function store(Request $request)
+    public function store(RequestShipping $request)
     {
         $shipping = new Shipping($request->all());
         $shipping->save();
@@ -55,7 +57,7 @@ class ShippingPriceController extends Controller
      * @param  Request $request
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(RequestShipping $request, $id)
     {
         $shipping = Shipping::find($id);
         $shipping->fill($request->all());

src/lib/StockDataTable.php

@@ -25,15 +25,18 @@ class StockDataTable extends DataTable
                     
                     $html = "";
                     $existencia = "";
+                    if (isset($product->infoSale)){
 
-                    if ($product->infoSale->quantity <= $product->infoSale->reserve_amount) {
-                        $existencia = "<span class='badge danger'>".$product->infoSale->quantity."</span>";
-                    } else {
-                        $existencia = "<span class='badge primary'>".$product->infoSale->quantity."</span>";
+                        if ($product->infoSale->quantity <= $product->infoSale->reserve_amount) {
+                            $existencia = "<span class='badge danger'>".$product->infoSale->quantity."</span>";
+                        } else {
+                            $existencia = "<span class='badge primary'>".$product->infoSale->quantity."</span>";
+                        }
+                        
+                        $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 = "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;
                 })
             ->addColumn('action',  function (Product $product){

src/requests/RequestCategory.php

+<?php
+
+namespace Onestartup\Shop\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestCategory extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|max:355',
+            'slug' => 'required|max:255',
+            'description'=> 'max:455',
+            'active' => 'required|boolean'
+        ];
+    }
+}
\ No newline at end of file

src/requests/RequestCoupon.php

+<?php
+
+namespace Onestartup\Shop\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestCoupon extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|max:255',
+            'code' => 'required|max:255',
+            'type' => 'required|max:255',
+            'value' => 'required|numeric',
+            'min_sale' => 'required|numeric',
+            'expiration' => 'required',
+            'active' => 'required|boolean'
+        ];
+    }
+}
\ No newline at end of file

src/requests/RequestExtraFields.php

+<?php
+
+namespace Onestartup\Shop\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestExtraFields extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'variable' => 'required|max:255',
+            'alias' => 'required|max:255',
+            'type' => 'required|max:255',
+            'active' => 'required|boolean'
+        ];
+    }
+}
\ No newline at end of file

src/requests/RequestProduct.php

+<?php
+
+namespace Onestartup\Shop\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestProduct extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|max:355',
+            'slug' => 'required|max:455',
+            'description' => 'required',
+            'active' => 'required|boolean',
+            'publication_date' => 'required',
+            'category_id' => 'required|integer',
+            'extra1' => 'max:455',
+            'extra2' => 'max:455',
+            'extra3' => 'max:455',
+            'extra4' => 'max:455',
+            'extra5' => 'max:455',
+            'extra6' => 'max:455',
+            'extra7' => 'max:455',
+            'extra8' => 'max:455',
+            'extra9' => 'max:455',
+            'extra10' => 'max:455',
+        ];
+    }
+}
\ No newline at end of file

src/requests/RequestProductInfo.php

+<?php
+
+namespace Onestartup\Shop\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestProductInfo extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'unity' => 'required|max:355',
+            'purchase_price' => 'required|numeric',
+            'sale_price' => 'required|numeric',
+            'quantity' => 'required|integer',
+            'reserve_amount' => 'required|integer',
+            'product_id' => 'required|integer'
+        ];
+    }
+}
\ No newline at end of file

src/requests/RequestShipping.php

+<?php
+
+namespace Onestartup\Shop\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RequestShipping extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|max:355',
+            'active' => 'required|boolean',
+            'cost' => 'required|numeric'
+        ];
+    }
+}
\ No newline at end of file

src/views/coupon/fields.blade.php

@@ -24,7 +24,10 @@
 	<div class="col-md-6">
 		<div class="form-group">
 			{!! Form::label('min_sale', 'Valor minimo de compra') !!}
-			{!! Form::text('min_sale', null, ["class"=>"form-control", "placeholder"=>"Valor minimo de compra", 'required'=>'required']) !!}
+			<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']) !!}
+			</div>	
 		</div>
 
 		<div class="form-group">

src/views/coupon/index.blade.php

@@ -61,7 +61,7 @@ setlocale(LC_MONETARY, 'en_US');
           <table class='table'>
             <tr>
               <th>#</th>
-              <th>Promocion</th>
+              <th>Promoción</th>
               <th>Cupon</th>
               <th>Valor</th>
               <th></th>
@@ -72,14 +72,14 @@ setlocale(LC_MONETARY, 'en_US');
               <td>
                 <p>Nombre: <b>{{$coupon->name}}</b></p>
                 <p>
-                  Codigo:
+                  Código:
                   <b> {{$coupon->code}}</b>
                 </p>
               </td>
               <td>
                 Tipo: 
                 <b>{{$coupon->type}}</b><br>
-                Expiracion: 
+                Expiración: 
                 <b>{{$coupon->expiration}}</b>
               </td>
               <td> 

src/views/product/fields_extra.blade.php

@@ -2,13 +2,19 @@
   <div class="col-md-6">
       <div class="form-group">
           {!! Form::label('purchase_price', 'Precio de compra', ['class'=>'control-label'])!!}
-          {!! Form::text('purchase_price', null, ["class"=>"form-control", "required"=>"required"]) !!}
+          <div class="input-group">
+            <div class="input-group-addon">$</div>
+            {!! Form::text('purchase_price', null, ["class"=>"form-control", "required"=>"required"]) !!}
+          </div>  
       </div>
   </div>
   <div class="col-md-6">
       <div class="form-group">
           {!! Form::label('sale_price', 'Precio de venta', ['class'=>'control-label'])!!}
-          {!! Form::text('sale_price', null, ["class"=>"form-control", "required"=>"required"]) !!}
+          <div class="input-group">
+            <div class="input-group-addon">$</div>  
+            {!! Form::text('sale_price', null, ["class"=>"form-control", "required"=>"required"]) !!}
+          </div>  
       </div>
   </div>
 
@@ -18,13 +24,19 @@
   <div class='col-md-6'>
     <div class="form-group" >
       {!! Form::label('quantity', 'Cantidad', ['class'=>'control-label'])!!}
-      {!! Form::text('quantity', null, ["class"=>"form-control", "required"=>"required"]) !!}
+      <div class="input-group">
+        <div class="input-group-addon"><i class="fa fa-shopping-cart" aria-hidden="true"></i></div>
+        {!! Form::text('quantity', null, ["class"=>"form-control", "required"=>"required"]) !!}
+      </div>
     </div>
   </div>
   <div class='col-md-6'>
     <div class="form-group" >
       {!! Form::label('reserve_amount', 'Cantidad de reserva', ['class'=>'control-label'])!!}
-      {!! Form::text('reserve_amount', null, ["class"=>"form-control", "required"=>"required"]) !!}
+      <div class="input-group">
+        <div class="input-group-addon"><i class="fa fa-shopping-cart" aria-hidden="true"></i></div>
+        {!! Form::text('reserve_amount', null, ["class"=>"form-control", "required"=>"required"]) !!}
+      </div>  
     </div>
   </div>
 </div>

src/views/shipping/fields.blade.php

@@ -5,7 +5,10 @@
 
 <div class="form-group">
 	{!! Form::label('cost', 'Costo del envio*') !!}
-	{!! Form::text('cost', null, ["class"=>"form-control", "required"=>"required", "placeholder"=>"Coloque aquí el costo para el cliente"]) !!}
+	<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"]) !!}
+	</div>
 </div>
 
 <div class="form-group">

src/views/shipping/index.blade.php

@@ -64,6 +64,7 @@
             <tr>
               <td> {{$shipping->id}}</td>
               <td> {{$shipping->name}} </td>
+              <td> {{money_format('%(#10n', $shipping->cost)}}
               <td> {{$shipping->active ? 'Activo': 'Inactivo'}}</td>
 
               <td>