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

update slim scroll

Browse Source
This commit is contained in:
Aung Myo
2017-10-11 17:53:29 +06:30
parent 12bf1dfc19
commit 6e47fbfe41
11 changed files with 288 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/assets/javascripts/application.js
View File

@@ -63,6 +63,27 @@
}); });
$(function(){
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
$('#custom-slimscroll').slimScroll({
height: height,
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
});
$('#order-detail-slimscroll').slimScroll({
height: height-180,
size: '5px',
color: 'rgba(0,0,0,0.5)',
alwaysVisible: false,
borderRadius: '0',
railBorderRadius: '0'
});
});
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
$(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
$('.dropdown-toggle').dropdown(); $('.dropdown-toggle').dropdown();

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

@@ -78,6 +78,15 @@ section.content {
.card { .card {
margin-bottom: 20px; margin-bottom: 20px;
} }
.card .card-header {
padding: 0.5rem;
}
.card .card-title{
margin-bottom:0.5rem;
}
.card .card-block {
padding: 0.5rem 1rem 1rem;
}
.checkbox label, label.checkbox-inline { .checkbox label, label.checkbox-inline {
padding-left: 0; padding-left: 0;
@@ -121,7 +130,7 @@ select.form-control {
} }
/* End Reset */ /* End Reset */
/*
.dining { .dining {
min-height:470px; min-height:470px;
max-height:570px; max-height:570px;
@@ -133,7 +142,7 @@ select.form-control {
max-height:500px; max-height:500px;
overflow:auto overflow:auto
} }
*/
.others-payment{ .others-payment{
line-height:100px; line-height:100px;
text-align:center; text-align:center;

11
app/views/origami/customers/index.html.erb
View File

@@ -37,10 +37,10 @@
<div class="row clearfix"> <div class="row clearfix">
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-12"> <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
<div class="form-group"> <div class="form-group">
<div class="form-line"> <!-- <div class="form-line"> -->
<input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-9"> <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
<input type="hidden" name="type" id="type" value=""> <input type="hidden" name="type" id="type" value="">
</div> <!-- </div> -->
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
@@ -101,7 +101,9 @@
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> <!-- <div class="col-lg-4 col-md-4 col-sm-4" style="min-height:600px; max-height:600px; overflow-x:scroll"> -->
<div class="col-lg-4 col-md-4 col-sm-4" >
<div id="custom-slimscroll">
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
<span class="patch_method"></span> <span class="patch_method"></span>
@@ -234,6 +236,7 @@
<%= f.button :submit, "Submit",:class => 'btn bg-blue waves-effect', :id => 'submit_customer' %> <%= f.button :submit, "Submit",:class => 'btn bg-blue waves-effect', :id => 'submit_customer' %>
<!-- <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> --> <!-- <%= f.button :submit, "Update",:class => 'btn bg-blue btn-block', :disabled =>'', :id => 'update_customer' %> -->
</div> </div>
</div>
<%end%> <%end%>
</div> </div>

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

@@ -18,13 +18,14 @@
<p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> <p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
</div> </div>
</div> </div>
<div id="custom-slimscroll">
<div class="card-text dining"> <div class="card-text dining">
<table class="table table-default" id="order-items-table"> <table class="table table-default" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY</td> <th class="item-attr">QTY</th>
<th class="item-attr">Price</td> <th class="item-attr">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -53,6 +54,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

2
app/views/origami/home/index.html.erb
View File

@@ -20,7 +20,7 @@
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div class="tab-content" > <div class="tab-content" id="custom-slimscroll">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="Completed " role="tabpanel"> <div class="tab-pane dining" id="Completed " role="tabpanel">
<div class="card-columns"> <div class="card-columns">

18
app/views/origami/home/show.html.erb
View File

@@ -21,6 +21,7 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content" > <div class="tab-content" >
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
@@ -112,6 +113,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>
<!-- Column One --> <!-- Column One -->
@@ -131,31 +133,32 @@
<div class="card-title"> <div class="card-title">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<p> Receipt No: <span id="receipt_no"> Receipt No: <span id="receipt_no">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<%= @sale_array[0].receipt_no rescue '' %> <%= @sale_array[0].receipt_no rescue '' %>
<% end %> <% end %>
</span></p> </span>
<br>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 text-right"> <div class="col-lg-6 col-md-6 col-sm-6 text-right">
<p>Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span> Date: <span id="receipt_date"><%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %></span>
</p> <br>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<% if @status_sale == 'sale' %> <% if @status_sale == 'sale' %>
<p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p> <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
<p>Customer : <%= @sale_array[0].customer.name rescue '' %></p> Customer : <%= @sale_array[0].customer.name rescue '' %>
<% else %> <% else %>
<p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p> <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
<p>Customer : <%= @customer.name rescue "" %></p> Customer : <%= @customer.name rescue "" %>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div id="order-detail-slimscroll">
<div class="card-text order-info" > <div class="card-text order-info" >
<table class="table table-striped" id="order-items-table"> <table class="table table-striped" id="order-items-table">
<thead> <thead>
@@ -221,6 +224,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

3
app/views/origami/orders/show.html.erb
View File

@@ -19,7 +19,7 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content"> <div class="tab-content">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane " id="completed" role="tabpanel" style="max-height:600px; overflow:auto"> <div class="tab-pane " id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
@@ -115,6 +115,7 @@
</div> </div>
</div> </div>
</div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>
<!-- Column One --> <!-- Column One -->

6
app/views/origami/other_charges/index.html.erb
View File

@@ -18,13 +18,14 @@
<p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p> <p>Date: <span id="receipt_date"> <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
</div> </div>
</div> </div>
<div id="order-detail-slimscroll">
<div class="card-text dining"> <div class="card-text dining">
<table class="table table-default" id="order-items-table"> <table class="table table-default" id="order-items-table">
<thead> <thead>
<tr> <tr>
<th class="item-name">Items</th> <th class="item-name">Items</th>
<th class="item-attr">QTY</td> <th class="item-attr">QTY</th>
<th class="item-attr">Price</td> <th class="item-attr">Price</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -53,6 +54,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

5
app/views/origami/product_commissions/load_commissioners.html.erb
View File

@@ -46,7 +46,9 @@
</div> </div>
</div> </div>
<div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll"> <div id="order-detail-slimscroll">
<!-- <div class="card-text" style="min-height:500px; max-height:500px; overflow-x:scroll"> -->
<div class="card-text">
<table class="table " id="order-items-table"> <table class="table " id="order-items-table">
<thead> <thead>
<tr> <tr>
@@ -93,6 +95,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
<div class="card-footer"> <div class="card-footer">
<table class="table" id="order-charges-table" border="0"> <table class="table" id="order-charges-table" border="0">
<tr> <tr>

4
app/views/origami/rooms/show.html.erb
View File

@@ -19,7 +19,7 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content" > <div class="tab-content" >
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane dining" id="completed" role="tabpanel"> <div class="tab-pane dining" id="completed" role="tabpanel">
@@ -112,7 +112,7 @@
<% end %> <% end %>
</div> </div>
</div> </div>
</div>
</div> </div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>

3
app/views/origami/sales/show.html.erb
View File

@@ -19,7 +19,7 @@
</li> </li>
</ul> </ul>
<!-- Nav tabs - End --> <!-- Nav tabs - End -->
<div id="custom-slimscroll">
<div class="tab-content"> <div class="tab-content">
<!--- Panel 0 - Completed Orders --> <!--- Panel 0 - Completed Orders -->
<div class="tab-pane active" id="completed" role="tabpanel" style="max-height:600px; overflow:auto"> <div class="tab-pane active" id="completed" role="tabpanel" style="max-height:600px; overflow:auto">
@@ -100,6 +100,7 @@
</div> </div>
</div> </div>
</div>
<!-- tabs - End --> <!-- tabs - End -->
</div> </div>
<!-- Column One --> <!-- Column One -->