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

Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

Browse Source
This commit is contained in:
NyanLinHtut
2020-06-08 10:14:17 +06:30
parent 98ca01533e 67b4cf870e
commit f9db23b500
33 changed files with 459 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/home/dashboard.html.erb
View File

@@ -189,7 +189,7 @@
<td align="right"><%= @summ_sale.total_receipt %></td>
</tr>
<tr>
<% revenue = @summ_sale.total_amount - @summ_sale.total_discount%>
<% revenue = @summ_sale.grand_total - @summ_sale.total_discount - @summ_sale.total_tax %>
<td><%= t("views.right_panel.detail.sale") %> <%= t :revenue %> : </td>
<td align="right"><%= number_format( revenue, precision: precision.to_i ,delimiter: delimiter) %></td>
</tr>

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

@@ -31,6 +31,7 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
@@ -59,7 +60,7 @@
</p>
<% end %>
<% end %>
<% end %>
<% end %>
<%= yield %>
</section>
</body>

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

@@ -35,6 +35,7 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>

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

@@ -32,6 +32,7 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
@@ -56,7 +57,7 @@
<p id="notify_message" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
<% end %>
<%= yield %>
</section>
</body>

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

@@ -31,6 +31,7 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
@@ -51,7 +52,7 @@
</div>
<% end %>
<% end %>
<% end %>
<%= yield %>
</section>
</body>

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

@@ -31,6 +31,7 @@
<p>Please wait...</p>
</div>
</div>
<%= render 'shared/license_expire_warning' %>
<!-- #END# Page Loader -->
<!-- Overlay For Sidebars -->
<div class="overlay"></div>
@@ -60,7 +61,7 @@
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
<%= yield %>
<%= yield %>
</section>
</body>

1
app/views/layouts/waiter.html.erb
View File

@@ -14,6 +14,7 @@
</head>
<body>
<%= render 'shared/license_expire_warning' %>
<%= render 'layouts/header' %>
<div class="container-fluid">
<% flash.each do |type, message| %>

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

@@ -1,5 +1,5 @@
<!-- Column One -->
<div class="row clearfix" style="">
<div class="row clearfix m-top-100" style="">
<div class="col-lg-7 col-md-7 col-sm-7">
<p class="hidden filter"><%= @filter %></p>
<div class="card">

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

@@ -4,7 +4,7 @@
<% type = request.path_info.include?('quick_service') || request.path_info.include?('food_court')%>
<% modify_order = request.path_info.include?('modify_order')%>
<div class="container-fluid " style="padding:0px 3px 0px 3px;">
<div class="container-fluid addorder-pages" style="padding:0px 3px 0px 3px;">
<div id="oqs_loading_wrapper" style="display:none;">
<div id="oqs_loading"></div>
</div>

2
app/views/origami/cash_ins/new.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div class='row'>
<div class="col-lg-10 col-md-10 col-sm-10">
<h2> <%= t :cash_in %> </h2>

2
app/views/origami/cash_outs/new.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div class='row'>
<div class="col-lg-10 col-md-10 col-sm-10">
<h2><%= t :cash_out %></h2>

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

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>

2
app/views/origami/home/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>

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

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>

2
app/views/origami/order_reservation/index.html.erb
View File

@@ -1,6 +1,6 @@
<%= stylesheet_link_tag 'order_reservation', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %>
<div class="container-fluid">
<div class="container-fluid m-top-100">
<!-- start count function -->
<%
pending_count = 0

4
app/views/origami/other_charges/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div class="row">
<!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6">
@@ -202,7 +202,7 @@
<%else%>
<button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%=@sale_data.sale_id%>/<%=@cashier_type%>/payment'"><i class="material-icons">reply</i> Back </button>
<%end%>
<button id="charge_other" class="btn bg-primary btn-block action-btn">Enter</button>
<button id="charge_other" class="btn bg-primary btn-block action-btn" style="height: 35px">Enter</button>
</div>
</div>
</div>

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

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>

2
app/views/origami/pending_order/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div class="row clearfix">
<!-- Column One -->
<div class="col-lg-10 col-md-10 col-sm-10">

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

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div class="row">
<!-- Column One -->
<div class="col-lg-5 col-md-5 col-sm-5">

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

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div>
</div>

2
app/views/origami/surveys/_form.html.erb
View File

@@ -1,4 +1,4 @@
<div class="container-fluid">
<div class="container-fluid m-top-100">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
<div class="card">

82
app/views/renew_license/expire.html.erb Normal file
View File

@@ -0,0 +1,82 @@
<% renewable_date = current_license.read_license("renewable_date") %>
<% date_count = (renewable_date.to_date - Date.today).to_i %>
<% day = pluralize( date_count, 'day' )%>
<% if @license_status == 0
text = 'Your license has been expired.'
elsif @license_status == 2
text = "Your license will expire in #{day}."
end
%>
<style>
.centered {
position: fixed;
/*width: 850px;*/
padding: 10px;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
</style>
<div class="container-fluid">
<div class="row">
<div class="col-sm-2"></div>
<div class="card col-sm-8 centered">
<div class="card-block">
<h3 class="pt-2 d-inline">Review Your License</h3>
<%= link_to origami_dashboard_url do %>
<img src="/image/logo.png" style="margin-left: 25pc; width: 150px">
<% end %>
<% if params[:message].present?
if params[:status].to_i == 1
color = 'text-success'
else
color = 'text-danger'
end
%>
<p class="<%= color %> m-t--30" style="font-weight: bold; font-size: 18px;"><%= params[:message] %></p><br>
<% end %>
<% if text %>
<h6 class="mb-2 "><%= text %></h6><br>
<% end %>
<h6 class="mb-2">Call Center Phone No: <a href="tel:+6494461709">+959 445 665 311</a></h6>
<br>
<h6>License Info:</h6>
<br>
<div class="container">
<div class="form-group row">
<label class="card-subtitle mb-2 col-md-4">Business Name:</label>
<label class="card-subtitle mb-2 "><strong><%= @bis_name %></strong></label>
</div>
<div class="form-group row">
<label class="card-subtitle mb-2 col-md-4">Plan:</label>
<label class="card-subtitle mb-2 "><strong><%= @plan %></strong></label>
</div>
</div>
<div class="form-group row">
<label class="card-subtitle mb-2 col-md-4 pl-4">Expired At: </label>
<label class="card-subtitle mb-2 "><strong><%= @expired_at.to_date.strftime('%B %d, %Y') %></strong></label>
</div>
</div>
<br>
<div class="col-md-12" style="padding-bottom: 20px;">
<%= link_to 'Review License', renew_url, class: 'btn btn-primary btn-lg float-right m-l-10 m-r-5' %>
<%= link_to 'Go To Home', origami_dashboard_url, class: 'btn btn-default btn-lg float-right' %>
</div>
</div>
<div class="col-sm-2"></div>
</div>
</div>
<script>
$(document).ready(function() {
$('.alert-danger, .navbar').hide()
$('html, section').css('background-color', '#61B8C9')
// $('html').css('overflow-x', 'hidden')
$('section.content').css('margin', '70px 0 0 0')
})
</script>

47
app/views/shared/_license_expire_warning.html.erb Normal file
View File

@@ -0,0 +1,47 @@
<% license_status = current_license.detail_with_local_file %>
<% renewable_date = current_license.read_license("renewable_date") %>
<% date_count = (renewable_date.to_date - Date.today).to_i %>
<% day = pluralize( date_count, 'day' )%>
<% if license_status == 0
text = 'Your license has expired.'
elsif license_status == 2
text = "Your license will expire in #{day}."
end
%>
<% if license_status == 0 || license_status == 2 %>
<div class="alert alert-danger fade show text-center" role="alert">
<strong style="margin-left: 40px !important"><%= text %></strong>
<%= link_to 'Review License', expire_url, class: 'btn btn-sm btn-primary', style: "margin-left: 20px !important"%>
<button type="button" class="close btn-close" data-dismiss="alert" aria-label="Close" style="padding-top: 5px;">
<span aria-hidden="true" class="text-white">&times;</span>
</button>
</div>
<% end %>
<script>
$(document).ready(function() {
if (<%= license_status %> == 1) {
$('.navbar').css("top", 0)
$('section.content').css('margin-top', '0 !important')
}
else {
$('.navbar').css("top", '45px')
$('.block-header, .addorder-pages').css('margin-top', '115px')
$('.page-header, .m-top-100').css('margin-top', '100px')
$('.alert-danger').css({
'top': 0,
'position': 'fixed',
'z-index': 999,
'width': '100%'
})
}
$('.btn-close').on ('click', function() {
$('.navbar').css("top", '0')
$('.block-header, .addorder-pages').css('margin-top', '')
$('.page-header, .m-top-100').css('margin-top', '')
})
})
</script>