fixed conflict

2017-06-07 22:29:43 +06:30
parent fd1c53432c f9c8dbc03e
commit 44382d284f
52 changed files with 746 additions and 249 deletions
--- a/app/views/crm/home/_booking.html.erb
+++ b/app/views/crm/home/_booking.html.erb
@@ -44,6 +44,7 @@ $(function(){
      $("#assign").removeAttr("disabled");
      $("#crm_print").removeAttr("disabled");
      $("#crm_print").attr('data',$(this).attr('data'));
+
      var url = $(this).attr('data-ref');
      show_details(url); 
    });