From ad7cf1215048f72e2112b60c0593ae156ac8352a Mon Sep 17 00:00:00 2001
From: Welton Moreira dos Santos <weltonwms@gmail.com>
Date: Sat, 2 Sep 2017 15:58:27 -0300
Subject: [PATCH] =?UTF-8?q?Inclus=C3=A3o=20forma=20de=20pagamento?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Relatorio.php                             |  4 ++
 app/Venda.php                                 |  8 +++-
 .../2017_08_08_014107_create_vendas_table.php |  1 +
 public/js/vendas.js                           |  2 +
 resources/macros/componentes.php              |  1 +
 .../views/components/form/list.blade.php      | 38 +++++++++++++++++++
 resources/views/relatorios/index.blade.php    | 12 ++++--
 resources/views/vendas/form.blade.php         |  6 +++
 resources/views/vendas/index.blade.php        |  2 +
 9 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 resources/views/components/form/list.blade.php

diff --git a/app/Relatorio.php b/app/Relatorio.php
index b27fb0a..9ee2f5b 100644
--- a/app/Relatorio.php
+++ b/app/Relatorio.php
@@ -38,6 +38,10 @@ public function getRelatorio()
             $dt = Util::dataToMysql(request('periodo_final'));
             $this->query->where('data', '<=', $dt);
         endif;
+        if (request('forma_pagamento')):
+            $this->query->where('forma_pagamento', request('forma_pagamento'));
+        endif;
+        
         $this->items = $this->query->orderBy('data', 'desc')->get();
         $this->calcTotalGeral();
         return $this;
diff --git a/app/Venda.php b/app/Venda.php
index c1acdc2..f6bdea6 100755
--- a/app/Venda.php
+++ b/app/Venda.php
@@ -7,7 +7,7 @@
 
 class Venda extends Model
 {
-    protected $fillable=['produto_id',"cliente_id",'valor_compra','valor_venda','qtd','observacao','data'];
+    protected $fillable=['produto_id',"cliente_id",'valor_compra','valor_venda','qtd','observacao','data','forma_pagamento'];
     protected $dates = array('data');
     
     public function produto()
@@ -102,6 +102,12 @@ public function setDataAttribute($value)
         $this->attributes['data'] = Carbon::createFromFormat('d/m/Y', $value);
     }
     
+    public function getNomeFormaPagamentoAttribute()
+    {
+        $nomes=[1=>'Dinheiro',2=>'Cartão'];
+        return isset($nomes[$this->forma_pagamento])?$nomes[$this->forma_pagamento]:null;
+    }
+    
     public function moneytoBr($attr)
     {
         return number_format($this->$attr, 2, ',', '.');
diff --git a/database/migrations/2017_08_08_014107_create_vendas_table.php b/database/migrations/2017_08_08_014107_create_vendas_table.php
index 47c0a60..829fcab 100755
--- a/database/migrations/2017_08_08_014107_create_vendas_table.php
+++ b/database/migrations/2017_08_08_014107_create_vendas_table.php
@@ -21,6 +21,7 @@ public function up()
 	    $table->decimal('valor_compra', 10, 2);
 	    $table->decimal('valor_venda', 10, 2);
 	    $table->integer('qtd');
+            $table->integer('forma_pagamento');
 	    $table->string('observacao')->nullable();
             $table->timestamps();
 	    $table->foreign('cliente_id')->references('id')->on('clientes');
diff --git a/public/js/vendas.js b/public/js/vendas.js
index a410604..d21be24 100644
--- a/public/js/vendas.js
+++ b/public/js/vendas.js
@@ -78,6 +78,7 @@ $("#form-venda").validate({
             valor_venda: {required: true},
             produto_id: {required: true},
             cliente_id: {required: true},
+            forma_pagamento: {required: true},
             qtd: {required: true}
 
         },
@@ -87,6 +88,7 @@ $("#form-venda").validate({
             valor_venda: {required: 'Digite o valor da Venda'},
             produto_id: {required: "Selecione o Produto"},
             cliente_id: {required: "Selecione o Cliente"},
+            forma_pagamento: {required: "Selecione forma de Pagamento"},
             qtd: {required: "Digite a Qtd."}
 
         }
diff --git a/resources/macros/componentes.php b/resources/macros/componentes.php
index 7a3418f..a0a55cc 100644
--- a/resources/macros/componentes.php
+++ b/resources/macros/componentes.php
@@ -2,3 +2,4 @@
 
 Form::component('bsText', 'components.form.text', ['name', 'value' => null, 'attributes' => []]);
 Form::component('listMultiple', 'components.form.listMultiple', ['name', 'elements','value' => [], 'attributes' => []]);
+Form::component('list', 'components.form.list', ['name', 'elements','value' => null, 'attributes' => []]);
diff --git a/resources/views/components/form/list.blade.php b/resources/views/components/form/list.blade.php
new file mode 100644
index 0000000..9f845b4
--- /dev/null
+++ b/resources/views/components/form/list.blade.php
@@ -0,0 +1,38 @@
+<?php
+
+$class='form-control ';
+if(isset($attributes['class'])):
+    $class.=$attributes['class'];
+    unset($attributes['class']);
+endif;
+
+
+if(is_array($name)):
+    $label=current($name);
+    $name=key($name);
+   
+ else:
+    $label=$name;
+endif;
+
+$atributos='';
+foreach ($attributes as $key=>$attribute):
+    $atributos.="$key=$attribute ";
+endforeach;
+//echo $atributos; exit();
+?>
+
+<div class="form-group">
+    {{ Form::label($label, null, ['class' => 'control-label']) }}
+    <select name="{{$name}}"  class="{{$class}}" {{$atributos}}>
+    @foreach($elements as $key=>$element)
+    <option value="{{$key}}"
+       
+        <?php echo $value == $key ? "selected='selected'" : '' ?>
+        
+        >{{$element}}</option>
+    @endforeach
+
+</select>
+</div>
+
diff --git a/resources/views/relatorios/index.blade.php b/resources/views/relatorios/index.blade.php
index e19e574..9b24f90 100644
--- a/resources/views/relatorios/index.blade.php
+++ b/resources/views/relatorios/index.blade.php
@@ -15,6 +15,7 @@
     'value' => request('periodo_final'),
     'atributos' => ['class' => 'dateBr']
 ];
+$formas_pg=[""=>'-Todos-','1'=>'Dinheiro','2'=>'Cartão'];
 use App\Helpers\Util;
 ?>
 {!! Form::open(['route'=>'relatorio.index','id'=>'form-relatorio'])!!}
@@ -23,7 +24,7 @@
     <div class="col-md-3">
         {!! Form::listMultiple(['produto_id[]'=>'Produto'],$produtos,request('produto_id'),['class'=>'meu_chosen','data-placeholder'=>'-Todos-']) !!}
     </div>
-    <div class="col-md-3">
+    <div class="col-md-2">
         {!! Form::listMultiple(['cliente_id[]'=>'Cliente'],$clientes,request('cliente_id'),['class'=>'meu_chosen','data-placeholder'=>'-Todos-']) !!}
     </div>
     <div class="col-md-2">
@@ -33,9 +34,12 @@
         {!! Html::formGroupFlex($dt_final) !!}
     </div>
     <div class="col-md-2">
+        {!! Form::list(['forma_pagamento'=>'Forma Pagamento'],$formas_pg,request('forma_pagamento')) !!}
+    </div>
+    <div class="col-md-1">
         <div class="form-group">
-            <label class="control-label"><span class="glyphicon glyphicon-play"></span></label>
-        <button type="submit" class="btn  btn-primary form-control">Consultar</button>
+            <label class="control-label">Buscar</label>
+        <button type="submit" class="btn   btn-primary form-control"><span class="glyphicon glyphicon-play"></span></button>
         </div>
 
     </div>
@@ -62,6 +66,7 @@
     <th>Qtd</th>
     <th>Total Venda</th>
     <th>Lucro</th>
+    <th>Pagamento</th>
 </thead>
 
 <tbody>
@@ -75,6 +80,7 @@
         <td>{{$item->qtd}}</td>
         <td>{{$item->moneyToBr('total_venda')}}</td>
         <td>{{$item->moneyToBr('lucro')}}</td>
+         <td>{{$item->nome_forma_pagamento}}</td>
     </tr>
 
 
diff --git a/resources/views/vendas/form.blade.php b/resources/views/vendas/form.blade.php
index 66c4021..46b3f19 100755
--- a/resources/views/vendas/form.blade.php
+++ b/resources/views/vendas/form.blade.php
@@ -14,6 +14,7 @@
              'value'=>(isset($venda))  ? $venda->data->format('d/m/Y') : \Carbon\Carbon::now()->format('d\/m\/Y'),
              'atributos'=>['class'=>'dateBr']
          ];
+$formas_pagamento=['1'=>'Dinheiro','2'=>'Cartão'];
 
 ?>
 
@@ -40,11 +41,16 @@
     <div class="col-md-2 ">
         {!! Html::formGroup('qtd','Qtd',$errors) !!}
     </div>
+        
     <div class="col-md-2">
          <div class="form-group  "><label for="total" class="control-label">Total</label>
              <input class=" form-control money" name="total" type="text" id="total">
          </div>
     </div>
+        
+        <div class="col-md-4">
+        {!! Html::formGroupSelect('forma_pagamento',$formas_pagamento,'Forma Pagamento',$errors,' meu_chosen') !!}
+    </div>
         </div>
 </div>
 
diff --git a/resources/views/vendas/index.blade.php b/resources/views/vendas/index.blade.php
index 33ba288..a13a73e 100755
--- a/resources/views/vendas/index.blade.php
+++ b/resources/views/vendas/index.blade.php
@@ -29,6 +29,7 @@
             <th>Valor Un. Compra</th>
             <th>Valor Un. Venda</th>
             <th>Qtd</th>
+             <th>Pagamento</th>
             <th>Acões</th>
         </tr>
     </thead>
@@ -43,6 +44,7 @@
             <td>R$ {{$venda->formated_valor_compra}}</td>
             <td> R$ {{$venda->formated_valor_venda}}</td>
             <td>{{$venda->qtd}}</td>
+            <td>{{$venda->nome_forma_pagamento}}</td>
             <td class="col-md-2">
                 <button data-toggle="modal" data-target="#myModal"
 			class='btn btn-default' data-href="{{url("vendas/$venda->id/edit")}}">Editar