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

fix for checkbox in promotion and Back btn fix for Customers in Origami

Browse Source
This commit is contained in:
phyusin
2017-11-06 16:02:01 +06:30
parent 6a8bf490d8
commit 70a908158f
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,8 @@
<li class="breadcrumb-item active">CRM</li> <li class="breadcrumb-item active">CRM</li>
<!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> --> <!-- <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li> -->
<span class="float-right"> <span class="float-right">
<%= link_to 'Back', dashboard_path %> <a href="#" id="back">Back</a>
<!-- <%= link_to 'Back', dashboard_path %> -->
</span> </span>
</ul> </ul>
</div> </div>

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

@@ -82,17 +82,19 @@
<br> <br>
<div class="row checkboxes "> <div class="row checkboxes ">
<div class="col-md-2"> <div class="col-md-3">
<label class="control-label font-14"><abbr title="required">*</abbr> Promotion Day</label> <label class="control-label"><abbr title="required">*</abbr> Promotion Day</label>
</div> </div>
<%= f.hidden_field :promo_day, :class => "form-control" %> <%= f.hidden_field :promo_day, :class => "form-control" %>
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label></div> <div class="col-md-9">
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label></div> <label><input class="selectDay" type="checkbox" name="Sunday" value="0" id="0"> Sun</label> &nbsp;&nbsp;
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Tuesday" value="2" id="2"> Tue</label></div> <label><input class="selectDay" type="checkbox" name="Monday" value="1" id="1">Mon</label> &nbsp;&nbsp;
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Wednesday" value="3" id="3"> Wed</label></div> <label><input class="selectDay" type="checkbox" name="Tuesday" value="2" id="2"> Tue</label> &nbsp;&nbsp;
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Thursday" value="4" id="4"> Thu</label></div> <label><input class="selectDay" type="checkbox" name="Wednesday" value="3" id="3"> Wed</label> &nbsp;&nbsp;
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Friday" value="5" id="5"> Fri</label></div> <label><input class="selectDay" type="checkbox" name="Thursday" value="4" id="4"> Thu</label> &nbsp;&nbsp;
<div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label></div> <label><input class="selectDay" type="checkbox" name="Friday" value="5" id="5"> Fri</label> &nbsp;&nbsp;
<label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label>
</div>
</div> </div>
<!-- <div class="row"> <!-- <div class="row">