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/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -25,7 +25,6 @@ namespace :clear do
    OrderReservation.delete_all
    OrderReservationItem.delete_all
    Delivery.delete_all
-    puts "Clear Data Done."
  end

  desc "Clear-- Menu"
@@ -47,7 +46,6 @@ namespace :clear do
    Menu.destroy_all

    Account.destroy_all
-    puts "Clear all Menu Done."
  end

  desc "Clear-- Inventory"
@@ -60,7 +58,5 @@ namespace :clear do
    StockCheck.destroy_all
    
    StockCheckItem.destroy_all
-    
-    puts "Clear all Menu Done."
  end
 end