merge with crm

2017-06-23 17:51:09 +06:30
parent 68403617a5 f5f0f9e077
commit 27ff8b89e7
22 changed files with 465 additions and 307 deletions
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -23,13 +23,13 @@ class Origami::HomeController < BaseOrigamiController
           @order_items = Array.new
           booking.booking_orders.each do |booking_order|
              order = Order.find(booking_order.order_id)
-              if (order.status == "new")
+              if (order.status == "new")                
                @obj_order = order
+                @customer = order.customer
                @date = order.created_at
                order.order_items.each do |item|
                  @order_items.push(item)
                end
-              end
           end
           @status_order = 'order'
         else
@@ -43,6 +43,7 @@ class Origami::HomeController < BaseOrigamiController
             @date = sale.created_at
             @status_sale = 'sale'
             @obj_sale = sale
+             @customer = sale.customer
           end
         end
     end