浏览代码

Merge branch 'chemi_branch' of SML/pos-boutique into master

Jose Miguel Ledon 7 年之前
父节点
当前提交
600fd3e7c0
共有 2 个文件被更改,包括 1 次插入3 次删除
  1. 1 2
      app/models/cash_registers_move.rb
  2. 0 1
      app/views/cash_registers_moves/_form.html.erb

+ 1 - 2
app/models/cash_registers_move.rb

@@ -92,8 +92,7 @@ class CashRegistersMove < ActiveRecord::Base
         self.change = received.to_f > quantity ? received.to_f - quantity : 0
       end
     else
-      # self.quantity = received.to_f
-      self.received = ""
+      self.quantity = received.to_f
       self.change = 0
     end
   end

+ 0 - 1
app/views/cash_registers_moves/_form.html.erb

@@ -169,7 +169,6 @@
   $('#cash_registers_move_payment_method_id').on('change', function() {
     var method = $(this).find("option:selected").text();
     $('#display_change').html(accounting.formatMoney(0));
-    console.log('aqui ando');
     switch(method){
       case 'Tarjeta de debito':
         // tarjeta de debito