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

Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into cancan

Browse Source
This commit is contained in:
Aung Myo
2017-06-22 15:35:27 +06:30
parent 25b6a893f2 4b9291110d
commit 5abda623ff
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/origami.scss
View File

@@ -179,7 +179,9 @@ select.form-control {
tr.discount-item-row:hover { tr.discount-item-row:hover {
background-color: #e3e3e3 !important; background-color: #e3e3e3 !important;
} }
.required abbr{
color: red !important;
}
/* Jquery Confirm */ /* Jquery Confirm */
.jconfirm-box-container{ .jconfirm-box-container{

10
app/views/origami/customers/index.html.erb
View File

@@ -75,7 +75,15 @@
<input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" /> <input type="hidden" id="sale_id" name="sale_id" value="<%= @sale_id %>" />
<%= f.error_notification %> <%= f.error_notification %>
<%= f.hidden_field :id, :class => "form-control col-md-6 " %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
<div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
<%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
<% flash.each do |name, msg| %>
<% str="[\"#{msg['name']}\"]"
str.gsub!('["', '')
str.gsub!('"]', '') %>
<span class="help-block" style="margin-top:-10px"><%= str %></span>
<% end -%>
</div>
<div class="form-group"> <div class="form-group">
<label>Salutation :</label><br> <label>Salutation :</label><br>
<label> <label>