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

fixed conflit

Browse Source
This commit is contained in:
NyanLinHtut
2019-12-13 10:09:25 +06:30
parent c6c605bb01 79598c0126
commit afe3c995ae
317 changed files with 17947 additions and 3204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/accounts_controller.rb
View File

@@ -5,6 +5,7 @@ class Settings::AccountsController < ApplicationController
# GET /settings/accounts
# GET /settings/accounts.json
def index
@settings_accounts = Account.all.where("shop_code='#{@shop.shop_code}'")
end
@@ -25,6 +26,7 @@ class Settings::AccountsController < ApplicationController
# POST /settings/accounts
# POST /settings/accounts.json
def create
@settings_account = Account.new(account_params)
@settings_account.shop_code = @shop.shop_code
respond_to do |format|

3
app/controllers/settings/cashier_terminals_controller.rb
View File

@@ -5,7 +5,7 @@ class Settings::CashierTerminalsController < ApplicationController
# GET /settings/cashier_terminals
# GET /settings/cashier_terminals.json
def index
@settings_cashier_terminals = CashierTerminal.all
@settings_cashier_terminals = CashierTerminal.where("shop_code=?",@shop.shop_code)
end
# GET /settings/cashier_terminals/1
@@ -27,6 +27,7 @@ class Settings::CashierTerminalsController < ApplicationController
# POST /settings/cashier_terminals
# POST /settings/cashier_terminals.json
def create
@settings_cashier_terminal = CashierTerminal.new(settings_cashier_terminal_params)
@settings_cashier_terminal.shop_code = @shop.shop_code
respond_to do |format|

2
app/controllers/settings/commissioners_controller.rb
View File

@@ -28,6 +28,7 @@ class Settings::CommissionersController < ApplicationController
# POST /commissioners
# POST /commissioners.json
def create
@commissioner = Commissioner.new(commissioner_params)
@commissioner.created_by = current_user.id
@commissioner.shop_code = @shop.shop_code
@@ -37,7 +38,6 @@ class Settings::CommissionersController < ApplicationController
unless @commissioner.resigned_date.nil?
@commissioner.resigned_date = @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d')
end
# puts params[:from_induty].length
if (params[:from_induty] != "true")
respond_to do |format|
if @commissioner.save

1
app/controllers/settings/commissions_controller.rb
View File

@@ -28,6 +28,7 @@ class Settings::CommissionsController < ApplicationController
# POST /commissions
# POST /commissions.json
def create
@commission = Commission.new(commission_params)
@commission.product_type = 'menu_item'
@commission.product_code = "[]"

2
app/controllers/settings/employees_controller.rb
View File

@@ -31,7 +31,7 @@ class Settings::EmployeesController < ApplicationController
# POST /employees.json
def create
@employee = Employee.new(employee_params)
@employee.shop_code = @shop.shop_code
@employee.shop_code =current_shop.shop_code
respond_to do |format|
if @employee.save
format.html { redirect_to settings_employees_path, notice: 'Employee was successfully created.' }

2
app/controllers/settings/lookups_controller.rb
View File

@@ -25,7 +25,7 @@ class Settings::LookupsController < ApplicationController
# POST /settings/lookups.json
def create
@settings_lookup = Lookup.new(settings_lookup_params)
@settings_lookup.shop_code = @shop.shop_code
@settings_lookup.shop_code = current_shop.shop_code
respond_to do |format|
if @settings_lookup.save
format.html { redirect_to settings_lookups_path, notice: 'Lookup was successfully created.' }

1
app/controllers/settings/membership_actions_controller.rb
View File

@@ -25,6 +25,7 @@ class Settings::MembershipActionsController < ApplicationController
# POST /settings/membership_actions
# POST /settings/membership_actions.json
def create
@settings_membership_action = MembershipAction.new(settings_membership_action_params)
@settings_membership_action.shop_code = @shop.shop_code
respond_to do |format|

1
app/controllers/settings/membership_settings_controller.rb
View File

@@ -25,6 +25,7 @@ class Settings::MembershipSettingsController < ApplicationController
# POST /settings/membership_settings
# POST /settings/membership_settings.json
def create
@settings_membership_setting = MembershipSetting.new(settings_membership_setting_params)
@settings_membership_setting.shop_code = @shop.shop_code
respond_to do |format|

3
app/controllers/settings/menus_controller.rb
View File

@@ -5,6 +5,7 @@ class Settings::MenusController < ApplicationController
# GET /settings/menus
# GET /settings/menus.json
def index
@settings_menus = Menu.all.where("shop_code='#{@shop.shop_code}'").page(params[:page]).per(10)
respond_to do |format|
format.html
@@ -30,6 +31,7 @@ class Settings::MenusController < ApplicationController
# POST /settings/menus
# POST /settings/menus.json
def create
@settings_menu = Menu.new(settings_menu_params)
@settings_menu.created_by = current_login_employee.name
@settings_menu.shop_code = @shop.shop_code
@@ -74,6 +76,7 @@ class Settings::MenusController < ApplicationController
end
def export
@settings_menus = Menu.all.where("shop_code='#{@shop.shop_code}'").page(params[:page]).per(10)
menu = Menu.find(params[:id])

1
app/controllers/settings/order_queue_stations_controller.rb
View File

@@ -29,6 +29,7 @@ class Settings::OrderQueueStationsController < ApplicationController
# POST /settings/order_queue_stations
# POST /settings/order_queue_stations.json
def create
@settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
@settings_order_queue_station.created_by = current_login_employee.name
@settings_order_queue_station.processing_items = "[]"

1
app/controllers/settings/payment_method_settings_controller.rb
View File

@@ -41,7 +41,6 @@ class Settings::PaymentMethodSettingsController < ApplicationController
# PATCH/PUT /settings/payment_method_settings/1
# PATCH/PUT /settings/payment_method_settings/1.json
def update
puts settings_payment_method_setting_params
respond_to do |format|
if @settings_payment_method_setting.update(settings_payment_method_setting_params)
format.html { redirect_to settings_payment_method_setting_path(@settings_payment_method_setting), notice: 'Payment method setting was successfully updated.' }

2
app/controllers/settings/products_controller.rb
View File

@@ -26,7 +26,7 @@ load_and_authorize_resource except: [:create]
# POST /settings/products
# POST /settings/products.json
def create
@settings_product = Product.new(settings_product_params)
@settings_product.created_by = current_user.name
@settings_product.shop_code = @shop.shop_code

3
app/controllers/settings/promotions_controller.rb
View File

@@ -28,6 +28,7 @@ class Settings::PromotionsController < ApplicationController
# POST /promotions
# POST /promotions.json
def create
@promotion = Promotion.new(promotion_params)
@promotion.created_by = current_login_employee.id
@promotion.shop_code = @shop.shop_code
@@ -117,8 +118,6 @@ class Settings::PromotionsController < ApplicationController
end
res.push({item_inst.menu_item.item_code => arr_inst})
end
puts "res"
p res
render json: res
end

2
app/controllers/settings/rooms_controller.rb
View File

@@ -25,6 +25,7 @@ class Settings::RoomsController < ApplicationController
# POST /settings/rooms
# POST /settings/rooms.json
def create
@settings_room = Room.new(settings_room_params)
@settings_room.type = DiningFacility::ROOM_TYPE
@settings_room.zone_id = params[:zone_id]
@@ -35,7 +36,6 @@ class Settings::RoomsController < ApplicationController
format.html { redirect_to settings_zone_path(@zone), notice: 'Room was successfully created.' }
format.json { render :show, status: :created, location: @settings_room }
else
puts "abc"
format.html { render :new }
format.json { render json: @settings_room.errors, status: :unprocessable_entity }
end

11
app/controllers/settings/shops_controller.rb
View File

@@ -56,14 +56,15 @@ class Settings::ShopsController < ApplicationController
audio_data = @settings_shop.display_images.find_by_name("order_audio").image
delete_path = Rails.root.join("public/#{audio_data}")
if File.exists?(delete_path)
File.delete(delete_path)
end
end
save_path = Rails.root.join("public/#{current_shop.shop_code}_#{a.original_filename}")
File.delete(delete_path)
end
end
save_path = Rails.root.join("public/#{@shop.shop_code}_#{a.original_filename}")
File.open(save_path, 'wb') do |f|
f.write a.read
end
audio_name = "#{current_shop.shop_code}_#{a.original_filename}"
audio_name = "#{@shop.shop_code}_#{a.original_filename}"
@settings_shop.display_images.where(:name => "order_audio").destroy_all
@display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :name => "order_audio", :image => audio_name)
else

1
app/controllers/settings/tables_controller.rb
View File

@@ -25,6 +25,7 @@ class Settings::TablesController < ApplicationController
# POST /settings/tables
# POST /settings/tables.json
def create
@settings_table = Table.new(settings_table_params)
@settings_table.type = DiningFacility::TABLE_TYPE
@settings_table.zone_id = params[:zone_id]

1
app/controllers/settings/tax_profiles_controller.rb
View File

@@ -45,6 +45,7 @@ class Settings::TaxProfilesController < ApplicationController
# POST /settings/tax_profiles
# POST /settings/tax_profiles.json
def create
@settings_tax_profile = TaxProfile.new(settings_tax_profile_params)
@settings_tax_profile.created_by = current_login_employee.name
@settings_tax_profile.shop_code = @shop.shop_code

2
app/controllers/settings/zones_controller.rb
View File

@@ -5,6 +5,7 @@ class Settings::ZonesController < ApplicationController
# GET /settings/zones
# GET /settings/zones.json
def index
@settings_zones = Zone.all.where("shop_code='#{@shop.shop_code}' and is_active= true")
end
@@ -27,6 +28,7 @@ class Settings::ZonesController < ApplicationController
# POST /settings/zones
# POST /settings/zones.json
def create
@settings_zone = Zone.new(settings_zone_params)
@settings_zone.shop_code =@shop.shop_code
@settings_zone.created_by = current_login_employee.name