Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -20,6 +20,9 @@ namespace :clear do
    SeedGenerator.where("id > 1").update(:current => 0, :next => 0)
    Receipt.delete_all
    ReceiptDetail.delete_all
+    OrderReservation.delete_all
+    OrderReservationItem.delete_all
+    Delivery.delete_all
    puts "Clear Data Done."
  end