customer sales report tax fixed

app/controllers/origami/payments_controller.rb

@@ -207,7 +207,7 @@ class Origami::PaymentsController < BaseOrigamiController
       end
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, printed_status,current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil)
+      filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,Shop.current_shop, printed_status,current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil)
       # if !saleObj.nil?
       #   InventoryJob.perform_now(self.id)
       #   InventoryDefinition.calculate_product_count(saleObj)

app/controllers/reports/customer_controller.rb

@@ -34,7 +34,7 @@ class Reports::CustomerController < BaseReportController
         membership_type = params[:membership_type]
       end
         @sale_data = Sale.get_shift_sales_by_customer(@shift_sale_range, @shift, from, to, membership_type, customer_filter)
-        @sale_taxes = Sale.get_separate_tax(@shift_sale_range, @shift, from, to, nil)
+        @sale_taxes = Sale.get_separate_tax_by_customer(@shift_sale_range, @shift, from, to, nil, customer_filter, membership_type)
         @tax_profiles = TaxProfile.group('name').order('order_by asc') #.limit(2)
 
         @from       = from

app/controllers/reports/receipt_no_controller.rb

@@ -32,7 +32,7 @@ authorize_resource :class => false
 
     payment_type = params[:payment_type]
       @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range, @shift, from, to, payment_type, customer_filter)
-      @sale_taxes = Sale.get_separate_tax(@shift_sale_range, @shift, from, to, payment_type)
+      @sale_taxes = Sale.get_separate_tax_by_customer(@shift_sale_range, @shift, from, to, payment_type, customer_filter)
       @tax_profiles = TaxProfile.group('name').order('order_by asc') #.limit(2)
 
       @from       = from

app/models/sale.rb

@@ -1225,7 +1225,7 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range, shift, from, to, paymen
     if payment_type.blank?
       payment_type = ''
     else
-      payment_type = " and sale_payments.payment_method = '#{payment_type}'"
+      payment_type = "sale_payments.payment_method = '#{payment_type}'"
     end
 
     query = Sale.includes(:sale_items).select("sales.*, sale_payments.*")
@@ -1235,7 +1235,9 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range, shift, from, to, paymen
               .joins("LEFT JOIN dining_facilities ON dining_facilities.id = bookings.dining_facility_id")
               .completed.where.not(total_amount: 0)
               .group("sales.sale_id")
-
+    if payment_type != ''
+      query = query.where("#{payment_type} and sale_payments.payment_amount!=0")
+    end
     if customer_filter.present?
       query = query.joins(sanitize_sql_array(["INNER JOIN customers ON customers.customer_id = sales.customer_id AND " +
         "customers.name LIKE :filter", filter: "%#{customer_filter}%"]))
@@ -1440,6 +1442,31 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
   end
 end
 
+def self.get_separate_tax_by_customer(shift_sale_range, shift, from, to, payment_type,customer_filter, membership_type=nil)
+
+  query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+            .where("sale_status= 'completed'")
+            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
+            .group("sale_taxes.tax_name")
+            .order("sale_taxes.tax_name desc")
+  if payment_type.present?
+    query = query.joins("JOIN sale_payments ON sale_payments.sale_id = sale_taxes.sale_id AND sale_payments.payment_method = '#{payment_type}' and sale_payments.payment_amount!=0")
+  end
+
+  query = query.joins("INNER JOIN customers ON customers.customer_id = sales.customer_id
+    #{sanitize_sql_array(['AND customers.name LIKE :filter', filter: "%#{customer_filter}%"]) if customer_filter.present?}
+    #{sanitize_sql_array(['AND customers.membership_type = :type', type: membership_type]) if membership_type.present?}")
+
+  if shift.present?
+     query = query.where("sales.shift_sale_id in (?) ", shift.to_a)
+  elsif shift_sale_range.present?
+     query = query.where("sales.shift_sale_id in (?) ", shift_sale_range.to_a)
+  else
+     query = query.where("sales.receipt_date between ? and ? ", from,to)
+  end
+
+end
+
 def self.get_payment_method_by_shift(shift,from,to,payment_type)
   payment_methods = SalePayment.where.not(payment_method: ['cash', 'creditnote', 'foc']).distinct.pluck(:payment_method)
 

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

@@ -165,13 +165,7 @@
     $("#member_acc_no").on('click', function(e){
       localStorage.setItem("member_card",true);
       $("#sxModal").show();
-<<<<<<< HEAD
-      setTimeout(function(){
-        getCardNo();
-      },100);
-=======
       getCardNo();
->>>>>>> r-1902001-01
     });
 
     // QR Code Reader

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

@@ -31,7 +31,7 @@
 			<select name="membership_type" id="membership_type" class="form-control m-t-3" style="height: 32px;">
 				<option value="0">--- All Group ---</option>
 				<%  @membership_type.each do |mt| %>
-				<option class="<%=mt.name.downcase%>" value="<%=mt.value%>"><%=mt.name%></option>
+				<option class="<%=mt.name.downcase%>" value="<%=mt.value%>" <%= 'selected' if mt.value == params[:membership_type]%>><%=mt.name%></option>
 				<%end %>
 			</select>
 		</div>

app/views/settings/lookups/_form.html.erb

@@ -1,5 +1,3 @@
-<% breadcrumb_add 'LookUp', settings_lookups_path, settings_lookups_path, t("views.btn.#{action_name}") %>
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
     <%= simple_form_for([:settings,@settings_lookup]) do |f| %>