fixed conflict

app/controllers/api/memberships_controller.rb

@@ -1,7 +1,7 @@
 class Api::MembershipsController < ActionController::API
   before :authenticate_token
 
-
+  
   #Add Membership to invoice
   def create
 

app/controllers/crm/customers_controller.rb

@@ -57,7 +57,7 @@ class Crm::CustomersController < BaseCrmController
         date_of_birth   = customer_params[:date_of_birth]
         membership_id   = params[:membership_id]
 
-        membership      = MembershipSetting.find_by_membership_type("smartpay_url")
+        membership      = MembershipSetting.find_by_membership_type("paypar_url")
         app_token       = membership.auth_token.to_s
         url             = membership.gateway_url.to_s + "/api/create_membership_customer".to_s
 
@@ -124,7 +124,7 @@ class Crm::CustomersController < BaseCrmController
         date_of_birth   = customer_params[:date_of_birth]
         id              = customer_params[:membership_id]
 
-        membership      = MembershipSetting.find_by_membership_type("smartpay_url")
+        membership      = MembershipSetting.find_by_membership_type("paypar_url")
         app_token       = membership.auth_token.to_s
         url             = membership.gateway_url.to_s + "/api/update_membership_customer".to_s
       

app/controllers/origami/card_payments_controller.rb

@@ -0,0 +1,29 @@
+class Origami::CardPaymentsController < BaseOrigamiController
+
+
+  def index
+  	@membership_rebate_balance = 0
+  	@membership_id = 0
+  	if !@membership_id.nil?
+  		membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+	  	membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
+	  	if membership_data["status"]==true
+	  		membership_account_data = membership_data["data"];
+	  		membership_account_data.each do |acc_data|
+	  			if acc_data["accountable_type"] == "REBATEACCOUNT"
+	  				@membership_rebate_balance=acc_data["balance"]
+	  			else
+	  				@membership_rebate_balance = 0
+	  			end
+	  		end
+	  	else
+	  		@membership_rebate_balance = 0
+	  	end
+  	end
+
+  end
+
+  def create
+  end
+
+end

app/controllers/origami/discounts_controller.rb

@@ -1,6 +1,51 @@
 class Origami::DiscountsController < BaseOrigamiController
+
+  #discount page show from origami index with selected order
   def index
+	sale_id = params[:id]
+    if Sale.exists?(sale_id)
+      @sale_data = Sale.find(sale_id)
+    end
   end
+
+  #discount for selected order
   def create
+  	sale_id = params[:sale_id]
+  	discount_type = params[:discount_type]
+	discount_value = params[:discount_value]
+	discount_amount = params[:discount_amount]
+	grand_total = params[:grand_total]
+
+	if discount_type == 0
+		remark="Discount " + discount_amount + " as net"
+	else
+		remark="Discount " + discount_amount + " as percentage"
+	end
+
+	#update discount for sale
+	sale = Sale.find(sale_id)
+	sale.total_discount = discount_amount
+	sale.grand_total = grand_total
+	sale.save
+
+  	#save sale item for discount
+    sale_item = SaleItem.new
+
+    #pull
+    sale_item.sale_id = sale_id
+    sale_item.product_code = 0
+    sale_item.product_name = "Discount"
+    sale_item.remark = remark
+
+    sale_item.qty = 1
+    sale_item.unit_price = (0-discount_amount.to_f)
+    sale_item.taxable_price = discount_amount
+    sale_item.is_taxable = 0
+
+    sale_item.price = sale_item.qty * sale_item.unit_price
+    sale_item.save
+
+    redirect_to origami_root_path
   end
+
 end

app/controllers/origami/others_payments_controller.rb

@@ -2,6 +2,34 @@ class Origami::OthersPaymentsController < BaseOrigamiController
 
 
   def index
+  	@membership_rebate_balance = 0
+  	@sale_id = params[:sale_id]
+  	@payment_method_setting = PaymentMethodSetting.all
+  	# @sale_id = params[:sale_id]
+  	# sale_data = Sale.find_by_sale_id(@sale_id)
+
+ #  	if sale_data.customer_id
+ #  		customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+	#   	@membership_id = customer_data.membership_id
+	#   	if !@membership_id.nil?
+	#   		membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+	# 	  	membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
+	# 	  	if membership_data["status"]==true
+	# 	  		membership_account_data = membership_data["data"];
+	# 	  		membership_account_data.each do |acc_data|
+	# 	  			if acc_data["accountable_type"] == "REBATEACCOUNT"
+	# 	  				@membership_rebate_balance=acc_data["balance"]
+	# 	  			else
+	# 	  				@membership_rebate_balance = 0
+	# 	  			end
+	# 	  		end
+	# 	  	else
+	# 	  		@membership_rebate_balance = 0
+	# 	  	end
+	# 	end
+	# else
+
+ #  	end
   end
 
   def create

app/controllers/origami/payments_controller.rb

@@ -10,7 +10,7 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash)
+      sale_payment.process_payment(saleObj, @user, cash, "cash")
     end
   end
 

app/controllers/origami/paypar_payments_controller.rb

@@ -0,0 +1,22 @@
+class Origami::PayparPaymentsController < BaseOrigamiController
+	def create
+		sale_id = params[:sale_id]
+		redeem_amount = params[:redeem_amount]
+		membership_id = params[:membership_id]
+		payment_method = "paypar"
+		if(Sale.exists?(sale_id))
+			saleObj = Sale.find(sale_id)
+      		sale_payment = SalePayment.new
+      		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
+   
+      		if status == true
+      			@out = true, "Success!"
+      		else
+      			@out =false, "Please try again payment!"
+      		end
+      	else
+      		@out = false, "There has no sale record!"
+		end
+
+	end
+end

app/controllers/origami/request_bills_controller.rb

@@ -26,6 +26,6 @@ class Origami::RequestBillsController < BaseOrigamiController
     printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer_name)
     redirect_to origami_root_path
   end
-
 end
 
+

app/controllers/settings/membership_actions_controller.rb

@@ -0,0 +1,111 @@
+class Settings::MembershipActionsController < ApplicationController
+  before_action :set_settings_membership_action, only: [:show, :edit, :update, :destroy]
+
+  # GET /settings/membership_actions
+  # GET /settings/membership_actions.json
+  def index
+    type = params[:type]
+    @sale_id = params[:sale_id]
+    if type.nil?
+        @settings_membership_actions = Settings::MembershipAction.all
+    else
+        membership_actions_data=Settings::MembershipAction.find_by_membership_type(type)
+
+        if !membership_actions_data.nil?
+            url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s
+            puts url.to_json
+            sale_data = Sale.find_by_sale_id(@sale_id) 
+            if sale_data.customer_id
+              customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+               @membership_id = customer_data.membership_id
+               @campaign_type_id =1
+                if !@membership_id.nil?
+                    membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+                    membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
+                    if membership_data["status"]==true
+                        @membership_rebate_balance=membership_data["balance"]
+                        @out = true, @membership_rebate_balance
+                    else
+                        @out = false, 0
+                    end
+                else
+                  @out = false, 0
+                end
+              else
+                @out =false, 0
+            end
+            # campaign_type_id=1
+            # get_account_data = MembershipAction.get_account_data(url)
+        else
+          @out = false, 0
+        end
+      render :json => @out.to_json
+    end
+    
+  end
+
+  # GET /settings/membership_actions/1
+  # GET /settings/membership_actions/1.json
+  def show
+  end
+
+  # GET /settings/membership_actions/new
+  def new
+    @settings_membership_action = Settings::MembershipAction.new
+  end
+
+  # GET /settings/membership_actions/1/edit
+  def edit
+  end
+
+  # POST /settings/membership_actions
+  # POST /settings/membership_actions.json
+  def create
+    @settings_membership_action = Settings::MembershipAction.new(settings_membership_action_params)
+
+    respond_to do |format|
+      if @settings_membership_action.save
+        format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully created.' }
+        format.json { render :show, status: :created, location: @settings_membership_action }
+      else
+        format.html { render :new }
+        format.json { render json: @settings_membership_action.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /settings/membership_actions/1
+  # PATCH/PUT /settings/membership_actions/1.json
+  def update
+    respond_to do |format|
+      if @settings_membership_action.update(settings_membership_action_params)
+        format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully updated.' }
+        format.json { render :show, status: :ok, location: @settings_membership_action }
+      else
+        format.html { render :edit }
+        format.json { render json: @settings_membership_action.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /settings/membership_actions/1
+  # DELETE /settings/membership_actions/1.json
+  def destroy
+    @settings_membership_action.destroy
+    respond_to do |format|
+      format.html { redirect_to settings_membership_actions_url, notice: 'Membership action was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_settings_membership_action
+      @settings_membership_action = Settings::MembershipAction.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def settings_membership_action_params
+      params.require(:settings_membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter)
+    end
+end

app/controllers/settings/payment_method_settings_controller.rb

@@ -69,6 +69,6 @@ class Settings::PaymentMethodSettingsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_payment_method_setting_params
-      params.require(:payment_method_setting).permit(:payment_method, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id)
+      params.require(:payment_method_setting).permit(:payment_method, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :additional_parameters)
     end
 end