conflict

2018-04-11 18:01:46 +06:30
parent b11480a90c 6889c879ec
commit 2ac629f6e0
73 changed files with 1631 additions and 344 deletions
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -88,7 +88,7 @@ class Origami::MovetableController < BaseOrigamiController
    @type          = (DiningFacility.find(change_to)).type
    @moved_by      = @current_user.name
    @date          = DateTime.now
-    @shop          = Shop::ShopDetail
+    @shop          = Shop.first
    unique_code    = "MoveTablePdf" 
    pdf_no        = PrintSetting.where(:unique_code => unique_code).count
    #print_settings = PrintSetting.find_by_unique_code(unique_code)