Merge branch 'adminbsb_material_ui'

2018-07-01 15:55:39 +06:30
parent 8afb2e7c5e 985604cd1f
commit 4750f03ea8
4 changed files with 6 additions and 15 deletions
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -146,7 +146,7 @@
                      <div class="card-block">
                        <%
                          order_status = ""
-                          sale_order = SaleOrder.find_by_order_id(order)
+                          sale_order = order.sale_orders.first
                          if sale_order
                            unless sale_order.sale_id.nil?
                              sale = Sale.find(sale_order.sale_id)