phyusin 00d3397834 conflict data remove for order/show.index.html.erb

2018-02-08 18:04:36 +06:30

..

api

conflict data

2018-02-06 18:12:59 +06:30

concerns

…

crm

merge with master

2018-01-09 16:40:45 +06:30

inventory

…

oqs

update oqs

2018-02-07 10:51:49 +06:30

origami

conflict data remove for order/show.index.html.erb

2018-02-08 18:04:36 +06:30

reports

update precision and delimetor all

2018-01-08 17:00:00 +06:30

settings

…

transactions

…

application_controller.rb

comment licence check

2018-01-23 15:15:12 +06:30

base_controller.rb

need to fix license

2017-12-19 11:49:03 +06:30

base_crm_controller.rb

…

base_inventory_controller.rb

…

base_oqs_controller.rb

…

base_origami_controller.rb

order item split bill process

2018-02-06 09:46:30 +06:30

base_report_controller.rb

…

base_waiter_controller.rb

…

home_controller.rb

update decimal and delimeter for dashboard

2018-01-09 10:52:52 +06:30

install_controller.rb

add response in license

2018-01-23 14:40:32 +06:30

print_settings_controller.rb

…

sym_control_controller.rb

add sudo for sym run

2018-01-23 15:14:07 +06:30