Merge pull request #178 from andrewdwallo/development-3.x

Development 3.x

app/Filament/Company/Resources/Purchases/BillResource/Pages/ViewBill.php

@@ -58,10 +58,10 @@ class ViewBill extends ViewRecord
                             ->link(),
                         TextEntry::make('total')
                             ->label('Total')
-                            ->currency(fn (Bill $record) => $record->currency_code),
+                            ->currency(static fn (Bill $record) => $record->currency_code),
                         TextEntry::make('amount_due')
                             ->label('Amount due')
-                            ->currency(fn (Bill $record) => $record->currency_code),
+                            ->currency(static fn (Bill $record) => $record->currency_code),
                         TextEntry::make('date')
                             ->label('Date')
                             ->date(),
@@ -70,7 +70,6 @@ class ViewBill extends ViewRecord
                             ->asRelativeDay(),
                         TextEntry::make('paid_at')
                             ->label('Paid at')
-                            ->placeholder('Not Paid')
                             ->date(),
                     ]),
             ]);

app/Filament/Company/Resources/Sales/EstimateResource/Pages/ViewEstimate.php

@@ -99,15 +99,12 @@ class ViewEstimate extends ViewRecord
                                     ->asRelativeDay(),
                                 TextEntry::make('approved_at')
                                     ->label('Approved at')
-                                    ->placeholder('Not Approved')
                                     ->date(),
                                 TextEntry::make('last_sent_at')
                                     ->label('Last sent')
-                                    ->placeholder('Never')
                                     ->date(),
                                 TextEntry::make('accepted_at')
                                     ->label('Accepted at')
-                                    ->placeholder('Not Accepted')
                                     ->date(),
                             ])->columnSpan(1),
                         DocumentPreview::make()

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/ViewInvoice.php

@@ -99,15 +99,12 @@ class ViewInvoice extends ViewRecord
                                     ->asRelativeDay(),
                                 TextEntry::make('approved_at')
                                     ->label('Approved at')
-                                    ->placeholder('Not Approved')
                                     ->date(),
                                 TextEntry::make('last_sent_at')
                                     ->label('Last sent')
-                                    ->placeholder('Never')
                                     ->date(),
                                 TextEntry::make('paid_at')
                                     ->label('Paid at')
-                                    ->placeholder('Not Paid')
                                     ->date(),
                             ])->columnSpan(1),
                         DocumentPreview::make()

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ViewRecurringInvoice.php

@@ -110,13 +110,14 @@ class ViewRecurringInvoice extends ViewRecord
                                     ->weight(FontWeight::SemiBold)
                                     ->url(static fn (RecurringInvoice $record) => $record->client_id ? ClientResource::getUrl('view', ['record' => $record->client_id]) : null)
                                     ->link(),
+                                TextEntry::make('total')
+                                    ->label('Total')
+                                    ->currency(static fn (RecurringInvoice $record) => $record->currency_code),
                                 TextEntry::make('last_date')
                                     ->label('Last invoice')
-                                    ->date()
-                                    ->placeholder('Not Created'),
+                                    ->date(),
                                 TextEntry::make('next_date')
                                     ->label('Next invoice')
-                                    ->placeholder('Not Scheduled')
                                     ->date(),
                                 TextEntry::make('schedule')
                                     ->label('Schedule')
@@ -141,15 +142,11 @@ class ViewRecurringInvoice extends ViewRecord
                                     ->visible(fn (RecurringInvoice $record) => $record->end_type?->isOn()),
                                 TextEntry::make('approved_at')
                                     ->label('Approved at')
-                                    ->placeholder('Not Approved')
                                     ->date(),
                                 TextEntry::make('ended_at')
                                     ->label('Ended at')
                                     ->date()
-                                    ->visible(fn (RecurringInvoice $record) => $record->ended_at),
-                                TextEntry::make('total')
-                                    ->label('Invoice amount')
-                                    ->currency(static fn (RecurringInvoice $record) => $record->currency_code),
+                                    ->visible(static fn (RecurringInvoice $record) => $record->ended_at),
                             ])->columnSpan(1),
                         DocumentPreview::make()
                             ->type(DocumentType::RecurringInvoice),

app/Jobs/ProcessTransactionImport.php

@@ -60,7 +60,7 @@ class ProcessTransactionImport implements ShouldQueue
         if (count($newTransactions) > 0) {
             $currentBalance = $transactionsResponse->accounts[0]->balances->current;
 
-            $transactionService->createStartingBalanceIfNeeded($this->company, $this->account, $this->bankAccount, $newTransactions, $currentBalance, $startDate);
+            $transactionService->createStartingBalanceIfNeeded($this->company, $this->bankAccount, $newTransactions, $currentBalance, $startDate);
             $transactionService->storeTransactions($this->company, $this->bankAccount, $newTransactions);
 
             $this->connectedBankAccount->update([

app/Listeners/CreateConnectedAccount.php

@@ -6,6 +6,7 @@ use App\Events\PlaidSuccess;
 use App\Models\Banking\Institution;
 use App\Models\Company;
 use App\Services\PlaidService;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Support\Facades\DB;
 
 class CreateConnectedAccount
@@ -59,6 +60,12 @@ class CreateConnectedAccount
     {
         $identifierHash = md5($company->id . $institution->external_institution_id . $plaidAccount->name . $plaidAccount->mask);
 
+        $currencyCode = $plaidAccount->balances->iso_currency_code ?? 'USD';
+
+        $currentBalance = $plaidAccount->balances->current ?? 0;
+
+        $currentBalanceCents = CurrencyConverter::convertToCents($currentBalance, $currencyCode);
+
         $company->connectedBankAccounts()->updateOrCreate([
             'identifier' => $identifierHash,
         ], [
@@ -66,8 +73,8 @@ class CreateConnectedAccount
             'external_account_id' => $plaidAccount->account_id,
             'access_token' => $accessToken,
             'item_id' => $authResponse->item->item_id,
-            'currency_code' => $plaidAccount->balances->iso_currency_code ?? 'USD',
-            'current_balance' => $plaidAccount->balances->current ?? 0,
+            'currency_code' => $currencyCode,
+            'current_balance' => $currentBalanceCents,
             'name' => $plaidAccount->name,
             'mask' => $plaidAccount->mask,
             'type' => $plaidAccount->type,

app/Livewire/Company/Service/ConnectedAccount/ListInstitutions.php

@@ -79,17 +79,19 @@ class ListInstitutions extends Component implements HasActions, HasForms
                     )),
                 Placeholder::make('info')
                     ->hiddenLabel()
-                    ->visible(static fn (ConnectedBankAccount $connectedBankAccount) => $connectedBankAccount->bank_account_id === null)
+                    ->visible(static fn (ConnectedBankAccount $connectedBankAccount) => ! $connectedBankAccount->bank_account_id)
                     ->content(static fn (ConnectedBankAccount $connectedBankAccount) => 'If ' . $connectedBankAccount->name . ' already has transactions for an existing account, select the account to import transactions into.'),
                 Select::make('bank_account_id')
                     ->label('Select account')
-                    ->visible(static fn (ConnectedBankAccount $connectedBankAccount) => $connectedBankAccount->bank_account_id === null)
+                    ->visible(static fn (ConnectedBankAccount $connectedBankAccount) => ! $connectedBankAccount->bank_account_id)
                     ->options(fn (ConnectedBankAccount $connectedBankAccount) => $this->getBankAccountOptions($connectedBankAccount))
                     ->required(),
                 DatePicker::make('start_date')
                     ->label('Start date')
                     ->required()
-                    ->placeholder('Select a start date for importing transactions.'),
+                    ->placeholder('Select a start date for importing transactions.')
+                    ->minDate(now()->subDays(PlaidService::TRANSACTION_DAYS_REQUESTED)->toDateString())
+                    ->maxDate(now()->toDateString()),
             ])
             ->action(function (array $data, ConnectedBankAccount $connectedBankAccount) {
                 $selectedBankAccountId = $data['bank_account_id'] ?? $connectedBankAccount->bank_account_id;

app/Providers/Filament/CompanyPanelProvider.php

@@ -50,6 +50,7 @@ use Filament\Forms\Components\Select;
 use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
+use Filament\Infolists\Components\TextEntry;
 use Filament\Navigation\NavigationBuilder;
 use Filament\Navigation\NavigationGroup;
 use Filament\Pages;
@@ -289,6 +290,10 @@ class CompanyPanelProvider extends PanelProvider
         Tables\Columns\TextColumn::configureUsing(function (Tables\Columns\TextColumn $column): void {
             $column->placeholder('–');
         });
+
+        TextEntry::configureUsing(function (TextEntry $component): void {
+            $component->placeholder('–');
+        });
     }
 
     /**

app/Services/PlaidService.php

@@ -15,6 +15,8 @@ class PlaidService
 {
     public const API_VERSION = '2020-09-14';
 
+    public const TRANSACTION_DAYS_REQUESTED = 730;
+
     protected ?string $clientId;
 
     protected ?string $clientSecret;
@@ -204,6 +206,12 @@ class PlaidService
 
         if ($products) {
             $data['products'] = $products;
+
+            if (in_array('transactions', $products, true)) {
+                $data['transactions'] = [
+                    'days_requested' => self::TRANSACTION_DAYS_REQUESTED,
+                ];
+            }
         }
 
         if (! empty($this->webhookUrl)) {

app/Services/TransactionService.php

@@ -18,9 +18,10 @@ use Illuminate\Support\Facades\DB;
 
 class TransactionService
 {
-    public function createStartingBalanceIfNeeded(Company $company, Account $account, BankAccount $bankAccount, array $transactions, float $currentBalance, string $startDate): void
+    public function createStartingBalanceIfNeeded(Company $company, BankAccount $bankAccount, array $transactions, float $currentBalance, string $startDate): void
     {
-        if ($account->transactions()->doesntExist()) {
+        if ($bankAccount->transactions()->doesntExist()) {
+            $account = $bankAccount->account;
             $accountSign = $account->category === AccountCategory::Asset ? 1 : -1;
 
             $sumOfTransactions = collect($transactions)->reduce(static function ($carry, $transaction) {
@@ -31,7 +32,7 @@ class TransactionService
 
             $startingBalance = bcsub($adjustedBalance, $sumOfTransactions, 2);
 
-            $this->createStartingBalanceTransaction($company, $account, $bankAccount, (float) $startingBalance, $startDate);
+            $this->createStartingBalanceTransaction($company, $bankAccount, (float) $startingBalance, $startDate);
         }
     }
 
@@ -42,7 +43,7 @@ class TransactionService
         }
     }
 
-    public function createStartingBalanceTransaction(Company $company, Account $account, BankAccount $bankAccount, float $startingBalance, string $startDate): void
+    public function createStartingBalanceTransaction(Company $company, BankAccount $bankAccount, float $startingBalance, string $startDate): void
     {
         $transactionType = $startingBalance >= 0 ? TransactionType::Deposit : TransactionType::Withdrawal;
         $accountName = $startingBalance >= 0 ? "Owner's Investment" : "Owner's Drawings";
@@ -53,12 +54,15 @@ class TransactionService
 
         $postedAt = Carbon::parse($startDate)->subDay()->toDateTimeString();
 
+        $currencyCode = $bankAccount->account->currency_code ?? 'USD';
+        $amountInCents = CurrencyConverter::convertToCents(abs($startingBalance), $currencyCode);
+
         Transaction::create([
             'company_id' => $company->id,
             'account_id' => $chartAccount->id,
             'bank_account_id' => $bankAccount->id,
             'type' => $transactionType,
-            'amount' => abs($startingBalance),
+            'amount' => $amountInCents,
             'payment_channel' => 'other',
             'posted_at' => $postedAt,
             'description' => 'Starting Balance',
@@ -75,13 +79,16 @@ class TransactionService
         $postedAt = $transaction->datetime ?? Carbon::parse($transaction->date)->toDateTimeString();
         $description = $transaction->name;
 
+        $currencyCode = $transaction->iso_currency_code ?? $bankAccount->account->currency_code ?? 'USD';
+        $amountInCents = CurrencyConverter::convertToCents(abs($transaction->amount), $currencyCode);
+
         Transaction::create([
             'company_id' => $company->id,
             'account_id' => $chartAccount->id,
             'bank_account_id' => $bankAccount->id,
             'plaid_transaction_id' => $transaction->transaction_id,
             'type' => $transactionType,
-            'amount' => abs($transaction->amount),
+            'amount' => $amountInCents,
             'payment_channel' => $paymentChannel,
             'posted_at' => $postedAt,
             'description' => $description,