git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aung Myo
2017-11-21 09:23:15 +06:30
parent 71a03a56d4 a423807554
commit 3eddb05ff8
9 changed files with 74 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/views/crm/customers/index.html.erb
View File

@@ -11,7 +11,7 @@
</div>
<div class="row clearfix">
<div class="col-lg-8 col-md-8 col-sm-8">
<div class="col-lg-9 col-md-9 col-sm-9">
<!-- <div class="main-box-body clearfix"> -->
<div class="body table-responsive">
<table class="table table-hover table-striped">
@@ -19,21 +19,14 @@
<table class="table table-striped"> -->
<thead>
<tr>
<td colspan="7">
<%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
<!-- <div class=" col-md-7 form-group float-left">
<input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control input-xs col-md-9">
<input type="hidden" name="type" id="type" value="">
<button type="submit" class="float-right btn btn-primary btn-md">Search</button>
</div> -->
<% end %>
<td colspan="7">
<!-- <button id="member_acc_no" class="btn btn-success btn-md"><span class="fa fa-credit-card"></span> Member Card</button>
<button id="qr_code" class="btn btn-danger btn-md">
<span class="fa fa-credit-card"></span> QR CODE
</button> -->
<div class="body">
<%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
<div class="row clearfix">
<div class="body">
<%= form_tag crm_customers_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">
<input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control">
<input type="hidden" name="type" id="type" value="">
@@ -45,9 +38,8 @@
<button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
</div>
<% end %>
</div>
</td>
</td>
</tr>
<tr>
<th></th>
@@ -91,7 +83,7 @@
</div>
<!-- </div> -->
</div>
<div class="col-lg-4 col-md-4 col-sm-4">
<div class="col-lg-3 col-md-3 col-sm-3">
<div id="custom-slimscroll">
<%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
</div>

23
app/views/crm/dining_queues/index.html.erb
View File

@@ -28,15 +28,26 @@
@bg_color = "normal"
end
%>
<div class="card select-queue <%= @bg_color %>" data-id="<%= queue.id %>" style="">
<div class="card select-queue <%= @bg_color %>" data-id="<%= queue.id %>">
<div class="card-block">
<p class="hidden queue-id"><%= queue.id %></p>
<p class="hidden queue-status"><%= queue.status %></p>
<span class="card-title"><strong> Queue No : <%= queue.queue_no %></strong></span>
<span class="card-title float-right"><strong> Seater : <%= queue.seater %></strong></span><br>
<span class="card-title"> Name : <%= queue.name %></span><br>
<span class="card-title"> Contact No : <%= queue.contact_no %></span><br>
<span class="card-title"> Remark : <%= queue.remark %></span>
<div class="row card-title">
<div class="col-md-auto col-sm-12 sx-margin-0">
<p class="padding-0 margin-0">
<strong> Queue No : <%= queue.queue_no %></strong>
</p>
</div>
<div class="col-md-auto col-sm-12 sx-margin-0">
<p class="padding-0 margin-0">
<strong> Seater : <%= queue.seater %></strong>
</p>
</div>
</div>
<p class="card-title"> Name : <%= queue.name %></p>
<p class="card-title"> Contact No : <%= queue.contact_no %></p>
<p class="card-title"> Remark : <%= queue.remark %></p>
</div>
</div>
<% end %>

7
app/views/origami/addorders/detail.html.erb
View File

@@ -1,8 +1,9 @@
<%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %>
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>
<div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div>
</div>
<div class="row m-t--20">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >