check product sale report

app/controllers/oqs/home_controller.rb

@@ -14,19 +14,19 @@ class Oqs::HomeController < BaseOqsController
     @queue_stations = OrderQueueStation.all
    
     @queue_completed_item = completed_order(@filter)
-    # if !@queue_completed_item.empty?
+    if !@queue_completed_item.empty?
-    #   @queue_completed_item.each do |queue_item|
+      @queue_completed_item.each do |queue_item|
-    #     if !queue_item.set_menu_items.nil?
+        if !queue_item.set_menu_items.nil?
-    #       instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
+          instance_item_sets = JSON.parse(JSON.parse(queue_item.set_menu_items))
-    #       arr_instance_item_sets = Array.new
+          arr_instance_item_sets = Array.new
-    #       instance_item_sets.each do |instance_item|
+          instance_item_sets.each do |instance_item|
-    #         item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
+            item_instance_name = MenuItemInstance.find_by_item_instance_code(instance_item["item_instance_code"]).item_instance_name
-    #         arr_instance_item_sets.push(item_instance_name)
+            arr_instance_item_sets.push(item_instance_name)
-    #       end
+          end
-    #       queue_item.set_menu_items = arr_instance_item_sets
+          queue_item.set_menu_items = arr_instance_item_sets
-    #     end
+        end
-    #   end
+      end
-    # end
+    end
 
     if !@filter.nil?
       @count = queue_items_count_query(false,@filter)

app/controllers/origami/payments_controller.rb

@@ -87,7 +87,7 @@ class Origami::PaymentsController < BaseOrigamiController
       #end rounding adjustment
 
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @usercurrent_user.name, cash, "cash")
+      sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
       render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error "})
       rebate_amount = nil

app/controllers/reports/product_sale_controller.rb

@@ -2,18 +2,19 @@ class Reports::ProductSaleController < BaseReportController
 	authorize_resource :class => false
 
 	def index
-		order_by = 'desc'
+		@order_by = 'desc'
 		if !params[:order_by].nil?
-			order_by = params[:order_by]
+			@order_by = params[:order_by]
 		end
 		
-	    @sale_data = Sale.get_menu_item_query(order_by)
+	    @sale_data = Sale.get_menu_item_query(@order_by)
 
 	    # get printer info
 	    @print_settings = PrintSetting.get_precision_delimiter()
 
 		respond_to do |format|
 			format.html
+			format.json 
 			format.xls
 		end
   	end

app/models/sale.rb

@@ -877,7 +877,7 @@ def self.get_menu_item_query(order_by)
                " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" +
                " LEFT JOIN sales s ON s.sale_id = si.sale_id")
           .group("mc.id, menu_items.name, si.qty, (CASE WHEN si.unit_price > 0 THEN si.unit_price ELSE mii.price END)")
-          .order("si.qty #{order_by}, menu_items.menu_category_id desc")
+          .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}")
 end
 #product sale report query
 

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

@@ -83,13 +83,13 @@
                   <span class="order-qty">
                     <%= qid.qty %>
                   </span> ]  
-                  <% if !qid.set_menu_items.nil? 
+                  <% if !qid.set_menu_items.nil? %>
-                      qid.set_menu_items.each do |item_instance|%>
+                    <% qid.set_menu_items.each do |item_instance|%>
                       <br><span class="font-12">
                       <%= item_instance %>
                       </span>
-                  <% end 
+                    <% end %>
-                  end %> 
+                  <% end %> 
                 </p>                  
                 
                 <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 

app/views/origami/payments/show.html.erb

@@ -441,7 +441,7 @@
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
           var amt = parseFloat(total) - parseFloat(othertotal);
-          $('#cash').text(parseFloat(amt).toFixed(1));
+          $('#cash').text(parseFloat(amt).toFixed(2));
           update_balance();
         break;
       }

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

@@ -1,4 +1,5 @@
-<div class="page-header">
+<div class="div_product_sale">
+	<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.sale_item_report") %></li>
@@ -6,8 +7,8 @@
 	      <%= link_to 'Back', dashboard_path %>
 	    </span>
 	  </ol>
-</div>
+	</div>
-<div class="row">
+	<div class="row">
 		<div class="col-md-12">
 			<div class="text-right">
 				<a href="javascript:export_to('<%=reports_product_sale_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
@@ -26,6 +27,17 @@
 					</div>
 
 					<div class="table-responsive">	
+						<% if @print_settings.precision.to_i > 0
+							precision = @print_settings.precision
+						else
+							precision = 0
+						end
+						#check delimiter
+						if @print_settings.delimiter
+							delimiter = ","
+					    else
+							delimiter = ""
+					    end %>				
 						<table class="table table-striped" id="items_table" border="0">
 							<thead>
 								<tr>
@@ -38,19 +50,7 @@
 									<th><%= t("views.right_panel.detail.total") %></th>
 								</tr>	
 							</thead>
-						<tbody>
+							<tbody id="tbd_data">
-							<% if @print_settings.precision.to_i > 0
-								precision = @print_settings.precision
-							else
-								precision = 0
-							end
-							#check delimiter
-							if @print_settings.delimiter
-								delimiter = ","
-						    else
-								delimiter = ""
-						    end
-							 %>	
 								<% unless @sale_data.blank? %>
 									<% acc_arr = Array.new %>
 									<% cate_arr = Array.new %>	
@@ -100,28 +100,22 @@
 				</div>
 			</div>
 		</div>
+	</div>
 </div>
 
-<script>
+<script type="text/javascript">
-	var order_status = '';
 	$(function(){
-		if(order_status == ''){
+		$('#order_by').val('<%= @order_by %>');
-			$('#order_by').val('desc');
-		}else{
-			$('#order_by').val(''+order_status+'');
-		}
 	});
 	
 	$('#order_by').on('change', function(){
 		var order_by = $("#order_by").val();
-		order_status = order_by;
+		$('.div_product_sale').html("");
 		$.ajax({
 	        type: 'GET',
-	        data: {'order_by' : order_by},
+	        url: '?order_by='+order_by,
-	        datatype: 'JSON',
-	        url: '?',
 	        success: function(data) {
-	        	// window.location.reload();
+	        	$('.div_product_sale').html(data);
 	        }
 	    });
 	});