update settings shops

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

View File

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

View File

@@ -57,9 +57,9 @@ class Settings::ShopsController < ApplicationController
delete_path = Rails.root.join("public/#{audio_data}")
if File.exists?(delete_path)
File.delete(delete_path)
end
end
File.delete(delete_path)
end
end
save_path = Rails.root.join("public/#{current_shop.shop_code}_#{a.original_filename}")
File.open(save_path, 'wb') do |f|
f.write a.read

View File

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