Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/discounts_controller.rb

@@ -157,7 +157,11 @@ class Origami::DiscountsController < BaseOrigamiController
     is_card         = params[:is_card]
     sub_total       = params[:sub_total]
     sale            = Sale.find(sale_id)
-
+    if is_card == 'true'
+      is_card = true
+      else is_card.to_s == 'false'
+      is_card = false
+    end
     # Check for Card Payment
     is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
    
@@ -178,9 +182,7 @@ class Origami::DiscountsController < BaseOrigamiController
           end
         end 
       end
-
-      generic_customer_id = sale.customer.membership_id
-      account_no          = sale.customer.paypar_account_no
+      generic_customer_id = sale.customer.membership_id      
       receipt_no          = sale.receipt_no
       membership          = MembershipSetting.find_by_membership_type("paypar_url")
       memberaction        = MembershipAction.find_by_membership_type("member_discount")
@@ -188,12 +190,13 @@ class Origami::DiscountsController < BaseOrigamiController
       campaign_type_id    = memberaction.additional_parameter["campaign_type_id"]
       auth_token          = memberaction.auth_token.to_s
       url                 = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+      account_no = sale.customer.paypar_account_no rescue nil
 
       # Check for items for Paypar Cloud
       if acc_prices.length > 0
           begin
           response        = HTTParty.post(url, 
-                                  :body => { account_no: nil,
+                                  :body => { account_no: account_no,
                                             generic_customer_id:generic_customer_id ,
                                              campaign_type_id: campaign_type_id,
                                              receipt_no: receipt_no,
@@ -220,8 +223,8 @@ class Origami::DiscountsController < BaseOrigamiController
       else 
           response = {"status": false, "message": "You have no selected discount item" }
       end
-      puts "discountttttttttttt"
-      puts response.to_json
+      Rails.logger.debug "-------------- Member Discount Osaka ---------"
+      Rails.logger.debug response.to_json
       # Re-calc All Amount in Sale
       if response["status"] == true
           discount_amount   = response["discount_earned"]