shop code

2019-11-22 18:24:02 +06:30
parent 5a3f328789
commit d1ab2c194d
106 changed files with 834 additions and 895 deletions
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -89,8 +89,8 @@ class Transactions::SalesController < ApplicationController
  # GET /transactions/sales/1
  # GET /transactions/sales/1.json
  def show
-    @membership = MembershipSetting::MembershipSetting
-    @payment_methods = PaymentMethodSetting.where("is_active='1'")
+    @membership = MembershipSetting.find_by_shop_code(@shop.shop_code)
+    @payment_methods = PaymentMethodSetting.where("shop_code='#{@shop.shop_code}' and is_active='1'")
    @sale = Sale.find(params[:id])

    @order_items = []