[Issue #4, Issue #3] Fixed

app/controllers/available_products_controller.rb

@@ -6,7 +6,7 @@ class AvailableProductsController < ApplicationController
     @showcolumns = "minMax"
     # se utiliza para mandarle al datatable el numero de columnas y en que orden se deben de acomodar
     @column_definition = [{ "data": "0" }, { "data": "1" }, { "data": "2" }, { "data": "3" }, { "data": "4" }, { "data": "5" }, { "data": "6" }, { "data": "7" }].to_json
-
+    @location_id = current_user.pointsale_id.present? ? current_user.pointsale_id : current_user.warehouse_id
     respond_to do |format|
       format.html
       format.json { render json: StocksDatatable.new(view_context, current_user, @showcolumns) }
@@ -15,6 +15,7 @@ class AvailableProductsController < ApplicationController
 
   def initial_stock
     @showcolumns = "initial"
+    @location_id = current_user.pointsale_id.present? ? current_user.pointsale_id : current_user.warehouse_id
     # se utiliza para mandarle al datatable el numero de columnas y en que orden se deben de acomodar
     @column_definition = [{ "data": "0" }, { "data": "1" }, { "data": "2" }, { "data": "3" }, { "data": "4" }, { "data": "5" }, { "data": "6" }].to_json
 

app/controllers/users_controller.rb

@@ -36,11 +36,12 @@ class UsersController < ApplicationController
   def create
     @user = User.new(user_params)
     respond_to do |format|
-      message = if @user.usertype == 'A'
-                  "usuario #{@user.userid} con perfil ADMINISTRADOR creado."
-                else
-                  "Usuario #{@user.userid} creado y asignado al " + (@user.pointsale.present? ? "punto de venta #{@user.pointsale.name}" : "almacén #{@user.warehouse.name}")
-                end
+      message =
+        if @user.usertype == 'A'
+          "usuario #{@user.userid} con perfil ADMINISTRADOR creado."
+        else
+          "Usuario #{@user.userid} creado y asignado al " + (@user.pointsale.present? ? "punto de venta #{@user.pointsale.name}" : "almacén #{@user.warehouse.name}")
+        end
       @user.audit_comment = message
       if @user.save
         format.html { redirect_to users_path, success: message }
@@ -75,11 +76,12 @@ class UsersController < ApplicationController
 
   def update_status
     user = User.find(params[:user_id])
-    if user.active?
-      user.status = "inactive"
-    elsif user.inactive?
-      user.status = "active"
-    end
+    user.status =
+      if user.active?
+        "inactive"
+      elsif user.inactive?
+        "active"
+      end
     respond_to do |format|
       message = "El usuario " + user.userid + " fue " + (user.active? ? "activado" : "desactivado") + "."
       user.audit_comment = message
@@ -106,7 +108,6 @@ class UsersController < ApplicationController
   end
 
   def user_params
-    # NOTE: Using `strong_parameters` gem
     params.require(:user).permit(:current_password, :password, :password_confirmation, :pointsale_id, :warehouse_id, :usertype, :userid, :first_name, :last_name, :email)
   end
 end

app/datatables/stock_by_pointsale_datatable.rb

@@ -50,23 +50,15 @@ class StockByPointsaleDatatable
 
   def get_display_name(product)
     name = "<label style='margin-bottom:0px'><strong>#{product.name}</strong></label> <br>"
-
-    if product.display_attributes.present?
-      name += "#{product.display_attributes} <br>"
-    end
-
+    name += "#{product.display_attributes} <br>" if product.display_attributes.present?
     name += "SKU: #{product.sku}"
-
-    if product.barcode.present?
-      name += "<br> <i class='fa fa-barcode'></i>: #{product.barcode}"
-    end
-
+    name += "<br> <i class='fa fa-barcode'></i>: #{product.barcode}" if product.barcode.present?
     name
   end
 
   def get_price_sale(product)
     location_id = params[:location][2, params[:location].length] unless params[:location].blank?
-    @current_user.usertype == 'S' ? '' : product.get_price_sale(location_id)
+    product.get_price_sale(location_id) unless current_user.usertype == "S"
   end
 
   def stock

app/views/available_products/_form.html.erb

@@ -2,7 +2,7 @@
   <div class="portlet-body form">
     <div id="error_explanation"></div>
 
-      <table class="table table-striped table-bordered table-hover stock-table" id="pointsale_stock" data-source="<%= @showcolumns == 'initial' ?  products_initial_stock_path(current_user.pointsale_id, :format => 'json') : products_stock_path(current_user.pointsale_id, :format => 'json') %>">
+      <table class="table table-striped table-bordered table-hover stock-table" id="pointsale_stock" data-source="<%= @showcolumns == 'initial' ?  products_initial_stock_path(@location_id, :format => 'json') : products_stock_path(@location_id, :format => 'json') %>">
         <thead>
           <tr>
             <th class="text-center"><input name="select_all" value="1" id="select-all" type="checkbox" /></th>

app/views/available_products/stock.html.erb

@@ -21,27 +21,27 @@
         <% end %>
         <!-- BEGIN PAGE BREADCRUMBS -->
         <ul class="page-breadcrumb breadcrumb">
-          <%= render_breadcrumbs :tag => :li, :separator => ' <i class="fa fa-circle"></i> ' %> 
-      </ul> 
+          <%= render_breadcrumbs :tag => :li, :separator => ' <i class="fa fa-circle"></i> ' %>
+      </ul>
         <!-- END PAGE BREADCRUMBS -->
         <!-- BEGIN PAGE CONTENT INNER -->
         <div class="page-content-inner">
           <div id="notice"><%= notice %></div>
           <div class="row">
             <div class="col-md-12">
-              <div class="portlet light">  
+              <div class="portlet light">
                 <div class="portlet-body form">
-                    <div id="error_explanation"></div> 
+                    <div id="error_explanation"></div>
 
                     <!-- lista de productos -->
                     <h4 class="form-section"> Lista de productos</h4>
                     <div class="portlet-body">
 
-                      <div class="row"> 
+                      <div class="row">
                         <!-- stock minimo para los seleccionados -->
                           <div class="col-md-offset-1 col-md-8">
                             <div class="form-group">
-                              <label class="col-md-1"> Stock Mínimo </label>          
+                              <label class="col-md-1"> Stock Mínimo </label>
                               <div class="col-md-2">
                                 <input class="form-control" type="number" min="0" id="min_stock_general">
                               </div>
@@ -50,12 +50,12 @@
                                 <input class="form-control" type="number" min="0" id="max_stock_general">
                               </div>
                               <div class="col-md-2">
-                                <button type="button" class="btn btn-success" onclick="updateStock()"><i class="fa fa-save"></i>&nbsp&nbspGuardar cambios</button>                 
+                                <button type="button" class="btn btn-success" onclick="updateStock()"><i class="fa fa-save"></i>&nbsp&nbspGuardar cambios</button>
                               </div>
-                            </div> 
+                            </div>
                           </div>
                       </div>
-                      <h4 class="form-section" style="margin-top: 5px; margin-bottom: 20px"></h4>   
+                      <h4 class="form-section" style="margin-top: 5px; margin-bottom: 20px"></h4>
                     </div>
                 </div>
                 <%= render 'form' %>

config/application.rb

@@ -26,12 +26,13 @@ module Pos
     config.active_record.raise_in_transactional_callbacks = true
     config.usertypes_for_admin = {
       "Administrador" => "A",
-      "Gerente" => "G",
+      "Almacenista" => "S",
       "Caja" => "C",
-      "Almacenista" => "S"
+      "Gerente" => "G"
     }
 
     config.usertypes_for_manager = {
+      "Almacenista" => "S",
       "Caja" => "C"
     }
   end