Pull from master

2018-07-09 09:27:52 +06:30
parent e5eb9b90ad 146f727f46
commit 6891756ae8
35 changed files with 167 additions and 102 deletions
--- a/app/models/sale_order.rb
+++ b/app/models/sale_order.rb
@@ -8,12 +8,18 @@ class SaleOrder < ApplicationRecord
  belongs_to :order

  def create_sale_order(sale, order) 
+<<<<<<< HEAD
    SaleOrder.transaction do
+=======
+>>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
      sale_order = SaleOrder.new
      sale_order.sale_id = sale
      sale_order.order_id = order
      sale_order.save!
+<<<<<<< HEAD
    end
+=======
+>>>>>>> 146f727f462174b1daa31972b597448c12e26d8c
  end

  private