Removed redundant functions in Account, Optimised User a little more, Moved Ezypay Commands to new Ezypay folder

app/Console/Commands/Ezypay/PaymentNext.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Console\Commands\Ezypay;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+
+use App\Classes\External\Payments\Ezypay;
+use App\Models\Account;
+
+class PaymentNext extends Command
+{
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'ezypay:payment:next';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Load next payments, and ensure they cover the next invoice';
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$poo = new Ezypay;
+
+		foreach ($poo->getCustomers() as $c) {
+			if ($c->BillingStatus == 'Inactive') {
+				$this->comment(sprintf('Ignoring INACTIVE: [%s] %s %s',$c->EzypayReferenceNumber,$c->Firstname,$c->Surname));
+				continue;
+			}
+
+			// Load Account Details from ReferenceId
+			$ao = Account::find((int)substr($c->ReferenceId,2,4));
+
+			if (! $ao) {
+				$this->warn(sprintf('Missing: [%s] %s %s (%s)',$c->EzypayReferenceNumber,$c->Firstname,$c->Surname,$c->ReferenceId));
+				continue;
+			}
+
+			// Get Due Invoices
+			$invoice_due = $ao->invoiceSummaryDue()->get();
+
+			$this->info(sprintf('Account [%s] (%s) has [%d] invoices due, totalling [%3.2f]',
+				$ao->lid,
+				$ao->name,
+				$invoice_due->count(),
+				($due=$invoice_due->sum('_balance')),
+			));
+
+			$next_pay = $poo->getDebits([
+				'customerId'=>$c->Id,
+				'dateFrom'=>now()->format('Y-m-d'),
+				'dateTo'=>now()->addQuarter()->format('Y-m-d'),
+			])->reverse()->first();
+
+			if ($next_pay->Status !== 'Pending') {
+				$this->warn(sprintf('- Next payment is not pending for (%s)',$ao->name));
+				continue;
+			}
+
+			$next_paydate = Carbon::createFromTimeString($next_pay->Date);
+
+			if ($next_pay->Amount < $due)
+				$this->error(sprintf('- Next payment on [%s] for (%s) [%s] not sufficient for outstanding balance [%s]',
+					$next_paydate->format('Y-m-d'),
+					$ao->name,
+					number_format($next_pay->Amount,2),
+					number_format($due,2)));
+
+			elseif ($next_pay->Amount > $due)
+				$this->warn(sprintf('- Next payment on [%s] for (%s) [%s] is too much for outstanding balance [%s]',
+					$next_paydate->format('Y-m-d'),
+					$ao->name,
+					number_format($next_pay->Amount,2),
+					number_format($due,2)));
+
+			else
+				$this->info(sprintf('- Next payment on [%s] for (%s) [%s] will cover outstanding balance [%s]',
+					$next_paydate->format('Y-m-d'),
+					$ao->name,
+					number_format($next_pay->Amount,2),
+					number_format($due,2)));
+		}
+	}
+}

app/Console/Commands/Ezypay/PaymentsImport.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Console\Commands\Ezypay;
+
+use Illuminate\Console\Command;
+
+use App\Classes\External\Payments\Ezypay;
+use App\Jobs\PaymentsImport as Job;
+
+class PaymentsImport extends Command
+{
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'ezypay:payment:import';
+
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Retrieve payments from Ezypay';
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		Job::dispatchSync(new Ezypay);
+	}
+}