update OQS and cashier

2017-11-14 09:43:13 +06:30
parent 8db96beca0
commit f1a28d64e1
31 changed files with 378 additions and 171 deletions
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -64,7 +64,7 @@
                  <td><%= order.order_type %></td>
                  <td><%= order.customer.name rescue '-' %></td>
                  <td><%= order.status %></td>
-                  <td> <%= order.date.strftime("%d-%m-%Y") %> </td>
+                  <td> <%= order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> </td>
                  <td> <%= order.item_count %> </td>
                  
                </tr>