fix conflict

app/models/sale.rb

@@ -26,7 +26,40 @@ class Sale < ApplicationRecord
   }
   SALE_STATUS_OUTSTANDING = "outstanding"
   SALE_STATUS_COMPLETED = "completed"
-
+  def self.sync_sale_records(sales)
+    if !sales.nil?
+      sales.each do |s|
+        unless Sale.exists?(s['sale_id'])
+          sale = Sale.new
+          sale.sale_id = s['sale_id']
+          sale.cashier_id = s['cashier_id']
+          sale.cashier_name = s['cashier_name']
+          sale.requested_by = s['requested_by']
+          sale.requested_at = s['requested_at']
+          sale.receipt_no = s['receipt_no']
+          sale.receipt_date = s['receipt_date']
+          sale.customer_id = s['customer_id']
+          sale.payment_status = s['payment_status']
+          sale.sale_status = s['sale_status']
+          sale.total_amount = s['total_amount']
+          sale.discount_type = s['discount_type']
+          sale.total_tax = s['total_tax']
+          sale.total_discount = s['total_discount']
+          sale.tax_type = s['tax_type']
+          sale.grand_total = s['grand_total']
+          sale.rounding_adjustment = s['rounding_adjustment']
+          sale.amount_received = s['amount_received']
+          sale.amount_changed = s['amount_changed']
+          sale.shift_sale_id = s['shift_sale_id']
+          sale.old_grand_total = s['old_grand_total']
+          sale.rebate_status = s['rebate_status']
+          sale.equal_persons = s['equal_persons']
+          sale.save
+          puts '........ Sale data has been created .......'
+        end
+      end
+    end
+  end
   def generate_invoice_from_booking(booking_id, requested_by, cashier, order_source = nil, current_checkin_induties_count)
     booking = Booking.find(booking_id)
     status = false
@@ -2755,6 +2788,11 @@ end
 private
 
   def generate_custom_id
-    self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL")
+    prefix = "SAL"
+    if ENV["SERVER_MODE"] == 'cloud'
+      prefix = "CSAL"
+    end
+
+    self.sale_id = SeedGenerator.generate_id(self.class.name, prefix)
   end
 end