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

conflict data

Browse Source
This commit is contained in:
phyusin
2018-02-14 14:24:01 +06:30
parent f19fb769f6 91aa216666
commit 4203aa995e
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/home_controller.rb
View File

@@ -45,6 +45,7 @@ class Origami::HomeController < BaseOrigamiController
end end
end end
else else
if !booking.sale_id.nil?
sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
if sale.sale_status !='completed' if sale.sale_status !='completed'
if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
@@ -56,6 +57,7 @@ class Origami::HomeController < BaseOrigamiController
end end
end end
end end
end
@dining.bookings.active.each do |booking| @dining.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'

2
app/controllers/origami/orders_controller.rb
View File

@@ -46,6 +46,7 @@ class Origami::OrdersController < BaseOrigamiController
end end
end end
else else
if !booking.sale_id.nil?
sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
if sale.sale_status !='completed' if sale.sale_status !='completed'
if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
@@ -58,6 +59,7 @@ class Origami::OrdersController < BaseOrigamiController
end end
end end
end end
end
#Shop Name in Navbor #Shop Name in Navbor
helper_method :shop_detail helper_method :shop_detail

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

@@ -41,6 +41,7 @@ class Origami::RoomsController < BaseOrigamiController
end end
end end
else else
if !booking.sale_id.nil?
sale = Sale.find(booking.sale_id) sale = Sale.find(booking.sale_id)
if sale.sale_status !='completed' if sale.sale_status !='completed'
if !@order_items_count.key?(booking.dining_facility_id) if !@order_items_count.key?(booking.dining_facility_id)
@@ -52,6 +53,7 @@ class Origami::RoomsController < BaseOrigamiController
end end
end end
end end
end
@room.bookings.active.each do |booking| @room.bookings.active.each do |booking|
if booking.sale_id.nil? && booking.booking_status != 'moved' if booking.sale_id.nil? && booking.booking_status != 'moved'

12
db/sym_master.sql
View File

@@ -121,6 +121,10 @@ delete from sym_node;
(trigger_id,source_table_name,channel_id,last_update_time,create_time) (trigger_id,source_table_name,channel_id,last_update_time,create_time)
values('tax_profiles','customers','setting',current_timestamp,current_timestamp); values('tax_profiles','customers','setting',current_timestamp,current_timestamp);
insert into sym_trigger
(trigger_id,source_table_name,channel_id,last_update_time,create_time)
values('display_images','customers','setting',current_timestamp,current_timestamp);
# Create Trigger for Dining Channel # Create Trigger for Dining Channel
insert into sym_trigger insert into sym_trigger
@@ -367,6 +371,10 @@ delete from sym_node;
(trigger_id,router_id,initial_load_order,last_update_time,create_time) (trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('tax_profiles','cloud_2_sx', 100, current_timestamp, current_timestamp); values('tax_profiles','cloud_2_sx', 100, current_timestamp, current_timestamp);
insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('display_images','cloud_2_sx', 100, current_timestamp, current_timestamp);
# Setting Channel # From Master to cloud # Setting Channel # From Master to cloud
insert into sym_trigger_router insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time) (trigger_id,router_id,initial_load_order,last_update_time,create_time)
@@ -400,6 +408,10 @@ delete from sym_node;
(trigger_id,router_id,initial_load_order,last_update_time,create_time) (trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('tax_profiles','sx_2_cloud', 100, current_timestamp, current_timestamp); values('tax_profiles','sx_2_cloud', 100, current_timestamp, current_timestamp);
insert into sym_trigger_router
(trigger_id,router_id,initial_load_order,last_update_time,create_time)
values('display_images','sx_2_cloud', 100, current_timestamp, current_timestamp);
#End Setting Channel #End Setting Channel
# Dining Channel # From cloud to SX # Dining Channel # From cloud to SX