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

add mm

Browse Source
This commit is contained in:
Yan
2017-10-13 15:53:34 +06:30
parent 9a761e5402
commit 746f5ad471
107 changed files with 270 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/settings/promotions/index.html.erb
View File

@@ -53,8 +53,8 @@
<td><%= pro.created_by %></td>
<% end %>
<td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_promotion_path(pro) %></td>
<td><%= link_to 'Destroy', settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro) %></td>
<td><%= link_to t("views.btn.delete"), settings_promotion_path(pro), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>

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

@@ -19,7 +19,7 @@
<tr><td style="width:20%">Promotion End Date</td><td><%= @promotion.promo_end_date %></td></tr>
<tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_start_hour.utc.strftime("%I:%M %P") rescue "-" %></td></tr>
<tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td></tr>
<tr><td style="width:20%"><%= link_to 'Edit', edit_settings_promotion_path(@promotion) %></td><td><%= link_to 'Destroy', settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
<tr><td style="width:20%"><%= link_to t("views.btn.edit"), edit_settings_promotion_path(@promotion) %></td><td><%= link_to t("views.btn.delete"), settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
</tbody>