phyusin 47b59cca59 remove conflict data

2018-07-10 18:13:41 +06:30

..

api

Edit Order item unmatch

2018-07-04 15:22:39 +06:30

concerns

…

crm

Pull from master

2018-06-07 11:05:19 +06:30

inventory

add change tax in table/room and check-in for room

2018-06-22 13:33:01 +06:30

oqs

Edit Order item unmatch

2018-07-04 15:22:39 +06:30

origami

remove conflict data

2018-07-10 18:13:41 +06:30

reports

Merge branch 'ui_ux_changes'

2018-07-10 15:24:31 +06:30

settings

check null for image

2018-06-22 14:51:53 +06:30

transactions

transactions for order reservation and api for tax profile

2018-05-28 18:08:30 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

Pull from master

2018-07-05 15:42:58 +06:30

install_controller.rb

…

print_settings_controller.rb

Edit route for delete in print Settings

2018-06-20 11:09:25 +06:30

sym_control_controller.rb

…