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

change UI for simple menu item, promotion, setting/OQS

Browse Source
This commit is contained in:
phyusin
2017-11-21 17:41:05 +06:30
parent a92a1298a3
commit 0b374cf3b2
5 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,6 @@
<% end %>
<% end %>
</select>
</div>
<% sample = [] %>
@@ -141,19 +140,19 @@
<% end %>
<div class="col-md-3 form-group"><%= f.input :original_product,collection: sample %></div>
<!-- <div class="col-md-6"><%= f.input :original_product,collection: MenuItemInstance.order("item_instance_name desc").pluck(:item_instance_name,:item_instance_code),input_html: { selected: 2 } %></div> -->
<div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty" %></div>
<div class="col-md-6 form-group"><%= f.input :min_qty ,label: "Qualified Qty", :input_html => {:style => 'height: 37px'} %></div>
</div>
<br>
<div class="card">
<div class="p-l-25 p-t-10 ">
<div class="row">
<div class="col-md-3" style="text-align:">Item Code</div>
<div class="col-md-2" style="text-align:">Item Instance</div>
<div class="col-md-2" style="text-align:">Qualified Qty</div>
<div class="col-md-1" style="text-align:">Net off</div>
<div class="col-md-2" style="text-align:">Net Price</div>
<div class="col-md-1" style="text-align:">Percentage</div>
<div class="col-md-1" style="text-align:"></div>
<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-1 p-t-10">Net off</div>
<div class="col-md-2 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>
<div class="row"></div >
<%= f.fields_for :promotion_products do |pro| %>
@@ -163,7 +162,7 @@
<% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
<% arr.push(p) %>
<% end %>
<div class="col-md-3 menu_item_choose" style="text-align:">
<div class="col-md-2 menu_item_choose form-group">
<select class="form-control item_code_place1">
<option value="">Choose Something</option>
<% arr.each do |a| %>
@@ -173,20 +172,23 @@
</div>
<!-- <% sample = [] %> -->
<div class="col-md-2" style="text-align:">
<div class="col-md-2">
<%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
</div>
<div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
<div class="col-md-1"><%= pro.input :net_off , label: false %></div>
<div class="col-md-2"><%= pro.input :net_price , label: false %></div>
<div class="col-md-1"><%= pro.input :percentage , label: false %></div>
<div class="col-md-1" style=""><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%></div>
<div class="col-md-2">
<%= 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-2"><%= pro.input :percentage , label: false, :input_html => {:style => 'height: 37px'} %></div>
<div class="col-md-1 p-t-10"><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25", :style => 'width: 25px'%></div>
</div>
<% end %>
<div class="row">
<div class="col-md-12" style="text-align:right;margin-right:
10px;">
<div class="col-md-12 align-right m-r-10">
<%= f.link_to_add "Add Product", :promotion_products, :class => 'btn bg-teal addProduct m-r-20' %>
</div>
</div>