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

merge with august spring from phyo

Browse Source
This commit is contained in:
Yan
2017-08-09 18:10:06 +06:30
parent 2794103e52 14384745ad
commit dd6cffec68
10 changed files with 180 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/crm/customers/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="row"> <!-- <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= crm_root_path %>">Home</a></li> <li><a href="<%= crm_root_path %>">Home</a></li>
@@ -7,10 +7,10 @@
</li> </li>
<!-- <a href="<%= new_crm_customer_path%>" class="btn btn-primary pull-right"> <!-- <a href="<%= new_crm_customer_path%>" class="btn btn-primary pull-right">
<i class="fa fa-plus-circle fa-lg"></i> Add Customer <i class="fa fa-plus-circle fa-lg"></i> Add Customer
</a> --> </a>
</ol> </ol>
</div> </div>
</div> </div> -->
<div class="row"> <div class="row">
<div class="col-lg-7 col-md-7 col-sm-7"> <div class="col-lg-7 col-md-7 col-sm-7">
@@ -234,4 +234,3 @@ $(document).on('click',".customer_tr",function(){
}); });
</script> </script>

8
app/views/crm/dining_queues/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="page-header"> <!-- <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li> <li><a href="<%= %>">Home</a></li>
<li>Queue</li> <li>Queue</li>
@@ -6,13 +6,13 @@
<%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-sm' %> <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-sm' %>
</span> </span>
</ul> </ul>
</div> </div> -->
<div class="row"> <div class="row">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-11 col-md-11 col-sm-11"> <div class="col-lg-11 col-md-11 col-sm-11">
<div class="tab-content" style="max-height:670px; overflow-y:scroll"> <div class="tab-content" style="max-height:670px; overflow-y:auto">
<!--- Panel 1 - Table Orders --> <!--- Panel 1 - Table Orders -->
<div class="active" role="tabpanel"> <div class="active" role="tabpanel">
@@ -48,6 +48,8 @@
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-lg btn-block' %>
<hr>
<button type="button" id="assign" class="btn btn-primary btn-lg btn-block" disabled>Assign</button> <button type="button" id="assign" class="btn btn-primary btn-lg btn-block" disabled>Assign</button>
<button type="button" id="cancel" class="btn btn-warning btn-lg btn-block" disabled>Cancel</button> <button type="button" id="cancel" class="btn btn-warning btn-lg btn-block" disabled>Cancel</button>
<a href="<%= dashboard_path %>" class="btn btn-primary btn-lg btn-block" role="button" aria-haspopup="true" aria-expanded="false"> Back </a> <a href="<%= dashboard_path %>" class="btn btn-primary btn-lg btn-block" role="button" aria-haspopup="true" aria-expanded="false"> Back </a>

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

@@ -8,22 +8,25 @@
<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">
<li><%= link_to "Zones (Zone,Table,Rooms)", settings_zones_path, :tabindex =>"-1" %></li>
<hr class="hr_advance" />
<li><%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %></li>
<hr class="hr_advance" />
<li><%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %></li> <li><%= link_to "Menus ", settings_menus_path, :tabindex =>"-1" %></li>
<li><%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %></li> <li><%= link_to "Menu Categories", settings_menu_categories_path, :tabindex =>"-1" %></li>
<li><%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %></li> <li><%= link_to "Menu Item Attributes", settings_menu_item_attributes_path, :tabindex =>"-1" %></li>
<li><%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %></li> <li><%= link_to "Menu Item Options",settings_menu_item_options_path, :tabindex =>"-1" %></li>
<hr> <hr class="hr_advance" />
<li><%= link_to "Order Queue Stations",settings_order_queue_stations_path, :tabindex =>"-1" %></li> <li><%= link_to "Cashier Terminals", settings_cashier_terminals_path, :tabindex =>"-1" %></li>
<li><%= link_to "Zones", settings_zones_path, :tabindex =>"-1" %></li> <li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
<hr> <hr class="hr_advance" />
<li><%= link_to "Cashier Terminals ", settings_cashier_terminals_path, :tabindex =>"-1" %></li>
<li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
<li><%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %></li> <li><%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %></li>
<li><%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %></li> <li><%= link_to "Membership Action",settings_membership_actions_path, :tabindex =>"-1" %></li>
<li><%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %></li> <li><%= link_to "Payment Methods", settings_payment_method_settings_path, :tabindex =>"-1" %></li>
<li><%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %></li>
<li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li> <li><%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %></li>
<hr> <hr class="hr_advance" />
<li><%= link_to "Employees", settings_employees_path, :tabindex =>"-1" %></li>
<hr class="hr_advance" />
<li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li> <li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
</ul> </ul>
</li> </li>
@@ -76,3 +79,9 @@
<% end %> <% end %>
</nav> </nav>
<style type="text/css">
hr.hr_advance {
margin-top: 10px !important;
margin-bottom: 10px !important;
}
</style>

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

@@ -1,7 +1,7 @@
<div class='row'> <div class='row'>
<div class="col-lg-11 col-md-11 col-sm-11"> <div class="col-lg-11 col-md-11 col-sm-11">
<h2> Payment Credit </h2> <h2> Cash In </h2>
<br> <br>
<table class='table table-striped'> <table class='table table-striped'>
<tr> <tr>

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

@@ -2,7 +2,7 @@
<div class='row'> <div class='row'>
<div class="col-lg-11 col-md-11 col-sm-11"> <div class="col-lg-11 col-md-11 col-sm-11">
<h2>Payment Debit</h2> <h2>Cash Out</h2>
<table class='table table-striped'> <table class='table table-striped'>
<tr> <tr>
<td> Payment Reference <td> Payment Reference

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

@@ -2,7 +2,7 @@
<div class="col-lg-11col-md-11 col-sm-11"> <div class="col-lg-11col-md-11 col-sm-11">
<div > <div >
<div > <div >
<% @payment_method_setting.each do |payment_method|%> <% @payment_method_setting.where("is_active = true").each do |payment_method|%>
<div class="purple others-payment bottom left" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div> <div class="purple others-payment bottom left" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
<% end %> <% end %>
</div> </div>

6
app/views/settings/employees/index.html.erb
View File

@@ -13,8 +13,9 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th style="width:40%">Name</th> <th style="width:20%">Name</th>
<th style="width:40%">Role</th> <th style="width:20%">Role</th>
<th style="width:20%">Created At</th>
<th style="width:20%">Action</th> <th style="width:20%">Action</th>
</tr> </tr>
</thead> </thead>
@@ -24,6 +25,7 @@
<tr> <tr>
<td><%= link_to employee.name,settings_employee_path(employee) %></td> <td><%= link_to employee.name,settings_employee_path(employee) %></td>
<td><%= employee.role %></td> <td><%= employee.role %></td>
<td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td> <td>
<%= link_to 'Edit', edit_settings_employee_path(employee) %> <%= link_to 'Edit', edit_settings_employee_path(employee) %>
<%if employee.role != "administrator"%> <%if employee.role != "administrator"%>

8
app/views/settings/membership_settings/_form.html.erb
View File

@@ -7,10 +7,10 @@
<%= f.input :gateway_communication_type %> <%= f.input :gateway_communication_type %>
<%= f.input :gateway_url %> <%= f.input :gateway_url %>
<%= f.input :auth_token %> <%= f.input :auth_token %>
<%= f.input :discount %> <label><%= f.check_box :discount %>Discount</label><br/>
<%= f.input :rebate %> <label><%= f.check_box :rebate %>Rebate</label><br/>
<%= f.input :bonus %> <label><%= f.check_box :bonus %>Bonus</label><br/>
<%= f.input :point %> <label><%= f.check_box :point %>Points</label>
</div> </div>
<div class="form-actions"> <div class="form-actions">

2
app/views/settings/membership_settings/index.html.erb
View File

@@ -21,7 +21,7 @@
<th>Discount</th> <th>Discount</th>
<th>Rebate</th> <th>Rebate</th>
<th>Bonus</th> <th>Bonus</th>
<th>Point</th> <th>Points</th>
<th colspan="3"></th> <th colspan="3"></th>
</tr> </tr>
</thead> </thead>

1
lib/tasks/menu_osaka.rake
View File

@@ -10,6 +10,7 @@ namespace :menu do
menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"}) menu = Menu.create({name: "Main Menu", is_active: true, created_by: "SYSTEM DEFAULT"})
food = Account.create({title: "Food", account_type: "0"}) food = Account.create({title: "Food", account_type: "0"})
beverage = Account.create({title: "Beverage", account_type: "1"}) beverage = Account.create({title: "Beverage", account_type: "1"})
product = Account.create({title: "Product", account_type: "2"})
# Gyoza # Gyoza
menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"}) menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoza", order_by: 1,created_by: "SYSTEM DEFAULT"})
#Gyoza 6Pcs #Gyoza 6Pcs