Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

2018-04-22 14:12:33 +06:30
parent cc89a35ece 1fe48b57d0
commit 5f95bf5f4d
7 changed files with 71 additions and 3 deletions
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -128,6 +128,9 @@ class Sale < ApplicationRecord
      self.save!

      #compute sales summary
+      if order_source.nil?
+        order_source = order.order_source
+      end
      compute(order_source)

      #Update the order items that is billed