merge with master

app/models/customer.rb

@@ -15,9 +15,10 @@ class Customer < ApplicationRecord
   def self.get_member_group
 
     membership  = MembershipSetting.find_by_membership_type("paypar_url")
+    memberaction = MembershipAction.find_by_membership_type("get_all_member_group")
     app_token   = membership.auth_token.to_s
 
-    url         = membership.gateway_url.to_s + "/api/get_all_member_group".to_s
+    url         = membership.gateway_url.to_s + memberaction.gateway_url.to_s
     response    = HTTParty.get(url,
                     :body => { app_token: app_token}.to_json,
                     :headers => {

app/models/membership_action.rb

@@ -0,0 +1,2 @@
+class MembershipAction < ApplicationRecord
+end

app/models/sale_payment.rb

@@ -78,11 +78,11 @@ class SalePayment < ApplicationRecord
 
   end
 
-  def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id)
-      membership_actions_data = Settings::MembershipAction.find_by_membership_type("redeem_url");
+  def self.redeem(paypar_url,token,membership_id,received_amount,sale_id)
+      membership_actions_data = MembershipAction.find_by_membership_type("redeem");
       if !membership_actions_data.nil?
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
-        campaign_type_id = 1
+       campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
         response = HTTParty.post(url,
                 :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json,
                 :headers => {
@@ -93,7 +93,7 @@ class SalePayment < ApplicationRecord
       else
         response =false;
       end
-
+      puts response.to_json
       return response;
 
   end
@@ -106,7 +106,6 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
 
     return payment_status
@@ -134,7 +133,7 @@ class SalePayment < ApplicationRecord
     self.payment_method = method
     self.payment_amount = self.received_amount
     self.payment_reference  = self.card_payment_reference
-    self.outstanding_amount = self.sale.grand_total- self.received_amount
+    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
 
@@ -188,10 +187,9 @@ class SalePayment < ApplicationRecord
     self.payment_status = "pending"
     payment_method = self.save!
 
-    campaign_type_id =1;
     customer_data = Customer.find_by_customer_id(self.sale.customer_id)
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id,campaign_type_id)
+    membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
     if membership_data["status"]==true
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
@@ -205,30 +203,28 @@ class SalePayment < ApplicationRecord
   end
 
   def sale_update_payment_status(paid_amount)
-    puts "sale update"
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
-
     self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
-
     all_received_amount = 0.0
-    sObj = self.sale
+    sObj = Sale.find(self.sale_id)
     sObj.sale_payments.each do |spay|
-        puts spay
-        puts spay.payment_amount
         all_received_amount += spay.payment_amount.to_f
     end
-    puts all_received_amount
-    puts self.sale.grand_total
+
     if (self.sale.grand_total <= all_received_amount)
-      puts " sale update ......"
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!
+      rebat()
     end
 
   end
 
+  def rebat
+     
+  end
+
   private
   def generate_custom_id
     self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI")

app/models/settings/membership_action.rb

@@ -1,2 +0,0 @@
-class Settings::MembershipAction < ApplicationRecord
-end