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

Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
phyusin
2018-03-14 09:16:14 +06:30
parent 69fcdb7e03 84fe089568
commit 0edc92d066
110 changed files with 1354 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/origami/addorders_controller.rb
View File

@@ -226,9 +226,4 @@ class Origami::AddordersController < BaseOrigamiController
# @dining = DiningFacility.find(params[:id])
# end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/bank_integration_controller.rb
View File

@@ -96,9 +96,4 @@ class Origami::BankIntegrationController < ApplicationController #BaseOrigamiCon
render json: response
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/card_payments_controller.rb
View File

@@ -24,9 +24,4 @@ class Origami::CardPaymentsController < BaseOrigamiController
def create
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/cash_ins_controller.rb
View File

@@ -14,10 +14,5 @@ class Origami::CashInsController < BaseOrigamiController
shift.cash_in = shift.cash_in + amount.to_i
shift.save
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/cash_mgmt_controller.rb
View File

@@ -8,9 +8,4 @@ class Origami::CashMgmtController < ApplicationController
def create
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/cash_outs_controller.rb
View File

@@ -13,9 +13,4 @@ class Origami::CashOutsController < BaseOrigamiController
shift.save
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/check_in_process_controller.rb
View File

@@ -36,9 +36,4 @@ class Origami::CheckInProcessController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/credit_payments_controller.rb
View File

@@ -47,10 +47,4 @@ class Origami::CreditPaymentsController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/customers_controller.rb
View File

@@ -141,10 +141,5 @@ class Origami::CustomersController < BaseOrigamiController
render json: JSON.generate({:status => false, :error_message => "Record not found"})
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

4
app/controllers/origami/dashboard_controller.rb
View File

@@ -58,8 +58,4 @@ class Origami::DashboardController < BaseOrigamiController
@current_user = current_user
end
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/discounts_controller.rb
View File

@@ -355,9 +355,5 @@ class Origami::DiscountsController < BaseOrigamiController
# redirect_to origami_path(sale_id)
# end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

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

@@ -136,12 +136,6 @@ class Origami::HomeController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
private
def set_dining

5
app/controllers/origami/home_controller_bk.rb
View File

@@ -81,9 +81,4 @@ class Origami::HomeController < ApplicationController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/in_duties_controller.rb
View File

@@ -169,9 +169,4 @@ class Origami::InDutiesController < BaseOrigamiController
params.require(:in_duty).permit(:id, :dinning_id, :commissioner_ids, :in_time, :out_time)
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/jcb_controller.rb
View File

@@ -9,6 +9,7 @@ class Origami::JcbController < BaseOrigamiController
@jcbcount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
@@ -58,9 +59,4 @@ class Origami::JcbController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/master_controller.rb
View File

@@ -9,6 +9,7 @@ class Origami::MasterController < BaseOrigamiController
@mastercount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
@@ -57,9 +58,4 @@ class Origami::MasterController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/moveroom_controller.rb
View File

@@ -35,11 +35,5 @@ class Origami::MoveroomController < BaseOrigamiController
end
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/movetable_controller.rb
View File

@@ -70,10 +70,5 @@ class Origami::MovetableController < BaseOrigamiController
@get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

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

@@ -7,7 +7,8 @@ class Origami::MpuController < BaseOrigamiController
total = sale_data.grand_total
@mpucount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
@@ -57,9 +58,4 @@ class Origami::MpuController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

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

@@ -80,10 +80,5 @@ class Origami::OrdersController < BaseOrigamiController
end
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/other_charges_controller.rb
View File

@@ -76,10 +76,5 @@ class Origami::OtherChargesController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/others_payments_controller.rb
View File

@@ -37,9 +37,4 @@ class Origami::OthersPaymentsController < BaseOrigamiController
def create
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/payments_controller.rb
View File

@@ -511,10 +511,4 @@ class Origami::PaymentsController < BaseOrigamiController
render :json => {status: true}
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/paypar_payments_controller.rb
View File

@@ -29,9 +29,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/pending_order_controller.rb
View File

@@ -41,9 +41,4 @@ class Origami::PendingOrderController < BaseOrigamiController
end
end
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/product_commissions_controller.rb
View File

@@ -137,9 +137,4 @@ class Origami::ProductCommissionsController < BaseOrigamiController
params.fetch(:product_commission, {})
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

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

@@ -6,6 +6,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
@membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(@sale_id)
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
# if @shop.is_rounding_adj
# new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
@@ -68,10 +69,5 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
end
@out = false, 0
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/request_bills_controller.rb
View File

@@ -58,10 +58,5 @@ class Origami::RequestBillsController < ApplicationController
# printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/room_invoices_controller.rb
View File

@@ -37,9 +37,4 @@ class Origami::RoomInvoicesController < BaseOrigamiController
@customer = @sale.customer
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

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

@@ -136,9 +136,4 @@ class Origami::RoomsController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/sale_edit_controller.rb
View File

@@ -196,10 +196,5 @@ class Origami::SaleEditController < BaseOrigamiController
ProductCommission.remove_product_commission(item)
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/sales_controller.rb
View File

@@ -56,9 +56,4 @@ class Origami::SalesController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/shifts_controller.rb
View File

@@ -125,9 +125,4 @@ class Origami::ShiftsController < BaseOrigamiController
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/split_bill_controller.rb
View File

@@ -366,11 +366,4 @@ class Origami::SplitBillController < BaseOrigamiController
render :json => { status: true }
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/surveys_controller.rb
View File

@@ -90,10 +90,5 @@ class Origami::SurveysController < BaseOrigamiController
def survey_params
params.require(:survey).permit(:child, :adult,:male,:female,:local,:foreigner, :dining_name,:receipt_no,:shift_id,:created_by,:total_customer,:total_amount,:survey_id)
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

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

@@ -70,9 +70,4 @@ class Origami::TableInvoicesController < BaseOrigamiController
@print_settings = PrintSetting.get_precision_delimiter()
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/unionpay_controller.rb
View File

@@ -8,6 +8,7 @@ class Origami::UnionpayController < BaseOrigamiController
@unionpaycount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
@@ -57,9 +58,4 @@ class Origami::UnionpayController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

6
app/controllers/origami/visa_controller.rb
View File

@@ -8,6 +8,7 @@ class Origami::VisaController < BaseOrigamiController
@visacount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)
@@ -57,9 +58,4 @@ class Origami::VisaController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

7
app/controllers/origami/void_controller.rb
View File

@@ -134,10 +134,5 @@ class Origami::VoidController < BaseOrigamiController
end
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end

5
app/controllers/origami/voucher_controller.rb
View File

@@ -78,9 +78,4 @@ class Origami::VoucherController < BaseOrigamiController
end
end
#Shop Name in Navbor
helper_method :shop_detail
def shop_detail
@shop = Shop.first
end
end