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

merge with staging

Browse Source
This commit is contained in:
Yan
2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ class Origami::AddordersController < BaseOrigamiController
if (params[:id])
#Pull this menu
@menu = MenuCategory.find_by_id(params[:id])
puts @menu.menu_items[1].item_attributes.to_json
# puts @menu.menu_items[1].item_attributes.to_json
return @menu
else
MenuCategory.current_menu

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

@@ -1,6 +1,4 @@
class Origami::CardPaymentsController < ApplicationController#BaseOrigamiController
class Origami::CardPaymentsController < ApplicationController #BaseOrigamiController
def index
@membership_rebate_balance = 0
@membership_id = 0

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

@@ -1,5 +1,4 @@
class Origami::CashInsController < ApplicationController#BaseOrigamiController
class Origami::CashInsController < ApplicationController #BaseOrigamiController
def new
end

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

@@ -1,5 +1,4 @@
class Origami::CashOutsController < ApplicationController#BaseOrigamiController
def new
end

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

@@ -1,6 +1,4 @@
class Origami::CreditPaymentsController < ApplicationController#BaseOrigamiController
class Origami::CreditPaymentsController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::CustomersController < ApplicationController#BaseOrigamiController
class Origami::CustomersController < ApplicationController #BaseOrigamiController
load_and_authorize_resource
def index
end

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

@@ -1,4 +1,4 @@
class Origami::DiscountsController < ApplicationController#BaseOrigamiController
class Origami::DiscountsController < ApplicationController #BaseOrigamiController
authorize_resource :class => false
#discount page show from origami index with selected order

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

@@ -1,4 +1,4 @@
class Origami::HomeController < ApplicationController#BaseOrigamiController
class Origami::HomeController < ApplicationController #BaseOrigamiController
before_action :set_dining, only: [:show]
def index

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

@@ -1,4 +1,4 @@
class Origami::HomeController < BaseOrigamiController
class Origami::HomeController < ApplicationController
def index
if params[:booking_id] != nil
type=params[:booking_id].split('-')[0];

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

@@ -1,4 +1,4 @@
class Origami::InDutiesController < ApplicationController#BaseOrigamiController
class Origami::InDutiesController < ApplicationController #BaseOrigamiController
before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
# GET /in_duties

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

@@ -1,4 +1,4 @@
class Origami::JcbController < ApplicationController#BaseOrigamiController
class Origami::JcbController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::MasterController < ApplicationController#BaseOrigamiController
class Origami::MasterController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]

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

@@ -1,5 +1,5 @@
class Origami::MoveroomController < ApplicationController#BaseOrigamiController
class Origami::MoveroomController < ApplicationController #BaseOrigamiController
authorize_resource :class => false
def move_dining

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

@@ -1,5 +1,5 @@
class Origami::MovetableController < ApplicationController#BaseOrigamiController
class Origami::MovetableController < ApplicationController #BaseOrigamiController
authorize_resource :class => false
def move_dining

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

@@ -1,5 +1,4 @@
class Origami::MpuController < ApplicationController#BaseOrigamiController
class Origami::MpuController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]

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

@@ -1,5 +1,4 @@
class Origami::OrdersController < ApplicationController#BaseOrigamiController
class Origami::OrdersController < ApplicationController #BaseOrigamiController
def show
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')

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

@@ -1,4 +1,4 @@
class Origami::OtherChargesController < ApplicationController#BaseOrigamiController
class Origami::OtherChargesController < ApplicationController #BaseOrigamiController
authorize_resource :class => false
def index

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

@@ -1,6 +1,4 @@
class Origami::OthersPaymentsController < ApplicationController#BaseOrigamiController
class Origami::OthersPaymentsController < ApplicationController #BaseOrigamiController
def index
@membership_rebate_balance = 0
@sale_id = params[:sale_id]

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

@@ -1,5 +1,4 @@
class Origami::PaymentsController < ApplicationController#BaseOrigamiController
class Origami::PaymentsController < ApplicationController #BaseOrigamiController
authorize_resource :class => false
def index
end

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

@@ -1,4 +1,4 @@
class Origami::ProductCommissionsController < ApplicationController#BaseOrigamiController
class Origami::ProductCommissionsController < ApplicationController #BaseOrigamiController
before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
# GET /product_commissions

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

@@ -1,4 +1,4 @@
class Origami::RedeemPaymentsController < ApplicationController#BaseOrigamiController
class Origami::RedeemPaymentsController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]
payment_method = params[:payment_method]

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

@@ -1,4 +1,4 @@
class Origami::RequestBillsController < BaseOrigamiController
class Origami::RequestBillsController < ApplicationController
# Print Request Bill and add to sale tables
def print
@@ -24,6 +24,9 @@ class Origami::RequestBillsController < BaseOrigamiController
# Bind shift sale id to sale
@sale_data.shift_sale_id = shift.id
@sale_data.save
# Promotion Activation
Promotion.promo_activate(@sale)
else
@status = false
@error_message = "No Current Open Shift for This Employee"

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

@@ -1,4 +1,4 @@
class Origami::RoomInvoicesController < ApplicationController#BaseOrigamiController
class Origami::RoomInvoicesController < ApplicationController #BaseOrigamiController
def index
@room = DiningFacility.find(params[:room_id])
puts "room bookig lenght"

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

@@ -1,5 +1,4 @@
class Origami::RoomsController < ApplicationController#BaseOrigamiController
class Origami::RoomsController < ApplicationController #BaseOrigamiController
def index
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')

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

@@ -1,4 +1,4 @@
class Origami::SaleEditController < ApplicationController#BaseOrigamiController
class Origami::SaleEditController < ApplicationController #BaseOrigamiController
authorize_resource class: false
# Index for sale item void OR edit
def edit

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

@@ -1,5 +1,4 @@
class Origami::SalesController < ApplicationController#BaseOrigamiController
def show
@tables = Table.all.active.order('status desc')
@rooms = Room.all.active.order('status desc')

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

@@ -1,5 +1,4 @@
class Origami::ShiftsController < ApplicationController#BaseOrigamiController
def index
end

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

@@ -1,4 +1,4 @@
class Origami::TableInvoicesController < ApplicationController#BaseOrigamiController
class Origami::TableInvoicesController < ApplicationController #BaseOrigamiController
def index
@table = DiningFacility.find(params[:table_id])
puts "table bookig lenght"

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

@@ -1,5 +1,4 @@
class Origami::VisaController < ApplicationController#BaseOrigamiController
class Origami::VisaController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::VoidController < BaseOrigamiController
class Origami::VoidController < ApplicationController
authorize_resource :class => false
def overall_void

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

@@ -1,5 +1,4 @@
class Origami::VoucherController < ApplicationController#BaseOrigamiController
class Origami::VoucherController < ApplicationController #BaseOrigamiController
def index
@sale_id = params[:sale_id]