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

update setting admin pages

Browse Source
This commit is contained in:
Aung Myo
2017-10-24 15:22:34 +06:30
parent 06dd5df432
commit 0d6167eca9
40 changed files with 422 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,9 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
<%= simple_nested_form_for([:settings,@promotion]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs">
<div class="form-inputs p-l-15">
<div class="div-border">
<div class="row">
<div class="col-md-6"><%= f.input :promo_code %></div>
@@ -16,12 +12,12 @@
<div class="row">
<div class="col-md-6">
<span>* Promo Start Date</span>
<%= f.date_field :promo_start_date, :placeholder => "From Date" , :class => "form-control"%>
<%= f.date_field :promo_start_date, :placeholder => "From Date" , :class => "form-control datepicker"%>
<br>
</div>
<div class="col-md-6">
<span>* Promo End Date</span>
<%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control"%>
<%= f.date_field :promo_end_date ,:placeholder => "To Date" , :class => "form-control datepicker"%>
</div>
</div>
<div class="row">
@@ -38,9 +34,9 @@
<div class="col-md-6">
<!-- <span>* Promo End Hour</span> -->
<% if !@promotion.promo_end_hour.nil?%>
<%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') } %>
<%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') },:class=>"form-control timepicker" %>
<% else %>
<%= f.input :promo_end_hour, as: :string, input_html: {} %>
<%= f.input :promo_end_hour, as: :string, input_html: {},:class=>"form-control timepicker" %>
<% end %>
</div>
</div>
@@ -153,7 +149,7 @@
</div>
<% end %>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
@@ -169,22 +165,22 @@
$(document).ready(function(){
$('#promotion_promo_start_date').datetimepicker({
timepicker:false,
format:'Y-m-d'
});
$('#promotion_promo_end_date').datetimepicker({
timepicker:false,
format:'Y-m-d'
});
$('#promotion_promo_start_hour').datetimepicker({
datepicker:false,
format:'H:m'
});
$('#promotion_promo_end_hour').datetimepicker({
datepicker:false,
format:'H:m'
});
// $('#promotion_promo_start_date').datetimepicker({
// timepicker:false,
// format:'Y-m-d'
// });
// $('#promotion_promo_end_date').datetimepicker({
// timepicker:false,
// format:'Y-m-d'
// });
// $('#promotion_promo_start_hour').datetimepicker({
// datepicker:false,
// format:'H:m'
// });
// $('#promotion_promo_end_hour').datetimepicker({
// datepicker:false,
// format:'H:m'
// });
$('#promotion_promo_start_hour').on('change', function(event) {
$('#promotion_promo_start_hour').val($('#promotion_promo_start_hour').val().split(":")[0]+":00");

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

@@ -1,10 +1,11 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
<li class="breadcrumb-item active">New</li>
<li class="breadcrumb-item"><a href="<%= settings_promotions_path %>">Promotion</a></li>
<li class="breadcrumb-item active">Edit</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
</span>
</ol>
</div>

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

@@ -2,10 +2,10 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_products_path %>">Products</a></li>
<li class="breadcrumb-item"><a href="<%= settings_promotions_path %>">Promotion</a></li>
<li class="breadcrumb-item active">New</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_products_path %>
<%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
</span>
</ol>
</div>

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

@@ -1,18 +1,21 @@
<div class="span12">
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li>
<li><a href="<%= settings_promotions_path %>">Promotions</a></li>
</ul>
</div>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item"><a href="<%= settings_promotions_path %>">Promotions</a></li>
<li class="breadcrumb-item active">Details</li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), settings_promotions_path %>
</span>
</ol>
</div>
<div class="card">
<div class="card-block">
<h4 class="card-title">Promotion</h4>
<table class="table">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
<div class="card">
<div class="card-block">
<h4 class="card-title">Promotion</h4>
<table class="table">
<tbody>
<tbody>
<tr><td style="width:20%">Promotion code</td><td><%= @promotion.promo_code %></td></tr>
<tr><td style="width:20%">Promotion Start Date</td><td><%= @promotion.promo_start_date %></td></tr>
@@ -22,7 +25,19 @@
<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>
</table>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
<div class="card">
<div class="body">
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
</div>
</div>
</div>
</div>