Phyo 184dcb53a1 Conflict fix din settings_backend

2017-06-19 15:24:15 +06:30

..

api

merge with origin master

2017-06-18 12:50:07 +06:30

concerns

…

crm

assign queue and other bug

2017-06-18 00:03:09 +06:30

oqs

merge with origin master

2017-06-18 12:50:07 +06:30

origami

merge with origin master

2017-06-18 12:50:07 +06:30

reports

add auth token:

2017-06-13 18:28:22 +06:30

settings

Conflict fix din settings_backend

2017-06-19 15:24:15 +06:30

transactions

update void and complete sale

2017-06-16 10:20:20 +06:30

application_controller.rb

…

base_controller.rb

…

base_crm_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

…

base_report_controller.rb

ui updating for report

2017-06-13 09:59:56 +06:30

base_waiter_controller.rb

…

home_controller.rb

add sale reason in seed

2017-06-15 11:12:50 +06:30

install_controller.rb

…

print_settings_controller.rb

origin pull master

2017-06-03 13:44:10 +06:30