From b88c40be418f15fdc9214fa19423cc7459da0092 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Jun 2017 09:41:00 +0630
Subject: [PATCH 1/3] sale update

---
 .../_shift_sale_report_filter.html.erb        | 211 ++++++++++++++++++
 app/views/transactions/sales/show.html.erb    |   2 +-
 app/views/transactions/sales/void.html.erb    |  82 +++----
 3 files changed, 248 insertions(+), 47 deletions(-)
 create mode 100644 app/views/reports/receipt_no/_shift_sale_report_filter.html.erb

diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
new file mode 100644
index 00000000..1b4082f5
--- /dev/null
+++ b/app/views/reports/receipt_no/_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> 
\ No newline at end of file
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 36994ec7..9c5a8b86 100644
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -171,7 +171,7 @@
        <i class="fa fa-arrow-left fa-lg"></i> Back
      </a>
 
-       <!-- <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+      <!--  <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
         <i class="fa fa-trash fa-lg"></i>  Void Sale
        </a>
       <a href="<%= transactions_manual_void_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
diff --git a/app/views/transactions/sales/void.html.erb b/app/views/transactions/sales/void.html.erb
index 6d0d9fb7..d8091876 100644
--- a/app/views/transactions/sales/void.html.erb
+++ b/app/views/transactions/sales/void.html.erb
@@ -1,59 +1,49 @@
 <div class="row">
   <div class="col-lg-12">
     <ol class="breadcrumb">
-       <li><a href="<%= crm_root_path %>">Home</a></li>
-       <li class="active">
-           <a href="<%= transactions_sales_path %>">Sale</a>
-       </li>
-       <li class="active">
-           <a href="<%= transactions_sale_path(@sale) %>"><%=  %></a>
-       </li>
-    </ol>
-  </div>
+     <li><a href="<%= crm_root_path %>">Home</a></li>
+     <li class="active">
+       <a href="<%= transactions_sales_path %>">Sale</a>
+     </li>
+     <li class="active">
+       <a href="<%= transactions_sale_path(@sale) %>"><%= @sale %></a>
+     </li>
+   </ol>
+ </div>
 </div>
 <div class="row">
-     
-    <div class="col-lg-10 col-md-10 col-sm-10">
-    <div class="tab-content" style="min-height:670px; max-height:670px; overflow-y:scroll">
 
-            <div class="tab-pane active" id="queue" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
-      	<h3>Choose your reason</h3>
-      	<table>
-      		
-			  <tr>
-				  <td>
-					 <div class="checkbox checkbox-primary">
-                        <input id="checkbox" class="styled checkbox-primary" type="checkbox" checked="">
-                        <label for="checkbox">
-                            Primary
-                        </label>
-                    </div>
-				  </td>
-				  <td>
-				  	
-				  </td>	
-				  <td>&nbsp;</td>
-			  </tr>		
-			
-      	</table>
-      	</div>
+  <div class="col-lg-10 col-md-10 col-sm-10">
+    <div class="tab-pane active" id="queue" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
+       <h3>Choose your reason</h3>
+       <table>
+        <% @reason.each do |r| %>
+        <tr>
+          <td>
+            <%= check_box_tag "reason", "#{r.name}" rescue '-' %>
+          </td>
+
+          <td><%= label_tag "reasons[#{r.id}]", r.name, :style=>'font-weight:bold;font-size:18px;' rescue '-' %></td>
+        </tr>		
+        <% end %>
+      </table>
     </div>
-    </div>
-    
-
-    <div class="col-lg-2 col-md-2 col-sm-2">
-
-       <a href="<%= transactions_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
-       <i class="fa fa-arrow-left fa-lg"></i> Back
-     </a>
-
-      
-    </div>
-
+  </div>
+<div class="col-lg-2 col-md-2 col-sm-2">
+    <a href="<%= transactions_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg"><i class="fa fa-arrow-left fa-lg"></i> Back
+    </a>
 </div>
 
+</div>
+<style>
+  input[type='checkbox'] {
+   width: 20px;
+   height: 20px;
+ }
+</style>
+
+
 
 
 
-     
 

From 5e8bc9c01306dfc4b38085d5a83502cc7e6a3915 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Thu, 15 Jun 2017 10:10:02 +0630
Subject: [PATCH 2/3] Update

---
 app/models/order.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index b250c073..83eb9418 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -231,7 +231,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
-                    .group("bookings.booking_id,orders.status")
+                    .group("bookings.booking_id,orders.status,sales.receipt_no,sales.sale_status,orders.order_id,sales.customer_id,sales.sale_id,dining_facilities.name")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
@@ -246,7 +246,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("sales.sale_status='completed'")
-                    .group("sales.sale_id")
+                    .group("sales.sale_id,orders.status,orders.order_id,bookings.booking_id,dining_facilities.name")
                     # For PG
                     #bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
   end
@@ -262,7 +262,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,orders.order_id,sales.customer_id,sales.sale_status,orders.customer_id,sales.sale_id,dining_facilities.name")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id

From 8cb40783a4d6a4f29f5b5b79736bc067418b2300 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Jun 2017 10:20:26 +0630
Subject: [PATCH 3/3] update requestby in sail

---
 .../transactions/orders_controller.rb            |  2 +-
 app/controllers/transactions/sales_controller.rb | 16 +++++++++++-----
 app/models/sale.rb                               |  7 +++----
 app/views/transactions/sales/index.html.erb      |  2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb
index 2d3a819e..35cefe6f 100644
--- a/app/controllers/transactions/orders_controller.rb
+++ b/app/controllers/transactions/orders_controller.rb
@@ -13,7 +13,7 @@ class Transactions::OrdersController < ApplicationController
 		        
 		    end    
 		end    
-		    @orders = Kaminari.paginate_array(orders).page(params[:page]).per(2)
+		    @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50)
 			    respond_to do |format|
 			    format.html # index.html.erb
 			    format.json { render json: @orders }
diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index c8ecb725..b1c28e98 100644
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -10,12 +10,18 @@ class Transactions::SalesController < ApplicationController
     today       = Date.today
     
     if receipt_no.nil?
-      @sales = Sale.order("sale_id")
-      #@products = Product.order("name").page(params[:page]).per(5)
+        sales = Sale.order("sale_id desc")
     else
-      @sales = Sale.search(receipt_no)    
-    end
-    @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+        order = Sale.search(receipt_no)
+        if order.count > 0
+          sales = order 
+        else
+          sales = Sale.order("sale_id desc")
+            
+        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 }
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 67953c14..dee4c2f7 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -57,10 +57,9 @@ class Sale < ApplicationRecord
       self.tax_type = "exclusive"
 
       # set cashier by current login
-      # TODO: requested_by is string , can't cast to id. error occur. please fix
-      # self.cashier_id = requested_by.id
-      self.cashier_name = requested_by
-      self.requested_by = requested_by
+      self.cashier_id = requested_by.id
+      self.cashier_name = requested_by.name
+      self.requested_by = requested_by.name
 
       self.requested_at = DateTime.now.utc
 
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb
index a50bf56b..ee82eb8b 100644
--- a/app/views/transactions/sales/index.html.erb
+++ b/app/views/transactions/sales/index.html.erb
@@ -57,7 +57,7 @@
             </tbody>
           </table>
           <br>
-          
+           <%= paginate @sales %>
         </div>
       </div>