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

ui review and edited

Browse Source
This commit is contained in:
Yan
2017-10-26 17:54:22 +06:30
parent fe6d8a4be0
commit 0da1aeaeb9
29 changed files with 110 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/crm/dining_queues/_form.html.erb
View File

@@ -14,7 +14,7 @@
</div>
<br>
<div class="form-actions">
<%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue"%>
<%= f.submit "Create Queue",:class=>"btn btn-primary btn-lg waves-effect"%>
</div>
</div>
<% end %>

6
app/views/crm/dining_queues/edit.html.erb
View File

@@ -2,9 +2,9 @@
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= crm_dining_queues_path %>">Queue</a></li>
<li>Edit</li>
<li class="breadcrumb-item"><a href="<%= root_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= crm_dining_queues_path %>">Queue</a></li>
<li class="breadcrumb-item active">Edit</li>
</ul>
</div>
<%= render 'form', dining_queue: @dining_queue %>

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

@@ -2,7 +2,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">CRM</li>
<li class="breadcrumb-item active">Queue</li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
</span>
@@ -54,7 +54,7 @@
<button type="button" id="assign" class="btn btn-primary btn-block btn-lg waves-effect" disabled>Assign</button>
<button type="button" id="cancel" class="btn btn-danger btn-block btn-lg waves-effect" disabled>Cancel</button>
<a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a>
<!-- <a href="<%= dashboard_path %>" class="btn btn-default btn-block waves-effect" role="button" aria-haspopup="true" aria-expanded="false"> Back </a> -->
</div>
</div>
</div>

6
app/views/crm/dining_queues/new.html.erb
View File

@@ -2,10 +2,10 @@
<div class="page-header">
<ul class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item">CRM</li>
<li class="breadcrumb-item active"><a href="<%= crm_dining_queues_path %>">Queue</a></li>
<li class="breadcrumb-item"><a href="<%= crm_dining_queues_path %>">Queue</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
<%= link_to 'Back', crm_dining_queues_path %>
</span>
</ul>
</div>

4
app/views/layouts/CRM.html.erb
View File

@@ -10,10 +10,6 @@
<!-- Favicon-->
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<%= stylesheet_link_tag 'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>
</head>

4
app/views/layouts/OQS.html.erb
View File

@@ -11,9 +11,9 @@
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
-->
<%= stylesheet_link_tag 'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %>
</head>

5
app/views/layouts/_header.html.erb
View File

@@ -15,7 +15,7 @@
<div class="navbar-header">
<!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
<a href="javascript:void(0);" class="bars"></a>
<a class="navbar-brand" href="index.html">
<a class="navbar-brand" href="<%=dashboard_path%>">
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
<span class="navbar-brand-txt">SX Restaurant</span>
</a>
@@ -40,9 +40,10 @@
<%end%>
</li>
</ul>
<!-- NO Need for color Change
<a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
<i class="material-icons">more_vert</i>
</a>
</a> -->
</div>
</div>
</nav>

5
app/views/layouts/application.html.erb
View File

@@ -10,12 +10,7 @@
<!-- Favicon-->
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

4
app/views/layouts/inventory.html.erb
View File

@@ -10,10 +10,6 @@
<!-- Favicon-->
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<%= stylesheet_link_tag 'inventory_definitions', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'inventory', 'data-turbolinks-track': 'reload' %>
</head>

4
app/views/layouts/origami.html.erb
View File

@@ -10,10 +10,6 @@
<!-- Favicon-->
<link rel="icon" href="/favicon.ico" type="image/x-icon">
<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
<%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %>
</head>

43
app/views/settings/dining_charges/_form.html.erb
View File

@@ -15,22 +15,22 @@
<i class="material-icons">access_time</i>
</span>
<% if !@dining_charge.minimum_free_time.nil?%>
<input type="text" name="minimum_free_time" value="<%= @dining_charge.minimum_free_time.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
<input type="text" name="dining_charge[minimum_free_time]" value="<%= @dining_charge.minimum_free_time.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Free Time...">
<% else %>
<input type="text" name="minimum_free_time" class="timepicker form-control col-md-8" placeholder="Start Time...">
<input type="text" name="dining_charge[minimum_free_time]" class="timepicker form-control col-md-8" placeholder="Free Time...">
<% end %>
</div>
<!--<%= f.input :charge_block, :input_html => { :id => 'charge_block'} %>-->
<div class="form-group">
<label class="control-label required"> Change Block</label>
<label class="control-label required"> Charges Block</label>
<div class="input-group">
<span class="input-group-addon">
<i class="material-icons">access_time</i>
</span>
<% if !@dining_charge.charge_block.nil?%>
<input type="text" name="charge_block" value="<%= @dining_charge.charge_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
<input type="text" name="dining_charge[charge_block]" value="<%= @dining_charge.charge_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Time for Charges...">
<% else %>
<input type="text" name="charge_block" class="timepicker form-control col-md-8" placeholder="Start Time...">
<input type="text" name="dining_charge[charge_block]" class="timepicker form-control col-md-8" placeholder="Time for Charges...">
<% end %>
</div>
</div>
@@ -43,9 +43,9 @@
<i class="material-icons">access_time</i>
</span>
<% if !@dining_charge.time_rounding_block.nil?%>
<input type="text" name="time_rounding_block" value="<%= @dining_charge.time_rounding_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Start Time...">
<input type="text" name="dining_charge[time_rounding_block]" value="<%= @dining_charge.time_rounding_block.utc.strftime('%H:%M') %>" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
<% else %>
<input type="text" name="time_rounding_block" class="timepicker form-control col-md-8" placeholder="Start Time...">
<input type="text" name="dining_charge[time_rounding_block]" class="timepicker form-control col-md-8" placeholder="Rounding Time...">
<% end %>
</div>
</div>
@@ -91,33 +91,40 @@
function price(){
var unit_price = $("#unit_price").val();
var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val();
var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val();
var time1=(parseInt(hour1)*60)+parseInt(min1);
var time_rounding_block = $("input[name='dining_charge[time_rounding_block]']").val();
var charge_block = $("input[name='dining_charge[charge_block]']").val();
var rounding = time_rounding_block.split(':');
var charge_block_time = charge_block.split(':');
var time1=(parseInt(rounding[0])*60)+parseInt(rounding[1]);
var time2=(parseInt(charge_block_time[0])*60)+parseInt(charge_block_time[1]);
var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val();
var min2 = $("select[name='dining_charge[charge_block(5i)]']").val();
var time2=(parseInt(hour2)*60)+parseInt(min2);
// var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val();
// var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val();
// var time1=(parseInt(hour1)*60)+parseInt(min1);
// var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val();
// var min2 = $("select[name='dining_charge[charge_block(5i)]']").val();
// var time2=(parseInt(hour2)*60)+parseInt(min2);
var result=(unit_price*time1)/time2;
$("#time_rounding_block_price").val(result);
// return result;
return result;
}
$( "#unit_price" ).change(function() {
price();
});
$( "select[name='dining_charge[time_rounding_block(4i)]']" ).change(function() {
$("input[name='dining_charge[time_rounding_block]']").change(function() {
price();
});
$( "select[name='dining_charge[time_rounding_block(5i)]']" ).change(function() {
$("input[name='dining_charge[time_rounding_block]']").change(function() {
price();
});
$( "select[name='dining_charge[charge_block(4i)]']" ).change(function() {
$("input[name='dining_charge[charge_block]']").change(function() {
price();
});
$( "select[name='dining_charge[charge_block(5i)]']" ).change(function() {
$("input[name='dining_charge[charge_block]']").change(function() {
price();
});

2
app/views/settings/payment_method_settings/_form.html.erb
View File

@@ -6,7 +6,7 @@
<div class="form-inputs p-l-15">
<%= f.input :payment_method %>
<%= f.input :is_active %>
<%= f.input :is_active,:class=> "checkbox" %>
<%= f.input :gateway_communication_type %>
<%= f.input :gateway_url %>
<%= f.input :auth_token %>

4
app/views/settings/promotions/_form.html.erb
View File

@@ -1,5 +1,5 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<%= simple_nested_form_for([:settings,@promotion]) do |f| %>
<%= f.error_notification %>
@@ -197,7 +197,7 @@
</div>
<% end %>
</div>
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod

4
app/views/settings/zones/index.html.erb
View File

@@ -48,7 +48,9 @@
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card">
<div class="body">
<h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
<h5>
<i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i>
</h5>
<p>
1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %> <br>
2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>