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

remove conflict

Browse Source
This commit is contained in:
phyusin
2018-07-13 14:49:56 +06:30
parent 72a5289072 043a1efb2a
commit 0096c1479d
5 changed files with 36 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/home_controller.rb
View File

@@ -20,7 +20,9 @@ class HomeController < ApplicationController
def index def index
# @employees = Employee.all_emp_except_waiter.order("name asc") # @employees = Employee.all_emp_except_waiter.order("name asc")
@employees = Employee.all.where("is_active = true").order("name asc") @employees = Employee.all.where("is_active = true").order("name asc")
@roles = Lookup.collection_of("employee_roles") @roles = Employee.distinct.pluck(:role)
# byebug
# @roles = Lookup.collection_of("employee_roles")
@login_form = LoginForm.new() @login_form = LoginForm.new()
render "layouts/login_dashboard", layout: false render "layouts/login_dashboard", layout: false
end end

4
app/controllers/origami/master_controller.rb
View File

@@ -79,7 +79,11 @@ class Origami::MasterController < BaseOrigamiController
payment_for = true payment_for = true
end end
sale_payment = SalePayment.new sale_payment = SalePayment.new
<<<<<<< HEAD
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for)
=======
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no)
>>>>>>> 043a1efb2a59c3793b56184a342ba6d132cf57f9
end end
end end

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

@@ -78,7 +78,6 @@ class Origami::VisaController < BaseOrigamiController
payment_for = true payment_for = true
end end
sale_payment = SalePayment.new sale_payment = SalePayment.new
@status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "visa",ref_no,payment_for) @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "visa",ref_no,payment_for)
end end
end end

2
app/controllers/settings/tables_controller.rb
View File

@@ -60,7 +60,7 @@ class Settings::TablesController < ApplicationController
def destroy def destroy
@settings_table.destroy @settings_table.destroy
flash[:notice] = 'Table was successfully destroyed.' flash[:notice] = 'Table was successfully destroyed.'
render :json => {:status=> "Success", :url => settings_zone_path(@zone) }.to_json render :json => {:status=> "Success", :url => settings_zones_path(@zone) }.to_json
# respond_to do |format| # respond_to do |format|
# format.html { redirect_to settings_zone_path(@zone), notice: 'Table was successfully destroyed.' } # format.html { redirect_to settings_zone_path(@zone), notice: 'Table was successfully destroyed.' }
# format.json { head :no_content } # format.json { head :no_content }

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

@@ -113,9 +113,9 @@
<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[1] != "administrator" %> <%if role != "administrator" %>
<li class="nav-item">role <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#<%=role[1]%>" role="tab"><b><%=role[0]%></b></a> <a class="nav-link" data-toggle="tab" href="#<%=role%>" role="tab"><b><%=role%></b></a>
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
@@ -124,9 +124,11 @@
<div class="tab-content" style="max-height:650px; overflow:auto"> <div class="tab-content" style="max-height:650px; overflow:auto">
<div class="tab-pane" id="manager" role="tabpanel" style="max-height:; overflow:auto"> <% @roles.each do |role| %>
<%if role != "administrator" %>
<div class="tab-pane" id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %> <% @employees.each do |employee| %>
<%if employee.role == "manager" %> <%if employee.role == role %>
<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> <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 id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
</form> </form>
@@ -147,102 +149,9 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<div class="tab-pane" id="supervisor" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %>
<%if employee.role == "supervisor" %>
<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>
<%if employee.image_path.present? %>
<div class="login_dashboard p-card">
<%= image_tag employee.image_path, :class => "style_image" %>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% end %>
</div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<div class="tab-pane" id="cashier" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %>
<%if employee.role == "cashier" %>
<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>
<%if employee.image_path.present? %>
<div class="login_dashboard p-card">
<%= image_tag employee.image_path, :class => "style_image" %>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% end %>
</div>
<% end %>
<% end %>
</div>
<div class="tab-pane" id="account" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %>
<%if employee.role == "account" %>
<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>
<%if employee.image_path.present? %>
<div class="login_dashboard p-card">
<%= image_tag employee.image_path, :class => "style_image" %>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% end %>
</div>
<% end %>
<% end %>
</div>
<div class="tab-pane" id="waiter" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %>
<%if employee.role == "waiter" %>
<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>
<%if employee.image_path.present? %>
<div class="login_dashboard p-card">
<%= image_tag employee.image_path, :class => "style_image" %>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
<% end %>
</div>
<% 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>