Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/assets/javascripts/OQS.js

@@ -33,8 +33,24 @@ $(document).on('turbolinks:load', function() {
 
     $(".tables").on("click", function(){
 
-       var table_id = $(this).val();
+ 		active     = $(this).hasClass('selected-table');
+ 		if (active) {      
+	        $(this).removeClass('bg-blue');
+	        $(this).addClass('green');
+	        $(this).removeClass('selected-table');
+	    }else{      
+	        $(this).removeClass('green');
+	        $(this).addClass('bg-blue');
+	        $(this).addClass('selected-table');
+	    }
+ 		var list = document.getElementsByClassName('selected-table');
+		var i;
+		var table_id =[];
+		for (i = 0; i < list.length; i++) {
+		    table_id.push(list[i].value);
+		} 
        	$('#table_id').val(table_id);
+
         oqs_id = $("#oqs_id").val();
     	if (table_id){
     		var table = table_id

app/assets/javascripts/custom.js

@@ -13,6 +13,16 @@ $(document).ready(function() {
     touchScrollStep : 50
   });
 
+  $('#table-slimscroll').slimScroll({
+      height: height,
+      size: '5px',
+      color: 'rgba(0,0,0,0.5)',
+      alwaysVisible: false,
+      borderRadius: '0',
+      railBorderRadius: '0',
+      touchScrollStep : 50
+  });
+
   $('#order-detail-slimscroll').slimScroll({
     height: height-$('#order-detail-slimscroll').attr('data-height'),
     size: '5px',

app/assets/javascripts/origami.js

@@ -361,6 +361,7 @@ function resCardSaleTrans(card_sale_trans_id,cmd_type,payment_type, bnk_bill_amo
 function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amount,sale_id,receipt_no,com_port,cashier_type) {
 	$("#loading_wrapper").hide();
     var jobj = $.parseJSON(resMsg);
+    $("#reference_no").val(jobj.REFNUM);
     if(jobj.STATUS == "Approved"){
         $.ajax({type: "POST",
          	url: "/origami/payment/"+payment_type,

app/assets/stylesheets/OQS.scss

@@ -87,7 +87,7 @@ select.form-control {
 }
 
 .green{
-	background-color: #009900;
+	background-color: #009900 !important;
 }
 .left{
 	margin-left:1px;
@@ -105,3 +105,19 @@ i.logout_icon{
   position: relative;
   top: 5px;
 }
+
+.table-block{
+	padding: 24px 8px 0 0;
+}
+
+.label-align{
+	padding-left: 10px;
+}
+
+.table-float{
+	float: left;
+}
+
+.table-width{
+	width: 100%;
+}

app/controllers/crm/customers_controller.rb

@@ -39,7 +39,7 @@ class Crm::CustomersController < BaseCrmController
 
     @membership_types = Lookup.collection_of("member_group_type")
 
-    @taxes = TaxProfile.all.order("order_by asc")
+     @taxes = TaxProfile.where(:group_type => 'cashier')
 
     @filter = filter
 

app/controllers/oqs/backhome_controller.rb

@@ -89,6 +89,7 @@ class Oqs::HomeController < BaseOqsController
 
   # Query for OQS with delivery status
   def queue_items_query(status) 
+    byebug
     AssignedOrderItem.select("assigned_order_items.assigned_order_item_id, oqs.id as station_id, oqs.station_name, oqs.is_active, oqpz.zone_id, df.name as zone, df.type as type, odt.order_id, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, odt.options, cus.name as customer_name, odt.created_at")
     .joins(" left join order_queue_stations as oqs on oqs.id = assigned_order_items.order_queue_station_id
               left join order_queue_process_by_zones as oqpz on oqpz.order_queue_station_id = oqs.id

app/controllers/oqs/home_controller.rb

@@ -5,7 +5,8 @@ class Oqs::HomeController < BaseOqsController
   	# @queue_items_details = queue_items_query(false)
 
     # Query for OQS with delivery status true
-    @tables   = DiningFacility.all.active.order('status desc')
+    # @tables   = DiningFacility.all.active.order('status desc')
+    @tables   = DiningFacility.where(:type => 'Table').order('status desc')
     @rooms    = Room.all.active.order('status desc')
 
     @filter = params[:filter]
@@ -161,9 +162,9 @@ class Oqs::HomeController < BaseOqsController
       oqs = "and assigned_order_items.order_queue_station_id = '#{oqs_id}' "
     end
 
-    if table_id.to_i>0
+    if !table_id.empty?
-       table = "and df.id = '#{table_id}' "
+       tableId = table_id.to_a.map{|h| h}.join(",")
-       
+       table = "and df.id IN (#{tableId})"
     else
      table = ''
     end

app/controllers/origami/customers_controller.rb

@@ -86,7 +86,7 @@ class Origami::CustomersController < BaseOrigamiController
     @crm_customer    = Customer.new
     @count_customer = Customer.count_customer
     
-    @taxes = TaxProfile.all.order("order_by asc")
+    @taxes = TaxProfile.where(:group_type => 'cashier')
     # if flash["errors"]
     #   @crm_customer.valid?
     # end

app/pdf/receipt_bill_pdf.rb

@@ -197,7 +197,6 @@ class ReceiptBillPdf < Prawn::Document
         move_down line_move
         sub_total = 0.0
         total_qty = 0.0
-
         sale_items.each do |item|
             # check for item not to show 
           if item.price != 0
@@ -247,7 +246,6 @@ class ReceiptBillPdf < Prawn::Document
         bounding_box([self.item_width + self.price_width + 8,y_position], :width =>self.total_width, :height => self.item_height) do
             text "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
         end
-
     end
 
     def all_total(sale_data,precision,delimiter)

app/views/oqs/home/index.html.erb

@@ -1,9 +1,10 @@
 <!-- Column One -->
 <div class="row clearfix" style="">
-  <div class="col-lg-11 col-md-11 col-sm-11">  
+  <div class="col-lg-8 col-md-8 col-sm-8">  
     <div class="body p-l-10">
       <div class="row clearfix">
-        <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
+        <div class="form-group col-lg-2 col-md-2 col-sm-2">
+          <label class="label-align">Select Station</label>
           <span class="hidden" id="oqs_active"></span>
           <select class="form-control select oqs_click" name="oqs_id" id="oqs_id">
             <option value="0"  data-id="0">Processed</option>
@@ -15,16 +16,6 @@
             <% end %> 
           </select>
         </div>
-        <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
-        <span class="hidden" id="table_id"></span>
-          <select class="form-control select tables" name="table_id" id="tables">
-            <option value="">Select Table</option>
-            <% @tables.each do |table|  %>
-              <option value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></option>
-              
-            <% end %> 
-          </select>
-        </div>
 <!-- 
         <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12">
         <span class="hidden" id="room_id"></span>
@@ -89,7 +80,6 @@
                           </span> 
                         </span>
                       </span>
-
                     <p class="hidden order-status">completed</p>
                     <p class="hidden order-customer"><%= qid.customer_name %></p>
                     <p class="hidden assigned-order-item"><%= qid.assigned_order_item_id %></p>           
@@ -98,13 +88,11 @@
               <% end %>    
             </div>
            </div>
-
           <div class="card-columns oqs_append" id="oqs_container" style="padding-top:10px; column-gap: 1.2rem;">       
       </div>
     </div>
       </div>
     </div>
-
   </div>
 
   <!-- Column Two -->
@@ -151,6 +139,35 @@
   </div>
  -->
   <!-- Column Three -->
+  <div class="col-lg-3 col-md-3 col-sm-3 table-block">
+    <p class="hidden filter"><%= @filter %></p>
+    <div class="card">
+      <div class="card-block">
+        <div class="tab-content" id="table-slimscroll" style="">
+          <ul class="nav nav-tabs">
+            <li class="active"><a data-toggle="tab" href="#table" id="defaultOpen">Table</a></li>
+            <li><a data-toggle="tab" href="#room">Room</a></li>
+          </ul>
+          <div class="tab-content">
+            <div id="table" class="tab-pane fade">
+              <% @tables.each do |table|  %>
+                <div class="col-lg-4 col-md-4 col-sm-4 table-float">
+                  <button class='btn btn-lg waves-effect green tables table-width' value="<%= table.id %>" data-id="<%= table.id %>"> <%= table.name %></button>
+                </div>
+              <% end %> 
+            </div>
+            <div id="room" class="tab-pane fade">
+              <% @rooms.each do |room|  %>
+                <div class="col-lg-4 col-md-4 col-sm-4 table-float">
+                  <button class='btn btn-lg waves-effect green tables table-width' value="<%= room.id %>" data-id="<%= room.id %>"> <%= room.name %></button>
+                </div>
+              <% end %> 
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>      
+  </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
     <br>
@@ -168,4 +185,6 @@
         window.location.href = '/dashboard';
     });
   });
+  document.getElementById("defaultOpen").click();
+
 </script>

app/views/origami/alipay/index.html.erb

@@ -204,7 +204,6 @@
 		var bank_integration = "<%= @bank_integration %>";
 		var cashier_type = "<%= @cashier_type %>";
 		$("#reference_no_Err").html("");
-		if(reference_no.length > 0){
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 				$(this).off("click");
 			//start member discount 5% by pay card	
@@ -251,9 +250,6 @@
 			    swal ( "Oops" ,  "Enter Amount!" ,  "error" );
 			}
 		}
-		}else{
-		 	$("#reference_no_Err").html("can't be blank");
-		}
 	})
 </script>
 

app/views/origami/jcb/index.html.erb

@@ -200,7 +200,6 @@ $('#jcb_pay').on('click',function(){
 	var receipt_no = "<%= @receipt_no %>";
 	var bank_integration = "<%= @bank_integration %>";
 	$("#reference_no_Err").html("");
-	if(reference_no.length > 0){
 	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 			  //start member discount 5% by pay card	
@@ -247,8 +246,5 @@ $('#jcb_pay').on('click',function(){
 	        swal ( "Oops" ,  "Enter Amount!" ,  "error" );
 	      }
 		}
-	}else{
-		$("#reference_no_Err").html("can't be blank");
-	}
 })
 </script>

app/views/origami/master/index.html.erb

@@ -198,7 +198,6 @@
     var receipt_no = "<%= @receipt_no %>";
     var bank_integration = "<%= @bank_integration %>";
     $("#reference_no_Err").html("");
-    if(reference_no.length > 0){
       if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
         
       $(this).off("click");
@@ -245,8 +244,5 @@
           swal ( "Oops" ,  "Enter Amount!" ,  "error" );
         }
       }
-    }else{
-      $("#reference_no_Err").html("can't be blank");
-    }
   })
 </script>

app/views/origami/mpu/index.html.erb

@@ -204,7 +204,6 @@
 		var bank_integration = "<%= @bank_integration %>";
 		var cashier_type = "<%= @cashier_type %>";
 		$("#reference_no_Err").html("");
-		if(reference_no.length > 0){
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 			//start member discount 5% by pay card	
@@ -251,9 +250,6 @@
 			    swal ( "Oops" ,  "Enter Amount!" ,  "error" );
 			}
 		}
-		}else{
-		 	$("#reference_no_Err").html("can't be blank");
-		}
 	})
 </script>
 

app/views/origami/unionpay/index.html.erb

@@ -202,7 +202,6 @@
     var receipt_no = "<%= @receipt_no %>";
 
     $("#reference_no_Err").html("");
-    if(reference_no.length > 0){
       if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
         $(this).off("click");
       //start member discount 5% by pay card  
@@ -250,8 +249,5 @@
           swal ( "Oops" ,  "Enter Amount!" ,  "error" );
         }
       }
-    }else{
-      $("#reference_no_Err").html("can't be blank");
-    }
   })
 </script>

app/views/origami/visa/index.html.erb

@@ -202,7 +202,6 @@
     console.log(amount);
     console.log($("#validamount").attr("value"));
     $("#reference_no_Err").html(""); 
-    if(reference_no.length > 0){ 
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
       $(this).off("click");
       //start member discount 5% by pay card  
@@ -250,8 +249,5 @@
         swal ( "Oops" ,  "Enter Amount!" ,  "error" );
       }
     }
-    }else{
-      $("#reference_no_Err").html("can't be blank");
-    }
   });
 </script>