Merge branch 'improve/cancelled-expenses' of SML/pos-boutique into master

app/controllers/expenses_controller.rb

@@ -4,9 +4,9 @@ class ExpensesController < ApplicationController
 
   ##--- Breadcrum_rails
   add_breadcrumb I18n.t("breadcrumbs." + controller_name), :expenses_path
-  add_breadcrumb "Nuevo egreso" , :new_expense_path, only: :new
-  add_breadcrumb "Detalle del egreso" , :expense_path, only: :show
-  add_breadcrumb "Editar egreso" , :edit_expense_path, only: :edit
+  add_breadcrumb "Nuevo egreso", :new_expense_path, only: :new
+  add_breadcrumb "Detalle del egreso", :expense_path, only: :show
+  add_breadcrumb "Editar egreso", :edit_expense_path, only: :edit
 
   before_action :set_expense, only: [:show, :edit, :update, :destroy]
   before_action :set_data, only: [:new, :create, :edit, :update]
@@ -14,25 +14,24 @@ class ExpensesController < ApplicationController
   # GET /expenses.json
   def index
     case current_user.usertype
-      when "A"
-        @from_pointsale = Expense.where.not('open_cash_register_id' => nil).includes(:expensesconcept).order(" id DESC ")
-        @general_expenses = Expense.where(:open_cash_register_id => nil).includes(:expensesconcept).order(" id DESC ")
-      when "G"
-        @expenses = Pointsale.find(current_user.pointsale_id).expenses.includes(:expensesconcept, :open_cash_register).order(" id DESC ")
-      when "C"
-        @expenses = Expense.where(:open_cash_register_id => current_user.get_open_cash_register.id).includes(:expensesconcept).order(" id DESC ")
+    when "A"
+      @from_pointsale = Expense.where.not(open_cash_register_id: nil).includes(:expensesconcept).order(" id DESC ")
+      @general_expenses = Expense.where(open_cash_register_id: nil).includes(:expensesconcept).order(" id DESC ")
+    when "G"
+      @expenses = Pointsale.find(current_user.pointsale_id).expenses.includes(:expensesconcept, :open_cash_register).order("id DESC ")
+    when "C"
+      @expenses = Expense.where(open_cash_register_id: current_user.get_open_cash_register.id).includes(:expensesconcept).order("id DESC ")
     end
   end
 
   # GET /expenses/1
   # GET /expenses/1.json
-  def show
-  end
+  def show; end
 
   # GET /expenses/new
   def new
     @expense = Expense.new
-    @concept_purchase_payment = Expensesconcept.find_by(:expense_from_purchase => 1)
+    @concept_purchase_payment = Expensesconcept.find_by(expense_from_purchase: 1)
     if current_user.usertype == 'C'
       @is_cashier = true
       @expense.open_cash_register_id = current_user.get_open_cash_register.id
@@ -40,20 +39,20 @@ class ExpensesController < ApplicationController
   end
 
   # GET /expenses/1/edit
-  def edit
-  end
+  def edit; end
 
   # POST /expenses
   # POST /expenses.json
+  # rubocop:disable Metrics/BlockLength
   def create
     respond_to do |format|
       @expense = Expense.new(expense_params)
-      @concept_purchase_payment = Expensesconcept.find_by(:expense_from_purchase => 1)
+      @concept_purchase_payment = Expensesconcept.find_by(expense_from_purchase: 1)
       @expense.status = :active
 
       if current_user.usertype == "A"
-        @expense.skip_open_cash_validation =  true
-        @expense.skip_open_cash_has_money =  true
+        @expense.skip_open_cash_validation = true
+        @expense.skip_open_cash_has_money = true
       else
         @expense.expense_date = Date.current
       end
@@ -64,10 +63,10 @@ class ExpensesController < ApplicationController
         if @concept_purchase_payment.id == @expense.expensesconcept_id
           if params[:purchases].present?
             purchase = Purchase.find(params[:purchases])
-            purchase.update_attributes(:status => "paid")
+            purchase.update_attributes(status: "paid")
           end
         end
-        #movimiento de efectivo
+        # movimiento de efectivo
         if current_user.usertype != "A"
           move = CashRegistersMove.new
           move.skip_received_validation = true
@@ -76,7 +75,7 @@ class ExpensesController < ApplicationController
           move.quantity = @expense.quantity
           move.move_type = :egreso
           move.concept = :expense
-          move.payment_method_id = PaymentMethod.find_by(:isCash => 1).id
+          move.payment_method_id = PaymentMethod.find_by(isCash: 1).id
           # si es pago a compra ponle el ID
           if purchase.present?
             move.purchase_id = purchase.id
@@ -91,6 +90,7 @@ class ExpensesController < ApplicationController
       end
     end
   end
+  # rubocop:enable Metrics/BlockLength
 
   # PATCH/PUT /expenses/1
   # PATCH/PUT /expenses/1.json
@@ -111,50 +111,46 @@ class ExpensesController < ApplicationController
   def destroy
     respond_to do |format|
       if current_user.usertype == 'A'
-        @expense.skip_open_cash_validation  =  true
+        @expense.skip_open_cash_validation = true
       end
 
       @expense.audit_comment = "Egreso #{@expense.expense_code} cancelado."
-      if @expense.update_attributes(:status => 0)
-        CashRegistersMove.where(:expense_id => @expense.id).each do |move|
-          new_cash_move = move.dup
-          new_cash_move.move_type = :ingreso
-          new_cash_move.skip_received_validation = true
-          new_cash_move.save
-        end
+      if @expense.update_attributes(status: 0)
+        CashRegistersMove.where(expense_id: @expense.id).destroy_all
         format.html { redirect_to expenses_url, warning: 'El Gasto fue cancelado correctamente.' }
-        format.json { head :no_content }
       else
         format.html { redirect_to expenses_url, warning: 'Error, intentar nuevamente.' }
-        format.json { head :no_content }
       end
+      format.json { head :no_content }
     end
   end
 
   private
-    def set_data
-      @is_cashier = false
-      if current_user.usertype != "A"
-        @expenses_concepts = Array.new
-        Expensesconcept.where("status = 1 and allpoints = 'true'").each do |expense|
-          @expenses_concepts << expense
-        end
 
-        Pointsale.find(current_user.pointsale_id).expensesconcepts.activos.each do |expense|
-          @expenses_concepts << expense
-        end
-        @expenses_concepts.uniq!
-      else
-        @expenses_concepts = Expensesconcept.activos
+  def set_data
+    @is_cashier = false
+    if current_user.usertype != "A"
+      @expenses_concepts = Array.new
+      Expensesconcept.where("status = 1 and allpoints = 'true'").each do |expense|
+        @expenses_concepts << expense
       end
-    end
-    # Use callbacks to share common setup or constraints between actions.
-    def set_expense
-      @expense = Expense.find(params[:id])
-    end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def expense_params
-      params.require(:expense).permit(:expensesconcept_id, :open_cash_register_id, :cash_registers_move_id, :quantity, :status, :purchases, :observations, :expense_date, :expense_code)
+      Pointsale.find(current_user.pointsale_id).expensesconcepts.activos.each do |expense|
+        @expenses_concepts << expense
+      end
+      @expenses_concepts.uniq!
+    else
+      @expenses_concepts = Expensesconcept.activos
     end
+  end
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_expense
+    @expense = Expense.find(params[:id])
+  end
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def expense_params
+    params.require(:expense).permit(:expensesconcept_id, :open_cash_register_id, :cash_registers_move_id, :quantity, :status, :purchases, :observations, :expense_date, :expense_code)
+  end
 end