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

Merge branch 'master' into user-works

Browse Source
This commit is contained in:
Sevan Nerse 2022-06-30 17:41:19 +03:00
commit c0a8520671
7 changed files with 732 additions and 12111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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>
<div class="col text-gray-500 ml-3"> <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> <p class="text-xs text-muted mb-0" data-dz-size>...</p>
</div> </div>

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

@ -10,7 +10,7 @@
<span class="text-xs mb-0">{{ $file->readableSize() }}</span> <span class="text-xs mb-0">{{ $file->readableSize() }}</span>
</div> </div>
</div> </div>
<div class="gap-x-1"> <div class="flex flex-row lg:flex-col gap-x-1">
@can('delete-common-uploads') @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"> <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> <span class="material-icons text-base text-red px-1.5 py-1 rounded-lg group-hover:bg-gray-100">delete</span>