Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2017-06-30 16:00:37 +06:30
parent b0bec2afc4 18094f5a71
commit 78be369a25
4 changed files with 23 additions and 15 deletions
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -10,6 +10,7 @@ class Origami::ShiftsController < BaseOrigamiController

  def new
    @float = Lookup.where('lookup_type=?','float_value')
+    @terminal = CashierTerminal.all
  end

  def create
@@ -29,7 +30,7 @@ class Origami::ShiftsController < BaseOrigamiController
    end
  end

-  
+
  def edit
  end
 end
--- a/app/views/origami/shifts/new.html.erb
+++ b/app/views/origami/shifts/new.html.erb
@@ -1,5 +1,9 @@
 <h1>Open Cashier</h1>
 <br>
+<div class="row">
+  <div class="col-md-12">
+  </div>
+</div>
 <div class="row">
  <div class="col-md-4">
      <table class='table table-striped'>