Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

app/assets/stylesheets/BSBMaterial/style.css

@@ -2323,7 +2323,7 @@
 @media (max-width: 767px) {
   .navbar > .container .navbar-brand,
   .navbar > .container-fluid .navbar-brand {
-    margin-left: 35px;
+    margin-left: 15px;
     width: 73%; }
   .navbar .navbar-header {
     display: inline-block;
@@ -8054,4 +8054,3 @@ html.ie11 .dropdown-menu ul.menu li a {
 
 html.ie11 .bs-searchbox .form-control {
   width: 90%; }
-

app/assets/stylesheets/CRM.scss

@@ -313,10 +313,34 @@ i.logout_icon{
   }
 
   .page-header{
-    width: 100%;
+    width: 100% !important;
   }
 
   .ls-closed .bars:after, .ls-closed .bars:before{
     top: 14px;
   }
+
+  .mbl_card{
+    width: 100% !important;
+  }
+
+  .mbl_lbl{
+    display: none;
+  }
+
+  .mbl-style{
+    padding: 10px 10px;
+  }
+
+  .m-auto{
+    width: 33%;
+  }
+
+  .online_order{
+    text-align: right;
+  }
+
+  .mbl-right-btn{
+    text-align: right;
+  }
 }

app/assets/stylesheets/OQS.scss

@@ -165,10 +165,34 @@ i.logout_icon{
   }
 
   .page-header{
-    width: 100%;
+    width: 100% !important;
   }
 
   .ls-closed .bars:after, .ls-closed .bars:before{
     top: 14px;
   }
+
+  .mbl_card{
+    width: 100% !important;
+  }
+
+  .mbl_lbl{
+    display: none;
+  }
+
+  .mbl-style{
+    padding: 10px 10px;
+  }
+
+  .m-auto{
+    width: 33%;
+  }
+
+  .online_order{
+    text-align: right;
+  }
+
+  .mbl-right-btn{
+    text-align: right;
+  }
 }

app/assets/stylesheets/application.scss

@@ -129,6 +129,7 @@ i.logout_icon{
 @media screen and (max-width: 785px) {
   #setting{ display: none;}
   .menu-up{ display: none;}
+  .card-btn{padding: 0px 35px;}
 }
 
 @media screen and (max-width: 785px) {
@@ -174,10 +175,34 @@ i.logout_icon{
   }
 
   .page-header{
-    width: 100%;
+    width: 100% !important;
   }
 
   .ls-closed .bars:after, .ls-closed .bars:before{
     top: 14px;
   }
+
+  .mbl_card{
+    width: 100% !important;
+  }
+
+  .mbl_lbl{
+    display: none;
+  }
+
+  .mbl-style{
+    padding: 10px 10px;
+  }
+
+  .m-auto{
+    width: 33%;
+  }
+
+  .online_order{
+    text-align: right;
+  }
+
+  .mbl-right-btn{
+    text-align: right;
+  }
 }

app/assets/stylesheets/inventory_definitions.scss

@@ -324,10 +324,34 @@ i.logout_icon{
   }
 
   .page-header{
-    width: 100%;
+    width: 100% !important;
   }
 
   .ls-closed .bars:after, .ls-closed .bars:before{
     top: 14px;
   }
+
+  .mbl_card{
+    width: 100% !important;
+  }
+
+  .mbl_lbl{
+    display: none;
+  }
+
+  .mbl-style{
+    padding: 10px 10px;
+  }
+
+  .m-auto{
+    width: 33%;
+  }
+
+  .online_order{
+    text-align: right;
+  }
+
+  .mbl-right-btn{
+    text-align: right;
+  }
 }

app/assets/stylesheets/login.scss

@@ -122,5 +122,9 @@
 @media screen and (max-width: 785px) {
   .login_pwd{width: 90%;}
   .login_ent{width: 10%;}
+  // .card-btn{padding: 0px 35px;}
+  // .nav-tabs{padding: 0px 44px;}
+  .box{margin: unset;}
+  .mbl-btn-usrgp{width: 48%;}
 
 }

app/assets/stylesheets/origami.scss

@@ -703,10 +703,34 @@ nav.pagination .page a:hover,
   }
 
   .page-header{
-    width: 100%;
+    width: 100% !important;
   }
 
   .ls-closed .bars:after, .ls-closed .bars:before{
     top: 14px;
   }
+
+  .mbl_card{
+    width: 100% !important;
+  }
+
+  .mbl_lbl{
+    display: none;
+  }
+
+  .mbl-style{
+    padding: 10px 10px;
+  }
+
+  .m-auto{
+    width: 33%;
+  }
+
+  .online_order{
+    text-align: right;
+  }
+
+  .mbl-right-btn{
+    text-align: right;
+  }
 }

app/views/home/dashboard.html.erb

@@ -99,23 +99,23 @@
         to_time = ''
       end
     %>
-    <div class="col-lg-3 col-md-3 col-sm-3 col-mbl-view">
+    <div class="col-lg-3 col-md-3 col-sm-3 col-mbl-view mbl-style">
-      <label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+      <label class="font-14 mbl_lbl"><%= 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 col-mbl-view">
+    <div class="col-lg-3 col-md-3 col-sm-3 col-mbl-view mbl-style">
-      <label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+      <label class="font-14 mbl_lbl"><%= 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 col-mbl-view">
+    <div class="col-lg-2 col-md-2 col-sm-2 col-mbl-view mbl-style">
-      <label class="font-14"><%= t("views.right_panel.detail.from_time") %></label>
+      <label class="font-14 mbl_lbl"><%= 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 col-mbl-view">
+    <div class="col-lg-2 col-md-2 col-sm-2 col-mbl-view mbl-style">
-      <label class="font-14"><%= t("views.right_panel.detail.to_time") %></label>
+      <label class="font-14 mbl_lbl"><%= 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>

app/views/layouts/login.html.erb

@@ -135,8 +135,6 @@
                <div class="pin_pad left" data-value="0">0</div>
                <div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div>
                <% end %>
-
-
             </div>
           </div>
          </div>

app/views/layouts/login_dashboard.html.erb

@@ -80,7 +80,7 @@
 
                 <br>
                 <div class="card padding-10">
-                <div class="card-content">
+                <div class="card-content card-btn">
                   <div class='col-md-12'>
                     <div class='row bottom'>
                       <div class="pin_pad " data-value="1">1</div>
@@ -129,7 +129,7 @@
                             <div class="tab-pane"  id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto">
                                 <% @employees.each do |employee| %>
                                     <%if employee.role == role %>
-                                        <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> 
+                                        <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn mbl-btn-usrgp" data-formid="#form_<%= employee.emp_id %>" style="float: left;">
                                             <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
                                             </form>
                                             <%if employee.image_path.present? %>
@@ -268,6 +268,3 @@
    }
   //end Notificaiotn message
 </script>
-
-
-

app/views/reports/dailysale/_shift_sale_report_filter.html.erb

@@ -3,8 +3,8 @@
 <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
 	<% if period_type != false %>
 		<div class="row">
-			<div class="col-lg-2 col-md-2 col-sm-2">
+			<div class="col-lg-2 col-md-2 col-sm-2 col-mbl mbl-style">
-				<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
+				<label class="font-14 mbl_lbl"><%= t("views.right_panel.detail.select_period") %></label>
 				<select name="period" id="sel_period" class="form-control">
 					<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 					<option value="0">Today</option>
@@ -21,16 +21,16 @@
 			</div>
 			<input type="hidden" name="report_type" value="daily_sale" id="sel_sale_type">
 
-			<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 mbl-style">
 				<!-- <label class="">Select Shift Period</label> -->
-				<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
+				<label class="font-14 mbl_lbl"><%= t("views.right_panel.detail.from") %></label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
 			</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 mbl-style">
-				<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
+				<label class="font-14 mbl_lbl"><%= t("views.right_panel.detail.to") %></label>
 				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
 			</div>
-			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
+			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20 mbl-right-btn">
 			    <label></label><br>
 				<input type="submit" value="Generate Report" class='btn btn-primary'>
 			</div>

app/views/reports/dailysale/index.html.erb

@@ -1,5 +1,5 @@
 
-<div class="page-header" style="width:130%;">
+<div class="page-header">
 	<ol class="breadcrumb">
 		<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
 		<li class="breadcrumb-item active"><%= t("views.right_panel.detail.daily_sale_report") %></li>
@@ -19,12 +19,12 @@
 
 		<div class="row">
 			<div class="col-md-12 col-lg-12">
-				<div class="card" style="width:129%;">
+				<div class="card mbl_card">
 					<div class="body table-responsive">
 						<table class="table table-bordered">
 							<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>
+									<th colspan="18"> <%= 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>
 								<tr>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.sr") %></th>
@@ -181,33 +181,63 @@
 								<tr style="font-weight:600;">
 									<td colspan="3" style='text-align:center;'>Total</td>
 									<% if @payment_methods.include? ("MPU") %>
+									  <% if !request.user_agent.include? "Mobile" %>
+									    <% colspan += 1 %>
+									  <% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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") %>
+										<% if !request.user_agent.include? "Mobile" %>
+											<% colspan += 1 %>
+										<% end %>
 										<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>

config/initializers/action_controller.rb

@@ -23,9 +23,9 @@ class ActionController::Base
       # check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
-       else
+      else
-         redirect_to activate_path
+        redirect_to activate_path
-       end
+      end
     end
 
   end