Yan 57b9c44349 merge with master

2018-05-03 17:57:49 +06:30

..

addorders_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

alipay_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +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

shop upate for 20 files

2018-04-10 18:10:40 +06:30

customers_controller.rb

Edit in customer of Tax Profile

2018-05-02 16:00:19 +06:30

dashboard_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

dinga_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

discounts_controller.rb

update discount member message

2018-04-20 13:00:48 +06:30

home_controller_bk.rb

…

home_controller.rb

fixed conflict

2018-04-23 18:21:47 +06:30

in_duties_controller.rb

…

jcb_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

junction_pay_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

master_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

moveroom_controller.rb

add alert for new,send_to_kitchen and ready_to_delivery

2018-05-03 17:22:59 +06:30

movetable_controller.rb

add alert for new,send_to_kitchen and ready_to_delivery

2018-05-03 17:22:59 +06:30

mpu_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

order_reservation_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

orders_controller.rb

…

other_charges_controller.rb

no change

2018-05-03 17:53:34 +06:30

others_payments_controller.rb

…

paymal_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

payments_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

paypar_payments_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

pending_order_controller.rb

update complete tab and other issuse

2018-05-03 09:52:53 +06:30

product_commissions_controller.rb

…

quick_service_controller.rb

update request bill msg box error

2018-04-10 17:29:02 +06:30

redeem_payments_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

request_bills_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

room_invoices_controller.rb

…

rooms_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

sale_edit_controller.rb

…

sales_controller.rb

…

second_display_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

shifts_controller.rb

…

split_bill_controller.rb

Pull from master

2018-05-03 09:31:36 +06:30

surveys_controller.rb

…

table_invoices_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

unionpay_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

visa_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

void_controller.rb

…

voucher_controller.rb

shop upate for 20 files

2018-04-10 18:10:40 +06:30

waste_spoile_controller.rb

update bugs for demo

2018-04-22 16:38:52 +06:30