From 444b270dd10a1d07a2fa7d59dd300898f6641a7a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Sep 2017 13:42:41 +0630
Subject: [PATCH] update ui design

---
 app/assets/stylesheets/application.scss       |  1 +
 app/assets/stylesheets/sx-sidebar.css         |  6 ++-
 .../inventory/inventory_controller.rb         |  2 +-
 .../inventory_definitions_controller.rb       |  2 +-
 .../inventory/stock_check_items_controller.rb |  2 +-
 .../inventory/stock_checks_controller.rb      |  2 +-
 .../origami/card_payments_controller.rb       |  2 +-
 .../origami/cash_ins_controller.rb            |  2 +-
 .../origami/cash_outs_controller.rb           |  2 +-
 .../origami/credit_payments_controller.rb     |  2 +-
 .../origami/customers_controller.rb           |  2 +-
 .../origami/discounts_controller.rb           |  2 +-
 app/controllers/origami/home_controller.rb    |  2 +-
 app/controllers/origami/home_controller_bk.rb |  2 +-
 .../origami/in_duties_controller.rb           |  2 +-
 app/controllers/origami/jcb_controller.rb     |  2 +-
 app/controllers/origami/master_controller.rb  |  2 +-
 .../origami/moveroom_controller.rb            |  2 +-
 .../origami/movetable_controller.rb           |  2 +-
 app/controllers/origami/mpu_controller.rb     |  2 +-
 app/controllers/origami/orders_controller.rb  |  2 +-
 .../origami/other_charges_controller.rb       |  2 +-
 .../origami/others_payments_controller.rb     |  2 +-
 .../origami/payments_controller.rb            |  2 +-
 .../origami/paypar_payments_controller.rb     |  2 +-
 .../origami/product_commissions_controller.rb |  2 +-
 .../origami/redeem_payments_controller.rb     |  2 +-
 .../origami/request_bills_controller.rb       |  2 +-
 .../origami/room_invoices_controller.rb       |  2 +-
 app/controllers/origami/rooms_controller.rb   |  2 +-
 .../origami/sale_edit_controller.rb           |  2 +-
 app/controllers/origami/sales_controller.rb   |  2 +-
 app/controllers/origami/shifts_controller.rb  |  2 +-
 .../origami/table_invoices_controller.rb      |  2 +-
 app/controllers/origami/visa_controller.rb    |  2 +-
 app/controllers/origami/void_controller.rb    |  2 +-
 app/controllers/origami/voucher_controller.rb |  2 +-
 app/views/layouts/application.html.erb        | 52 ++++++++++---------
 38 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 4aabe81b..4bad284a 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -16,6 +16,7 @@
 
 .setting_nav{
 	background-color: #2f5663;
+  height: 53px;
 }
 
 ul.navbar-nav li a{
diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css
index 6f8d5f04..e181db8a 100644
--- a/app/assets/stylesheets/sx-sidebar.css
+++ b/app/assets/stylesheets/sx-sidebar.css
@@ -41,13 +41,14 @@
 #page-content-wrapper {
     width: 100%;
     position: absolute;
-    padding: 0px;
+    padding-top: 20px;
     
 }
 
 #wrapper.toggled #page-content-wrapper {
     position: absolute;
     margin-right: -200px;
+    padding-top: 20px;
 }
 
 
@@ -126,12 +127,13 @@
         width: 216px;
     }
     #page-content-wrapper {
-        padding: 0px;
+        padding-top: 20px;
         position: relative;
     }
     #wrapper.toggled #page-content-wrapper {
         position: relative;
         margin-right: 0;
+        padding-top: 20px;
     }
 }
 .accordion {
diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb
index 673cf943..3bf3c84c 100644
--- a/app/controllers/inventory/inventory_controller.rb
+++ b/app/controllers/inventory/inventory_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::InventoryController < BaseInventoryController
+class Inventory::InventoryController < ApplicationController#BaseInventoryController
 
    def index
      @products = InventoryDefinition.all.active.order('created_at desc') 
diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb
index 33b7dd75..cc9eecd8 100644
--- a/app/controllers/inventory/inventory_definitions_controller.rb
+++ b/app/controllers/inventory/inventory_definitions_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::InventoryDefinitionsController < BaseInventoryController
+class Inventory::InventoryDefinitionsController < ApplicationController#BaseInventoryController
   before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy]
 
   # GET /inventory_definitions
diff --git a/app/controllers/inventory/stock_check_items_controller.rb b/app/controllers/inventory/stock_check_items_controller.rb
index 18980f29..43782767 100644
--- a/app/controllers/inventory/stock_check_items_controller.rb
+++ b/app/controllers/inventory/stock_check_items_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::StockCheckItemsController < BaseInventoryController
+class Inventory::StockCheckItemsController < ApplicationController#BaseInventoryController
   before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
 
   # GET /stock_check_items
diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb
index 52d183de..f7a9e7fe 100644
--- a/app/controllers/inventory/stock_checks_controller.rb
+++ b/app/controllers/inventory/stock_checks_controller.rb
@@ -1,4 +1,4 @@
-class Inventory::StockChecksController < BaseInventoryController
+class Inventory::StockChecksController < ApplicationController#BaseInventoryController
   def index
     @check = StockCheck.new
     @inventory_definitions = InventoryDefinition.active.all
diff --git a/app/controllers/origami/card_payments_controller.rb b/app/controllers/origami/card_payments_controller.rb
index 1d18e401..77eb4e4f 100644
--- a/app/controllers/origami/card_payments_controller.rb
+++ b/app/controllers/origami/card_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CardPaymentsController < BaseOrigamiController
+class Origami::CardPaymentsController < ApplicationController
 
 
   def index
diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb
index 085f68b8..41c5bd8d 100644
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CashInsController < BaseOrigamiController
+class Origami::CashInsController < ApplicationController
 
   def new
   end
diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb
index 95ab97a2..a300db75 100644
--- a/app/controllers/origami/cash_outs_controller.rb
+++ b/app/controllers/origami/cash_outs_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CashOutsController < BaseOrigamiController
+class Origami::CashOutsController < ApplicationController
 
   def new
   end
diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index ff9ae413..3f0b89aa 100644
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CreditPaymentsController < BaseOrigamiController
+class Origami::CreditPaymentsController < ApplicationController
 
 
   def index
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 72597613..e74dd15d 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -1,4 +1,4 @@
-class Origami::CustomersController < BaseOrigamiController
+class Origami::CustomersController < ApplicationController
   load_and_authorize_resource
   def index
   end
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 8fddfa0f..99f55f2f 100644
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -1,4 +1,4 @@
-class Origami::DiscountsController < BaseOrigamiController
+class Origami::DiscountsController < ApplicationController
   authorize_resource :class => false
 
   #discount page show from origami index with selected order
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 27b9cc52..8a58501d 100644
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -1,4 +1,4 @@
-class Origami::HomeController < BaseOrigamiController
+class Origami::HomeController < ApplicationController
  before_action :set_dining, only: [:show]
 
   def index
diff --git a/app/controllers/origami/home_controller_bk.rb b/app/controllers/origami/home_controller_bk.rb
index 5496cca5..4839f15c 100644
--- a/app/controllers/origami/home_controller_bk.rb
+++ b/app/controllers/origami/home_controller_bk.rb
@@ -1,4 +1,4 @@
-class Origami::HomeController < BaseOrigamiController
+class Origami::HomeController < ApplicationController
   def index
     if params[:booking_id] != nil
       type=params[:booking_id].split('-')[0];
diff --git a/app/controllers/origami/in_duties_controller.rb b/app/controllers/origami/in_duties_controller.rb
index eaf23c5a..1f7df320 100644
--- a/app/controllers/origami/in_duties_controller.rb
+++ b/app/controllers/origami/in_duties_controller.rb
@@ -1,4 +1,4 @@
-class Origami::InDutiesController < BaseOrigamiController
+class Origami::InDutiesController < ApplicationController
   before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
 
   # GET /in_duties
diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb
index a8b77861..9643ccc6 100644
--- a/app/controllers/origami/jcb_controller.rb
+++ b/app/controllers/origami/jcb_controller.rb
@@ -1,4 +1,4 @@
-class Origami::JcbController < BaseOrigamiController
+class Origami::JcbController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb
index ba97cad9..a7e680d3 100644
--- a/app/controllers/origami/master_controller.rb
+++ b/app/controllers/origami/master_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MasterController < BaseOrigamiController
+class Origami::MasterController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb
index ef1c286a..782145d7 100644
--- a/app/controllers/origami/moveroom_controller.rb
+++ b/app/controllers/origami/moveroom_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MoveroomController < BaseOrigamiController
+class Origami::MoveroomController < ApplicationController
   
   authorize_resource :class => false
   
diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb
index 6062216f..fa9a5ed4 100644
--- a/app/controllers/origami/movetable_controller.rb
+++ b/app/controllers/origami/movetable_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MovetableController < BaseOrigamiController
+class Origami::MovetableController < ApplicationController
   
   authorize_resource :class => false
 
diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb
index c9f707e3..85720e5e 100644
--- a/app/controllers/origami/mpu_controller.rb
+++ b/app/controllers/origami/mpu_controller.rb
@@ -1,4 +1,4 @@
-class Origami::MpuController < BaseOrigamiController
+class Origami::MpuController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb
index 800c460b..d23b4787 100644
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -1,4 +1,4 @@
-class Origami::OrdersController < BaseOrigamiController
+class Origami::OrdersController < ApplicationController
 
   def show
     @tables = Table.all.active.order('status desc')
diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb
index b0e6472c..c21e5011 100644
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -1,4 +1,4 @@
-class Origami::OtherChargesController < BaseOrigamiController
+class Origami::OtherChargesController < ApplicationController
 	authorize_resource :class => false
 
 	def index
diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index 2a24e2ac..001033e5 100644
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::OthersPaymentsController < BaseOrigamiController
+class Origami::OthersPaymentsController < ApplicationController
 
 
   def index
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 2a9fe5d9..2dd1a412 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::PaymentsController < BaseOrigamiController
+class Origami::PaymentsController < ApplicationController
 
   authorize_resource :class => false
   def index
diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb
index 0c3ea11f..491c989c 100644
--- a/app/controllers/origami/paypar_payments_controller.rb
+++ b/app/controllers/origami/paypar_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::PayparPaymentsController < BaseOrigamiController
+class Origami::PayparPaymentsController < ApplicationController
 	def create
 		sale_id = params[:sale_id]
 		redeem_amount = params[:redeem_amount]
diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb
index 74dd8095..ada68f59 100644
--- a/app/controllers/origami/product_commissions_controller.rb
+++ b/app/controllers/origami/product_commissions_controller.rb
@@ -1,4 +1,4 @@
-class Origami::ProductCommissionsController < BaseOrigamiController
+class Origami::ProductCommissionsController < ApplicationController
   before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
 
   # GET /product_commissions
diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb
index 802ba51b..c53e5d5a 100644
--- a/app/controllers/origami/redeem_payments_controller.rb
+++ b/app/controllers/origami/redeem_payments_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RedeemPaymentsController < BaseOrigamiController
+class Origami::RedeemPaymentsController < ApplicationController
  	def index
  		@sale_id = params[:sale_id]
  		payment_method = params[:payment_method]
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 7fa51da4..378e04c1 100644
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RequestBillsController < BaseOrigamiController
+class Origami::RequestBillsController < ApplicationController
 
   # Print Request Bill and add to sale tables
   def print
diff --git a/app/controllers/origami/room_invoices_controller.rb b/app/controllers/origami/room_invoices_controller.rb
index 8d805771..8fb995fc 100644
--- a/app/controllers/origami/room_invoices_controller.rb
+++ b/app/controllers/origami/room_invoices_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RoomInvoicesController < BaseOrigamiController
+class Origami::RoomInvoicesController < ApplicationController
  	def index
     @room = DiningFacility.find(params[:room_id])
     puts "room bookig lenght"
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 0eed53bc..67daf9af 100644
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -1,4 +1,4 @@
-class Origami::RoomsController < BaseOrigamiController
+class Origami::RoomsController < ApplicationController
 
   def index
     @tables = Table.all.active.order('status desc')
diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index 61c8b00f..6a183493 100644
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -1,4 +1,4 @@
-class Origami::SaleEditController < BaseOrigamiController
+class Origami::SaleEditController < ApplicationController
   authorize_resource class: false
   # Index for sale item void OR edit
   def edit
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 56e41a2a..7ab44c08 100644
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -1,4 +1,4 @@
-class Origami::SalesController < BaseOrigamiController
+class Origami::SalesController < ApplicationController
 
   def show
     @tables = Table.all.active.order('status desc')
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 31c68edf..c70a38c9 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -1,4 +1,4 @@
-class Origami::ShiftsController < BaseOrigamiController
+class Origami::ShiftsController < ApplicationController
 
   def index
   end
diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb
index 4571ba87..6947548e 100644
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -1,4 +1,4 @@
-class Origami::TableInvoicesController < BaseOrigamiController
+class Origami::TableInvoicesController < ApplicationController
  	def index
     @table = DiningFacility.find(params[:table_id])
     puts "table bookig lenght"
diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb
index 552d960b..4866fb13 100644
--- a/app/controllers/origami/visa_controller.rb
+++ b/app/controllers/origami/visa_controller.rb
@@ -1,4 +1,4 @@
-class Origami::VisaController < BaseOrigamiController
+class Origami::VisaController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 1cf1ec65..15215279 100644
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -1,4 +1,4 @@
-class Origami::VoidController < BaseOrigamiController
+class Origami::VoidController < ApplicationController
    authorize_resource :class => false
   def overall_void
 
diff --git a/app/controllers/origami/voucher_controller.rb b/app/controllers/origami/voucher_controller.rb
index e65abc85..d96d5a0d 100644
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -1,4 +1,4 @@
-class Origami::VoucherController < BaseOrigamiController
+class Origami::VoucherController < ApplicationController
 
   def index
     @sale_id = params[:sale_id]
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index dac05832..dc73ab8c 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -9,16 +9,20 @@
     <title>SmartSales : Restaurant</title>
     <%= csrf_meta_tags %>
 
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
+    
 
     <!-- oqs -->
     <%= stylesheet_link_tag    'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
     <!-- crm -->
-    <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>    
+    <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>   
+    <!-- oqs -->
+    <%= stylesheet_link_tag    'origami', media: 'all', 'data-turbolinks-track': 'reload' %> 
 
     <%= stylesheet_link_tag    'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'sx-sidebar', media: 'all', 'data-turbolinks-track': 'reload' %>
+
+    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
   <!-- JS -->  
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
     <!-- oqs -->
@@ -30,36 +34,34 @@
 
     <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>      
     
-
-
-    
   </head>
 
   <body>
     <%= render 'layouts/header' %>
     <div class="container-fluid">
-      <% flash.each do |type, message| %>
-        <%
-          if type== "warning"
-            alert = "alert-warning"
-          elsif type== "notice"
-            alert = "alert-success" 
-          else
-            alert = "alert-danger"
-          end
-        %>
-            <% if !flash["errors"]%>
-						  <div class="alert <%=alert%> fade-in">
-						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>			<%=message%>
-						  </div>
-            <% end %>
-			<% end %>
+      
       <div id="wrapper">
         <!-- Sidebar -->
-         <%=render 'layouts/sidebar' %>
+        <%=render 'layouts/sidebar' %>
         <!-- /#sidebar-wrapper -->
-         <div id="page-content-wrapper">
-           <%= yield %>  
+        <div id="page-content-wrapper">
+          <% flash.each do |type, message| %>
+              <%
+                if type== "warning"
+                  alert = "alert-warning"
+                elsif type== "notice"
+                  alert = "alert-success" 
+                else
+                  alert = "alert-danger"
+                end
+              %>
+                  <% if !flash["errors"]%>
+                    <div class="alert <%=alert%> fade-in">
+                      <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>      <%=message%>
+                    </div>
+                  <% end %>
+          <% end %>
+          <%= yield %>  
           </div>   
       </div>