Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/application.js

@@ -18,6 +18,139 @@
 //= require cable
 //= require settings/processing_items
 
+$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
+    $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
+	$('.dropdown-toggle').dropdown();	
+});
+
+/*
+*	ToDo Move to here from pages
+*
+*
 
 
 
+$(function(){
+	$('#custom_excel').hide();
+	
+	$('#custom_excel').click(function(){
+		var url = $('#custom_excel').attr('data-url');
+		$('#frm_report').attr('action',url)
+		$('#frm_report').submit();
+		// window.location = url;
+	});
+	
+	var item = $('#item').val();
+	var payment_type = $('#payment_type');
+	
+	if(item == 'order'){
+		$('#cashier').hide();
+		$('#waiter').show();
+		if(payment_type){
+			$('#payment_type').hide();
+		}		
+	}
+	else if(item == 'sale'){
+		$('#waiter').hide();
+		$('#cashier').show();
+	}
+	else{
+		$('#waiter').hide();
+		$('#cashier').show();		
+		$("#item").val('sale');
+	}
+});
+
+//Reset the form to pervious values
+$("#branch").val(<%=params[:branch]%>);
+$("#waiter").val("<%=params[:waiter]%>");
+$("#cashier").val(<%=params[:cashier]%>);
+$("#product").val(<%=params[:product]%>);
+$("#singer").val(<%=params[:singer]%>);
+$("#item").val('<%=params[:item]%>');
+$("#guest_role").val('<%=params[:guest_role]%>');
+
+
+$("#from").val("<%=params[:from]%>");
+$("#to").val("<%=params[:to]%>");
+$("#sel_period").val(<%=params[:period]%>);
+$("#sel_sale_type").val(<%=params[:sale_type]%>);
+
+<% if params[:period_type] == 1 || params[:period_type] == "1" %>
+	$("#rd_period_type_1").attr("checked","checked");
+<% else %>
+	$("#rd_period_type_0").attr("checked","checked");
+<% end %>
+$(".btn-group button").removeClass("active");
+<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+$("#btn_report_type_<%= report_type %>").addClass("active");
+
+$('#item').change(function(){
+	var item = $('#item').val();
+	var payment_type = $('#payment_type');
+
+	if(item == 'sale'){
+		$('#waiter').hide();
+		$('#cashier').show();		
+		if(payment_type){
+			$('#payment_type').show();
+		}
+	}
+	else{
+		$('#cashier').hide();
+		$('#waiter').show();
+		if(payment_type){
+			$('#payment_type').hide();
+		}
+	}
+});
+
+$(function(){
+	var check_arr = [];   	
+	var search = '<%= params[:period_type] %>';	
+	if(search){
+		if(parseInt(search) == 0){
+			search_by_period();	
+		}
+		else{
+			search_by_date();				
+		}
+	}else{
+		search_by_period();		
+	}
+    $('#sel_period').change(function(){	   
+	   search_by_period();	   
+    });   
+	function search_by_period(){
+ 	   var period = $('#sel_period').val();
+ 	   var period_type = 0;
+ 	   var from = "";
+ 	   var to = ""; 	
+	}   
+   
+    $('#from').change(function(){
+	   search_by_date();	   
+    });
+   
+    $('#to').change(function(){
+	   search_by_date();
+    });      
+    function search_by_date(){
+	   var from = $('#from').val();
+	   var to = $('#to').val();
+	   var period = 0;
+	   var period_type = 1;	   
+	   if(to != '' && from != ''){
+		   shift_name = from + ',' + to;
+		   check_arr.push(to);		   
+		   // console.log(check_arr.length)
+		   if(check_arr.length == 1){ 		   			   	
+		   }
+		   if(check_arr.length == 3){
+			   check_arr = [];
+		   }
+	   }	   
+   }    
+});
+*/
+>>>>>>> d54fd19d1c18384ee6b21c43ca51587fb7fa843f

app/assets/javascripts/origami.js

@@ -185,7 +185,7 @@ $(document).ready(function(){
 		}else{
 			var sale_id = $(".selected-item").find(".order-cid").text();
 		}
-		window.location.href = '/origami/'+ sale_id  + "/add_customer"
+		window.location.href = '/origami/'+ sale_id  + "/customers"
 
 		return false;
 	});
@@ -199,6 +199,7 @@ $(document).ready(function(){
 	    }
 
 		$('.customer_detail').removeClass('hide'); 
+		
 		  //Start Ajax
 		  $.ajax({      
 		  	type: "GET",         
@@ -210,8 +211,16 @@ $(document).ready(function(){
 		  		$.each(data["response_data"]["data"], function (i) {
 		  			if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){
 		  				var balance = data["response_data"]["data"][i]["balance"];
+		  				if (data["response_data"]["status"]==true) {
+		  					$('.rebate_amount').removeClass('hide'); 
 		  					console.log(balance);
-		  					$("#customer_amount").text(balance);
+			  				row = 
+			                 '<td class="charges-name">' + data["response_data"]["data"][i]["accountable_type"] +'</td>'
+			                 +'<td class="item-attr">' + balance + '</td>'; 
+
+			                 $(".rebate_amount").append(row);
+		  				}
+		  				
 		  			}
 		  		});
 		  	}

app/assets/stylesheets/application.scss

@@ -58,3 +58,19 @@ ul.dropdown-menu li a{
 /*----- Header Bar -----*/
 
 /*----- Header Bar -----*/
+
+/*----- Layout ------ */
+
+.margin-top-20 {
+  margin: 20px 0 0 0;
+}
+
+/*----- Layout ------ */
+
+/*--- Reset --- */
+
+select.form-control {
+  height: inherit !important;
+}
+
+/*--- Reset --- */

app/controllers/crm/customers_controller.rb

@@ -45,6 +45,35 @@ class Crm::CustomersController < BaseCrmController
           @sale_items = @sale_items + sale.sale_items
       end
     end
+
+    #get customer amount
+      @customer       = Customer.find(params[:id])
+
+      membership      = MembershipSetting.find_by_membership_type("paypar_url")
+
+      memberaction    = MembershipAction.find_by_membership_type("get_all_member_account")
+      merchant_uid       = memberaction.merchant_account_id.to_s
+      auth_token      = memberaction.auth_token.to_s
+      url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+     response        = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
+                                             :headers => {
+                                                      'Content-Type' => 'application/json',
+                                                      'Accept'       => 'application/json'
+                                              }
+                      )
+      
+      @type = "-"
+      @balance = 0.00
+      response["data"].each do |res|
+        if res["accountable_type"] == "RebateAccount"
+           @balance = res["balance"]
+           @type    = "RebateAccount"
+        end         
+      end
+      
+      #end customer amount
+
   end
 
   # GET /crm/customers/new
@@ -76,11 +105,12 @@ class Crm::CustomersController < BaseCrmController
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
         memberaction    = MembershipAction.find_by_membership_type("create_membership_customer")
         merchant_uid     = memberaction.merchant_account_id.to_s
+        auth_token      = memberaction.auth_token.to_s
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         dob: dob,
-                                                        member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json,
+                                                        member_group_id: member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
@@ -93,7 +123,7 @@ class Crm::CustomersController < BaseCrmController
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
               
                if params[:sale_id]
-                 format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' }
+                 format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' }
                else
                  format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
                end              
@@ -102,7 +132,7 @@ class Crm::CustomersController < BaseCrmController
               
               @crm_customers.destroy
               if params[:sale_id]
-                format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
+                format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'}
               else
                 format.html { redirect_to crm_customers_path, notice: response["message"] }
               end
@@ -111,7 +141,7 @@ class Crm::CustomersController < BaseCrmController
 
           if params[:sale_id]
             flash[:errors] = @crm_customers.errors
-            format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} 
+            format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'} 
             format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
           else
             flash[:errors] = @crm_customers.errors
@@ -140,11 +170,12 @@ end
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
         memberaction    = MembershipAction.find_by_membership_type("update_membership_customer")
         merchant_uid    = memberaction.merchant_account_id.to_s
+        auth_token      = memberaction.auth_token.to_s
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
         
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         dob: dob,
-                                                        id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json,
+                                                        id: id,member_group_id:member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'

app/controllers/origami/home_controller.rb

@@ -74,9 +74,10 @@ class Origami::HomeController < BaseOrigamiController
 
     memberaction    = MembershipAction.find_by_membership_type("get_all_member_account")
     merchant_uid       = memberaction.merchant_account_id.to_s
+    auth_token       = memberaction.auth_token.to_s
     url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
-     response        = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid}.to_json,
+     response        = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'

app/controllers/origami/redeem_payments_controller.rb

@@ -36,7 +36,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
  								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
  								merchant_uid= member_actions.merchant_account_id
-		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid)
+ 								auth_token = member_actions.auth_token.to_s
+		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
 		 						if membership_data["status"]==true
 		 							@membership_rebate_balance=membership_data["balance"]
 		 							@out = true, @membership_rebate_balance,@membership_id

app/controllers/reports/daily_sale_controller.rb

@@ -1,21 +1,9 @@
 class Reports::DailySaleController < BaseReportController
-	  PERIOD = {
-	"today" => 0,
-	"yesterday" => 1,
-	"this_week" => 2,
-	"last_week" => 3,
-	"last_7" => 4,
-	"this_month" => 5,
-	"last_month" => 6,
-	"last_30" => 7,
-	"this_year" => 8,
-	"last_year" => 9
-  }
 
   def index
 	from, to = get_date_range_from_params
 	@sale_data = Sale.get_receipt_no_list(from,to)
 	@sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50)
-end
+  end
 
 end

app/controllers/settings/sales_controller.rb

@@ -5,23 +5,13 @@ class Settings::SalesController < ApplicationController
     receipt_no  = params[:receipt_no]
     today       = Date.today
     
-    if receipt_no.nil? && search_date.nil?
+    if receipt_no.nil?
-       @sales = Sale.where("NOT sale_status = 'void'" ).order("sale_id desc").limit(500) 
+      @sales = Sale.order("sale_id").page(params[:page])
+      #@products = Product.order("name").page(params[:page]).per(5)
     else
-      if !search_date.blank? && receipt_no.blank?  
+      @sales = Sale.where("receipt_no LIKE ?", "%#{receipt_no}%").order("receipt_no").page(params[:page])    
-        sale = Sale.where("DATE_FORMAT(receipt_date,'%Y-%b-%d') = ?", search_date).order("sale_id desc").limit(500).page(params[:page])
-      elsif !search_date.blank? && !receipt_no.blank?  
-        sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%Y-%b-%d') = ?", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page])
-      else  
-        sale = Sale.where("receipt_no LIKE ?", receipt_no).order("sale_id desc").limit(500).page(params[:page]) 
     end
-      if sale.count > 0
+    #@sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
-        @sales = sale 
-      else
-        @sales = Sale.where("NOT sale_status = 'void'").order("sale_id desc").limit(500)
-      end
-    end
-    @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }

app/models/sale.rb

@@ -258,6 +258,14 @@ class Sale < ApplicationRecord
     end
   end
 
+  def self.search(search)
+    if search
+      find(:all, :conditions => ['receipt_no LIKE ?', "%#{search}%"])
+    else
+      find(:all)
+    end
+  end
+
   private
 
   def generate_custom_id

app/models/sale_payment.rb

@@ -66,9 +66,9 @@ class SalePayment < ApplicationRecord
 
   end
 
-   def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid)
+   def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid,auth_token)
       response = HTTParty.get(url,
-                :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid}.to_json,
+                :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
                 :headers => {
                           'Content-Type' => 'application/json',
                           'Accept' => 'application/json'
@@ -83,11 +83,12 @@ class SalePayment < ApplicationRecord
       if !membership_actions_data.nil?
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
         merchant_uid = membership_actions_data.merchant_account_id
+        auth_token = membership_actions_data.auth_token
         campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
         sale_data = Sale.find_by_sale_id(sale_id)
         if sale_data
           response = HTTParty.post(url,
-                :body => { generic_customer_id:membership_id,redeem_amount:received_amount,receipt_no:sale_data.receipt_no,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid}.to_json,
+                :body => { generic_customer_id:membership_id,redeem_amount:received_amount,receipt_no:sale_data.receipt_no,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
                 :headers => {
                           'Content-Type' => 'application/json',
                           'Accept' => 'application/json'

app/views/crm/customers/show.html.erb

@@ -26,6 +26,9 @@
                 <th>Contact no</th>
                 <th>Company</th>
                 <th>Date Of Birth</th>
+                <th>Membership Account</th>
+                <th>Balance</th>
+                <th>Type</th>
               </tr>
             </thead>
 
@@ -36,7 +39,11 @@
                   <td><%= @crm_customer.contact_no %></td>
                   <td><%= @crm_customer.company %></td>
                   <td><%= @crm_customer.date_of_birth %> </td>
-                 
+                  <td><%= @balance %> </td>
+                  <td><%= @type %> </td>
+                    <%
+puts "hhhhhhhhhhhhhhhhhhhhh"
+             puts @member_data.to_json %>
                 </tr>
             </tbody>
           </table>

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

@@ -14,7 +14,7 @@
 
 
 <div class="row">
-  <div class="col-lg-8">
+  <div class="col-lg-7 col-md-7 col-sm-7">
       
       <div class="main-box-body clearfix">
         <div class="table-responsive">
@@ -38,7 +38,6 @@
                 <th>Company</th>
                 <th>Contact no</th>
                 <th>Email</th>
-                <th>Date of Birth</th>
               </tr>
             </thead>
 
@@ -51,10 +50,7 @@
                   <td><%= crm_customer.company rescue '-' %></td>
                   <td><%= crm_customer.contact_no %></td>
                   <td><%= crm_customer.email %></td>
-                  <td>
-                  <%= crm_customer.date_of_birth rescue  '-' %>
                   
-                  </td>
                  
                 </tr>
               <% end %>
@@ -68,7 +64,7 @@
 
   </div>
 
-  <div class="col-lg-4">
+  <div class="col-lg-4 col-md-4 col-sm-4">
     <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %>
 
     <span class="patch_method"></span>
@@ -112,7 +108,12 @@
       <!--  <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> -->
     </div>
     <%end%>
-</div>
+  </div>
+   <div class="col-lg-1 col-md-1 col-sm-1">
+         <a href="<%= origami_root_path%>" class="btn btn-primary btn-lg ">
+         Back
+       </a>
+   </div>
 </div>
 
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.2.0/jquery-confirm.min.css">
@@ -197,7 +198,7 @@
                         success: function(data) {
                           if(data.status == true)
                           { 
-                            alert('Customer has assigned');
+                            
                             window.location.href = '/origami'
                           }else{
                             alert('Record not found!');

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

@@ -297,9 +297,7 @@
               <p>Customer : <span id="customer_name"></span></p>
 
             </div>
-            <div class="col-lg-6 col-md-6 col-sm-6 text-right">
+            
-              <p>Amount :  <span id="customer_amount"></span></p>
-            </div>
           </div>
           <div class="card-text">
             <table class="table table-striped" id="order-items-table">
@@ -373,6 +371,9 @@
                 <td class="charges-name"><strong>Grand Total:</strong></td>
                 <td class="item-attr"><strong id="order-grand-total"><%=@selected_item.grand_total rescue 0%></strong></td>
               </tr>
+               <tr class="rebate_amount">
+                
+              </tr>
             </table>
           </div>
         </div>

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

@@ -5,14 +5,14 @@
 				<div class="rebate-form">
 		    		<div class="row">
 			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Valid Redeem Amount</label>
+			      			<label class="col-lg-4 col-md-4 col-sm-4">Valid Rebate Amount</label>
 						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
 			    		</div>
 			    		<hr>
 			    	</div>
 			    	<div class="row">
 			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-			      			<label class="col-lg-4 col-md-4 col-sm-4">Used Amount</label>
+			      			<label class="col-lg-4 col-md-4 col-sm-4">Redeem Amount</label>
 			      			<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
 			    		</div>
 			    		<hr>

app/views/reports/_shift_sale_report_filter.html.erb

@@ -0,0 +1,211 @@
+<div class="row">
+	<div class="col-md-12">
+			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+				<% if period_type != false %>
+					<div class="row">
+						<div class="form-group col-md-2">
+							<label>Select Period</label>
+							<select name="period" id="sel_period" class="form-control">
+								<option value="0">Today</option>
+								<option value="1">Yesterday</option>
+								<option value="2">This week</option>
+								<option value="3">Last week</option>
+								<option value="4">Last 7 days</option>
+								<option value="5">This month</option>
+								<option value="6">Last month</option>
+								<option value="7">Last 30 days</option>
+								<option value="8">This year</option>
+								<option value="9">Last year</option>
+							</select>
+						</div>
+						<div class="form-group col-md-2">
+							<label>Select Type</label>
+							<select name="sale_type" id="sel_sale_type" class="form-control">
+								<option value="0">All Sale Type</option>
+								<option value="1">Revenue Only</option>
+								<option value="2">Discount Only</option>
+								<option value="3">Void Only</option>
+								<option value="4">Taxes Only</option>
+								<option value="5">Other Amount Only</option>
+							</select>
+						</div>
+						<div class="form-group col-md-3">					
+							<!-- <label class="">Select Shift Period</label> -->
+				  			<label class="">From</label>
+							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+						</div>
+						<div class="form-group col-md-3">
+							<label class="">To</label>
+							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+						</div>
+						<div class="form-group col-md-2 margin-top-20">
+							<input type="submit" value="Generate Report" class='btn btn-primary'>
+						</div>							
+					</div>													
+				<% end %>
+				
+				<!-- <div class="row">
+					<% if defined? show_monthly %>
+						<div class="span3" style="margin-bottom:10px;">
+							<input type="hidden" id="report_type" name="report_type" value="0">
+							<div class="btn-group" data-toggle="buttons-radio">
+							  <button id="btn_report_type_1" onclick="$('#report_type').val(1)" type="button" class="btn btn-inverse">Monthly</button>
+							  <button id="btn_report_type_2" onclick="$('#report_type').val(2)" type="button" class="btn btn-inverse">Yearly</button>
+							</div>
+						</div>
+					<% end %>
+				</div> -->
+	
+				<div class="row">
+					<div class="form-group">
+					<% if defined? promotions %>
+						<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %>
+					<% end %>
+					
+					<% if defined? menu_types %>
+						<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %>	
+					<% end %>
+					
+					<% if defined? payments %>
+						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+					<% end %>
+					
+					<% if defined? shift_name %>
+						<!-- Temporary no needs
+						<select name="shift_name" id="shift_name"></select> 
+						-->
+					<% end %>
+
+					<% if defined? cashiers %>
+						<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %>
+					<% end %>
+						
+					<% if defined? singer %>
+						<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %>
+					<% end %>
+					
+					<% if defined? bsm %>		
+						<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %>
+					<% end %>		
+					
+					<% if defined? guest_role %>
+						<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %>
+					<% end %>
+					
+					<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
+						<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %>	
+					<% end %>				
+					
+					<% if defined? products %>
+						<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %>	
+					<% end %>
+
+					<% if defined? items %>	
+						<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %>			
+					<% end %>
+					</div>
+				</div>
+
+				<!-- <div class="row">
+					<div class="col-md-12">
+						<input type="submit" value="Generate Report" class='btn btn-primary'>
+					</div>
+				</div> -->
+				
+			<% end %>		
+	</div>
+</div>
+
+<!--
+ <div class = "row">
+	
+	<div class = "span3">
+		<input type="button" value="Filter by Shift" class='btn' onclick = "select_shift(this)">
+	</div>	
+	<div class = "span3">
+		<select name="shift" id="shift">
+			<option value="">All Shift</option>
+			
+		</select>
+	</div>
+	<div class = "span3">
+	</div>
+</div> 
+-->
+
+<script type="text/javascript">
+$(function(){
+	$('#custom_excel').hide();
+	
+	$('#custom_excel').click(function(){
+		var url = $('#custom_excel').attr('data-url');
+		$('#frm_report').attr('action',url)
+		$('#frm_report').submit();
+		// window.location = url;
+	});
+	
+	var item = $('#item').val();
+	var payment_type = $('#payment_type');
+	
+	if(item == 'order'){
+		$('#cashier').hide();
+		$('#waiter').show();
+		if(payment_type){
+			$('#payment_type').hide();
+		}		
+	}
+	else if(item == 'sale'){
+		$('#waiter').hide();
+		$('#cashier').show();
+	}
+	else{
+		$('#waiter').hide();
+		$('#cashier').show();		
+		$("#item").val('sale');
+	}
+});
+
+//Reset the form to pervious values
+$("#branch").val(<%=params[:branch]%>);
+$("#waiter").val("<%=params[:waiter]%>");
+$("#cashier").val(<%=params[:cashier]%>);
+$("#product").val(<%=params[:product]%>);
+$("#singer").val(<%=params[:singer]%>);
+$("#item").val('<%=params[:item]%>');
+$("#guest_role").val('<%=params[:guest_role]%>');
+
+
+$("#from").val("<%=params[:from]%>");
+$("#to").val("<%=params[:to]%>");
+$("#sel_period").val(<%=params[:period]%>);
+$("#sel_sale_type").val(<%=params[:sale_type]%>);
+
+<% if params[:period_type] == 1 || params[:period_type] == "1" %>
+	$("#rd_period_type_1").attr("checked","checked");
+<% else %>
+	$("#rd_period_type_0").attr("checked","checked");
+<% end %>
+$(".btn-group button").removeClass("active");
+<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+$("#btn_report_type_<%= report_type %>").addClass("active");
+
+$('#item').change(function(){
+	var item = $('#item').val();
+	var payment_type = $('#payment_type');
+
+	if(item == 'sale'){
+		$('#waiter').hide();
+		$('#cashier').show();		
+		if(payment_type){
+			$('#payment_type').show();
+		}
+	}
+	else{
+		$('#cashier').hide();
+		$('#waiter').show();
+		if(payment_type){
+			$('#payment_type').hide();
+		}
+	}
+});
+</script> 

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

@@ -1,247 +0,0 @@
-<%= form_tag report_path, :method => :get, :id=>"frm_report" do %>
-<div class="row">
-	<div class="col-md-12"></div>
-	<div class="span3">
-		<% if defined? product_account %>
-			<%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account])%>	
-		<% end %>
-		<% if defined? shift_product_account %>
-			<%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account]), :prompt => 'All Group'%>	
-		<% end %>		
-	</div>
-	
-	<div class="span3">
-	<% if period_type != false %>
-		<label class="radio inline top-valign">
-		  <input type="radio" id="rd_period_type_0" name="period_type" value="0" checked></input>
-		</label>
-			<select name="period" id="sel_period">
-				<option value="0">Today</option>
-				<option value="1">Yesterday</option>
-				<option value="2">This week</option>
-				<option value="3">Last week</option>
-				<option value="4">Last 7 days</option>
-				<option value="5">This month</option>
-				<option value="6">Last month</option>
-				<option value="7">Last 30 days</option>
-				<option value="8">This year</option>
-				<option value="9">Last year</option>
-			</select>	
-	<% end %>
-	</div>
-
-	<div class="span3">
-		<div class="btn-group">
-			<a href="javascript:export_to('<%=report_path%>.xls')" class = "btn" >Export to Excel</a>								  
-			<button class="btn dropdown-toggle" data-toggle="dropdown">
-			    <span class="caret"></span>
-			</button>			
-		<!--	<ul class="dropdown-menu">
-			  <li>
-				<a href="javascript:export_to('<%=report_path%>.pdf')" class = "btn" >Export to Pdf</a>
-			  </li>
-			</ul>
-		-->
-		</div>
-		<br>
-		<br>
-	</div>
-<!-- 	<div class="span3">
-		<% url = url_for(:format => 'xls')%>
-		<div class="btn-group">
-			<div id="default_excel">
-				<a href="javascript:export_to('<%=report_path%>.xls')" class = "btn" >Export to Excel</a>		
-			</div>
-
-			<div id="custom_excel" data-url="<%= url %>">
-				<a href="#" class="btn">Export to Excel</a>
-
-			</div>
-		</div>
-		<br>
-		<br>
-	</div> -->
-</div>
-
-<div class="row">
-	<div class="span3">
-		<% if defined? show_sale_type %>
-		<select name="sale_type" id="sel_sale_type">
-			<option value="0">All Sale Type</option>
-			<option value="1">Revenue Only</option>
-			<option value="2">Discount Only</option>
-			<option value="3">Void Only</option>
-			<option value="4">Taxes Only</option>
-			<option value="5">Other Amount Only</option>
-		</select>
-		<% end %>
-	
-		<% if defined? promotions %>
-			<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]) %>	
-		<% end %>
-		
-		<% if defined? menu_types %>
-			<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]) %>	
-		<% end %>
-		
-		<% if defined? payments %>
-			<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]) %>	
-		<% end %>
-		
-		<% if defined? shift_name %>
-			<select name="shift_name" id="shift_name">
-			</select>
-		<% end %>
-		<% if defined? cashiers %>
-			<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations" %>
-		<% end %>
-			
-		<% if defined? singer %>
-			<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List" %>
-		<% end %>
-		
-		<% if defined? bsm %>		
-			<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List" %>
-		<% end %>		
-		
-		<% if defined? guest_role %>
-			<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List" %>
-		<% end %>
-		
-		<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
-			<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]) %>	
-		<% end %>				
-		
-		<% if defined? products %>
-			<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products" %>	
-		<% end %>
-		<% if defined? items %>	
-			<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]) %>			
-		<% end %>			
-	</div>
-	
-	<div class="span3">
-		
-		<label class="radio inline top-valign">
-		  <input type="radio" id="rd_period_type_1" name="period_type" value="1">
-		  <div class="input-prepend margin-left-3">
-  			<span class="add-on">From</span>
-			<input data-behaviour='datepicker' class="span2" name="from" id="from" type="text" placeholder="From date">
-		  </div>	
-		</label>
-		<div class="input-prepend margin-left-23">
-  			<span class="add-on">To&nbsp&nbsp&nbsp&nbsp</span>
-			<input data-behaviour='datepicker' class="span2" name="to" id="to" type="text" placeholder="To date">
-		</div>							
-	</div>
-
-	
-	<% if defined? show_monthly %>
-	<div class="span3" style="margin-bottom:10px;">
-		<input type="hidden" id="report_type" name="report_type" value="0">
-		<div class="btn-group" data-toggle="buttons-radio">
-		  <!-- <button id="btn_report_type_0" onclick="$('#report_type').val(0)" type="button" class="btn btn-inverse active">Daily</button> -->
-		  <button id="btn_report_type_1" onclick="$('#report_type').val(1)" type="button" class="btn btn-inverse">Monthly</button>
-		  <button id="btn_report_type_2" onclick="$('#report_type').val(2)" type="button" class="btn btn-inverse">Yearly</button>
-		</div>
-	</div>
-	<% end %>
-	
-	<div class="span3">
-		<input type="submit" value="Generate Report" class='btn btn-primary'>
-	</div>	
-</div>
-<!--
- <div class = "row">
-	
-	<div class = "span3">
-		<input type="button" value="Filter by Shift" class='btn' onclick = "select_shift(this)">
-	</div>	
-	<div class = "span3">
-		<select name="shift" id="shift">
-			<option value="">All Shift</option>
-			
-		</select>
-	</div>
-	<div class = "span3">
-	</div>
-</div> 
--->
-<% end %>
-
-<script type="text/javascript">
-$(function(){
-	$('#custom_excel').hide();
-	
-	$('#custom_excel').click(function(){
-		var url = $('#custom_excel').attr('data-url');
-		$('#frm_report').attr('action',url)
-		$('#frm_report').submit();
-		// window.location = url;
-	});
-	
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-	
-	if(item == 'order'){
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}		
-	}
-	else if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();
-	}
-	else{
-		$('#waiter').hide();
-		$('#cashier').show();		
-		$("#item").val('sale');
-	}
-});
-
-//Reset the form to pervious values
-$("#branch").val(<%=params[:branch]%>);
-$("#waiter").val("<%=params[:waiter]%>");
-$("#cashier").val(<%=params[:cashier]%>);
-$("#product").val(<%=params[:product]%>);
-$("#singer").val(<%=params[:singer]%>);
-$("#item").val('<%=params[:item]%>');
-$("#guest_role").val('<%=params[:guest_role]%>');
-
-
-$("#from").val("<%=params[:from]%>");
-$("#to").val("<%=params[:to]%>");
-$("#sel_period").val(<%=params[:period]%>);
-$("#sel_sale_type").val(<%=params[:sale_type]%>);
-
-<% if params[:period_type] == 1 || params[:period_type] == "1" %>
-	$("#rd_period_type_1").attr("checked","checked");
-<% else %>
-	$("#rd_period_type_0").attr("checked","checked");
-<% end %>
-$(".btn-group button").removeClass("active");
-<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
-$("#btn_report_type_<%= report_type %>").addClass("active");
-
-$('#item').change(function(){
-	var item = $('#item').val();
-	var payment_type = $('#payment_type');
-
-	if(item == 'sale'){
-		$('#waiter').hide();
-		$('#cashier').show();		
-		if(payment_type){
-			$('#payment_type').show();
-		}
-	}
-	else{
-		$('#cashier').hide();
-		$('#waiter').show();
-		if(payment_type){
-			$('#payment_type').hide();
-		}
-	}
-});
-</script> 

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

@@ -2,14 +2,25 @@
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
   <li>Receipt List Report</li>
-  <span style="float: center">
-    <%= render :partial=>'shift_sale_report_filter',:locals=>{ 	:period_type => true, 
-																	:shift_name => true, 								:report_path => reports_receipt_no_index_path} %>
-  </span>
  </ul>
 </div>
 
-<div class="card">
+<div class="container">
+    <%= render :partial=>'shift_sale_report_filter',
+    		   :locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_receipt_no_index_path} %>
+	<hr />
+</div>
+
+<div class="container">
+	<div class="row">
+		<div class="col-md-12 text-right">
+			<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
+		</div>	  			
+	</div>
+</div>
+
+<div class="container margin-top-20">
+	<div class="card row">
 	  <table class="table table-striped">
 	    <thead>
 	      <tr> 
@@ -43,8 +54,11 @@
 	    	<% end %>
 	    </tbody>
 	  </table>
+	</div>
 </div>
+
 <%= paginate @sale_data %>
+
 <script>
 $(function(){
 	var check_arr = [];   	

app/views/settings/sales/index.html.erb

@@ -20,9 +20,9 @@
                  <td colspan="8">
                     <%= form_tag settings_sales_path, :method => :get do %>
                       <div class="input-append form-group pull-right">
-                        <input data-behaviour='datepicker' class="datepicker col-md-3 form-control" name="date" id="date" type="text" placeholder="Search by date" style="margin-right: 10px">
+                        <!-- <input data-behaviour='datepicker' class="datepicker col-md-3 form-control" name="date" id="date" type="text" placeholder="Search by date" style="margin-right: 10px"> -->
       
-                         <input type="text" name="receipt_no" class="col-md-4 form-control" placeholder="Receipt No" style="margin-right: 10px">
+                         <input type="text" name="receipt_no" class="col-md-8 form-control" placeholder="Receipt No" style="margin-right: 10px">
                         <button type="submit" class="btn btn-primary btn">Search</button>
                       </div>
                     <% end %>
@@ -58,7 +58,6 @@
           </table>
           <br>
           
-          <%= paginate @sales %>
         </div>
       </div>
 
@@ -67,14 +66,14 @@
 
 <script type="text/javascript">
   $(function () {
-     if (jQuery().datepicker) {
+
             $('.datepicker').datepicker({
                format : 'dd-mm-yyyy',
                autoclose: true
             });
             $('.datepicker').attr('ReadOnly','true');
             $('.datepicker').css('cursor','pointer');
-      }
+
      
   });
 </script>

config/routes.rb

@@ -95,11 +95,11 @@ Rails.application.routes.draw do
 
     get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
     post 'payment/mpu' => "mpu#create"
-    get 'sale/:sale_id/payment/others_payment/REDEEM' => "redeem_payments#index"
+    get 'sale/:sale_id/payment/others_payment/Redeem' => "redeem_payments#index"
 
     #---------Add Customer --------------#
     #resources :customers
-    get '/:sale_id/add_customer', to: "customers#add_customer"
+    get '/:sale_id/customers', to: "customers#add_customer"
     get '/:customer_id/get_customer' => 'home#get_customer'
     post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
   end

db/seeds.rb

@@ -145,18 +145,18 @@ crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrder
 
 member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
 
-member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"},
+  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}
+  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"}
   ])
 
 payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"})
 
-payment_methods = PaymentMethodSetting.create({payment_method:"REDEEM",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
 
 
 # shop = Shop.create(