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

fixed conflict after merch dev for current shop

Browse Source
This commit is contained in:
Nweni
2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/origami/table_invoices_controller.rb
View File

@@ -1,6 +1,8 @@
class Origami::TableInvoicesController < BaseOrigamiController
def index
@table = DiningFacility.find(params[:table_id])
shop = Shop.current_shop
@sale_array = Array.new
@table.bookings.each do |booking|
@@ -28,10 +30,10 @@ class Origami::TableInvoicesController < BaseOrigamiController
def show
@table = DiningFacility.find(params[:table_id])
@membership = MembershipSetting.find_by_shop_code(@shop.shop_code)
@payment_methods = PaymentMethodSetting.where("shop_code='#{@shop.shop_code}'")
# shop = Shop.first
@membership = MembershipSetting::MembershipSetting
@payment_methods = PaymentMethodSetting.all
shop = Shop.current_shop
@sale_array = Array.new
@table.bookings.each do |booking|
if booking.sale_id.nil?