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:
code2lab
2019-05-30 14:01:03 +06:30
parent 453435f8fa c02305e386
commit 0016318611
9 changed files with 107 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/application.scss
View File

@@ -129,6 +129,7 @@ i.logout_icon{
@media screen and (max-width: 785px) { @media screen and (max-width: 785px) {
#setting{ display: none;} #setting{ display: none;}
.menu-up{ display: none;} .menu-up{ display: none;}
.card-btn{padding: 0px 35px;}
} }
@media screen and (max-width: 785px) { @media screen and (max-width: 785px) {

4
app/assets/stylesheets/login.scss
View File

@@ -122,5 +122,9 @@
@media screen and (max-width: 785px) { @media screen and (max-width: 785px) {
.login_pwd{width: 90%;} .login_pwd{width: 90%;}
.login_ent{width: 10%;} .login_ent{width: 10%;}
// .card-btn{padding: 0px 35px;}
// .nav-tabs{padding: 0px 44px;}
.box{margin: unset;}
.mbl-btn-usrgp{width: 48%;}
} }

45
app/controllers/reports/saleitem_controller.rb
View File

@@ -87,31 +87,44 @@ class Reports::SaleitemController < BaseReportController
end end
def print_sale_items def print_sale_items
type = params[:type] from, to = get_date_range_from_params
account = params[:account]
from_date = to_date = '-'
if !params[:from].nil?
from_date = Date.parse(params[:from])
end
if !params[:to].nil?
to_date = Date.parse(params[:to])
end
shift = params[:shift_name] shift_sale_range = ''
shift_name = "All Shifts"
if shift.to_i > 0
shift_name = params[:shift_from].to_s+" - ".to_s+params[:shift_to].to_s
end
period_name = get_period_name(params[:period]) shift = ''
shift_name = 'All Shift'
if params[:shift_name].to_i != 0
shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
shift_sale = ShiftSale.find(params[:shift_name])
if to.blank?
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
else
if shift_sale.shift_closed_at.blank?
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at)
else
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
end
end
sh_name = "#{shift_sale.shift_started_at.utc.getlocal.strftime('%d %B %l:%M%p')} - #{shift_sale.shift_closed_at.utc.getlocal.strftime('%d %B %l:%M%p')}"
employee = Employee.find(shift_sale.employee_id)
shift_name = employee.nil? ? sh_name : "#{sh_name} (#{employee.name})"
end
shop_details = shop_detail shop_details = shop_detail
account_type = params[:account_type]
@type = params[:period_type]
period_name = get_period_name(params[:period])
@sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type)
# get printer info # get printer info
print_settings = PrintSetting.find_by_unique_code('CloseCashierPdf') # SaleItemsPdf print_settings = PrintSetting.find_by_unique_code('CloseCashierPdf') # SaleItemsPdf
printer = Printer::CashierStationPrinter.new(print_settings) printer = Printer::CashierStationPrinter.new(print_settings)
printer.print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, params[:sale_items], params[:menu_cate_count]) printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data)
respond_to do |format| respond_to do |format|
format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'} format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'}

4
app/models/printer/cashier_station_printer.rb
View File

@@ -81,10 +81,10 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
end end
end end
def print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, menu_cate_count) def print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items)
filename = "tmp/reports_sale_items.pdf" filename = "tmp/reports_sale_items.pdf"
pdf = SaleItemsPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, nil, menu_cate_count, nil) pdf = SaleItemsPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, nil, nil, nil)
pdf.render_file filename pdf.render_file filename

8
app/pdf/sale_items_pdf.rb
View File

@@ -105,7 +105,7 @@ class SaleItemsPdf < Prawn::Document
text "From Date : ", :size => self.item_font_size,:align => :left text "From Date : ", :size => self.item_font_size,:align => :left
end end
bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do
text "#{ from_date}" , :size => self.item_font_size,:align => :left text "#{ from_date.utc.getlocal.strftime("%d-%m-%Y")}" , :size => self.item_font_size,:align => :left
end end
y_position = cursor y_position = cursor
@@ -113,14 +113,14 @@ class SaleItemsPdf < Prawn::Document
text "To Date : ", :size => self.item_font_size,:align => :left text "To Date : ", :size => self.item_font_size,:align => :left
end end
bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do
text "#{ to_date}" , :size => self.item_font_size,:align => :left text "#{ to_date.utc.getlocal.strftime("%d-%m-%Y")}" , :size => self.item_font_size,:align => :left
end end
y_position = cursor y_position = cursor
bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do
text "Shift : ", :size => self.item_font_size,:align => :left text "Shift : ", :size => self.item_font_size,:align => :left
end end
bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do bounding_box([@label_name_width,y_position], :width => @label_item_width) do
text "#{shift}" , :size => self.item_font_size,:align => :left text "#{shift}" , :size => self.item_font_size,:align => :left
end end
@@ -148,7 +148,7 @@ class SaleItemsPdf < Prawn::Document
arr = Array.new arr = Array.new
unless sale_items.nil? unless sale_items.nil?
JSON.parse(sale_items).each do |item| sale_items.each do |item|
if !arr.include?(item['menu_category_id']) if !arr.include?(item['menu_category_id'])

2
app/views/layouts/login.html.erb
View File

@@ -135,8 +135,6 @@
<div class="pin_pad left" data-value="0">0</div> <div class="pin_pad left" data-value="0">0</div>
<div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div> <div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>

77
app/views/layouts/login_dashboard.html.erb
View File

@@ -15,10 +15,10 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> --> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
<%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %>
<!-- <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> <!-- <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script> --> <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script> -->
<%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="login_dashboard"> <body class="login_dashboard">
@@ -39,8 +39,8 @@
</div> </div>
</div> </div>
<% flash.each do |type, message| %> <% flash.each do |type, message| %>
<% <%
if type == "notice" if type == "notice"
color = "alert-success" color = "alert-success"
elsif type == "error" elsif type == "error"
color = "alert-danger" color = "alert-danger"
@@ -49,11 +49,11 @@
else else
color = "bg-black" color = "bg-black"
end %> end %>
<p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center" <p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" > data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p> </p>
<% end %> <% end %>
<!-- #END# Page Loader --> <!-- #END# Page Loader -->
<div class="container"> <div class="container">
@@ -62,25 +62,25 @@
<img src="/image/SX-logo.png" width="150px" height="150px"> <img src="/image/SX-logo.png" width="150px" height="150px">
<p> <p>
<small>Version - 1.0.1</small> <small>Version - 1.0.1</small>
</p> </p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center"> <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
<div class="current-shop-name"> <div class="current-shop-name">
<span><%= shop_detail.name %></span> <span><%= shop_detail.name %></span>
</div> </div>
</div> </div>
</div> </div>
<div class="row bg-white box"> <div class="row bg-white box">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white"> <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">
<div class="row justify-content-center form-group"> <div class="row justify-content-center form-group">
<input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID"> <input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
</div> </div>
<br> <br>
<div class="card padding-10"> <div class="card padding-10">
<div class="card-content"> <div class="card-content card-btn">
<div class='col-md-12'> <div class='col-md-12'>
<div class='row bottom'> <div class='row bottom'>
<div class="pin_pad " data-value="1">1</div> <div class="pin_pad " data-value="1">1</div>
@@ -103,14 +103,14 @@
<div class="pin_pad left bg-indigo" data-value="ENT">ENT</div> --> <div class="pin_pad left bg-indigo" data-value="ENT">ENT</div> -->
<div class="pin_pad bg-blue-grey" data-value="BAC">BACK</div> <div class="pin_pad bg-blue-grey" data-value="BAC">BACK</div>
<div class="pin_pad left" data-value="0">0</div> <div class="pin_pad left" data-value="0">0</div>
<div class="pin_pad bg-grey left" data-value="CLR">CLR</div> <div class="pin_pad bg-grey left" data-value="CLR">CLR</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white"> <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<% @roles.each do |role| %> <% @roles.each do |role| %>
<%if role != "administrator" %> <%if role != "administrator" %>
@@ -119,8 +119,8 @@
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
<div class="tab-content" style="max-height:650px; overflow:auto"> <div class="tab-content" style="max-height:650px; overflow:auto">
@@ -129,7 +129,7 @@
<div class="tab-pane" id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto"> <div class="tab-pane" id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %> <% @employees.each do |employee| %>
<%if employee.role == role %> <%if employee.role == role %>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn mbl-btn-usrgp" data-formid="#form_<%= employee.emp_id %>" style="float: left;">
<form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH"> <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
</form> </form>
<%if employee.image_path.present? %> <%if employee.image_path.present? %>
@@ -138,20 +138,20 @@
<div class="p-name"><b><%= employee.name%></b> <div class="p-name"><b><%= employee.name%></b>
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="login_dashboard p-card"> <div class="login_dashboard p-card">
<i class="material-icons style_icon">person</i> <i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b> <div class="p-name"><b><%= employee.name%></b>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</div> </div>
<!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> --> <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
</div> </div>
@@ -159,7 +159,7 @@
</body> </body>
</html> </html>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
@@ -172,7 +172,7 @@
var text = $("#noti").attr('data-message'); var text = $("#noti").attr('data-message');
if (text != null || colorName != null){ if (text != null || colorName != null){
showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit);
} }
$(".empBtn").click(function (event) { $(".empBtn").click(function (event) {
@@ -181,15 +181,15 @@
$(item).submit(); $(item).submit();
}); });
$('ul.nav.nav-tabs li a').click(function() { $('ul.nav.nav-tabs li a').click(function() {
var bb = $('.nav-item').children()[0]; var bb = $('.nav-item').children()[0];
$(bb).removeClass('active_tab'); $(bb).removeClass('active_tab');
$(this).parent().addClass('active_tab').siblings().removeClass('active_tab'); $(this).parent().addClass('active_tab').siblings().removeClass('active_tab');
}); });
$("#emp_id").focus(); $("#emp_id").focus();
$(".pin_pad").click(function (event) { $(".pin_pad").click(function (event) {
event.preventDefault(); event.preventDefault();
var value = $(this).data("value"); var value = $(this).data("value");
if (value == "CLR") { if (value == "CLR") {
@@ -213,11 +213,11 @@
$('#emp_id').keyup(function(e) { $('#emp_id').keyup(function(e) {
e.preventDefault(); e.preventDefault();
var txtVal = this.value; var txtVal = this.value;
if(txtVal!=''){ if(txtVal!=''){
if ($.isNumeric(txtVal)) { if ($.isNumeric(txtVal)) {
if( txtVal.length === 3 ) { if( txtVal.length === 3 ) {
window.location.href = '/auth/'+txtVal; window.location.href = '/auth/'+txtVal;
} }
}else{ }else{
@@ -228,10 +228,10 @@
var aa = $('.nav-item').children().attr('href').replace('#',''); var aa = $('.nav-item').children().attr('href').replace('#','');
$('#'+aa).addClass('active'); $('#'+aa).addClass('active');
var bb = $('.nav-item').children()[0]; var bb = $('.nav-item').children()[0];
$(bb).parent().addClass('active_tab').siblings().removeClass('active_tab'); $(bb).parent().addClass('active_tab').siblings().removeClass('active_tab');
}); });
function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) { function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
if (colorName === null || colorName === '') { colorName = 'bg-black'; } if (colorName === null || colorName === '') { colorName = 'bg-black'; }
@@ -268,6 +268,3 @@
} }
//end Notificaiotn message //end Notificaiotn message
</script> </script>

35
app/views/reports/saleitem/index.html.erb
View File

@@ -15,7 +15,7 @@
<hr /> <hr />
<div class="text-right"> <div class="text-right">
<%= link_to "Print", reports_print_sale_items_path(:type => params[:sale_type], :period => params[:period], :account => params[:account_type], :from => @from, :to => @to, :shift_name => params[:shift_name], :shift_from => @shift_from, :shift_to => @shift_to, :menu_cate_count => @menu_cate_count, :sale_items => @sale_data.to_json), :method => 'post', class:"btn btn-info wave-effects" %> <button class="btn btn-info wave-effects" onclick="print_sale_items()">Print</button>
<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a> <a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
</div> </div>
@@ -66,6 +66,7 @@
<% other_sub_total = 0 %> <% other_sub_total = 0 %>
<% product_sub_total = 0 %> <% product_sub_total = 0 %>
<% count = 0 %> <% count = 0 %>
<% row_count = 0 %>
<% total_price = 0 %> <% total_price = 0 %>
<% cate_count = 0 %> <% cate_count = 0 %>
<% acc_count = 0 %> <% acc_count = 0 %>
@@ -78,6 +79,7 @@
<% total_tax = 0 %> <% total_tax = 0 %>
<% unless @sale_data.blank? %> <% unless @sale_data.blank? %>
<% @sale_data.each do |sale| %> <% @sale_data.each do |sale| %>
<% row_count += 1 %>
<!-- all total qty sum --> <!-- all total qty sum -->
<% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion" <% if sale.status_type != "Discount" && sale.status_type != "foc" && sale.status_type != "promotion"
@@ -285,6 +287,7 @@
<%end%> <%end%>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
@@ -293,10 +296,7 @@
<script> <script>
$(function(){ $(function(){
var check_arr = []; var check_arr = [];
var search = '<%= params[:period_type] %>'; var search = '<%= params[:period_type] %>';
if(search){ if(search){
@@ -309,7 +309,7 @@
} }
}else{ }else{
search_by_period(); search_by_period();
} }
$('#sel_period').change(function(){ $('#sel_period').change(function(){
search_by_period(); search_by_period();
@@ -407,4 +407,29 @@
} }
}); });
function print_sale_items(){
var period = $('#sel_period').val();
var type = $('#sel_sale_type').val();
var account = $('#account_type').val();
var from = $('#from').val();
var to = $('#to').val();
var shift = $('#shift_name').val();
// var flag = false;
// alert($('#row_count').val())
// if (flag == true) {
$.ajax({
type: "POST",
url: "<%= reports_print_sale_items_path %>",
data: "period="+period+"&period_type="+type+"&account_type="+account+"&from="+from+"&to="+to+"&shift_name="+shift,
success: function(data){
if (data != null){
location.reload();
}
$("#loader").hide();
}
});
// }
}
</script> </script>

BIN
dump.rdb
View File

Binary file not shown.