phyusin 6e5064cf9f remove confilct data

2018-05-14 10:17:26 +06:30

..

_card_read_form.html.erb

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

_crm_customer.json.jbuilder

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

_form.html.erb

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

_new_form.html.erb

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

edit.html.erb

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

edit.json.jbuilder

remove confilct data

2018-05-14 10:17:26 +06:30

index.html.erb

remove confilct data

2018-05-14 10:17:26 +06:30

index.json.jbuilder

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

new.html.erb

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

show.html.erb

change customer and sale tax for takeaway

2018-05-09 15:40:13 +06:30

show.json.jbuilder

remove confilct data

2018-05-14 10:17:26 +06:30