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

update ui design

Browse Source
This commit is contained in:
Aung Myo
2017-09-29 13:42:41 +06:30
parent 96af0fcd17
commit 444b270dd1
38 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/application.scss
View File

@@ -16,6 +16,7 @@
.setting_nav{ .setting_nav{
background-color: #2f5663; background-color: #2f5663;
height: 53px;
} }
ul.navbar-nav li a{ ul.navbar-nav li a{

6
app/assets/stylesheets/sx-sidebar.css
View File

@@ -41,13 +41,14 @@
#page-content-wrapper { #page-content-wrapper {
width: 100%; width: 100%;
position: absolute; position: absolute;
padding: 0px; padding-top: 20px;
} }
#wrapper.toggled #page-content-wrapper { #wrapper.toggled #page-content-wrapper {
position: absolute; position: absolute;
margin-right: -200px; margin-right: -200px;
padding-top: 20px;
} }
@@ -126,12 +127,13 @@
width: 216px; width: 216px;
} }
#page-content-wrapper { #page-content-wrapper {
padding: 0px; padding-top: 20px;
position: relative; position: relative;
} }
#wrapper.toggled #page-content-wrapper { #wrapper.toggled #page-content-wrapper {
position: relative; position: relative;
margin-right: 0; margin-right: 0;
padding-top: 20px;
} }
} }
.accordion { .accordion {

2
app/controllers/inventory/inventory_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::InventoryController < BaseInventoryController class Inventory::InventoryController < ApplicationController#BaseInventoryController
def index def index
@products = InventoryDefinition.all.active.order('created_at desc') @products = InventoryDefinition.all.active.order('created_at desc')

2
app/controllers/inventory/inventory_definitions_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::InventoryDefinitionsController < BaseInventoryController class Inventory::InventoryDefinitionsController < ApplicationController#BaseInventoryController
before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy] before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy]
# GET /inventory_definitions # GET /inventory_definitions

2
app/controllers/inventory/stock_check_items_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::StockCheckItemsController < BaseInventoryController class Inventory::StockCheckItemsController < ApplicationController#BaseInventoryController
before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy] before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
# GET /stock_check_items # GET /stock_check_items

2
app/controllers/inventory/stock_checks_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::StockChecksController < BaseInventoryController class Inventory::StockChecksController < ApplicationController#BaseInventoryController
def index def index
@check = StockCheck.new @check = StockCheck.new
@inventory_definitions = InventoryDefinition.active.all @inventory_definitions = InventoryDefinition.active.all

2
app/controllers/origami/card_payments_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::CardPaymentsController < BaseOrigamiController class Origami::CardPaymentsController < ApplicationController
def index def index

2
app/controllers/origami/cash_ins_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::CashInsController < BaseOrigamiController class Origami::CashInsController < ApplicationController
def new def new
end end

2
app/controllers/origami/cash_outs_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::CashOutsController < BaseOrigamiController class Origami::CashOutsController < ApplicationController
def new def new
end end

2
app/controllers/origami/credit_payments_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::CreditPaymentsController < BaseOrigamiController class Origami::CreditPaymentsController < ApplicationController
def index def index

2
app/controllers/origami/customers_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::CustomersController < BaseOrigamiController class Origami::CustomersController < ApplicationController
load_and_authorize_resource load_and_authorize_resource
def index def index
end end

2
app/controllers/origami/discounts_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::DiscountsController < BaseOrigamiController class Origami::DiscountsController < ApplicationController
authorize_resource :class => false authorize_resource :class => false
#discount page show from origami index with selected order #discount page show from origami index with selected order

2
app/controllers/origami/home_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::HomeController < BaseOrigamiController class Origami::HomeController < ApplicationController
before_action :set_dining, only: [:show] before_action :set_dining, only: [:show]
def index def index

2
app/controllers/origami/home_controller_bk.rb
View File

@@ -1,4 +1,4 @@
class Origami::HomeController < BaseOrigamiController class Origami::HomeController < ApplicationController
def index def index
if params[:booking_id] != nil if params[:booking_id] != nil
type=params[:booking_id].split('-')[0]; type=params[:booking_id].split('-')[0];

2
app/controllers/origami/in_duties_controller.rb
View File

@@ -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] before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
# GET /in_duties # GET /in_duties

2
app/controllers/origami/jcb_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::JcbController < BaseOrigamiController class Origami::JcbController < ApplicationController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

2
app/controllers/origami/master_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::MasterController < BaseOrigamiController class Origami::MasterController < ApplicationController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

2
app/controllers/origami/moveroom_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::MoveroomController < BaseOrigamiController class Origami::MoveroomController < ApplicationController
authorize_resource :class => false authorize_resource :class => false

2
app/controllers/origami/movetable_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::MovetableController < BaseOrigamiController class Origami::MovetableController < ApplicationController
authorize_resource :class => false authorize_resource :class => false

2
app/controllers/origami/mpu_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::MpuController < BaseOrigamiController class Origami::MpuController < ApplicationController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

2
app/controllers/origami/orders_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::OrdersController < BaseOrigamiController class Origami::OrdersController < ApplicationController
def show def show
@tables = Table.all.active.order('status desc') @tables = Table.all.active.order('status desc')

2
app/controllers/origami/other_charges_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::OtherChargesController < BaseOrigamiController class Origami::OtherChargesController < ApplicationController
authorize_resource :class => false authorize_resource :class => false
def index def index

2
app/controllers/origami/others_payments_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::OthersPaymentsController < BaseOrigamiController class Origami::OthersPaymentsController < ApplicationController
def index def index

2
app/controllers/origami/payments_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::PaymentsController < BaseOrigamiController class Origami::PaymentsController < ApplicationController
authorize_resource :class => false authorize_resource :class => false
def index def index

2
app/controllers/origami/paypar_payments_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::PayparPaymentsController < BaseOrigamiController class Origami::PayparPaymentsController < ApplicationController
def create def create
sale_id = params[:sale_id] sale_id = params[:sale_id]
redeem_amount = params[:redeem_amount] redeem_amount = params[:redeem_amount]

2
app/controllers/origami/product_commissions_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::ProductCommissionsController < BaseOrigamiController class Origami::ProductCommissionsController < ApplicationController
before_action :set_product_commission, only: [:show, :edit, :update, :destroy] before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
# GET /product_commissions # GET /product_commissions

2
app/controllers/origami/redeem_payments_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::RedeemPaymentsController < BaseOrigamiController class Origami::RedeemPaymentsController < ApplicationController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]
payment_method = params[:payment_method] payment_method = params[:payment_method]

2
app/controllers/origami/request_bills_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::RequestBillsController < BaseOrigamiController class Origami::RequestBillsController < ApplicationController
# Print Request Bill and add to sale tables # Print Request Bill and add to sale tables
def print def print

2
app/controllers/origami/room_invoices_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::RoomInvoicesController < BaseOrigamiController class Origami::RoomInvoicesController < ApplicationController
def index def index
@room = DiningFacility.find(params[:room_id]) @room = DiningFacility.find(params[:room_id])
puts "room bookig lenght" puts "room bookig lenght"

2
app/controllers/origami/rooms_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::RoomsController < BaseOrigamiController class Origami::RoomsController < ApplicationController
def index def index
@tables = Table.all.active.order('status desc') @tables = Table.all.active.order('status desc')

2
app/controllers/origami/sale_edit_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::SaleEditController < BaseOrigamiController class Origami::SaleEditController < ApplicationController
authorize_resource class: false authorize_resource class: false
# Index for sale item void OR edit # Index for sale item void OR edit
def edit def edit

2
app/controllers/origami/sales_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::SalesController < BaseOrigamiController class Origami::SalesController < ApplicationController
def show def show
@tables = Table.all.active.order('status desc') @tables = Table.all.active.order('status desc')

2
app/controllers/origami/shifts_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::ShiftsController < BaseOrigamiController class Origami::ShiftsController < ApplicationController
def index def index
end end

2
app/controllers/origami/table_invoices_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::TableInvoicesController < BaseOrigamiController class Origami::TableInvoicesController < ApplicationController
def index def index
@table = DiningFacility.find(params[:table_id]) @table = DiningFacility.find(params[:table_id])
puts "table bookig lenght" puts "table bookig lenght"

2
app/controllers/origami/visa_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::VisaController < BaseOrigamiController class Origami::VisaController < ApplicationController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

2
app/controllers/origami/void_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::VoidController < BaseOrigamiController class Origami::VoidController < ApplicationController
authorize_resource :class => false authorize_resource :class => false
def overall_void def overall_void

2
app/controllers/origami/voucher_controller.rb
View File

@@ -1,4 +1,4 @@
class Origami::VoucherController < BaseOrigamiController class Origami::VoucherController < ApplicationController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

50
app/views/layouts/application.html.erb
View File

@@ -9,16 +9,20 @@
<title>SmartSales : Restaurant</title> <title>SmartSales : Restaurant</title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
<!-- oqs --> <!-- oqs -->
<%= stylesheet_link_tag 'OQS', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
<!-- crm --> <!-- 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 'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'sx-sidebar', 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 --> <!-- JS -->
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<!-- oqs --> <!-- oqs -->
@@ -30,36 +34,34 @@
<%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body> <body>
<%= render 'layouts/header' %> <%= render 'layouts/header' %>
<div class="container-fluid"> <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"> <div id="wrapper">
<!-- Sidebar --> <!-- Sidebar -->
<%=render 'layouts/sidebar' %> <%=render 'layouts/sidebar' %>
<!-- /#sidebar-wrapper --> <!-- /#sidebar-wrapper -->
<div id="page-content-wrapper"> <div id="page-content-wrapper">
<%= yield %> <% 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>
</div> </div>