pull origin master

2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -8,7 +8,7 @@
    <%= f.input :commission_type, :collection => ['Percentage','Net Amount'], prompt: 'Select Commission Type', class: 'form-control' %>
    <%= f.input :amount %>
    <label><%= f.check_box :is_active %> Active </label>
-    
+
  </div><br>
  <div class="form-actions">
    <%= link_to 'Back', settings_commissions_path, class: 'btn btn-success' %>