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

update material ui

Browse Source
This commit is contained in:
Aung Myo
2017-10-26 17:02:26 +06:30
parent 6b88403186
commit 92ef1dcdae
12 changed files with 231 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/custom.js
View File

@@ -25,10 +25,7 @@ $(document).on('turbolinks:load', function() {
$('.delete').click(function(){
var method = $(this).attr('data-method');
var url = $(this).attr('data-ref');
var html_text = $( this ).siblings( "#delete_text" ).html();
console.log(method);
console.log(url);
console.log(html_text);
var html_text = $(this).siblings( "#delete_text" ).html();
swal({
title: "Confirmation",
text: html_text,

8
app/assets/stylesheets/reset.css
View File

@@ -226,5 +226,13 @@ section.content {
}
/* END FORM */
.form-group span.help-block {
font-size: 12px;
display: block;
margin-top: 5px;
font-weight: normal;
color: #F44336;
}
/* End Reset Theme */
/* *************************************************** */

2
app/controllers/settings/accounts_controller.rb
View File

@@ -27,7 +27,7 @@ class Settings::AccountsController < ApplicationController
def create
@settings_account = Account.new(account_params)
respond_to do |format|
if @settings_account.save!
if @settings_account.save
format.html { redirect_to settings_accounts_url, notice: 'Account was successfully created.' }
format.json { render :index, status: :created, location: @settings_account }
else

4
app/views/layouts/_left_sidebar.html.erb
View File

@@ -167,12 +167,12 @@
<span><%= t :payment_methods %></span>
</a>
</li>
<li>
<!-- <li>
<a href="<%= settings_accounts_path %>">
<i class="material-icons col-amber">donut_large</i>
<span><%= t :accounts %></span>
</a>
</li>
</li> -->
<li>
<a href="<%= settings_products_path %>">
<i class="material-icons col-brown">donut_large</i>

4
app/views/settings/accounts/_form.html.erb
View File

@@ -3,8 +3,8 @@
<%= simple_form_for([:settings,@settings_account]) do |f| %>
<%= f.error_notification %>
<div class="form-inputs p-l-10">
<%= f.input :title ,:input_html=>{:class=>"col-md-10"}%>
<%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"} %>
<%= f.input :title ,:input_html=>{:class=>"col-md-10"},:required=>true%>
<%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"},:required=>true %>
<%= f.input :discount %>
<%= f.input :point %>
<%= f.input :bonus %>

1
app/views/settings/menu_categories/show.html.erb
View File

@@ -13,6 +13,7 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->

12
app/views/settings/menu_item_options/index.html.erb
View File

@@ -11,8 +11,8 @@
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
@@ -21,7 +21,7 @@
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
<div class="card">
<div class="card-block">
@@ -53,9 +53,9 @@
</tbody>
</table>
</div>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
</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
@@ -64,6 +64,6 @@
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
</div>
</div>
</div>
</div>
</div>

1
app/views/settings/menus/index.html.erb
View File

@@ -12,6 +12,7 @@
<br><br>
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->

3
app/views/settings/menus/show.html.erb
View File

@@ -12,7 +12,7 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
@@ -20,7 +20,6 @@
<li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</ul>
</div>
</div>
<div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">

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

@@ -149,13 +149,15 @@
</div>
<br>
<div class="card">
<div class="p-l-25 p-t-10 ">
<div class="row">
<div class="col-md-4" style="text-align:center">Item Code</div>
<div class="col-md-2" style="text-align:center">Min Qty</div>
<div class="col-md-2" style="text-align:center">Net off</div>
<div class="col-md-2" style="text-align:center">Net Price</div>
<div class="col-md-1" style="text-align:center">Percentage</div>
<div class="col-md-1" style="text-align:center"></div>
<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-1" style="text-align:">Min 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-2" style="text-align:">Percentage</div>
<div class="col-md-1" style="text-align:"></div>
</div>
<div class="row"></div >
<%= f.fields_for :promotion_products do |pro| %>
@@ -165,7 +167,7 @@
<% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
<% arr.push(p) %>
<% end %>
<div class="col-md-2 menu_item_choose" style="text-align:left">
<div class="col-md-3 menu_item_choose" style="text-align:">
<select class="form-control item_code_place1">
<option value="">Choose Something</option>
<% arr.each do |a| %>
@@ -175,17 +177,23 @@
</div>
<!-- <% sample = [] %> -->
<div class="col-md-2" style="text-align:left"><%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %></div>
<div class="col-md-2" style="text-align:">
<%= 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-2"><%= pro.input :net_off , label: false %></div>
<div class="col-md-1"><%= 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="text-align:right"><%= pro.link_to_remove "X" %></div>
<div class="col-md-2"><%= 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>
<% end %>
<div class="row">
<div class="col-md-12" style="text-align:right;"><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary addProduct' %></div>
<div class="col-md-12" style="text-align:right;margin-right:
10px;">
<%= f.link_to_add "Add Product", :promotion_products, :class => 'btn bg-teal addProduct m-r-20' %>
</div>
</div>
</div>
</div>
</div>
@@ -193,7 +201,7 @@
<br>
<div class="form-actions">
<%= f.button :submit %>
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
</div>
<% end %>
</div>

1
app/views/settings/set_menu_items/show.html.erb
View File

@@ -13,6 +13,7 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->

1
app/views/settings/simple_menu_items/show.html.erb
View File

@@ -14,6 +14,7 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->