From b40d4982f330ba829567fb7ee143367ee877d746 Mon Sep 17 00:00:00 2001
From: Myat Zin Wai Maw <myatzin@code2lab.com>
Date: Tue, 28 May 2019 14:02:14 +0630
Subject: [PATCH 1/6] add total grand balance

---
 app/controllers/crm/customers_controller.rb |  1 +
 app/views/crm/customers/show.html.erb       | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index c895c4b6..50c0da09 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -122,6 +122,7 @@ class Crm::CustomersController < BaseCrmController
     #get customer amount
       @customer        = Customer.find(params[:id])
       @response        = Customer.get_membership_transactions(@customer)
+      puts @response.to_json
 
       Rails.logger.debug "get membership transactions response"
       Rails.logger.debug @response.to_json
diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb
index 572b3937..646cd06a 100644
--- a/app/views/crm/customers/show.html.erb
+++ b/app/views/crm/customers/show.html.erb
@@ -179,11 +179,14 @@
                     <th><%= t("views.right_panel.detail.sales_status") %></th>
                     <th><%= t("views.right_panel.detail.receipt_date") %></th>
                 </tr>
+
               </thead>
 
               <tbody>
+                <% add_grand_total =0 %>
                   <% @sales.each do |sale| %>
                     <tr>
+
                       <td><%= link_to sale.sale_id, transactions_sale_path(sale) %></td>
                 <td><%= sale.receipt_no %></td>
                 <td><%= sale.total_discount %></td>
@@ -194,7 +197,15 @@
                 <td> <%= sale.sale_status %> </td>
                 <td> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
                     </tr>
+                    <% add_grand_total += sale.grand_total%>
                   <% end %>
+                  <% if !@sales.empty?%>
+                    <tr  style="border-top:2px solid #666;">
+                      <th colspan="5">Balance</th>
+                      <th colspan="4"><%= add_grand_total %></th>
+                    </tr>
+                  <% end %>
+                
               </tbody>
             </table>
          </div>

From 2fb4a85295472feafba0d3628ac4c0a06fc7a865 Mon Sep 17 00:00:00 2001
From: NyanLinHtut <nyanlinhtut@code2lab.com>
Date: Wed, 29 May 2019 17:32:53 +0630
Subject: [PATCH 2/6] mobile view

---
 app/assets/stylesheets/application.scss  |  11 +-
 app/assets/stylesheets/login.scss        |  10 +-
 app/views/layouts/_left_sidebar.html.erb | 285 +++++++++++++++++------
 app/views/layouts/login.html.erb         |  38 +--
 4 files changed, 246 insertions(+), 98 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index b1718ee2..f3cd1157 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -119,9 +119,14 @@ i.logout_icon{
   margin-right: 15px;
   color:#fff !important;
  # background-color: green !important;
-} 
+}
 
 .payment-btn-box {
-  width: 130px; 
+  width: 130px;
   height: 50px;
-}
\ No newline at end of file
+}
+
+@media screen and (max-width: 785px) {
+  #setting{ display: none;}
+  .menu-up{ display: none;}
+}
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index f156d4d3..3d2504d0 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -22,7 +22,7 @@
   display: block;
   width: 100%;
   text-align: center;
-  color: #000; 
+  color: #000;
   margin-top: -5px;
 }
 
@@ -117,4 +117,10 @@
 
 .box {
   margin : 0 -60px 0 -60px;
-}
\ No newline at end of file
+}
+
+@media screen and (max-width: 785px) {
+  .login_pwd{width: 90%;}
+  .login_ent{width: 10%;}
+
+}
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 21b32859..d9f12423 100644
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -2,12 +2,12 @@
 <aside id="leftsidebar" class="sidebar">
 	<!-- User Info -->
 	<!-- <div class="user-info">
-		<div class="image">			
+		<div class="image">
 			<img src="public/image/user.png" width="48" height="48" alt="User" />
 		</div>
 		<div class="info-container">
 			<div class="name" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-			current_login_employee.name 			
+			current_login_employee.name
 			</div>
 			 <div class="email">john.doe@example.com</div>
 			<div class="btn-group user-helper-dropdown">
@@ -21,7 +21,7 @@
 					<li role="seperator" class="divider"></li>
 					<li><a href="javascript:void(0);"><i class="material-icons">input</i>Sign Out</a></li>
 				</ul>
-			</div> 
+			</div>
 		</div>
 	</div> -->
 	<!-- #User Info -->
@@ -42,7 +42,7 @@
 				</a>
 			</li>
 			<% if can? :menage, OrderQueueStation %>
-			<li>
+			<li class="menu-up">
 				<a href="<%= oqs_root_path %>">
 					<i class="material-icons">room_service</i>
 					<span><%= t :oqs %></span>
@@ -50,8 +50,8 @@
 			</li>
 			<% end %>
 			<% if can? :index, :home %>
-				<% if current_login_employee.role != "kitchen" %> 
-				<li>
+				<% if current_login_employee.role != "kitchen" %>
+				<li class="menu-up">
 					<a href="<%= origami_dashboard_path %>">
 						<i class="material-icons">monetization_on</i>
 						<span><%= t :origami %></span>
@@ -60,27 +60,27 @@
 				<% end %>
 			<% end %>
 			<% if can? :menage, Customer %>
-			<li>
+			<li class="menu-up">
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">widgets</i>
 					<span><%= t :crm %></span>
 				</a>
 				<ul class="ml-menu">
-					
+
 						<li>
 							<a href="<%= crm_customers_path %>"><%= t :customer %></a>
 						</li>
-					
+
 					<% if can? :menage, DiningQueue %>
 						<li>
 							<a href="<%= crm_dining_queues_path %>"><%= t :queue %></a>
-						</li>	
-					<% end %>	
+						</li>
+					<% end %>
 				</ul>
 			</li>
-			<% end %>	
+			<% end %>
 			<% if can? :menage, Inventory %>
-			<li>
+			<li class="menu-up">
 				<a href="<%= inventory_path %>">
 					<i class="material-icons">store</i>
 					<span><%= t :inventory %></span>
@@ -88,66 +88,9 @@
 			</li>
 			<%end%>
 			<li class="header"><%= t :backend %></li>
-			<li>
-				<a href="javascript:void(0);" class="menu-toggle">
-					<i class="material-icons">widgets</i>
-					<span><%= t :transactions %></span>
-				</a>
-				<ul class="ml-menu">
-				    <% if can? :menage, Booking %>
-						<li>
-							<a href="<%= transactions_bookings_path %>"><%= t :bookings %></a>
-						</li>
-					<% end %>
-				    <% if can? :menage, Order %>
-						<li>
-							<a href="<%= transactions_orders_path %>"><%= t :orders %></a>
-						</li>
-					<% end %>
-					<% if can? :menage, Sale %>
-						<li>
-							<a href="<%= transactions_sales_path %>"><%= t :sale %></a>
-						</li>
-					<% end %>
-					<% if can? :menage, Sale %>
-						<li>
-							<a href="<%= transactions_credit_notes_path %>"><%= (t :credit) %></a>
-						</li>
-					<% end %>
-					<% if can? :menage, Sale %>
-						<li>
-							<a href="<%= transactions_shift_sales_path %>"><%= (t :shiftsale) %></a>
-						</li>
-					<% end %>
-					<% if can? :menage, Survey %>
-						<li>
-							<a href="<%= transactions_surveys_path %>"><%= t("views.right_panel.detail.survey") %></a>
-						</li>
-					<% end %>
-					<% if can? :manage, OrderReservation %>
-						<% if order_reservation %>
-							<li>
-								<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
-							</li>
-						<% end %>
-					<% end %>
-					<% if can? :manage, Sale %>
-						<% if bank_integration %>
-							<li>
-								<a href="<%= transactions_card_sale_trans_path %>"><%= t :cb_payments %></a>
-							</li>
-						<% end %>
-					<% end %>
-					<% if can? :manage, Sale %>
-						<% if bank_integration %>
-							<li>
-								<a href="<%= transactions_card_settle_trans_path %>"><%= t :cb_settlement %></a>
-							</li>
-						<% end %>
-					<% end %>
-				</ul>
-			</li>
-			<% if can? :index, :dailysale %> 
+			<% device = request.user_agent %>
+			<% if device.include? 'Mobile' %>
+			<% if can? :index, :dailysale %>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">assessment</i>
@@ -207,8 +150,193 @@
 						</li>
 					<% end %>
 				</ul>
-			</li>	
+			</li>
 			<%end%>
+
+			<li>
+				<a href="javascript:void(0);" class="menu-toggle">
+					<i class="material-icons">widgets</i>
+					<span><%= t :transactions %></span>
+				</a>
+				<ul class="ml-menu">
+				    <% if can? :menage, Booking %>
+						<li>
+							<a href="<%= transactions_bookings_path %>"><%= t :bookings %></a>
+						</li>
+					<% end %>
+				    <% if can? :menage, Order %>
+						<li>
+							<a href="<%= transactions_orders_path %>"><%= t :orders %></a>
+						</li>
+					<% end %>
+					<% if can? :menage, Sale %>
+						<li>
+							<a href="<%= transactions_sales_path %>"><%= t :sale %></a>
+						</li>
+					<% end %>
+					<% if can? :menage, Sale %>
+						<li>
+							<a href="<%= transactions_credit_notes_path %>"><%= (t :credit) %></a>
+						</li>
+					<% end %>
+					<% if can? :menage, Sale %>
+						<li>
+							<a href="<%= transactions_shift_sales_path %>"><%= (t :shiftsale) %></a>
+						</li>
+					<% end %>
+					<% if can? :menage, Survey %>
+						<li>
+							<a href="<%= transactions_surveys_path %>"><%= t("views.right_panel.detail.survey") %></a>
+						</li>
+					<% end %>
+					<% if can? :manage, OrderReservation %>
+						<% if order_reservation %>
+							<li>
+								<a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
+							</li>
+						<% end %>
+					<% end %>
+					<% if can? :manage, Sale %>
+						<% if bank_integration %>
+							<li>
+								<a href="<%= transactions_card_sale_trans_path %>"><%= t :cb_payments %></a>
+							</li>
+						<% end %>
+					<% end %>
+					<% if can? :manage, Sale %>
+						<% if bank_integration %>
+							<li>
+								<a href="<%= transactions_card_settle_trans_path %>"><%= t :cb_settlement %></a>
+							</li>
+						<% end %>
+					<% end %>
+				</ul>
+			</li>
+
+			<%else%>
+			<li id="left-menu">
+			  <a href="javascript:void(0);" class="menu-toggle">
+			    <i class="material-icons">widgets</i>
+			    <span><%= t :transactions %></span>
+			  </a>
+			  <ul class="ml-menu">
+			      <% if can? :menage, Booking %>
+			      <li>
+			        <a href="<%= transactions_bookings_path %>"><%= t :bookings %></a>
+			      </li>
+			    <% end %>
+			      <% if can? :menage, Order %>
+			      <li>
+			        <a href="<%= transactions_orders_path %>"><%= t :orders %></a>
+			      </li>
+			    <% end %>
+			    <% if can? :menage, Sale %>
+			      <li>
+			        <a href="<%= transactions_sales_path %>"><%= t :sale %></a>
+			      </li>
+			    <% end %>
+			    <% if can? :menage, Sale %>
+			      <li>
+			        <a href="<%= transactions_credit_notes_path %>"><%= (t :credit) %></a>
+			      </li>
+			    <% end %>
+			    <% if can? :menage, Sale %>
+			      <li>
+			        <a href="<%= transactions_shift_sales_path %>"><%= (t :shiftsale) %></a>
+			      </li>
+			    <% end %>
+			    <% if can? :menage, Survey %>
+			      <li>
+			        <a href="<%= transactions_surveys_path %>"><%= t("views.right_panel.detail.survey") %></a>
+			      </li>
+			    <% end %>
+			    <% if can? :manage, OrderReservation %>
+			      <% if order_reservation %>
+			        <li>
+			          <a href="<%= transactions_order_reservations_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
+			        </li>
+			      <% end %>
+			    <% end %>
+			    <% if can? :manage, Sale %>
+			      <% if bank_integration %>
+			        <li>
+			          <a href="<%= transactions_card_sale_trans_path %>"><%= t :cb_payments %></a>
+			        </li>
+			      <% end %>
+			    <% end %>
+			    <% if can? :manage, Sale %>
+			      <% if bank_integration %>
+			        <li>
+			          <a href="<%= transactions_card_settle_trans_path %>"><%= t :cb_settlement %></a>
+			        </li>
+			      <% end %>
+			    <% end %>
+			  </ul>
+			</li>
+			<% if can? :index, :dailysale %>
+			<li>
+			  <a href="javascript:void(0);" class="menu-toggle">
+			    <i class="material-icons">assessment</i>
+			    <span><%= t :reports %></span>
+			  </a>
+			  <ul class="ml-menu">
+			    <li>
+			      <a href="<%= reports_dailysale_index_path %>">Daily Sales</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_saleitem_index_path %>">Sale Items</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_product_sale_index_path %>">Product Sale</a>
+			    </li>
+			    <% if order_reservation %>
+			    <li>
+			      <a href="<%= reports_order_reservation_index_path %>"><%= t("views.right_panel.detail.order_reservation") %></a>
+			    </li>
+			    <% end %>
+			    <li>
+			      <a href="<%= reports_receipt_no_index_path %>">Receipt</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_receipt_no_detail_index_path %>">Receipt Detail</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_shiftsale_index_path %>">Shift Sales</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_credit_payment_index_path %>">Credit Sales</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_void_sale_index_path %>">Void Sales</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_waste_and_spoilage_index_path %>">Wastes & Spoilages</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_payment_method_index_path %>">Payment Method</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_commission_index_path %>">Commission</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_induty_index_path %>">Induty</a>
+			    </li>
+			    <li>
+			      <a href="<%= reports_stock_check_index_path %>">Stock Check</a>
+			    </li>
+			    <% if bank_integration %>
+			      <li>
+			        <a href="<%= reports_card_sale_tran_index_path %>">CB Payments</a>
+			      </li>
+			      <li>
+			        <a href="<%= reports_card_settle_tran_index_path %>">CB Settlement</a>
+			      </li>
+			    <% end %>
+			  </ul>
+			</li>
+			<% end %>
+		<% end %>
+		<div id="setting" >
 			<li class="header"><%= t :settings %></li>
 			<% if can? :menage, Zone %>
 			<li>
@@ -232,7 +360,7 @@
 					<i class="material-icons col-indigo">donut_large</i>
 					<span><%= t :oqs %></span>
 				</a>
-			</li>	
+			</li>
 			<% end %>
 			<% if can? :menage, Employee %>
 				<li>
@@ -256,7 +384,7 @@
 					<i class="material-icons col-pupple">donut_large</i>
 					<span><%= t :printer %></span>
 				</a>
-			</li>			
+			</li>
 			<% end %>
 			<% if can? :menage, TaxProfile %>
 				<li>
@@ -312,8 +440,11 @@
 					</a>
 				</li>
 			<% end %>
+		</div>
 		</ul>
 	</div>
+
+
 	<!-- #Menu -->
 	<!-- Footer -->
 	<div class="legal">
@@ -326,4 +457,4 @@
 	</div>
 	<!-- #Footer -->
 </aside>
-<!-- #END# Left Sidebar
\ No newline at end of file
+<!-- #END# Left Sidebar
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index d6c6c955..46ccccde 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -35,7 +35,7 @@
 
     <!-- <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script> -->
-    <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %> 
+    <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %>
   </head>
 
   <body class="login-page">
@@ -57,8 +57,8 @@
     </div>
     <!-- #END# Page Loader -->
     <% flash.each do |type, message| %>
-    <% 
-    if type == "notice" 
+    <%
+    if type == "notice"
      color = "alert-success"
    elsif type == "error"
     color = "alert-danger"
@@ -67,22 +67,22 @@
   else
     color = "bg-black"
     end %>
-    
+
     <p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
       data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
     </p>
-    <% end %>  
+    <% end %>
     <div class="login-box">
       <div class="logo text-center">
         <img src="/image/SX-logo.png" width="150px" height="150px">
         <p>
           <small>Version - 1.0.1</small>
-        </p> 
+        </p>
       </div>
       <div class="row">
           <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
             <div class="current-shop-name">
-                <span><%= shop_detail.name %></span> 
+                <span><%= shop_detail.name %></span>
               </div>
           </div>
         </div>
@@ -90,13 +90,13 @@
       <div class="card padding-10">
         <div class="card-header m-l-">
           <div class="row clearfix">
-            <div class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
+            <div class="col-lg-10 col-md-10 col-sm-10 col-xs-10 login_pwd">
               <%= f.input :emp_id, as: :hidden, required: false, class: "form-control" %>
 
               <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
 
             </div>
-            <div class="col-lg-2 col-md-2 col-sm-2 col-xs-10">
+            <div class="col-lg-2 col-md-2 col-sm-2 col-xs-10 login_ent">
               <br>
               <span class="input-group-addon enter m-t-25 m-l--25" data-value="ENT" style="cursor: pointer;padding:0.1rem !important;">
                 <i class="material-icons">send</i>
@@ -126,10 +126,18 @@
               <!--  <div class="pin_pad bg-grey" data-value="CLR">CLR</div>
                <div class="pin_pad left" data-value="0">0</div>
                <div class="pin_pad left bg-indigo" data-value="ENT">ENT</div> -->
+               <% if request.user_agent.include? 'Mobile' %>
+                <div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div>
+                <div class="pin_pad left" data-value="0">0</div>
+                <div class="pin_pad bg-grey left" data-value="ENT">ENTER</div>
+               <% else %>
                <div class="pin_pad bg-blue-grey" data-value="BAC">BACK</div>
                <div class="pin_pad left" data-value="0">0</div>
-               <div class="pin_pad bg-grey left" data-value="CLR">CLR</div>                    
-            </div>                      
+               <div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div>
+               <% end %>
+
+
+            </div>
           </div>
          </div>
         <% end %>
@@ -139,7 +147,7 @@
     $("#login_form_password").focus();
 
     $(".pin_pad").click(function (event) {
-      event.preventDefault();                
+      event.preventDefault();
       var value = $(this).data("value");
 
       if (value == "CLR") {
@@ -154,12 +162,12 @@
       }
     });
     $(".enter").click(function (event) {
-      event.preventDefault();                
+      event.preventDefault();
       var value = $(this).data("value");
 
       if (value == "ENT") {
         $("#new_login_form").submit();
-      } 
+      }
     });
   });
   function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
@@ -199,5 +207,3 @@
 </script>
 </body>
 </html>
-
-

From 9440bcfa7e220c68dcd99f8fed4524dfaec1b792 Mon Sep 17 00:00:00 2001
From: PPK <moethandar@code2lab.com>
Date: Wed, 29 May 2019 17:34:43 +0630
Subject: [PATCH 3/6] Update Reort

---
 app/controllers/api/orders_controller.rb   |   4 ++++
 app/views/reports/dailysale/index.html.erb |  20 ++++++++++----------
 app/views/reports/dailysale/index.xls.erb  |   2 +-
 app/views/reports/shiftsale/index.html.erb |   4 ++--
 dump.rdb                                   | Bin 1084 -> 3868 bytes
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index c893bb64..aab34b42 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -47,8 +47,12 @@ class Api::OrdersController <  Api::ApiController
     # end
 
     @shop = Shop.first
+    puts "Hello world"
+    puts @shop.to_json
+    return @shop.to_json
   end
 
+
   # Description
   # This API allow new order creation
   # Input Params
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index a6b57134..6b055fc2 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -31,34 +31,34 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
 									<% if @payment_methods.include? ("MPU") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.mpu_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.mpu_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("Master") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.master_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("VISA") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.visa_sales") %></th>
+										<th style='text-align:center;'class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.visa_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("JCB") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.jcb_sales") %></th>
+										<th style='text-align:center;'class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.jcb_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("UNIONPAY") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.unionpay_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.unionpay_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("Alipay") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.alipay_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.alipay_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("PAYMAL") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.paymal_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.paymal_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("DINGA") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.dinga_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.dinga_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("JunctionPay") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.junctionpay_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.junctionpay_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("Redeem") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.redeem_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.redeem_sales") %></th>
 									<% end %>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index b8bf01b8..d441e48e 100755
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -19,7 +19,7 @@
 								<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
 								<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
 								<% if @payment_methods.include? ("MPU") %>
-									<th style='text-align:center;'><%= t("views.right_panel.detail.mpu_sales") %></th>
+									<th style='text-align:center;' class='mobile'><%= t("views.right_panel.detail.mpu_sales") %></th>
 								<% end %>
 								<% if @payment_methods.include? ("Master") %>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index f9b4e233..e5382b87 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -54,8 +54,8 @@
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>
 						<!-- <th>Credit Charges</th> -->
 						<th><%= t("views.right_panel.detail.credit_payment") %></th>
-						<th><%= t("views.btn.other_payment") %></th>
-						<th><%= t("views.btn.foc") %> <%= t :payment %></th>
+						<th class="d-none d-sm-table-cell"><%= t("views.btn.other_payment") %></th>
+						<th class="d-none d-sm-table-cell"><%= t("views.btn.foc") %> <%= t :payment %></th>
 					<!-- <th>Grand Total 
 					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
diff --git a/dump.rdb b/dump.rdb
index 87e22f1d49653abdc6c0f99faa01b9c718bc686f..99b6899f68e00045419078e588b2d46029c6f5a1 100644
GIT binary patch
literal 3868
zcmc)NeQ*@z9S87dcW*CuNgzZbpddVZNzjnnWbgeh8r<UuG=;-RKp9@V+uM7NTXK7Q
z+1*PB9qJ}PEBFSE1!1aQsE8J5t4=$<O&h>=oT;@=J8f-ko!vDF4(U|N_*Tl)ZW2YL
z!Kr`w?>@WF{`Prhzn|Z;x@~EDC&Mt23r-oO1%>WGG8t%MntT_^CoiM~RT*M0ki060
z=u~HXY~uw-Q9)^1MB*vt-YRgRl9MuYK}MXI%Aq0fAMo$F_KSzkJ{Nxw0{~p7sGQnT
zkR=`|)?+PR#uK5L0L_F?9spq0#At>Sa+5<L>pJa?3|(c!=b3uMn$a4$_~G<lbbskf
zJ%N+2PFd2#dwq;G$ECurEbY^(tpaL%J|B-zAdulQ=~ToQ2&Mx3>81Z#F>}F&Z@GlD
ztHtMb<v9_#T3m5S&I|d?Fply?m)lh)C<)G5${u(<p~^*+oMDsXG?HQM&^68;E+?cD
zX|7L!w^lN4kK60^x&7{dI|x~Ao@0Ci5*b+%S&Cp<7)B?r!&C{*wt0Omfe4)K;5ij-
zmSh3JRbYem7zn~^F)0mqz*~R^x|025BGu<=@#x@r#}aG1x-y)i!UY7EQxm1%>clL2
zfs;{QO|a*Pd@+|xzE;NdSUba|a&Tiw$5kZiSRe4{wrzmczFk^hV`%#f?VzFUG_)5C
z?Ri7{j-mZ1Nx~Yo+6fKqdxrL`p}mxJ5YHLfUN}c5AFo<1@Ca@!GK@C}mmn?=Zy*Gb
z+YBFA;L56Mp{2Q*=Q1dbM2Yr#{Y?c)p~XHfFLJW2iI>FYWFyurQpZ6eS&k{qu%0ER
zB~n5cqI)Gdm!?w)5+~;qO<M|^VY)nx6kZkzsvzaz7Q)j2+u=t5Mo}50p|x_oGUd>!
z$}^G-6+tZI5M;9e!Z{9cqr5TiZGfv>ew}F6%NAM>En*u<UjvNh)Z}#QBK1^qChH>o
z4RB3gAvvG5>lH-+*&CgK1{fFeuv_he?LaI!^$MDGTU*gf^1M{ctJ+$ehMZ1J*Q<gc
zL{(u5G{IaL)E$2Yf=(=;C_FEzYypIm5nL&zxP>rW#%B@Vm6En<T|=|kMfOMoT$>kE
zSW7A>hj=wffg)SY-hg=+*iH%MkW*DzNEKD2zy_OG%&FGQ&C&aG+?9-+{0)$}xAp2^
zX+hFQy%syK$)J5nKNQJgAt!O^<N@9J30s?Nq25Y9g)2zatGnPlR}mBPR5vDa1H~OX
zqJMYwgU(cv9bi|$MT1BA6SX7MyC6ZGPgX2__#Ma3FeO241c~T$($$jTa!TE?=nA+V
zu4HF{1RRLH2{yqE23Va=l?Dh!*oI(Z-7}z=oa1!Gtr#kbu1(vacd*f_+SXYR_&(jn
z*j8Er0*7Ylpo}OMkX*VJ-?ZJWgFJqlkkg&Fur)ef*YDD?edH<$#ygkm1cke}yiV>Q
zV_AXkLQ9w1U_p|*V9EhAf|7+PF2_nlhs^aR=h+p+WhCo&SpolM7xGpv<@w}?yX0Z#
z$ACuLVsF4AyaOx9buYqlo5zaGrnWbz0i$9+kwzKL_0tiMSjgh}L}6hCkOu67$8}H*
z=W6S;wK{guz#fRUwfz$Fghq)u^^XECJWv`$yNDkf+QaoSW(+_QJU)UyP4pYuvHE8r
zUDyAsMR;7wF8l-FU`^^R_?MADKZx%-iqXrcjE#;<c@^G;b!FiU;2Ejh!S=rM;(T*j
z+;BW)+TspF8#J`<8`{ff0CkE00keAp2%Gi|z(<wL{tW}i95koWE4gd|ovHle&Q|lK
zH6y@JtdR<Z+9#+z!`N(LV*_$NWAy*r&@@9kUV9!={Clxc($MxB+M%Hu@JP}Pj#!IR
z?}QlGG*!%7nHr)!;i(flM0<l%kA!K)dwG^mnZusI5I!{?;~{?4YP?q;4AWP`#VYmc
zk4?&R^%stR<n%8Rc=Fd6sPP6eet+5*h=hVE<m0$dnD?Jv_R6N)KO@9@iIBD)^tBP<
z`;-ve<!@qJJ|iSx5kkhKTpBKg2S68$O&anBoOX$jcP9yX<#R&Tl-`^qq#NE@>b5hC
zpJo^jTvqCs*{NE;U<%1{pOu}tE+xx#A$Wt1%RtdF3Wz#RO)8Q9N=od!Oo{45R<b%4
zE{$kO-pu6%p4KrD(5zTaTNbAKXjP)q(aLIidGJmqz9c~>Vp5@R0+M52faJkRNG@7w
zf9`Wgrd<Ka{Z~NZxdaJw1tgxSA;AI-lxq8`kif4IlJ_PcdGh~;<Zuzrh@N%bZ9#Gu
ztFi5H_TUlzCv^v@Q45lDxYen^*gF+3j8n4SqNMUON}i0iU!p{dy){WmM|x9f0JkWK
zovu6nzmhaq%a3>VqU7&%>{Cg!S(AROBRV*~EB1j-EFzXjs#@1;bGu?zXX1w3B?z|d
z{O7RaZa@zc1Mp^|APao-7GhihG?OAt@a!=7J*gxnBnawwH6d9L)b9pT|91zQFM~ig
zuxj@0wiO^aVz0Fn*dIGj^@5f4@8R&9MYf%iN3i>J+w9a*=pG4F+4vl%DD`$il(q<U
z?_VP$UML`15xHEB_R#@`*$Ro_%8%e7^M!}Z%2va1(A?7sLZ-dd3i<~QxAMzK*pVxW
z5Z0LZVx630w%(fTw9y@s%DGyncZ!mvW(7od-o7@vy3HI78jgp|8Nt}<_Iv7*!wGd5
z^Z>sJ!XS{`aTcqz2mw+28<Ki9S^@89zrOBioM8fI$qJ%PDaiF71Ie@>wfac2^$0+v
ztU0>RaBMSo?7MMfxgA7I`}{Mw9gB+eO*qfx&9Vj7mzu3`WgO6rdo{@%U1&H4%smUO
zF2=OqIEtSui*bcQk>>@|anpG5w>Avr=2~IwjnF8}q(Xc!?em2BP&nvKXS}?hhYqKY
z^LR3mNW!z#99?BNe`r?S2E1e4+kuCkHfq}s{0)syvmnN-$KXo$S%60Ek4&t~ZDk#@
zq#_|tuRM#RbRyY9B$V!=M?E*Q2v3Z?zTI#hH1A#9yw0>O1_5gC;l&{S&^-iPgDjuN
z@Vh4_SzIo13YX((KFbLwULHOp8jjs&RnwSKJcsQC!7+Ogcmj_e4uhqQ6&R8|TTEL3
zPWxa{KYND>O4bczkFA|YH19t{ig2}*%fW<+|3G)lHCvyo>hSs^Od#y10|92M-{UjS
zJV6Z`<o#yV6ToY3IdW__@caY2e!x41?;+z7pB12M9tLAe!Y1j{o%76AKM+|J&^~hD
z1Wq$P^WD(+j#q`=mtO^*VeGF1p)ukRDe+RisHP%m*(4)6G5^#$v-Rf2$LxHzDCcQj
z>o@UbgeO3U{C~nj9{=!}UE^)XjCkY0%+d4dL5N*^o%XHx(t{Wi8bVh=bK?AG$L-xk
zR746^HvUst9W1E0?5JqrKgGFn;t*#w57<<l!DK7)d1X_!6;@f`lSi~U$<s%Jwf_aO
CZUEW<

literal 1084
zcmaJ=L5tHs7@d@~tL|E44~h%YGI)|snM{&q5-$}LT*ZqXJgC&9nQkLV(<YOJBKsRW
zivA5Rf(O&xiy-(1ym<Bpc!+g%npWK{$sUvUz3;v6ecwF1b9?s@#+YX3Bj$QB+GkNs
zYvZ<}WEYly9FNCoH>>u!7qCM!`}#CHm&D9P0SgZA{@McBmK_ezIAV6-_$&p-;OEW;
zsK?yq);J3LEEd(X&(i$u_jeCoNdSPWr!k9Q#Y9*~n9g1Uu$iL++w+;5R>0*GpNmQZ
zVFM{N1w{x&#1u$@Ku#l_Vw!;nE~Vu?Yo$FGR_0%jdjIUvjFc4_7RtiYfByQk%Uq0N
z+Z3t7_WVcv<K#?nMW1~FmD(g>35%r-mksR1=Oq&@o0fp9pw?ZAaD`E&G{O~FKoe@^
zG>R}urTOD)_ddK3cO&ogLzfZXb}W?=)6yKQ(~jvnL^I^-B=H!Rd6Y2O8x6vv?)&ah
z<0Tx1F(26hgBJYDhAk*=D&oxTHEa$oMb`~#Vy#2ls)i|{S__Un7cNw)W(#tAuX*#L
z8^k@A?fc<4U?bkV)#!(#eiB7&)Sp6&=q<R+7g|qXo-pvc*Dnpdy<u-0d12)7DSXy~
z%>#)Ept&h|ZgaPL<(u^8c~n0&3p|h=X7lZZFOy(m8f`<NCQ+&EB=J;i{NGDjPjvN+
gN*A$;dz~ismuG$Amex!1&WfH^eyd7+e4`qGKV(=_ZU6uP


From d38d3184cb06550ad3a9031b43a5188d54d377d2 Mon Sep 17 00:00:00 2001
From: code2lab <wunnatun@code2lab.com>
Date: Wed, 29 May 2019 17:49:02 +0630
Subject: [PATCH 4/6] SX project

---
 config/database.yml.sample | 91 +++++---------------------------------
 config/facebook.yml        | 11 +++++
 config/puma.rb             | 18 ++++----
 config/secrets.yml         | 15 ++-----
 4 files changed, 35 insertions(+), 100 deletions(-)
 create mode 100644 config/facebook.yml

diff --git a/config/database.yml.sample b/config/database.yml.sample
index 02c6afe3..211fb2f0 100755
--- a/config/database.yml.sample
+++ b/config/database.yml.sample
@@ -1,83 +1,16 @@
-# ## SQLIte3 --- Setup
-#
-# # SQLite version 3.x
-# #   gem install sqlite3
-# #
-# #   Ensure the SQLite 3 gem is defined in your Gemfile
-# #   gem 'sqlite3'
-# #
-# default: &default
-#   adapter: sqlite3
-#   pool: 5
-#   timeout: 5000
-#
-# development:
-#   <<: *default
-#   database: db/development.sqlite3
-#
-# # Warning: The database defined as "test" will be erased and
-# # re-generated from your development database when you run "rake".
-# # Do not set this db to the same as development or production.
-# test:
-#   <<: *default
-#   database: db/test.sqlite3
-#
-# production:
-#   <<: *default
-#   database: db/production.sqlite3
-
-# Mysql --- Setup
-# MySQL. Versions 5.0 and up are supported.
-#
-# Install the MySQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.7/en/old-client.html
-#
 default: &default
-  adapter: mysql2
-  encoding: utf8
-  pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock
+ adapter: postgresql
+ host: localhost
+ pool: 5
+ timeout: 5000
+ encoding: unicode
+ username: wunna
+ password: admin123
+ port: 5432
 
 development:
-  <<: *default
-  database: SXRestaurants_development
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: SXRestaurants_test
-
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= ENV['DATABASE_URL'] %>
-#
+ <<: *default
+ database: SXDatabase
 production:
-  <<: *default
-  database: SXRestaurants_production
-  username: SXRestaurants
-  password: <%= ENV['SXRESTAURANTS_DATABASE_PASSWORD'] %>
+ <<: *default
+ database: paymal
diff --git a/config/facebook.yml b/config/facebook.yml
new file mode 100644
index 00000000..a60b0def
--- /dev/null
+++ b/config/facebook.yml
@@ -0,0 +1,11 @@
+development:
+## with doemal account  
+app_id: 1049017345154593
+secret: 36b2d6132deb803aa9d503d0034e7a68
+
+## My account 
+#app_id: 434807636720506
+#secret: b94c5e35cde5a2c13cfb2e1ba8be30c6
+
+
+  
\ No newline at end of file
diff --git a/config/puma.rb b/config/puma.rb
index 6f7c4941..b5aa06b3 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,10 +1,10 @@
-application_path="#{File.expand_path("../..", __FILE__)}"
-directory application_path
+#application_path="#{File.expand_path("../..", __FILE__)}"
+#directory application_path
 # environment ENV.fetch("RAILS_ENV") { "production" }
-environment "production"
-pidfile "#{application_path}/tmp/puma/pid"
-state_path "#{application_path}/tmp/puma/state"
-stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-port        ENV.fetch("PORT") { 62158 }
-workers 2
-preload_app!
+#environment "production"
+#pidfile "#{application_path}/tmp/puma/pid"
+#state_path "#{application_path}/tmp/puma/state"
+#stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+#port        ENV.fetch("PORT") { 62158 }
+#workers 2
+#preload_app!
diff --git a/config/secrets.yml b/config/secrets.yml
index 0282c5fc..0536042a 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -11,21 +11,12 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
-  cipher_type: AES-256-CBC
-  sx_key: Wh@t1$C2L
+  secret_key_base: a17cafd23cb0d29cf61d909be65790f19f25a117683b25a23419b8cdf87d9ec21135e031130f6192998e385017ec1c3250e493c0e42c2e6241b66e14048c6eb5
 
 test:
-  secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
+  secret_key_base: 477062b07514b11d98ad096b82d81cd692af7a9f084e022dc65cfe02b26b01d11dcf950e624927894a3a1850fde5c82c0b27d8a24686b6c2d522154d0adaffec
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: application
-  cipher_type: AES-256-CBC
-  sx_key: Wh@t1$C2L
-
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

From 0fef2d5ba25f405d2a4bb3a8033593cc51b7f622 Mon Sep 17 00:00:00 2001
From: code2lab <wunnatun@code2lab.com>
Date: Wed, 29 May 2019 18:37:58 +0630
Subject: [PATCH 5/6] wt updated

---
 app/assets/images/online_order_icon.png       | Bin 0 -> 376 bytes
 app/assets/images/user_icon.png               | Bin 0 -> 819 bytes
 app/assets/stylesheets/CRM.scss               |  61 +++++++++-
 app/assets/stylesheets/OQS.scss               |  53 ++++++++-
 app/assets/stylesheets/application.scss       |  51 ++++++++
 .../stylesheets/inventory_definitions.scss    |  53 ++++++++-
 app/assets/stylesheets/origami.scss           |  75 ++++++++++--
 .../reports/dailysale_controller.rb           |   8 +-
 app/models/sale.rb                            |  11 --
 app/views/home/dashboard.html.erb             |  95 +++++++++------
 app/views/home/index.html.erb                 |  10 +-
 app/views/layouts/_header.html.erb            |  64 +++++-----
 app/views/reports/dailysale/index.html.erb    | 110 ++++++++----------
 app/views/reports/shiftsale/index.html.erb    |  14 +--
 config/initializers/action_controller.rb      |  10 +-
 15 files changed, 439 insertions(+), 176 deletions(-)
 create mode 100644 app/assets/images/online_order_icon.png
 create mode 100644 app/assets/images/user_icon.png

diff --git a/app/assets/images/online_order_icon.png b/app/assets/images/online_order_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9e74994e2a0562238abbafa33302aae28fb83cc
GIT binary patch
literal 376
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zFzyCnMyofE9{~j=OI#yLg7ec#$`gxH8OqDc^)mCai<1)zQuXqS(r3T3kpe3E>gnPb
z;?a3`if!H@2LZSAW&zy}J@p06#SG;q6pNUp{3d8QY3^XL7ZnPb)1ai`biu)y(Us-m
z;txs!+Y*mwi$Bp`d-MA<_f04Ea~P<cV9ZEWoKbL6PGhOw#zk`fUd9{8=gG)xe)(CI
z&%}JjMm^)sRp$3{9}XV=*`RcA;nttbtNgrKtT<WX{R*^KXg;)7__xDw(n_Zb*AAUN
zaE$Q}cS&PY*oRC;<pV3^tPgY_xL6kMDVoPxnXvlCf6K=j_uj5|>M>*&tQ4NOb<_5k
zrb;8O3oOqLm<N1c+g-I|$E~;h{;@CE1n)o2GAUhnZq@;=2&*+O67Lp2XSrUwMq|2M
R7${sBJYD@<);T3K0RVYfl1l&p

literal 0
HcmV?d00001

diff --git a/app/assets/images/user_icon.png b/app/assets/images/user_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a977c32e449f135da50e0f8ad5ca9e386fbae882
GIT binary patch
literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00004b3#c}2nYxW
zd<bNS00009a7bBm000A<000A<0X*LaF#rGn8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10<cL$K~!jg?V8JL)KC=0zcW=@t@xm#=%ykTi!NMG!3PC5A_c*%
zy0D;sg8mJ<RY7o};z}3AMX4wS5vqb4rGjF8lp;O~E<~z!WPUCt!Eri|=H{fC#rz-;
zZgReRzT}?d&do?2I%I-nB@FD4bV$<XXp^J`NzWurn%S?c`c4f{08RqWY0eyQB=3Cd
z0&D@EwlGjl3AhD}0GW-9L;!ujbOIB#j03%S`w(y~g^8Hkd7J2`GE6)e4$Y(B;N`fa
zRSr6mG#VP{VPwC9Mrth&BRd^5VzvXTLjpaFbUA3m6eO(+4NObfL8F>dNRWq-MF)+T
zZ)Wx*B+$di8wZV;x1oU^MqWB-#Jma(^f2<mK_lj2XrPCYpr=d&f(qRQ;IY&61mIC<
z9v*jOqk~3FUud9*k!c5wnBWJ8hmmmyjhG2Xtz-b*z@$TcOaa}YdAR(<q%zT)le9HZ
z;<KcFGYg(2cnmF>SxM=J#Y7qtt^map!)hq+{Qm>E8(<>80&fJc4fvYC#CM?Iqi>fQ
zi7~TJlHMl>`DkXd9(}tSiSSy8NJJJ!o+LQ8{puqISPR@)Mt$4_dh*V93BW$!RJ3ov
zFmMBy0e(l@3~(JNR>hqF_U4!QzeEOstH7V=N?!t6&WM3cz~v}rG1Azx5;<2V(M4qy
z{T@)RGi<&@hK>RQROVwn(f$Z<1(>fBR|Xyc#{kb|rX>c}1LuGb%cz00%mU|u4W0%J
zIMd)NX3acsmbBkcfL>rM2LrW?(c~LSQ<qWTeM!Y;=dB=9k`9~MLhXT8FT{&#9}|)^
zB<VuE0}by8uuIZwW%Kq=Ls`;*nZ2uSY?kC`i{p7wkaW6UV<Qe^mrH66);2UVvOB{>
x(lS`vP`5^?Oy+)Oo=!T}wDrFyI&^3={sL$jF$kuj;i&)s002ovPDHLkV1l~&SzZ7D

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss
index de416831..2febb6d0 100755
--- a/app/assets/stylesheets/CRM.scss
+++ b/app/assets/stylesheets/CRM.scss
@@ -69,11 +69,11 @@
     z-index: 1100;
 }
 
-#sxModal-Content {  
+#sxModal-Content {
   position: relative;
   left: 42%;
   top: 30%;
-  background-color: #32ad1a;  
+  background-color: #32ad1a;
   color: #fff;
   text-align: center;
     width: 200px;
@@ -92,7 +92,7 @@
 #videoElement {
     width: 480px;
     height: 375px;
-    
+
 }
 
 .cashier_number{
@@ -243,7 +243,7 @@ i.logout_icon{
   span.round-tab:hover{
       color: white;
       border: 1px solid #fff;
-      background-color:#2196F3; 
+      background-color:#2196F3;
   }
   .wizard .nav-tabs > li {
       width: 25%;
@@ -268,4 +268,55 @@ i.logout_icon{
       font-size: 14px;
       color: #FFFFFF;
   }
-/*customer modal UI */
\ No newline at end of file
+/*customer modal UI */
+
+@media screen and (max-width: 785px) {
+  section.content{
+    margin: 80px 15px 0 225px;
+  }
+
+  .mbl_view{
+    display: none;
+  }
+
+  .navbar-brand-txt{
+    margin-top: -15px;
+  }
+
+  .toggle_mbl {
+    text-align: right;
+  }
+
+  .toggle_mbl img{
+    width: 24px;
+    margin-bottom: 14px;
+  }
+
+  .toggle_mbl a:hover, a:focus{
+    background-color: unset;
+  }
+
+  .col-mbl-view{
+    width: 50%;
+  }
+
+  .info-box .icon{
+    display: none;
+  }
+
+  .mbl_product_div{
+    display: none;
+  }
+
+  .sidebar .menu{
+    top: 10px;
+  }
+
+  .page-header{
+    width: 100%;
+  }
+
+  .ls-closed .bars:after, .ls-closed .bars:before{
+    top: 14px;
+  }
+}
diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss
index 6a97bdcb..11fa7952 100755
--- a/app/assets/stylesheets/OQS.scss
+++ b/app/assets/stylesheets/OQS.scss
@@ -120,4 +120,55 @@ i.logout_icon{
 
 .table-width{
 	width: 100%;
-}
\ No newline at end of file
+}
+
+@media screen and (max-width: 785px) {
+  section.content{
+    margin: 80px 15px 0 225px;
+  }
+
+  .mbl_view{
+    display: none;
+  }
+
+  .navbar-brand-txt{
+    margin-top: -15px;
+  }
+
+  .toggle_mbl {
+    text-align: right;
+  }
+
+  .toggle_mbl img{
+    width: 24px;
+    margin-bottom: 14px;
+  }
+
+  .toggle_mbl a:hover, a:focus{
+    background-color: unset;
+  }
+
+  .col-mbl-view{
+    width: 50%;
+  }
+
+  .info-box .icon{
+    display: none;
+  }
+
+  .mbl_product_div{
+    display: none;
+  }
+
+  .sidebar .menu{
+    top: 10px;
+  }
+
+  .page-header{
+    width: 100%;
+  }
+
+  .ls-closed .bars:after, .ls-closed .bars:before{
+    top: 14px;
+  }
+}
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f3cd1157..6c5f0821 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -130,3 +130,54 @@ i.logout_icon{
   #setting{ display: none;}
   .menu-up{ display: none;}
 }
+
+@media screen and (max-width: 785px) {
+  section.content{
+    margin: 80px 15px 0 225px;
+  }
+
+  .mbl_view{
+    display: none;
+  }
+
+  .navbar-brand-txt{
+    margin-top: -15px;
+  }
+
+  .toggle_mbl {
+    text-align: right;
+  }
+
+  .toggle_mbl img{
+    width: 24px;
+    margin-bottom: 14px;
+  }
+
+  .toggle_mbl a:hover, a:focus{
+    background-color: unset;
+  }
+
+  .col-mbl-view{
+    width: 50%;
+  }
+
+  .info-box .icon{
+    display: none;
+  }
+
+  .mbl_product_div{
+    display: none;
+  }
+
+  .sidebar .menu{
+    top: 10px;
+  }
+
+  .page-header{
+    width: 100%;
+  }
+
+  .ls-closed .bars:after, .ls-closed .bars:before{
+    top: 14px;
+  }
+}
diff --git a/app/assets/stylesheets/inventory_definitions.scss b/app/assets/stylesheets/inventory_definitions.scss
index aa02f08d..e9eb5d80 100755
--- a/app/assets/stylesheets/inventory_definitions.scss
+++ b/app/assets/stylesheets/inventory_definitions.scss
@@ -279,4 +279,55 @@ tr.discount-item-row:hover {
 i.logout_icon{
   position: relative;
   top: 5px;
-}
\ No newline at end of file
+}
+
+@media screen and (max-width: 785px) {
+  section.content{
+    margin: 80px 15px 0 225px;
+  }
+
+  .mbl_view{
+    display: none;
+  }
+
+  .navbar-brand-txt{
+    margin-top: -15px;
+  }
+
+  .toggle_mbl {
+    text-align: right;
+  }
+
+  .toggle_mbl img{
+    width: 24px;
+    margin-bottom: 14px;
+  }
+
+  .toggle_mbl a:hover, a:focus{
+    background-color: unset;
+  }
+
+  .col-mbl-view{
+    width: 50%;
+  }
+
+  .info-box .icon{
+    display: none;
+  }
+
+  .mbl_product_div{
+    display: none;
+  }
+
+  .sidebar .menu{
+    top: 10px;
+  }
+
+  .page-header{
+    width: 100%;
+  }
+
+  .ls-closed .bars:after, .ls-closed .bars:before{
+    top: 14px;
+  }
+}
diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 2558d846..5d933f39 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -62,8 +62,8 @@ select.form-control {
 
 /*
 .order-info {
-	min-height:300px; 
-	max-height:500px; 
+	min-height:300px;
+	max-height:500px;
 	overflow:auto
 }
 */
@@ -222,7 +222,7 @@ select.form-control {
   margin-right: 15px;
   color:#fff !important;
  # background-color: green !important;
-} 
+}
 
 /* Reciept Style */
 #order-charges-table td {
@@ -336,11 +336,11 @@ tr.discount-item-row:hover {
     z-index: 1100;
 }
 
-#sxModal-Content {	
+#sxModal-Content {
 	position: relative;
 	left: 42%;
 	top: 30%;
-	background-color: #32ad1a;	
+	background-color: #32ad1a;
 	color: #fff;
 	text-align: center;
     width: 200px;
@@ -373,7 +373,7 @@ tr.discount-item-row:hover {
     opacity: 1;
     filter: alpha(opacity=100); /* ie */
     -moz-opacity: 1; /* mozilla */
-        
+
 }
 
 /* For Payment Page */
@@ -465,7 +465,7 @@ iframe {
 }
 
 .tax-btn-box {
-	width: 230px; 
+	width: 230px;
 	height: 80px;
 }
 
@@ -518,12 +518,12 @@ nav.pagination .page a:hover,
     opacity: 1;
     z-index: 101;
     filter: alpha(opacity=100); /* ie */
-    -moz-opacity: 1; /* mozilla */       
+    -moz-opacity: 1; /* mozilla */
 }
 .existing_invoice{
 	background-color:#ffab51;
 	color:#fff;
-	
+
 }
 
 
@@ -628,7 +628,7 @@ nav.pagination .page a:hover,
   span.round-tab:hover{
       color: white;
       border: 1px solid #fff;
-      background-color:#2196F3; 
+      background-color:#2196F3;
   }
   .wizard .nav-tabs > li {
       width: 25%;
@@ -656,6 +656,57 @@ nav.pagination .page a:hover,
 /*customer modal UI */
 
 .payment-btn-box {
-  width: 130px; 
+  width: 130px;
   height: 50px;
-}
\ No newline at end of file
+}
+
+@media screen and (max-width: 785px) {
+  section.content{
+    margin: 80px 15px 0 225px;
+  }
+
+  .mbl_view{
+    display: none;
+  }
+
+  .navbar-brand-txt{
+    margin-top: -15px;
+  }
+
+  .toggle_mbl {
+    text-align: right;
+  }
+
+  .toggle_mbl img{
+    width: 24px;
+    margin-bottom: 14px;
+  }
+
+  .toggle_mbl a:hover, a:focus{
+    background-color: unset;
+  }
+
+  .col-mbl-view{
+    width: 50%;
+  }
+
+  .info-box .icon{
+    display: none;
+  }
+
+  .mbl_product_div{
+    display: none;
+  }
+
+  .sidebar .menu{
+    top: 10px;
+  }
+
+  .page-header{
+    width: 100%;
+  }
+
+  .ls-closed .bars:after, .ls-closed .bars:before{
+    top: 14px;
+  }
+}
diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb
index 838536a7..6fb7fe3f 100755
--- a/app/controllers/reports/dailysale_controller.rb
+++ b/app/controllers/reports/dailysale_controller.rb
@@ -1,6 +1,6 @@
 class Reports::DailysaleController < BaseReportController
 	authorize_resource :class => false
-  
+
   def index
 	from, to     = get_date_range_from_params
 	@sale_data   = Sale.daily_sales_list(from,to)
@@ -16,9 +16,9 @@ class Reports::DailysaleController < BaseReportController
       format.xls
     end
   end
-  
+
   def show
-  	
+
   end
- 
+
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 761492b1..21836a6f 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -879,7 +879,6 @@ def self.daily_sales_list(from,to)
 
       total_sale.each do |sale|
         grand_total = sale.grand_total
-        amount_received = sale.amount_received
         old_grand_total = sale.old_grand_total
         total_discount = sale.total_discount
         void_amount = sale.void_amount
@@ -952,7 +951,6 @@ def self.get_by_shiftsales(from,to,shift)
     end
 
     shift_sale_data[shift_sale.id] = {
-      :shift_id => shift_sale.id,
       :cashier_terminal_name => shift_sale.cashier_terminal.name,
       :employee_name => shift_sale.employee.name,
       :shift_started_at => shift_sale.shift_started_at,
@@ -1127,15 +1125,6 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,accou
   return query,other_charges, product, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
 end
 
-def self.get_shift_sale_items(sh_id)
-  query = Sale.select("sales.shift_sale_id as shift_sale_id, i.account_id as account_id, acc.title as account_name, i.item_instance_code as item_code, i.menu_category_name, i.menu_category_code as menu_category_id, i.product_name as product_name, i.unit_price, i.price as price, i.qty as qty, SUM(i.qty) as total_item, SUM(i.qty * i.unit_price) as grand_total, i.status as status_type, i.remark as remark")
-              .joins("JOIN sale_items i on i.sale_id = sales.sale_id")
-              .joins("JOIN accounts acc on acc.id = i.account_id")
-              .where("sales.shift_sale_id=?", sh_id)
-              .group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price")
-              .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc")
-end
-
 def self.get_product_sale()
   query = Sale.select("i.account_id as account_id, " +
                      "SUM(i.qty * i.unit_price) as grand_total,SUM(i.qty) as total_item," +
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index a65ac631..3dd2c92a 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -14,10 +14,10 @@
     else
       delimiter = ""
     end
-  %> 
+  %>
   <!-- Widgets -->
   <div class="row clearfix">
-    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-mbl-view">
       <div class="info-box bg-cyan hover-expand-effect">
         <div class="icon">
           <i class="material-icons">help</i>
@@ -30,7 +30,7 @@
         </div>
       </div>
     </div>
-    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-mbl-view">
       <div class="info-box bg-pink hover-expand-effect">
         <div class="icon">
           <i class="material-icons">attach_money</i>
@@ -44,7 +44,7 @@
       </div>
     </div>
 
-    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-mbl-view">
       <div class="info-box bg-light-green hover-expand-effect">
         <div class="icon">
           <i class="material-icons">person_add</i>
@@ -57,7 +57,7 @@
         </div>
       </div>
     </div>
-    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12 col-mbl-view">
       <div class="info-box bg-orange hover-expand-effect">
         <div class="icon">
           <i class="material-icons">credit_card</i>
@@ -99,27 +99,27 @@
         to_time = ''
       end
     %>
-    <div class="col-lg-3 col-md-3 col-sm-3">
+    <div class="col-lg-3 col-md-3 col-sm-3 col-mbl-view">
       <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
       <input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" value="<%= from_date %>" placeholder="From date" style="height: 35px;">
       <span id="fromErr" style="color:red;"></span>
     </div>
-    <div class="col-lg-3 col-md-3 col-sm-3">
+    <div class="col-lg-3 col-md-3 col-sm-3 col-mbl-view">
       <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
       <input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" value="<%= to_date %>" placeholder="To date" style="height: 35px;">
       <span id="toErr" style="color:red;"></span>
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="col-lg-2 col-md-2 col-sm-2 col-mbl-view">
       <label class="font-14"><%= t("views.right_panel.detail.from_time") %></label>
       <input data-behaviour='timepicker' class="form-control timepicker" name="from_time" id="from_time" type="text" value="<%= from_time %>" placeholder="From Time" style="height: 35px;">
       <span id="from_timeErr" style="color:red;"></span>
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="col-lg-2 col-md-2 col-sm-2 col-mbl-view">
       <label class="font-14"><%= t("views.right_panel.detail.to_time") %></label>
       <input data-behaviour='timepicker' class="form-control timepicker" name="to_time" id="to_time" type="text" value="<%= to_time %>" placeholder="To time" style="height: 35px;">
       <span id="to_timeErr" style="color:red;"></span>
     </div>
-    <div class="col-lg-2 col-md-2 col-sm-2">
+    <div class="col-lg-2 col-md-2 col-sm-2 toggle_mbl">
       <label></label><br>
       <input type="button" value="Generate" class='btn btn-primary btn_generate'>
     </div>
@@ -131,26 +131,29 @@
   <div class="row">
     <% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
     <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
-      <div class="row">
-        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-          <div class="card">
-            <div class="body">
-              <h4><i class="material-icons md-24">dashboard</i><%= (t :top) + " " + (t :products) %></h4>
-              <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
-              <%= pie_chart @top_products %>
+      <% isMobile = request.user_agent %>
+      <% if !isMobile.include? "Mobile" %>
+        <div class="row">
+          <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 ">
+            <div class="card">
+              <div class="body">
+                <h4><i class="material-icons md-24">dashboard</i><%= (t :top) + " " + (t :products) %></h4>
+                <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
+                <%= pie_chart @top_products %>
+              </div>
+            </div>
+          </div>
+          <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 ">
+            <div class="card">
+              <div class="body">
+                <h4><i class="material-icons md-24">dashboard</i><%= (t :bottom) + " " + (t :products) %></h4>
+                <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
+                <%= pie_chart @bottom_products %>
+              </div>
             </div>
           </div>
         </div>
-        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
-          <div class="card">
-            <div class="body">
-              <h4><i class="material-icons md-24">dashboard</i><%= (t :bottom) + " " + (t :products) %></h4>
-              <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
-              <%= pie_chart @bottom_products %>
-            </div>
-          </div>
-        </div>
-      </div>
+      <% end %>
           <!-- <div class="row">
           <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
             <div class="card">
@@ -231,9 +234,9 @@
                         <tr>
                           <% if payment.payment_method == 'paypar' %>
                             <td>Redeem Sale : </td>
-                          <% else %>  
+                          <% else %>
                             <td><%= payment.payment_method.to_s.capitalize %> Sale : </td>
-                          <% end %> 
+                          <% end %>
                           <td align="right">
                             <% @sale_data.each do |data| %>
                               <% pay_mth = payment.payment_method %>
@@ -254,7 +257,7 @@
                         </td>
                       </tr>
                   <% end %>
-                  
+
                 <% end %>
               </table>
             </div>
@@ -329,7 +332,7 @@
                     <td align="right" width="60px"><%= @total_order.total_order %></td>
                   </tr>
                 <% end %>
-        
+
                 <% if !@total_accounts.nil? %>
                   <% @total_accounts.each do |account| %>
                     <tr>
@@ -346,7 +349,7 @@
                 <% if !@top_items.nil? %>
                 <tr>
                   <td width="40px"><%= t :top %> <%= t("views.right_panel.detail.item") %> : </td>
-                  <td align="right" width="60px"><%= @top_items.item_name %> 
+                  <td align="right" width="60px"><%= @top_items.item_name %>
                   <br>(<%= @top_items.item_total_price %>)</td>
                 </tr>
                 <% end %>
@@ -359,19 +362,41 @@
               </table>
             </div>
           </div>
-        </div> 
+        </div>
     <% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
       </div>
     <% end %>
     <% end %>
   </div>
+  <% if isMobile.include? "Mobile" %>
+    <div class="row">
+      <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 ">
+        <div class="card">
+          <div class="body">
+            <h4><i class="material-icons md-24">dashboard</i><%= (t :top) + " " + (t :products) %></h4>
+            <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
+            <%= pie_chart @top_products %>
+          </div>
+        </div>
+      </div>
+      <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 ">
+        <div class="card">
+          <div class="body">
+            <h4><i class="material-icons md-24">dashboard</i><%= (t :bottom) + " " + (t :products) %></h4>
+            <!-- <canvas id="top_products" class="col-md-12"></canvas> -->
+            <%= pie_chart @bottom_products %>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
 </div>
 
 <script type="text/javascript">
   $(document).ready(function(){
     var from = '<%= @from.strftime('%d-%m-%Y') rescue '' %>';
     var to = '<%= @to.strftime('%d-%m-%Y') rescue '' %>';
-    
+
     if((from!=undefined) && (from != null) && (from != '')){
       $('#from').val(from);
     }
@@ -434,4 +459,4 @@
     if(status && t_status) status = true;
     return status;
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index a8a6d85c..acb35329 100755
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -154,7 +154,7 @@
         $(".collapse.in").each(function () {
             $(this).siblings(".panel-heading").find(".glyphicon").addClass("glyphicon-minus").removeClass("glyphicon-plus");
         });
-        
+
         // Toggle plus minus icon on show hide of collapse element
         $(".collapse").on('show.bs.collapse', function () {
             $(this).parent().find(".glyphicon").removeClass("glyphicon-plus").addClass("glyphicon-minus");
@@ -164,11 +164,3 @@
     });
 
 </script>
-
-
-
-
-
-
-
-
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 164b6c4f..415e8f2c 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -18,19 +18,19 @@
             <%if current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
                 <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "account" %>
-                    <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+                    <a class="navbar-brand mbl_view" href="<%=dashboard_path%>" style="margin-left: 20px;">
                 <% elsif current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
-                 <a class="navbar-brand" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
+                 <a class="navbar-brand mbl_view" href="<%=origami_dashboard_path%>" style="margin-left: 20px;">
                 <%else%>
-                    <a class="navbar-brand" href="" style="margin-left: 20px;">
+                    <a class="navbar-brand mbl_view" href="" style="margin-left: 20px;">
                 <% end %>
             <% else %>
-                <a class="navbar-brand m-0" href="<%= origami_dashboard_path%>">
+                <a class="navbar-brand m-0 mbl_view" href="<%= origami_dashboard_path%>">
             <%end%>
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
             </a>
-            
+
             <span class="navbar-brand m-0">
                 <span id="others_payment"></span>
             </span>
@@ -40,11 +40,17 @@
             <span class="navbar-brand navbar-brand-txt"><%= shop_detail.name %></span>
         </div>
         <!-- End Shop Info -->
-        
+
         <div class="navbar-right m-auto">
             <% if order_reservation %>
                 <div class="online_order">
-                    <span class="navbar-brand navbar-brand-txt header-default-color"><%= t :order_reservation %></span>
+                    <span class="navbar-brand navbar-brand-txt header-default-color">
+                      <% if request.user_agent.include? "Mobile" %>
+                        <img src="/assets/online_order_icon.png" alt="<%= t :order_reservation %>" />
+                      <% else %>
+                        <%= t :order_reservation %>
+                      <% end %>
+                      </span>
                     <span class="order_no"></span>
                 </div>
             <% end %>
@@ -52,7 +58,7 @@
 
         <!-- Start Quick Access for Cashier -->
         <!-- <div class="navbar-right m-auto">
-            <a href="#" class="dropdown-toggle waves-block col-white" data-toggle="dropdown" aria-haspopup="true" aria-expanded="flase"> 
+            <a href="#" class="dropdown-toggle waves-block col-white" data-toggle="dropdown" aria-haspopup="true" aria-expanded="flase">
                 <span><%= t :cashier %></span>
             </a>
             <ul class="dropdown-menu">
@@ -62,7 +68,7 @@
                             <i class="material-icons font-7 logout_icon shopinfo">monetization_on</i>
                             <span class="font-15 shopinfo dinein" ><%= t :dine_in %></span>
                         </a>
-                    </p>    
+                    </p>
                 </li>
                 <li>
                     <p class="waves-effect waves-block p-l-20 m-b-5">
@@ -70,7 +76,7 @@
                             <i class="material-icons font-7 logout_icon shopinfo">restaurant_menu</i>
                             <span class="font-15 shopinfo quick_service" ><%= t :quick_service %></span>
                         </a>
-                    </p>    
+                    </p>
                 </li>
                 <% if order_reservation %>
                 <li>
@@ -80,7 +86,7 @@
                             <span class="font-15 col-black online_order" ><%= t :order_reservation %></span>
                             <span class="order_no"></span>
                         </a>
-                    </p>    
+                    </p>
                 </li>
                 <% end %>
                 <li>
@@ -89,7 +95,7 @@
                             <i class="material-icons font-7 logout_icon shopinfo">book</i>
                             <span class="font-15 col-black reservation" ><%= t :reservation %></span>
                         </a>
-                    </p>    
+                    </p>
                 </li>
                 <li>
                     <p class="waves-effect waves-block p-l-20 m-b-5">
@@ -97,17 +103,23 @@
                             <i class="material-icons font-7 logout_icon shopinfo">restaurant</i>
                             <span class="font-15 col-black foodcourt" ><%= t :foodcourt %></span>
                         </a>
-                    </p>    
+                    </p>
                 </li>
             </ul>
         </div> -->
         <!-- End Quick Access for Cashier -->
-        
+
         <!-- Start Delete confirrm text !-->
-        <div class="navbar-right">
-            <a href="javascript:void(0);" class="dropdown-toggle waves-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> 
+        <div class="navbar-right toggle_mbl">
+            <a href="javascript:void(0);" class="dropdown-toggle waves-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                 <% if current_login_employee %>
-                   <span><%= current_login_employee.name %></span>
+                   <span>
+                     <% if request.user_agent.include? "Mobile" %>
+                       <img src="/assets/user_icon.png" alt="<%= current_login_employee.name %>" />
+                     <% else %>
+                       <%= current_login_employee.name %>
+                     <% end %>
+                   </span>
                 <% end %>
             </a>
             <ul class="dropdown-menu">
@@ -118,14 +130,14 @@
                             <i class="material-icons font-7 logout_icon shopinfo">info</i>
                             <span class="font-15 shopinfo" >Shop Info</span>
                         </a>
-                    </p>    
+                    </p>
                 </li>
                 <% end %>
                 <li>
                     <p class="waves-effect waves-block p-l-30 m-b-5 team_viewer">
                        <i class="material-icons font-7 logout_icon shopinfo">touch_app</i>
                         <span class="font-15 shopinfo" >Team Viewer</span>
-                    </p>    
+                    </p>
                 </li>
                 <li>
                     <!-- <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
@@ -140,7 +152,7 @@
                         <h6>Are you sure you want to Logout ?</h6>
                         <!-- <h6>This action can't be undo. </h6> -->
                     </span>
-                </li>   
+                </li>
             </ul>
             <!-- NO Need for color Change
             <a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
@@ -156,7 +168,7 @@
             var method    = $(this).attr('data-method');
             var url       = $(this).attr('data-ref');
             var html_text = $(this).siblings( "#delete_text" ).html();
-            //var page = url.substring(url.lastIndexOf('/') + 1);    
+            //var page = url.substring(url.lastIndexOf('/') + 1);
             swal({
                 title: "Confirmation",
                 text: html_text,
@@ -168,11 +180,11 @@
                 if (isConfirm) {
                   $.ajax({
                     type: method,
-                    url: url ,            
-                    success: function(data) {             
+                    url: url ,
+                    success: function(data) {
                         location.href = data.url;
                     }
-                 });          
+                 });
                 } else {
                     swal("Cancelled", "Your imaginary file is safe :)", "error");
                 }
@@ -203,6 +215,6 @@
                 }
             });
         });
-        
+
     });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 6b055fc2..9e5664df 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -15,14 +15,14 @@
 		<hr />
 		<div class=" text-right">
 		<a href="javascript:export_to('<%=reports_dailysale_index_path%>.xls')" class = "btn btn-info wave-effects"><%= t("views.btn.exp_to_excel") %></a>
-		</div>	  			
+		</div>
 
 		<div class="row">
 			<div class="col-md-12 col-lg-12">
 				<div class="card" style="width:129%;">
 					<div class="body table-responsive">
 						<table class="table table-bordered">
-							<thead> 
+							<thead>
 								<tr>
 									<th colspan="15"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
 								</tr>
@@ -37,10 +37,10 @@
 										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.master_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("VISA") %>
-										<th style='text-align:center;'class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.visa_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.visa_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("JCB") %>
-										<th style='text-align:center;'class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.jcb_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.jcb_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("UNIONPAY") %>
 										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.unionpay_sales") %></th>
@@ -67,10 +67,10 @@
 										<th style='text-align:center;'><%= t("views.right_panel.detail.giftvoucher_sales") %></th>
 									<% end %>
 									<th style='text-align:center;'>(<%= t("views.right_panel.detail.discount") %>)</th>
-									<!-- <th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th>    -->  
-									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>  
+									<!-- <th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %> + <br/> <%= t("views.right_panel.detail.rnd_adj_sh") %></th>    -->
+									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.rnd_adj_sh") %></th>
-									   	        
+
 								</tr>
 							</thead>
 							<% if @print_settings.precision.to_i > 0
@@ -84,7 +84,7 @@
 								    else
 								        delimiter = ""
 								    end
-							    %>	
+							    %>
 							<% unless @sale_data.empty? %>
 
 							<tbody>
@@ -105,8 +105,8 @@
 								<% foc    = 0 %>
 								<% discount = 0 %>
 								<% total    = 0 %>
-								<% grand_total = 0 %> 
-								<% old_grand_total = 0 %>  
+								<% grand_total = 0 %>
+								<% old_grand_total = 0 %>
 								<% count = 1 %> <% rounding_adj = 0 %>
 								<% @sale_data.each do |sale| %>
 								<% void += sale[:void_amount] %>
@@ -122,121 +122,111 @@
 								<% giftvoucher += sale[:giftvoucher_amount] %>
 								<% paypar += sale[:paypar_amount] %>
 								<% cash += sale[:cash_amount]-sale[:total_change_amount] %>
-								<% credit += sale[:credit_amount] %>   
+								<% credit += sale[:credit_amount] %>
 								<% foc += sale[:foc_amount] %>
 								<% discount += sale[:total_discount] %>
 								<% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f  %>
-								<% grand_total += sale[:grand_total].to_f  %>	
-								<% old_grand_total += sale[:old_grand_total].to_f  %>	
-								<% rounding_adj += sale[:rounding_adj].to_f %>	
+								<% grand_total += sale[:grand_total].to_f  %>
+								<% old_grand_total += sale[:old_grand_total].to_f  %>
+								<% rounding_adj += sale[:rounding_adj].to_f %>
 								<tr>
 									<td style='text-align:right;'><%= count %></td>
 									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
 									<td style='color:red;text-align:right;'><%= number_with_precision(sale[:void_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% if @payment_methods.include? ("MPU") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:mpu_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Master") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:master_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("VISA") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:visa_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("JCB") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:jcb_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("UNIONPAY") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:unionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Alipay") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:alipay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("PAYMAL") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:paymal_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("DINGA") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:dinga_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("JunctionPay") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:junctionpay_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Redeem") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(sale[:paypar_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision.to_i, delimiter: delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% if @payment_methods.include? ("GiftVoucher") %>
-										<td style='text-align:right;'><%= number_with_precision(sale[:giftvoucher_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   
-									<% end %> 
+										<td style='text-align:right;'><%= number_with_precision(sale[:giftvoucher_amount], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<% end %>
 									<td style='text-align:right;'>(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
-									<!-- <td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   --> 
-									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>	 
+									<!-- <td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   -->
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(sale[:rounding_adj].to_f, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									  	
+
 								</tr>
 								<% count = count + 1 %>
 								<% end %>
 								<% colspan = 7 %>
 								<tr style="font-weight:600;">
-									<td colspan="3" style='text-align:center;'>Total</td>	
+									<td colspan="3" style='text-align:center;'>Total</td>
 									<% if @payment_methods.include? ("MPU") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(mpu ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(mpu ,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("Master") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("VISA") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("JCB") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end%>
 									<% if @payment_methods.include? ("UNIONPAY") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Alipay") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("PAYMAL") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("DINGA") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("JunctionPay") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<% if @payment_methods.include? ("Redeem") %>
-										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+										<td style='text-align:right;' class="d-none d-sm-table-cell"><%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% end %>
 									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<td style='text-align:right;'><%= number_with_precision(foc, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
 									<% if @payment_methods.include? ("GiftVoucher") %>
 										<% colspan += 1 %>
-										<td style='text-align:right;'><%= number_with_precision(giftvoucher, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td> 
-									<% end %>  
+										<td style='text-align:right;'><%= number_with_precision(giftvoucher, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<% end %>
 									<td style='text-align:right;'>(<%= number_with_precision(discount, precision:precision.to_i,delimiter:delimiter) rescue '-'%>)</td>
 									<!-- <td style='text-align:right;'><%= number_with_precision(total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>     -->
-									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td> 
-									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>   	
-									  
+									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+
 								</tr>
 								<% total_tax = 0 %>
 								<% net = 0 %>
 								<% unless @tax.empty? %>
-									<% @tax.each do |tax| 
+									<% @tax.each do |tax|
 										total_tax += tax.tax_amount.to_f %>
 										<tr style="font-weight:600;">
 											<td colspan="<%= colspan %>" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
@@ -245,14 +235,14 @@
 										</tr>
 									<% end %>
 								<% end %>
-								
+
 								<% net = grand_total %>
 								<% net = net - rounding_adj%>
 								<% net = net - total_tax %>
 								<tr style="font-weight:600;">
 									<td colspan="<%= colspan %>" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
 									<td style='text-align:right;'><%= number_with_precision(net, precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-									<td colspan="2">&nbsp;</td>	
+									<td colspan="2">&nbsp;</td>
 								</tr>
 								</tbody>
 							<% end %>
@@ -263,4 +253,4 @@
 		</div>
 
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 8c4a113f..2db05f6e 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -56,10 +56,10 @@
 						<th><%= t("views.right_panel.detail.credit_payment") %></th>
 						<th class="d-none d-sm-table-cell"><%= t("views.btn.other_payment") %></th>
 						<th class="d-none d-sm-table-cell"><%= t("views.btn.foc") %> <%= t :payment %></th>
-					<!-- <th>Grand Total 
-					<br/>Rounding Adj</th> -->						
+					<!-- <th>Grand Total
+					<br/>Rounding Adj</th> -->
+
 
-						
 					<!-- <th>Grand Total
 					<br/>Rounding Adj</th> -->
 
@@ -109,8 +109,8 @@
 						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
 						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
 						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->
-						<td><%= number_with_precision(result[:other_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
-						<td>
+						<td class="d-none d-sm-table-cell"><%= number_with_precision(result[:other_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
+						<td class="d-none d-sm-table-cell">
 						 	<%= number_with_precision(result[:foc_sales].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%>
 						</td>
 						<td><%= number_with_precision(result[:grand_total].to_f,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></td>
@@ -138,8 +138,8 @@
 						<td><b><%= number_with_precision(credit,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-						<td><b><%= number_with_precision(card,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
-						<td><b><%= number_with_precision(foc,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td class="d-none d-sm-table-cell"><b><%= number_with_precision(card,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
+						<td class="d-none d-sm-table-cell"><b><%= number_with_precision(foc,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->
 						<td><b><%= number_with_precision(g_total,  precision:precision.to_i,delimiter:delimiter) rescue '-'%></b></td>
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index 628875b9..a292a543 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -21,11 +21,11 @@ class ActionController::Base
       end
     else
       # check for license file
-       if check_license
-         current_license(ENV["SX_PROVISION_URL"])
-       else
-         redirect_to activate_path
-       end
+      # if check_license
+         #current_license(ENV["SX_PROVISION_URL"])
+       #else
+         #redirect_to activate_path
+       #end
     end
 
   end

From dddfaeccac19075a3e7b7d8f9370401fe0ec3595 Mon Sep 17 00:00:00 2001
From: code2lab <wunnatun@code2lab.com>
Date: Wed, 29 May 2019 18:39:58 +0630
Subject: [PATCH 6/6] wt updated

---
 config/initializers/action_controller.rb | 10 +++++-----
 config/puma.rb                           | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb
index a292a543..1265e988 100644
--- a/config/initializers/action_controller.rb
+++ b/config/initializers/action_controller.rb
@@ -21,11 +21,11 @@ class ActionController::Base
       end
     else
       # check for license file
-      # if check_license
-         #current_license(ENV["SX_PROVISION_URL"])
-       #else
-         #redirect_to activate_path
-       #end
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+       else
+         redirect_to activate_path
+       end
     end
 
   end
diff --git a/config/puma.rb b/config/puma.rb
index b5aa06b3..fd89392f 100755
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,10 +1,10 @@
-#application_path="#{File.expand_path("../..", __FILE__)}"
-#directory application_path
-# environment ENV.fetch("RAILS_ENV") { "production" }
-#environment "production"
-#pidfile "#{application_path}/tmp/puma/pid"
-#state_path "#{application_path}/tmp/puma/state"
-#stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-#port        ENV.fetch("PORT") { 62158 }
-#workers 2
-#preload_app!
+application_path="#{File.expand_path("../..", __FILE__)}"
+directory application_path
+#environment ENV.fetch("RAILS_ENV") { "production" }
+environment "production"
+pidfile "#{application_path}/tmp/puma/pid"
+state_path "#{application_path}/tmp/puma/state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+port        ENV.fetch("PORT") { 62158 }
+workers 2
+preload_app!