fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -36,7 +36,6 @@ class Origami::CashInsController < BaseOrigamiController
          shift =current_shift
        end
    end
-    puts shift.to_json
    shift.cash_in = shift.cash_in + amount.to_f
    shift.save
  end