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

Merge branch 'master' into adminbsb_material_ui_test

Browse Source
This commit is contained in:
Yan
2017-09-28 18:25:44 +06:30
parent 8d48a73cfc 8f0789fede
commit 343a61a7e3
20 changed files with 957 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/origami/addorders/detail.html.erb
View File

@@ -62,7 +62,7 @@
<div class="modal-dialog custom-modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
@@ -97,12 +97,12 @@
<!-- Menu Item modal -->
<div class="item-modal modal sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
<div class="item-modal modal sx_item_detailModal" id="sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
<div class="modal-dialog custom-modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header" style="background-color: #54A5AF;">
<h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
<button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
</div>
<div class="modal-body">
@@ -159,12 +159,12 @@
<!-- Large modal -->
<div class=" modal sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
<div class=" modal sx_item_set_detailModal" id="sx_item_set_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true" >
<div class="modal-dialog custom-modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header" style="background-color: #54A5AF;">
<h4 class="modal-title" style="color:#fff;" id="set_name"></h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
<button type="button" class="close" id="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
</div>
<div class="modal-body">
@@ -197,7 +197,7 @@
<p class="hidden" id="set_item_instances"></p>
<p class="hidden" id="set_item_code"></p>
<p></p>
<br><br><br><br>
<div class="options-list">
</div>

5
app/views/origami/addorders/get_menu_category.json.jbuilder
View File

@@ -1,5 +1,8 @@
if @menu.menu_items
json.menu_items @menu.menu_items do |item|
json.partial! 'origami/addorders/menu_item', item: item
if item.is_available
json.partial! 'origami/addorders/menu_item', item: item
end
end
end

4
app/views/origami/discounts/index.html.erb
View File

@@ -196,9 +196,9 @@
<button id="remove-all" class="btn btn-warning btn-block action-btn">Remove All</button>
<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button>
<% if @member_discount%>
<hr />
<!-- <hr />
<button id="member-discount" class="btn btn-success btn-block action-btn
<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button>
<%= @sale_data.customer.membership_id ? " " : "disabled"%>">Member Discount</button> -->
<%end %>
</div>
</div>

2
app/views/settings/order_queue_stations/_form.html.erb
View File

@@ -11,7 +11,7 @@ div.form-inputs span{
<%= f.input :is_active %>
<%= f.input :printer_name %>
<%= f.input :font_size %>
<!-- <%= f.input :font_size %> -->
<%= f.input :print_copy %>
<%= f.hidden_field :processing_items %>
<%= f.label "Select Zones", :class => 'control-label' %>

2
app/views/settings/order_queue_stations/edit.html.erb
View File

@@ -1,6 +1,4 @@
<!-- <h1>Editing Settings Order Queue Station</h1>
<%= render 'form', settings_order_queue_station: @settings_order_queue_station %> -->
<div class="span12">
<div class="page-header">

13
app/views/settings/order_queue_stations/index.html.erb
View File

@@ -16,14 +16,16 @@
<thead>
<tr>
<th>Station name</th>
<th>Printer name</th>
<th>Is active</th>
<th>Auto Print</th>
<th>Print copy</th>
<th>Printer name</th>
<th>Cut per item</th>
<th>Use alternate name</th>
<th>Alternate name</th>
<th>Created by</th>
<th colspan="3"></th>
<th> Created At</th>
<th>Updated At</th>
<th>Action</th>
</tr>
</thead>
@@ -31,13 +33,16 @@
<% @settings_order_queue_stations.each do |settings_order_queue_station| %>
<tr>
<td><%= link_to settings_order_queue_station.station_name, settings_order_queue_station_path(settings_order_queue_station) %></td>
<td><%= settings_order_queue_station.printer_name %></td>
<td><%= settings_order_queue_station.is_active %></td>
<td><%= settings_order_queue_station.auto_print %></td>
<td><%= settings_order_queue_station.print_copy %></td>
<td><%= settings_order_queue_station.printer_name %></td>
<td><%= settings_order_queue_station.cut_per_item %></td>
<td><%= settings_order_queue_station.use_alternate_name %></td>
<td><%= settings_order_queue_station.created_by %></td>
<td><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td>
<td><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %></td>
<td><%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station) %></td>
<td><%= link_to 'Edit', edit_settings_order_queue_station_path(settings_order_queue_station) %></td>
</tr>

2
app/views/settings/order_queue_stations/show.html.erb
View File

@@ -9,7 +9,7 @@
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">Menu Item Option</h4>
<h4 class="card-title">Order Queue Station</h4>
<table class="table">
<thead>
<tr>

4
app/views/settings/processing_items/_form.html.erb
View File

@@ -2,6 +2,10 @@
<%= f.error_notification %>
<%= f.input :processing_items, as: :hidden %>
<strong>Select Menu Items</strong><br/><br/>
<div class="form-actions">
<%= f.button :submit, class:'pull-right', label: "Add Menu Items to Queue Station" %>
</div>
<br><br>
<div class="row">
<% @menu_categories.each do |category|%>