Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for auth.net

Browse Source
This commit is contained in:
David Bomba 2022-02-15 21:23:51 +11:00
parent 5810b7c9a6
commit 910aeebaf7
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Invoice/ActionInvoiceRequest.php
View File

@ -30,7 +30,7 @@ class ActionInvoiceRequest extends Request
private $invoice; private $invoice;
public function authorize() : bool public function authorize() : bool
{ {
return auth()->user()->can('edit', $this->invoice); return auth()->user()->can('edit', $this->invoice);
} }

24
app/PaymentDrivers/Authorize/AuthorizeCustomer.php
View File

@ -115,15 +115,15 @@ class AuthorizeCustomer
//if the profile ID already exists in ClientGatewayToken we continue else - add. //if the profile ID already exists in ClientGatewayToken we continue else - add.
if($client_gateway_token = ClientGatewayToken::where('company_id', $company->id)->where('gateway_customer_reference', $gateway_customer_reference)->first()){ if($client_gateway_token = ClientGatewayToken::where('company_id', $company->id)->where('gateway_customer_reference', $gateway_customer_reference)->first()){
nlog("found client"); // nlog("found client");
$client = $client_gateway_token->client; $client = $client_gateway_token->client;
} }
elseif($client_contact = ClientContact::where('company_id', $company->id)->where('email', $profile['email'])->first()){ elseif($client_contact = ClientContact::where('company_id', $company->id)->where('email', $profile['email'])->first()){
$client = $client_contact->client; $client = $client_contact->client;
nlog("found client through contact"); // nlog("found client through contact");
} }
else { else {
nlog("creating client"); // nlog("creating client");
$first_payment_profile = $profile['payment_profiles'][0]; $first_payment_profile = $profile['payment_profiles'][0];
@ -148,14 +148,25 @@ class AuthorizeCustomer
$client_contact->save(); $client_contact->save();
} }
if($client){ if($client && is_array($profile['payment_profiles'])){
$this->authorize->setClient($client); $this->authorize->setClient($client);
foreach($profile['payment_profiles'] as $payment_profile) foreach($profile['payment_profiles'] as $payment_profile)
{ {
$token_exists = ClientGatewayToken::where('company_id', $company->id)
->where('token', $payment_profile->getCustomerPaymentProfileId())
->where('gateway_customer_reference', $gateway_customer_reference)
->exists();
if($token_exists)
continue;
// $expiry = $payment_profile->getPayment()->getCreditCard()->getExpirationDate();
$payment_meta = new \stdClass; $payment_meta = new \stdClass;
$payment_meta->exp_month = 'xx';
$payment_meta->exp_year = 'xx';
$payment_meta->brand = (string) $payment_profile->getPayment()->getCreditCard()->getCardType(); $payment_meta->brand = (string) $payment_profile->getPayment()->getCreditCard()->getCardType();
$payment_meta->last4 = (string) $payment_profile->getPayment()->getCreditCard()->getCardNumber(); $payment_meta->last4 = (string) $payment_profile->getPayment()->getCreditCard()->getCardNumber();
$payment_meta->type = GatewayType::CREDIT_CARD; $payment_meta->type = GatewayType::CREDIT_CARD;
@ -171,10 +182,7 @@ class AuthorizeCustomer
} }
} }
//iterate through auth.net list
//exclude any existing customers (ie. only import their missing payment profiles)
} }
private function getCountryCode($country_code) private function getCountryCode($country_code)

1
app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php
View File

@ -130,6 +130,7 @@ class AuthorizePaymentMethod
public function buildPaymentMethod($payment_profile) public function buildPaymentMethod($payment_profile)
{ {
$payment_meta = new stdClass; $payment_meta = new stdClass;
$payment_meta->exp_month = 'xx'; $payment_meta->exp_month = 'xx';
$payment_meta->exp_year = 'xx'; $payment_meta->exp_year = 'xx';

5
app/Providers/MailCssInlinerServiceProvider.php
View File

@ -41,10 +41,5 @@ class MailCssInlinerServiceProvider extends ServiceProvider
$this->app->singleton(CssInlinerPlugin::class, function ($app) { $this->app->singleton(CssInlinerPlugin::class, function ($app) {
return new CssInlinerPlugin([]); return new CssInlinerPlugin([]);
}); });
// $this->app->afterResolving('mail.manager', function (MailManager $mailManager) {
// $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
// return $mailManager;
// });
} }
} }

3
app/Utils/HtmlEngine.php
View File

@ -491,7 +491,8 @@ class HtmlEngine
//$data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => '']; //$data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => ''];
$data['$entity_footer'] = ['value' => Helpers::processReservedKeywords(\nl2br($this->entity->footer), $this->client), 'label' => '']; $data['$entity_footer'] = ['value' => Helpers::processReservedKeywords(\nl2br($this->entity->footer), $this->client), 'label' => ''];
$data['$footer'] = &$data['$entity_footer'];
$data['$page_size'] = ['value' => $this->settings->page_size, 'label' => '']; $data['$page_size'] = ['value' => $this->settings->page_size, 'label' => ''];
$data['$page_layout'] = ['value' => property_exists($this->settings, 'page_layout') ? $this->settings->page_layout : 'Portrait', 'label' => '']; $data['$page_layout'] = ['value' => property_exists($this->settings, 'page_layout') ? $this->settings->page_layout : 'Portrait', 'label' => ''];