fixed conflict

2017-06-29 13:52:55 +06:30
parent 50091e4016 8d09e5a919
commit cf851327b3
33 changed files with 721 additions and 148 deletions
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -11,7 +11,9 @@ namespace :clear do
    Sale.delete_all
    SaleAudit.delete_all
    SalePayment.delete_all
-    DiningFacility.update_all(status:'available') 
+    ShiftSale.delete_all
+    PaymentJournal.delete_all
+    DiningFacility.update_all(status:'available')
    puts "Clear Data Done."
  end
 end