diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb
index 9977850f..a633c9e1 100644
--- a/app/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -18,42 +18,42 @@ class Origami::DashboardController < BaseOrigamiController
                     # .sum('(CASE WHEN sp.payment_method="cash" THEN (sp.payment_amount - sales.amount_changed) ELSE sp.payment_amount END)')
     # @inventories    = StockJournal.inventory_balances(today).sum(:balance)
 
-    @total_sale     = Sale.total_sale(today)
-    @total_count    = Sale.total_count(today)
-    @total_card     = Sale.total_card_sale(today)
-    @total_credit   = Sale.credit_payment(today)
+    @total_sale     = Sale.total_sale(today,current_user)
+    @total_count    = Sale.total_count(today,current_user)
+    @total_card     = Sale.total_card_sale(today,current_user)
+    @total_credit   = Sale.credit_payment(today,current_user)
 
     @sale_data = Array.new
-    @total_payment_methods = Sale.total_payment_methods(today)
+    @total_payment_methods = Sale.total_payment_methods(today,current_user)
 
     @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)
+        pay = Sale.payment_sale('card', today, current_user)
         @sale_data.push({'card' => pay.payment_amount})
       else 
-        pay = Sale.payment_sale(payment.payment_method, today)
+        pay = Sale.payment_sale(payment.payment_method, today, current_user)
         @sale_data.push({payment.payment_method => pay.payment_amount})
       end
     end
-    @summ_sale              = Sale.summary_sale_receipt(today)
-    @total_customer         = Sale.total_customer(today)
-    @total_dinein           = Sale.total_dinein(today)
-    @total_takeaway         = Sale.total_takeaway(today)
-    @total_other_customer   = Sale.total_other_customer(today)
-    @total_membership       = Sale.total_membership(today)
+    @summ_sale              = Sale.summary_sale_receipt(today,current_user)
+    @total_customer         = Sale.total_customer(today,current_user)
+    @total_dinein           = Sale.total_dinein(today,current_user)
+    @total_takeaway         = Sale.total_takeaway(today,current_user)
+    @total_other_customer   = Sale.total_other_customer(today,current_user)
+    @total_membership       = Sale.total_membership(today,current_user)
 
-    @total_order            = Sale.total_order(today)
-    @total_accounts         = Sale.total_account(today)
+    @total_order            = Sale.total_order(today,current_user)
+    @total_accounts         = Sale.total_account(today,current_user)
     @account_data = Array.new
     @total_accounts.each do |account|
-      acc = Sale.account_data(account.account_id, today)
+      acc = Sale.account_data(account.account_id, today,current_user)
       if !acc.nil?
         @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc})
       end
     end
 
-    @top_items         = Sale.top_items(today)
-    @total_foc_items   = Sale.total_foc_items(today) 
+    @top_items         = Sale.top_items(today,current_user)
+    @total_foc_items   = Sale.total_foc_items(today,current_user) 
 
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ae7245a4..fb4824ec 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -570,8 +570,8 @@ var customer_name = "<%= @customer.name %>";
         
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
-          console.log(payment_type)
-          console.log(parseInt(jQuery.inArray("MPU", payment_type)))
+          // console.log(payment_type)
+          // console.log(parseInt(jQuery.inArray("MPU", payment_type)))
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -636,7 +636,7 @@ var customer_name = "<%= @customer.name %>";
     $('#pay').click(function() {
       sub_total = $('#sub-total').text();
       member = $('#membership_id').text();
-      console.log(member)
+      // console.log(member)
       if (parseInt(jQuery.inArray("MPU", payment_type)) != -1 && $('.mpu').text() == 0 && sub_total != 0.0 && member) {
           swal("Oops","Please Pay with MPU Payment","warning");
       }else if(parseInt(jQuery.inArray("Redeem", payment_type)) != -1 && $('#ppamount').text()==0 && sub_total != 0.0 && member){
@@ -1195,7 +1195,7 @@ var customer_name = "<%= @customer.name %>";
           url: url,
           data: {},
           success: function (result) {
-            console.log(result)
+            // console.log(result)
              if (result.status == true) {
               createAccessCode(code);
                if (type == "edit") {
@@ -1330,7 +1330,7 @@ var customer_name = "<%= @customer.name %>";
           url: url,
           data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code,
           success: function (result) {
-            console.log(result)
+            // console.log(result)
                    // For Server Print - from jade
                    if ($("#server_mode").val() == "cloud") {
                     code2lab.printFile(result.filepath.substr(6), result.printer_url);