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

Active tab in dashboard, Manager Tab, Union Payment

Browse Source
This commit is contained in:
San Wai Lwin
2018-03-13 17:53:04 +06:30
parent a0c6c363fd
commit 84fe089568
4 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,11 @@
background-color: #2790a5;
}
.active_tab{
border-style: solid;
border-color: #2790a5;
}
.login-page {
margin: 0% auto;
background-color: #2790a5;

1
app/controllers/origami/unionpay_controller.rb
View File

@@ -8,6 +8,7 @@ class Origami::UnionpayController < BaseOrigamiController
@unionpaycount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

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

@@ -105,6 +105,14 @@
</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">
<ul class="nav nav-tabs" role="tablist">
<% @employees.each do |employee| %>
<%if employee.role == "manager" %>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#manager" role="tab"><b>Manager</b></a>
<% break %>
</li>
<% end %>
<% end %>
<% @employees.each do |employee| %>
<%if employee.role == "supervisor" %>
<li class="nav-item">
@@ -144,6 +152,21 @@
<div class="tab-content" style="max-height:650px; overflow:auto">
<div class="tab-pane" id="manager" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %>
<%if employee.role == "manager" %>
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" 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>
<div class="login_dashboard p-card">
<i class="material-icons md-48" style="font-size: 100px;">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
</div>
<% end %>
<% end %>
</div>
<div class="tab-pane" id="supervisor" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %>
<%if employee.role == "supervisor" %>
@@ -239,8 +262,8 @@
$('ul.nav.nav-tabs li a').click(function() {
var bb = $('.nav-item').children()[0];
$(bb).removeClass('login_dashboard');
$(this).parent().addClass('login_dashboard').siblings().removeClass('login_dashboard');
$(bb).removeClass('active_tab');
$(this).parent().addClass('active_tab').siblings().removeClass('active_tab');
});
$("#emp_id").focus();
@@ -285,7 +308,7 @@
var aa = $('.nav-item').children().attr('href').replace('#','');
$('#'+aa).addClass('active');
var bb = $('.nav-item').children()[0];
$(bb).addClass('login_dashboard').siblings().removeClass('login_dashboard');
$(bb).parent().addClass('active_tab').siblings().removeClass('active_tab');
});

1
app/views/origami/unionpay/index.html.erb
View File

@@ -12,7 +12,6 @@
</span>
</ol>
</div> -->
<h5>UNIONPAY Payment</h5>
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-5">
<span class="hidden" id="membership_id"><%= @membership_id%></span>