Merge branch 'r-1902001-01' into foodcourt

2020-05-29 13:32:16 +06:30
parent d037802a43 8bae89eeac
commit 7c2dd165fc
23 changed files with 724 additions and 508 deletions
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -107,9 +107,9 @@
                <%if @sale_payment.nil? && @changable_tax %>
                  <% if @current_user.role == 'cashier' %>
                    <button class="btn btn-link waves-effect bg-info access_modal" data-type="change_tax">Change Tax</button>
-                <% else %>
+                  <% else %>
                  <button class="btn btn-link waves-effect bg-info change_tax">Change Tax</button>
-                <% end %>
+                  <% end %>
                <% end %>
              </td>
              <td class="item-attr"><strong><span id="total_tax"><%= number_format(@sale_data.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%></span></strong></td>