Merge branch 'r-1902001-01' into foodcourt

2020-07-11 04:00:55 +06:30
parent 4b0d7294ae 13fcb69dee
commit 2ee1fc2423
99 changed files with 2085 additions and 1781 deletions
--- a/app/models/sale_audit.rb
+++ b/app/models/sale_audit.rb
@@ -142,8 +142,9 @@ class SaleAudit < ApplicationRecord
      if paymal[0]
        remark = paymal[0].remark.split("}")
        response = "["+remark[0]+'}]'
-        response = JSON.parse(response)
        # puts response
+        # response = JSON.parse(response)
+
        if response[0]["status"]  == true
          if response[0]["current_rebate_amount"].present?
            amount = response[0]["current_rebate_amount"]