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/origami/dashboard_controller.rb
+++ b/app/controllers/origami/dashboard_controller.rb
@@ -1,8 +1,6 @@
 class Origami::DashboardController < BaseOrigamiController

  def index
-
-    @shop = Shop.current_shop
    @display_type = Lookup.find_by_lookup_type("display_type")

    @sale_data = Array.new
@@ -114,7 +112,7 @@ def get_all_menu
 end

 def get_credit_sales
-  credit_sales = SalePayment.get_credit_sales(params,Shop.current_shop.shop_code)
+  credit_sales = SalePayment.get_credit_sales(params,@shop.shop_code)
  if !credit_sales.nil?
    result = {:status=> true, :data=> credit_sales }
  else