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

update promotion ui

Browse Source
This commit is contained in:
Yan
2017-10-25 13:57:07 +06:30
parent bbae5cd5cc
commit 32866428ce
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@@ -40,7 +40,7 @@
$(document).on('turbolinks:load', function() {
$('.datetimepicker').bootstrapMaterialDatePicker({
format: 'DD-MM YYYY - HH:mm',
format: 'DD-MM-YYYY - HH:mm',
clearButton: true,
weekStart: 1
});

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

@@ -27,7 +27,7 @@
<% if !@promotion.promo_start_date.nil?%>
<input type="text" name="promotion[promo_start_date]" value="<%= @promotion.promo_start_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
<% else %>
<input type="text" name="promotion[promo_start_date]" class="datepicker form-control" placeholder="Start Date...">
<input type="date" name="promotion[promo_start_date]" class="datepicker form-control" placeholder="Start Date...">
<% end %>
</div>
</div>
@@ -38,9 +38,9 @@
<i class="material-icons">date_range</i>
</span>
<% if !@promotion.promo_end_date.nil?%>
<input type="text" name="promotion[promo_end_date]" value="<%= @promotion.promo_end_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
<input type="date" name="promotion[promo_end_date]" value="<%= @promotion.promo_end_date.strftime('%A, %d-%m-%Y') %>" class="datepicker form-control" placeholder="Start Date...">
<% else %>
<input type="text" name="promotion[promo_end_date]" class="datepicker form-control" placeholder="End Date...">
<input type="date" name="promotion[promo_end_date]" class="datepicker form-control" placeholder="End Date...">
<% end %>
</div>
</div>
@@ -54,9 +54,9 @@
<i class="material-icons">access_time</i>
</span>
<% if !@promotion.promo_start_hour.nil?%>
<input type="text" name="promotion[promo_start_hour]" value="<%= @promotion.promo_start_hour.utc.strftime('%H:%M') %>" class="timepicker form-control" placeholder="Start Time...">
<input type="date" name="promotion[promo_start_hour]" value="<%= @promotion.promo_start_hour.utc.strftime('%H:%M') %>" class="timepicker form-control" placeholder="Start Time...">
<% else %>
<input type="text" name="promotion[promo_start_hour]" class="timepicker form-control" placeholder="Start Time...">
<input type="date" name="promotion[promo_start_hour]" class="timepicker form-control" placeholder="Start Time...">
<% end %>
</div>
</div>