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

4
app/views/origami/discounts/index.html.erb
View File

@@ -127,7 +127,7 @@
<hr /> <hr />
<div class="p-l-20"> <div class="p-l-20">
<div class="row"> <div class="row">
<div class="col-md-9"> <div class="col-md-8">
<div class="row bottom"> <div class="row bottom">
<div class="col-md-3"> <div class="col-md-3">
<div class="fluid cashier_number" data-value="5" data-type="add">5%</div> <div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
@@ -194,7 +194,7 @@
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<button id="net" class="btn bg-info fluid action-btn">Nett</button> <button id="net" class="btn bg-info fluid action-btn">Nett</button>
<button id="percentage" class="btn bg-primary fluid action-btn">Percentage</button> <button id="percentage" class="btn bg-primary fluid action-btn">Percentage</button>

4
app/views/reports/dailysale/_shift_sale_report_filter.html.erb
View File

@@ -24,11 +24,11 @@
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<!-- <label class="">Select Shift Period</label> --> <!-- <label class="">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></label> <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date"> <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 37px;">
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3"> <div class="col-lg-3 col-md-3 col-sm-3">
<label class="font-14"><%= t("views.right_panel.detail.to") %></label> <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date"> <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 37px;">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"> <div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
<label></label><br> <label></label><br>

8
app/views/settings/order_queue_stations/index.html.erb
View File

@@ -30,7 +30,7 @@
<!-- <th>Created by</th> --> <!-- <th>Created by</th> -->
<th><%= t("views.right_panel.detail.created_at") %></th> <th><%= t("views.right_panel.detail.created_at") %></th>
<!-- <th>Updated At</th> --> <!-- <th>Updated At</th> -->
<th><%= t("views.right_panel.detail.actions") %></th> <th colspan="2"><%= t("views.right_panel.detail.actions") %></th>
</tr> </tr>
</thead> </thead>
@@ -46,10 +46,10 @@
<!-- <td><%= settings_order_queue_station.cut_per_item %></td> --> <!-- <td><%= settings_order_queue_station.cut_per_item %></td> -->
<td><%= settings_order_queue_station.use_alternate_name %></td> <td><%= settings_order_queue_station.use_alternate_name %></td>
<!-- <td><%= settings_order_queue_station.created_by %></td> --> <!-- <td><%= settings_order_queue_station.created_by %></td> -->
<td><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td> <td width="15%"><%= settings_order_queue_station.created_at.strftime("%m-%d-%Y") %></td>
<!-- <td><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %></td> --> <!-- <td><%= settings_order_queue_station.updated_at.strftime("%m-%d-%Y") %></td> -->
<td> <td colspan="2">
<%= link_to 'Assign Processing Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => 'btn btn-success btn-sm waves-effect' %> <%= link_to 'Assign Items', new_settings_order_queue_station_processing_item_path(settings_order_queue_station),:class => 'btn btn-success btn-sm waves-effect' %>
&nbsp;&nbsp; &nbsp;&nbsp;
<%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_order_queue_station_path(settings_order_queue_station),:class => 'btn btn-info btn-sm waves-effect' %>

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

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

2
app/views/settings/simple_menu_items/_form.html.erb
View File

@@ -9,7 +9,9 @@
<%= f.input :item_code,:input_html => {:class => "col-md-9"} %> <%= f.input :item_code,:input_html => {:class => "col-md-9"} %>
<%= f.input :name,:input_html => {:class => "col-md-9"} %> <%= f.input :name,:input_html => {:class => "col-md-9"} %>
<%= f.input :alt_name,:input_html => {:class => "col-md-9"} %> <%= f.input :alt_name,:input_html => {:class => "col-md-9"} %>
<div style="display: none;">
<%= f.input :type,:input_html => {:class => "col-md-9"} %> <%= f.input :type,:input_html => {:class => "col-md-9"} %>
</div>
<%= f.input :min_qty,:input_html => {:class => "col-md-9"} %> <%= f.input :min_qty,:input_html => {:class => "col-md-9"} %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %> <%= f.input :account_id, :label => "Account type", :collection => Account.collection,:input_html => {:class => "col-md-9"} %>