Invoices table changes

app/assets/stylesheets/application.scss

@@ -1,5 +1,5 @@
 @import "bootstrap-sprockets";
 @import "bootstrap";
 @import "bootstrap-datepicker3";
-
+@import "colors";
 @import "scaffolds";

app/assets/stylesheets/colors.scss

@@ -0,0 +1 @@
+$teal: #4ebdd7;

app/assets/stylesheets/scaffolds.scss

@@ -19,11 +19,10 @@ pre {
 }
 
 a {
-  color: #000;
+  color: $teal;
 
   &:hover {
-    color: #fff;
-    background-color: #000;
+    text-decoration: underline;
   }
 }
 

app/controllers/invoices_controller.rb

@@ -56,7 +56,7 @@ def update
   def destroy
     @invoice.destroy
     respond_to do |format|
-      format.html { redirect_to invoices_url, notice: 'Factura eliminada' }
+      format.html { redirect_to [@namespace, :invoices], notice: 'Factura eliminada' }
       format.json { head :no_content }
     end
   end

app/models/invoice.rb

@@ -12,6 +12,8 @@ class Invoice < ActiveRecord::Base
   monetize :exempt_cents
   monetize :perception_cents
 
+  default_scope { order(date: 'DESC') }
+
   def operator_namespace
     operator.class.to_s.pluralize.downcase
   end

app/views/invoices/_form.html.erb

@@ -19,6 +19,6 @@
   </div>
 
   <div class="form-actions">
-    <%= f.button :submit %>
+    <%= f.button :submit, 'Aceptar', class: 'btn btn-primary' %>
   </div>
 <% end %>

app/views/invoices/_invoices.html.erb

@@ -1,46 +1,34 @@
-<table class='table'>
+<table class='table table-bordered'>
   <thead>
     <tr>
       <th>Fecha</th>
       <th>Operador</th>
-      <th>CUIT</th>
       <th>Factura</th>
-      <th>Pto_d_Vta</th>
-      <th>Nro</th>
       <th>Gravado 21%</th>
       <th>IVA 21%</th>
       <th>Gravado 10,5%</th>
       <th>IVA 10,5%</th>
       <th>No gravado</th>
       <th>Exento</th>
-      <th>Percepcion AFIP</th>
+      <th>5% AFIP</th>
       <th>Total</th>
-      <th colspan="3"></th>
     </tr>
   </thead>
 
   <tbody>
     <% @invoices.each do |invoice| %>
       <tr>
         <td><%= localize invoice.date, :format => '%d/%m/%Y' %></td>
-        <td><%= invoice.operator.name %></td>
-        <td><%= invoice.operator.cuit %></td>
-        <td><%= invoice.invoice_type %></td>
-        <td><%= invoice.sales_point %></td>
-        <td><%= invoice.number %></td>
-        <td><%= invoice.taxed_21 %></td>
-        <td><%= number_to_currency invoice.tax_21, unit: '' %></td>
-        <td><%= invoice.taxed_105 %></td>
-        <td><%= number_to_currency invoice.tax_105, unit: '' %></td>
-        <td><%= invoice.not_taxed %></td>
-        <td><%= invoice.exempt %></td>
-        <td><%= invoice.perception %></td>
-        <td><%= number_to_currency invoice.total, unit: '' %></td>
-        <td><%= link_to 'Detalles', [invoice.operator_namespace, invoice] %></td>
-        <td><%= link_to 'Editar',
-          [:edit, invoice.operator_namespace, invoice] %></td>
-        <td><%= link_to 'Borrar', [invoice.operator_namespace, invoice],
-          method: :delete, data: { confirm: '¿Seguro de borrar?' } %></td>
+        <td><%= invoice.operator.name.truncate 30 %></td>
+        <td><%= link_to invoice.full_number, invoice_path(invoice)%></td>
+        <td class="text-right"><%= invoice.taxed_21 %></td>
+        <td class="text-right"><%= number_to_currency invoice.tax_21, unit: '' %></td>
+        <td class="text-right"><%= invoice.taxed_105 %></td>
+        <td class="text-right"><%= number_to_currency invoice.tax_105, unit: '' %></td>
+        <td class="text-right"><%= invoice.not_taxed %></td>
+        <td class="text-right"><%= invoice.exempt %></td>
+        <td class="text-right"><%= invoice.perception %></td>
+        <td class="text-right"><%= number_to_currency invoice.total %></td>
       </tr>
     <% end %>
   </tbody>

app/views/invoices/edit.html.erb

@@ -2,5 +2,4 @@
 
 <%= render partial: 'form', locals: { operators: @operators } %>
 
-<%= link_to 'Detalles', [@invoice.operator_namespace, @invoice] %> |
-<%= link_to 'Volver', [@invoice.operator_namespace, :invoices] %>
+<%= link_to 'Cancelar', [@invoice.operator_namespace, :invoices], class: 'btn btn-default' %>

app/views/invoices/show.html.erb

@@ -1,41 +1,32 @@
 <p id="notice"><%= notice %></p>
 
-<p>
-  <strong>Fecha:</strong>
-  <%= @invoice.date.strftime('%d/%m/%Y')%>
-</p>
-
-<p>
-  <strong>Operador:</strong>
-  <%= @invoice.operator %>
-</p>
-
-<p>
-  <strong>Factura:</strong>
-  <%= @invoice.invoice_type %>
-  <%= @invoice.sales_point %>
-  <%= @invoice.number %>
-</p>
-
-<p>
-  <strong>Gravado IVA 21%</strong>
-  <%= @invoice.taxed_21 %>
-</p>
-
-<p>
-  <strong>Gravado IVA 10,5:</strong>
-  <%= @invoice.taxed_105 %>
-</p>
-
-<p>
-  <strong>No Gravado:</strong>
-  <%= @invoice.not_taxed %>
-</p>
-
-<p>
-  <strong>Exento:</strong>
-  <%= @invoice.exempt %>
-</p>
-
-<%= link_to 'Editar', [:edit, @invoice.operator_namespace, @invoice] %> |
-<%= link_to 'Volver', [@invoice.operator_namespace, :invoices] %>
+<dl class='dl-horizontal'>
+  <dt>Factura:</dt>
+  <dd><%= @invoice.full_number %></dd>
+  <dt>Fecha:</dt>
+  <dd><%= @invoice.date.strftime('%d/%m/%Y')%></dd>
+  <dt>Operador:</dt>
+  <dd><%= @invoice.operator %></dd>
+  <dt>CUIT:</dt>
+  <dd><%= @invoice.operator.cuit %></dd>
+  <dt>Gravado IVA 21%</dt>
+  <dd><%= @invoice.taxed_21 %></dd>
+  <dt>IVA 21%</dt>
+  <dd><%= @invoice.tax_21 %></dd>
+  <dt>Gravado IVA 10,5:</dt>
+  <dd><%= @invoice.tax_105 %></dd>
+  <dt>IVA 10,5:</dt>
+  <dd><%= @invoice.taxed_105 %></dd>
+  <dt>No Gravado:</dt>
+  <dd><%= @invoice.not_taxed %></dd>
+  <dt>Exento:</dt>
+  <dd><%= @invoice.exempt %></dd>
+  <dt>Percepcion AFIP:</dt>
+  <dd><%= @invoice.perception %></dd>
+  <dt>Total:</dt>
+  <dd><%= @invoice.total %></dd>
+</dl>
+
+<%= link_to 'Editar', [:edit, @invoice.operator_namespace, @invoice], class: 'btn btn-default' %>
+<%= link_to 'Borrar', [@invoice.operator_namespace, @invoice], method: :delete,
+  data: { confirm: 'Desea eliminar la factura?' }, class: 'btn btn-danger' %>

app/views/movements/_movements.html.erb

@@ -1,4 +1,4 @@
-<table class="table">
+<table class="table table-bordered">
   <thead>
     <tr>
       <th>Monto</th>

app/views/operators/_operators.html.erb

@@ -1,4 +1,4 @@
-<table class="table">
+<table class="table table-bordered">
   <thead>
     <tr>
       <th>Nombre</th>

app/views/passengers/_passengers.html.erb

@@ -1,4 +1,4 @@
-<table class="table">
+<table class="table table-bordered">
   <thead>
     <tr>
       <th>Name</th>

app/views/reservas/index.html.erb

@@ -17,7 +17,7 @@
 </div><!-- /.row -->
 
 
-<table class="table">
+<table class="table table-bordered">
   <thead>
     <tr>
       <th>Salida</th>