Fixed conflict

app/models/customer.rb

@@ -25,6 +25,10 @@ class Customer < ApplicationRecord
       self.email = pin.to_s + "@gmail.com"
       self.pin_code = pin.to_s
       self.pin_sent_at = Time.now
+      tax_profiles=TaxProfile.where(group_type: "online_order")
+      tax_ids =[]
+      tax_profiles.each {|tax| tax_ids << "#{tax.id}"}
+      self.tax_profiles = tax_ids
       self.save
       return self
     else
@@ -389,6 +393,57 @@ class Customer < ApplicationRecord
    WALKIN   = "CUS-000000000001"
    TAKEAWAY = "CUS-000000000002"
 
+  def self.check_paymalcard(url,token,merchant_uid,auth_token,account_no)
+     # Control for Paypar Cloud
+     begin
+       response = HTTParty.get(url,
+               :body => { merchant_uid:merchant_uid,auth_token:auth_token,paypar_account_no: account_no}.to_json,
+               :headers => {
+                         'Content-Type' => 'application/json',
+                         'Accept' => 'application/json; version=4'
+               }, :timeout => 10
+         )
+     rescue Errno::ECONNREFUSED
+         response = { "status" => false, "message" => "Can't open membership server"}
+     rescue Net::OpenTimeout
+         response = { "status" => false, "message" => "No internet connection " }
+     rescue OpenURI::HTTPError
+         response = { "status" => false, "message" => "No internet connection "}
+     rescue SocketError
+         response = { "status" => false, "message" => "No internet connection "}
+     end
+     Rails.logger.debug "search_paypar_account_no"
+     Rails.logger.debug response.to_json
+     if response["status"]
+       response = { "status" => true, "message" => "Success"}
+     else
+       response = { "status" => false, "message" => response["message"]}
+     end
+     return response
+  end
+  def self.check_security_code(url,token,merchant_uid,auth_token,account_no)
+     # Control for Paypar Cloud
+     begin
+       response = HTTParty.get(url,
+               :body => { merchant_uid:merchant_uid,auth_token:auth_token,paypar_account_no: account_no}.to_json,
+               :headers => {
+                         'Content-Type' => 'application/json',
+                         'Accept' => 'application/json; version=4'
+               }, :timeout => 10
+         )
+     rescue Errno::ECONNREFUSED
+         response = { "status" => false, "message" => "Can't open membership server"}
+     rescue Net::OpenTimeout
+         response = { "status" => false, "message" => "No internet connection " }
+     rescue OpenURI::HTTPError
+         response = { "status" => false, "message" => "No internet connection "}
+     rescue SocketError
+         response = { "status" => false, "message" => "No internet connection "}
+     end
+     Rails.logger.debug "search_paypar_account_no"
+     Rails.logger.debug response.to_json
+     return response
+  end
   private
   def generate_custom_id
     self.customer_id = SeedGenerator.generate_id(self.class.name, "CUS")

app/models/sale.rb

@@ -458,7 +458,7 @@ class Sale < ApplicationRecord
     if order_source.to_s == "emenu"
       order_source = "cashier"
     elsif order_source.to_s == "app"
-      order_source = "food_court"
+      order_source = "online_order"
     end
 
     tax_profiles = unique_tax_profiles(order_source, self.customer_id)
@@ -592,6 +592,8 @@ class Sale < ApplicationRecord
     # tax_profiles = TaxProfile.all.order("order_by asc")
     if order_source.to_s == "emenu"
       order_source = "cashier"
+    elsif order_source.to_s == "app"
+      order_source = "online_order"
     end
 
     # tax_data = TaxProfile.unscope(:order).where("group_type=?",order_source).pluck(:id)
@@ -2024,6 +2026,7 @@ def self.get_sale_data_for_other_payment_credit(sale_id)
 end
 
 def unique_tax_profiles(order_source, customer_id)
+  puts "unique_tax_profiles unique_tax_profiles"
   tax_data = TaxProfile.where(group_type: order_source)
 
   customer_tax_profiles = Customer.select(:tax_profiles).where(customer_id: customer_id).first

app/models/sale_payment.rb

@@ -217,7 +217,7 @@ class SalePayment < ApplicationRecord
                 account_no: account_no, amount: amount}.to_json,
               :headers => {
                         'Content-Type' => 'application/json',
-                        'Accept' => 'application/json; version=3'
+                        'Accept' => 'application/json; version=4'
               }, :timeout => 10
         )
     rescue Errno::ECONNREFUSED
@@ -331,7 +331,7 @@ class SalePayment < ApplicationRecord
                   :body => params,
                   :headers => {
                             'Content-Type' => 'application/json',
-                            'Accept' => 'application/json; version=3'
+                            'Accept' => 'application/json; version=4'
                   },
                   :timeout => 10
             )
@@ -970,7 +970,6 @@ class SalePayment < ApplicationRecord
       .merge(SalePayment.where.not(payment_method: 'creditnote')
       .or(SalePayment.where.not(SalePayment.arel_table[:payment_amount].lteq(sale_data.sale_payments.joins(:sale_audit).sum(:payment_amount)))))
   end
-
   private
   def generate_custom_id
      if self.sale_payment_id.nil?

app/models/shop.rb

@@ -12,6 +12,6 @@ class Shop < ApplicationRecord
 	end
 
   def self.current_shop
-    RequestStore["current_shop"] ||= ActsAsTenant.current_tenant || Shop.first
+    ActsAsTenant.current_tenant
   end
 end