From 0868697b113e8b6b96bff033e720a4298177b287 Mon Sep 17 00:00:00 2001
From: Zin Moe <zin.moe@code2lab.com>
Date: Thu, 27 Feb 2020 10:54:10 +0630
Subject: [PATCH] fix page scroll

---
 app/assets/javascripts/custom.js                         | 4 ++--
 app/views/foodcourt/addorders/detail.html.erb            | 2 +-
 app/views/foodcourt/orders/app_orders.html.erb           | 2 +-
 app/views/inventory/inventory_definitions/_form.html.erb | 2 +-
 app/views/inventory/stock_checks/index.html.erb          | 2 +-
 app/views/origami/addorders/detail.html.erb              | 2 +-
 app/views/origami/home/show.html.erb                     | 2 +-
 app/views/origami/pending_order/show.html.erb            | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index abde0bd5..620b9321 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -24,8 +24,8 @@ $(document).ready(function() {
   });
 
   $('#order-detail-slimscroll').slimScroll({
-    height: $('#order-detail-slimscroll').attr('data-height'),
-    // height: height-$('#order-detail-slimscroll').attr('data-height'),
+    // height: $('#order-detail-slimscroll').attr('data-height'),
+    height: height-$('#order-detail-slimscroll').attr('data-height'),
     size: '5px',
     color: 'rgba(0,0,0,0.5)',
     alwaysVisible: false,
diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb
index d640e94c..7b639931 100644
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -165,7 +165,7 @@
 
          </div>
          <div class="card-block">
-          <div class="card-text" id="order-detail-slimscroll" data-height="480">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
            <table class="table table-striped summary-items" id="order-items-table" >
              <thead>
                <tr>
diff --git a/app/views/foodcourt/orders/app_orders.html.erb b/app/views/foodcourt/orders/app_orders.html.erb
index f84e1434..03e922f4 100644
--- a/app/views/foodcourt/orders/app_orders.html.erb
+++ b/app/views/foodcourt/orders/app_orders.html.erb
@@ -103,7 +103,7 @@
             </div>
           </div>
           <div class="card-body">
-             <div class="card-text" id="order-detail-slimscroll" data-height="230">
+             <div class="card-text" id="order-detail-slimscroll" data-height="335">
                <table class="table table-striped summary-items">
                  <thead>
                    <tr>
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index ada37e7b..f5d3a245 100644
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -79,7 +79,7 @@
         </button>
 
         <div class="card-block">
-          <div class="card-text" id="order-detail-slimscroll" data-height="420">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
            <table class="table table-striped summary-items" id="order-items-table" >
               <thead>
                <tr>
diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb
index 2ab89ba4..0d9f03a5 100644
--- a/app/views/inventory/stock_checks/index.html.erb
+++ b/app/views/inventory/stock_checks/index.html.erb
@@ -37,7 +37,7 @@
         </button>
         <br>
         <div class="card-block">
-          <div class="card-text" id="order-detail-slimscroll" data-height="420">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
            <table class="table table-striped summary-items" id="order-items-table" >
               <thead>
                <tr>
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 2a683c25..a54ef431 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -243,7 +243,7 @@
 
          </div>
          <div class="card-block">
-          <div class="card-text" id="order-detail-slimscroll" data-height="420">
+          <div class="card-text" id="order-detail-slimscroll" data-height="140">
            <table class="table table-striped summary-items" id="order-items-table" >
              <thead>
                <tr>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index f6f5373d..ef8e8e3d 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -276,7 +276,7 @@
                   </div>
                 </div>
               </div>
-              <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 270 : 415%>">
+              <div id="order-detail-slimscroll" data-height="<%= @status_sale=="sale" ? 300 : 160%>">
               <div class="card-text" >
                 <table class="table table-striped" id="order-items-table">
                   <thead>
diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb
index 118b2998..df120aae 100644
--- a/app/views/origami/pending_order/show.html.erb
+++ b/app/views/origami/pending_order/show.html.erb
@@ -131,7 +131,7 @@
              </div>
 
            </div>
-           <div id="order-detail-slimscroll" data-height="430">
+           <div id="order-detail-slimscroll" data-height="140">
            <div class="card-text" style="">
              <table class="table table-striped" id="order-items-table">
                <thead>