From e6cef8ef937ab82830ad8283b75e83b0083b95ac Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Sun, 18 Jun 2017 11:57:14 +0630
Subject: [PATCH 1/3] Redeem amount not cut bug Fix

---
 app/models/sale_payment.rb | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 731fa321..465a8e5b 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -187,17 +187,17 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     #Next time - validate if the vochure number is valid - within
-    self.payment_method = "paypar"
-    self.payment_amount = self.received_amount
-    self.payment_reference  = self.voucher_no
-    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
-    self.payment_status = "pending"
-    payment_method = self.save!
 
     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)
     if membership_data["status"]==true
+      self.payment_method = "paypar"
+      self.payment_amount = self.received_amount
+      self.payment_reference  = self.voucher_no
+      self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
+      self.payment_status = "pending"
+      payment_method = self.save!
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
 
@@ -251,7 +251,12 @@ class SalePayment < ApplicationRecord
           payparcost = payparcost + pp.payment_amount
         end
       end
-   		total_amount = food_prices - payparcost
+      overall_dis = SaleItem.get_overall_discount(sObj.id)
+   		total_amount = food_prices - payparcost + overall_dis
+      puts "total_amount"
+      puts food_prices
+      puts payparcost
+      puts total_amount
       if total_amount > 0
      		receipt_no = sObj.receipt_no
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
@@ -266,7 +271,7 @@ class SalePayment < ApplicationRecord
                                                       'Content-Type' => 'application/json',
                                                       'Accept'       => 'application/json'
                                               })
-
+                                      puts "haha"
           puts response.to_json
         end
       end

From 3a1fba2c6f2f1a3fb96e5e130c5513b3aec622c0 Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Sun, 18 Jun 2017 13:18:23 +0630
Subject: [PATCH 2/3] Other Payments Bug fix

---
 app/views/origami/jcb/index.html.erb    | 8 +++++++-
 app/views/origami/master/index.html.erb | 8 +++++++-
 app/views/origami/mpu/index.html.erb    | 8 +++++++-
 app/views/origami/visa/index.html.erb   | 8 +++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index 6d08b25a..9c239931 100644
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_jcb %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 // number key pad
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
@@ -141,7 +147,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#jcb_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_jcb %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
 	    $.ajax({type: "POST",
 	      url: "<%= origami_payment_jcb_path  %>",
 	      data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 5767ad0f..a545b656 100644
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_master %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
@@ -138,7 +144,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#master_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_master %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
     $.ajax({type: "POST",
       url: "<%= origami_payment_master_path  %>",
       data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index f58ca552..59bc932f 100644
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_mpu %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
@@ -138,7 +144,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#mpu_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_mpu %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
 	    $.ajax({type: "POST",
 	      url: "<%= origami_payment_mpu_path  %>",
 	      data: "amount="+ amount + "&sale_id="+ sale_id,
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index e01ca696..81640c68 100644
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -96,6 +96,12 @@
 </div>
 
 <script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_visa %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
 $(document).on('click', '.cashier_number', function(event){
         event.stopPropagation();
         event.preventDefault();
@@ -138,7 +144,7 @@ $(document).on('click', '.cashier_number', function(event){
   $('#visa_pay').on('click',function(){
     var amount = $('#amount').text();
     var sale_id = "<%= @sale_id %>";
-		if(parseFloat(amount) <= "<%= @can_visa %>"){
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value"))){
     $.ajax({type: "POST",
       url: "<%= origami_payment_visa_path  %>",
       data: "amount="+ amount + "&sale_id="+ sale_id,

From a204afda6a405050228745d9c25dc98f90d7b55b Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Sun, 18 Jun 2017 13:19:07 +0630
Subject: [PATCH 3/3] Discount added in Rebate

---
 app/models/sale_item.rb | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb
index ef852bbd..c49e9317 100644
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -35,11 +35,13 @@ class SaleItem < ApplicationRecord
     beverage_prices=0
 
     sale_items.each do |si|
-      food_price, beverage_price = self.get_price(si.sale_item_id)            
+      food_price, beverage_price = self.get_price(si.sale_item_id)
 
       food_prices = food_prices + food_price
       beverage_prices = beverage_prices + beverage_price
     end
+    puts food_prices
+    puts beverage_prices
     return food_prices, beverage_prices
   end
 
@@ -52,11 +54,22 @@ class SaleItem < ApplicationRecord
                           .where("sale_items.sale_item_id=?", sale_item_id.to_s)
     if item[0].account_id == 1
       food_price = item[0].price
-    else 
+    else
       beverage_price = item[0].price
     end
 
-    return food_price, beverage_price                       
+    return food_price, beverage_price
+  end
+
+  def self.get_overall_discount(sale_id)
+    price = 0.0
+    item=SaleItem.where("product_code=?", sale_id)
+
+    item.each do|i|
+      price += i.price
+    end
+
+    return price
   end
 
   private