Changed transfers/expenses views syntax

app/views/expenses/_expenses_for_manager.html.erb

@@ -19,7 +19,7 @@
       <td><%= expense.expense_code %></td>
       <td><%= expense.expensesconcept.name %></td>
       <td><%= expense.open_cash_register.cash_register.name %></td>
-      <td><%= l(expense.created_at, :format => '%d/%B/%Y') %> </td>
+      <td><%= l(expense.created_at, format: '%d/%B/%Y') %> </td>
       <td><%= number_to_currency(expense.quantity, precision: 2) %> </td>
       <td><%= expense.observations %> </td>
       <td>
@@ -33,8 +33,10 @@
         <% end %>
       </td>
       <td class="text-center">
-        <%= expense.active? %>
-          <%= link_to expense, method: :delete, class: "btn btn-icon-only btn-danger", title: "Cancelar egreso", data: { confirm: '¿Está seguro que desea cancelar el egreso?' } do %> <i class="fa fa-ban"></i><% end %>
+        <% if expense.active? %>
+          <%= link_to expense, method: :delete, class: "btn btn-icon-only btn-danger", title: "Cancelar egreso", data: { confirm: '¿Está seguro que desea cancelar el egreso?' } do %>
+            <i class="fa fa-ban"></i>
+          <% end %>
         <% end %>
       </td>
     </tr>

app/views/expenses/_form.html.erb

@@ -2,7 +2,7 @@
   <div class="portlet-body form">
     <% if @expense.errors.any? %>
       <div class="alert alert-danger">
-        <strong>Tiene <%= pluralize(@expense.errors.count, "error") %> no se puede guardar el gasto</strong><br>
+        <strong>Tiene <%= pluralize(@expense.errors.count, "error") %> no se puede guardar el egreso</strong><br>
       </div>
     <% end %>
     <div class="form-body">

app/views/expenses/new.html.erb

@@ -17,7 +17,7 @@
 		<!-- BEGIN PAGE CONTENT BODY -->
 		<div class="page-content">
 			<div class="container-fluid">
-				<%= link_to  expenses_path, {:class=>"btn blue-hoki pull-right margin-bottom-10"} do %>  <i class="fa fa-angle-left "></i> Regresar
+				<%= link_to expenses_path, {:class=>"btn blue-hoki pull-right margin-bottom-10"} do %>  <i class="fa fa-angle-left "></i> Regresar
 				<% end %>
 				<!-- BEGIN PAGE BREADCRUMBS -->
 				<ul class="page-breadcrumb breadcrumb">
@@ -39,7 +39,7 @@
 								<%= render 'form' %>
 							</div>
 						</div>
-					</div>                       
+					</div>
 				</div>
 				<!-- END PAGE CONTENT INNER -->
 			</div>
@@ -49,4 +49,3 @@
 	</div>
 	<!-- END CONTENT -->
 </div>
-<!-- END CONTAINER -->

app/views/layouts/application.html.erb

@@ -41,7 +41,17 @@
 						</div>
 						<!-- END LOGO -->
 						<!-- BEGIN TOP NAVIGATION MENU -->
-						<label style="margin-top: 25px;font-size: 14px;"> Módulo - <%= usertype(current_user) %><br><small><%= current_user.pointsale_id.present? ? "Punto de venta - #{current_user.pointsale.name}" : "" %></small></label>
+						<label style="margin-top: 25px;font-size: 14px;">
+							Módulo - <%= usertype(current_user) %>
+							<br>
+							<small>
+								<% if current_user.pointsale_id.present? %>
+									<%= "Punto de venta - #{current_user.pointsale.name}" %>
+								<% elsif current_user.warehouse_id.present? %>
+									<%= "Almacén - #{current_user.warehouse.name}" %>
+								<% end %>
+							</small>
+						</label>
 						<a href="javascript:;" class="menu-toggler"></a>
 						<div class="top-menu">
 							<ul class="nav navbar-nav pull-right">

app/views/pos_configs/index.html.erb

@@ -31,7 +31,7 @@
                 <div class="portlet-title">
                   <div class="caption">
                     <i class="fa fa-fw fa-cog"></i>
-                    <span class="caption-subject bold uppercase">Párametros generales para los puntos de venta</span>
+                    <span class="caption-subject bold uppercase">Parámetros generales para los puntos de venta</span>
                   </div>
                 </div>
                 <%= render 'form' %>

app/views/transfers/_index_for_admin.html.erb

@@ -26,7 +26,7 @@
             <td>
               <%= transfer.destiny_is_pointsale? ? Pointsale.find(transfer.destiny_id).name : Warehouse.find(transfer.destiny_id).name %>
             </td>
-            <td> <%= transfer.transfer_details.count %> </td>
+            <td> <%= transfer.transfer_details.sum(:quantity) %> </td>
             <td class="text-center"><%= transfer_status(transfer) %></td>
             <td class="text-center"><%= transfer_details(transfer) %></td>
             <td class="text-center">

app/views/transfers/_index_for_cashier.html.erb

@@ -2,11 +2,11 @@
   <div class="col-md-2 col-sm-3 col-xs-3">
     <ul class="nav nav-tabs tabs-left">
       <li class="active">
-          <a href="#recibidos" data-toggle="tab"> Recibidos </a>
+        <a href="#recibidos" data-toggle="tab"> Recibidos </a>
       </li>
       <li>
-          <a href="#enviados" data-toggle="tab"> Enviados </a>
-      </li>                    
+        <a href="#enviados" data-toggle="tab"> Enviados </a>
+      </li>
     </ul>
   </div>
   <div class="col-md-10 col-sm-9 col-xs-9">
@@ -22,59 +22,37 @@
                     <th>Origen</th>
                     <th>Productos</th>
                     <th>Status</th>
-                    <th>Status recepción</th>                       
+                    <th>Status recepción</th>
                     <th>Acciones</th>
                   </tr>
                 </thead>
                 <tbody>
                   <% @received.each_with_index do |transfer, key| %>
                     <tr>
-                      <td> <%= key +1 %> </td>
-                      <td> <%= l(transfer.transfer_date, :format => '%d/%B/%Y') %> </td>
-                      <td> <%= transfer.origin_is_pointsale == 1 ? Pointsale.find(transfer.origin_id).name : Warehouse.find(transfer.origin_id).name %>  </td>
-                      <td> <%= transfer.products.count %> </td>
-                      <td>
-                          <% case transfer.status %>
-                            <% when "cancelled" %>
-                              <span class="label label-danger"> CANCELADO </span>
-                            <% when "pending" %>
-                              <span class="label bg-yellow-crusta"> PENDIENTE DE RECEPCIÓN </span>
-                            <% when "received" %>
-                              <span class="label label-success"> RECIBIDO </span>
-                          <% end %>
-                      </td>
-                      <td class="text-center">
-                        <% if transfer.transfer_details.where(:has_looses => 1).count > 0 && 
-                          transfer.transfer_details.where(:has_surplus => 1).count == 0 %>
-                          <span class="label label-warning"> CON PERDIDAS </span>
-                        <% elsif transfer.transfer_details.where(:has_surplus => 1).count > 0 &&
-                          transfer.transfer_details.where(:has_looses => 1).count == 0 %>
-                          <span class="label label-warning"> CON EXCEDENTE </span>
-                        <% elsif transfer.transfer_details.where(:has_surplus => 1).count > 0  && 
-                        transfer.transfer_details.where(:has_looses => 1).count > 0 %>
-                          <span class="label label-danger"> CON INCONSISTENCIAS </span>
-                        <% elsif transfer.received? %>
-                          <i class='fa fa-check fa-2 font-green'></i> 
-                        <% end %>
-                      </td>                       
+                      <td><%= key + 1 %> </td>
+                      <td><%= l(transfer.transfer_date, format: '%d/%B/%Y') %> </td>
+                      <td><%= transfer.origin_is_pointsale == 1 ? Pointsale.find(transfer.origin_id).name : Warehouse.find(transfer.origin_id).name %>  </td>
+                      <td><%= transfer.transfer_details.sum(:quantity) %> </td>
+                      <td><%= transfer_status(transfer) %></td>
+                      <td class="text-center"><%= transfer_details(transfer) %></td>
                       <td>
-                        <%= link_to transfer, {:class=>"btn btn-icon-only default", :title=>"Ver traspaso"} do %>
+                        <%= link_to transfer, { class: "btn btn-icon-only default", title: "Ver traspaso" } do %>
                           <i class="fa fa-search"></i>
                         <% end %>
-                        <%= link_to print_transfer_receipt_path(transfer.id, format: 'pdf'), {:class=>"btn btn-icon-only default", :target => "blank"} do %>
+                        <%= link_to print_transfer_receipt_path(transfer.id, format: 'pdf'), { class: "btn btn-icon-only default", target: "blank" } do %>
                           <i class="fa fa-print"></i>
-                        <% end %>                        
-                        <% if transfer.status =="pending" %>
-                          <%= link_to verify_transfer_path(transfer), {:class=>"btn btn-icon-only green-meadow", :title=>"Verificar traspaso"} do %>
+                        <% end %>
+                        <% if transfer.pending? %>
+                          <%= link_to verify_transfer_path(transfer), { class: "btn btn-icon-only green-meadow", title: "Verificar traspaso" } do %>
                             <i class="fa fa-check-square-o"></i>
-                          <% end %>                              
+                          <% end %>
                         <% end %>
                       </td>
                     </tr>
-                  <% end %>            
+                  <% end %>
                 </tbody>
-              </table>                            
-            </div>                                  
+              </table>
+            </div>
           </div>
         </div>
         <div class="tab-pane fade" id="enviados">
@@ -88,54 +66,32 @@
                     <th>Destino</th>
                     <th>Productos</th>
                     <th>Status</th>
-                    <th>Status recepción</th>                    
+                    <th>Status<br>recepción</th>
                     <th>Acciones</th>
                   </tr>
                 </thead>
                 <tbody>
                   <% @sent.each_with_index do |transfer, key| %>
                     <tr>
-                      <td> <%= key +1 %> </td>
-                      <td> <%= l(transfer.transfer_date, :format => '%d/%B/%Y') %> </td>
-                      <td> <%= transfer.destiny_is_pointsale == 1 ? Pointsale.find(transfer.destiny_id).name : Warehouse.find(transfer.destiny_id).name %>  </td>
-                      <td> <%= transfer.products.count %> </td>
-                      <td>
-                          <% case transfer.status %>
-                            <% when "cancelled" %>
-                              <span class="label label-danger"> CANCELADO </span>
-                            <% when "pending" %>
-                              <span class="label bg-yellow-crusta"> PENDIENTE DE RECEPCIÓN </span>
-                            <% when "received" %>
-                              <span class="label label-success"> RECIBIDO </span>
-                          <% end %>
-                      </td>
-                      <td class="text-center">
-                        <% if transfer.transfer_details.where(:has_looses => 1).count > 0 && 
-                          transfer.transfer_details.where(:has_surplus => 1).count == 0 %>
-                          <span class="label label-warning"> CON PERDIDAS </span>
-                        <% elsif transfer.transfer_details.where(:has_surplus => 1).count > 0 &&
-                          transfer.transfer_details.where(:has_looses => 1).count == 0 %>
-                          <span class="label label-warning"> CON EXCEDENTE </span>
-                        <% elsif transfer.transfer_details.where(:has_surplus => 1).count > 0  && 
-                        transfer.transfer_details.where(:has_looses => 1).count > 0 %>
-                          <span class="label label-danger"> CON INCONSISTENCIAS </span>
-                        <% elsif transfer.received? %>
-                          <i class='fa fa-check fa-2 font-green'></i>                           
-                        <% end %>
-                      </td>                      
+                      <td> <%= key + 1 %> </td>
+                      <td> <%= l(transfer.transfer_date, format: '%d/%B/%Y') %> </td>
+                      <td> <%= transfer.destiny_is_pointsale == 1 ? Pointsale.find(transfer.destiny_id).name : Warehouse.find(transfer.destiny_id).name %> </td>
+                      <td> <%= transfer.transfer_details.sum(:quantity) %> </td>
+                      <td><%= transfer_status(transfer) %></td>
+                      <td class="text-center"><%= transfer_details(transfer) %></td>
                       <td>
-                        <%= link_to transfer, {:class=>"btn btn-icon-only default", :title=>"Ver traspaso"} do %>
+                        <%= link_to transfer, { class: "btn btn-icon-only default", title: "Ver traspaso" } do %>
                           <i class="fa fa-search"></i>
                         <% end %>
-                        <%= link_to print_transfer_receipt_path(transfer.id, format: 'pdf'), {:class=>"btn btn-icon-only default", :target => "blank"} do %>
+                        <%= link_to print_transfer_receipt_path(transfer.id, format: 'pdf'), { class: "btn btn-icon-only default", target: "blank" } do %>
                           <i class="fa fa-print"></i>
                         <% end %>
                       </td>
                     </tr>
-                  <% end %>            
+                  <% end %>
                 </tbody>
-              </table>                            
-            </div>                                  
+              </table>
+            </div>
           </div>
         </div>
      </div>

app/views/transfers/_index_for_manager.html.erb

@@ -2,10 +2,10 @@
   <div class="col-md-2 col-sm-3 col-xs-3">
     <ul class="nav nav-tabs tabs-left">
       <li class="active">
-          <a href="#recibidos" data-toggle="tab"> Recibidos </a>
+        <a href="#recibidos" data-toggle="tab"> Recibidos </a>
       </li>
       <li>
-          <a href="#enviados" data-toggle="tab"> Enviados </a>
+        <a href="#enviados" data-toggle="tab"> Enviados </a>
       </li>
     </ul>
   </div>
@@ -29,10 +29,10 @@
                 <tbody>
                   <% @received.each_with_index do |transfer, key| %>
                     <tr>
-                      <td> <%= key +1 %> </td>
-                      <td> <%= l(transfer.transfer_date, :format => '%d/%B/%Y') %> </td>
+                      <td> <%= key + 1 %> </td>
+                      <td> <%= l(transfer.transfer_date, format: '%d/%B/%Y') %> </td>
                       <td> <%= transfer.origin_is_pointsale == 1 ? Pointsale.find(transfer.origin_id).name : Warehouse.find(transfer.origin_id).name %>  </td>
-                      <td> <%= transfer.transfer_details.count %> </td>
+                      <td> <%= transfer.transfer_details.sum(:quantity) %> </td>
                       <td><%= transfer_status(transfer) %> </td>
                       <td class="text-center"><%= transfer_details(transfer) %></td>
                       <td>
@@ -76,7 +76,7 @@
                       <td> <%= key + 1 %> </td>
                       <td> <%= l(transfer.transfer_date, format: '%d/%B/%Y') %> </td>
                       <td> <%= transfer.destiny_is_pointsale == 1 ? Pointsale.find(transfer.destiny_id).name : Warehouse.find(transfer.destiny_id).name %></td>
-                      <td> <%= transfer.products.count %></td>
+                      <td> <%= transfer.transfer_details.sum(:quantity) %></td>
                       <td><%= transfer_status(transfer) %></td>
                       <td class="text-center"><%= transfer_details(transfer) %></td>
                       <td>

app/views/transfers/index.html.erb

@@ -43,18 +43,18 @@
                     <span class="caption-subject bold uppercase">Lista de traspasos</span>
                   </div>
                   <div class="actions">
-                    <%= link_to new_transfer_path, {:class=>"btn bold green pull-right filtros"} do %> Nuevo traspaso <i class="fa fa-plus"></i>
+                    <%= link_to new_transfer_path, { class: "btn bold green pull-right filtros" } do %> Nuevo traspaso <i class="fa fa-plus"></i>
                     <% end %>
                   </div>
                 </div>
                 <div class="portlet-body">
-                    <% if current_user.usertype == "A" || current_user.usertype == "SS" %>
-                      <%= render partial: 'transfers/index_for_admin' %>
-                    <% elsif current_user.usertype == "C" %>
-                      <%= render partial: 'transfers/index_for_cashier' %>
-                    <% else %>
-                      <%= render partial: 'transfers/index_for_manager' %>
-                    <% end %>
+                  <% if current_user.usertype == "A" || current_user.usertype == "SS" %>
+                    <%= render partial: 'transfers/index_for_admin' %>
+                  <% elsif current_user.usertype == "C" %>
+                    <%= render partial: 'transfers/index_for_cashier' %>
+                  <% else %>
+                    <%= render partial: 'transfers/index_for_manager' %>
+                  <% end %>
                 </div>
               </div>
             </div>

app/views/transfers/receipt.pdf.erb

@@ -1,5 +1,5 @@
 <div class='pdf-body'>
-	<h3 style="margin-top:20px" class="text-center">Traspaso de <strong><%= origin %></strong> a <strong><%= destiny %></strong></h3> 
+	<h3 style="margin-top:20px" class="text-center">Traspaso de <strong><%= origin %></strong> a <strong><%= destiny %></strong></h3>
 
 	<div class="resume" style="border-bottom:1px solid black;">
 		<h4 style="margin-top:5px;margin-bottom:5px">Información general</h4>
@@ -11,17 +11,10 @@
 			<%= transfer.user.first_name %><br>
 
 		<strong>Productos:</strong>&nbsp;&nbsp;
-			<%= transfer.products.count %><br>
+			<%= transfer.transfer_details.sum(:quantity) %><br>
 
 		<strong>Status:</strong>&nbsp;&nbsp;
-	        <% case transfer.status %>
-	          <% when "cancelled" %>
-	            CANCELADO <br>	
-	          <% when "pending" %>
-	            PENDIENTE <br>	
-	          <% when "received" %>
-	            RECIBIDO <br>	
-	        <% end %>
+	    <%= transfer_status(transfer) %>
 
 		<% if transfer.received? %>
 			<strong>Status de recepción:</strong>&nbsp;&nbsp;
@@ -32,12 +25,12 @@
 
 			<strong>Recibió:</strong>&nbsp;&nbsp;
 				<%= transfer.received_by.first_name %>
-							
+
 			<% if transfer.observations.present? %>
 				<br> <strong>Observaciones:</strong>&nbsp;&nbsp;
-					<%= transfer.observations %>			
+					<%= transfer.observations %>
 			<% end %>
-		<% end %>		
+		<% end %>
 	</div>
 
 	<div class="products">
@@ -57,8 +50,8 @@
 						</td>
 					</tr>
 					<tr>
-						<td style="text-align:center"> 
-							<%= detail.quantity.round %>  
+						<td style="text-align:center">
+							<%= detail.quantity.round %>
 						</td>
 						<td style="text-align:center">
 							<%= detail.adjustment if transfer.received? %>
@@ -69,15 +62,10 @@
 							<% elsif detail.has_surplus? %>
 								CON EXCEDENTE
 							<% end %>
-						</td>						
-					</tr>				
-				<% end %>			
+						</td>
+					</tr>
+				<% end %>
 			</tbody>
 		</table>
-	</div>		
-
+	</div>
 </div>
-
-
-
-