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

update ui desige for sx theme

Browse Source
This commit is contained in:
Aung Myo
2017-09-26 11:40:44 +06:30
parent dd9e8fe908
commit 7f5ce4e233
24 changed files with 1726 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@@ -45,3 +45,5 @@ function export_to(path)
var form_params = $("#frm_report").serialize(); var form_params = $("#frm_report").serialize();
window.location = path+"?"+ form_params; window.location = path+"?"+ form_params;
} }

5
app/assets/javascripts/popper.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

172
app/assets/stylesheets/sx-sidebar.css Normal file
View File

@@ -0,0 +1,172 @@
/*!
* Start Bootstrap - Simple Sidebar (http://startbootstrap.com/template-overviews/simple-sidebar)
* Copyright 2013-2017 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE)
*/
#wrapper {
padding-left: 0;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
#wrapper.toggled {
padding-left: 200px;
}
#sidebar-wrapper {
/* z-index: 1000;*/
/*position: fixed;*/
z-index: 1;
position: absolute;
left: 200px;
width: 0;
height: 100%;
margin-left: -200px;
margin-top:-20px;
overflow-x: auto;
background: #222d32;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
}
#wrapper.toggled #sidebar-wrapper {
width: 216px;
}
#page-content-wrapper {
width: 100%;
position: absolute;
padding: 0px;
}
#wrapper.toggled #page-content-wrapper {
position: absolute;
margin-right: -200px;
}
/* Sidebar Styles */
.sidebar-nav {
position: absolute;
top: 0;
width: 200px;
margin: 0;
padding: 0;
list-style: none;
}
.sidebar-nav li {
text-indent: 20px;
line-height: 40px;
}
.sidebar-nav>li.header {
color: #4b646f;
background-color: #1a2226;
line-height: 35px !important;
}
.main-nav {
/* background-color: #161926 !important;*/
}
/*.main-nav a {
color: #fff !important;
}
*/
.sidebar-nav li a {
display: block;
text-decoration: none;
color: #999999;
}
.sidebar-nav li a:hover {
text-decoration: none;
color: #fff;
background: rgba(255, 255, 255, 0.2);
}
.sidebar-nav li a:active,
.sidebar-nav li a:focus {
text-decoration: none;
}
.sidebar-nav > .sidebar-brand {
height: 65px;
font-size: 18px;
line-height: 60px;
}
.sidebar-nav > .sidebar-brand a {
color: #999999;
}
.sidebar-nav > .sidebar-brand a:hover {
color: #fff;
background: none;
}
@media(min-width:768px) {
#wrapper {
padding-left: 0;
}
#wrapper.toggled {
padding-left: 210px;
}
#sidebar-wrapper {
width: 0;
}
#wrapper.toggled #sidebar-wrapper {
width: 216px;
}
#page-content-wrapper {
padding: 0px;
position: relative;
}
#wrapper.toggled #page-content-wrapper {
position: relative;
margin-right: 0;
}
}
.dropdown-item{
padding: 0px 1.5rem !important;
}
.sidebar-sub-menu {
position: relative !important;
width: 200px;
list-style: none;
font-size: 14px;
background-color: #161926;
padding: 0px !important;
margin: 0px !important;
}
.sidebar-sub-item {
display: block;
width: 100%;
/*clear: both;*/
/*font-weight: normal;*/
/*color: #292b2c;
text-align: inherit;
white-space: nowrap;
background: none;
border: 0;*/
}
.fa{
}
.custom-fa-arrow{
font-size: 20px !important;
font-weight: bold;
padding: 9px 20px;
}

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

@@ -1,4 +1,6 @@
<div class="row">
<!-- Page Content -->
<div class="row">
<div class="col-md-9 col-lg-9"> <div class="col-md-9 col-lg-9">
<h4><strong>Role Features</strong></h4> <h4><strong>Role Features</strong></h4>
<!-- <p><strong>Note:</strong> The <strong>data-parent</strong> attribute makes sure that all collapsible elements under the specified parent will be closed when one of the collapsible item is shown.</p> --> <!-- <p><strong>Note:</strong> The <strong>data-parent</strong> attribute makes sure that all collapsible elements under the specified parent will be closed when one of the collapsible item is shown.</p> -->
@@ -171,21 +173,16 @@
<div class="card-content dashboard-nav">CRM</div> <div class="card-content dashboard-nav">CRM</div>
</div> </div>
<!-- No Needs
<div class="card" id="backend" onclick="location.href='<%= dashboard_path %>'">
<div class="card-content">
<span class="card-title">Backend</span>
</div>
</div> -->
<div class="card" id="backend" onclick="location.href='<%= inventory_path %>'"> <div class="card" id="backend" onclick="location.href='<%= inventory_path %>'">
<div class="card-content dashboard-nav">Inventory</div> <div class="card-content dashboard-nav">Inventory</div>
</div> </div>
</div> </div>
</div>
<div class="footer" style="background-color: inherit">
<div class="card"> </div>
<div class="" style="background-color: inherit;">
<div class="">
<div class="page-header center-text"> <div class="page-header center-text">
<h4 class="footer-header"> <h4 class="footer-header">
<%= @shop.name %> <%= @shop.name %>

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

@@ -1,10 +1,14 @@
<nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav"> <nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <a href="#" class=" btn btn-info btn-sm " id="sx-menu-toggle" data-toggle="push-menu" role="button">
</button> <span class="fa fa-bars" ></span>
<a class="navbar-brand" href="<%= root_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a> </a>
<a class="navbar-brand" href="<%= dashboard_path %>" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
<div class="collapse navbar-collapse" id="navbarCollapse"> <div class="collapse navbar-collapse" id="navbarCollapse">
<ul class="navbar-nav mr-auto"> <!-- <ul class="navbar-nav mr-auto">
<li class="navbar-nav mr-auto dropdown"> <li class="navbar-nav mr-auto dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Settings</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@@ -70,7 +74,7 @@
</li> </li>
</ul> </ul> -->
</div> </div>
<% if current_login_employee %> <% if current_login_employee %>
@@ -94,3 +98,10 @@
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
</style> </style>
<!-- Menu Toggle Script -->
<script>
$("#sx-menu-toggle").click(function(e) {
e.preventDefault();
$("#wrapper").toggleClass("toggled");
});
</script>

85
app/views/layouts/_sidebar.html.erb Normal file
View File

@@ -0,0 +1,85 @@
<div id="sidebar-wrapper">
<ul class="sidebar-nav">
<li class="header"><a>Main Navigation</a></li>
<li>
<%= link_to "Dashboard ", dashboard_path,:class =>"" %>
</li>
<li>
<%= link_to "OQS ", oqs_root_path,:class =>"" %>
</li>
<li>
<%= link_to "Cashier ", origami_root_path,:class =>"" %>
</li>
<li>
<%= link_to "CRM ", crm_customers_path,:class =>"" %>
</li>
<li>
<%= link_to "Inventory ", transactions_sales_path,:class =>"" %>
</li>
<li class="header"><a>Settings</a></li>
<li>
<%= link_to "Zones ", transactions_sales_path,:class =>"" %>
</li>
<li>
<%= link_to "Order Queue Station ", transactions_sales_path,:class =>"" %>
</li>
<li>
<%= link_to "Menu ", settings_menus_path,:class =>"" %>
</li>
<li>
<%= link_to "Cashier Terminal ", transactions_sales_path,:class =>"" %>
</li>
<li>
<%= link_to "Print Settings ", transactions_sales_path,:class =>"" %>
</li>
<li>
<%= link_to "Staff ", settings_menus_path,:class =>"" %>
</li>
<li>
<%= link_to "Product ", transactions_sales_path,:class =>"" %>
</li>
<li>
<%= link_to "Promotion ", transactions_sales_path,:class =>"" %>
</li>
<li>
<div class="dropdown">
<a class="custom-dropdown" href="#" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Transaction <i class="fa fa-angle-left pull-right custom-fa-arrow"></i>
</a>
<div class="dropdown-menu sidebar-sub-menu" aria-labelledby="dropdownMenuButton">
<%= link_to "Orders ", transactions_orders_path,:class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Sales ", transactions_sales_path,:class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"dropdown-item sidebar-sub-item" %>
</div>
</div>
</li>
<!-- <li>
<div class="dropdown">
<a class="custom-dropdown" href="#" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" ariaroot_path-expanded="false">
Transaction <i class="fa fa-angle-left pull-right custom-fa-arrow"></i>
</a>
<div class="dropdown-menu sidebar-sub-menu" aria-labelledby="dropdownMenuButton">
<%= link_to "Daily Sale Report", reports_dailysale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Sales Item Report", reports_saleitem_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Receipt Report", reports_receipt_no_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Shift Sale Report", reports_shiftsale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Credit Sale Report", reports_credit_payment_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Void Sale Report", reports_void_sale_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Commission Report", reports_commission_index_path, :class =>"dropdown-item sidebar-sub-item" %>
<%= link_to "Stock Check Report", reports_stock_check_index_path, :class =>"dropdown-item sidebar-sub-item" %>
</div>
</div>
</li> -->
<li>
<%= link_to "Reports", reports_dailysale_index_path, :class =>"" %>
</li>
</ul>
</div>

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

@@ -12,9 +12,11 @@
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'sx-sidebar', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'popper.min', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body> <body>
@@ -35,8 +37,16 @@
<%= message %> <%= message %>
</div> </div>
<% end %> <% end %>
<div id="wrapper">
<!-- Sidebar -->
<%=render 'layouts/sidebar' %>
<!-- /#sidebar-wrapper -->
<div id="page-content-wrapper">
<%= yield %> <%= yield %>
</div> </div>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){

9
app/views/reports/commission/_commission_report_filter.html.erb
View File

@@ -1,6 +1,5 @@
<div class="row">
<div class="col-md-12"> <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
<%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
@@ -34,9 +33,7 @@
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">

20
app/views/reports/commission/index.html.erb
View File

@@ -1,3 +1,5 @@
<div class="row">
<div class="col-md-12">
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
@@ -5,23 +7,23 @@
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial => 'commission_report_filter', <%= render :partial => 'commission_report_filter',
:locals => {:period_type => true, :shift_name => true, :report_path => reports_commission_index_path} %> :locals => {:period_type => true, :shift_name => true, :report_path => reports_commission_index_path} %>
<hr/> <hr/>
</div> <!-- </div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="text-right">
<a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-default">Export to <a href="javascript:export_to('<%= reports_commission_index_path %>.xls')" class="btn btn-default">Export to
Excel</a> Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>

32
app/views/reports/credit_payment/_shift_sale_report_filter.html.erb
View File

@@ -1,6 +1,5 @@
<div class="row">
<div class="col-md-12"> <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
@@ -40,13 +39,10 @@
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$('#custom_excel').hide(); $('#custom_excel').hide();
$('#custom_excel').click(function(){ $('#custom_excel').click(function(){
@@ -75,7 +71,7 @@ $(function(){
$('#cashier').show(); $('#cashier').show();
$("#item").val('sale'); $("#item").val('sale');
} }
}); });
<% if params[:shift_name].to_i > 0%> <% if params[:shift_name].to_i > 0%>
shift_id = '<%= params[:shift_name] %>' shift_id = '<%= params[:shift_name] %>'
@@ -83,7 +79,7 @@ $(function(){
var shift = $('#shift_name'); var shift = $('#shift_name');
str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>'; str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
shift.append(str); shift.append(str);
<% end %> <% end %>
$("#from").val("<%=params[:from] rescue '-'%>"); $("#from").val("<%=params[:from] rescue '-'%>");
$("#to").val("<%=params[:to] rescue '-'%>"); $("#to").val("<%=params[:to] rescue '-'%>");
@@ -94,16 +90,16 @@ $(function(){
// $('.shift_name > option[value="'+shift+'"]').attr('selected','selected'); // $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
// } // }
<% if params[:period_type] == 1 || params[:period_type] == "1" %> <% if params[:period_type] == 1 || params[:period_type] == "1" %>
$("#rd_period_type_1").attr("checked","checked"); $("#rd_period_type_1").attr("checked","checked");
<% else %> <% else %>
$("#rd_period_type_0").attr("checked","checked"); $("#rd_period_type_0").attr("checked","checked");
<% end %> <% end %>
$(".btn-group button").removeClass("active"); $(".btn-group button").removeClass("active");
<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
$("#btn_report_type_<%= report_type %>").addClass("active"); $("#btn_report_type_<%= report_type %>").addClass("active");
$('#item').change(function(){ $('#item').change(function(){
var item = $('#item').val(); var item = $('#item').val();
var payment_type = $('#payment_type'); var payment_type = $('#payment_type');
@@ -121,5 +117,5 @@ $('#item').change(function(){
$('#payment_type').hide(); $('#payment_type').hide();
} }
} }
}); });
</script> </script>

18
app/views/reports/credit_payment/index.html.erb
View File

@@ -5,22 +5,22 @@
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter', <%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %> :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %>
<hr /> <hr />
</div> <!-- </div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="text-right">
<a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-default">Export to Excel</a> <a href="javascript:export_to('<%=reports_credit_payment_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card ">
<% unless @sale_data.blank? %> <% unless @sale_data.blank? %>
<table class="table table-striped" border="0"> <table class="table table-striped" border="0">

40
app/views/reports/dailysale/_shift_sale_report_filter.html.erb
View File

@@ -1,6 +1,5 @@
<div class="row">
<div class="col-md-12"> <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
@@ -36,18 +35,6 @@
</div> </div>
<% end %> <% end %>
<!-- <div class="row">
<% if defined? show_monthly %>
<div class="span3" style="margin-bottom:10px;">
<input type="hidden" id="report_type" name="report_type" value="0">
<div class="btn-group" data-toggle="buttons-radio">
<button id="btn_report_type_1" onclick="$('#report_type').val(1)" type="button" class="btn btn-inverse">Monthly</button>
<button id="btn_report_type_2" onclick="$('#report_type').val(2)" type="button" class="btn btn-inverse">Yearly</button>
</div>
</div>
<% end %>
</div> -->
<div class="row"> <div class="row">
<div class="form-group"> <div class="form-group">
<% if defined? promotions %> <% if defined? promotions %>
@@ -64,8 +51,7 @@
<% if defined? shift_name %> <% if defined? shift_name %>
<!-- Temporary no needs <!-- Temporary no needs
<select name="shift_name" id="shift_name"></select> <select name="shift_name" id="shift_name"></select> -->
-->
<% end %> <% end %>
<% if defined? cashiers %> <% if defined? cashiers %>
@@ -98,25 +84,17 @@
</div> </div>
</div> </div>
<!-- <div class="row"> <% end %>
<div class="col-md-12">
<input type="submit" value="Generate Report" class='btn btn-primary'>
</div>
</div> -->
<% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$('#custom_excel').hide(); $('#custom_excel').hide();
$('#custom_excel').click(function(){ $('#custom_excel').click(function(){
var url = $('#custom_excel').attr('data-url'); var url = $('#custom_excel').attr('data-url');
$('#frm_report').attr('action',url) $('#frm_report').attr('action',url)
$('#frm_report').submit(); $('#frm_report').submit();
// window.location = url;
}); });
var item = $('#item').val(); var item = $('#item').val();
@@ -138,7 +116,7 @@ $(function(){
$('#cashier').show(); $('#cashier').show();
$("#item").val('sale'); $("#item").val('sale');
} }
}); });
//Reset the form to pervious values //Reset the form to pervious values
$("#branch").val(<%=params[:branch]%>); $("#branch").val(<%=params[:branch]%>);
@@ -156,9 +134,9 @@ $("#sel_period").val(<%=params[:period]%>);
$("#sel_sale_type").val(<%=params[:sale_type]%>); $("#sel_sale_type").val(<%=params[:sale_type]%>);
<% if params[:period_type] == 1 || params[:period_type] == "1" %> <% if params[:period_type] == 1 || params[:period_type] == "1" %>
$("#rd_period_type_1").attr("checked","checked"); $("#rd_period_type_1").attr("checked","checked");
<% else %> <% else %>
$("#rd_period_type_0").attr("checked","checked"); $("#rd_period_type_0").attr("checked","checked");
<% end %> <% end %>
$(".btn-group button").removeClass("active"); $(".btn-group button").removeClass("active");
<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>

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

@@ -1,26 +1,35 @@
<div class="page-header"> <div class="row">
<div class="col-md-12">
<div class="row">
<div class="page-header col-md-12 col-lg-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
<li>Daily Sale Report</li> <li>Daily Sale Report</li>
</ul> </ul>
</div> </div>
</div>
<div class="container"> <!-- <div class="row">
<div class="col-md-12 col-lg-12"> -->
<!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter', <%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %> :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %>
<hr /> <hr />
</div> <!-- </div> -->
<!-- </div>
</div> -->
<div class="container"> <!-- <div class="row"> -->
<div class="row"> <!-- <div class="container"> -->
<div class="col-md-12 text-right"> <div class=" text-right">
<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a> <a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="row">
<div class="card row"> <div class="col-md-12 col-lg-12">
<div class="card ">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
@@ -136,4 +145,8 @@
</table> </table>
</div> </div>
</div> </div>
</div>
</div>
</div>
</div> </div>

31
app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
View File

@@ -1,6 +1,4 @@
<div class="row"> <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<div class="col-md-12">
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
@@ -45,13 +43,10 @@
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$('#custom_excel').hide(); $('#custom_excel').hide();
$('#custom_excel').click(function(){ $('#custom_excel').click(function(){
@@ -80,7 +75,7 @@ $(function(){
$('#cashier').show(); $('#cashier').show();
$("#item").val('sale'); $("#item").val('sale');
} }
}); });
<% if params[:shift_name].to_i > 0%> <% if params[:shift_name].to_i > 0%>
shift_id = '<%= params[:shift_name] %>' shift_id = '<%= params[:shift_name] %>'
@@ -88,7 +83,7 @@ $(function(){
var shift = $('#shift_name'); var shift = $('#shift_name');
str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>'; str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
shift.append(str); shift.append(str);
<% end %> <% end %>
$("#from").val("<%=params[:from] rescue '-'%>"); $("#from").val("<%=params[:from] rescue '-'%>");
$("#to").val("<%=params[:to] rescue '-'%>"); $("#to").val("<%=params[:to] rescue '-'%>");
@@ -99,16 +94,16 @@ $(function(){
// $('.shift_name > option[value="'+shift+'"]').attr('selected','selected'); // $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
// } // }
<% if params[:period_type] == 1 || params[:period_type] == "1" %> <% if params[:period_type] == 1 || params[:period_type] == "1" %>
$("#rd_period_type_1").attr("checked","checked"); $("#rd_period_type_1").attr("checked","checked");
<% else %> <% else %>
$("#rd_period_type_0").attr("checked","checked"); $("#rd_period_type_0").attr("checked","checked");
<% end %> <% end %>
$(".btn-group button").removeClass("active"); $(".btn-group button").removeClass("active");
<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
$("#btn_report_type_<%= report_type %>").addClass("active"); $("#btn_report_type_<%= report_type %>").addClass("active");
$('#item').change(function(){ $('#item').change(function(){
var item = $('#item').val(); var item = $('#item').val();
var payment_type = $('#payment_type'); var payment_type = $('#payment_type');
@@ -126,5 +121,5 @@ $('#item').change(function(){
$('#payment_type').hide(); $('#payment_type').hide();
} }
} }
}); });
</script> </script>

28
app/views/reports/receipt_no/index.html.erb
View File

@@ -1,26 +1,28 @@
<div class="page-header"> <div class="row">
<div class="col-md-12">
<div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
<li>Receipt List Report</li> <li>Receipt List Report</li>
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter', <%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %> :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
<hr /> <hr />
</div> <!-- </div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="text-right">
<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a> <a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card">
<table class="table table-striped" border="0"> <table class="table table-striped" border="0">
<thead> <thead>
@@ -115,7 +117,9 @@
<%end%> <%end%>
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</div>
</div> </div>
<script> <script>

6
app/views/reports/saleitem/_shift_sale_report_filter.html.erb
View File

@@ -1,5 +1,4 @@
<div class="row">
<div class="col-md-12">
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
@@ -52,8 +51,7 @@
<% end %> <% end %>
<% end %> <% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$('#custom_excel').hide(); $('#custom_excel').hide();

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

@@ -1,28 +1,30 @@
<div class="page-header"> <div class="row">
<div class="col-md-12">
<div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
<li>Sale Item Report</li> <li>Sale Item Report</li>
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter', <%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %> :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_saleitem_index_path} %>
<hr /> <hr />
</div> <!-- /div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="text-right">
<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-default">Export to Excel</a> <a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
@@ -164,10 +166,12 @@
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> --> <!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> <td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
<script> <script>
@@ -273,5 +277,5 @@
}); });
} }
}); });
</script> </script>

28
app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
View File

@@ -1,6 +1,5 @@
<div class="row">
<div class="col-md-12"> <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
@@ -39,12 +38,11 @@
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$('#custom_excel').hide(); $('#custom_excel').hide();
$('#custom_excel').click(function(){ $('#custom_excel').click(function(){
@@ -73,15 +71,15 @@ $(function(){
$('#cashier').show(); $('#cashier').show();
$("#item").val('sale'); $("#item").val('sale');
} }
}); });
//Reset the form to pervious values //Reset the form to pervious values
<% if params[:shift_name].to_i > 0%> <% if params[:shift_name].to_i > 0%>
shift_id = '<%= params[:shift_name] %>' shift_id = '<%= params[:shift_name] %>'
local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>' local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>'
var shift = $('#shift_name'); var shift = $('#shift_name');
str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>'; str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
shift.append(str); shift.append(str);
<% end %> <% end %>
$("#from").val("<%=params[:from]%>"); $("#from").val("<%=params[:from]%>");
$("#to").val("<%=params[:to]%>"); $("#to").val("<%=params[:to]%>");
@@ -89,9 +87,9 @@ $("#sel_period").val(<%=params[:period]%>);
$("#sel_sale_type").val(<%=params[:sale_type]%>); $("#sel_sale_type").val(<%=params[:sale_type]%>);
<% if params[:period_type] == 1 || params[:period_type] == "1" %> <% if params[:period_type] == 1 || params[:period_type] == "1" %>
$("#rd_period_type_1").attr("checked","checked"); $("#rd_period_type_1").attr("checked","checked");
<% else %> <% else %>
$("#rd_period_type_0").attr("checked","checked"); $("#rd_period_type_0").attr("checked","checked");
<% end %> <% end %>
$(".btn-group button").removeClass("active"); $(".btn-group button").removeClass("active");
<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>

24
app/views/reports/shiftsale/index.html.erb
View File

@@ -1,29 +1,31 @@
<div class="page-header"> <div class="row">
<div class="col-md-12">
<div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
<li>Shift Sale Report</li> <li>Shift Sale Report</li>
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter', <%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %> :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %>
<hr /> <hr />
</div> <!-- </div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="text-right">
<a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a> <a href="javascript:export_to('<%=reports_shiftsale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<!-- <div class="span11"> <!-- <div class="span11">
<div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div> <div id="report_container" style="min-width: 400px; height: 400px; margin: 0 auto"></div>
</div> --> </div> -->
<div class="card row"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>

6
app/views/reports/stock_check/_stock_check_report_filter.html.erb
View File

@@ -1,5 +1,4 @@
<div class="row">
<div class="col-md-12">
<%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %> <%= form_tag report_path, :method => :get, :id => "frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
@@ -38,8 +37,7 @@
<% end %> <% end %>
<% end %> <% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">

30
app/views/reports/stock_check/index.html.erb
View File

@@ -1,27 +1,29 @@
<div class="page-header"> <div class="row">
<div class="col-md-12">
<div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
<li>Stock Check Report</li> <li>Stock Check Report</li>
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial => 'stock_check_report_filter', <%= render :partial => 'stock_check_report_filter',
:locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %> :locals => {:period_type => true, :shift_name => true, :report_path => reports_stock_check_index_path} %>
<hr/> <hr/>
</div> <!-- </div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="text-right">
<a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to <a href="javascript:export_to('<%= reports_stock_check_index_path %>.xls')" class="btn btn-default">Export to
Excel</a> Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
@@ -79,9 +81,9 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
$(function () { $(function () {
}); });
</script> </script>

33
app/views/reports/void_sale/_shift_sale_report_filter.html.erb
View File

@@ -1,6 +1,5 @@
<div class="row">
<div class="col-md-12"> <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
<% if period_type != false %> <% if period_type != false %>
<div class="row"> <div class="row">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
@@ -39,14 +38,10 @@
</div> </div>
</div> </div>
<% end %> <% end %>
<% end %>
<% end %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(function(){ $(function(){
$('#custom_excel').hide(); $('#custom_excel').hide();
$('#custom_excel').click(function(){ $('#custom_excel').click(function(){
@@ -75,7 +70,7 @@ $(function(){
$('#cashier').show(); $('#cashier').show();
$("#item").val('sale'); $("#item").val('sale');
} }
}); });
<% if params[:shift_name].to_i > 0%> <% if params[:shift_name].to_i > 0%>
shift_id = '<%= params[:shift_name] %>' shift_id = '<%= params[:shift_name] %>'
@@ -83,7 +78,7 @@ $(function(){
var shift = $('#shift_name'); var shift = $('#shift_name');
str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>'; str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
shift.append(str); shift.append(str);
<% end %> <% end %>
$("#from").val("<%=params[:from] rescue '-'%>"); $("#from").val("<%=params[:from] rescue '-'%>");
$("#to").val("<%=params[:to] rescue '-'%>"); $("#to").val("<%=params[:to] rescue '-'%>");
@@ -94,16 +89,16 @@ $(function(){
// $('.shift_name > option[value="'+shift+'"]').attr('selected','selected'); // $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
// } // }
<% if params[:period_type] == 1 || params[:period_type] == "1" %> <% if params[:period_type] == 1 || params[:period_type] == "1" %>
$("#rd_period_type_1").attr("checked","checked"); $("#rd_period_type_1").attr("checked","checked");
<% else %> <% else %>
$("#rd_period_type_0").attr("checked","checked"); $("#rd_period_type_0").attr("checked","checked");
<% end %> <% end %>
$(".btn-group button").removeClass("active"); $(".btn-group button").removeClass("active");
<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
$("#btn_report_type_<%= report_type %>").addClass("active"); $("#btn_report_type_<%= report_type %>").addClass("active");
$('#item').change(function(){ $('#item').change(function(){
var item = $('#item').val(); var item = $('#item').val();
var payment_type = $('#payment_type'); var payment_type = $('#payment_type');
@@ -121,5 +116,5 @@ $('#item').change(function(){
$('#payment_type').hide(); $('#payment_type').hide();
} }
} }
}); });
</script> </script>

30
app/views/reports/void_sale/index.html.erb
View File

@@ -1,26 +1,28 @@
<div class="page-header"> <div class="row">
<div class="col-md-12">
<div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= dashboard_path %>">Home</a></li> <li><a href="<%= dashboard_path %>">Home</a></li>
<li>Void Sale Report</li> <li>Void Sale Report</li>
</ul> </ul>
</div> </div>
<div class="container"> <!-- <div class="container"> -->
<%= render :partial=>'shift_sale_report_filter', <%= render :partial=>'shift_sale_report_filter',
:locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %> :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %>
<hr /> <hr />
</div> <!-- </div> -->
<div class="container"> <!-- <div class="container"> -->
<div class="row"> <!-- <div class="row"> -->
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<a href="javascript:export_to('<%=reports_void_sale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a> <a href="javascript:export_to('<%=reports_void_sale_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
</div> </div>
</div> <!-- </div> -->
</div> <!-- </div> -->
<div class="container margin-top-20"> <div class="margin-top-20">
<div class="card row"> <div class="card">
<% if @sale_data.count > 0 %> <% if @sale_data.count > 0 %>
<table class="table table-striped" border="0"> <table class="table table-striped" border="0">
<thead> <thead>
@@ -79,19 +81,15 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<% end %> <% end %>
</div>
</div> </div>
</div>
<script> <script>
$(function(){ $(function(){
var check_arr = []; var check_arr = [];
$('#sel_period').change(function(){ $('#sel_period').change(function(){
search_by_period(); search_by_period();
}); });
function search_by_period(){ function search_by_period(){

4
config/initializers/assets.rb
View File

@@ -37,6 +37,10 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
Rails.application.config.assets.precompile += %w( addorder.css ) Rails.application.config.assets.precompile += %w( addorder.css )
Rails.application.config.assets.precompile += %w( addorder.js ) Rails.application.config.assets.precompile += %w( addorder.js )
# --- Custom SX Themem ----
Rails.application.config.assets.precompile += %w( sx-sidebar.css )
Rails.application.config.assets.precompile += %w( popper.min.js )
# --- Inventory Definition ---- # --- Inventory Definition ----
Rails.application.config.assets.precompile += %w( inventory_definitions.css ) Rails.application.config.assets.precompile += %w( inventory_definitions.css )