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

Merge branch 'master' into company-forms

Browse Source
This commit is contained in:
Sevan Nerse 2022-07-01 00:05:11 +03:00
commit 2f3fc5cc0c
15 changed files with 747 additions and 12126 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()
{
$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>';

2
app/Abstracts/Widget.php
View File

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

1
app/Exports/Purchases/Vendors.php
View File

@ -35,7 +35,6 @@ class Vendors extends Export
'currency_code',
'reference',
'enabled',
'user_id',
];
}
}

1
app/Exports/Sales/Customers.php
View File

@ -35,7 +35,6 @@ class Customers extends Export
'currency_code',
'reference',
'enabled',
'user_id',
];
}
}

1
app/Imports/Purchases/Vendors.php
View File

@ -21,6 +21,7 @@ class Vendors extends Import
$row['type'] = 'vendor';
$row['country'] = !empty($country) ? $country : null;
$row['user_id'] = null;
return $row;
}

1
app/Imports/Sales/Customers.php
View File

@ -21,6 +21,7 @@ class Customers extends Import
$row['type'] = 'customer';
$row['country'] = !empty($country) ? $country : null;
$row['user_id'] = null;
return $row;
}

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

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

12
app/Traits/Cloud.php
View File

@ -15,10 +15,10 @@ trait Cloud
return request()->getHost() == $this->cloud_host;
}
public function getCloudRolesPageUrl()
public function getCloudRolesPageUrl($location = 'user')
{
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')) {
@ -26,20 +26,20 @@ trait Cloud
}
return route('cloud.plans.index', [
'utm_source' => 'user',
'utm_source' => $location,
'utm_medium' => 'app',
'utm_campaign' => 'roles',
]);
}
public function getCloudBankFeedsUrl()
public function getCloudBankFeedsUrl($location = 'widget')
{
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', [
'utm_source' => 'widget',
'utm_source' => $location,
'utm_medium' => 'app',
'utm_campaign' => 'bank_feeds',
]);

12835
public/css/app.css vendored
View File

File diff suppressed because it is too large Load Diff

2
resources/assets/js/components/AkauntingDropzoneFileUpload.vue
View File

@ -33,7 +33,7 @@
</div>
<div class="col text-gray-500 ml-3">
<h4 class="text-sm mb-1" data-dz-name>...</h4>
<h4 class="w-56 lg:w-96 text-sm mb-1 truncate" data-dz-name>...</h4>
<p class="text-xs text-muted mb-0" data-dz-size>...</p>
</div>

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">
<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>
</div>
@else

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

@ -7,7 +7,7 @@
</div>
<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') }}
</a>
</div>

2
resources/views/components/media/file.blade.php
View File

@ -10,7 +10,7 @@
<span class="text-xs mb-0">{{ $file->readableSize() }}</span>
</div>
</div>
<div class="gap-x-1">
<div class="flex flex-row lg:flex-col gap-x-1">
@can('delete-common-uploads')
<a href="javascript:void();" id="remove-{{ $column_name }}" @click="onDeleteFile('{{ $file->id }}', '{{ route('uploads.destroy', $file->id) }}', '{{ trans('general.title.delete', ['type' => $column_name]) }}', '{{ trans('general.delete_confirm', ['name' => $file->basename, 'type' => $column_name]) }} ', '{{ trans('general.cancel') }}', '{{ trans('general.delete') }}')" type="button" class="group">
<span class="material-icons text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">delete</span>

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

@ -158,7 +158,7 @@
</div>
<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') }}
</a>
</div>

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

@ -35,7 +35,7 @@
@foreach($payments as $item)
<x-table.tr href="{{ route('portal.payments.show', $item->id) }}">
<x-table.td kind="action"></x-table.td>
<x-table.td class="w-4/12 sm:w-3/12">
<span class="font-bold"><x-date date="{{ $item->paid_at }}" /></span>
</x-table.td>
@ -66,7 +66,7 @@
</div>
<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') }}
</a>
</div>