shop code

2019-12-10 15:18:48 +06:30
parent c606ca73db
commit 79598c0126
115 changed files with 247 additions and 396 deletions
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -2,7 +2,6 @@ class Reports::CommissionController < BaseReportController
  # authorize_resource :class => false

  def index
-    @shop = Shop.current_shop
    from_date, to_date  = get_date_range_from_params

    commissioner = params[:commissioner].to_i
@@ -22,7 +21,6 @@ class Reports::CommissionController < BaseReportController
  end

  def show
-    @shop = Shop.current_shop
    from, to  = get_date_range_from_params

    @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED).where("shift_sales.shop_code='#{@shop.shop_code}'")