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/controllers/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -14,7 +14,7 @@ class Origami::DashboardController < BaseOrigamiController
        @sale_data.push({payment.payment_method => pay.payment_amount})
      end
    else
-        @sale_data = nil
+      @sale_data = nil
    end

    @summ_sale              = Sale.summary_sale_receipt(current_user)
@@ -35,7 +35,7 @@ class Origami::DashboardController < BaseOrigamiController
      end
      @total_accounts = @total_accounts.reject.with_index { |x, i| @account_data[i].nil? }
    else
-        @account_data = nil
+      @account_data = nil
    end