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

Merge pull request #6236 from beganovich/v5-0807-billing-portal-changes

Browse Source 
(v5) Billing portal changes
This commit is contained in:
Benjamin Beganović 2021-07-09 14:28:16 +02:00 committed by GitHub
commit c7edf8704a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View File

@ -1,6 +1,6 @@
{
"/js/app.js": "/js/app.js?id=696e8203d5e8e7cf5ff5",
"/css/app.css": "/css/app.css?id=9d6698418e6cdd571d49",
"/css/app.css": "/css/app.css?id=b1d2337c232fcb67a548",
"/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4",
"/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1",
"/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=0dc8c34010d09195d2f7",
@ -21,7 +21,5 @@
"/js/clients/shared/multiple-downloads.js": "/js/clients/shared/multiple-downloads.js?id=5c35d28cf0a3286e7c45",
"/js/clients/shared/pdf.js": "/js/clients/shared/pdf.js?id=fc3055d6a099f523ea98",
"/js/setup/setup.js": "/js/setup/setup.js?id=8d454e7090f119552a6c",
"/css/card-js.min.css": "/css/card-js.min.css?id=62afeb675235451543ad",
"/js/admin.js": "/js/admin.js?id=003930085af69b13a86a",
"/css/admin.css": "/css/admin.css?id=0ca9742f0da64aa54214"
"/css/card-js.min.css": "/css/card-js.min.css?id=62afeb675235451543ad"
}

5
resources/lang/en/texts.php
View File

@ -4273,6 +4273,11 @@ $LANG = array(
'already_default_payment_method' => 'This is your preferred way of paying.',
'auto_bill_disabled' => 'Auto Bill Disabled',
'select_payment_method' => 'Select a payment method:',
'login_without_password' => 'Log in without password',
'email_sent' => 'E-mail sent, please check your inbox.',
'one_time_purchases' => 'One time purchases',
'recurring_purchases' => 'Recurring purchases',
'you_might_be_interested_in_following' => 'You might be interested in following',
);
return $LANG;

35
resources/views/portal/ninja2020/components/livewire/billing-portal-purchase.blade.php
View File

@ -1,5 +1,5 @@
<div class="grid grid-cols-12">
<div class="col-span-12 lg:col-span-6 bg-gray-50 flex flex-col items-center">
<div class="col-span-12 xl:col-span-8 bg-gray-50 flex flex-col items-center">
<div class="w-full p-10 lg:mt-24 md:max-w-3xl">
<img class="h-8" src="{{ $subscription->company->present()->logo }}"
alt="{{ $subscription->company->present()->name }}">
@ -14,7 +14,7 @@
<div class="flex flex-col mt-8">
<p
class="mb-4 uppercase leading-4 tracking-wide inline-flex items-center rounded-full text-xs font-medium">
One-time purchases:
{{ ctrans('texts.one_time_purchases') }}
</p>
@foreach($subscription->service()->products() as $product)
@ -25,7 +25,6 @@
<div data-ref="price-and-quantity-container">
<span
data-ref="price">{{ \App\Utils\Number::formatMoney($product->price, $subscription->company) }}</span>
{{-- <span data-ref="quantity" class="text-sm">(1x)</span>--}}
</div>
</div>
@endforeach
@ -36,7 +35,7 @@
<div class="flex flex-col mt-8">
<p
class="mb-4 uppercase leading-4 tracking-wide inline-flex items-center rounded-full text-xs font-medium">
Recurring purchases:
{{ ctrans('texts.recurring_purchases') }}
</p>
@foreach($subscription->service()->recurring_products() as $product)
@ -82,12 +81,26 @@
<span>{{ ctrans('texts.client_portal') }}</span>
</a>
@endif
@if($subscription->service()->getPlans()->count() - 1 > 1)
<div class="flex flex-col mt-10">
<p class="mb-4 uppercase leading-4 tracking-wide inline-flex items-center rounded-full text-xs font-medium">
{{ ctrans('texts.you_might_be_interested_in_following') }}:
</p>
<div class="mt-4 space-x-2">
@foreach($subscription->service()->getPlans() as $_subscription)
<a class="border mt-4 bg-white rounded py-2 px-4 hover:bg-gray-100 text-sm" target="_blank" href="{{ route('client.subscription.purchase', $_subscription->hashed_id) }}">{{ $_subscription->name }}</a>
@endforeach
</div>
</div>
@endif
</div>
</div>
<div class="col-span-12 lg:col-span-6 bg-white lg:h-screen">
<div class="grid grid-cols-12 flex flex-col p-10 lg:mt-48 lg:ml-16">
<div class="col-span-12 w-full lg:col-span-6">
<div class="col-span-12 xl:col-span-4 bg-white flex flex-col items-center lg:h-screen">
<div class="w-full p-10 md:p-24 xl:mt-32 md:max-w-3xl">
<div class="col-span-12 w-full xl:col-span-9">
<h2 class="text-2xl font-bold tracking-wide">{{ $heading_text ?? ctrans('texts.login') }}</h2>
@if (session()->has('message'))
@component('portal.ninja2020.components.message')
@ -179,12 +192,12 @@
<button wire:loading.attr="disabled" type="button" wire:click="passwordlessLogin"
class="mt-4 text-sm active:outline-none focus:outline-none">
Log in without password
{{ ctrans('texts.login_without_password') }}
</button>
@if($steps['passwordless_login_sent'])
<span
class="block mt-2 text-sm text-green-600">E-mail sent. Please check your inbox!</span>
class="block mt-2 text-sm text-green-600">{{ ctrans('texts.email_sent') }}</span>
@endif
@endif
@ -200,7 +213,7 @@
</div>
<div class="relative flex justify-center text-sm leading-5">
<span class="px-2 text-gray-700 bg-white">Have a coupon code?</span>
<span class="px-2 text-gray-700 bg-white">{{ ctrans('texts.promo_code') }}</span>
</div>
</div>
@ -211,7 +224,7 @@
<input type="text" wire:model.lazy="coupon" class="input w-full m-0"/>
</label>
<button class="button button-primary bg-primary">Apply</button>
<button class="button button-primary bg-primary">{{ ctrans('texts.apply') }}</button>
</form>
@endif