fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -96,7 +96,7 @@ class HomeController < ApplicationController
  def dashboard
    @from, @to = get_date_range_from_params

-    @shop = Shop.first
+    @shop = Shop.current_shop

    @orders = Sale.receipt_date_between(@from, @to).where("payment_status = 'new' and sale_status = 'bill'")
    @sales = Sale.receipt_date_between(@from, @to).completed