fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -3,7 +3,7 @@ namespace :consolidate do
  task :receipt => :environment do
    # Receipt.delete_all
    sales = Sale.all_receipts
-    shop  = Shop.first #current_shop
+    shop  = Shop.current_shop #Shop.current_shop
    sales.each do |sale|
      
     if sale.shift_sale_id.present?
@@ -57,7 +57,7 @@ namespace :consolidate do
    ReceiptDetail.delete_all
    sales = Sale.all_receipt_details

-    shop  = Shop.first #current_shop
+    shop  = Shop.current_shop #Shop.current_shop

    sale_id = ''
    count   = 0