fixed trans && fixed watermark image

This commit is contained in:
vedatakd 2020-11-10 16:49:13 +03:00
parent ada9f7ffc7
commit 0450fb500a
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@
{% set parent_url = url('admin/cats?cat='~parent.parent_category_id) %}
{% endif %}
<a class="btn btn-md btn-warning " href="{{ parent_url }}">
<i class="fa fa-arrow-left"></i> {{ trans('module.field.go_to_parent') }}
<i class="fa fa-arrow-left"></i> {{ trans('module::field.go_to_parent') }}
</a>
</div>
{% endif %}

View File

@ -111,7 +111,7 @@ class UploadController extends AdminController
if ($settings_value['watermark_type'] == 'image') {
if (!$watermarkimage = $this->files->find($settings_value['watermark_image'])) {
if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) {
$watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path());
$image->insert($watermark, $settings_value['watermark_position']);
}