change dashboard data

app/controllers/home_controller.rb

@@ -86,10 +86,10 @@ class HomeController < ApplicationController
     @total_payment_methods.each do |payment|
       if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb"
         pay = Sale.payment_sale('card', today)
-        @sale_data.push({'card' => pay})
+        @sale_data.push({'card' => pay.payment_amount})
       else 
         pay = Sale.payment_sale(payment.payment_method, today)
-        @sale_data.push({payment.payment_method => pay})
+        @sale_data.push({payment.payment_method => pay.payment_amount})
       end
     end
     @summ_sale              = Sale.summary_sale_receipt(today)

app/models/sale.rb

@@ -1038,7 +1038,7 @@ end
           else
             query = query.where("sales.sale_status = 'completed' and sp.payment_method = '#{payment_method}' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           end
-          query.sum("sp.payment_amount")
+          query.select("(CASE WHEN sp.payment_method='cash' THEN (SUM(sp.payment_amount) - SUM(sales.amount_changed)) ELSE SUM(sp.payment_amount) END) as payment_amount").first()
   end
 
   def self.total_customer(today)

app/views/home/dashboard.html.erb

@@ -163,7 +163,7 @@
                       <% total_card = 0.0 %>
                       <% @sale_data.each do |data| %>
                         <% total_card = data["card"] %>
-                      <% break end %>
+                      <% end %>
                       <%= total_card.to_f %>
                     </td>
                   </tr>