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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
parent 7dfcff5af5 5e8f08315c
commit b730da7a75
184 changed files with 2672 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1 +1,11 @@
<%= render 'form', promotion: @promotion %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_promotions_path %>"><%= t("views.right_panel.detail.promotion") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
</span>
</ol>
</div>
<%= render 'form', promotion: @promotion %>

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

@@ -1,4 +1,12 @@
<% breadcrumb_add t("views.right_panel.detail.promotion"), '', dashboard_path %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("views.right_panel.detail.promotion") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), root_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
@@ -83,7 +91,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>

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

@@ -1,3 +1,13 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_promotions_path %>"><%= t("views.right_panel.detail.promotion") %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
</span>
</ol>
</div>
<%= render 'form', promotion: @promotion %>
<script>

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

@@ -1,4 +1,13 @@
<% breadcrumb_add t("views.right_panel.detail.promotion"), settings_promotions_path, settings_promotions_path, t("details") %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= settings_promotions_path %>"><%= t("views.right_panel.detail.promotion") %></a></li>
<li class="breadcrumb-item active"><%= t :details %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="card">
@@ -10,7 +19,7 @@
<tr><td style="width:20%"><%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.start_date") %></td><td><%= @promotion.promo_start_date %></td></tr>
<tr><td style="width:20%"><%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_date") %></td><td><%= @promotion.promo_end_date %></td></tr>
<tr><td style="width:20%"><%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.start_time") %></td><td><%= @promotion.promo_start_hour.utc.strftime("%I:%M %P") rescue "-" %></td></tr>
<tr><td style="width:20%"><%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_time") %></td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td></tr>
<tr><td style="width:20%"><%= t("views.right_panel.detail.promotion") %> <%= t("views.right_panel.detail.end_time") %></td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td></tr>
</tbody>
</table>
@@ -23,7 +32,7 @@
<span class="hidden" id="delete_text">
<h6>Are you sure you want to delete this row ?</h6>
<h6>This action can't be undo. </h6>
<h6>This action can't be undo. </h6>
</span>
</div>
</div>
@@ -52,6 +61,6 @@
2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
</p>
</div>
</div>
</div>
</div>
</div>