Rollback for new payment flow

app/Console/Commands/CheckData.php

@@ -1169,7 +1169,7 @@ class CheckData extends Command
                 ->whereNull('exchange_rate')
                 ->orWhere('exchange_rate', 0)
                 ->cursor()
-                ->each(function ($expense){
+                ->each(function ($expense) {
                     $expense->exchange_rate = 1;
                     $expense->saveQuietly();
 

app/DataMapper/Tax/BaseRule.php

@@ -131,7 +131,8 @@ class BaseRule implements RuleInterface
         return $this;
     }
 
-    public function shouldCalcTax(): bool {
+    public function shouldCalcTax(): bool
+    {
         return $this->should_calc_tax && $this->checkIfInvoiceLocked();
     }
     /**
@@ -404,8 +405,9 @@ class BaseRule implements RuleInterface
     {
         $lock_invoices = $this->client->getSetting('lock_invoices');
 
-        if($this->invoice instanceof RecurringInvoice)
+        if($this->invoice instanceof RecurringInvoice) {
             return true;
+        }
 
         switch ($lock_invoices) {
             case 'off':

app/DataMapper/Tax/DE/Rule.php

@@ -251,8 +251,7 @@ class Rule extends BaseRule implements RuleInterface
             $this->reduced_tax_rate = 0;
         } elseif(!in_array($this->client_subregion, $this->eu_country_codes)) {
             $this->defaultForeign();
-        } elseif(in_array($this->client_subregion, $this->eu_country_codes) && ((strlen($this->client->vat_number ?? '') == 1) || $this->client->has_valid_vat_number)) { //eu country / no valid vat
+        } elseif(in_array($this->client_subregion, $this->eu_country_codes) && ((strlen($this->client->vat_number ?? '') == 1) || !$this->client->has_valid_vat_number)) { //eu country / no valid vat
-            // if(($this->client->company->tax_data->seller_subregion != $this->client_subregion) && $this->client->company->tax_data->regions->EU->has_sales_above_threshold) {
             if($this->client->company->tax_data->seller_subregion != $this->client_subregion) {
                 // nlog("eu zone with sales above threshold");
                 $this->tax_rate = $this->client->company->tax_data->regions->EU->subregions->{$this->client->country->iso_3166_2}->tax_rate ?? 0;

app/DataMapper/Tax/TaxModel.php

@@ -48,8 +48,7 @@ class TaxModel
     public function migrate(): self
     {
 
-        if($this->version == 'alpha')
+        if($this->version == 'alpha') {
-        {
             $this->regions->EU->subregions->PL = new \stdClass();
             $this->regions->EU->subregions->PL->tax_rate = 23;
             $this->regions->EU->subregions->PL->tax_name = 'VAT';

app/DataProviders/CAProvinces.php

@@ -11,7 +11,8 @@
 
 namespace App\DataProviders;
 
-final class CAProvinces {
+final class CAProvinces
+{
     /**
      * The provinces and territories of Canada
      *
@@ -39,7 +40,8 @@ final class CAProvinces {
      * @param  string  $abbreviation
      * @return string
      */
-    public static function getName($abbreviation) {
+    public static function getName($abbreviation)
+    {
         return self::$provinces[$abbreviation];
     }
 
@@ -48,7 +50,8 @@ final class CAProvinces {
      *
      * @return array
      */
-    public static function get() {
+    public static function get()
+    {
         return self::$provinces;
     }
 
@@ -58,7 +61,8 @@ final class CAProvinces {
      * @param  string  $name
      * @return string
      */
-    public static function getAbbreviation($name) {
+    public static function getAbbreviation($name)
+    {
         return array_search(ucwords($name), self::$provinces);
     }
 }

app/Export/CSV/BaseExport.php

@@ -1041,7 +1041,7 @@ class BaseExport
 
         $recurring_filters = [];
 
-        if($this->company->getSetting('report_include_drafts')){
+        if($this->company->getSetting('report_include_drafts')) {
             $recurring_filters[] = RecurringInvoice::STATUS_DRAFT;
         }
 

app/Export/CSV/ClientExport.php

@@ -133,7 +133,7 @@ class ClientExport extends BaseExport
             $query->where('is_deleted', 0);
         }
 
-        $query = $this->addDateRange($query,' clients');
+        $query = $this->addDateRange($query, ' clients');
 
         if($this->input['document_email_attachment'] ?? false) {
             $this->queueDocuments($query);

app/Export/CSV/ExpenseExport.php

@@ -269,8 +269,7 @@ class ExpenseExport extends BaseExport
 
             if($expense->uses_inclusive_taxes) {
                 $entity['expense.net_amount'] = round($expense->amount, $precision) - $total_tax_amount;
-            }
+            } else {
-            else {
                 $entity['expense.net_amount'] = round($expense->amount, $precision);
             }
 

app/Filters/ExpenseFilters.php

@@ -162,8 +162,9 @@ class ExpenseFilters extends QueryFilters
     {
         $categories_exploded = explode(",", $categories);
 
-        if(empty($categories) || count(array_filter($categories_exploded)) == 0) 
+        if(empty($categories) || count(array_filter($categories_exploded)) == 0) {
             return $this->builder;
+        }
 
         $categories_keys = $this->transformKeys($categories_exploded);
 

app/Filters/RecurringInvoiceFilters.php

@@ -141,7 +141,7 @@ class RecurringInvoiceFilters extends QueryFilters
             return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
         }
 
-        if($sort_col[0] == 'status_id'){
+        if($sort_col[0] == 'status_id') {
             return $this->builder->orderBy('status_id', $dir)->orderBy('last_sent_date', $dir);
         }
 

app/Http/Controllers/ActivityController.php

@@ -254,17 +254,20 @@ class ActivityController extends BaseController
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
                 $activity->vendor_id = $entity->vendor_id;
+                // no break
             case Task::class:
                 $activity->task_id = $entity->id;
                 $activity->expense_id = $entity->id;
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
                 $activity->vendor_id = $entity->vendor_id;
+                // no break
             case Payment::class:
                 $activity->payment_id = $entity->id;
                 $activity->expense_id = $entity->id;
                 $activity->client_id = $entity->client_id;
                 $activity->project_id = $entity->project_id;
+                // no break
             default:
                 # code...
                 break;

app/Http/Controllers/Auth/ContactLoginController.php

@@ -41,8 +41,9 @@ class ContactLoginController extends Controller
         $company = false;
         $account = false;
 
-        if($request->query('intended'))
+        if($request->query('intended')) {
             $request->session()->put('url.intended', $request->query('intended'));
+        }
 
         if ($request->session()->has('company_key')) {
             MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key'));
@@ -142,8 +143,9 @@ class ContactLoginController extends Controller
 
         $this->setRedirectPath();
 
-        if($intended)
+        if($intended) {
             $this->redirectTo = $intended;
+        }
 
         return $request->wantsJson()
                     ? new JsonResponse([], 204)

app/Http/Controllers/BaseController.php

@@ -934,7 +934,7 @@ class BaseController extends Controller
             } elseif (in_array($this->entity_type, [Design::class, GroupSetting::class, PaymentTerm::class, TaskStatus::class])) {
                 // nlog($this->entity_type);
             } else {
-                $query->where(function ($q) use ($user){ //grouping these together improves query performance significantly)
+                $query->where(function ($q) use ($user) { //grouping these together improves query performance significantly)
                     $q->where('user_id', '=', $user->id)->orWhere('assigned_user_id', $user->id);
                 });
             }
@@ -996,7 +996,7 @@ class BaseController extends Controller
 
                 if(request()->has('einvoice')) {
 
-                    if(class_exists(Schema::class)){
+                    if(class_exists(Schema::class)) {
                         $ro = new Schema();
                         $response_data['einvoice_schema'] = $ro('Peppol');
                     }

app/Http/Controllers/BrevoController.php

@@ -19,7 +19,6 @@ use Illuminate\Http\Request;
  */
 class BrevoController extends BaseController
 {
-
     public function __construct()
     {
     }

app/Http/Controllers/ClientPortal/InvitationController.php

@@ -115,7 +115,7 @@ class InvitationController extends Controller
                         ]);
             }
 
-            if(!auth()->guard('contact')->check()){
+            if(!auth()->guard('contact')->check()) {
                 $this->middleware('auth:contact');
                 return redirect()->route('client.login', ['intended' => route('client.'.$entity.'.show', [$entity => $this->encodePrimaryKey($invitation->{$key}), 'silent' => $is_silent])]);
             }

app/Http/Controllers/ImportQuickbooksController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\Quickbooks\AuthorizedQuickbooksRequest;
-use \Closure;
+use Closure;
 use App\Utils\Ninja;
 use App\Models\Company;
 use App\Libraries\MultiDB;
@@ -19,7 +19,6 @@ use App\Services\Import\Quickbooks\QuickbooksService;
 
 class ImportQuickbooksController extends BaseController
 {
-
     private array $import_entities = [
         'client' => 'Customer',
         'invoice' => 'Invoice',
@@ -46,7 +45,6 @@ class ImportQuickbooksController extends BaseController
     /**
      * Determine if the user is authorized to make this request.
      *
-     * @return bool
      */
     public function authorizeQuickbooks(AuthQuickbooksRequest $request, string $token)
     {
@@ -74,17 +72,19 @@ class ImportQuickbooksController extends BaseController
         $this->getData($data);
     }
 
-    protected function getData($data) {
+    protected function getData($data)
+    {
 
         $entity = $this->import_entities[$data['type']];
         $cache_name = "{$data['hash']}-{$data['type']}";
         // TODO: Get or put cache  or DB?
-        if(! Cache::has($cache_name) )
+        if(! Cache::has($cache_name)) {
-        {
             $contents = call_user_func([$this->service, "fetch{$entity}s"]);
-            if($contents->isEmpty()) return;
+            if($contents->isEmpty()) {
+                return;
+            }
 
-            Cache::put($cache_name, base64_encode( $contents->toJson()), 600);
+            Cache::put($cache_name, base64_encode($contents->toJson()), 600);
         }
     }
 
@@ -117,20 +117,19 @@ class ImportQuickbooksController extends BaseController
      */
     public function import(Request $request)
     {
-         $hash = Str::random(32);
+        // $hash = Str::random(32);
-        foreach($request->input('import_types') as $type)
+        // foreach($request->input('import_types') as $type) {
-        {
+        //     $this->preimport($type, $hash);
-            $this->preimport($type, $hash);
+        // }
-        }
+        // /** @var \App\Models\User $user */
-        /** @var \App\Models\User $user */
+        // // $user = auth()->user() ?? Auth::loginUsingId(60);
-        // $user = auth()->user() ?? Auth::loginUsingId(60);
+        // $data = ['import_types' => $request->input('import_types') ] + compact('hash');
-        $data = ['import_types' => $request->input('import_types') ] + compact('hash');
+        // if (Ninja::isHosted()) {
-        if (Ninja::isHosted()) {
+        //     QuickbooksIngest::dispatch($data, $user->company());
-            QuickbooksIngest::dispatch( $data , $user->company() );
+        // } else {
-        } else {
+        //     QuickbooksIngest::dispatch($data, $user->company());
-            QuickbooksIngest::dispatch($data, $user->company() );
+        // }
-        }
 
-        return response()->json(['message' => 'Processing'], 200);
+        // return response()->json(['message' => 'Processing'], 200);
     }
 }

app/Http/Controllers/InvoiceController.php

@@ -503,7 +503,7 @@ class InvoiceController extends BaseController
 
         $invoices = Invoice::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
 
-        if ($invoices->count() == 0 ) {
+        if ($invoices->count() == 0) {
             return response()->json(['message' => 'No Invoices Found']);
         }
 

app/Http/Controllers/MailgunWebhookController.php

@@ -20,7 +20,6 @@ use Illuminate\Http\Request;
  */
 class MailgunWebhookController extends BaseController
 {
-
     public function __construct()
     {
     }
@@ -35,7 +34,7 @@ class MailgunWebhookController extends BaseController
         }
 
         if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature'])) {
-            ProcessMailgunWebhook::dispatch($request->all())->delay(rand(2,10));
+            ProcessMailgunWebhook::dispatch($request->all())->delay(rand(2, 10));
         }
 
         return response()->json(['message' => 'Success.'], 200);

app/Http/Controllers/OneTimeTokenController.php

@@ -22,7 +22,6 @@ use Illuminate\Support\Str;
 
 class OneTimeTokenController extends BaseController
 {
-
     public function __construct()
     {
         parent::__construct();

app/Http/Controllers/PostMarkController.php

@@ -19,7 +19,6 @@ use Illuminate\Http\Request;
  */
 class PostMarkController extends BaseController
 {
-
     public function __construct()
     {
     }

app/Http/Controllers/PreviewController.php

@@ -297,8 +297,7 @@ class PreviewController extends BaseController
                 ->setTemplate($design_object)
                 ->mock();
         } catch(SyntaxError $e) {
-        }
+        } catch(\Exception $e) {
-        catch(\Exception $e) {
             return response()->json(['message' => 'invalid data access', 'errors' => ['design.design.body' => $e->getMessage()]], 422);
         }
 

app/Http/Controllers/SelfUpdateController.php

@@ -181,8 +181,9 @@ class SelfUpdateController extends BaseController
 
     public function checkVersion()
     {
-        if(Ninja::isHosted())
+        if(Ninja::isHosted()) {
             return '5.10.SaaS';
+        }
 
         return trim(file_get_contents(config('ninja.version_url')));
     }

app/Http/Middleware/ThrottleRequestsWithPredis.php

@@ -85,7 +85,10 @@ class ThrottleRequestsWithPredis extends \Illuminate\Routing\Middleware\Throttle
     protected function tooManyAttempts($key, $maxAttempts, $decaySeconds)
     {
         $limiter = new DurationLimiter(
-            $this->getRedisConnection(), $key, $maxAttempts, $decaySeconds
+            $this->getRedisConnection(),
+            $key,
+            $maxAttempts,
+            $decaySeconds
         );
 
         return tap(! $limiter->acquire(), function () use ($key, $limiter) {

app/Http/Requests/Activity/StoreNoteRequest.php

@@ -68,8 +68,9 @@ class StoreNoteRequest extends Request
 
     public function getEntity()
     {
-        if(!$this->entity)
+        if(!$this->entity) {
             return false;
+        }
 
         $class = "\\App\\Models\\".ucfirst(Str::camel(rtrim($this->entity, 's')));
         return $class::withTrashed()->find(is_string($this->entity_id) ? $this->decodePrimaryKey($this->entity_id) : $this->entity_id);

app/Http/Requests/Chart/ShowCalculatedFieldRequest.php

@@ -66,8 +66,7 @@ class ShowCalculatedFieldRequest extends Request
             $input['end_date'] = now()->format('Y-m-d');
         }
 
-        if(isset($input['period']) && $input['period'] == 'previous')
+        if(isset($input['period']) && $input['period'] == 'previous') {
-        {
             $dates = $this->calculatePreviousPeriodStartAndEndDates($input, $user->company());
             $input['start_date'] = $dates[0];
             $input['end_date'] = $dates[1];

app/Http/Requests/Invoice/BulkInvoiceRequest.php

@@ -40,8 +40,9 @@ class BulkInvoiceRequest extends Request
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if(\Illuminate\Support\Facades\Cache::has($this->ip()."|".$this->input('action', 0)."|".$user->company()->company_key))
+        if(\Illuminate\Support\Facades\Cache::has($this->ip()."|".$this->input('action', 0)."|".$user->company()->company_key)) {
             throw new DuplicatePaymentException('Duplicate request.', 429);
+        }
 
         \Illuminate\Support\Facades\Cache::put(($this->ip()."|".$this->input('action', 0)."|".$user->company()->company_key), true, 1);
 

app/Http/Requests/Payment/StorePaymentRequest.php

@@ -80,8 +80,9 @@ class StorePaymentRequest extends Request
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if(\Illuminate\Support\Facades\Cache::has($this->ip()."|".$this->input('amount', 0)."|".$this->input('client_id', '')."|".$user->company()->company_key))
+        if(\Illuminate\Support\Facades\Cache::has($this->ip()."|".$this->input('amount', 0)."|".$this->input('client_id', '')."|".$user->company()->company_key)) {
             throw new DuplicatePaymentException('Duplicate request.', 429);
+        }
 
         \Illuminate\Support\Facades\Cache::put(($this->ip()."|".$this->input('amount', 0)."|".$this->input('client_id', '')."|".$user->company()->company_key), true, 1);
 

app/Http/Requests/Quote/StoreQuoteRequest.php

@@ -44,7 +44,7 @@ class StoreQuoteRequest extends Request
 
         $rules = [];
 
-        $rules['client_id'] = ['required', 'bail', Rule::exists('clients', 'id')->where('company_id', $user->company()->id)->where('is_deleted',0)];
+        $rules['client_id'] = ['required', 'bail', Rule::exists('clients', 'id')->where('company_id', $user->company()->id)->where('is_deleted', 0)];
 
         if ($this->file('documents') && is_array($this->file('documents'))) {
             $rules['documents.*'] = $this->fileValidation();

app/Http/Requests/Report/GenericReportRequest.php

@@ -17,7 +17,6 @@ use Illuminate\Auth\Access\AuthorizationException;
 
 class GenericReportRequest extends Request
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *

app/Http/Requests/User/DisconnectUserMailerRequest.php

@@ -15,7 +15,6 @@ use App\Http\Requests\Request;
 
 class DisconnectUserMailerRequest extends Request
 {
-
     /**
      * Determine if the user is authorized to make this request.
      *

app/Http/Requests/User/UpdateUserRequest.php

@@ -77,8 +77,7 @@ class UpdateUserRequest extends Request
             unset($input['oauth_user_token']);
         }
 
-        if(isset($input['password']) && is_string($input['password']))
+        if(isset($input['password']) && is_string($input['password'])) {
-        {
             $input['password'] = trim($input['password']);
         }
 

app/Http/ValidationRules/EInvoice/ValidClientScheme.php

@@ -34,8 +34,7 @@ class ValidClientScheme implements ValidationRule, ValidatorAwareRule
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
 
-        if(isset($value['Invoice']))
+        if(isset($value['Invoice'])) {
-        {
             $r = new EInvoice();
             $errors = $r->validateRequest($value['Invoice'], ClientLevel::class);
 

app/Http/ValidationRules/EInvoice/ValidCompanyScheme.php

@@ -24,7 +24,6 @@ use Illuminate\Contracts\Validation\ValidatorAwareRule;
  */
 class ValidCompanyScheme implements ValidationRule, ValidatorAwareRule
 {
- 
     /**
      * The validator instance.
      *
@@ -35,8 +34,7 @@ class ValidCompanyScheme implements ValidationRule, ValidatorAwareRule
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
 
-        if(isset($value['Invoice']))
+        if(isset($value['Invoice'])) {
-        {
             $r = new EInvoice();
             $errors = $r->validateRequest($value['Invoice'], CompanyLevel::class);
 

app/Http/ValidationRules/Payment/ValidInvoicesRules.php

@@ -89,7 +89,7 @@ class ValidInvoicesRules implements Rule
             } elseif (floatval($invoice['amount']) > floatval($inv->balance)) {
                 $this->error_msg = ctrans('texts.amount_greater_than_balance_v5');
                 return false;
-            } elseif($inv->is_deleted){
+            } elseif($inv->is_deleted) {
                 $this->error_msg = 'One or more invoices in this request have since been deleted';
                 return false;
             }

app/Http/ViewComposers/Components/Rotessa/AccountComponent.php

@@ -42,8 +42,9 @@ class AccountComponent extends Component
         "authorization_type" => 'Online'
     ];
 
-    public function __construct(public array $account) {
+    public function __construct(public array $account)
-        $this->attributes = $this->newAttributeBag(Arr::only($this->account, $this->fields) );
+    {
+        $this->attributes = $this->newAttributeBag(Arr::only($this->account, $this->fields));
     }
 
     public function render()

app/Http/ViewComposers/Components/Rotessa/AddressComponent.php

@@ -34,21 +34,25 @@ class AddressComponent extends Component
         'country' => 'US'
     ];
 
-    public function __construct(public array $address) {
+    public function __construct(public array $address)
-        if(strlen($this->address['state']) > 2 ) {
+    {
+        if(strlen($this->address['state']) > 2) {
             $this->address['state'] = $this->address['country'] == 'US' ? array_search($this->address['state'], USStates::$states) : CAProvinces::getAbbreviation($this->address['state']);
         }
 
         $this->attributes = $this->newAttributeBag(
-            Arr::only(Arr::mapWithKeys($this->address, function ($item, $key) {
+            Arr::only(
-                return in_array($key, ['address1','address2','state'])?[ (['address1'=>'address_1','address2'=>'address_2','state'=>'province_code'])[$key] => $item ] :[ $key => $item ];
+                Arr::mapWithKeys($this->address, function ($item, $key) {
+                    return in_array($key, ['address1','address2','state']) ? [ (['address1' => 'address_1','address2' => 'address_2','state' => 'province_code'])[$key] => $item ] : [ $key => $item ];
                 }),
-        $this->fields) );
+                $this->fields
+            )
+        );
     }
 
 
     public function render()
     {
-        return render('gateways.rotessa.components.address',   $this->attributes->getAttributes() + $this->defaults );
+        return render('gateways.rotessa.components.address', $this->attributes->getAttributes() + $this->defaults);
     }
 }

app/Http/ViewComposers/Components/Rotessa/ContactComponent.php

@@ -18,21 +18,20 @@ use App\Models\ClientContact;
 use Illuminate\Support\Arr;
 use Illuminate\View\View;
 
-
 // Contact Component
 class ContactComponent extends Component
 {
-
+    public function __construct(ClientContact $contact)
-    public function __construct(ClientContact $contact) {
+    {
 
         $contact = collect($contact->client->contacts->firstWhere('is_primary', 1)->toArray())->merge([
-            'home_phone' =>$contact->client->phone, 
+            'home_phone' => $contact->client->phone,
             'custom_identifier' => $contact->client->client_hash,
-            'name' =>$contact->client->name,
+            'name' => $contact->client->name,
             'id' => null,
-        ] )->all();
+        ])->all();
 
-        $this->attributes = $this->newAttributeBag(Arr::only($contact, $this->fields) );
+        $this->attributes = $this->newAttributeBag(Arr::only($contact, $this->fields));
     }
 
     private $fields = [
@@ -53,6 +52,6 @@ class ContactComponent extends Component
 
     public function render()
     {
-        return render('gateways.rotessa.components.contact', $this->attributes->getAttributes() + $this->defaults );
+        return render('gateways.rotessa.components.contact', $this->attributes->getAttributes() + $this->defaults);
     }
 }

app/Import/Providers/Quickbooks.php

@@ -12,23 +12,24 @@
 namespace App\Import\Providers;
 
 use App\Models\Invoice;
-use App\Factory\ProductFactory;
 use App\Factory\ClientFactory;
 use App\Factory\InvoiceFactory;
 use App\Factory\PaymentFactory;
+use App\Factory\ProductFactory;
+use App\Import\ImportException;
 use Illuminate\Support\Facades\Cache;
 use App\Repositories\ClientRepository;
 use App\Repositories\InvoiceRepository;
-use App\Repositories\ProductRepository;
 use App\Repositories\PaymentRepository;
+use App\Repositories\ProductRepository;
 use App\Http\Requests\Client\StoreClientRequest;
-use App\Http\Requests\Product\StoreProductRequest;
 use App\Http\Requests\Invoice\StoreInvoiceRequest;
 use App\Http\Requests\Payment\StorePaymentRequest;
+use App\Http\Requests\Product\StoreProductRequest;
 use App\Import\Transformer\Quickbooks\ClientTransformer;
 use App\Import\Transformer\Quickbooks\InvoiceTransformer;
-use App\Import\Transformer\Quickbooks\ProductTransformer;
 use App\Import\Transformer\Quickbooks\PaymentTransformer;
+use App\Import\Transformer\Quickbooks\ProductTransformer;
 
 class Quickbooks extends BaseImport
 {
@@ -94,10 +95,11 @@ class Quickbooks extends BaseImport
         $this->entity_count['products'] = $count;
     }
 
-    public function getData($type) {
+    public function getData($type)
+    {
 
         // get the data from cache? file? or api ?
-        return json_decode(base64_decode(Cache::get("{$this->hash}-$type")), 1);
+        return json_decode(base64_decode(Cache::get("{$this->hash}-{$type}")), true);
     }
 
     public function payment()
@@ -143,7 +145,7 @@ class Quickbooks extends BaseImport
         $this->repository = app()->make($this->repository_name);
         $this->repository->import_mode = true;
         $this->transformer = new InvoiceTransformer($this->company);
-        $invoice_count = $this->ingestInvoices($data,'');
+        $invoice_count = $this->ingestInvoices($data, '');
         $this->entity_count['invoices'] = $invoice_count;
         $this->company->update_products = $initial_update_products_value;
         $this->company->save();
@@ -198,8 +200,7 @@ class Quickbooks extends BaseImport
                         'error' => $validator->errors()->all(),
                     ];
                 } else {
-                    if(!Invoice::where('number',$invoice_data['number'])->get()->first())
+                    if(!Invoice::where('number', $invoice_data['number'])->first()) {
-                    {
                         $invoice = InvoiceFactory::create(
                             $this->company->id,
                             $this->company->owner()->id

app/Import/Providers/Wave.php

@@ -244,8 +244,7 @@ class Wave extends BaseImport implements ImportInterface
                 if (empty($expense_data['vendor_id'])) {
                     $vendor_data['user_id'] = $this->getUserIDForRecord($expense_data);
 
-                    if(isset($raw_expense['Vendor Name']) || isset($raw_expense['Vendor']))
+                    if(isset($raw_expense['Vendor Name']) || isset($raw_expense['Vendor'])) {
-                    {
                         $vendor_repository->save(
                             ['name' => isset($raw_expense['Vendor Name']) ? $raw_expense['Vendor Name'] : isset($raw_expense['Vendor'])],
                             $vendor = VendorFactory::create(

app/Import/Transformer/BaseTransformer.php

@@ -119,8 +119,9 @@ class BaseTransformer
     {
         $code = array_key_exists($key, $data) ? $data[$key] : false;
 
-        if(!$code)
+        if(!$code) {
             return $this->company->settings->currency_id;
+        }
 
         /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
         $currencies = app('currencies');

app/Import/Transformer/Quickbooks/ClientTransformer.php

@@ -24,7 +24,6 @@ use Illuminate\Support\Str;
  */
 class ClientTransformer extends BaseTransformer
 {
-    
     use CommonTrait {
         transform as preTransform;
     }
@@ -49,7 +48,7 @@ class ClientTransformer extends BaseTransformer
     {
         parent::__construct($company);
 
-        $this->model = new Model;
+        $this->model = new Model();
     }
 
 
@@ -68,12 +67,13 @@ class ClientTransformer extends BaseTransformer
         }
 
         $transformed_data = $this->preTransform($data);
-        $transformed_data['contacts'][0] = $this->getContacts($data)->toArray()+['company_id' => $this->company->id ];
+        $transformed_data['contacts'][0] = $this->getContacts($data)->toArray() + ['company_id' => $this->company->id ];
 
         return $transformed_data;
     }
 
-    protected function getContacts($data) {
+    protected function getContacts($data)
+    {
         return (new ClientContact())->fill([
                     'first_name'    => $this->getString($data, 'GivenName'),
                     'last_name'     => $this->getString($data, 'FamilyName'),
@@ -84,12 +84,14 @@ class ClientTransformer extends BaseTransformer
     }
 
 
-    public function getShipAddrCountry($data,$field) {
+    public function getShipAddrCountry($data, $field)
-        return is_null(($c = $this->getString($data,$field))) ? null : $this->getCountryId($c);
+    {
+        return is_null(($c = $this->getString($data, $field))) ? null : $this->getCountryId($c);
     }
 
-    public function getBillAddrCountry($data,$field) {
+    public function getBillAddrCountry($data, $field)
-        return is_null(($c = $this->getString($data,$field))) ? null : $this->getCountryId($c);
+    {
+        return is_null(($c = $this->getString($data, $field))) ? null : $this->getCountryId($c);
     }
 
 }

app/Import/Transformer/Quickbooks/CommonTrait.php

@@ -8,8 +8,9 @@ trait CommonTrait
 {
     protected $model;
 
-    public function getString($data,$field) {
+    public function getString($data, $field)
-        return Arr::get($data,$field);
+    {
+        return Arr::get($data, $field);
     }
 
     public function getCreateTime($data, $field = null)
@@ -19,7 +20,7 @@ trait CommonTrait
 
     public function getLastUpdatedTime($data, $field = null)
     {
-        return $this->parseDateOrNull($data,'MetaData.LastUpdatedTime');
+        return $this->parseDateOrNull($data, 'MetaData.LastUpdatedTime');
     }
 
     public function transform($data)
@@ -27,7 +28,7 @@ trait CommonTrait
         $transformed = [];
 
         foreach ($this->fillable as $key => $field) {
-            $transformed[$key] = is_null((($v = $this->getString($data, $field))))? null : (method_exists($this, ($method = "get{$field}")) ? call_user_func([$this, $method], $data, $field ) : $this->getString($data,$field));
+            $transformed[$key] = is_null((($v = $this->getString($data, $field)))) ? null : (method_exists($this, ($method = "get{$field}")) ? call_user_func([$this, $method], $data, $field) : $this->getString($data, $field));
         }
 
         return $this->model->fillable(array_keys($this->fillable))->fill($transformed)->toArray() + ['company_id' => $this->company->id ] ;

app/Import/Transformer/Quickbooks/InvoiceTransformer.php

@@ -11,10 +11,11 @@
 
 namespace App\Import\Transformer\Quickbooks;
 
-use Illuminate\Support\Str;
+use App\Models\Invoice;
 use Illuminate\Support\Arr;
-use App\Import\ImportException;
+use Illuminate\Support\Str;
 use App\DataMapper\InvoiceItem;
+use App\Import\ImportException;
 use App\Models\Invoice as Model;
 use App\Import\Transformer\BaseTransformer;
 use App\Import\Transformer\Quickbooks\CommonTrait;
@@ -48,7 +49,7 @@ class InvoiceTransformer extends BaseTransformer
     {
         parent::__construct($company);
 
-        $this->model = new Model;
+        $this->model = new Model();
     }
 
     public function getInvoiceStatus($data)
@@ -63,28 +64,29 @@ class InvoiceTransformer extends BaseTransformer
 
     public function getTotalAmt($data)
     {
-        return (float) $this->getString($data,'TotalAmt');
+        return (float) $this->getString($data, 'TotalAmt');
     }
 
     public function getLine($data)
     {
         return array_map(function ($item) {
             return [
-                'description' => $this->getString($item,'Description'),
+                'description' => $this->getString($item, 'Description'),
-                'product_key' => $this->getString($item,'Description'),
+                'product_key' => $this->getString($item, 'Description'),
-                'quantity' => (int) $this->getString($item,'SalesItemLineDetail.Qty'),
+                'quantity' => (int) $this->getString($item, 'SalesItemLineDetail.Qty'),
-                'unit_price' =>(double) $this->getString($item,'SalesItemLineDetail.UnitPrice'),
+                'unit_price' => (float) $this->getString($item, 'SalesItemLineDetail.UnitPrice'),
-                'line_total' => (double) $this->getString($item,'Amount'),
+                'line_total' => (float) $this->getString($item, 'Amount'),
-                'cost' =>(double) $this->getString($item,'SalesItemLineDetail.UnitPrice'),
+                'cost' => (float) $this->getString($item, 'SalesItemLineDetail.UnitPrice'),
-                'product_cost' => (double) $this->getString($item,'SalesItemLineDetail.UnitPrice'),
+                'product_cost' => (float) $this->getString($item, 'SalesItemLineDetail.UnitPrice'),
-                'tax_amount' => (double) $this->getString($item,'TxnTaxDetail.TotalTax'),
+                'tax_amount' => (float) $this->getString($item, 'TxnTaxDetail.TotalTax'),
             ];
-        }, array_filter($this->getString($data,'Line'), function ($item) {
+        }, array_filter($this->getString($data, 'Line'), function ($item) {
-            return $this->getString($item,'DetailType') !== 'SubTotalLineDetail';
+            return $this->getString($item, 'DetailType') !== 'SubTotalLineDetail';
         }));
     }
 
-    public function getInvoiceClient($data, $field = null) {
+    public function getInvoiceClient($data, $field = null)
+    {
         /**
          *  "CustomerRef": {
                 "value": "23",
@@ -135,23 +137,22 @@ class InvoiceTransformer extends BaseTransformer
         $customer = explode(" ", $this->getString($data, 'CustomerRef.name'));
         $customer = ['GivenName' => $customer[0], 'FamilyName' => $customer[1]];
         $has_company = property_exists($bill_address, 'Line4');
-        $address = $has_company?  $bill_address->Line4 : $bill_address->Line3;
+        $address = $has_company ? $bill_address->Line4 : $bill_address->Line3;
-        $address_1 = substr($address, 0, stripos($address,','));
+        $address_1 = substr($address, 0, stripos($address, ','));
-        $address =array_filter( [$address_1] + (explode(' ', substr($address, stripos($address,",") + 1 ))));
+        $address = array_filter([$address_1] + (explode(' ', substr($address, stripos($address, ",") + 1))));
         $client_id = null;
         $client =
         [
-            "CompanyName" => $has_company?  $bill_address->Line2 : $bill_address->Line1,
+            "CompanyName" => $has_company ? $bill_address->Line2 : $bill_address->Line1,
-            "BillAddr" => array_combine(['City','CountrySubDivisionCode','PostalCode'], array_pad($address,3,'N/A') ) + ['Line1' => $has_company? $bill_address->Line3 : $bill_address->Line2 ],
+            "BillAddr" => array_combine(['City','CountrySubDivisionCode','PostalCode'], array_pad($address, 3, 'N/A')) + ['Line1' => $has_company ? $bill_address->Line3 : $bill_address->Line2 ],
             "ShipAddr" => $ship_address
         ] + $customer + ['PrimaryEmailAddr' => ['Address' => $this->getString($data, 'BillEmail.Address') ]];
-        if($this->hasClient($client['CompanyName']))
+        if($this->hasClient($client['CompanyName'])) {
-        {
+            $client_id = $this->getClient($client['CompanyName'], $this->getString($client, 'PrimaryEmailAddr.Address'));
-            $client_id = $this->getClient($client['CompanyName'],$this->getString($client, 'PrimaryEmailAddr.Address'));
         }
 
 
-        return ['client'=> (new ClientTransformer($this->company))->transform($client), 'client_id'=> $client_id ];
+        return ['client' => (new ClientTransformer($this->company))->transform($client), 'client_id' => $client_id ];
     }
 
     public function getDueDate($data)
@@ -161,22 +162,23 @@ class InvoiceTransformer extends BaseTransformer
 
     public function getDeposit($data)
     {
-        return (double) $this->getString($data,'Deposit');
+        return (float) $this->getString($data, 'Deposit');
     }
 
     public function getBalance($data)
     {
-        return (double) $this->getString($data,'Balance');
+        return (float) $this->getString($data, 'Balance');
     }
 
     public function getCustomerMemo($data)
     {
-        return $this->getString($data,'CustomerMemo.value');
+        return $this->getString($data, 'CustomerMemo.value');
     }
 
     public function getDocNumber($data, $field = null)
     {
-        return sprintf("%s-%s", 
+        return sprintf(
+            "%s-%s",
             $this->getString($data, 'DocNumber'),
             $this->getString($data, 'Id.value')
         );
@@ -184,8 +186,10 @@ class InvoiceTransformer extends BaseTransformer
 
     public function getLinkedTxn($data)
     {
-        $payments = $this->getString($data,'LinkedTxn');
+        $payments = $this->getString($data, 'LinkedTxn');
-        if(empty($payments)) return [];
+        if(empty($payments)) {
+            return [];
+        }
 
         return [[
              'amount' => $this->getTotalAmt($data),

app/Import/Transformer/Quickbooks/PaymentTransformer.php

@@ -44,10 +44,11 @@ class PaymentTransformer extends BaseTransformer
     {
         parent::__construct($company);
 
-        $this->model = new Model;
+        $this->model = new Model();
     }
 
-    public function getTotalAmt($data, $field = null) {
+    public function getTotalAmt($data, $field = null)
+    {
         return (float) $this->getString($data, $field);
     }
 
@@ -56,9 +57,9 @@ class PaymentTransformer extends BaseTransformer
         return $this->parseDateOrNull($data, $field);
     }
 
-    public function getCustomerRef($data, $field = null )
+    public function getCustomerRef($data, $field = null)
     {
-        return $this->getClient($this->getString($data, 'CustomerRef.name'),null);
+        return $this->getClient($this->getString($data, 'CustomerRef.name'), null);
     }
 
     public function getCurrencyRef($data, $field = null)
@@ -69,9 +70,13 @@ class PaymentTransformer extends BaseTransformer
     public function getLine($data, $field = null)
     {
         $invoices = [];
-        $invoice = $this->getString($data,'Line.LinkedTxn.TxnType');
+        $invoice = $this->getString($data, 'Line.LinkedTxn.TxnType');
-        if(is_null($invoice) || $invoice !== 'Invoice') return $invoices;
+        if(is_null($invoice) || $invoice !== 'Invoice') {
-        if( is_null( ($invoice_id = $this->getInvoiceId($this->getString($data, 'Line.LinkedTxn.TxnId.value')))) ) return $invoices;
+            return $invoices;
+        }
+        if(is_null(($invoice_id = $this->getInvoiceId($this->getString($data, 'Line.LinkedTxn.TxnId.value'))))) {
+            return $invoices;
+        }
 
         return [[
             'amount' => (float) $this->getString($data, 'Line.Amount'),
@@ -88,7 +93,9 @@ class PaymentTransformer extends BaseTransformer
     {
         $invoice = Invoice::query()->where('company_id', $this->company->id)
             ->where('is_deleted', false)
-            ->where("number", "LIKE", 
+            ->where(
+                "number",
+                "LIKE",
                 "%-$invoice_number%",
             )
             ->first();

app/Import/Transformer/Quickbooks/ProductTransformer.php

@@ -22,7 +22,6 @@ use App\Import\ImportException;
  */
 class ProductTransformer extends BaseTransformer
 {
-
     use CommonTrait;
 
     protected $fillable = [
@@ -41,19 +40,22 @@ class ProductTransformer extends BaseTransformer
     {
         parent::__construct($company);
 
-        $this->model = new Model;
+        $this->model = new Model();
     }
 
-    public function getQtyOnHand($data, $field = null) {
+    public function getQtyOnHand($data, $field = null)
+    {
         return (int) $this->getString($data, $field);
     }
 
-    public function getPurchaseCost($data, $field = null) {
+    public function getPurchaseCost($data, $field = null)
-        return (double) $this->getString($data, $field);
+    {
+        return (float) $this->getString($data, $field);
     }
 
 
-    public function getUnitPrice($data, $field = null) {
+    public function getUnitPrice($data, $field = null)
+    {
         return (float) $this->getString($data, $field);
     }
 }

app/Import/Transformer/Wave/ExpenseTransformer.php

@@ -38,12 +38,13 @@ class ExpenseTransformer extends BaseTransformer
 
         $tax_rate = $total_tax > 0 ? round(($total_tax / $amount) * 100, 3) : 0;
 
-        if(isset($data['Notes / Memo']) && strlen($data['Notes / Memo']) > 1)
+        if(isset($data['Notes / Memo']) && strlen($data['Notes / Memo']) > 1) {
             $public_notes = $data['Notes / Memo'];
-        elseif (isset($data['Transaction Description']) && strlen($data['Transaction Description']) > 1)
+        } elseif (isset($data['Transaction Description']) && strlen($data['Transaction Description']) > 1) {
             $public_notes = $data['Transaction Description'];
-        else
+        } else {
             $public_notes = '';
+        }
 
 
         $transformed = [

app/Jobs/Bank/MatchBankTransactions.php

@@ -237,7 +237,7 @@ class MatchBankTransactions implements ShouldQueue
 
         $amount = $this->bt->amount;
 
-        if ($_invoices->count() >0 && $this->checkPayable($_invoices)) {
+        if ($_invoices->count() > 0 && $this->checkPayable($_invoices)) {
             $this->createPayment($_invoices, $amount);
 
             $this->bts->push($this->bt->id);
@@ -387,7 +387,7 @@ class MatchBankTransactions implements ShouldQueue
 
         $hashed_keys = [];
 
-        foreach($this->attachable_invoices as $attachable_invoice){ //@phpstan-ignore-line
+        foreach($this->attachable_invoices as $attachable_invoice) { //@phpstan-ignore-line
             $hashed_keys[] = $this->encodePrimaryKey($attachable_invoice['id']);
         }
 

app/Jobs/Cron/RecurringExpensesCron.php

@@ -114,8 +114,7 @@ class RecurringExpensesCron
             $exchange_rate = new CurrencyApi();
 
             $expense->exchange_rate = $exchange_rate->exchangeRate($expense->currency_id, (int)$expense->company->settings->currency_id, Carbon::parse($expense->date));
-        }
+        } else {
-        else {
             $expense->exchange_rate = 1;
         }
 

app/Jobs/Import/QuickbooksIngest.php

@@ -12,7 +12,10 @@ use Illuminate\Foundation\Bus\Dispatchable;
 
 class QuickbooksIngest implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     protected $engine;
     protected $request;
@@ -35,7 +38,7 @@ class QuickbooksIngest implements ShouldQueue
         MultiDB::setDb($this->company->db);
         set_time_limit(0);
 
-        $engine = new Quickbooks(['import_type' => 'client', 'hash'=> $this->request['hash'] ], $this->company);
+        $engine = new Quickbooks(['import_type' => 'client', 'hash' => $this->request['hash'] ], $this->company);
         foreach ($this->request['import_types'] as $entity) {
             $engine->import($entity);
         }

app/Jobs/Task/TaskAssigned.php

@@ -48,12 +48,11 @@ class TaskAssigned implements ShouldQueue
 
         $company_user = $this->task->assignedCompanyUser();
 
-        if(($company_user instanceof CompanyUser) && $this->findEntityAssignedNotification($company_user, 'task'))
+        if(($company_user instanceof CompanyUser) && $this->findEntityAssignedNotification($company_user, 'task')) {
-        {
             $mo = new EmailObject();
             $mo->subject = ctrans('texts.task_assigned_subject', ['task' => $this->task->number, 'date' => now()->setTimeZone($this->task->company->timezone()->name)->format($this->task->company->date_format()) ]);
-            $mo->body = ctrans('texts.task_assigned_body',['task' => $this->task->number, 'description' => $this->task->description ?? '', 'client' => $this->task->client ? $this->task->client->present()->name() : ' ']);
+            $mo->body = ctrans('texts.task_assigned_body', ['task' => $this->task->number, 'description' => $this->task->description ?? '', 'client' => $this->task->client ? $this->task->client->present()->name() : ' ']);
-            $mo->text_body = ctrans('texts.task_assigned_body',['task' => $this->task->number, 'description' => $this->task->description ?? '', 'client' => $this->task->client ? $this->task->client->present()->name() : ' ']);
+            $mo->text_body = ctrans('texts.task_assigned_body', ['task' => $this->task->number, 'description' => $this->task->description ?? '', 'client' => $this->task->client ? $this->task->client->present()->name() : ' ']);
             $mo->company_key = $this->task->company->company_key;
             $mo->html_template = 'email.template.generic';
             $mo->to = [new Address($this->task->assigned_user->email, $this->task->assigned_user->present()->name())];

app/Livewire/BillingPortalPurchase.php

@@ -363,10 +363,11 @@ class BillingPortalPurchase extends Component
         $method_values = array_column($this->methods, 'is_paypal');
         $is_paypal = in_array('1', $method_values);
 
-        if($is_paypal && !$this->steps['check_rff'])
+        if($is_paypal && !$this->steps['check_rff']) {
             $this->rff();
-        elseif(!$this->steps['check_rff'])
+        } elseif(!$this->steps['check_rff']) {
             $this->steps['fetched_payment_methods'] = true;
+        }
 
         $this->heading_text = ctrans('texts.payment_methods');
 

app/Livewire/BillingPortalPurchasev2.php

@@ -515,8 +515,7 @@ class BillingPortalPurchasev2 extends Component
             strlen($this->contact_email ?? '') == 0 ||
             strlen($this->client_city ?? '') == 0 ||
             strlen($this->client_postal_code ?? '') == 0
-        )
+        ) {
-        {
             $this->check_rff = true;
         }
 

app/Livewire/Flow2/InvoicePay.php

@@ -143,7 +143,7 @@ class InvoicePay extends Component
 
         $this->payment_method_accepted = true;
 
-        $company_gateway = CompanyGateway::find($company_gateway_id);
+        $company_gateway = CompanyGateway::query()->find($company_gateway_id);
 
         $this->checkRequiredFields($company_gateway);
     }
@@ -240,8 +240,9 @@ class InvoicePay extends Component
 
         nlog($this->invoices);
 
-        if(is_array($this->invoices))
+        if(is_array($this->invoices)) {
             $this->invoices = Invoice::find($this->transformKeys($this->invoices));
+        }
 
         $invoices = $this->invoices->filter(function ($i) {
             $i = $i->service()

app/Livewire/Flow2/Signature.php

@@ -16,10 +16,8 @@ use Livewire\Component;
 
 class Signature extends Component
 {
-    
     public function render()
     {
         return render('components.livewire.signature');
     }
 }
-

app/Livewire/Flow2/UnderOverPayment.php

@@ -18,7 +18,6 @@ use Livewire\Component;
 
 class UnderOverPayment extends Component
 {
-
     use WithSecureContext;
 
     public $payableAmount;
@@ -45,29 +44,28 @@ class UnderOverPayment extends Component
 
         $settings = $this->getContext()['settings'];
 
-        foreach($payableInvoices as $key => $invoice){
+        foreach($payableInvoices as $key => $invoice) {
             $payableInvoices[$key]['amount'] = Number::parseFloat($invoice['formatted_amount']);
         }
 
         $input_amount = collect($payableInvoices)->sum('amount');
 
-        if($settings->client_portal_allow_under_payment && $settings->client_portal_under_payment_minimum != 0)
+        if($settings->client_portal_allow_under_payment && $settings->client_portal_under_payment_minimum != 0) {
-        {
+            if($input_amount <= $settings->client_portal_under_payment_minimum) {
-            if($input_amount <= $settings->client_portal_under_payment_minimum){
                 // return error message under payment too low.
                 $this->errors = ctrans('texts.minimum_required_payment', ['amount' => $settings->client_portal_under_payment_minimum]);
                 $this->dispatch('errorMessageUpdate', errors: $this->errors);
             }
         }
 
-        if(!$settings->client_portal_allow_over_payment && ($input_amount > $this->invoice_amount)){
+        if(!$settings->client_portal_allow_over_payment && ($input_amount > $this->invoice_amount)) {
             $this->errors = ctrans('texts.over_payments_disabled');
             $this->dispatch('errorMessageUpdate', errors: $this->errors);
         }
 
-        if(!$this->errors){
+        if(!$this->errors) {
             $this->setContext('payable_invoices', $payableInvoices);
-            $this->dispatch('payable-amount',  payable_amount: $input_amount );
+            $this->dispatch('payable-amount', payable_amount: $input_amount);
         }
     }
 

app/Models/Activity.php

@@ -449,8 +449,9 @@ class Activity extends StaticModel
         $replacements['created_at'] = $this->created_at ?? '';
         $replacements['ip'] = $this->ip ?? '';
 
-        if($this->activity_type_id == 141)
+        if($this->activity_type_id == 141) {
             $replacements = $this->harvestNoteEntities($replacements);
+        }
 
         return $replacements;
 
@@ -472,12 +473,12 @@ class Activity extends StaticModel
 
         ];
 
-        foreach($entities as $entity)
+        foreach($entities as $entity) {
-        {
             $entity_key = substr($entity, 1);
 
-            if($this?->{$entity_key})
+            if($this?->{$entity_key}) {
                 $replacements = array_merge($replacements, $this->matchVar($entity));
+            }
 
         }
 

app/Models/BaseModel.php

@@ -374,10 +374,9 @@ class BaseModel extends Model
 
         $files->push($company_docs);
 
-        try{
+        try {
             $pdf = (new PdfMerge($files->flatten()->toArray()))->run();
-        }
+        } catch(\Exception $e) {
-        catch(\Exception $e){
             nlog("Exception:: BaseModel:: PdfMerge::" . $e->getMessage());
         }
 

app/Models/Company.php

@@ -118,7 +118,7 @@ use Laracasts\Presenter\PresentableTrait;
  * @property string|null $smtp_port
  * @property string|null $smtp_encryption
  * @property string|null $smtp_local_domain
- * @property string|null $quickbooks
+ * @property object|null $quickbooks
  * @property boolean $smtp_verify_peer
  * @property-read \App\Models\Account $account
  * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities

app/Models/Invoice.php

@@ -431,9 +431,9 @@ class Invoice extends BaseModel
 
     public function isPayable(): bool
     {
-        if($this->is_deleted || $this->status_id == self::STATUS_PAID)
+        if($this->is_deleted || $this->status_id == self::STATUS_PAID) {
             return false;
-        elseif ($this->status_id == self::STATUS_DRAFT && $this->is_deleted == false) {
+        } elseif ($this->status_id == self::STATUS_DRAFT && $this->is_deleted == false) {
             return true;
         } elseif ($this->status_id == self::STATUS_SENT && $this->is_deleted == false) {
             return true;

app/Models/Quote.php

@@ -435,8 +435,9 @@ class Quote extends BaseModel
      */
     public function canRemind(): bool
     {
-        if (in_array($this->status_id, [self::STATUS_DRAFT, self::STATUS_APPROVED, self::STATUS_CONVERTED]) || $this->is_deleted) 
+        if (in_array($this->status_id, [self::STATUS_DRAFT, self::STATUS_APPROVED, self::STATUS_CONVERTED]) || $this->is_deleted) {
             return false;
+        }
 
         return true;
 

app/Models/Task.php

@@ -296,8 +296,7 @@ class Task extends BaseModel
         $client_currency = $this->client->getSetting('currency_id');
         $company_currency = $this->company->getSetting('currency_id');
 
-        if($client_currency != $company_currency)
+        if($client_currency != $company_currency) {
-        {
             $converter = new CurrencyApi();
             return $converter->convert($this->taskValue(), $client_currency, $company_currency);
         }
@@ -308,7 +307,7 @@ class Task extends BaseModel
 
     public function taskValue(): float
     {
-        return round(($this->calcDuration() / 3600) * $this->getRate(),2);
+        return round(($this->calcDuration() / 3600) * $this->getRate(), 2);
     }
 
     public function processLogs()
@@ -374,8 +373,9 @@ class Task extends BaseModel
 
     public function assignedCompanyUser()
     {
-        if(!$this->assigned_user_id)
+        if(!$this->assigned_user_id) {
             return false;
+        }
 
         return CompanyUser::where('company_id', $this->company_id)->where('user_id', $this->assigned_user_id)->first();
     }

app/Notifications/Ninja/EmailQuotaNotification.php

@@ -66,7 +66,7 @@ class EmailQuotaNotification extends Notification
     {
         $content = "Email quota exceeded by Account {$this->account->key} \n";
 
-        $owner = $this->account->companies()->first()->owner() ?? $this->account->users()->orderBy('id','asc')->first();
+        $owner = $this->account->companies()->first()->owner() ?? $this->account->users()->orderBy('id', 'asc')->first();
         $owner_name = $owner->present()->name() ?? 'No Owner Found';
         $owner_email = $owner->email ?? 'No Owner Email Found';
 

app/PaymentDrivers/Authorize/AuthorizeCreditCard.php

@@ -21,7 +21,6 @@ use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\AuthorizePaymentDriver;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\Utils\Traits\MakesHash;
 use net\authorize\api\contract\v1\DeleteCustomerPaymentProfileRequest;
 use net\authorize\api\contract\v1\DeleteCustomerProfileRequest;
@@ -31,7 +30,7 @@ use net\authorize\api\controller\DeleteCustomerProfileController;
 /**
  * Class AuthorizeCreditCard.
  */
-class AuthorizeCreditCard implements LivewireMethodInterface
+class AuthorizeCreditCard
 {
     use MakesHash;
 
@@ -42,7 +41,7 @@ class AuthorizeCreditCard implements LivewireMethodInterface
         $this->authorize = $authorize;
     }
 
-    public function paymentData(array $data): array
+    public function processPaymentView($data)
     {
         $tokens = ClientGatewayToken::where('client_id', $this->authorize->client->id)
                                     ->where('company_gateway_id', $this->authorize->company_gateway->id)
@@ -55,13 +54,6 @@ class AuthorizeCreditCard implements LivewireMethodInterface
         $data['public_client_id'] = $this->authorize->init()->getPublicClientKey();
         $data['api_login_id'] = $this->authorize->company_gateway->getConfigField('apiLoginId');
 
-        return $data;
-    }
-
-    public function processPaymentView($data)
-    {
-        $data = $this->paymentData($data);
-
         return render('gateways.authorize.credit_card.pay', $data);
     }
 
@@ -321,9 +313,4 @@ class AuthorizeCreditCard implements LivewireMethodInterface
             'invoices' => $vars['invoices'],
         ];
     }
-    
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.authorize.credit_card.pay_livewire';
-    }
 }

app/PaymentDrivers/BTCPay/BTCPay.php

@@ -14,7 +14,6 @@ namespace App\PaymentDrivers\BTCPay;
 
 use App\Models\Payment;
 use App\PaymentDrivers\BTCPayPaymentDriver;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\Utils\Traits\MakesHash;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
@@ -25,7 +24,7 @@ use App\Services\Email\EmailObject;
 use App\Services\Email\Email;
 use Illuminate\Support\Facades\App;
 
-class BTCPay implements MethodInterface, LivewireMethodInterface
+class BTCPay implements MethodInterface
 {
     use MakesHash;
 
@@ -50,7 +49,9 @@ class BTCPay implements MethodInterface, LivewireMethodInterface
 
     public function paymentView($data)
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->driver_class;
+        $data['amount'] = $data['total']['amount_with_fee'];
+        $data['currency'] = $this->driver_class->client->getCurrencyCode();
 
         return render('gateways.btcpay.pay', $data);
     }
@@ -175,24 +176,4 @@ class BTCPay implements MethodInterface, LivewireMethodInterface
             throw new PaymentFailed('Error during BTCPay refund : ' . $e->getMessage());
         }
     }
-    
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.btcpay.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->driver_class;
-        $data['amount'] = $data['total']['amount_with_fee'];
-        $data['currency'] = $this->driver_class->client->getCurrencyCode();
-
-        return $data;
-    }
 }

app/PaymentDrivers/BaseDriver.php

@@ -867,14 +867,4 @@ class BaseDriver extends AbstractPaymentDriver
     {
 
     }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        return $this->payment_method->livewirePaymentView($data);
-    }
-
-    public function processPaymentViewData(array $data): array
-    {
-        return $this->payment_method->paymentData($data); 
-    }
 }

app/PaymentDrivers/Braintree/ACH.php

@@ -20,12 +20,11 @@ use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\BraintreePaymentDriver;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 
-class ACH implements MethodInterface, LivewireMethodInterface
+class ACH implements MethodInterface
 {
     use MakesHash;
 
@@ -98,7 +97,10 @@ class ACH implements MethodInterface, LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->braintree;
+        $data['currency'] = $this->braintree->client->getCurrencyCode();
+        $data['payment_method_id'] = GatewayType::BANK_TRANSFER;
+        $data['amount'] = $this->braintree->payment_hash->data->amount_with_fee;
 
         return render('gateways.braintree.ach.pay', $data);
     }
@@ -179,24 +181,4 @@ class ACH implements MethodInterface, LivewireMethodInterface
 
         throw new PaymentFailed($response->transaction->additionalProcessorResponse, $response->transaction->processorResponseCode);
     }
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.braintree.ach.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->braintree;
-        $data['currency'] = $this->braintree->client->getCurrencyCode();
-        $data['payment_method_id'] = GatewayType::BANK_TRANSFER;
-        $data['amount'] = $this->braintree->payment_hash->data->amount_with_fee;
-
-        return $data;
-    }
 }

app/PaymentDrivers/Braintree/CreditCard.php

@@ -21,9 +21,8 @@ use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\BraintreePaymentDriver;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     /**
      * @var BraintreePaymentDriver
@@ -77,7 +76,6 @@ class CreditCard implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-<<<<<<< HEAD
         $data['gateway'] = $this->braintree;
         $data['client_token'] = $this->braintree->gateway->clientToken()->generate();
         $data['threeds'] = $this->threeDParameters($data);
@@ -89,9 +87,6 @@ class CreditCard implements LivewireMethodInterface
                 'merchantAccountId' => $this->braintree->company_gateway->getConfigField('merchantAccountId'),
             ]);
         }
-=======
-       $data = $this->paymentData($data);
->>>>>>> new_payment_flow
 
         return render('gateways.braintree.credit_card.pay', $data);
     }
@@ -283,32 +278,4 @@ class CreditCard implements LivewireMethodInterface
             return $this->braintree->processInternallyFailedPayment($this->braintree, $e);
         }
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.braintree.credit_card.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->braintree;
-        $data['client_token'] = $this->braintree->gateway->clientToken()->generate();
-        $data['threeds'] = $this->threeDParameters($data);
-        $data['threeds_enable'] = $this->braintree->company_gateway->getConfigField('threeds') ? "true" : "false";
-
-        if ($this->braintree->company_gateway->getConfigField('merchantAccountId')) {
-            /** https://developer.paypal.com/braintree/docs/reference/request/client-token/generate#merchant_account_id */
-            $data['client_token'] = $this->braintree->gateway->clientToken()->generate([
-                'merchantAccountId' => $this->braintree->company_gateway->getConfigField('merchantAccountId'),
-            ]);
-        }
-
-        return $data;
-    }
 }

app/PaymentDrivers/Braintree/PayPal.php

@@ -10,9 +10,8 @@ use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\BraintreePaymentDriver;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 
-class PayPal implements LivewireMethodInterface
+class PayPal
 {
     /**
      * @var BraintreePaymentDriver
@@ -46,7 +45,8 @@ class PayPal implements LivewireMethodInterface
      */
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->braintree;
+        $data['client_token'] = $this->braintree->gateway->clientToken()->generate();
 
         return render('gateways.braintree.paypal.pay', $data);
     }
@@ -188,23 +188,4 @@ class PayPal implements LivewireMethodInterface
             return $this->braintree->processInternallyFailedPayment($this->braintree, $e);
         }
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.braintree.paypal.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->braintree;
-        $data['client_token'] = $this->braintree->gateway->clientToken()->generate();
-
-        return $data;
-    }
 }

app/PaymentDrivers/CheckoutCom/CreditCard.php

@@ -19,7 +19,6 @@ use App\Models\ClientGatewayToken;
 use App\Models\GatewayType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\CheckoutComPaymentDriver;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\Utils\Traits\MakesHash;
 use Checkout\CheckoutApiException;
@@ -33,7 +32,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
-class CreditCard implements MethodInterface, LivewireMethodInterface
+class CreditCard implements MethodInterface
 {
     use Utilities;
     use MakesHash;
@@ -141,7 +140,7 @@ class CreditCard implements MethodInterface, LivewireMethodInterface
         }
     }
 
-    public function paymentData(array $data): array
+    public function paymentView($data)
     {
         $data['gateway'] = $this->checkout;
         $data['company_gateway'] = $this->checkout->company_gateway;
@@ -151,25 +150,9 @@ class CreditCard implements MethodInterface, LivewireMethodInterface
         $data['raw_value'] = $data['total']['amount_with_fee'];
         $data['customer_email'] = $this->checkout->client->present()->email();
 
-        return $data;
-    }
-    
-    public function paymentView($data, $livewire = false)
-    {
-        $data = $this->paymentData($data);
-
-        if ($livewire) {
-            return render('gateways.checkout.credit_card.pay_livewire', $data);
-        }
-
         return render('gateways.checkout.credit_card.pay', $data);
     }
 
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.checkout.credit_card.livewire_pay'; 
-    }
-
     public function paymentResponse(PaymentResponseRequest $request)
     {
         $state = [

app/PaymentDrivers/CheckoutComPaymentDriver.php

@@ -12,7 +12,6 @@
 
 namespace App\PaymentDrivers;
 
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use Exception;
 use App\Models\Company;
 use App\Models\Invoice;

app/PaymentDrivers/Eway/CreditCard.php

@@ -17,11 +17,10 @@ use App\Jobs\Util\SystemLogger;
 use App\Models\GatewayType;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\EwayPaymentDriver;
 use App\Utils\Traits\MakesHash;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     use MakesHash;
 
@@ -103,18 +102,11 @@ class CreditCard implements LivewireMethodInterface
         return $token;
     }
 
-    public function paymentData(array $data): array
+    public function paymentView($data)
     {
         $data['gateway'] = $this->eway_driver;
         $data['public_api_key'] = $this->eway_driver->company_gateway->getConfigField('publicApiKey');
 
-        return $data;
-    }
-
-    public function paymentView($data)
-    {
-        $data = $this->paymentData($data);
-
         return render('gateways.eway.pay', $data);
     }
 
@@ -284,8 +276,4 @@ class CreditCard implements LivewireMethodInterface
 
         return $payment;
     }
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.eway.pay_livewire';
-    }
 }

app/PaymentDrivers/Forte/ACH.php

@@ -19,12 +19,11 @@ use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\FortePaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Support\Facades\Validator;
 
-class ACH implements LivewireMethodInterface
+class ACH
 {
     use MakesHash;
 
@@ -80,8 +79,10 @@ class ACH implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->forte->payment_hash->data = array_merge((array) $this->forte->payment_hash->data, $data);
+        $this->forte->payment_hash->save();
 
+        $data['gateway'] = $this->forte;
         return render('gateways.forte.ach.pay', $data);
     }
 
@@ -174,25 +175,4 @@ class ACH implements LivewireMethodInterface
         return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
 
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.forte.ach.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->forte->payment_hash->data = array_merge((array) $this->forte->payment_hash->data, $data);
-        $this->forte->payment_hash->save();
-
-        $data['gateway'] = $this->forte;
-
-        return $data;
-    }
 }

app/PaymentDrivers/Forte/CreditCard.php

@@ -20,12 +20,11 @@ use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\FortePaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Support\Facades\Validator;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     use MakesHash;
 
@@ -158,8 +157,10 @@ class CreditCard implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->forte->payment_hash->data = array_merge((array) $this->forte->payment_hash->data, $data);
+        $this->forte->payment_hash->save();
 
+        $data['gateway'] = $this->forte;
         return render('gateways.forte.credit_card.pay', $data);
     }
 
@@ -286,25 +287,4 @@ class CreditCard implements LivewireMethodInterface
         return redirect()->route('client.payments.show', ['payment' => $payment->hashed_id]);
 
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.forte.credit_card.pay_livewire';        
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->forte->payment_hash->data = array_merge((array) $this->forte->payment_hash->data, $data);
-        $this->forte->payment_hash->save();
-
-        $data['gateway'] = $this->forte;
-
-        return $data;
-    }
 }

app/PaymentDrivers/GoCardless/ACH.php

@@ -20,7 +20,6 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\GoCardlessPaymentDriver;
 use App\Utils\Traits\MakesHash;
@@ -32,7 +31,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 
 //@deprecated
-class ACH implements MethodInterface, LivewireMethodInterface
+class ACH implements MethodInterface
 {
     use MakesHash;
 
@@ -147,7 +146,9 @@ class ACH implements MethodInterface, LivewireMethodInterface
      */
     public function paymentView(array $data): View
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->go_cardless;
+        $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
+        $data['currency'] = $this->go_cardless->client->getCurrencyCode();
 
         return render('gateways.gocardless.ach.pay', $data);
     }
@@ -256,23 +257,4 @@ class ACH implements MethodInterface, LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.gocardless.ach.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->go_cardless;
-        $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
-        $data['currency'] = $this->go_cardless->client->getCurrencyCode();
-
-        return $data;
-    }
 }

app/PaymentDrivers/GoCardless/DirectDebit.php

@@ -21,7 +21,6 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\GoCardlessPaymentDriver;
 use App\Utils\Traits\MakesHash;
@@ -30,7 +29,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 
-class DirectDebit implements MethodInterface, LivewireMethodInterface
+class DirectDebit implements MethodInterface
 {
     use MakesHash;
 
@@ -219,7 +218,9 @@ class DirectDebit implements MethodInterface, LivewireMethodInterface
      */
     public function paymentView(array $data): View
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->go_cardless;
+        $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
+        $data['currency'] = $this->go_cardless->client->getCurrencyCode();
 
         return render('gateways.gocardless.direct_debit.pay', $data);
     }
@@ -329,24 +330,4 @@ class DirectDebit implements MethodInterface, LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.gocardless.direct_debit.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->go_cardless;
-        $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
-        $data['currency'] = $this->go_cardless->client->getCurrencyCode();
-
-        return $data;
-    }
 }

app/PaymentDrivers/GoCardless/InstantBankPay.php

@@ -9,14 +9,13 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\GoCardlessPaymentDriver;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
-class InstantBankPay implements MethodInterface, LivewireMethodInterface
+class InstantBankPay implements MethodInterface
 {
     protected GoCardlessPaymentDriver $go_cardless;
 
@@ -195,8 +194,9 @@ class InstantBankPay implements MethodInterface, LivewireMethodInterface
      * Process unsuccessful payments for Direct Debit.
      *
      * @param ResourcesPayment $payment
+     * @return never
      */
-    public function processUnsuccessfulPayment(\GoCardlessPro\Resources\Payment $payment): void
+    public function processUnsuccessfulPayment(\GoCardlessPro\Resources\Payment $payment)
     {
         PaymentFailureMailer::dispatch($this->go_cardless->client, $payment->status, $this->go_cardless->client->company, $this->go_cardless->payment_hash->data->amount_with_fee);
 
@@ -221,24 +221,4 @@ class InstantBankPay implements MethodInterface, LivewireMethodInterface
             $this->go_cardless->client->company,
         );
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        // not supported, this is offsite payment method.
-
-        return '';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->paymentView($data);
-
-        return $data;
-    }
 }

app/PaymentDrivers/GoCardless/SEPA.php

@@ -20,7 +20,6 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\GoCardlessPaymentDriver;
 use App\Utils\Traits\MakesHash;
@@ -30,7 +29,7 @@ use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 
-class SEPA implements MethodInterface, LivewireMethodInterface
+class SEPA implements MethodInterface
 {
     use MakesHash;
 
@@ -146,7 +145,9 @@ class SEPA implements MethodInterface, LivewireMethodInterface
      */
     public function paymentView(array $data): View
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->go_cardless;
+        $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
+        $data['currency'] = $this->go_cardless->client->getCurrencyCode();
 
         return render('gateways.gocardless.sepa.pay', $data);
     }
@@ -256,24 +257,4 @@ class SEPA implements MethodInterface, LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-    
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.gocardless.sepa.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->go_cardless;
-        $data['amount'] = $this->go_cardless->convertToGoCardlessAmount($data['total']['amount_with_fee'], $this->go_cardless->client->currency()->precision);
-        $data['currency'] = $this->go_cardless->client->getCurrencyCode();
-
-        return $data;
-    }
 }

app/PaymentDrivers/Mollie/Bancontact.php

@@ -19,14 +19,13 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
-class Bancontact implements MethodInterface, LivewireMethodInterface
+class Bancontact implements MethodInterface
 {
     protected MolliePaymentDriver $mollie;
 
@@ -210,24 +209,4 @@ class Bancontact implements MethodInterface, LivewireMethodInterface
     {
         return $this->processSuccessfulPayment($payment, 'open');
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        // Doesn't support, it's offsite payment method.
-
-        return '';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->paymentView($data);
-
-        return $data;
-    }
 }

app/PaymentDrivers/Mollie/BankTransfer.php

@@ -19,7 +19,6 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Exception;
@@ -29,7 +28,7 @@ use Illuminate\Routing\Redirector;
 use Illuminate\View\View;
 use Mollie\Api\Resources\Payment as ResourcesPayment;
 
-class BankTransfer implements MethodInterface, LivewireMethodInterface
+class BankTransfer implements MethodInterface
 {
     protected MolliePaymentDriver $mollie;
 
@@ -207,24 +206,4 @@ class BankTransfer implements MethodInterface, LivewireMethodInterface
     {
         return $this->processSuccessfulPayment($payment, 'open');
     }
-    
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        // Doesn't support, it's offsite payment method.
-
-        return '';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->paymentView($data);
-
-        return $data;
-    }
 }

app/PaymentDrivers/Mollie/CreditCard.php

@@ -10,13 +10,12 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\View\View;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     /**
      * @var MolliePaymentDriver
@@ -38,7 +37,7 @@ class CreditCard implements LivewireMethodInterface
      */
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->mollie;
 
         return render('gateways.mollie.credit_card.pay', $data);
     }
@@ -258,22 +257,4 @@ class CreditCard implements LivewireMethodInterface
     {
         return redirect()->route('client.payment_methods.index');
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.mollie.credit_card.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->mollie;
-
-        return $data;
-    }
 }

app/PaymentDrivers/Mollie/IDEAL.php

@@ -19,14 +19,13 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
-class IDEAL implements MethodInterface, LivewireMethodInterface
+class IDEAL implements MethodInterface
 {
     protected MolliePaymentDriver $mollie;
 
@@ -210,24 +209,4 @@ class IDEAL implements MethodInterface, LivewireMethodInterface
     {
         return $this->processSuccessfulPayment($payment, 'open');
     }
-    
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        // Doesn't support, it's offsite payment method.
-
-        return '';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->paymentView($data);
-
-        return $data;
-    }
 }

app/PaymentDrivers/Mollie/KBC.php

@@ -19,14 +19,13 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\MolliePaymentDriver;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\View\View;
 
-class KBC implements MethodInterface, LivewireMethodInterface
+class KBC implements MethodInterface
 {
     protected MolliePaymentDriver $mollie;
 
@@ -194,24 +193,4 @@ class KBC implements MethodInterface, LivewireMethodInterface
 
         return redirect()->route('client.payments.show', ['payment' => $this->mollie->encodePrimaryKey($payment_record->id)]);
     }
-    
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        // Doesn't support, it's offsite payment method.
-
-        return '';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $this->paymentView($data);
-
-        return $data;
-    }
 }

app/PaymentDrivers/PayFast/CreditCard.php

@@ -18,13 +18,12 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\PayFastPaymentDriver;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     public $payfast;
 
@@ -159,9 +158,24 @@ class CreditCard implements LivewireMethodInterface
 
     public function paymentView($data)
     {
-        $data = $this->paymentData($data);
+        $payfast_data = [
+            'merchant_id' => $this->payfast->company_gateway->getConfigField('merchantId'),
+            'merchant_key' => $this->payfast->company_gateway->getConfigField('merchantKey'),
+            'return_url' => route('client.payments.index'),
+            'cancel_url' => route('client.payment_methods.index'),
+            'notify_url' => $this->payfast->genericWebhookUrl(),
+            'm_payment_id' => $data['payment_hash'],
+            'amount' => $data['amount_with_fee'],
+            'item_name' => 'purchase',
+            'item_description' => ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number'),
+            'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
+        ];
 
-        return render('gateways.payfast.pay', array_merge($data));
+        $payfast_data['signature'] = $this->payfast->generateSignature($payfast_data);
+        $payfast_data['gateway'] = $this->payfast;
+        $payfast_data['payment_endpoint_url'] = $this->payfast->endpointUrl();
+
+        return render('gateways.payfast.pay', array_merge($data, $payfast_data));
     }
 
     /*
@@ -249,36 +263,4 @@ class CreditCard implements LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.payfast.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $payfast_data = [
-            'merchant_id' => $this->payfast->company_gateway->getConfigField('merchantId'),
-            'merchant_key' => $this->payfast->company_gateway->getConfigField('merchantKey'),
-            'return_url' => route('client.payments.index'),
-            'cancel_url' => route('client.payment_methods.index'),
-            'notify_url' => $this->payfast->genericWebhookUrl(),
-            'm_payment_id' => $data['payment_hash'],
-            'amount' => $data['amount_with_fee'],
-            'item_name' => 'purchase',
-            'item_description' => ctrans('texts.invoices').': '.collect($data['invoices'])->pluck('invoice_number'),
-            'passphrase' => $this->payfast->company_gateway->getConfigField('passphrase'),
-        ];
-
-        $payfast_data['signature'] = $this->payfast->generateSignature($payfast_data);
-        $payfast_data['gateway'] = $this->payfast;
-        $payfast_data['payment_endpoint_url'] = $this->payfast->endpointUrl();
-
-        return array_merge($data, $payfast_data);
-    }
 }

app/PaymentDrivers/PayPalPPCPPaymentDriver.php

@@ -85,13 +85,30 @@ class PayPalPPCPPaymentDriver extends PayPalBasePaymentDriver
      */
     public function processPaymentView($data)
     {
-        $data = $this->processPaymentViewData($data);
+
+        $this->init()->checkPaymentsReceivable();
+
+        $data['gateway'] = $this;
+        $this->payment_hash->data = array_merge((array) $this->payment_hash->data, ['amount' => $data['total']['amount_with_fee']]);
+        $this->payment_hash->save();
+
+        $data['client_id'] = config('ninja.paypal.client_id');
+        $data['token'] = $this->getClientToken();
+        $data['order_id'] = $this->createOrder($data);
+        $data['funding_source'] = $this->paypal_payment_method;
+        $data['gateway_type_id'] = $this->gateway_type_id;
+        $data['merchantId'] = $this->company_gateway->getConfigField('merchantId');
+        $data['currency'] = $this->client->currency()->code;
+        $data['guid'] = $this->risk_guid;
+        $data['identifier'] = "s:INN_".$this->company_gateway->getConfigField('merchantId')."_CHCK";
+        $data['pp_client_reference'] = $this->getClientHash();
 
         if($this->gateway_type_id == 29) {
             return render('gateways.paypal.ppcp.card', $data);
         } else {
             return render('gateways.paypal.ppcp.pay', $data);
         }
+
     }
 
     /**
@@ -463,40 +480,7 @@ class PayPalPPCPPaymentDriver extends PayPalBasePaymentDriver
 
     }
 
-<<<<<<< HEAD
 
 
 
-=======
-    public function processPaymentViewData(array $data): array
-    {
-        $this->init()->checkPaymentsReceivable();
-
-        $data['gateway'] = $this;
-        $this->payment_hash->data = array_merge((array) $this->payment_hash->data, ['amount' => $data['total']['amount_with_fee']]);
-        $this->payment_hash->save();
-
-        $data['client_id'] = config('ninja.paypal.client_id');
-        $data['token'] = $this->getClientToken();
-        $data['order_id'] = $this->createOrder($data);
-        $data['funding_source'] = $this->paypal_payment_method;
-        $data['gateway_type_id'] = $this->gateway_type_id;
-        $data['merchantId'] = $this->company_gateway->getConfigField('merchantId');
-        $data['currency'] = $this->client->currency()->code;
-        $data['guid'] = $this->risk_guid;
-        $data['identifier'] = "s:INN_".$this->company_gateway->getConfigField('merchantId')."_CHCK";
-        $data['pp_client_reference'] = $this->getClientHash();
-
-        return $data;
-    } 
-
-    public function livewirePaymentView(array $data): string 
-    {
-        if ($this->gateway_type_id == 29) {
-            return 'gateways.paypal.ppcp.card_livewire';
-        }
-
-        return 'gateways.paypal.ppcp.pay_livewire';
-    }
->>>>>>> new_payment_flow
 }

app/PaymentDrivers/PayPalRestPaymentDriver.php

@@ -31,13 +31,30 @@ class PayPalRestPaymentDriver extends PayPalBasePaymentDriver
 
     public function processPaymentView($data)
     {
-        $data = $this->processPaymentViewData($data);
+
+        $this->init();
+
+        $data['gateway'] = $this;
+
+        $this->payment_hash->data = array_merge((array) $this->payment_hash->data, ['amount' => $data['total']['amount_with_fee']]);
+        $this->payment_hash->save();
+
+        $data['client_id'] = $this->company_gateway->getConfigField('clientId');
+        $data['token'] = $this->getClientToken();
+        $data['order_id'] = $this->createOrder($data);
+        $data['funding_source'] = $this->paypal_payment_method;
+        $data['gateway_type_id'] = $this->gateway_type_id;
+        $data['currency'] = $this->client->currency()->code;
+        $data['guid'] = $this->risk_guid;
+        $data['identifier'] = "s:INN_ACDC_CHCK";
+        $data['pp_client_reference'] = $this->getClientHash();
 
         if($this->gateway_type_id == 29) {
             return render('gateways.paypal.ppcp.card', $data);
         } else {
             return render('gateways.paypal.pay', $data);
         }
+
     }
 
     /**
@@ -417,35 +434,4 @@ class PayPalRestPaymentDriver extends PayPalBasePaymentDriver
         SystemLogger::dispatch($response, SystemLog::CATEGORY_GATEWAY_RESPONSE, SystemLog::EVENT_GATEWAY_FAILURE, SystemLog::TYPE_PAYPAL, $this->client, $this->client->company);
 
     }
-
-    public function processPaymentViewData(array $data): array
-    {
-        $this->init();
-
-        $data['gateway'] = $this;
-
-        $this->payment_hash->data = array_merge((array) $this->payment_hash->data, ['amount' => $data['total']['amount_with_fee']]);
-        $this->payment_hash->save();
-
-        $data['client_id'] = $this->company_gateway->getConfigField('clientId');
-        $data['token'] = $this->getClientToken();
-        $data['order_id'] = $this->createOrder($data);
-        $data['funding_source'] = $this->paypal_payment_method;
-        $data['gateway_type_id'] = $this->gateway_type_id;
-        $data['currency'] = $this->client->currency()->code;
-        $data['guid'] = $this->risk_guid;
-        $data['identifier'] = "s:INN_ACDC_CHCK";
-        $data['pp_client_reference'] = $this->getClientHash();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        if ($this->gateway_type_id == 29) {
-            return 'gateways.paypal.ppcp.card_livewire';
-        }
-
-        return 'gateways.paypal.pay_livewire';
-    }
 }

app/PaymentDrivers/PayTrace/CreditCard.php

@@ -18,13 +18,12 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\PaytracePaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     use MakesHash;
 
@@ -37,7 +36,8 @@ class CreditCard implements LivewireMethodInterface
 
     public function authorizeView($data)
     {
-        $data = $this->paymentData($data);
+        $data['client_key'] = $this->paytrace->getAuthToken();
+        $data['gateway'] = $this->paytrace;
 
         return render('gateways.paytrace.authorize', $data);
     }
@@ -240,23 +240,4 @@ class CreditCard implements LivewireMethodInterface
 
         return $this->paytrace->processUnsuccessfulTransaction($data);
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.paytrace.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array
-    {
-        $data['client_key'] = $this->paytrace->getAuthToken();
-        $data['gateway'] = $this->paytrace;
-
-        return $data;
-    }
 }

app/PaymentDrivers/Razorpay/Hosted.php

@@ -19,7 +19,6 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\RazorpayPaymentDriver;
 use Illuminate\Http\RedirectResponse;
@@ -27,7 +26,7 @@ use Illuminate\Http\Request;
 use Illuminate\View\View;
 use Razorpay\Api\Errors\SignatureVerificationError;
 
-class Hosted implements MethodInterface, LivewireMethodInterface
+class Hosted implements MethodInterface
 {
     protected RazorpayPaymentDriver $razorpay;
 
@@ -68,7 +67,23 @@ class Hosted implements MethodInterface, LivewireMethodInterface
      */
     public function paymentView(array $data): View
     {
-        $data = $this->paymentData($data);
+        $order = $this->razorpay->gateway->order->create([
+            'currency' => $this->razorpay->client->currency()->code,
+            'amount' => $this->razorpay->convertToRazorpayAmount((float) $this->razorpay->payment_hash->data->amount_with_fee),
+        ]);
+
+        $this->razorpay->payment_hash->withData('order_id', $order->id);
+        $this->razorpay->payment_hash->withData('order_amount', $order->amount);
+
+        $data['gateway'] = $this->razorpay;
+
+        $data['options'] = [
+            'key' => $this->razorpay->company_gateway->getConfigField('apiKey'),
+            'amount' => $this->razorpay->convertToRazorpayAmount((float) $this->razorpay->payment_hash->data->amount_with_fee),
+            'currency' => $this->razorpay->client->currency()->code,
+            'name' => $this->razorpay->company_gateway->company->present()->name(),
+            'order_id' => $order->id,
+        ];
 
         return render('gateways.razorpay.hosted.pay', $data);
     }
@@ -159,38 +174,4 @@ class Hosted implements MethodInterface, LivewireMethodInterface
 
         throw new PaymentFailed($exception->getMessage(), $exception->getCode());
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.razorpay.hosted.pay_livewire';
-    }
-    
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $order = $this->razorpay->gateway->order->create([
-            'currency' => $this->razorpay->client->currency()->code,
-            'amount' => $this->razorpay->convertToRazorpayAmount((float) $this->razorpay->payment_hash->data->amount_with_fee),
-        ]);
-
-        $this->razorpay->payment_hash->withData('order_id', $order->id);
-        $this->razorpay->payment_hash->withData('order_amount', $order->amount);
-
-        $data['gateway'] = $this->razorpay;
-
-        $data['options'] = [
-            'key' => $this->razorpay->company_gateway->getConfigField('apiKey'),
-            'amount' => $this->razorpay->convertToRazorpayAmount((float) $this->razorpay->payment_hash->data->amount_with_fee),
-            'currency' => $this->razorpay->client->currency()->code,
-            'name' => $this->razorpay->company_gateway->company->present()->name(),
-            'order_id' => $order->id,
-        ];
-
-        return $data;
-    }
 }

app/PaymentDrivers/Square/CreditCard.php

@@ -21,7 +21,6 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\SquarePaymentDriver;
 use App\Utils\Traits\MakesHash;
@@ -30,7 +29,7 @@ use Illuminate\Http\Request;
 use Illuminate\View\View;
 use Square\Http\ApiResponse;
 
-class CreditCard implements MethodInterface, LivewireMethodInterface
+class CreditCard implements MethodInterface
 {
     use MakesHash;
 
@@ -65,7 +64,10 @@ class CreditCard implements MethodInterface, LivewireMethodInterface
 
     public function paymentView($data)
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->square_driver;
+        $data['amount'] = $this->square_driver->payment_hash->data->amount_with_fee;
+        $data['currencyCode'] = $this->square_driver->client->getCurrencyCode();
+        $data['square_contact'] = $this->buildClientObject();
 
         return render('gateways.square.credit_card.pay', $data);
     }
@@ -236,24 +238,5 @@ class CreditCard implements MethodInterface, LivewireMethodInterface
         return false;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.square.credit_card.pay_livewire';
-    }
 
-    /**
-     * @inheritDoc
-     */
-    public function paymentData(array $data): array 
-    {
-        $data['gateway'] = $this->square_driver;
-        $data['amount'] = $this->square_driver->payment_hash->data->amount_with_fee;
-        $data['currencyCode'] = $this->square_driver->client->getCurrencyCode();
-        $data['square_contact'] = $this->buildClientObject();
-
-        return $data;
-    }
 }

app/PaymentDrivers/Stripe/ACH.php

@@ -24,7 +24,6 @@ use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Traits\MakesHash;
 use Exception;
@@ -36,7 +35,7 @@ use Stripe\Exception\InvalidRequestException;
 use Stripe\Exception\RateLimitException;
 use Stripe\PaymentIntent;
 
-class ACH implements LivewireMethodInterface
+class ACH
 {
     use MakesHash;
 
@@ -200,7 +199,47 @@ class ACH implements LivewireMethodInterface
      */
     public function paymentView(array $data)
     {
-        $this->paymentData($data);
+        $data['gateway'] = $this->stripe;
+        $data['currency'] = $this->stripe->client->getCurrencyCode();
+        $data['payment_method_id'] = GatewayType::BANK_TRANSFER;
+        $data['customer'] = $this->stripe->findOrCreateCustomer();
+        $data['amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+
+        $description = $this->stripe->getDescription(false);
+
+        $intent = false;
+
+        if (count($data['tokens']) == 1) {
+
+            $token = $data['tokens'][0];
+
+            $meta = $token->meta;
+
+            if(isset($meta->state) && $meta->state == 'unauthorized') {
+                return redirect()->route('client.payment_methods.show', $token->hashed_id);
+            }
+        }
+
+        if (count($data['tokens']) == 0) {
+            $intent =
+            $this->stripe->createPaymentIntent(
+                [
+                'amount' => $data['amount'],
+                'currency' => $data['currency'],
+                'setup_future_usage' => 'off_session',
+                'customer' => $data['customer']->id,
+                'payment_method_types' => ['us_bank_account'],
+                'description' => $description,
+                'metadata' => [
+                    'payment_hash' => $this->stripe->payment_hash->hash,
+                    'gateway_type_id' => GatewayType::BANK_TRANSFER,
+                ],
+                'statement_descriptor' => $this->stripe->getStatementDescriptor(),
+            ]
+            );
+        }
+
+        $data['client_secret'] = $intent ? $intent->client_secret : false;
 
         return render('gateways.stripe.ach.pay', $data);
     }
@@ -589,56 +628,4 @@ class ACH implements LivewireMethodInterface
             return $this->stripe->processInternallyFailedPayment($this->stripe, $e);
         }
     }
-
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.stripe.ach.pay_livewire';
-    }
-
-    public function paymentData(array $data): array
-    {
-        $data['gateway'] = $this->stripe;
-        $data['currency'] = $this->stripe->client->getCurrencyCode();
-        $data['payment_method_id'] = GatewayType::BANK_TRANSFER;
-        $data['customer'] = $this->stripe->findOrCreateCustomer();
-        $data['amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-
-        $description = $this->stripe->getDescription(false);
-
-        $intent = false;
-
-        if (count($data['tokens']) == 1) {
-
-            $token = $data['tokens'][0];
-
-            $meta = $token->meta;
-
-            if(isset($meta->state) && $meta->state == 'unauthorized') {
-                return redirect()->route('client.payment_methods.show', $token->hashed_id);
-            }
-        }
-
-        if (count($data['tokens']) == 0) {
-            $intent =
-            $this->stripe->createPaymentIntent(
-                [
-                'amount' => $data['amount'],
-                'currency' => $data['currency'],
-                'setup_future_usage' => 'off_session',
-                'customer' => $data['customer']->id,
-                'payment_method_types' => ['us_bank_account'],
-                'description' => $description,
-                'metadata' => [
-                    'payment_hash' => $this->stripe->payment_hash->hash,
-                    'gateway_type_id' => GatewayType::BANK_TRANSFER,
-                ],
-                'statement_descriptor' => $this->stripe->getStatementDescriptor(),
-            ]
-            );
-        }
-
-        $data['client_secret'] = $intent ? $intent->client_secret : false;
-
-        return $data;
-    }
 }

app/PaymentDrivers/Stripe/ACSS.php

@@ -17,7 +17,6 @@ use App\Models\SystemLog;
 use App\Models\GatewayType;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use Illuminate\Support\Str;
 use App\Http\Requests\Request;
 use App\Jobs\Util\SystemLogger;
@@ -30,7 +29,7 @@ use App\PaymentDrivers\StripePaymentDriver;
 use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
 use Stripe\PaymentIntent;
 
-class ACSS implements LivewireMethodInterface
+class ACSS
 {
     use MakesHash;
 
@@ -128,7 +127,7 @@ class ACSS implements LivewireMethodInterface
             $this->stripe->setClient($hash->fee_invoice->client);
             $this->stripe->setPaymentMethod(GatewayType::ACSS);
 
-            return $this->paymentView($data);
+            return $this->continuePayment($data);
         }
 
         return redirect()->route('client.payment_methods.show', $client_gateway_token->hashed_id);
@@ -162,15 +161,36 @@ class ACSS implements LivewireMethodInterface
         return $intent;
     }
 
-    public function paymentData(array $data)
+    /**
+     * Payment view for ACSS
+     *
+     * Determines if any payment tokens are available and if not, generates a mandate
+     *
+     * @param  array $data
+
+     */
+    public function paymentView(array $data)
     {
+
         if(count($data['tokens']) == 0) {
             $hash = Str::random(32);
-
             Cache::put($hash, $data, 3600);
-
             $data['post_auth_response'] = $hash;
-            $data['needs_mandate_generate'] = true;
+
+            return $this->generateMandate($data);
+        }
+
+        return $this->continuePayment($data);
+    }
+
+    /**
+     * Generate a payment Mandate for ACSS
+     *
+     * @param  array $data
+
+     */
+    private function generateMandate(array $data)
+    {
 
         $data['gateway'] = $this->stripe;
         $data['company_gateway'] = $this->stripe->company_gateway;
@@ -196,9 +216,18 @@ class ACSS implements LivewireMethodInterface
 
         $data['pi_client_secret'] = $intent->client_secret;
 
-            return $data;
+        return render('gateways.stripe.acss.authorize', array_merge($data));
+
     }
 
+    /**
+     * Continues the payment flow after a Mandate has been successfully generated
+     *
+     * @param  array $data
+     */
+    private function continuePayment(array $data)
+    {
+
         $this->stripe->init();
 
         $data['gateway'] = $this->stripe;
@@ -211,25 +240,6 @@ class ACSS implements LivewireMethodInterface
         $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
         $this->stripe->payment_hash->save();
 
-        return $data;
-    }
-
-    /**
-     * Payment view for ACSS
-     *
-     * Determines if any payment tokens are available and if not, generates a mandate
-     *
-     * @param  array $data
-
-     */
-    public function paymentView(array $data)
-    {
-        $data = $this->paymentData($data);
-
-        if (array_key_exists('needs_mandate_generate', $data)) {
-            return render('gateways.stripe.acss.authorize', array_merge($data));
-        }
-
         return render('gateways.stripe.acss.pay', $data);
     }
 
@@ -390,13 +400,4 @@ class ACSS implements LivewireMethodInterface
             return $this->stripe->processInternallyFailedPayment($this->stripe, $e);
         }
     }
-    
-    public function livewirePaymentView(array $data): string 
-    {
-        if (array_key_exists('needs_mandate_generate', $data)) {
-            return 'gateways.stripe.acss.authorize_livewire';
-        }
-
-        return 'gateways.stripe.acss.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/BACS.php

@@ -20,13 +20,12 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Stripe\Jobs\UpdateCustomer;
 use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Number;
 use Stripe\Checkout\Session;
 
-class BACS implements LivewireMethodInterface
+class BACS
 {
     public $stripe;
 
@@ -70,7 +69,9 @@ class BACS implements LivewireMethodInterface
     }
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $data['gateway'] = $this->stripe;
+        $data['amount'] = $data['total']['amount_with_fee'];
+        $data['payment_hash'] = $this->stripe->payment_hash->hash;
 
         return render('gateways.stripe.bacs.pay', $data);
     }
@@ -186,18 +187,4 @@ class BACS implements LivewireMethodInterface
             return $this->stripe->processInternallyFailedPayment($this->stripe, $e);
         }
     }
-
-    public function paymentData(array $data): array
-    {
-        $data['gateway'] = $this->stripe;
-        $data['amount'] = $data['total']['amount_with_fee'];
-        $data['payment_hash'] = $this->stripe->payment_hash->hash;
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.stripe.bacs.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/BECS.php

@@ -19,10 +19,9 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 
-class BECS implements LivewireMethodInterface
+class BECS
 {
     /** @var StripePaymentDriver */
     public StripePaymentDriver $stripe;
@@ -40,7 +39,33 @@ class BECS implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $data['gateway'] = $this->stripe;
+        $data['payment_method_id'] = GatewayType::BECS;
+        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $data['client'] = $this->stripe->client;
+        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
+        $data['country'] = $this->stripe->client->country->iso_3166_2;
+        $data['payment_hash'] = $this->stripe->payment_hash->hash;
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => $this->stripe->client->currency()->code,
+            'payment_method_types' => ['au_becs_debit'],
+            'setup_future_usage' => 'off_session',
+            'customer' => $this->stripe->findOrCreateCustomer(),
+            'description' => $this->stripe->getDescription(false),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::BECS,
+            ],
+        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
+
+        $data['pi_client_secret'] = $intent->client_secret;
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
+        $this->stripe->payment_hash->save();
 
         return render('gateways.stripe.becs.pay', $data);
     }
@@ -136,42 +161,4 @@ class BECS implements LivewireMethodInterface
             return $this->stripe->processInternallyFailedPayment($this->stripe, $e);
         }
     }
-
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $data['gateway'] = $this->stripe;
-        $data['payment_method_id'] = GatewayType::BECS;
-        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-        $data['client'] = $this->stripe->client;
-        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
-        $data['country'] = $this->stripe->client->country->iso_3166_2;
-        $data['payment_hash'] = $this->stripe->payment_hash->hash;
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $data['stripe_amount'],
-            'currency' => $this->stripe->client->currency()->code,
-            'payment_method_types' => ['au_becs_debit'],
-            'setup_future_usage' => 'off_session',
-            'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->getDescription(false),
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::BECS,
-            ],
-        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
-
-        $data['pi_client_secret'] = $intent->client_secret;
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
-        $this->stripe->payment_hash->save();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.stripe.becs.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/Bancontact.php

@@ -18,10 +18,9 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 
-class Bancontact implements LivewireMethodInterface
+class Bancontact
 {
     /** @var StripePaymentDriver */
     public StripePaymentDriver $stripe;
@@ -38,7 +37,32 @@ class Bancontact implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $data['gateway'] = $this->stripe;
+        $data['return_url'] = $this->buildReturnUrl();
+        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $data['client'] = $this->stripe->client;
+        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
+        $data['country'] = $this->stripe->client->country->iso_3166_2;
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => 'eur',
+            'payment_method_types' => ['bancontact'],
+            'customer' => $this->stripe->findOrCreateCustomer(),
+            'description' => $this->stripe->getDescription(false),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::BANCONTACT,
+            ],
+
+        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
+
+        $data['pi_client_secret'] = $intent->client_secret;
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
+        $this->stripe->payment_hash->save();
 
         return render('gateways.stripe.bancontact.pay', $data);
     }
@@ -119,41 +143,4 @@ class Bancontact implements LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $data['gateway'] = $this->stripe;
-        $data['return_url'] = $this->buildReturnUrl();
-        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-        $data['client'] = $this->stripe->client;
-        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
-        $data['country'] = $this->stripe->client->country->iso_3166_2;
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $data['stripe_amount'],
-            'currency' => 'eur',
-            'payment_method_types' => ['bancontact'],
-            'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->getDescription(false),
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::BANCONTACT,
-            ],
-
-        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
-
-        $data['pi_client_secret'] = $intent->client_secret;
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
-        $this->stripe->payment_hash->save();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.stripe.bancontact.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/BankTransfer.php

@@ -19,13 +19,12 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Number;
 use App\Utils\Traits\MakesHash;
 use Stripe\PaymentIntent;
 
-class BankTransfer implements LivewireMethodInterface
+class BankTransfer
 {
     use MakesHash;
 
@@ -39,7 +38,37 @@ class BankTransfer implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
+            'currency' => $this->stripe->client->currency()->code,
+            'customer' => $this->stripe->findOrCreateCustomer()->id,
+            'description' => $this->stripe->getDescription(false),
+            'payment_method_types' => ['customer_balance'],
+            'payment_method_data' => [
+                'type' => 'customer_balance',
+            ],
+            'payment_method_options' => [
+                'customer_balance' => [
+                'funding_type' => 'bank_transfer',
+                'bank_transfer' => $this->resolveBankType()
+                ],
+            ],
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::DIRECT_DEBIT,
+            ],
+        ], $this->stripe->stripe_connect_auth);
+
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency())]);
+        $this->stripe->payment_hash->save();
+
+        $data = [];
+        $data['return_url'] = $this->buildReturnUrl();
+        $data['gateway'] = $this->stripe;
+        $data['client_secret'] = $intent ? $intent->client_secret : false;
 
         return render('gateways.stripe.bank_transfer.pay', $data);
     }
@@ -288,46 +317,4 @@ class BankTransfer implements LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
-            'currency' => $this->stripe->client->currency()->code,
-            'customer' => $this->stripe->findOrCreateCustomer()->id,
-            'description' => $this->stripe->getDescription(false),
-            'payment_method_types' => ['customer_balance'],
-            'payment_method_data' => [
-                'type' => 'customer_balance',
-            ],
-            'payment_method_options' => [
-                'customer_balance' => [
-                'funding_type' => 'bank_transfer',
-                'bank_transfer' => $this->resolveBankType()
-                ],
-            ],
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::DIRECT_DEBIT,
-            ],
-        ], $this->stripe->stripe_connect_auth);
-
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency())]);
-        $this->stripe->payment_hash->save();
-
-        $data = [];
-        $data['return_url'] = $this->buildReturnUrl();
-        $data['gateway'] = $this->stripe;
-        $data['client_secret'] = $intent ? $intent->client_secret : false;
-
-        return $data;
-    }
-    
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.stripe.bank_transfer.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/BrowserPay.php

@@ -19,7 +19,6 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Common\MethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 use App\Utils\Ninja;
@@ -30,7 +29,7 @@ use Stripe\ApplePayDomain;
 use Stripe\Exception\ApiErrorException;
 use Stripe\PaymentIntent;
 
-class BrowserPay implements MethodInterface, LivewireMethodInterface
+class BrowserPay implements MethodInterface
 {
     protected StripePaymentDriver $stripe;
 
@@ -65,8 +64,7 @@ class BrowserPay implements MethodInterface, LivewireMethodInterface
         return redirect()->route('client.payment_methods.index');
     }
 
-
+    public function paymentView(array $data): View
-    public function paymentData(array $data): array
     {
         $payment_intent_data = [
             'amount' => $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency()),
@@ -95,13 +93,6 @@ class BrowserPay implements MethodInterface, LivewireMethodInterface
             'requestPayerEmail' => true,
         ];
 
-        return $data;
-    }
-
-    public function paymentView(array $data): View
-    {
-        $data = $this->paymentData($data);
-
         return render('gateways.stripe.browser_pay.pay', $data);
     }
 
@@ -240,9 +231,4 @@ class BrowserPay implements MethodInterface, LivewireMethodInterface
 
         return str_replace(['https://', '/public'], '', $domain);
     }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.stripe.browser_pay.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/CreditCard.php

@@ -19,13 +19,12 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\Stripe\Jobs\UpdateCustomer;
 use App\PaymentDrivers\StripePaymentDriver;
 use Stripe\PaymentIntent;
 use Stripe\PaymentMethod;
 
-class CreditCard implements LivewireMethodInterface
+class CreditCard
 {
     public $stripe;
 
@@ -58,7 +57,7 @@ class CreditCard implements LivewireMethodInterface
         return redirect()->route('client.payment_methods.index');
     }
 
-    public function paymentData(array $data): array
+    public function paymentView(array $data)
     {
         $description = $this->stripe->getDescription(false);
 
@@ -78,21 +77,9 @@ class CreditCard implements LivewireMethodInterface
         $data['intent'] = $this->stripe->createPaymentIntent($payment_intent_data);
         $data['gateway'] = $this->stripe;
 
-        return $data;
-    }
-
-    public function paymentView(array $data)
-    {
-        $data = $this->paymentData($data);
-
         return render('gateways.stripe.credit_card.pay', $data);
     }
 
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.stripe.credit_card.pay_livewire';
-    }
-
     public function paymentResponse(PaymentResponseRequest $request)
     {
         $this->stripe->init();

app/PaymentDrivers/Stripe/EPS.php

@@ -18,10 +18,9 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 
-class EPS implements LivewireMethodInterface
+class EPS
 {
     /** @var StripePaymentDriver */
     public StripePaymentDriver $stripe;
@@ -38,7 +37,31 @@ class EPS implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $data['gateway'] = $this->stripe;
+        $data['return_url'] = $this->buildReturnUrl();
+        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $data['client'] = $this->stripe->client;
+        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
+        $data['country'] = $this->stripe->client->country->iso_3166_2;
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => 'eur',
+            'payment_method_types' => ['eps'],
+            'customer' => $this->stripe->findOrCreateCustomer(),
+            'description' => $this->stripe->getDescription(false),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::EPS,
+            ],
+        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
+
+        $data['pi_client_secret'] = $intent->client_secret;
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
+        $this->stripe->payment_hash->save();
 
         return render('gateways.stripe.eps.pay', $data);
     }
@@ -119,40 +142,4 @@ class EPS implements LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $data['gateway'] = $this->stripe;
-        $data['return_url'] = $this->buildReturnUrl();
-        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-        $data['client'] = $this->stripe->client;
-        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
-        $data['country'] = $this->stripe->client->country->iso_3166_2;
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $data['stripe_amount'],
-            'currency' => 'eur',
-            'payment_method_types' => ['eps'],
-            'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->getDescription(false),
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::EPS,
-            ],
-        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
-
-        $data['pi_client_secret'] = $intent->client_secret;
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
-        $this->stripe->payment_hash->save();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.stripe.eps.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/FPX.php

@@ -19,10 +19,9 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 
-class FPX implements LivewireMethodInterface
+class FPX
 {
     /** @var StripePaymentDriver */
     public StripePaymentDriver $stripe;
@@ -39,7 +38,31 @@ class FPX implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $data['gateway'] = $this->stripe;
+        $data['return_url'] = $this->buildReturnUrl();
+        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $data['client'] = $this->stripe->client;
+        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
+        $data['country'] = $this->stripe->client->country->iso_3166_2;
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => $this->stripe->client->getCurrencyCode(),
+            'payment_method_types' => ['fpx'],
+            'customer' => $this->stripe->findOrCreateCustomer(),
+            'description' => $this->stripe->getDescription(false),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::FPX,
+            ],
+        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
+
+        $data['pi_client_secret'] = $intent->client_secret;
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
+        $this->stripe->payment_hash->save();
 
         return render('gateways.stripe.fpx.pay', $data);
     }
@@ -120,40 +143,4 @@ class FPX implements LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 400);
     }
-
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $data['gateway'] = $this->stripe;
-        $data['return_url'] = $this->buildReturnUrl();
-        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-        $data['client'] = $this->stripe->client;
-        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
-        $data['country'] = $this->stripe->client->country->iso_3166_2;
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $data['stripe_amount'],
-            'currency' => $this->stripe->client->getCurrencyCode(),
-            'payment_method_types' => ['fpx'],
-            'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->getDescription(false),
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::FPX,
-            ],
-        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
-
-        $data['pi_client_secret'] = $intent->client_secret;
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
-        $this->stripe->payment_hash->save();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string
-    {
-        return 'gateways.stripe.fpx.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/GIROPAY.php

@@ -18,10 +18,9 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 
-class GIROPAY implements LivewireMethodInterface
+class GIROPAY
 {
     /** @var StripePaymentDriver */
     public StripePaymentDriver $stripe;
@@ -38,7 +37,31 @@ class GIROPAY implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $data['gateway'] = $this->stripe;
+        $data['return_url'] = $this->buildReturnUrl();
+        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $data['client'] = $this->stripe->client;
+        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
+        $data['country'] = $this->stripe->client->country->iso_3166_2;
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => 'eur',
+            'payment_method_types' => ['giropay'],
+            'customer' => $this->stripe->findOrCreateCustomer(),
+            'description' => $this->stripe->getDescription(false),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::GIROPAY,
+            ],
+        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
+
+        $data['pi_client_secret'] = $intent->client_secret;
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
+        $this->stripe->payment_hash->save();
 
         return render('gateways.stripe.giropay.pay', $data);
     }
@@ -119,40 +142,4 @@ class GIROPAY implements LivewireMethodInterface
 
         throw new PaymentFailed('Failed to process the payment.', 500);
     }
-    
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $data['gateway'] = $this->stripe;
-        $data['return_url'] = $this->buildReturnUrl();
-        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-        $data['client'] = $this->stripe->client;
-        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
-        $data['country'] = $this->stripe->client->country->iso_3166_2;
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $data['stripe_amount'],
-            'currency' => 'eur',
-            'payment_method_types' => ['giropay'],
-            'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $this->stripe->getDescription(false),
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::GIROPAY,
-            ],
-        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
-
-        $data['pi_client_secret'] = $intent->client_secret;
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
-        $this->stripe->payment_hash->save();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.giropay.pay_livewire';
-    }
 }

app/PaymentDrivers/Stripe/Klarna.php

@@ -18,10 +18,9 @@ use App\Models\GatewayType;
 use App\Models\Payment;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
-use App\PaymentDrivers\Common\LivewireMethodInterface;
 use App\PaymentDrivers\StripePaymentDriver;
 
-class Klarna implements LivewireMethodInterface
+class Klarna
 {
     /** @var StripePaymentDriver */
     public StripePaymentDriver $stripe;
@@ -38,7 +37,33 @@ class Klarna implements LivewireMethodInterface
 
     public function paymentView(array $data)
     {
-        $data = $this->paymentData($data);
+        $this->stripe->init();
+
+        $data['gateway'] = $this->stripe;
+        $data['return_url'] = $this->buildReturnUrl();
+        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $data['client'] = $this->stripe->client;
+        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
+        $data['country'] = $this->stripe->client->country->iso_3166_2;
+
+        $description = $this->stripe->getDescription(false);
+
+        $intent = \Stripe\PaymentIntent::create([
+            'amount' => $data['stripe_amount'],
+            'currency' => $this->stripe->client->getCurrencyCode(),
+            'payment_method_types' => ['klarna'],
+            'customer' => $this->stripe->findOrCreateCustomer(),
+            'description' => $description,
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::KLARNA,
+            ],
+        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
+
+        $data['pi_client_secret'] = $intent->client_secret;
+
+        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
+        $this->stripe->payment_hash->save();
 
         return render('gateways.stripe.klarna.pay', $data);
     }
@@ -117,42 +142,4 @@ class Klarna implements LivewireMethodInterface
 
         throw new PaymentFailed(ctrans('texts.gateway_error'), 500);
     }
-
-    public function paymentData(array $data): array
-    {
-        $this->stripe->init();
-
-        $data['gateway'] = $this->stripe;
-        $data['return_url'] = $this->buildReturnUrl();
-        $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
-        $data['client'] = $this->stripe->client;
-        $data['customer'] = $this->stripe->findOrCreateCustomer()->id;
-        $data['country'] = $this->stripe->client->country->iso_3166_2;
-
-        $description = $this->stripe->getDescription(false);
-
-        $intent = \Stripe\PaymentIntent::create([
-            'amount' => $data['stripe_amount'],
-            'currency' => $this->stripe->client->getCurrencyCode(),
-            'payment_method_types' => ['klarna'],
-            'customer' => $this->stripe->findOrCreateCustomer(),
-            'description' => $description,
-            'metadata' => [
-                'payment_hash' => $this->stripe->payment_hash->hash,
-                'gateway_type_id' => GatewayType::KLARNA,
-            ],
-        ], array_merge($this->stripe->stripe_connect_auth, ['idempotency_key' => uniqid("st", true)]));
-
-        $data['pi_client_secret'] = $intent->client_secret;
-
-        $this->stripe->payment_hash->data = array_merge((array) $this->stripe->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);
-        $this->stripe->payment_hash->save();
-
-        return $data;
-    }
-
-    public function livewirePaymentView(array $data): string 
-    {
-        return 'gateways.stripe.klarna.pay_livewire';
-    }
 }