Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant

2017-07-08 17:34:22 +06:30
parent 2226d59140 9608dc96a0
commit 9158f0e93a
13 changed files with 746 additions and 211 deletions
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -119,7 +119,7 @@
        <div class="col-md-4" id="others"><%= @other %></div>
      </div>
    <% else %>
-      <div class="row payment other-payment-color" id="card_payment" style="line-height:30px;height: 30px;margin-bottom: 0px;" >
+      <div class="row payment other-payment-color" id="card_payment"  >
        <div class="col-md-12">Other Payments</div>
      </div>
    <% end %>