From c0073a8ca2e421171a6c7e6eef54adeb457cc928 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 20 Jan 2020 01:32:05 +0300 Subject: [PATCH] format date --- app/Imports/Purchases/Sheets/BillTransactions.php | 2 ++ app/Imports/Purchases/Sheets/Bills.php | 10 ++++++++++ app/Imports/Sales/Sheets/InvoiceTranactions.php | 2 ++ app/Imports/Sales/Sheets/Invoices.php | 10 ++++++++++ 4 files changed, 24 insertions(+) diff --git a/app/Imports/Purchases/Sheets/BillTransactions.php b/app/Imports/Purchases/Sheets/BillTransactions.php index 5440c223d..1d20f0402 100644 --- a/app/Imports/Purchases/Sheets/BillTransactions.php +++ b/app/Imports/Purchases/Sheets/BillTransactions.php @@ -5,6 +5,7 @@ namespace App\Imports\Purchases\Sheets; use App\Abstracts\Import; use App\Models\Banking\Transaction as Model; use App\Http\Requests\Banking\Transaction as Request; +use Jenssegers\Date\Date; class BillTransactions extends Import { @@ -17,6 +18,7 @@ class BillTransactions extends Import { $row['company_id'] = session('company_id'); $row['type'] = 'expense'; + $row['paid_at'] = Date::parse($row['paid_at'])->format('Y-m-d H:i:s'); // Make reconciled field integer if (isset($row['reconciled'])) { diff --git a/app/Imports/Purchases/Sheets/Bills.php b/app/Imports/Purchases/Sheets/Bills.php index f50ca9d45..8a0649954 100644 --- a/app/Imports/Purchases/Sheets/Bills.php +++ b/app/Imports/Purchases/Sheets/Bills.php @@ -5,6 +5,7 @@ namespace App\Imports\Purchases\Sheets; use App\Abstracts\Import; use App\Models\Purchase\Bill as Model; use App\Http\Requests\Purchase\Bill as Request; +use Jenssegers\Date\Date; class Bills extends Import { @@ -13,6 +14,15 @@ class Bills extends Import return new Model($row); } + public function map($row): array + { + $row['company_id'] = session('company_id'); + $row['billed_at'] = Date::parse($row['billed_at'])->format('Y-m-d H:i:s'); + $row['due_at'] = Date::parse($row['due_at'])->format('Y-m-d H:i:s'); + + return $row; + } + public function rules(): array { return (new Request())->rules(); diff --git a/app/Imports/Sales/Sheets/InvoiceTranactions.php b/app/Imports/Sales/Sheets/InvoiceTranactions.php index 7792cdd6b..38bac199a 100644 --- a/app/Imports/Sales/Sheets/InvoiceTranactions.php +++ b/app/Imports/Sales/Sheets/InvoiceTranactions.php @@ -5,6 +5,7 @@ namespace App\Imports\Sales\Sheets; use App\Abstracts\Import; use App\Models\Banking\Transaction as Model; use App\Http\Requests\Banking\Transaction as Request; +use Jenssegers\Date\Date; class InvoiceTranactions extends Import { @@ -17,6 +18,7 @@ class InvoiceTranactions extends Import { $row['company_id'] = session('company_id'); $row['type'] = 'income'; + $row['paid_at'] = Date::parse($row['paid_at'])->format('Y-m-d H:i:s'); // Make reconciled field integer if (isset($row['reconciled'])) { diff --git a/app/Imports/Sales/Sheets/Invoices.php b/app/Imports/Sales/Sheets/Invoices.php index dd5e0b75d..d9011ac94 100644 --- a/app/Imports/Sales/Sheets/Invoices.php +++ b/app/Imports/Sales/Sheets/Invoices.php @@ -5,6 +5,7 @@ namespace App\Imports\Sales\Sheets; use App\Abstracts\Import; use App\Models\Sale\Invoice as Model; use App\Http\Requests\Sale\Invoice as Request; +use Jenssegers\Date\Date; class Invoices extends Import { @@ -13,6 +14,15 @@ class Invoices extends Import return new Model($row); } + public function map($row): array + { + $row['company_id'] = session('company_id'); + $row['invoiced_at'] = Date::parse($row['invoiced_at'])->format('Y-m-d H:i:s'); + $row['due_at'] = Date::parse($row['due_at'])->format('Y-m-d H:i:s'); + + return $row; + } + public function rules(): array { return (new Request())->rules();