Merge branch 'settings_backend'

2017-06-01 17:14:57 +06:30
parent ad38a0a708 e200dcd438
commit 926c54c079
15 changed files with 54 additions and 17 deletions
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -0,0 +1,32 @@
+@import "bootstrap";
+@import "font-awesome";
+@import "theme";
+
+/* Show it is fixed to the top */
+// body {
+//   min-height: 75rem;
+//   padding-top: 4.5rem;
+// }
+
+.setting_nav{
+	background-color: #2f5663;
+}
+
+ul.navbar-nav li a{
+	text-decoration :none;
+	color :#e6e6e6;
+}
+
+ul.dropdown-menu li a{
+	text-decoration :none;
+	color :#525252;
+}
+
+.setting_breadcrumb{
+	background-color: transparent !important;
+	margin-bottom: 0px !important;
+}
+.page-header{
+	border-bottom :0px solid #000 !important;
+	margin :0px !important;
+}
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -4,7 +4,7 @@ class Settings::SetMenuItemsController < ApplicationController
  # GET /settings/menu_items
  # GET /settings/menu_items.json
  def index
-    @settings_menu_items = @category.menu_items
+    @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
  end
 
  # GET /settings/menu_items/1
@@ -15,6 +15,7 @@ class Settings::SetMenuItemsController < ApplicationController
  # GET /settings/menu_items/new
  def new
    @settings_menu_item = MenuItem.new
+    @settings_menu_item.type = "SetMenuItem"
  end

  # GET /settings/menu_items/1/edit
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -4,7 +4,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
  # GET /settings/menu_items
  # GET /settings/menu_items.json
  def index
-    @settings_menu_items = @category.menu_items
+    @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
  end
 
  # GET /settings/menu_items/1
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -2,7 +2,7 @@ class Menu < ApplicationRecord
  has_many :menu_categories, dependent: :destroy

  validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to
-  validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i, :on => :create
+  validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i
  #Default Scope to pull the active version only
  default_scope { where(is_active: true).order("created_at desc") }

--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,8 +1,8 @@
-<nav class="navbar navbar-toggleable-md fixed-top navbar-light">
+<nav class="navbar navbar-toggleable-md fixed-top navbar-light setting_nav">
   <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
-   <a class="navbar-brand" href="#">H</a>
+   <a class="navbar-brand" href="#" style="color: rgba(67, 185, 220, 0.9)">E-menu</a>
   <div class="collapse navbar-collapse" id="navbarCollapse">
     <ul class="navbar-nav mr-auto">
        <li class="navbar-nav mr-auto dropdown">
@@ -24,7 +24,7 @@
        </li>

        <li class="navbar-nav mr-auto dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Transactions</a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">&nbsp;&nbsp;&nbsp;Transactions</a>
          <ul class="dropdown-menu">
            <li><%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %></li>
            <li><%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %></li>
@@ -39,7 +39,7 @@
   <% if current_login_employee %>
     <div class="right">
          <ul class="navbar-nav mr-auto">
-            <li><%= current_login_employee.name %> </li>
+            <li style="color: #959595"><%= current_login_employee.name %> </li>
            <li style="padding-right:10px;padding-left:10px"> | </li>
            <li ><%= link_to 'Logout', logout_path, method: :delete, data: { confirm: 'Are you sure?' } %>
            </li>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,6 +10,7 @@
    <%= csrf_meta_tags %>

    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
  </head>

--- a/app/views/settings/set_menu_items/edit.html.erb
+++ b/app/views/settings/set_menu_items/edit.html.erb
@@ -9,7 +9,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li>
+  			<li><a href="<%= settings_menu_category_set_menu_items_path(@cattegory) %>">Menu Category</a></li>
 		  	<li>Edit</li>
 		 </ul>
 		</div>
--- a/app/views/settings/set_menu_items/index.html.erb
+++ b/app/views/settings/set_menu_items/index.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
 <ul class="breadcrumb">
  <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
+  <li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>

  <li>Menu Items</li>
  <span style="float: right">
@@ -78,3 +78,4 @@
  </div>

 </div>
+ <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> 
--- a/app/views/settings/set_menu_items/new.html.erb
+++ b/app/views/settings/set_menu_items/new.html.erb
@@ -9,7 +9,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="<%= settings_menu_items_path %>">Menu Items</a></li>
+  			<li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
 		  	<li>New</li>
 		 </ul>
 		</div>
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -2,8 +2,8 @@
 <div class="page-header">
 <ul class="breadcrumb">
  <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
-  <li>Menu Item Option</li>
+  <li><a href="<%= settings_menu_category_set_menu_items_path(@category) %>">Menu Category</a></li>
+  <li>Menu Item</li>
  <span style="float: right">
  </span>
 </ul>
--- a/app/views/settings/simple_menu_items/edit.html.erb
+++ b/app/views/settings/simple_menu_items/edit.html.erb
@@ -6,7 +6,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><a href="">Menu Items</a></li>
+  			<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
 		  	<li>Edit</li>
 		 </ul>
 		</div>
--- a/app/views/settings/simple_menu_items/index.html.erb
+++ b/app/views/settings/simple_menu_items/index.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
 <ul class="breadcrumb">
  <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
+  <li><a href="<%= settings_menu_categories_path %>">Menus Categories</a></li>

  <li>Menu Items</li>
  <span style="float: right">
@@ -46,7 +46,6 @@
        <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@category),:class => 'btn btn-primary btn-sm' %>

      </span></h4>
-    <h4 class="card-title"><%= @settings_menu_items.count %></h4>
    <table class="table">
      <thead>
        <tr>
@@ -84,3 +83,4 @@
  </div>

 </div>
+ <%= paginate @settings_menu_items, param_name: :page, :outer_window => 3 %> 
--- a/app/views/settings/simple_menu_items/new.html.erb
+++ b/app/views/settings/simple_menu_items/new.html.erb
@@ -9,7 +9,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
-  			<li><!-- <a href="<%= settings_menu_items_path %>"> -->Menu Items<!-- </a> --></li>
+  			<li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
 		  	<li>New</li>
 		 </ul>
 		</div>
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -2,7 +2,7 @@
 <div class="page-header">
 <ul class="breadcrumb">
  <li><a href="<%=  %>">Home</a></li>
-  <li>Settings</li>
+  <li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
  <li>Menu Item Option</li>
  <span style="float: right">
  </span>
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -16,3 +16,5 @@ Rails.application.config.assets.precompile += %w( orgiami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
 Rails.application.config.assets.precompile += %w( OQS.js ) 
+
+Rails.application.config.assets.precompile += %w( settings.css )