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 18:40:13 +06:30
parent 0787271706 e1dc1d4a8a
commit bb96cf6db5
14 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@ $(function(){
}
row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+'<div class="custom-card-head card-head" style="line-height:14px;">'
+'<small class="col-md-9">'+ product[field].name +'</small>'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+'<div class="col-md-9">'+ product[field].name +'</div>'
+"<div class='col-md-3 add_icon' data-item-code='"
+ product[field].item_code +"' data-name='"
+ product[field].name +"' data-qty = '"+ qty +"' data-price = '"
@@ -46,9 +46,8 @@ $(function(){
+ product[field].name +"' data-promotion-price = '"+ 1 +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '"
+ options +"' data-image='"+image_path+"'>"
+"<i class='fa fa-plus '"
+ 'style="margin-top:4px;">'
+'</i>'
+"<i class='fa fa-plus material-icons'>"
+'add</i>'
+'</div>'
+'</div>'
@@ -65,7 +64,7 @@ $(function(){
+"</div>"
+'<div class="card-footer custom-card-footer">'
+'<small>'+ product[field].unit_price +'</small>'
+'<span>'+ product[field].unit_price +'</span>'
+'</div>'
+'</div>';
$('.menu_items_list').append(row);
@@ -109,6 +108,7 @@ $(function(){
if (JSON.stringify(menu_items[field].item_sets)!='[]') {
fa_plus = '';
add = '';
menu_item_box = 'set_item_box';
data_target = 'sx_item_set_detailModal';
@@ -120,7 +120,8 @@ $(function(){
item_attributes = menu_items[field].attributes;
promotion_price = menu_items[field].promotion_price;
}else{
fa_plus = 'fa-plus';
fa_plus = 'material-icons';
add = 'add'
menu_item_box = 'menu_item_box';
data_target = 'sx_item_detailModal';
@@ -146,8 +147,8 @@ $(function(){
}
row = '<div class="card custom-card testimonial-card animated fadeInRight" style="">'
+'<div class="custom-card-head card-head" style="line-height:14px;">'
+'<small class="col-md-9">'+ menu_items[field].name +'</small>'
+'<div class="custom-card-head card-head row" style="line-height:14px;margin:0px;">'
+'<div class="col-md-9">'+ menu_items[field].name +'</div>'
+"<div class='col-md-3 add_icon' data-item-code='"
+ menu_items[field].code +"' data-name='"
+ menu_items[field].name +"' data-qty = '"+ qty +"' data-price = '"
@@ -155,9 +156,8 @@ $(function(){
+ name +"' data-promotion-price = '"+ promotion_price +"' data-attributes = '"
+ JSON.stringify(item_attributes) +"' data-options = '"
+ options +"' data-image='"+image_path+"'>"
+"<i class='fa "+fa_plus+" '"
+ 'style="margin-top:4px;">'
+'</i>'
+"<i class='fa "+fa_plus+" '>"
+add+ '</i>'
+'</div>'
+'</div>'
@@ -174,7 +174,7 @@ $(function(){
+"</div>"
+'<div class="card-footer custom-card-footer">'
+'<small>'+ price +'</small>'
+'<span>'+ price +'</span>'
+'</div>'
+'</div>';
$('.menu_items_list').append(row);
@@ -216,14 +216,14 @@ $(function(){
+"' data-max-qty='"+item_sets[field]["max_selectable_qty"]
+"'>"
+'<div class="custom-card-head card-head" style="line-height:14px;">'
+'<small class="">'+result["name"]+'</small>'
+'<span class="">'+result["name"]+'</span>'
+'</div>'
+'<div class="card-block custom-card-block">'
+'<img id="" src="/image/logo.png" height="40px">'
+' <small style="float:" id="instance_option"></small>'
+'</div>'
+'<div class="card-footer custom-card-footer">'
+' <small>'+result["price"]+'</small>'
+' <span>'+result["price"]+'</span>'
// +' <small style="float:right" id="instance_option"></small>'
+'</div>'
+'</div>'
@@ -433,8 +433,8 @@ $(function(){
disabled = "disabled";
}
row +="<button id='selected-attribute' data-instances='"+JSON.stringify(instances)+"' data-type='"
+type+"' data-value='"+value[i]+"' class='btn btn-default attribute_btn "
+ status +" "+ type +" "+ disabled +" '>"
+type+"' data-value='"+value[i]+"' class='btn btn- waves-effect attribute_btn "
+ status +" "+ type +" '"+ disabled +" >"
+value[i]
+"</button>";
});
@@ -446,7 +446,7 @@ $(function(){
type = item_options[field]["type"];
row = "<h4>"+type+"</h4>"
$(value).each(function(i){
row +="<button class='btn btn-default option_btn "+ type +"' data-type='"
row +="<button class='btn btn- waves-effect option_btn "+ type +"' data-type='"
+type+"' data-value='"+value[i]+"' data-group='simple_menu'>"+value[i]+"</button>";
});
$(".options-list").append(row);

1
app/assets/javascripts/origami.js
View File

@@ -4,6 +4,7 @@
//= require bootstrap/js/bootstrap-material-design.min
//= require jquery_ujs
//= require turbolinks
//= require cable
//= require jquery-slimscroll/jquery.slimscroll.js
//= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js

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

@@ -1,3 +1,6 @@
section .content{
padding:50px 15px 0 225px !important;
}
.custom-card-head{
height: 40px;
background-color: #54A5AF;
@@ -78,11 +81,9 @@ element.style {
}
.selected-attribute {
color: #fff !important;
background-color: green !important;
}
.selected-option {
color: #fff !important;
background-color: green !important;
}
@@ -94,12 +95,14 @@ element.style {
white-space: normal !important;
margin-bottom: 5px;
margin-right: 5px;
color:#111 !important;
}
.option_btn {
white-space: normal !important;
margin-bottom: 5px;
margin-right: 5px;
color:#111 !important;
}
#logo{
margin: auto;

14
app/assets/stylesheets/origami.scss
View File

@@ -39,12 +39,6 @@ select.form-control {
/* End Reset */
.dining {
min-height:470px;
max-height:570px;
overflow:auto
}
.order-info {
min-height:300px;
max-height:500px;
@@ -103,15 +97,15 @@ select.form-control {
}
.cash-color{
background-color:#80CBC4;
background-color:#2196F3;
}
.credit-color{
background-color:#FFCCBC;
background-color:#FF5722;
}
.other-payment-color{
background-color:#E1BEE7;
background-color:#795548;
}
.cashier_number:hover{
@@ -207,7 +201,7 @@ select.form-control {
}
.red {
background-color:#ff0000;
background-color:#F44336;
}
.green{

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

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
@@ -9,7 +9,7 @@
</span>
</ul>
</div>
</div>
<div class="row clearfix">
<div class="col-lg-8 col-md-8 col-sm-8">
<!-- <div class="main-box-body clearfix"> -->

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

@@ -1,5 +1,8 @@
<%= 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 class="row">
<div class="col-lg-2 col-md-2 col-sm-2">
<ul class="nav nav-tabs flex-column" role="tablist" >
@@ -23,8 +26,7 @@
</div>
<div class="col-md-3 col-lg-3 col-sm-3">
<button type="button" class="btn btn-primary btn-md pull-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br><br>
<button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
<div class="card-header">
<div>
<strong id="order-title">ORDER DETAILS </strong> | Table <%=@table.name%>
@@ -121,13 +123,14 @@
<div class="input-group">
<span class="input-group-btn">
<button type="button" class="btn btn-danger btn-number" value="-" id="minus">
<span class="glyphicon glyphicon-minus"></span>
<i class="material-icons">remove</i>
</button>
</span>
<input type="text" value="1" id="count" class="change_qty form-control col-md-12 ">
<span class="input-group-btn">
<button type="button" class="btn btn-success btn-number" value="+" id="plus">
<span class="glyphicon glyphicon-plus"></span>
<i class="material-icons">add</i>
</button>
</span>
</div>
@@ -154,8 +157,8 @@
<div class="mr-auto">
<h4 class=" pull-left">Total : <span id="total_price"></span></h4>
</div>
<button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button>
<button type="button" class="btn btn-success add_to_order" data-dismiss="modal" id="add_to_order">Add to Order</button>
<button type="button" class="btn btn-primary m-r-20" data-dismiss="modal" id="close">Close</button>
<button type="button" class="btn btn-success add_to_order m-r-10" data-dismiss="modal" id="add_to_order">Add to Order</button>
</div>
</div>
</div>
@@ -183,13 +186,13 @@
<div class="input-group">
<span class="input-group-btn">
<button type="button" class="btn btn-danger btn-number" value="-" id="set_minus">
<span class="glyphicon glyphicon-minus"></span>
<i class="material-icons">remove</i>
</button>
</span>
<input type="text" value="1" id="set_count" class="set_change_qty form-control col-md-12 ">
<span class="input-group-btn">
<button type="button" class="btn btn-success btn-number" value="+" id="set_plus">
<span class="glyphicon glyphicon-plus"></span>
<i class="material-icons">add</i>
</button>
</span>
</div>
@@ -207,7 +210,7 @@
</div>
<div class="col-md-8">
<div class="instance-list"></div>
<div class="instance-list row"></div>
</div>
</div>
</div>

6
app/views/origami/credit_payments/index.html.erb
View File

@@ -90,11 +90,11 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div>
<div class="row bottom">
<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
@@ -106,7 +106,7 @@
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn bg-blue btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
<button type="button" class="btn bg-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
</div>
</div>
</div>

5
app/views/origami/discounts/index.html.erb
View File

@@ -1,4 +1,7 @@
<div class="container-fluid">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>
<div class="row">
<!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6">
@@ -366,6 +369,7 @@
// Pay Discount for Payment
$("#pay-discount").on('click', function(e){
e.preventDefault();
$("#loading_wrapper").show();
var sale_id = $('#sale-id').text();
var discount_items = JSON.stringify(get_discount_item_rows());
var overall_discount = $("#order-discount").text();
@@ -379,6 +383,7 @@
url: ajax_url,
data: params,
success:function(result){
$("#loading_wrapper").hide();
swal({
title: "Infomation!",
text: result.status,

6
app/views/origami/jcb/index.html.erb
View File

@@ -76,11 +76,11 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div>
<div class="row bottom">
<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
@@ -92,7 +92,7 @@
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
<button type="button" class="btn btn-primary m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div>
</div>

6
app/views/origami/master/index.html.erb
View File

@@ -76,11 +76,11 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div>
<div class="row bottom">
<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
@@ -92,7 +92,7 @@
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
<button type="button" class="btn btn-default m-l-3 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div>
</div>

6
app/views/origami/mpu/index.html.erb
View File

@@ -79,11 +79,11 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div>
<div class="row bottom">
<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
@@ -95,7 +95,7 @@
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
<button type="button" class="btn btn-primary m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div>
</div>
</div>

2
app/views/origami/payments/show.html.erb
View File

@@ -265,7 +265,7 @@
<!-- Waiter Buttons -->
<button type="button" class="btn bg-default btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
<button type="button" class="btn bg-warning btn-block" id="foc"> FOC </button>
<button type="button" class="btn bg-deep-purple btn-block" id="foc"> FOC </button>
<button type="button" class="btn bg-red btn-block" id="void"> Void </button>
</div>

16
app/views/origami/sales/show.html.erb
View File

@@ -25,7 +25,7 @@
<div class="tab-pane active" id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @complete.each do |sale| %>
<div class="card sales red text-white" data-id = "<%= sale.sale_id %>">
<div class="card sales bg-red text-white" data-id = "<%= sale.sale_id %>">
<div class="card-block">
<%= sale.receipt_no %><span style="font-size:12px;float:right;line-height:inherit;"><%= sale.sale_status %></span>
</div>
@@ -39,7 +39,7 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @tables.each do |table| %>
<% if table.status == 'occupied' %>
<div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card tables bg-red text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
<% if table.get_booking.nil? %>
@@ -50,7 +50,7 @@
</div>
</div>
<% else %>
<div class="card tables green text-white" data-id="<%= table.id %>">
<div class="card tables bg-green text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.name %>
</div>
@@ -65,7 +65,7 @@
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @rooms.each do |room| %>
<% if room.status == 'occupied' %>
<div class="card rooms red text-white" data-id="<%= room.id %>">
<div class="card rooms bg-red text-white" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
<% if room.get_booking.nil? %>
@@ -76,7 +76,7 @@
</div>
</div>
<% else %>
<div class="card rooms green text-white" data-id="<%= room.id %>">
<div class="card rooms bg-green text-white" data-id="<%= room.id %>">
<div class="card-block">
<%= room.name %>
</div>
@@ -90,7 +90,7 @@
<div class="tab-pane" id="orders" role="tabpanel" style="max-height:600px; overflow:auto">
<div class="card-columns" style="padding-top:10px; column-gap: 1.2rem;">
<% @orders.each do |order| %>
<div class="card orders red text-white" data-id = "<%= order.order_id %>">
<div class="card orders bg-red text-white" data-id = "<%= order.order_id %>">
<div class="card-block">
<%= order.order_id %>
</div>
@@ -198,9 +198,9 @@
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default btn-block" id='back'>Back</button>
<% if @sale.sale_status != 'void' %>
<button type="button" id="void" class="btn btn-blue btn-block">VOID</button>
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
<% end %>
<button type="button" id="re-print" class="btn btn-blue btn-block">Re.Print</button>
<button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
</div>
</div>
</div>

6
app/views/origami/visa/index.html.erb
View File

@@ -76,11 +76,11 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="row bottom">
<div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long border-left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div>
<div class="row bottom">
<div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long border-left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div>
<div class="row bottom">
@@ -92,7 +92,7 @@
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
<button type="button" class="btn bg-default m-l-10 btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div>
</div>
</div>