shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akaunting:master' into master

Browse Source
This commit is contained in:
Burak Civan 2022-07-01 14:48:28 +03:00 committed by GitHub
commit dd562ff024
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Notification.php
View File

@ -91,7 +91,7 @@ abstract class Notification extends BaseNotification implements ShouldQueue
public function getFooter() public function getFooter()
{ {
$url = 'https://akaunting.com/lp/accounting-software?utm_source=email&utm_medium=software&utm_campaign=footer&utm_content=' . $this->template->alias; $url = 'https://akaunting.com/lp/accounting-software?utm_source=email&utm_medium=footer&utm_campaign=plg&utm_content=' . $this->template->alias;
$get_started = '<a href="' . $url . '" style="color: #676ba2; text-decoration: none;">' . trans('footer.get_started') . '</a>'; $get_started = '<a href="' . $url . '" style="color: #676ba2; text-decoration: none;">' . trans('footer.get_started') . '</a>';

2
app/Abstracts/Widget.php
View File

@ -63,7 +63,7 @@ abstract class Widget
'alias' => $alias, 'alias' => $alias,
'utm_source' => 'widget', 'utm_source' => 'widget',
'utm_medium' => 'app', 'utm_medium' => 'app',
'utm_campaign' => Str::snake(Str::camel($alias)), 'utm_campaign' => str_replace('-', '_', $alias),
]); ]);
} }

4
app/Listeners/Menu/ShowInNotifications.php
View File

@ -62,8 +62,8 @@ class ShowInNotifications
$app_url = route('apps.app.show', [ $app_url = route('apps.app.show', [
'alias' => $new_app->alias, 'alias' => $new_app->alias,
'utm_source' => 'notification', 'utm_source' => 'notification',
'utm_medium' => 'software', 'utm_medium' => 'app',
'utm_campaign' => str_replace('-', '', $new_app->alias), 'utm_campaign' => str_replace('-', '_', $new_app->alias),
]); ]);
$new = new DatabaseNotification(); $new = new DatabaseNotification();

12
app/Traits/Cloud.php
View File

@ -15,10 +15,10 @@ trait Cloud
return request()->getHost() == $this->cloud_host; return request()->getHost() == $this->cloud_host;
} }
public function getCloudRolesPageUrl() public function getCloudRolesPageUrl($location = 'user')
{ {
if (! $this->isCloud()) { if (! $this->isCloud()) {
return 'https://akaunting.com/plans?utm_source=user_role&utm_medium=software&utm_campaign=plg'; return 'https://akaunting.com/apps/roles?utm_source=software&utm_medium=' . $location . '&utm_campaign=roles';
} }
if ($this->moduleIsEnabled('roles')) { if ($this->moduleIsEnabled('roles')) {
@ -26,20 +26,20 @@ trait Cloud
} }
return route('cloud.plans.index', [ return route('cloud.plans.index', [
'utm_source' => 'user', 'utm_source' => $location,
'utm_medium' => 'app', 'utm_medium' => 'app',
'utm_campaign' => 'roles', 'utm_campaign' => 'roles',
]); ]);
} }
public function getCloudBankFeedsUrl() public function getCloudBankFeedsUrl($location = 'widget')
{ {
if (! $this->isCloud()) { if (! $this->isCloud()) {
return 'https://akaunting.com/features/connect-your-bank?utm_source=bank_feeds_widget&utm_medium=software&utm_campaign=plg'; return 'https://akaunting.com/apps/bank-feeds?utm_source=software&utm_medium=' . $location . '&utm_campaign=bank_feeds';
} }
return route('cloud.plans.index', [ return route('cloud.plans.index', [
'utm_source' => 'widget', 'utm_source' => $location,
'utm_medium' => 'app', 'utm_medium' => 'app',
'utm_campaign' => 'bank_feeds', 'utm_campaign' => 'bank_feeds',
]); ]);

17
resources/assets/js/views/common/companies.js vendored
View File

@ -30,5 +30,22 @@ const app = new Vue({
form: new Form('company'), form: new Form('company'),
bulk_action: new BulkAction('companies') bulk_action: new BulkAction('companies')
} }
},
methods: {
// Form Submit
onSubmit() {
this.form.loading = true;
if (this.form.country === "") {
this.form.errors.set('country', [country_validation_required_message]);
this.form.loading = false;
return;
}
this.form.submit();
},
} }
}); });

8
resources/views/common/companies/create.blade.php
View File

@ -44,7 +44,7 @@
</x-slot> </x-slot>
<x-slot name="body"> <x-slot name="body">
<x-form.group.textarea name="address" label="{{ trans('general.address') }}" v-model="form.address" /> <x-form.group.textarea name="address" label="{{ trans('general.address') }}" v-model="form.address" not-required />
<x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" value="{{ setting('company.city') }}" not-required /> <x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" value="{{ setting('company.city') }}" not-required />
@ -65,5 +65,11 @@
</x-form.container> </x-form.container>
</x-slot> </x-slot>
@push('scripts_end')
<script type="text/javascript">
var country_validation_required_message = "{{ trans('validation.required', ['attribute' => trans_choice('general.countries', 1)]) }}";
</script>
@endpush
<x-script folder="common" file="companies" /> <x-script folder="common" file="companies" />
</x-layouts.admin> </x-layouts.admin>

6
resources/views/common/companies/edit.blade.php
View File

@ -69,5 +69,11 @@
</x-form.container> </x-form.container>
</x-slot> </x-slot>
@push('scripts_end')
<script type="text/javascript">
var country_validation_required_message = "{{ trans('validation.required', ['attribute' => trans_choice('general.countries', 1)]) }}";
</script>
@endpush
<x-script folder="common" file="companies" /> <x-script folder="common" file="companies" />
</x-layouts.admin> </x-layouts.admin>

2
resources/views/components/contacts/form/address.blade.php
View File

@ -24,7 +24,7 @@
@endif @endif
@if (! $hideCountry) @if (! $hideCountry)
<x-form.group.country form-group-class="sm:col-span-3 el-select-tags-pl-38" /> <x-form.group.country form-group-class="sm:col-span-3 el-select-tags-pl-38" not-required />
@endif @endif
</x-slot> </x-slot>
</x-form.section> </x-form.section>

3
resources/views/components/form/group/country.blade.php
View File

@ -3,7 +3,8 @@
label="{!! trans_choice('general.countries', 1) !!}" label="{!! trans_choice('general.countries', 1) !!}"
:options="trans('countries')" :options="trans('countries')"
:selected="setting('company.country')" :selected="setting('company.country')"
not-required required="{{ $required }}"
not-required="{{ $notRequired }}"
model="form.country" model="form.country"
form-group-class="{{ $formGroupClass }}" form-group-class="{{ $formGroupClass }}"
/> />

2
resources/views/components/layouts/modules/show/information.blade.php
View File

@ -13,7 +13,7 @@
<div x-show="price_type == false" class="text-center text-sm mt-3 mb--2"> <div x-show="price_type == false" class="text-center text-sm mt-3 mb--2">
<span style="font-size: 12px;"> <span style="font-size: 12px;">
<span class="text-red">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=app_show&utm_medium=software&utm_campaign={{ str_replace('-', '', $module->slug) }}" target="_blank">{!! trans('modules.information_monthly') !!}</a> <span class="text-red">*</span> <a href="https://akaunting.com/features/why-akaunting-cloud?utm_source=software&utm_medium=app_show&utm_campaign={{ str_replace('-', '_', $module->slug) }}" target="_blank">{!! trans('modules.information_monthly') !!}</a>
</span> </span>
</div> </div>
@else @else

2
resources/views/components/layouts/portal/finish/content.blade.php
View File

@ -7,7 +7,7 @@
</div> </div>
<div class="my-10"> <div class="my-10">
<a href="https://akaunting.com/lp/accounting-software?utm_source=invoice_payment&utm_medium=software&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"> <a href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_payment&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
{{ trans('portal.get_started') }} {{ trans('portal.get_started') }}
</a> </a>
</div> </div>

2
resources/views/modals/customers/create.blade.php
View File

@ -72,7 +72,7 @@
<x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required /> <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
<x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" /> <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" not-required />
</div> </div>
</div> </div>

2
resources/views/modals/customers/edit.blade.php
View File

@ -72,7 +72,7 @@
<x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required /> <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
<x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" /> <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" not-required />
</div> </div>
</div> </div>

2
resources/views/modals/vendors/create.blade.php vendored
View File

@ -72,7 +72,7 @@
<x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required /> <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
<x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" /> <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" not-required />
</div> </div>
</div> </div>

2
resources/views/modals/vendors/edit.blade.php vendored
View File

@ -72,7 +72,7 @@
<x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required /> <x-form.group.text name="state" label="{{ trans('general.state') }}" form-group-class="col-span-6" not-required />
<x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" /> <x-form.group.country form-group-class="col-span-6 el-select-tags-pl-38" not-required />
</div> </div>
</div> </div>

2
resources/views/portal/invoices/index.blade.php
View File

@ -158,7 +158,7 @@
</div> </div>
<div class="my-10"> <div class="my-10">
<a href="https://akaunting.com/lp/accounting-software?utm_source=invoice_index&utm_medium=software&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"> <a href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=invoice_index&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
{{ trans('portal.get_started') }} {{ trans('portal.get_started') }}
</a> </a>
</div> </div>

4
resources/views/portal/payments/index.blade.php
View File

@ -35,7 +35,7 @@
@foreach($payments as $item) @foreach($payments as $item)
<x-table.tr href="{{ route('portal.payments.show', $item->id) }}"> <x-table.tr href="{{ route('portal.payments.show', $item->id) }}">
<x-table.td kind="action"></x-table.td> <x-table.td kind="action"></x-table.td>
<x-table.td class="w-4/12 sm:w-3/12"> <x-table.td class="w-4/12 sm:w-3/12">
<span class="font-bold"><x-date date="{{ $item->paid_at }}" /></span> <span class="font-bold"><x-date date="{{ $item->paid_at }}" /></span>
</x-table.td> </x-table.td>
@ -66,7 +66,7 @@
</div> </div>
<div class="my-10"> <div class="my-10">
<a href="https://akaunting.com/lp/accounting-software?utm_source=payment_index&utm_medium=software&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700"> <a href="https://akaunting.com/lp/accounting-software?utm_source=software&utm_medium=payment_index&utm_campaign=plg" class="bg-purple text-white px-3 py-1.5 mb-3 sm:mb-0 rounded-xl text-sm font-medium leading-6 hover:bg-purple-700">
{{ trans('portal.get_started') }} {{ trans('portal.get_started') }}
</a> </a>
</div> </div>

2
resources/views/portal/profile/edit.blade.php
View File

@ -48,7 +48,7 @@
<x-form.group.locale /> <x-form.group.locale />
<x-form.group.country :selected="$user->contact->country" /> <x-form.group.country :selected="$user->contact->country" not-required />
<x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" value="{{ $user->contact->city }}" not-required /> <x-form.group.text name="city" label="{{ trans_choice('general.cities', 1) }}" value="{{ $user->contact->city }}" not-required />