From a8a8c2b984f5de4a5164217d74e42a5dbcaaa2f8 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Mon, 12 Jun 2017 20:15:26 +0630
Subject: [PATCH 1/2] update

---
 app/views/origami/home/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 0332fa12..5ee5ae3e 100644
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -60,7 +60,7 @@
               <p class="hidden orders-id"><%= unique_id  %></p>
               <p class="hidden customer-id"><%= customer_id  %></p>
               <p class="hidden order-cid"><%= cpo.order_id  %></p>
-              <h4 class="card-title orders-table"><%= cpo.table_name %></h4> 
+              <h4 class="card-title orders-table"><%= cpo.table_name %></h4>
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -96,7 +96,7 @@
                 unique_id=bko.booking_id
                 customer_id=bko.order_customer_id
                 # check selected item and assign
-                if @selected_item != nil
+                if !@selected_item.nil?
                   if bko.order_id == @selected_item.order_id
                     sale_status = sale_status + " selected-item"
                   end

From 29acbd9bfa8eef7f0c03b74fa4fae044ca005844 Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Mon, 12 Jun 2017 20:32:12 +0630
Subject: [PATCH 2/2] Rebate Redeem amount detect

---
 app/models/sale_payment.rb | 41 +++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 04668575..ffe881e6 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -236,21 +236,34 @@ class SalePayment < ApplicationRecord
   def rebat(sObj)
     food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items)
     generic_customer_id = sObj.customer.membership_id
- 		total_amount = food_prices
- 		receipt_no = sObj.receipt_no
-    membership      = MembershipSetting.find_by_membership_type("paypar_url")
-    memberaction    = MembershipAction.find_by_membership_type("rebate")
-    campaign_type_id = memberaction.additional_parameter["campaign_type_id"]
-    app_token       = membership.auth_token.to_s
-    url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-    response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id,
-                                                    receipt_no: receipt_no}.to_json,
-                                         :headers => {
-                                                  'Content-Type' => 'application/json',
-                                                  'Accept'       => 'application/json'
-                                          })
+    if generic_customer_id != nil || generic_customer_id != ""
+      paypar = sObj.sale_payments
+      payparcost = 0
+      paypar.each do |pp|
+        if pp.payment_method == "paypar"
+          payparcost = payparcost + pp.payment_amount
+        end
+      end
+   		total_amount = food_prices - payparcost
+      puts "aaaa"
+      puts food_prices
+      puts payparcost
+      puts total_amount
+   		receipt_no = sObj.receipt_no
+      membership      = MembershipSetting.find_by_membership_type("paypar_url")
+      memberaction    = MembershipAction.find_by_membership_type("rebate")
+      campaign_type_id = memberaction.additional_parameter["campaign_type_id"]
+      app_token       = membership.auth_token.to_s
+      url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+      response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id,
+                                                      receipt_no: receipt_no}.to_json,
+                                           :headers => {
+                                                    'Content-Type' => 'application/json',
+                                                    'Accept'       => 'application/json'
+                                            })
 
-      puts response.to_json
+        puts response.to_json
+      end
   end
 
   private