phyusin 50f5094efc remove conflict

2018-07-16 10:58:12 +06:30

..

addorders_controller.rb

…

alipay_controller.rb

remove conflict data

2018-07-12 15:54:30 +06:30

bank_integration_controller.rb

…

card_payments_controller.rb

…

cash_ins_controller.rb

…

cash_mgmt_controller.rb

…

cash_outs_controller.rb

…

check_in_process_controller.rb

…

credit_payments_controller.rb

remove conflict data

2018-07-12 15:54:30 +06:30

credit_sales_controller.rb

…

customers_controller.rb

add dashboard settings and customer create

2018-07-13 18:00:49 +06:30

dashboard_controller.rb

add dashboard settings and customer create

2018-07-13 18:00:49 +06:30

dinga_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

discounts_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

gift_voucher_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

home_controller_bk.rb

…

home_controller.rb

add dashboard settings and customer create

2018-07-13 18:00:49 +06:30

in_duties_controller.rb

…

jcb_controller.rb

remove conflict data

2018-07-12 15:54:30 +06:30

junction_pay_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

master_controller.rb

remove conflict

2018-07-16 10:58:12 +06:30

moveroom_controller.rb

…

movetable_controller.rb

…

mpu_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

order_reservation_controller.rb

…

orders_controller.rb

…

other_charges_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

others_payments_controller.rb

…

paymal_controller.rb

…

payments_controller.rb

remove conflict data

2018-07-12 15:54:30 +06:30

paypar_payments_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

pending_order_controller.rb

…

product_commissions_controller.rb

…

quick_service_controller.rb

…

redeem_payments_controller.rb

…

request_bills_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

room_invoices_controller.rb

…

rooms_controller.rb

close cashier pdf and receipt bill pdf changes for credit payment

2018-07-12 15:50:58 +06:30

sale_edit_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

sales_controller.rb

remove conflict data

2018-07-12 15:54:30 +06:30

second_display_controller.rb

…

shifts_controller.rb

close cashier pdf and receipt bill pdf changes for credit payment

2018-07-12 15:50:58 +06:30

split_bill_controller.rb

…

surveys_controller.rb

…

table_invoices_controller.rb

…

unionpay_controller.rb

remove conflict data

2018-07-12 15:54:30 +06:30

visa_controller.rb

remove conflict

2018-07-13 14:49:56 +06:30

void_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

voucher_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30

waste_spoile_controller.rb

Pull from master

2018-07-12 15:09:37 +06:30