hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openclassify/openclassify into mtop

Browse Source 
 Conflicts:
	addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
This commit is contained in:
Muammer Top 2021-06-22 10:38:58 +03:00
commit 1853920357
9 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
addons/default/visiosoft/advs-module/migrations/2021_06_21_114752_visiosoft.module.advs__create_config_fields.php Normal file
View File

@ -0,0 +1,25 @@
<?php
use Anomaly\Streams\Platform\Database\Migration\Migration;
class VisiosoftModuleAdvsCreateConfigFields extends Migration
{
public function __construct()
{
//Maria DB will be removed when the version is updated.
\Illuminate\Support\Facades\DB::getDoctrineSchemaManager()
->getDatabasePlatform()->registerDoctrineTypeMapping('point', 'string');
}
protected $stream = [
'slug' => 'advs',
];
protected $fields = [
'config' => 'visiosoft.field_type.json',
];
protected $assignments = [
'config'
];
}

2
addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig
View File

@ -7,7 +7,7 @@
</a> </a>
</span> </span>
{{ addBlock('ads-list/partials/breadcrumb', {'mainCats': mainCats, 'category': categoryId})|raw }} {{ addBlock('ads-list/partials/breadcrumb', {'mainCats': mainCats, 'category': category})|raw }}
</div> </div>

17
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -21,9 +21,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
protected $appends = [ protected $appends = [
'detail_url', 'detail_url',
'currency_price', 'currency_price',
'currency_standard_price',
'category1', 'category1',
'category2', 'currency_standard_price',
'category2',
'thumbnail', 'thumbnail',
]; ];
@ -37,10 +37,13 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
return app(Currency::class)->format($this->price, $this->currency); return app(Currency::class)->format($this->price, $this->currency);
} }
public function getCurrencyStandardPriceAttribute() public function getCurrencyStandardPriceAttribute()
{ {
return app(Currency::class)->format($this->standard_price, $this->currency); if ($this->standard_price > $this->currency) {
} return app(Currency::class)->format($this->standard_price, $this->currency);
}
return null;
}
public function getCategory1Attribute() public function getCategory1Attribute()
{ {
@ -50,7 +53,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function getCategory2Attribute() public function getCategory2Attribute()
{ {
return $this->hasMany('Visiosoft\CatsModule\Category\CategoryModel', 'id', 'cat2')->first(); return $this->hasMany('Visiosoft\CatsModule\Category\CategoryModel', 'id', 'cat1')->first();
} }

8
addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
View File

@ -58,8 +58,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$delimiter = '_'; $delimiter = '_';
$keyword = str_slug($param['keyword'], $delimiter); $keyword = str_slug($param['keyword'], $delimiter);
$query = $query->where(function ($query) use ($keyword) { $query = $query->where(function ($query) use ($keyword) {
$query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%') $query->where('slug', 'like', '%' . $keyword . '%')
->orWhere('slug', 'like', '%' . $keyword . '%')
->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%'); ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%');
}); });
} }
@ -389,11 +388,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$ads = $this->model->getLocationNames($latest_advs); $ads = $this->model->getLocationNames($latest_advs);
foreach ($ads as $index => $ad) {
$ads[$index]->detail_url = $this->model->getAdvDetailLinkByModel($ad, 'list');
$ads[$index] = $this->model->AddAdsDefaultCoverImage($ad);
}
return $ads; return $ads;
} }

1
addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig
View File

@ -4,6 +4,7 @@
<head> <head>
{% include "theme::partials/metadata" %} {% include "theme::partials/metadata" %}
{% block styles %}{% endblock %}
</head> </head>
<body class="variant-{{ random(8) }}{{ locale().isRtl() ? ' rtl' }} display--{{ preference_value('visiosoft.theme.defaultadmin::display', 'default') }} sidebars--{{ preference_value('visiosoft.theme.defaultadmin::sidebars', 'default') }}" <body class="variant-{{ random(8) }}{{ locale().isRtl() ? ' rtl' }} display--{{ preference_value('visiosoft.theme.defaultadmin::display', 'default') }} sidebars--{{ preference_value('visiosoft.theme.defaultadmin::sidebars', 'default') }}"

2
addons/default/visiosoft/profile-module/resources/lang/nl/field.php
View File

@ -2,7 +2,7 @@
return [ return [
'file' => [ 'file' => [
'name' => 'foto\\'s' 'name' => 'foto\'s'
], ],
'first_name' => [ 'first_name' => [
'name' => 'Voornaam' 'name' => 'Voornaam'

1
app/Exceptions/ExceptionHandler.php
View File

@ -2,6 +2,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use Anomaly\Streams\Platform\Exception\ExceptionIdentifier;
use Swift_TransportException; use Swift_TransportException;
use Throwable; use Throwable;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;

2
composer.json
View File

@ -61,7 +61,6 @@
"anomaly/settings-module": "~2.4.0", "anomaly/settings-module": "~2.4.0",
"anomaly/blocks-module": "~1.3.0", "anomaly/blocks-module": "~1.3.0",
"anomaly/search-module": "~3.0.0", "anomaly/search-module": "~3.0.0",
"anomaly/system-module": "~1.1.0",
"anomaly/users-module": "~2.5.0", "anomaly/users-module": "~2.5.0",
"anomaly/pages-module": "~2.6.0", "anomaly/pages-module": "~2.6.0",
"anomaly/posts-module": "~2.6.0", "anomaly/posts-module": "~2.6.0",
@ -74,6 +73,7 @@
"visiosoft/decimal-field_type": "~2.1.0", "visiosoft/decimal-field_type": "~2.1.0",
"visiosoft/integer-field_type": "~2.1.0", "visiosoft/integer-field_type": "~2.1.0",
"visiosoft/list-field_type": "*", "visiosoft/list-field_type": "*",
"visiosoft/system-module": "~1.1.0",
"wirelab/language_switcher-plugin": "^1.3", "wirelab/language_switcher-plugin": "^1.3",
"visiosoft/addblock-extension": "^1.1", "visiosoft/addblock-extension": "^1.1",
"maatwebsite/excel": "*", "maatwebsite/excel": "*",

2
resources/streams/config/translate.php
View File

@ -3,5 +3,7 @@
return [ return [
'override' => [ 'override' => [
'Sümüklüböcek:Benzersiz İsim', 'Sümüklüböcek:Benzersiz İsim',
'Blocks:Advertising Spaces',
'Bloklar:Reklam Alanları',
], ],
]; ];