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

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

Browse Source
This commit is contained in:
Yan
2017-10-23 16:17:29 +06:30
parent 1aa3358013 2e41037d5f
commit 47efe20e8e
10 changed files with 134 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/assets/javascripts/OQS.js
View File

@@ -70,16 +70,16 @@ $(document).ready(function(){
row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">' row ='<div class="card queue_station animated " data-date="'+data[field]["order_id"]+'">'
+'<div class="card-block">' +'<div class="card-block">'
+'<h4 class="card-title">' +'<h6 class="card-">'
+'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>' +'<span class="order-zone-type">'+data[field]["table_type"]+'- </span>'
+'<span class="order-zone">'+ data[field]["zone"] +'</span>' +'<span class="order-zone">'+ data[field]["zone"] +'</span>'
+'<small class="pull-right">'+ data[field]["order_id"] +'- </small>' +'<small class="float-right">'+ data[field]["order_id"] +'</small>'
+'</h4>' +'</h6>'
+'<h4>' +'<h6>'
+'<span class="order-item">'+ data[field]["item_name"] +'- </span>' +'<span class="order-item">'+ data[field]["item_name"] +'- </span>'
+'<span class="order-qty">'+ data[field]["qty"] +'- </span>' +'<span class="order-qty">'+ data[field]["qty"] +' </span>'
+'</h4>' +'</h6>'
+'<p class="card-text item-options">'+ options +'</p>' +'<p class="card-text item-options">'+ options +'</p>'
@@ -110,7 +110,6 @@ $(document).ready(function(){
} }
}); });
//end Ajax //end Ajax
} }
$(document).on('click', '.queue_station', function(event){ $(document).on('click', '.queue_station', function(event){
@@ -198,7 +197,20 @@ $(document).ready(function(){
// update queue item count in completed station // update queue item count in completed station
$("#completed_count").text(parseInt($("#completed_count").text()) + data.length); $("#completed_count").text(parseInt($("#completed_count").text()) + data.length);
alert("updated!"); swal({
title: "Infomation !",
text: 'Order has been successfully created',
confirmButtonColor: "green",
confirmButtonText: "Yes!",
closeOnConfirm: false,
}, function () {
if(table_type == "Table"){
window.location.href = "/origami/table/" + table_id
}
else {
window.location.href = "/origami/room/" + table_id
}
});
// Page reload // Page reload
location.reload(); location.reload();
} }

18
app/assets/javascripts/addorder.js
View File

@@ -664,23 +664,19 @@ $(function(){
dataType: "json", dataType: "json",
success:function(result){ success:function(result){
$("#loading_wrapper").hide(); $("#loading_wrapper").hide();
$.confirm({ swal({
title: 'Infomation!', title: "Infomation !",
content: "Order has been successfully created", text: 'Order has been successfully created',
buttons: { confirmButtonColor: "green",
confirm: { confirmButtonText: "Yes!",
text: 'Ok', closeOnConfirm: false,
btnClass: 'btn-green', }, function () {
action: function(){
if(table_type == "Table"){ if(table_type == "Table"){
window.location.href = "/origami/table/" + table_id window.location.href = "/origami/table/" + table_id
} }
else { else {
window.location.href = "/origami/room/" + table_id window.location.href = "/origami/room/" + table_id
} }
}
}
}
}); });
} }
}); });

3
app/assets/javascripts/custom.js
View File

@@ -26,6 +26,9 @@ $(function(){
var method = $(this).attr('data-method'); var method = $(this).attr('data-method');
var url = $(this).attr('data-ref'); var url = $(this).attr('data-ref');
var html_text = $( this ).siblings( "#delete_text" ).html(); var html_text = $( this ).siblings( "#delete_text" ).html();
console.log(method);
console.log(url);
console.log(html_text);
swal({ swal({
title: "Confirmation", title: "Confirmation",
text: html_text, text: html_text,

11
app/assets/stylesheets/addorder.scss
View File

@@ -1,9 +1,3 @@
@import "bootstrap";
@import "font-awesome";
@import "theme";
@import "jquery-ui";
@import "bootstrap-datepicker3";
.custom-card-head{ .custom-card-head{
height: 40px; height: 40px;
background-color: #54A5AF; background-color: #54A5AF;
@@ -11,7 +5,6 @@
color :#fff; color :#fff;
} }
.custom-card { .custom-card {
border: 2px solid rgba(0, 0, 0, 0.125) !important; border: 2px solid rgba(0, 0, 0, 0.125) !important;
} }
@@ -126,6 +119,10 @@ element.style {
margin-bottom:10px; margin-bottom:10px;
} }
section.content{
padding-top:-50px !important;
}
/*Loading gif for payment*/ /*Loading gif for payment*/
#loading_wrapper{ #loading_wrapper{

4
app/assets/stylesheets/reset.css
View File

@@ -187,7 +187,9 @@ section.content {
.hidden{ .hidden{
display: none !important; display: none !important;
} }
.hide{
display: none !important;
}
.sidebar .menu .list a { .sidebar .menu .list a {
padding: 5px 13px; padding: 5px 13px;
} }

1
app/controllers/origami/addorders_controller.rb
View File

@@ -34,7 +34,6 @@ class Origami::AddordersController < BaseOrigamiController
def get_menu_category () def get_menu_category ()
if (params[:id]) if (params[:id])
puts "sssssssssssss"
puts params[:id] puts params[:id]
#Pull this menu #Pull this menu
@menu = MenuCategory.find_by_id(params[:id]) @menu = MenuCategory.find_by_id(params[:id])

18
app/views/oqs/home/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -13,7 +13,7 @@
<!-- Column One --> <!-- Column One -->
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-8 col-md-8 col-sm-8"> <div class="col-lg-8 col-md-8 col-sm-8">
<div class="body"> <div class="body p-l-10">
<%= form_tag oqs_root_path, :method => :get do %> <%= form_tag oqs_root_path, :method => :get do %>
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12"> <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
@@ -76,26 +76,26 @@
<div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:"> <div class="tab-content" id="custom-slimscroll" style="max-height:; overflow:">
<!--- Panel 0 - Completed --> <!--- Panel 0 - Completed -->
<div class="tab-pane fade in active" id="completed" role="tabpanel"> <div class="tab-pane in active" id="completed" role="tabpanel">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;"> <div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% <%
@queue_completed_item.each do |qid| @queue_completed_item.each do |qid|
%> %>
<div class="card queue_station"> <div class="card queue_station">
<div class="card-block"> <div class="card-block">
<h4 class="card-title"> <h5 class="card-">
<span class="order-zone-type"><%= qid.type %> - </span> <span class="order-zone-type"><%= qid.type %> - </span>
<span class="order-zone"><%= qid.zone %></span> <span class="order-zone"><%= qid.zone %></span>
<small class="pull-right"><%= qid.order_id %></small> <small class="pull-right"><%= qid.order_id %></small>
</h4> </h5>
<h4> <h5>
<span class="order-item"> <span class="order-item">
<%= qid.item_name %> <%= qid.item_name %>
</span> [x </span> [x
<span class="order-qty"> <span class="order-qty">
<%= qid.qty %> <%= qid.qty %>
</span> ] </span> ]
</h4> </h5>
<p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p>
@@ -187,7 +187,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript"> <!-- <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$(".nav-completed").on("click", function(){ $(".nav-completed").on("click", function(){
@@ -413,4 +413,4 @@
}); });
}); });
}); });
</script> </script> -->

11
app/views/settings/accounts/index.html.erb
View File

@@ -39,17 +39,8 @@
<td><%= account.bonus %></td> <td><%= account.bonus %></td>
<td><%= account.rebate %></td> <td><%= account.rebate %></td>
<td> <td>
<%= link_to t("views.btn.show"), settings_account_path(account),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(account)%>" data-method="delete">
<%= t("views.btn.delete") %>
</button>
<span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6>
<h6>This action can't be undo. </h6>
</span>
</td> </td>
</tr> </tr>
<% end %> <% end %>

23
app/views/settings/accounts/show.html.erb
View File

@@ -1,11 +1,13 @@
<!-- --> <!-- -->
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li>Account</li> <li class="breadcrumb-item"><a href="<%= settings_account_path %>">Account</a></li>
<span style="float: right"> <li class="breadcrumb-item active">Details</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_account_path %>
</span> </span>
</ul> </ol>
</div> </div>
<br/> <br/>
@@ -34,7 +36,16 @@
<!-- <td><%= @settings_account.bonus %></td> --> <!-- <td><%= @settings_account.bonus %></td> -->
<td><%= @settings_account.rebate %></td> <td><%= @settings_account.rebate %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %></td> <td><%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %>
<button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_account_path(@settings_account)%>" data-method="delete">
<%= t("views.btn.delete") %>
</button>
<span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6>
<h6>This action can't be undo. </h6>
</span>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

9
app/views/settings/membership_actions/show.html.erb
View File

@@ -48,7 +48,14 @@
<tr> <tr>
<td colspan="2" align="right"> <td colspan="2" align="right">
<%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
<%= link_to t("views.btn.delete"), settings_membership_action_path(@settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect', :disabled => "disabled" %> <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_action_path(@settings_membership_action)%>" data-method="delete">
<%= t("views.btn.delete") %>
</button>
<span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6>
<h6>This action can't be undo. </h6>
</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>