Added more payment methods; fixed credit payments

app/controllers/cash_registers_moves_controller.rb

@@ -1,5 +1,6 @@
 class CashRegistersMovesController < ApplicationController
   before_action :set_cash_registers_move, only: [:show, :edit, :update, :destroy]
+  before_action :set_payment_methods, only: [:new, :register_payment]
 
   # GET /cash_registers_moves/new
   def new
@@ -7,7 +8,7 @@ class CashRegistersMovesController < ApplicationController
 
     if params[:sale].present?
       @sale = Sale.find(params[:sale])
-      @credito = Credit.where(customer_id: @sale.customer_id, status: "0").sum(:rest)
+      @credito = Credit.activos.where(customer_id: @sale.customer_id).sum(:rest)
       @cash_registers_move.open_cash_register_id = @sale.open_cash_register_id
     elsif params[:products_return].present?
       @products_return = ProductsReturn.find(params[:products_return])
@@ -49,26 +50,28 @@ class CashRegistersMovesController < ApplicationController
     @products_return = ProductsReturn.find(params[:cash_registers_move][:products_return_id]) if params[:cash_registers_move][:products_return_id].present?
 
     respond_to do |format|
-      if @sale.present?
+      if !@cash_registers_move.valid?
+        format.js
+        format.json { render json: @cash_registers_move.errors, status: :unprocessable_entity }
+      elsif @sale.present?
         # calcular cambio cuando aplica.
         @cash_registers_move.calculate_quantities
-
+        @cash_registers_move.concept = :sale
         @cash_registers_move.move_type = :ingreso
 
+        if credit.present?
+          save_when_is_credit(@cash_registers_move, @sale)
+          @cash_registers_move.open_cash_register_id = session[:open_cash_register_id]
+        end
+
         if @sale.cash?
           @sale.update_attributes(status: :paid)
-          @cash_registers_move.concept = :sale
         elsif @sale.reserved?
           @cash_registers_move.status = :inactive
           @cash_registers_move.choose_concept_when_reserved
           @cash_registers_move.open_cash_register_id = session[:open_cash_register_id]
         end
 
-        if credit.present?
-          save_when_is_credit(credit)
-          @cash_registers_move.open_cash_register_id = session[:open_cash_register_id]
-        end
-
         message = "movimiento de efectivo por venta con folio #{@cash_registers_move.sale.sale_code}"
         @cash_registers_move.audit_comment = message
         if @cash_registers_move.save
@@ -88,7 +91,7 @@ class CashRegistersMovesController < ApplicationController
         if @cash_registers_move.save
           format.html { redirect_to purchases_path, success: 'Movimiento de efectivo realizado correctamente.' }
         else
-          format.html { render :new }
+          format.js
           format.json { render json: @cash_registers_move.errors, status: :unprocessable_entity }
         end
       elsif @products_return.present?
@@ -226,6 +229,14 @@ class CashRegistersMovesController < ApplicationController
     redirect_to new_cash_registers_move_path(sale: @sale, customer: @customer)
   end
 
+  def set_payment_methods
+    @is_cash = PaymentMethod.find_by(isCash: 1).id
+    @is_credit_card = PaymentMethod.find_by(method: "Tarjeta de credito").id
+    @is_debit_card = PaymentMethod.find_by(method: "Tarjeta de debito").id
+    @is_transfer = PaymentMethod.find_by(method: "Transferencia bancaria").id
+    @is_check = PaymentMethod.find_by(method: "Cheque").id
+  end
+
   private
 
   # Use callbacks to share common setup or constraints between actions.
@@ -235,68 +246,71 @@ class CashRegistersMovesController < ApplicationController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def cash_registers_move_params
-    params.require(:cash_registers_move).permit(:payment_method_id, :quantity, :open_cash_register_id, :sale_id, :cardnumber, :ticket, :received, :change, :products_return_id)
+    params.require(:cash_registers_move).permit(:payment_method_id, :quantity, :open_cash_register_id, :sale_id, :cardnumber, :ticket, :received, :change, :products_return_id, :bank_name, :check_number, :customer_account, :customer_code)
   end
 
-  def save_when_is_credit(credit)
-    abono = @cash_registers_move.quantity
-    abono_this_credit = abono >= credit.rest ? credit.rest : abono
-
-    # por si abonan dinero de mas, checar cuanto debe de ser de esta venta, y separarlo.
-    # @cash_registers_move.quantity = abono_this_credit
-    @credit_payment = CreditPayment.new
-    @credit_payment.credit_id = credit.id
-    @credit_payment.customer_id = credit.customer_id
-    @credit_payment.pointsale_id = credit.pointsale_id
-    @credit_payment.status = :active
-    @credit_payment.date_payment = Date.today
-    @credit_payment.user_id = current_user.id
-    # @credit_payment.quantity = abono_this_credit
-    @credit_payment.quantity = abono_this_credit
-
-    if @credit_payment.save
-      @cash_registers_move.credit_payment_id = @credit_payment.id
-      @cash_registers_move.concept = :credit_payment
-
-      if abono >= credit.rest # si se paga mas del adeudo de este credito
-        abono -= credit.rest
-
-        credit.update_attributes(rest: 0)
-        @sale.update_attributes(status: :paid)
+  def save_when_is_credit(cash_registers_move, sale)
+    if sale.paid?
+      sale = Sale.credit_pending(sale.customer_id).first
+    end
+    credit = Credit.find_by(sale_id: sale.id)
+    abono = cash_registers_move.received
+    total_debt = Credit.activos.where(customer_id: sale.customer_id)
+    @debt = total_debt.sum(:rest)
+    cash_registers_move.concept = :credit_payment
+    cash_registers_move.quantity = abono
+    cash_registers_move.change = 0
+    cash_registers_move.save
+
+    if abono >= total_debt.sum(:rest) # => liquidacion de la deuda total
+      nuevo_saldo = abono - total_debt.sum(:rest)
+      total_debt.each do |c|
+        sale = Sale.find_by_id(c.sale_id)
+        CreditPayment.create(credit_id: c.id, customer_id: sale.customer_id, pointsale_id: current_user.pointsale_id, status: "active", date_payment: Date.today, user_id: current_user.id, quantity: c.rest, cash_registers_move_id: cash_registers_move.id)
+        sale.update_attribute(:status, 2)
+      end
+      total_debt.update_all(rest: 0, status: 3)
+      cash_registers_move.update_attributes(change: nuevo_saldo, quantity: abono - nuevo_saldo) if cash_registers_move.payment_method.isCash?
+
+    elsif abono > credit.rest
+      CreditPayment.create(credit_id: credit.id, customer_id: sale.customer_id, pointsale_id: current_user.pointsale_id, status: "active", date_payment: Date.today, user_id: current_user.id, quantity: credit.rest, cash_registers_move_id: cash_registers_move.id)
+      abono -= credit.rest
+      credit.update_attributes(rest: 0, status: 3)
+      sale.update_attribute(:status, 2)
+      if abono > 0
+        new_debt(abono, cash_registers_move, sale)
+      elsif cash_registers_move.payment_method.isCash?
+        cash_registers_move.update_attributes(change: abono, quantity: cash_registers_move.quantity - abono)
+      end
+    else
+      CreditPayment.create(credit_id: credit.id, customer_id: sale.customer_id, pointsale_id: current_user.pointsale_id, status: "active", date_payment: Date.today, user_id: current_user.id, quantity: abono, cash_registers_move_id: cash_registers_move.id)
+      nuevo_saldo = credit.rest - abono
+      credit.update_attribute(:rest, nuevo_saldo)
+      sale.update_attribute(:status, 3)
+    end
+  end
 
-        # rubocop:disable Style/WhileUntilDo
-        while abono > 0 do
-          nextcredit = Credit.where("customer_id = #{credit.customer_id} and rest > 0").order("sale_id ASC")
-          # rubocop:disable Metrics/BlockNesting
-          if nextcredit.first.present?
-            if abono <= nextcredit.first.rest
-              next_credit_payment = CreditPayment.create(customer_id: credit.customer_id, credit_id: nextcredit.first.id, pointsale_id: credit.pointsale_id, quantity: abono, status: 0, date_payment: Date.today, user_id: current_user.id)
-              # next_credit_abono = @cash_registers_move.dup
-              # next_credit_abono.quantity = abono
-              # next_credit_abono.credit_payment_id = next_credit_payment.id
-              # next_credit_abono.save
-              nextcredit.first.update_attributes(rest: nextcredit.first.rest - abono)
-              sale = Sale.find_by_id(nextcredit.first.sale_id)
-              sale.update_attributes(status: :parcial)
-              abono -= nextcredit.first.rest
-            else
-              abono -= nextcredit.first.rest
-              nextcredit.first.update_attributes(rest: 0)
-              sale = Sale.find_by_id(nextcredit.sale_id)
-              sale.update_attributes(status: :paid)
-            end
-          else
-            abono = 0 # si ya no hay deuda
-          end
-          # rubocop:enable Metrics/BlockNesting
+  def new_debt(abono, cash_registers_move, sale)
+    until abono.zero?
+      next_sale = Sale.credit_pending(sale.customer_id).first
+      if next_sale.present?
+        credit = Credit.find_by(sale_id: next_sale.id)
+        if abono < credit.rest
+          cp = CreditPayment.create(credit_id: credit.id, customer_id: next_sale.customer_id, status: 0, date_payment: Date.today, user_id: current_user.id, quantity: abono, cash_registers_move_id: cash_registers_move.id)
+          nuevo_saldo = credit.rest - abono
+          abono = 0
+          credit.update_attribute(:rest, nuevo_saldo)
+          next_sale.update_attribute(:status, 3)
+        else
+          cp = CreditPayment.create(credit_id: credit.id, customer_id: next_sale.customer_id, status: 0, date_payment: Date.today, user_id: current_user.id, quantity: credit.rest, cash_registers_move_id: cash_registers_move.id)
+          abono -= credit.rest
+          credit.update_attributes(rest: 0, status: 3)
+          next_sale.update_attribute(:status, 2)
         end
-        # rubocop:enable Style/WhileUntilDo
       else
-        @cash_registers_move.quantity = abono
-        abono = credit.rest - abono
-        credit.update_attributes(rest: abono)
-        @sale.update_attributes(status: :parcial)
+        cash_registers_move.update_attribute(:change, abono)
+        abono = 0
       end
     end
-  end
+  end # new debt
 end

app/controllers/customers_controller.rb

@@ -20,13 +20,17 @@ class CustomersController < ApplicationController
   end
 
   def debtors
-    @customers = Customer.where("customers.status != 0").includes(:sales, :credits).order('credits.id DESC')
+    @customers = Credit.joins(:customer).activos.select("customers.*").uniq
+    # @customers = Customer.where("customers.status != 0").includes(:sales, :credits).order('credits.id DESC')
   end
 
   def customer_sales
-    @custom = Customer.find(params[:customer_id])
-    @sales = Sale.where(customer_id: @custom.id, saletype: 0).order('created_at desc')
-    @credit = Credit.where(customer_id: @custom.id)
+    @customer = Customer.includes(:billing_information, :credits, :sales).find(params[:customer_id])
+    # @sales = Sale.where(customer_id: @custom.id, saletype: 0).order('created_at desc')
+    @sales = @customer.sales.includes(:seller, :credit)
+    @credits = @customer.credits
+    # @abonos = @customer.credit_payments.activos.select("credit_payments.*, sales.sale_code").order("credit_payments.created_at DESC")
+    # @credit = Credit.where(customer_id: @custom.id)
   end
 
   # apartados por cliente

app/controllers/sales_controller.rb

@@ -314,7 +314,7 @@ class SalesController < ApplicationController
     # ticket para abonos a credito
     respond_to do |format|
       sale = Sale.find(params[:sale_id])
-      deuda = params[:debts]
+      deuda = params[:debts].to_f
       cash_move = CashRegistersMove.where(sale_id: sale.id).last
       quantity = cash_move.quantity
       debt = Credit.where(customer_id: sale.customer_id).sum(:rest)

app/helpers/cash_outs_helper.rb

@@ -19,4 +19,24 @@ module CashOutsHelper
       'DIFERENCIA POR DEVOLUCIÓN'
     end
   end
+
+  def move_concept_folio(move)
+    case move.concept
+    when "sale" then
+      content_tag(:span, move.sale.sale_code)
+    when "purchase" then
+      content_tag(:span, move.purchase.purchase_code)
+    when "expense" then
+      content_tag(:span, move.expense.expense_code)
+    # when "credit_payment" then
+    #   cp = CreditPayment.find_by(cash_registers_move_id: move.id)
+    #   unless cp.nil?
+    #     content_tag(:span, cp.id)
+    #   end
+    when "returned_money" then
+      content_tag(:span, ProductsReturn.find(move.products_return_id).return_code)
+    when "paid_product_change" then
+      content_tag(:span, ProductsReturn.find(move.products_return_id).return_code)
+    end
+  end
 end

app/helpers/cash_registers_moves_helper.rb

@@ -1,2 +1,15 @@
 module CashRegistersMovesHelper
+  def display_additional_info(move)
+    case move.payment_method.method
+    when "Tarjeta de credito" then
+      "No. tarjeta: #{move.cardnumber}"
+    when "Tarjeta de debito" then
+      "No. tarjeta: #{move.cardnumber}"
+    when "Transferencia bancaria" then
+      "Referencia: #{move.customer_code}"
+    when "Cheque" then
+      s = "Folio de cheque: #{move.check_number}\nBanco: #{move.bank_name}\nCuenta: #{move.customer_account}"
+      s.gsub(/\n/, '<br />').html_safe
+    end
+  end
 end

app/models/cash_registers_move.rb

@@ -20,8 +20,11 @@ class CashRegistersMove < ActiveRecord::Base
   validates_presence_of :quantity, message: "Debe indicar cantidad."
   validates_presence_of :payment_method_id, message: "Debe seleccionar método de pago."
   validates_presence_of :received, message: "Debe seleccionar monto recibido.", if: :in_cash?, unless: :skip_received_validation
+  validate :valid_info?, on: :create
 
-  scope :activos, -> { where("cash_registers_moves.status = ?", 1) }
+  scope :activos, -> { where(cash_registers_moves: { status: 1 }) }
+  scope :incomings, ->(open_cash_register) { includes(:open_cash_register).where(open_cash_register_id: open_cash_register, status: 1, move_type: 1) }
+  scope :outgoings, ->(open_cash_register) { includes(:open_cash_register).where(open_cash_register_id: open_cash_register, status: 1, move_type: 0) }
 
   def in_cash?
     cash_payment_id = PaymentMethod.find_by(isCash: 1).id
@@ -32,47 +35,68 @@ class CashRegistersMove < ActiveRecord::Base
     end
   end
 
-  # rubocop:disable Metrics/BlockNesting
-  def calculate_quantities
-    cash_payment_method_id = PaymentMethod.find_by(isCash: 1).id
-    # ventas
-    if sale.present?
-      if sale.cash?
-        if payment_method_id == cash_payment_method_id
-          sale_total = sale.total
-
-          already_paid = CashRegistersMove.where(sale_id: sale_id, open_cash_register_id: open_cash_register_id).sum(:quantity)
-          rest = sale_total - already_paid
-          if received.present?
-            self.change = rest > received ? 0 : received - rest
-            self.quantity = received > rest ? rest : received
-          end
-        else
-          self.quantity = received
-          self.change = 0
-        end
-      elsif sale.reserved? || sale.credit?
-        self.change = received.present? ? (received - quantity) : 0
+  def valid_info?
+    case payment_method.method
+    when "Tarjeta de credito", "Tarjeta de debito" then
+      if !cardnumber.present?
+        errors.add(:cardnumber, "Debe capturar los últimos 4 dígitos de la tarjeta.")
+      else
+        true
       end
-      # devoluciones
-    elsif products_return.present?
-      if payment_method_id == cash_payment_method_id
-        total = products_return.difference_amount
+    when "Transferencia bancaria" then
+      if !customer_code.present?
+        errors.add(:customer_code, "Debe capturar la referencia del cliente.")
+      else
+        true
+      end
+    when "Cheque" then
+      if !bank_name.present? || !check_number.present? || !customer_account.present?
+        errors.add(:base, "Debe capturar toda la información adicional del método de pago.")
+      else
+        true
+      end
+    else
+      true
+    end
+  end
 
+  def show_extras
+    case payment_method.method
+    when "Tarjeta de credito", "Tarjeta de debito" then # tarjetas
+      cardnumber
+    when "Transferencia bancaria" then # transferencia bancaria
+      "Referencia: #{customer_code}"
+    when "Cheque" then # cheque
+      "Banco: #{bank_name}"
+    when "Efectivo" then # efectivo
+      ""
+    end
+  end
+
+  def calculate_quantities
+    if payment_method.isCash?
+      if sale.present?
+        self.concept = :sale
+        total = sale.total
+        already_paid = CashRegistersMove.where(sale_id: sale_id, open_cash_register_id: open_cash_register_id).sum(:quantity)
+      elsif products_return.present?
+        total = products_return.difference_amount
         already_paid = CashRegistersMove.where(products_return_id: products_return_id, open_cash_register_id: open_cash_register_id).sum(:quantity)
+      end
 
-        rest = total - already_paid
-        if received.present?
-          self.change = received - (total - already_paid)
-          self.quantity = received > rest ? rest : received
-        end
-      else
-        self.quantity = received
-        self.change = 0
+      rest = total - already_paid
+      if sale.cash?
+        self.change = rest > received.to_f ? 0 : received.to_f - rest
+        self.quantity = received.to_f > rest ? rest : received.to_f
+      elsif sale.reserved? || sale.credit?
+        self.change = received.to_f > quantity ? received.to_f - quantity : 0
       end
+    else
+      # self.quantity = received.to_f
+      self.received = ""
+      self.change = 0
     end
   end
-  # rubocop:enable Metrics/BlockNesting
 
   def self.incomings_per_period(period)
     all_incomings = Array.new
@@ -101,12 +125,11 @@ class CashRegistersMove < ActiveRecord::Base
 
   def choose_concept_when_reserved
     reserve_has_moves = CashRegistersMove.where(sale_id: sale_id, move_type: 1, status: 1).any?
-    # rubocop:disable Style/ConditionalAssignment
-    if reserve_has_moves
-      self.concept = sale.reserve_debt > quantity ? :reserved_payment : :reserved_last_payment
-    else
-      self.concept = :reserved_first_payment
-    end
-    # rubocop:enable Style/ConditionalAssignment
+    self.concept =
+      if reserve_has_moves
+        sale.reserve_debt > quantity ? :reserved_payment : :reserved_last_payment
+      else
+        :reserved_first_payment
+      end
   end
 end

app/models/credit.rb

@@ -4,11 +4,11 @@ class Credit < ActiveRecord::Base
   belongs_to :sale
 
   has_many :credit_payments
-  has_many :cash_registers_moves, :through => :credit_payments
+  has_many :cash_registers_moves, through: :credit_payments
 
-  enum status: [ :active, :cancelled, :expired ]
+  enum status: [:active, :cancelled, :expired, :liquidated]
 
-	scope :debtors, -> { where( "rest > 0").group(:customer_id).sum(:rest) }
+  scope :debtors, -> { where("rest > 0").group(:customer_id).sum(:rest) }
 
-	scope :activos, -> { where( "status != 1") }
+  scope :activos, -> { where(status: [0, 2]) }
 end

app/models/credit_payment.rb

@@ -5,7 +5,9 @@ class CreditPayment < ActiveRecord::Base
   belongs_to :user
   belongs_to :credit
 
-	has_one :cash_registers_move
+  has_one :cash_registers_move
 
- 	enum status: [ :active, :cancelled ]
+  enum status: [:active, :cancelled]
+
+  scope :activos, -> { where(credit_payments: { status: 0 }) }
 end

app/models/sale.rb

@@ -14,7 +14,7 @@ class Sale < ActiveRecord::Base
   has_many :products_returns
   has_many :pointsales, through: :open_cash_register
 
-    ##--- Llevar registro de Actividad del usuario
+  ##--- Llevar registro de Actividad del usuario
   audited
 
   enum status: [:notpaid, :cancelled, :paid, :parcial, :cancelled_by_expiration]
@@ -30,6 +30,7 @@ class Sale < ActiveRecord::Base
   accepts_nested_attributes_for :sales_details
 
   scope :activas, -> { where.not(sales: { status: 1 }) }
+  scope :credit_pending, ->(customer) { where(saletype: 0, status: [0, 3], customer_id: customer).order(:id) }
 
   def get_pointsale
     user.pointsale
@@ -62,7 +63,7 @@ class Sale < ActiveRecord::Base
       all_sales << obj
     end
     all_sales = all_sales.to_json
-    return all_sales
+    all_sales
   end
 
   def reserve_debt
@@ -71,17 +72,16 @@ class Sale < ActiveRecord::Base
   end
 
   def can_be_cancelled?(pos_config)
-    daysToCancel = pos_config.days_cancel_sale
-    if (date_sale + daysToCancel.days) >= Date.today && !cancelled?
+    if (date_sale + pos_config.days_cancel_sale.days) >= Date.today && !cancelled?
       # checar si la venta es de credito y ver si tiene pagos
       if credit?
         has_payments = CreditPayment.where(credit_id: credit.id).any?
         has_payments ? (return false) : (return true)
       else
-        return true
+        true
       end
     else
-      return false
+      false
     end
   end
 end

app/views/cash_outs/_form.html.erb

@@ -34,80 +34,80 @@
       </ul>
     </div>
     <div class="col-md-offset-2 col-md-6" style="padding-right:0px">
-        <div class="form-group credit_limits">
-          <%= f.label :physical_cash, {:class=>"col-md-4 control-label"} do %>Efectivo en caja<span class="required">*</span> <% end %>
-          <div class="col-md-8">
-            <div class="input-group">
-              <span class="input-group-addon"> $ </span>
-              <%= f.text_field :physical_cash, {:class=>"form-control mask_decimal"} %>
-            </div>
-            <span class="help-block">Es el dinero que se tiene físicamente en caja. </span>
+      <div class="form-group credit_limits">
+        <%= f.label :physical_cash, {:class=>"col-md-4 control-label"} do %>Efectivo en caja<span class="required">*</span> <% end %>
+        <div class="col-md-8">
+          <div class="input-group">
+            <span class="input-group-addon"> $ </span>
+            <%= f.text_field :physical_cash, {:class=>"form-control mask_decimal"} %>
           </div>
+          <span class="help-block">Es el dinero que se tiene físicamente en caja. </span>
         </div>
-        <div class="form-group credit_limits">
-          <%= f.label :received_cash, {:class=>"col-md-4 control-label"} do %>Retiro de efectivo<span class="required">*</span> <% end %>
-          <div class="col-md-8">
-            <div class="input-group">
-              <span class="input-group-addon"> $ </span>
-              <%= f.text_field :received_cash, {:class=>"form-control mask_decimal", :onkeyup => "receivedAndFundCash()", :disabled => true} %>
-            </div>
+      </div>
+      <div class="form-group credit_limits">
+        <%= f.label :received_cash, {:class=>"col-md-4 control-label"} do %>Retiro de efectivo<span class="required">*</span> <% end %>
+        <div class="col-md-8">
+          <div class="input-group">
+            <span class="input-group-addon"> $ </span>
+            <%= f.text_field :received_cash, {:class=>"form-control mask_decimal", :onkeyup => "receivedAndFundCash()", :disabled => true} %>
           </div>
         </div>
-        <div class="form-group credit_limits">
-          <%= f.label :cash_fund, {:class=>"col-md-4 control-label"} do %>Fondo de caja<span class="required">*</span> <% end %>
-          <div class="col-md-8">
-            <div class="input-group">
-              <span class="input-group-addon"> $ </span>
-              <%= text_field_tag :cash_fund_display, '', class: "form-control mask_decimal", disabled: true %>
-                <!-- < %= f.hidden_field(:cash_fund) %> -->
-              <%= f.hidden_field :cash_fund, {:class=>"form-control mask_decimal"} %>
-            </div>
+      </div>
+      <div class="form-group credit_limits">
+        <%= f.label :cash_fund, {:class=>"col-md-4 control-label"} do %>Fondo de caja<span class="required">*</span> <% end %>
+        <div class="col-md-8">
+          <div class="input-group">
+            <span class="input-group-addon"> $ </span>
+            <%= text_field_tag :cash_fund_display, '', class: "form-control mask_decimal", disabled: true %>
+              <!-- < %= f.hidden_field(:cash_fund) %> -->
+            <%= f.hidden_field :cash_fund, {:class=>"form-control mask_decimal"} %>
           </div>
         </div>
-        <div class="form-group credit_limits">
-          <%= f.label :observations, {:class=>"col-md-4 control-label"} do %>Observaciones<span class="required" id="required_observations"></span> <% end %>
-          <div class="col-md-8">
-            <div class="input-group">
-              <span class="input-group-addon"> <i class="fa fa-comment-o"></i> </span>
-                <%= f.text_area :observations, {:class=>"form-control", :rows=>5 } %>
-            </div>
+      </div>
+      <div class="form-group credit_limits">
+        <%= f.label :observations, {:class=>"col-md-4 control-label"} do %>Observaciones<span class="required" id="required_observations"></span> <% end %>
+        <div class="col-md-8">
+          <div class="input-group">
+            <span class="input-group-addon"> <i class="fa fa-comment-o"></i> </span>
+              <%= f.text_area :observations, {:class=>"form-control", :rows=>5 } %>
           </div>
         </div>
+      </div>
     </div>
     <div class="row">
       <div class="col-md-12">
         <div class="table-scrollable">
-            <table class="table table-hover table-striped table-bordered" id="payment_methods_table">
-                <thead>
-                    <tr>
-                        <th> # </th>
-                        <th> Método de pago </th>
-                        <th> Total de ingresos (ventas) </th>
-                        <th> Total de egresos (gastos) </th>
-                        <th>Total (ventas y efectivo inicial)</th>
-                    </tr>
-                </thead>
-                <tbody>
-                  <% @payments.each_with_index do |payment, key| %>
-                    <tr id="payment_<%= payment['payment_method_id']%>">
-                      <td> <%= key +1 %> </td>
-                      <td> <%= payment["method"] %> </td>
-                      <td> <%= number_to_currency(payment["incoming"], precision: 2) %> </td>
-                      <td class="danger"> <%= number_to_currency(payment["outgoing"], precision: 2) %> </td>
-                      <td>
-                        <%= number_to_currency(payment["total"], precision: 2) %>
-                        <input class="hidden" value="<%= payment["total"] %>" id="<%=key + 1%>">
-                      </td>
-                    </tr>
-                        <%= f.fields_for :cash_out_details do |ff| %>
-                        <%= ff.hidden_field :payment_method_id, :value => payment["payment_method_id"] %>
-                        <%= ff.hidden_field :incoming, :value => payment["incoming"] %>
-                        <%= ff.hidden_field :outgoing, :value => payment["outgoing"] %>
-                        <%= ff.hidden_field :total, :value => payment["total"] %>
-                        <% end %>
+          <table class="table table-hover table-striped table-bordered" id="payment_methods_table">
+            <thead>
+              <tr>
+                <th> # </th>
+                <th> Método de pago </th>
+                <th> Total de ingresos (ventas) </th>
+                <th> Total de egresos (gastos) </th>
+                <th>Total (ventas y efectivo inicial)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <% @payments.each_with_index do |payment, key| %>
+                <tr id="payment_<%= payment['payment_method_id']%>">
+                  <td> <%= key +1 %> </td>
+                  <td> <%= payment["method"] %> </td>
+                  <td> <%= number_to_currency(payment["incoming"], precision: 2) %> </td>
+                  <td class="danger"> <%= number_to_currency(payment["outgoing"], precision: 2) %> </td>
+                  <td>
+                    <%= number_to_currency(payment["total"], precision: 2) %>
+                    <input class="hidden" value="<%= payment["total"] %>" id="<%= key + 1 %>">
+                  </td>
+                </tr>
+                  <%= f.fields_for :cash_out_details do |ff| %>
+                    <%= ff.hidden_field :payment_method_id, :value => payment["payment_method_id"] %>
+                    <%= ff.hidden_field :incoming, :value => payment["incoming"] %>
+                    <%= ff.hidden_field :outgoing, :value => payment["outgoing"] %>
+                    <%= ff.hidden_field :total, :value => payment["total"] %>
                   <% end %>
-                </tbody>
-            </table>
+              <% end %>
+            </tbody>
+          </table>
         </div>
       </div>
     </div>
@@ -126,49 +126,17 @@
       </thead>
       <tbody>
         <% @incomings.each_with_index do |move, key| %>
-        <tr>
-          <td><%= key + 1 %></td>
-          <td>
-            <% case move.concept %>
-              <% when "sale",  "reserved_payment", "reserved_first_payment", "reserved_last_payment" %>
-                <%= move.sale.sale_code %>
-              <% when "purchase"%>
-                <%= move.purchase.purchase_code %>
-              <% when "expense"%>
-                <%= move.expense.expense_code %>
-              <% when "credit_payment"%>
-                <%= move.credit_payment.id %>
-              <% when "products_return"%>
-                <%= move.products_return.sale.sale_code %>
-            <% end %>
-          </td>
-          <td><%= move.open_cash_register.cash_register.name%></td>
-          <td><%= move.payment_method.method %></td>
-          <td><%= number_to_currency(move.quantity, precision: 2) %></td>
-          <td>
-            <% case move.concept %>
-              <% when "sale"%>
-                VENTA
-              <% when "purchase"%>
-                COMPRA CANCELADA
-              <% when "expense"%>
-                GASTO CANCELADO
-              <% when "credit_payment"%>
-                <strong>ABONO A CRÉDITO </strong><br>
-                cliente: <%= move.credit_payment.customer.nick_name %>
-              <% when "reserved_payment"%>
-                ABONO A APARTADO
-              <% when "reserved_first_payment" %>
-                ANTICIPO DE APARTADO
-              <% when "reserved_last_payment" %>
-                LIQUIDACIÓN DE APARTADO
-              <% when "products_return" %>
-                DIFERENCIA POR DEVOLUCIÓN
-            <% end %>
-          </td>
-          <td><%= l(move.created_at, :format => '%I:%M %p') %> </td>
-        </tr>
+          <tr <%= move.sale.cancelled? ? 'class=danger' : "" %>>
+            <td><%= key += 1 %></td>
+            <td><%= move_concept_folio(move) %></td>
+            <td><%= move.open_cash_register.cash_register.name %></td>
+            <td><%= move.payment_method.method %></td>
+            <td><%= number_to_currency(move.quantity, precision: 2) %></td>
+            <td><%= cash_move_type(move) %></td>
+            <td><%= l(move.created_at, format: '%I:%M %p') %> </td>
+          </tr>
         <% end %>
+        <!--  -->
       </tbody>
     </table>
 
@@ -187,42 +155,31 @@
       </thead>
       <tbody>
         <% @outgoings.each_with_index do |move, key| %>
-        <tr>
-          <td><%= key + 1 %></td>
-          <td>
-            <% case move.concept %>
-              <% when "sale",  "reserved_payment" %>
-                <%= move.sale.sale_code %>
-              <% when "purchase"%>
-                <%= move.purchase.purchase_code %>
-              <% when "expense"%>
-                <%= move.expense.expense_code %>
-              <% when "credit_payment"%>
-                <%= move.credit_payment.id %>
-            <% end %>
-          </td>
-          <td><%= move.open_cash_register.cash_register.name%></td>
-          <td><%= move.payment_method.method %></td>
-          <td><%= number_to_currency(move.quantity, precision: 2) %></td>
-          <td>
-            <% case move.concept %>
-              <% when "sale" %>
-                <% if move.sale.cash? %>
-                  VENTA CANCELADA
-                <% elsif move.sale.reserved? %>
-                  APARTADO CANCELADO
-                <% end %>
-              <% when "purchase"%>
-                COMPRA
-              <% when "expense"%>
-                <strong> <%= move.expense.expensesconcept.name %></strong> <br>
-                <%= move.expense.observations %>
-              <% when "credit_payment"%>
-                ABONO CANCELADO
-            <% end %>
-          </td>
-          <td><%= l(move.created_at, :format => '%I:%M %p') %> </td>
-        </tr>
+          <tr>
+            <td><%= key + 1 %></td>
+            <td><%= move_concept_folio(move) %></td>
+            <td><%= move.open_cash_register.cash_register.name %></td>
+            <td><%= move.payment_method.method %></td>
+            <td><%= number_to_currency(move.quantity, precision: 2) %></td>
+            <td>
+              <% case move.concept %>
+                <% when "sale" %>
+                  <% if move.sale.cash? %>
+                    VENTA CANCELADA
+                  <% elsif move.sale.reserved? %>
+                    APARTADO CANCELADO
+                  <% end %>
+                <% when "purchase" %>
+                  COMPRA
+                <% when "expense" %>
+                  <strong> <%= move.expense.expensesconcept.name %></strong> <br>
+                  <%= move.expense.observations %>
+                <% when "credit_payment" %>
+                  ABONO CANCELADO
+              <% end %>
+            </td>
+            <td><%= l(move.created_at, :format => '%I:%M %p') %> </td>
+          </tr>
         <% end %>
       </tbody>
     </table>
@@ -232,8 +189,8 @@
     <div style="margin-top: 30px">
       <div class="row">
         <div class="col-md-9">
-        <button type="button" class="btn green" onclick="addCashOut()" disabled id="submit_cash_out">Guardar</button>
-          <%= link_to 'Cancelar', root_path, {:class=>"btn default"} %>
+          <button type="button" class="btn green" onclick="addCashOut()" disabled id="submit_cash_out">Guardar</button>
+          <%= link_to 'Cancelar', root_path, { class: "btn default" } %>
         </div>
       </div>
     </div>

app/views/cash_outs/index.html.erb

@@ -137,13 +137,15 @@
                             <%= link_to print_cash_out_receipt_path(cash_out.id, format: 'pdf'), {:class=>"btn btn-icon-only default", :target => "blank"} do %>
                               <i class="fa fa-print"></i>
                             <% end %>
-                            <% if cash_out.invoice_num.blank? && (cash_out.amount_in - cash_out.amount_out) > 0.0 && horas_transcurridas < 72 %>
-                              <%= link_to general_public_invoice_path(cash_out.id), remote: true, class: "btn btn-icon-only green", title: "Generar factura a público general" do %>
-                                <i class="fa fa-envelope"></i>
-                              <% end %>
-                            <% elsif cash_out.invoice_num.present? %>
-                              <%= link_to print_gpi_path(cash_out.id), remote: true, class: "btn btn-icon-only default blue-madison", target: "blank", title: "Reimprimir factura" do %>
-                                <i class="fa fa-file-text-o"></i>
+                            <% if can? :general_public_invoice, CashOut %>
+                              <% if cash_out.invoice_num.blank? && (cash_out.amount_in - cash_out.amount_out) > 0.0 && horas_transcurridas < 72 %>
+                                <%= link_to general_public_invoice_path(cash_out.id), remote: true, class: "btn btn-icon-only green", title: "Generar factura a público general" do %>
+                                  <i class="fa fa-envelope"></i>
+                                <% end %>
+                              <% elsif cash_out.invoice_num.present? %>
+                                <%= link_to print_gpi_path(cash_out.id), remote: true, class: "btn btn-icon-only default blue-madison", target: "blank", title: "Reimprimir factura" do %>
+                                  <i class="fa fa-file-text-o"></i>
+                                <% end %>
                               <% end %>
                             <% end %>
                           </td>

app/views/cash_outs/show.html.erb

@@ -240,28 +240,15 @@
 											</thead>
 											<tbody>
 								        <% @incomings.each_with_index do |move, key| %>
-									        <tr>
-									          <td><%= key + 1 %></td>
-									          <td>
-									            <% case move.concept %>
-        												<% when "sale",  "reserved_payment", "reserved_first_payment", "reserved_last_payment", "products_return" %>
-									                <%= move.sale.sale_code %>
-									              <% when "purchase"%>
-									                <%= move.purchase.purchase_code %>
-									              <% when "expense"%>
-									                <%= move.expense.expense_code %>
-									              <% when "credit_payment"%>
-									                <%= move.credit_payment.id %>
-									            <% end %>
-									          </td>
-									          <td><%= move.open_cash_register.cash_register.name%></td>
-									          <td><%= move.payment_method.method %></td>
-									          <td><%= number_to_currency(move.quantity, precision: 2) %></td>
-									          <td>
-                              <%= cash_move_type(move) %>
-							           		</td>
-									          <td><%= l(move.created_at, :format => '%I:%M %p') %> </td>
-									        </tr>
+								          <tr <%= move.sale.cancelled? ? 'class=danger' : "" %>>
+								            <td><%= key += 1 %></td>
+								            <td><%= move_concept_folio(move) %></td>
+								            <td><%= move.open_cash_register.cash_register.name %></td>
+								            <td><%= move.payment_method.method %></td>
+								            <td><%= number_to_currency(move.quantity, precision: 2) %></td>
+								            <td><%= cash_move_type(move) %></td>
+								            <td><%= l(move.created_at, format: '%I:%M %p') %> </td>
+								          </tr>
 								        <% end %>
 											</tbody>
 										</table>
@@ -290,33 +277,30 @@
 								        <% @outgoings.each_with_index do |move, key| %>
 									        <tr>
 									          <td><%= key + 1 %></td>
+									          <td><%= move_concept_folio(move) %></td>
+									          <td><%= move.open_cash_register.cash_register.name %></td>
+									          <td><%= move.payment_method.method %></td>
+									          <td><%= number_to_currency(move.quantity, precision: 2) %></td>
 									          <td>
 									            <% case move.concept %>
-									              <% when "sale",  "reserved_payment",  "credit_payment" %>
-									                <%= move.sale.sale_code %>
-									              <% when "purchase"%>
-									                <%= move.purchase.purchase_code %>
-									              <% when "expense"%>
-									                <%= move.expense.expense_code %>
+									              <% when "sale" %>
+									                <% if move.sale.cash? %>
+									                  VENTA CANCELADA
+									                <% elsif move.sale.reserved? %>
+									                  APARTADO CANCELADO
+									                <% end %>
+									              <% when "purchase" %>
+									                COMPRA
+									              <% when "expense" %>
+									                <strong> <%= move.expense.expensesconcept.name %></strong> <br>
+									                <%= move.expense.observations %>
+									              <% when "credit_payment" %>
+									                ABONO CANCELADO
 									            <% end %>
 									          </td>
-									          <td><%= move.open_cash_register.cash_register.name%></td>
-									          <td><%= move.payment_method.method %></td>
-									          <td><%= number_to_currency(move.quantity, precision: 2) %></td>
-									          <td>
-	                          	<% case move.concept %>
-	                          	<% when "sale" %>
-    	                        	Venta cancelada
-	                          	<% when "purchase" %>
-	                            	Compra
-	                          	<% when "expense" %>
-								                <strong> <%= move.expense.expensesconcept.name %></strong> <br>
-								                <%= move.expense.observations %>
-		                          <% end %>
-							           		</td>
 									          <td><%= l(move.created_at, :format => '%I:%M %p') %> </td>
 									        </tr>
-								        <% end %>
+									      <% end %>
 											</tbody>
 										</table>
 									</div>

app/views/cash_registers_moves/_abonoform.html.erb

@@ -35,7 +35,7 @@
           <!-- recibido -->
           <div class="col-md-4">
             <div class="form-group">
-              <span class="help-block">monto recibido. </span>
+              <span class="help-block">Monto recibido </span>
               <div class="input-group col-md-11">
                 <span class="input-group-addon"> $ </span>
                 <%= f.number_field :received, { class: "form-control mask_decimal first_input", oninput: 'lock_button()' } %>
@@ -45,38 +45,56 @@
           <!-- cantidad -->
           <div class="col-md-4">
             <div class="form-group">
-              <span class="help-block">monto a ABONAR. </span>
+              <span class="help-block">Monto a ABONAR </span>
               <div class="input-group col-md-11">
                 <span class="input-group-addon"> $ </span>
                 <%= f.number_field :quantity, { class: "form-control mask_decimal", oninput: 'lock_button()' } %>
               </div>
             </div>
           </div>
-          <!-- metodo de pago -->
-          <div class="col-md-2">
-            <div class="form-group">
-              <span class="help-block">forma de pago. </span>
-              <div class="input-group col-md-12">
-                <%= f.select :payment_method_id, PaymentMethod.vigentes.map { |c| [c.method, c.id] }, {:include_blank => "Seleccione", :selected => @cash_id}, { class: "form-control" } %>
-              </div>
-            </div>
-          </div>
           <!-- boton agregar -->
           <div class="col-md-2" style="padding-right:0px; margin-top:30px">
             <button type="button" class="btn green pull-right" onclick="unlockSubmit()">Agregar</button>
           </div>
         </div>
+        <div class="col-md-4">
+          <div class="form-group">
+            <span class="help-block">Forma de pago </span>
+            <div class="input-group col-md-12">
+              <%= f.select :payment_method_id, PaymentMethod.vigentes.map { |c| [c.method, c.id] }, { include_blank: "Seleccione", selected: @cash_id }, { class: "form-control" } %>
+            </div>
+          </div>
+        </div>
         <!--  datos de la tarjeta cuando aplica -->
-        <div class="col-md-12" id="card_info" style="display: none;">
+        <div class="col-md-6" id="card_info" style="display: none;margin-top: 25px">
           <div class="form-group">
-            <%= f.label :cardnumber, { class: "col-md-3 control-label" } do %> Tarjeta: <span class="required">*</span>
-            <% end %>
+            <%= f.label :cardnumber, { class: "col-md-4 control-label" } do %> Tarjeta: <span class="required">*</span><% end %>
             <div class="col-md-8">
-              <%= f.text_field :cardnumber, { class: "form-control", maxlength: 4 } %>
-              <span class="help-block">Últimos 4 dígitos de la tarjeta. </span>
+              <%= f.text_field :cardnumber, { class: "form-control input-xsmall", maxlength: 4 } %>
+              <span class="help-block"><small>Últimos 4 dígitos de la tarjeta.</small></span>
             </div>
           </div>
         </div>
+        <!--  datos del cheque cuando aplica -->
+        <div class="col-md-12" id="check_info" style="display: none;padding-left: 10px">
+          <div class="form-group">
+            <%= f.label :bank_name, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Nombre del banco: <span class="required">*</span><% end %>
+            <%= f.text_field :bank_name, { class: "col-md-8 form-control", style: "width: 25%" } %>
+            <%= f.label :check_number, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Folio de cheque: <span class="required">*</span><% end %>
+            <%= f.text_field :check_number, { class: "col-md-8 form-control", style: "width: 25%" } %>
+          </div>
+          <div class="form-group">
+            <%= f.label :customer_account, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Número de cuenta: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_account, { class: "col-md-8 form-control input-medium", style: "width: 25%" } %>
+          </div>
+        </div>
+        <!--  datos de la transferencia cuando aplica -->
+        <div class="col-md-6" id="transfer_info" style="display: none;padding-left: 10px;margin-top: 25px">
+          <div class="form-group">
+            <%= f.label :customer_code, { class: "col-md-5 control-label" } do %> Referencia: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_code, class: "col-md-7 form-control input-small" %>
+          </div>
+        </div>
       </div>
       <!-- div para mostrar cambio -->
       <div class="col-md-offset-6 col-md-6">
@@ -97,7 +115,9 @@
 
 <% end %>
 <script type="text/javascript">
+  var totalInTable = 0;
   var timeout = null;
+
   $('#datetimepicker2').datetimepicker({
     icons: {
       date: "fa fa-calendar"
@@ -114,22 +134,58 @@
   $('#dialog .modal-dialog').removeClass('modal-lg');
 
   $('#cash_registers_move_payment_method_id').on('change', function() {
-    // $('#display_change').html(formatter.format(0));
+    var method = parseInt($(this).val());
     $('#display_change').html(accounting.formatMoney(0));
-
     $('#save_move').attr('disabled', true);
-    if ($(this).val() != <%= @cash_id %>) {
-      $("#card_info").fadeIn();
-      $('#cash_registers_move_received').attr('disabled', true);
-      $('#cash_registers_move_received').val("");
-    } else {
-      $("#card_info").fadeOut();
-      $("#cash_registers_move_cardnumber").val("");
-      $('#cash_registers_move_received').attr('disabled', false);
+
+    switch(method){
+      case 1:
+        // tarjeta de debito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 2:
+        // efectivo
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 3:
+        // transferencia bancaria
+        $('#transfer_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 5:
+        // cheque
+        $('#check_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        break;
+      case 4:
+        // tarjeta de credito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
     }
   });
 
-
   function unlockSubmit() {
     var method = $('#cash_registers_move_payment_method_id').val();
     var received = $('#cash_registers_move_received').val();
@@ -138,18 +194,14 @@
     var isReady = false;
 
     if (method == <%= @cash_id %>) {
-      var received = $('#cash_registers_move_received').val();
-      var quantity = $('#cash_registers_move_quantity').val();
       if(received && quantity && (quantity <= <%= @credito %> ) ) {
         change = received - quantity;
         isReady = true;
       } else {
         toastr["error"]("Hay datos que falta ingresar o la cantidad es incorrecta.");
       }
-    } else {
-      if (quantity) {
-        isReady = true;
-      }
+    } else if (quantity) {
+      isReady = true;
     }
 
     // $('#display_change').html(formatter.format(change));
@@ -157,7 +209,7 @@
 
     if (isReady) {
       $("#save_move").attr('disabled', false);
-    } else  {
+    } else {
       $("#save_move").attr('disabled', true);
     }
   }

app/views/cash_registers_moves/_cash_registers_move.html.erb

@@ -1,10 +1,10 @@
 <tr id="cash_move_<%= @cash_registers_move.id %>">
-  	<% if (@cash_registers_move.sale.present? && (@cash_registers_move.sale.cash? || @cash_registers_move.sale.reserved?)) || @cash_registers_move.products_return.present? %>
-	  	<td>
-	  		<%= number_to_currency(@cash_registers_move.received, precision: 2) %>
-	  		<%= hidden_field_tag :received, @cash_registers_move.received %>
-	  	</td>
-  	<% end %>
+	<% if (@cash_registers_move.sale.present? && (@cash_registers_move.sale.cash? || @cash_registers_move.sale.reserved?)) || @cash_registers_move.products_return.present? %>
+  	<td>
+  		<%= number_to_currency(@cash_registers_move.received, precision: 2) %>
+  		<%= hidden_field_tag :received, @cash_registers_move.received %>
+  	</td>
+	<% end %>
   <td>
   	<%= hidden_field_tag :amount, @cash_registers_move.quantity %>
   	<%= number_to_currency(@cash_registers_move.quantity, precision: 2) %>
@@ -13,10 +13,8 @@
   	<%= hidden_field_tag :payment_type, @cash_registers_move.payment_method.id %>
   	<%= @cash_registers_move.payment_method.method %>
   </td>
-  <td> <%= @cash_registers_move.cardnumber %> </td>
+  <td> <%= display_additional_info(@cash_registers_move) %> </td>
   <td style="width: 5%" class="text-center">
     <button type="button" class="btn btn-icon-only btn-danger" onclick="deleteCashMove($(this))"><i class="fa fa-trash-o"></i></button>
   </td>
 </tr>
-
-

app/views/cash_registers_moves/_form.html.erb

@@ -68,16 +68,35 @@
           <button id="addrowBtn" type="button" class="btn green pull-right" onclick="addRow()">Agregar pago</button>
         </div>
         <!--  datos de la tarjeta cuando aplica -->
-        <div class="col-md-12" id="card_info" style="display: none;">
+        <div class="col-md-6" id="card_info" style="display: none;margin-top: 25px">
           <div class="form-group">
-            <%= f.label :cardnumber, { class: "col-md-3 control-label" } do %> Tarjeta: <span class="required">*</span>
-            <% end %>
+            <%= f.label :cardnumber, { class: "col-md-4 control-label" } do %> Tarjeta: <span class="required">*</span><% end %>
             <div class="col-md-8">
-              <%= f.text_field :cardnumber, { class: "form-control input-small", maxlength: 4 } %>
-              <span class="help-block">Últimos 4 dígitos de la tarjeta. </span>
+              <%= f.text_field :cardnumber, { class: "form-control input-xsmall", maxlength: 4 } %>
+              <span class="help-block"><small>Últimos 4 dígitos de la tarjeta.</small></span>
             </div>
           </div>
         </div>
+        <!--  datos del cheque cuando aplica -->
+        <div class="col-md-12" id="check_info" style="display: none;padding-left: 10px">
+          <div class="form-group">
+            <%= f.label :bank_name, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Nombre del banco: <span class="required">*</span><% end %>
+            <%= f.text_field :bank_name, { class: "col-md-8 form-control", style: "width: 25%" } %>
+            <%= f.label :check_number, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Folio de cheque: <span class="required">*</span><% end %>
+            <%= f.text_field :check_number, { class: "col-md-8 form-control", style: "width: 25%" } %>
+          </div>
+          <div class="form-group">
+            <%= f.label :customer_account, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Número de cuenta: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_account, { class: "col-md-8 form-control input-medium", style: "width: 25%" } %>
+          </div>
+        </div>
+        <!--  datos de la transferencia cuando aplica -->
+        <div class="col-md-6" id="transfer_info" style="display: none;padding-left: 10px;margin-top: 25px">
+          <div class="form-group">
+            <%= f.label :customer_code, { class: "col-md-5 control-label" } do %> Referencia: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_code, class: "col-md-7 form-control input-small" %>
+          </div>
+        </div>
       </div>
       <div class="col-md-12">
         <table class="table table-striped table-hover table-bordered" id="payments_table">
@@ -148,11 +167,54 @@
   });
 
   $('#cash_registers_move_payment_method_id').on('change', function() {
-    if ($(this).val() != <%= @cash_id %>) {
-      $("#card_info").fadeIn();
-    } else {
-      $("#card_info").fadeOut();
-      $("#cash_registers_move_cardnumber").val("");
+    var method = parseInt($(this).val());
+    $('#display_change').html(accounting.formatMoney(0));
+
+    switch(method){
+      case 1:
+        // tarjeta de debito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 2:
+        // efectivo
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 3:
+        // transferencia bancaria
+        $('#transfer_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 5:
+        // cheque
+        $('#check_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        break;
+      case 4:
+        // tarjeta de credito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
     }
   });
 

app/views/cash_registers_moves/_form_liquidate_reserved_sale.html.erb

@@ -28,26 +28,26 @@
       <div class="col-md-12">
         <h4 class="form-section" style="margin-bottom: 15px;margin-top: 15px;">Pagos anteriores</h4>
         <div class="table-scrollable table-scrollable-borderless">
-            <table class="table table-hover table-light">
-                <thead>
-                    <tr class="uppercase">
-                      <th>#</th>
-                      <th>Metodo de pago</th>
-                      <th>Monto</th>
-                      <th>Info. Adicional</th>
-                    </tr>
-                </thead>
-                <tbody>
-                  <% @payments.each_with_index do |payment, key| %>
-                    <tr>
-                      <td> <%= key + 1 %> </td>
-                      <td> <%= payment.payment_method.method %> </td>
-                      <td> <%= number_to_currency(payment.quantity, precision: 2) %> </td>
-                      <td> <%= payment.cardnumber %> </td>
-                    </tr>
-                  <% end %>
-                </tbody>
-            </table>
+          <table class="table table-hover table-light">
+              <thead>
+                <tr class="uppercase">
+                  <th>#</th>
+                  <th>Metodo de pago</th>
+                  <th>Monto</th>
+                  <th>Info. Adicional</th>
+                </tr>
+              </thead>
+              <tbody>
+                <% @payments.each_with_index do |payment, key| %>
+                  <tr>
+                    <td> <%= key + 1 %> </td>
+                    <td> <%= payment.payment_method.method %> </td>
+                    <td> <%= number_to_currency(payment.quantity, precision: 2) %> </td>
+                    <td> <%= payment.cardnumber %> </td>
+                  </tr>
+                <% end %>
+              </tbody>
+          </table>
         </div>
       </div>
       <div class="col-md-12">
@@ -68,7 +68,7 @@
           <!-- recibido -->
           <div class="col-md-4">
             <div class="form-group">
-              <span class="help-block">monto recibido. </span>
+              <span class="help-block">Monto recibido </span>
               <div class="input-group col-md-11">
                 <span class="input-group-addon"> $ </span>
                 <%= f.number_field :received, {:class=>"form-control mask_decimal first_input"} %>
@@ -78,7 +78,7 @@
           <!-- cantidad -->
           <div class="col-md-4">
             <div class="form-group">
-              <span class="help-block">monto a ABONAR. </span>
+              <span class="help-block">Monto a ABONAR </span>
               <div class="input-group col-md-11">
                 <span class="input-group-addon"> $ </span>
                 <%= f.number_field :quantity, {:class=>"form-control mask_decimal"} %>
@@ -88,9 +88,9 @@
           <!-- metodo de pago -->
           <div class="col-md-2">
             <div class="form-group">
-              <span class="help-block">forma de pago. </span>
+              <span class="help-block">Forma de pago </span>
               <div class="input-group col-md-12">
-                <%= f.select :payment_method_id, PaymentMethod.vigentes.map { |c| [c.method, c.id] }, {:include_blank => "Seleccione", :selected => @cash_id}, {:class => "form-control" }   %>
+                <%= f.select :payment_method_id, PaymentMethod.vigentes.map { |c| [c.method, c.id] }, { include_blank: "Seleccione", selected: @cash_id }, {:class => "form-control" } %>
               </div>
             </div>
           </div>
@@ -100,16 +100,35 @@
           </div>
         </div>
         <!--  datos de la tarjeta cuando aplica -->
-        <div class="col-md-offset-6 col-md-6" id="card_info" style="display: none;">
+        <div class="col-md-6" id="card_info" style="display: none;margin-top: 25px">
           <div class="form-group">
-            <%= f.label :cardnumber, {:class=>"col-md-2 control-label "} do %> Tarjeta: <span class="required">*</span>
-            <% end %>
-            <div class="col-md-6">
-              <%= f.text_field :cardnumber, { class: "form-control input-small", maxlength: 4 } %>
-              <span class="help-block">Últimos 4 dígitos de la tarjeta. </span>
+            <%= f.label :cardnumber, { class: "col-md-4 control-label" } do %> Tarjeta: <span class="required">*</span><% end %>
+            <div class="col-md-8">
+              <%= f.text_field :cardnumber, { class: "form-control input-xsmall", maxlength: 4 } %>
+              <span class="help-block"><small>Últimos 4 dígitos de la tarjeta.</small></span>
             </div>
           </div>
         </div>
+        <!--  datos del cheque cuando aplica -->
+        <div class="col-md-12" id="check_info" style="display: none;padding-left: 10px">
+          <div class="form-group">
+            <%= f.label :bank_name, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Nombre del banco: <span class="required">*</span><% end %>
+            <%= f.text_field :bank_name, { class: "col-md-8 form-control", style: "width: 25%" } %>
+            <%= f.label :check_number, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Folio de cheque: <span class="required">*</span><% end %>
+            <%= f.text_field :check_number, { class: "col-md-8 form-control", style: "width: 25%" } %>
+          </div>
+          <div class="form-group">
+            <%= f.label :customer_account, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Número de cuenta: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_account, { class: "col-md-8 form-control input-medium", style: "width: 25%" } %>
+          </div>
+        </div>
+        <!--  datos de la transferencia cuando aplica -->
+        <div class="col-md-6" id="transfer_info" style="display: none;padding-left: 10px;margin-top: 25px">
+          <div class="form-group">
+            <%= f.label :customer_code, { class: "col-md-5 control-label" } do %> Referencia: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_code, class: "col-md-7 form-control input-small" %>
+          </div>
+        </div>
       </div>
       <div class="col-md-12">
         <table class="table table-striped table-hover table-bordered" id="payments_table">
@@ -154,14 +173,54 @@
   });
 
   $('#cash_registers_move_payment_method_id').on('change', function() {
-    if ($(this).val() != <%= @cash_id %>) {
-      $("#card_info").fadeIn();
-      $('#cash_registers_move_received').attr('disabled', true);
-      $('#cash_registers_move_received').val("");
-    } else {
-      $("#card_info").fadeOut();
-      $("#cash_registers_move_cardnumber").val("");
-      $('#cash_registers_move_received').attr('disabled', false);
+    var method = parseInt($(this).val());
+    $('#display_change').html(accounting.formatMoney(0));
+
+    switch(method){
+      case 1:
+        // tarjeta de debito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 2:
+        // efectivo
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 3:
+        // transferencia bancaria
+        $('#transfer_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 5:
+        // cheque
+        $('#check_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        break;
+      case 4:
+        // tarjeta de credito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
     }
   });
 
@@ -176,13 +235,7 @@
     received = parseFloat($('#cash_registers_move_received').val());
     payment_method = $('#cash_registers_move_payment_method_id option:selected').val();
 
-    if (((quantity <= debt && quantity > 0) && (received >= quantity && payment_method == "2")) || (payment_method == "1" && quantity > 0) ) {
-      $('#cash_register_move_form').submit();
-    } else if (quantity > debt || quantity == 0) {
-      toastr["error"]("El monto a abonar no puede ser mayor al adeudo, ni puede ir en ceros");
-    } else if ((received <= 0 || quantity > received) && payment_method == "2") {
-      toastr["error"]("La cantidad recibida no puede ir en ceros, ni se puede abonar más de lo recibido");
-    }
+    $('#cash_register_move_form').submit();
   }
 
   function deleteCashMove(input) {
@@ -218,35 +271,37 @@
       totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
     });
 
-    // $('#display_debt').html(formatter.format(debt - totalInTable));
-    $('#display_debt').html(accounting.formatMoney(debt - totalInTable));
+    if (debt > totalInTable) {
+      $('#display_debt').html(accounting.formatMoney(debt - totalInTable));
+    } else {
+      $('#display_debt').html(accounting.formatMoney(0));
+    }
 
-    if ($("#save_move").prop('disabled')) {
-      $("#save_move").attr('disabled', false);
-    } else if (!$("#save_move").prop('disabled') && $('#payments_table tbody tr').length == 0) {
-      $("#save_move").attr('disabled', true);
+    if (totalInTable > 0) {
+      $('#save_move').attr('disabled', false);
+    } else {
+      $('#save_move').attr('disabled', true);
     }
   }
 
   function calculateChange() {
-    var total = parseFloat($('#reserve_sale_percent').val());
-    var received_cash = parseFloat($('#cash_registers_move_received').val());
+    var total = parseFloat($('#reserve_debt').val());
     totalInTable = 0;
-
+    var cash = 0;
+    var card = 0;
     $('#payments_table tbody tr').each(function() {
+      totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
       if ($(this).find("td:nth-child(3) input").val() == <%= @cash_id %>) {
-        totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
+        cash += parseFloat($(this).find("td:nth-child(1) input").val());
+      } else {
+        card += parseFloat($(this).find("td:nth-child(2) input").val());
       }
     });
-
-    var change = received_cash - totalInTable;
-    if (change > 0 && totalInTable > 0) {
-      // $('#display_change').html(formatter.format(change));
-      $('#display_change').html(accounting.formatMoney(change));
-
-    } else {
-      // $('#display_change').html(formatter.format(0));
+    rest = totalInTable - card;
+    if(cash + card == total || cash - rest <= 0 ){
       $('#display_change').html(accounting.formatMoney(0));
+    } else {
+      $('#display_change').html(accounting.formatMoney(cash - rest));
     }
   }
 </script>

app/views/cash_registers_moves/_form_products_return.html.erb

@@ -58,7 +58,7 @@
           <div class="form-group">
             <div class="input-group col-md-12">
               <span class="help-block">seleccione forma de pago. </span>
-              <%= f.select :payment_method_id, PaymentMethod.vigentes.map {|c| [c.method, c.id] }, {:include_blank => "Seleccione", :selected => @cash_id}, {:class => "form-control" }   %>
+              <%= f.select :payment_method_id, PaymentMethod.vigentes.map { |c| [c.method, c.id] }, {:include_blank => "Seleccione", :selected => @cash_id}, {:class => "form-control" } %>
             </div>
           </div>
         </div>
@@ -67,30 +67,49 @@
           <button id="addrowBtn" type="button" class="btn green pull-right" onclick="addRow()">Agregar pago</button>
         </div>
         <!--  datos de la tarjeta cuando aplica -->
-        <div class="col-md-12" id="card_info" style="display: none;">
+        <div class="col-md-6" id="card_info" style="display: none;margin-top: 25px">
           <div class="form-group">
-            <%= f.label :cardnumber,  {:class=>"col-md-3 control-label "} do %> Tarjeta: <span class="required">*</span>
-            <% end %>
+            <%= f.label :cardnumber, { class: "col-md-4 control-label" } do %> Tarjeta: <span class="required">*</span><% end %>
             <div class="col-md-8">
-                <%= f.text_field :cardnumber, {:class => "form-control"}  %>
-                <span class="help-block">Ultimos 4 digitos de la tarjeta. </span>
+              <%= f.text_field :cardnumber, { class: "form-control input-xsmall", maxlength: 4 } %>
+              <span class="help-block"><small>Últimos 4 dígitos de la tarjeta.</small></span>
             </div>
           </div>
         </div>
+        <!--  datos del cheque cuando aplica -->
+        <div class="col-md-12" id="check_info" style="display: none;padding-left: 10px">
+          <div class="form-group">
+            <%= f.label :bank_name, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Nombre del banco: <span class="required">*</span><% end %>
+            <%= f.text_field :bank_name, { class: "col-md-8 form-control", style: "width: 25%" } %>
+            <%= f.label :check_number, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Folio de cheque: <span class="required">*</span><% end %>
+            <%= f.text_field :check_number, { class: "col-md-8 form-control", style: "width: 25%" } %>
+          </div>
+          <div class="form-group">
+            <%= f.label :customer_account, { class: "col-md-2 control-label", style: "padding-right: 5px" } do %> Número de cuenta: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_account, { class: "col-md-8 form-control input-medium", style: "width: 25%" } %>
+          </div>
+        </div>
+        <!--  datos de la transferencia cuando aplica -->
+        <div class="col-md-6" id="transfer_info" style="display: none;padding-left: 10px;margin-top: 25px">
+          <div class="form-group">
+            <%= f.label :customer_code, { class: "col-md-5 control-label" } do %> Referencia: <span class="required">*</span><% end %>
+            <%= f.text_field :customer_code, class: "col-md-7 form-control input-small" %>
+          </div>
+        </div>
       </div>
       <div class="col-md-12">
         <table class="table table-striped table-hover table-bordered" id="payments_table">
-            <thead>
-                <tr>
-                    <th> Recibido </th>
-                    <th> Cobro </th>
-                    <th> Forma de pago </th>
-                    <th> Info. adicional </th>
-                    <th> Acciones </th>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
+          <thead>
+            <tr>
+              <th> Recibido </th>
+              <th> Cobro </th>
+              <th> Forma de pago </th>
+              <th> Info. adicional </th>
+              <th> Acciones </th>
+            </tr>
+          </thead>
+          <tbody>
+          </tbody>
         </table>
       </div>
       <!-- div para mostrar total -->
@@ -108,6 +127,7 @@
         <button type="button" class="btn green btn-block" id="save_move" disabled onclick="confirmPayments()">Cobrar</button>
       </div>
     </div>
+  </div>
 <% end %>
 <script type="text/javascript">
   // var received_cash = 0;
@@ -138,11 +158,54 @@
   });
 
   $('#cash_registers_move_payment_method_id').on('change', function() {
-    if ($(this).val() != <%= @cash_id %>) {
-      $("#card_info").fadeIn();
-    } else {
-      $("#card_info").fadeOut();
-      $("#cash_registers_move_cardnumber").val("");
+    var method = parseInt($(this).val());
+    $('#display_change').html(accounting.formatMoney(0));
+
+    switch(method){
+      case 1:
+        // tarjeta de debito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 2:
+        // efectivo
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 3:
+        // transferencia bancaria
+        $('#transfer_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#check_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
+      case 5:
+        // cheque
+        $('#check_info').fadeIn();
+        $('#card_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_cardnumber").val("");
+        break;
+      case 4:
+        // tarjeta de credito
+        $('#card_info').fadeIn();
+        $('#check_info').fadeOut();
+        $('#transfer_info').fadeOut();
+        $("#cash_registers_move_bank_name").val("");
+        $("#cash_registers_move_check_number").val("");
+        $("#cash_registers_move_customer_account").val("");
+        break;
     }
   });
 
@@ -217,21 +280,22 @@
 
   function calculateChange() {
     var total = parseFloat($('#products_return_total').val());
-    var received_cash  = parseFloat($('#cash_registers_move_received').val());
+    var received_cash = parseFloat($('#cash_registers_move_received').val());
     totalInTable = 0;
 
     $('#payments_table tbody tr').each(function() {
+      totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
       if ($(this).find("td:nth-child(3) input").val() == <%= @cash_id %>) {
-        totalInTable += parseFloat($(this).find("td:nth-child(2) input").val());
+        cash += parseFloat($(this).find("td:nth-child(1) input").val());
+      } else {
+        card += parseFloat($(this).find("td:nth-child(2) input").val());
       }
     });
-
-    var change = received_cash - totalInTable;
-    if (change > 0 && totalInTable > 0) {
-      $('#display_change').html(accounting.formatMoney(change));
-    } else {
+    rest = totalInTable - card;
+    if(cash + card == total || cash - rest <= 0 ){
       $('#display_change').html(accounting.formatMoney(0));
-
+    } else {
+      $('#display_change').html(accounting.formatMoney(cash - rest));
     }
   }
 </script>

app/views/cash_registers_moves/create.js.erb

@@ -1,27 +1,27 @@
-$("#error_explanation_move").html("")
+$("#error_explanation_move").html("");
 <% if @cash_registers_move.errors.any? %>
-	$('#error_explanation_move').removeClass('hidden');
+  $('#error_explanation_move').removeClass('hidden');
     <% @cash_registers_move.errors.values.each do |message| %>
         $("#error_explanation_move").append($("<li />").html("<%= message.first.to_s %>"));
     <% end %>
 <% else %>
-	if($("#error_explanation_move").is(':visible')) {
-		$("#error_explanation_move").addClass('hidden');
-	}
+  if($("#error_explanation_move").is(':visible')) {
+    $("#error_explanation_move").addClass('hidden');
+  }
 
-	<% if @sale.present? && @sale.saletype == 'credit' %>
-		window.location = "<%= debtors_path %>";
-		var ticket_window = window.open("<%= print_credit_payment_receipt_path(:sale_id => @sale.id, :debts => @debt, format: 'pdf') %>", 'New tab', '' );
-	<% else %>
-		var newRow = $('<%= j render (@cash_registers_move) %>');
-		$('#payments_table tbody').append(newRow);
-		$('#cash_registers_move_quantity').val('');
-		$('#cash_registers_move_payment_method_id').val('');
-		$('#cash_registers_move_received').attr('disabled', false);
-		if($("#card_info").is(":visible")) {
-			$('#cash_registers_move_cardnumber').val('');
-			$("#card_info").fadeOut();
-		}
-		unlockConfirmPayment();
-	<% end %>
+  <% if @sale.present? && @sale.saletype == 'credit' %>
+    window.location = "<%= debtors_path %>";
+    var ticket_window = window.open("<%= print_credit_payment_receipt_path(:sale_id => @sale.id, :debts => @debt, format: 'pdf') %>", 'New tab', '' );
+  <% else %>
+    var newRow = $('<%= j render (@cash_registers_move) %>');
+    $('#payments_table tbody').append(newRow);
+    $('#cash_registers_move_quantity').val('');
+    $('#cash_registers_move_payment_method_id').val('');
+    $('#cash_registers_move_received').attr('disabled', false);
+    if($("#card_info").is(":visible")) {
+      $('#cash_registers_move_cardnumber').val('');
+      $("#card_info").fadeOut();
+    }
+    unlockConfirmPayment();
+  <% end %>
 <% end %>

app/views/customers/customer_sales.html.erb

@@ -16,7 +16,7 @@
 		<!-- BEGIN PAGE CONTENT BODY -->
 		<div class="page-content">
 			<div class="container-fluid">
-				<%= link_to  debtors_path(:filter => @filter, :current_page => @current_page), {:class=>"btn blue-hoki pull-right margin-bottom-10"} do %>  <i class="fa fa-angle-left "></i> Regresar
+				<%= link_to debtors_path(filter: @filter, current_page: @current_page), { 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">
@@ -42,7 +42,7 @@
 								<div class="portlet-title">
 									<div class="caption">
 										<i class="fa fa-list "></i>
-										<span class="caption-subject bold uppercase">Ventas al cliente <%= @custom.nick_name %></span>
+										<span class="caption-subject bold uppercase">Ventas al cliente <%= @customer.nick_name %></span>
 										<span class="caption-helper"></span>
 									</div>
 								</div>
@@ -115,7 +115,7 @@
 													</thead>
 													<tbody id="customer_sales">
 														<% @sales.each_with_index do |sale, key| %>
-															<tr class=<%= (sale.cancelled? ? 'danger' : (sale.paid? ? 'success' : '')) %>>
+															<tr class=<%= sale.cancelled? ? 'danger' : '' %>>
 																<td><%= sale.id %></td>
 																<td><%= sale.sale_code %> </td>
 																<% if current_user.usertype == "A" || current_user.usertype == "SS" %>
@@ -135,20 +135,15 @@
 																<td><%= sale.products.count %></td>
 																<td><%= sale_status(sale) %></td>
 																<td><%= number_to_currency(sale.total, precision: 2) %></td>
-																<% credito = Credit.where(:sale_id => sale.id).first %>
-																<% if credito.present? %>
-																	<% abonos = CreditPayment.where(:credit_id => credito.id, :status => 0).sum(:quantity) %>
-																	<% if abonos.present? %>
-																		<td><%= number_to_currency(abonos, precision: 2) %></td>
-																	<% end %>
-																	<td><%= number_to_currency(credito.rest, precision: 2) %></td>
+																<% if sale.credit.present? %>
+																	<td><%= number_to_currency(sale.credit.credit_payments.activos.sum(:quantity), precision: 2) %></td>
+																	<td><%= number_to_currency(sale.credit.rest, precision: 2) %></td>
 																<% else %>
 																	<td></td>
 																	<td></td>
 																<% end %>
-
 																<td class="text-center">
-																	<%= link_to sale, {:class=>"btn btn-icon-only default", :title=>"Ver venta"} do %>
+																	<%= link_to sale, { class: "btn btn-icon-only default", title: "Ver venta" } do %>
 																		<i class="fa fa-search"></i>
 																	<% end %>
 																	<% if can? :destroy, Sale %>
@@ -182,17 +177,15 @@
 														</tr>
 													</thead>
 													<tbody id="abonos">
-														<% @credit.each_with_index do |credit, key| %>
-															<% abonos = CreditPayment.where(:credit_id => credit.id).order('id') %>
-																<% total = credit.total %>
+														<% @credits.each_with_index do |credit, key| %>
+															<% abonos = credit.credit_payments.activos.order(:id) %>
 																<% abonos.each_with_index do |abono, key| %>
-																	<% rest = total - abono.quantity %>
-																	<tr class=<%= (credit.cancelled? ? 'danger' : (credit.active? ? 'success' : '')) %>>
+																	<tr class=<%= credit.cancelled? ? 'danger' : '' %>>
 																		<td><%= credit.sale.sale_code %> </td>
 																		<td><%= l(abono.date_payment, :format => '%d/%m/%Y')  %></td>
-																		<td><%= number_to_currency(total, precision: 2) %></td>
+																		<td><%= number_to_currency(credit.total, precision: 2) %></td>
 																		<td><%= number_to_currency(abono.quantity, precision: 2) %></td>
-																		<td><%= number_to_currency(rest, precision: 2) %></td>
+																		<td><%= number_to_currency(credit.rest, precision: 2) %></td>
 																		<td>
 																			<% case abono.status %>
 																			<% when "cancelled"%>
@@ -202,12 +195,12 @@
 																			<% end %>
 																		</td>
 																		<td class="text-center">
-																		<% if !abono.cancelled? && abono.cash_registers_move.present? && abono.cash_registers_move.open_cash_register.open?%>
+																		<% if !abono.cancelled? && abono.cash_registers_move.present? && abono.cash_registers_move.open_cash_register.open? %>
 																			<%= link_to cash_move_delete_payment_path(:credit_payment_id => abono.id, :credit => credit.id) , method: :delete_credit_payment, :class => "btn btn-icon-only btn-danger", :title=>"Cancelar abono", data: { confirm: '¿Está seguro que desea cancelar el abono?' } do %> <i class="fa fa-ban"></i>
 																			<% end %>
 																		<% end %>
 																		</td>
-																		<% total -= abono.quantity %>
+																		<% credit.total -= abono.quantity %>
 																	</tr>
 																<% end %>
 														<% end %>
@@ -256,7 +249,7 @@
 	function salesByDate() {
 		var start = moment($("#begin_date").data("date"), "DD-MM-YYYY").format('YYYY-MM-DD HH:mm:ss');
 		var end = moment($("#end_date").data("date"), "DD-MM-YYYY").format('YYYY-MM-DD HH:mm:ss');
-		var cliente = '<%= @custom.id %>'
+		var cliente = '<%= @customer.id %>'
 		App.blockUI({
 			target: $("#sales_table"),
 			animate: true

app/views/customers/debtors.html.erb

@@ -61,7 +61,7 @@
 												</thead>
 												<tbody>
 													<% @customers.each_with_index do |customer, key| %>
-													<% customer.verify_credit %>
+													<% # customer.verify_credit %>
 													<% payment = CreditPayment.where(:customer_id => customer.id, :status => 0).order("date_payment DESC").first %>
 													<% credito = Credit.activos.where(:customer_id => customer.id).sum(:rest) %>
 													<% sales = Sale.where("customer_id = #{customer.id} and status != 1 and status != 2 and saletype = 0").order("date_sale DESC") %>

app/views/sales/receipt_credit_payment.pdf.erb

@@ -35,11 +35,11 @@
 				<tr>
 					<td width="30%">Saldo anterior</td>
 					<td width="15%" class="text-right">$</td>
-					<% if debt == 0 %>
+					<!-- < % if debt == 0 %> -->
 						<td width="40%"><%= number_to_currency(deuda, precision: 2, :unit => "") %></td>
-					<% else %>
-						<td width="40%"><%= number_to_currency(debt + new_payment, precision: 2, :unit => "") %></td>
-					<% end %>
+					<!-- < % else %>
+						<td width="40%">< %= number_to_currency(debt + new_payment, precision: 2, :unit => "") %></td>
+					< % end %> -->
 				</tr>
 				<tr>
 					<td width="30%">Abono a crédito</td>
@@ -49,7 +49,7 @@
 				<tr>
 					<td width="30%">Saldo actual</td>
 					<td width="15%" class="text-right">$</td>
-					<td width="40%"><%= number_to_currency(debt, precision: 2, :unit => "") %></td>
+					<td width="40%"><%= number_to_currency((deuda > new_payment ? (deuda - new_payment) : 0), precision: 2, :unit => "") %></td>
 				</tr>
 			</tbody>
 		</table>
@@ -68,7 +68,7 @@
 				<tr class="text-center" style="text-decoration:underline;">
 					<td><%= move.payment_method.method %> </td>
 					<td></td>
-					<td></td>
+					<td><small><%= move.payment_method.id == 1 || move.payment_method.id == 4 ? "n° #{move.cardnumber}" : "" %></small></td>
 				</tr>
 				<% if move.payment_method.isCash? %>
 					<% marginFooter += 80 %>
@@ -96,8 +96,8 @@
 					</tr>
 					<tr class="text-left">
 						<td> </td>
-						<td> tarjeta nº: </td>
-						<td> <%= move.cardnumber %></td>
+						<td> </td>
+						<td> </td>
 					</tr>
 				<% end %>
 			</tbody>

db/migrate/20181220182317_add_extra_info_columns_to_cash_registers_moves.rb

@@ -0,0 +1,8 @@
+class AddExtraInfoColumnsToCashRegistersMoves < ActiveRecord::Migration
+  def change
+    add_column :cash_registers_moves, :bank_name, :string, default: ""
+    add_column :cash_registers_moves, :check_number, :string, default: ""
+    add_column :cash_registers_moves, :customer_account, :string, default: ""
+    add_column :cash_registers_moves, :customer_code, :string, default: ""
+  end
+end

db/migrate/20181221220426_add_cash_register_move_id_to_credit_payment.rb

@@ -0,0 +1,5 @@
+class AddCashRegisterMoveIdToCreditPayment < ActiveRecord::Migration
+  def change
+    add_column :credit_payments, :cash_registers_move_id, :integer, index: true, null: true unless column_exists? :credit_payments, :cash_registers_move_id
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181217175547) do
+ActiveRecord::Schema.define(version: 20181221220426) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -138,6 +138,10 @@ ActiveRecord::Schema.define(version: 20181217175547) do
     t.decimal  "change",                          precision: 10, scale: 2
     t.integer  "products_return_id"
     t.integer  "credit_payment_id"
+    t.string   "bank_name",                                                default: ""
+    t.string   "check_number",                                             default: ""
+    t.string   "customer_account",                                         default: ""
+    t.string   "customer_code",                                            default: ""
   end
 
   add_index "cash_registers_moves", ["open_cash_register_id"], name: "index_cash_registers_moves_on_open_cash_register_id", using: :btree
@@ -187,12 +191,13 @@ ActiveRecord::Schema.define(version: 20181217175547) do
     t.integer  "customer_id"
     t.integer  "credit_id"
     t.integer  "pointsale_id"
-    t.decimal  "quantity",     precision: 10, scale: 2, default: 0.0, null: false
-    t.integer  "status",                                default: 0,   null: false
-    t.date     "date_payment",                                        null: false
-    t.datetime "created_at",                                          null: false
-    t.datetime "updated_at",                                          null: false
+    t.decimal  "quantity",               precision: 10, scale: 2, default: 0.0, null: false
+    t.integer  "status",                                          default: 0,   null: false
+    t.date     "date_payment",                                                  null: false
+    t.datetime "created_at",                                                    null: false
+    t.datetime "updated_at",                                                    null: false
     t.integer  "user_id"
+    t.integer  "cash_registers_move_id"
   end
 
   add_index "credit_payments", ["credit_id"], name: "index_credit_payments_on_credit_id", using: :btree