From bbc950a755d8ce1c780769c911c7cfdb3e68400b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 25 Jun 2021 15:44:10 +0300 Subject: [PATCH] import bill/invoice date column fixed.. --- app/Imports/Purchases/Sheets/Bills.php | 2 ++ app/Imports/Sales/Sheets/Invoices.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/Imports/Purchases/Sheets/Bills.php b/app/Imports/Purchases/Sheets/Bills.php index b8e177be7..383ff7e56 100644 --- a/app/Imports/Purchases/Sheets/Bills.php +++ b/app/Imports/Purchases/Sheets/Bills.php @@ -36,6 +36,8 @@ class Bills extends Import $rules = (new Request())->rules(); $rules['bill_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']); + $rules['issued_at'] = Str::replaceFirst('|before_or_equal:due_at', '', $rules['issued_at']); + $rules['due_at'] = Str::replaceFirst('|after_or_equal:issued_at', '', $rules['due_at']); $rules['billed_at'] = $rules['issued_at']; unset($rules['document_number'], $rules['issued_at'], $rules['type']); diff --git a/app/Imports/Sales/Sheets/Invoices.php b/app/Imports/Sales/Sheets/Invoices.php index 89c997505..dc950b950 100644 --- a/app/Imports/Sales/Sheets/Invoices.php +++ b/app/Imports/Sales/Sheets/Invoices.php @@ -36,6 +36,8 @@ class Invoices extends Import $rules = (new Request())->rules(); $rules['invoice_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']); + $rules['issued_at'] = Str::replaceFirst('|before_or_equal:due_at', '', $rules['issued_at']); + $rules['due_at'] = Str::replaceFirst('|after_or_equal:issued_at', '', $rules['due_at']); $rules['invoiced_at'] = $rules['issued_at']; unset($rules['document_number'], $rules['issued_at'], $rules['type']);