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

change UI for promotions

Browse Source
This commit is contained in:
phyusin
2017-11-23 18:24:01 +06:30
parent acdefef6db
commit 6a4acb71e8
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,11 +148,11 @@
<div class="card">
<div class="p-l-25 p-t-10 ">
<div class="row">
<div class="col-md-2 p-t-10">Item Code</div>
<div class="col-md-2 p-t-10">Item Instance</div>
<div class="col-md-2 p-t-10">Qualified Qty</div>
<div class="col-md-3 p-t-10">Item Code</div>
<div class="col-md-3 p-t-10">Item Instance</div>
<div class="col-md-1 p-t-10">Qty</div>
<div class="col-md-1 p-t-10">Net off</div>
<div class="col-md-2 p-t-10">Net Price</div>
<div class="col-md-1 p-t-10">Net Price</div>
<div class="col-md-2 p-t-10">Percentage</div>
<div class="col-md-1 p-t-10"></div>
</div>
@@ -164,7 +164,7 @@
<% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
<% arr.push(p) %>
<% end %>
<div class="col-md-2 menu_item_choose form-group">
<div class="col-md-3 menu_item_choose form-group">
<select class="form-control item_code_place1">
<option value="">Choose Something</option>
<% arr.each do |a| %>
@@ -174,17 +174,17 @@
</div>
<!-- <% sample = [] %> -->
<div class="col-md-2">
<div class="col-md-3">
<%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
</div>
<div class="col-md-2">
<div class="col-md-1">
<%= pro.input :min_qty , label: false, :input_html => {:style => 'height: 37px'}%>
</div>
<div class="col-md-1">
<%= pro.input :net_off , label: false, :input_html => {:style => 'height: 37px'} %>
</div>
<div class="col-md-2"><%= pro.input :net_price , label: false, :input_html => {:style => 'height: 37px'} %></div>
<div class="col-md-1"><%= pro.input :net_price , label: false, :input_html => {:style => 'height: 37px'} %></div>
<div class="col-md-2"><%= pro.input :percentage , label: false, :input_html => {:style => 'height: 37px'} %></div>
<div class="col-md-1"><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-45", :style => 'width: 25px'%></div>
</div>

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

@@ -43,19 +43,21 @@
<td>
<% item = MenuItemInstance.find_by_item_instance_code(pro.original_product)%>
<% if item.nil? %>
<%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
<%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
<% else %>
<%= item.menu_item.name rescue "-" %>
- <%= item.item_instance_name rescue "-" %>
<%= item.menu_item.name rescue "-" %>
- <%= item.item_instance_name rescue "-" %>
<% end %>
</td>
<td style="padding: 2px">
<% if Employee.exists?(pro.created_by) %>
<%= Employee.find(pro.created_by).name %>
<% else %>
<%= pro.created_by %>
<% end %>
</td>
<% if Employee.exists?(pro.created_by) %>
<td><%= Employee.find(pro.created_by).name %></td>
<% else %>
<td><%= pro.created_by %></td>
<% end %>
<td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-info btn-sm waves-effect' %>
<td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-primary btn-sm waves-effect' %>
</td>
</tr>
<% end %>