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

2017-06-13 14:37:35 +06:30
parent 1ef88c4e70 03b839fc07
commit 7c37d9ada3
30 changed files with 271 additions and 347 deletions
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -14,8 +14,8 @@
              <td><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></td>
            </tr>
            <tr>
-              <td><strong>Customer :</strong> Default Customer</td>
-              <td><strong>Points :</strong>  1234 </td>
+              <td><strong>Customer :</strong> <%= @sale_data.customer.name%></td>
+              <td><strong>Points :</strong>  <%= @balance %> </td>
            </tr>
          </table>
        </div>