git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update settings shops

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-01-31 15:15:01 +06:30
parent f0affaf3f2
commit f251d4b4e5
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/shops_controller.rb
View File

@@ -3,7 +3,7 @@ class Api::ShopsController < Api::ApiController
skip_before_action :set_current_tenant_by_subdomain_or_name, only: [:index, :show] skip_before_action :set_current_tenant_by_subdomain_or_name, only: [:index, :show]
def index def index
@shops = Shop.select('id,logo,name,shop_code,address,phone_no').all @shops = Shop.select('id, logo, name, shop_code').all
end end
def show def show
@@ -11,6 +11,6 @@ class Api::ShopsController < Api::ApiController
end end
def get_tax_profiles def get_tax_profiles
@inclusive_tax,@exclusive_tax = TaxProfile.calculate_tax("online_order") @inclusive_tax, @exclusive_tax = TaxProfile.calculate_tax("online_order")
end end
end end

1
app/models/application_record.rb
View File

@@ -5,7 +5,6 @@ class ApplicationRecord < ActiveRecord::Base
super super
return unless subclass.superclass == self return unless subclass.superclass == self
return unless subclass.name != "Shop"
return unless subclass.column_names.include? 'shop_code' return unless subclass.column_names.include? 'shop_code'
subclass.class_eval do subclass.class_eval do