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

merge with aung myo

Browse Source
This commit is contained in:
Yan
2017-10-30 18:52:48 +06:30
parent 72414b53b5 a687b45193
commit c1db3ba8be
7 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/login.js
View File

@@ -16,4 +16,5 @@
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require node-waves/waves.js
//= require BSBMaterial/admin.js
//= require BSBMaterial/admin.js
//= require bootstrap-notify/bootstrap-notify.js

31
app/assets/stylesheets/application.scss
View File

@@ -34,4 +34,33 @@
line-height: inherit;
padding:5px;
}
/*----- Order Processing Items -----*/
/*----- Order Processing Items -----*/
/* ========== Select Field ========== */
/* Remove focus */
select:focus {
outline: none}
/* Hide label */
.custom-selectfield label {display: none;}
/* Use custom arrow */
.custom-selectfield select {appearance: none}
.custom-selectfield {
position: relative;
&:after {
position: absolute;
top: 1em;
right: 0.5em;
/* Styling the down arrow */
width: 0;
height: 0;
padding: 0;
content: '';
border-left: .25em solid transparent;
border-right: .25em solid transparent;
border-top: .375em solid #111;
pointer-events: none;
}
}

8
app/views/inventory/inventory_definitions/_form.html.erb
View File

@@ -10,8 +10,9 @@
<% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
<% arr.push(p) %>
<% end %>
<div class="col-md-4">
<label class="control-label"><abbr title="required">*</abbr>Select Item</label>
<div class="col-md-4 ">
<div class="form-group">
<label class="control-label"><abbr title="required">*</abbr>Select Item</label>
<select class="form-control item_code_place" id="item">
<% if !@inventory_definition.item_code.nil? %>
<% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
@@ -21,7 +22,7 @@
<% code = menuiteminstance.menu_item.item_code %>
<% end %>
<% end %>
<option value="">Select Item</option>
<option value=""></option>
<% arr.each do |a| %>
<% if a[1] == code %>
<option value="<%= a[1] %>" selected><%= a[0] %></option>
@@ -30,6 +31,7 @@
<% end %>
<% end %>
</select>
</div>
</div>
<% sample = [] %>

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

@@ -50,7 +50,7 @@
color = "bg-black"
end %>
<p id="noti" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
<p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p>
<% end %>
@@ -158,7 +158,7 @@
$(document).ready(function () {
// for Notificaiotn message
console.log("hi");
var placementFrom = $("#noti").attr('data-placement-from');
var placementAlign = $("#noti").attr('data-placement-align');
var animateEnter = $("#noti").attr('data-animate-enter');

12
app/views/settings/commissioners/_form.html.erb
View File

@@ -8,10 +8,14 @@
<div class="form-inputs">
<%= f.input :name %>
<%= f.label :emp_id, 'Employee' %>
<%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
<%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
<br/>
<%= f.label :commission_id, 'Commission' %><br/>
<%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, {prompt: 'Select a Product'}, {class: 'form-control'} %>
<%= f.label :commission_id, 'Commission'%>
<%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, { :include_blank => 'Choose Commission Product', :selected => ''}, {class: 'form-control'} %>
<br/>
<%= f.label :joined_date %><br/>
<%= f.text_field :joined_date, {class: 'form-control datepicker', id: 'joined_date', readonly: true} %><br/>
@@ -51,5 +55,3 @@
</div>
</div>
</div>

12
app/views/settings/promotions/_form.html.erb
View File

@@ -95,18 +95,18 @@
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label></div>
</div>
<div class="row">
<!-- <div class="row">
<div class="col-md-5 form-group">
<select name="promotion[promo_type]" class="form-control">
<option>Quantity</option>
<option>Choose Promotion Type</option>
<option>Net_off</option>
<option>Net_price</option>
<option>Percentage</option>
</select>
<!-- <%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "Promotion Type" %> -->
</div>
</select> -->
<%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:input_html=>{:class => 'col-md-5 form-control select'} ,:label => "Promotion Type", :include_blank => 'Choose Promotion Type', :selected => '' %>
<!-- </div>
</div>
-->
<div class="row">
<% arr = MenuItem.active.order("name desc").pluck(:name,:item_code) %>
<% Product.order("name desc").pluck(:name,:item_code).each do |p| %>

21
app/views/settings/tables/show.html.erb
View File

@@ -59,6 +59,27 @@
</tr>
</tbody>
</table>
<% @table.dining_charges.each do |dc| %>
<div class="card">
<h4 class="card-title">Dining Charge</h4>
<div class="">
<table class="table">
<tr>
<td class="align-right">Item code :</td>
<td class="align-left"><%= dc.item_code %></td>
<td class="align-right">Unit price : </td>
<td class="align-left"><%= dc.unit_price %></td>
<td class="align-right">Charge type : </td>
<td class="align-left"><%= dc.charge_type %></td>
<td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
<!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
</tr>
</table>
</div>
</div>
<% end %>
</div>
</div>
</div>