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

2018-03-30 15:29:26 +06:30
parent 3ced0f2590 996392a041
commit df93563e6f
35 changed files with 1024 additions and 99 deletions
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -26,7 +26,7 @@
              </div>
            <% end %>
            <button id="member_acc_no" class="btn btn-success btn-sm"><span class="fa fa-credit-card"></span> Member Card</button> -->
-              <% path ="/origami/#{@sale_id}/customers" %>
+              <% path ="/origami/#{@sale_id}/#{@cashier_type}/customers/#{@page}" %>
              <%= form_tag path, :id => "filter_form", :method => :get do %>
              <div class="row clearfix">
                <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">