mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Merge pull request #8077 from turbo124/v5-develop
Attach invoice documents to payment emails
This commit is contained in:
David Bomba
GitHub
commit
d7d9239a24
@ -33,6 +33,8 @@ use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Laracasts\Presenter\Exceptions\PresenterException;
|
||||
use InvalidArgumentException;
|
||||
use Livewire\Component;
|
||||
|
||||
class BillingPortalPurchasev2 extends Component
|
||||
@ -51,13 +53,6 @@ class BillingPortalPurchasev2 extends Component
|
||||
*/
|
||||
public $email;
|
||||
|
||||
/**
|
||||
* Password model for user input.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public $password;
|
||||
|
||||
/**
|
||||
* Instance of subscription.
|
||||
*
|
||||
@ -72,19 +67,6 @@ class BillingPortalPurchasev2 extends Component
|
||||
*/
|
||||
public $contact;
|
||||
|
||||
/**
|
||||
* Rules for validating the form.
|
||||
*
|
||||
* @var \string[][]
|
||||
*/
|
||||
// protected $rules = [
|
||||
// 'email' => ['required', 'email'],
|
||||
// 'data' => ['required', 'array'],
|
||||
// 'data.*.recurring_qty' => ['required', 'between:100,1000'],
|
||||
// 'data.*.optional_recurring_qty' => ['required', 'between:100,1000'],
|
||||
// 'data.*.optional_qty' => ['required', 'between:100,1000'],
|
||||
// ];
|
||||
|
||||
/**
|
||||
* Id for CompanyGateway record.
|
||||
*
|
||||
@ -99,27 +81,10 @@ class BillingPortalPurchasev2 extends Component
|
||||
*/
|
||||
public $payment_method_id;
|
||||
|
||||
|
||||
/**
|
||||
* List of steps that frontend form follows.
|
||||
*
|
||||
* @var array
|
||||
* Array of front end variables for
|
||||
* the subscription
|
||||
*/
|
||||
public $steps = [
|
||||
'passed_email' => false,
|
||||
'existing_user' => false,
|
||||
'fetched_payment_methods' => false,
|
||||
'fetched_client' => false,
|
||||
'show_start_trial' => false,
|
||||
'passwordless_login_sent' => false,
|
||||
'started_payment' => false,
|
||||
'discount_applied' => false,
|
||||
'show_loading_bar' => false,
|
||||
'not_eligible' => null,
|
||||
'not_eligible_message' => null,
|
||||
'payment_required' => true,
|
||||
];
|
||||
|
||||
public $data = [];
|
||||
|
||||
/**
|
||||
@ -157,18 +122,6 @@ class BillingPortalPurchasev2 extends Component
|
||||
*/
|
||||
public $request_data;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public $price;
|
||||
|
||||
/**
|
||||
* Disabled state of passwordless login button.
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
public $passwordless_login_btn = false;
|
||||
|
||||
/**
|
||||
* Instance of company.
|
||||
*
|
||||
@ -197,6 +150,7 @@ class BillingPortalPurchasev2 extends Component
|
||||
public $payment_started = false;
|
||||
public $valid_coupon = false;
|
||||
public $payable_invoices = [];
|
||||
public $payment_confirmed = false;
|
||||
|
||||
public function mount()
|
||||
{
|
||||
@ -249,7 +203,9 @@ class BillingPortalPurchasev2 extends Component
|
||||
return $this;
|
||||
}
|
||||
|
||||
$contact = ClientContact::where('email', $this->email)->first();
|
||||
$contact = ClientContact::where('email', $this->email)
|
||||
->where('company_id', $this->subscription->company_id)
|
||||
->first();
|
||||
|
||||
if($contact){
|
||||
Auth::guard('contact')->loginUsingId($contact->id, true);
|
||||
@ -259,14 +215,10 @@ class BillingPortalPurchasev2 extends Component
|
||||
$this->createClientContact();
|
||||
}
|
||||
|
||||
$this->authenticated = true;
|
||||
|
||||
$this->getPaymentMethods();
|
||||
|
||||
}
|
||||
|
||||
public function showClientRequiredFields()
|
||||
{
|
||||
$this->authenticated = true;
|
||||
$this->payment_started = true;
|
||||
|
||||
}
|
||||
|
||||
@ -303,7 +255,6 @@ class BillingPortalPurchasev2 extends Component
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Handle a coupon being entered into the checkout
|
||||
*/
|
||||
@ -455,6 +406,11 @@ class BillingPortalPurchasev2 extends Component
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return $this
|
||||
* @throws PresenterException
|
||||
* @throws InvalidArgumentException
|
||||
*/
|
||||
private function createClientContact()
|
||||
{
|
||||
|
||||
@ -475,19 +431,26 @@ class BillingPortalPurchasev2 extends Component
|
||||
$client = $client_repo->save($data, ClientFactory::create($company->id, $user->id));
|
||||
|
||||
$this->contact = $client->fresh()->contacts()->first();
|
||||
|
||||
Auth::guard('contact')->loginUsingId($this->contact->id, true);
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
|
||||
public function updated($propertyName)
|
||||
/**
|
||||
* @param mixed $propertyName
|
||||
*
|
||||
* @return BillingPortalPurchasev2
|
||||
*/
|
||||
public function updated($propertyName) :self
|
||||
{
|
||||
if(in_array($propertyName, ['login','email']))
|
||||
return;
|
||||
return $this;
|
||||
|
||||
$this->buildBundle();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -495,8 +458,9 @@ class BillingPortalPurchasev2 extends Component
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
protected function getPaymentMethods(): self
|
||||
protected function getPaymentMethods() :self
|
||||
{
|
||||
if($this->contact)
|
||||
$this->methods = $this->contact->client->service()->getPaymentMethods($this->float_amount_total);
|
||||
|
||||
return $this;
|
||||
@ -511,6 +475,7 @@ class BillingPortalPurchasev2 extends Component
|
||||
*/
|
||||
public function handleMethodSelectingEvent($company_gateway_id, $gateway_type_id)
|
||||
{
|
||||
$this->payment_confirmed = true;
|
||||
|
||||
$this->company_gateway_id = $company_gateway_id;
|
||||
$this->payment_method_id = $gateway_type_id;
|
||||
@ -525,7 +490,6 @@ class BillingPortalPurchasev2 extends Component
|
||||
*/
|
||||
public function handleBeforePaymentEvents() :void
|
||||
{
|
||||
$this->payment_started = true;
|
||||
|
||||
$data = [
|
||||
'client_id' => $this->contact->client->id,
|
||||
@ -722,58 +686,6 @@ class BillingPortalPurchasev2 extends Component
|
||||
*
|
||||
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
*/
|
||||
public function handleTrial()
|
||||
{
|
||||
return $this->subscription->service()->startTrial([
|
||||
'email' => $this->email ?? $this->contact->email,
|
||||
'quantity' => $this->quantity,
|
||||
'contact_id' => $this->contact->id,
|
||||
'client_id' => $this->contact->client->id,
|
||||
]);
|
||||
}
|
||||
|
||||
public function handlePaymentNotRequired()
|
||||
{
|
||||
|
||||
$is_eligible = $this->subscription->service()->isEligible($this->contact);
|
||||
|
||||
if ($is_eligible['status_code'] != 200) {
|
||||
$this->steps['not_eligible'] = true;
|
||||
$this->steps['not_eligible_message'] = $is_eligible['message'];
|
||||
$this->steps['show_loading_bar'] = false;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
return $this->subscription->service()->handleNoPaymentRequired([
|
||||
'email' => $this->email ?? $this->contact->email,
|
||||
'quantity' => $this->quantity,
|
||||
'contact_id' => $this->contact->id,
|
||||
'client_id' => $this->contact->client->id,
|
||||
'coupon' => $this->coupon,
|
||||
]);
|
||||
}
|
||||
|
||||
public function passwordlessLogin()
|
||||
{
|
||||
$this->passwordless_login_btn = true;
|
||||
|
||||
$contact = ClientContact::query()
|
||||
->where('email', $this->email)
|
||||
->where('company_id', $this->subscription->company_id)
|
||||
->first();
|
||||
|
||||
$mailer = new NinjaMailerObject();
|
||||
$mailer->mailable = new ContactPasswordlessLogin($this->email, $this->subscription->company, (string)route('client.subscription.purchase', $this->subscription->hashed_id) . '?coupon=' . $this->coupon);
|
||||
$mailer->company = $this->subscription->company;
|
||||
$mailer->settings = $this->subscription->company->settings;
|
||||
$mailer->to_user = $contact;
|
||||
|
||||
NinjaMailerJob::dispatch($mailer);
|
||||
|
||||
$this->steps['passwordless_login_sent'] = true;
|
||||
$this->passwordless_login_btn = false;
|
||||
}
|
||||
|
||||
public function render()
|
||||
{
|
||||
@ -782,16 +694,10 @@ class BillingPortalPurchasev2 extends Component
|
||||
}
|
||||
|
||||
if ($this->contact instanceof ClientContact) {
|
||||
$this->getPaymentMethods($this->contact);
|
||||
$this->getPaymentMethods();
|
||||
}
|
||||
|
||||
return render('components.livewire.billing-portal-purchasev2');
|
||||
}
|
||||
|
||||
// public function changeData()
|
||||
// {
|
||||
|
||||
// nlog($this->data);
|
||||
|
||||
// }
|
||||
}
|
||||
|
||||
@ -96,11 +96,17 @@ class PaymentEmailEngine extends BaseEmailEngine
|
||||
|
||||
$this->setAttachments([['file' => base64_encode($pdf), 'name' => $invoice->numberFormatter().'.pdf']]);
|
||||
|
||||
//attach invoice documents also to payments
|
||||
if ($this->client->getSetting('document_email_attachment') !== false)
|
||||
{
|
||||
foreach ($invoice->documents as $document) {
|
||||
$this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL, ]]);
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
// foreach ($this->payment->documents as $document) {
|
||||
// $this->setAttachments([['path' => $document->filePath(), 'name' => $document->name, 'mime' => NULL, ]]);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
return $this;
|
||||
|
||||
@ -229,6 +229,6 @@ class BrowserPay implements MethodInterface
|
||||
$domain = config('ninja.app_url');
|
||||
}
|
||||
|
||||
return str_replace('https://', '', $domain);
|
||||
return str_replace(['https://', '/public'], '', $domain);
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,9 +8,8 @@
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
|
||||
@if(isset($invoice))
|
||||
<div class="flex items-center mt-4 text-sm">
|
||||
@if(isset($invoice))
|
||||
<div class="flex items-center mt-4 text-sm">
|
||||
<form action="{{ route('client.payments.process', ['hash' => $hash, 'sidebar' => 'hidden']) }}"
|
||||
method="post"
|
||||
id="payment-method-form">
|
||||
@ -28,8 +27,8 @@
|
||||
<input type="hidden" name="company_gateway_id" value="{{ $company_gateway_id }}"/>
|
||||
<input type="hidden" name="payment_method_id" value="{{ $payment_method_id }}"/>
|
||||
</form>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<form wire:submit.prevent="submit">
|
||||
<!-- Recurring Plan Products-->
|
||||
@ -65,7 +64,6 @@
|
||||
@endfor
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@endif
|
||||
</div>
|
||||
@error("data.{$index}.recurring_qty")
|
||||
@ -83,7 +81,7 @@
|
||||
@foreach($products as $product)
|
||||
<li class="flex py-6">
|
||||
@if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
|
||||
<div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
|
||||
<div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200 mr-2">
|
||||
<img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
|
||||
</div>
|
||||
@endif
|
||||
@ -122,7 +120,7 @@
|
||||
@foreach($optional_recurring_products as $index => $product)
|
||||
<li class="flex py-6">
|
||||
@if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
|
||||
<div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
|
||||
<div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200 mr-2">
|
||||
<img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
|
||||
</div>
|
||||
@endif
|
||||
@ -130,9 +128,8 @@
|
||||
<div>
|
||||
<div class="flex justify-between text-base font-medium text-gray-900">
|
||||
<h3>{!! nl2br($product->notes) !!}</h3>
|
||||
<p class="ml-0">{{ \App\Utils\Number::formatMoney($product->price, $subscription->company) }} </p>
|
||||
<p class="ml-0">{{ \App\Utils\Number::formatMoney($product->price, $subscription->company) }} / {{ App\Models\RecurringInvoice::frequencyForKey($subscription->frequency_id) }}</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="flex justify-between text-sm mt-1">
|
||||
@if(is_numeric($product->custom_value2))
|
||||
@ -149,7 +146,7 @@
|
||||
@endif
|
||||
>
|
||||
<option value="0" selected="selected">0</option>
|
||||
@for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity,$product->custom_value2) : $product->custom_value2); $i++)
|
||||
@for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity, max(100,$product->custom_value2)) : max(100,$product->custom_value2)); $i++)
|
||||
<option value="{{$i}}">{{$i}}</option>
|
||||
@endfor
|
||||
</select>
|
||||
@ -164,7 +161,7 @@
|
||||
@foreach($optional_products as $index => $product)
|
||||
<li class="flex py-6">
|
||||
@if(filter_var($product->custom_value1, FILTER_VALIDATE_URL))
|
||||
<div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200">
|
||||
<div class="h-24 w-24 flex-shrink-0 overflow-hidden rounded-md border border-gray-200 mr-2">
|
||||
<img src="{{$product->custom_value1}}" alt="" class="h-full w-full object-cover object-center">
|
||||
</div>
|
||||
@endif
|
||||
@ -187,7 +184,7 @@
|
||||
@endif
|
||||
<select wire:model.debounce.300ms="data.{{ $index }}.optional_qty" class="rounded-md border-gray-300 shadow-sm sm:text-sm">
|
||||
<option value="0" selected="selected">0</option>
|
||||
@for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity,$product->custom_value2) : $product->custom_value2); $i++)
|
||||
@for ($i = 1; $i <= ($subscription->use_inventory_management ? min($product->in_stock_quantity, min(100,$product->custom_value2)) : min(100,$product->custom_value2)); $i++)
|
||||
<option value="{{$i}}">{{$i}}</option>
|
||||
@endfor
|
||||
</select>
|
||||
@ -253,8 +250,7 @@
|
||||
<span>{{ $total }}</span>
|
||||
</div>
|
||||
|
||||
@if($authenticated)
|
||||
<div class="mx-auto text-center mt-20 content-center">
|
||||
<div class="mx-auto text-center mt-20 content-center" x-data="{open: @entangle('payment_started'), toggle: @entangle('payment_confirmed'), buttonDisabled: false}" x-show.important="open" x-transition>
|
||||
<h2 class="text-2xl font-bold tracking-wide border-b-2 pb-4">{{ $heading_text ?? ctrans('texts.checkout') }}</h2>
|
||||
@if (session()->has('message'))
|
||||
@component('portal.ninja2020.components.message')
|
||||
@ -262,9 +258,10 @@
|
||||
@endcomponent
|
||||
@endif
|
||||
@if(count($methods) > 0)
|
||||
<div class="mt-4">
|
||||
<div class="mt-4" x-show.important="!toggle" x-transition>
|
||||
@foreach($methods as $method)
|
||||
<button
|
||||
x-on:click="buttonDisabled = true" x-bind:disabled="buttonDisabled"
|
||||
wire:click="handleMethodSelectingEvent('{{ $method['company_gateway_id'] }}', '{{ $method['gateway_type_id'] }}')"
|
||||
class="relative -ml-px inline-flex items-center space-x-2 rounded border border-gray-300 bg-gray-50 px-4 py-2 text-sm font-medium text-gray-700 hover:bg-gray-100 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500">
|
||||
{{ $method['label'] }}
|
||||
@ -273,8 +270,7 @@
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if($payment_started)
|
||||
<div class="mt-4 container mx-auto flex w-full justify-center">
|
||||
<div class="mt-4 container mx-auto flex w-full justify-center" x-show.important="toggle" x-transition>
|
||||
<span class="">
|
||||
<svg class="animate-spin h-8 w-8 text-primary mx-auto justify-center w-full" xmlns="http://www.w3.org/2000/svg"
|
||||
fill="none" viewBox="0 0 24 24">
|
||||
@ -285,9 +281,8 @@
|
||||
</svg>
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(!$email || $errors->has('email'))
|
||||
<form wire:submit.prevent="handleEmail" class="">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user