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

Browse Source
This commit is contained in:
diashalabi 2021-10-07 16:15:47 +03:00
commit d854917696
9 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
View File

@ -3,6 +3,7 @@
use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface;
use Anomaly\Streams\Platform\Application\Application;
use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryTranslationsModel;
use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Http\Request;
@ -160,7 +161,7 @@ class AdvsController extends AdminController
height: 20px;
border: 1px solid #2980b9;
border-radius: 3px;
background-image:
background-image:
repeating-linear-gradient(
-45deg,
#2980b9,
@ -185,15 +186,23 @@ class AdvsController extends AdminController
<script>
location.href = '" . $request->server('HTTP_REFERER') . "';
</script>
<a href='" . $request->server('HTTP_REFERER') . "'><b>Return Back</b></a>";
echo "<br><a href='/admin'><b>Return Admin Panel</b></a>";
}
public function exportAdvs()
public function exportAdvs(FormBuilder $builder, Request $request)
{
return Excel::download(new AdvsExport(), 'advs-' . time() . '.xlsx');
if ($request['format'] === 'csv' || $request['format'] === 'xlsx') {
return Excel::download(new AdvsExport(), 'advs-' . time() . '.' . $request['format']);
}
$builder->setOptions([
'form_view' => 'visiosoft.theme.defaultadmin::form/advs-export',
]);
return $builder->render();
}
public function advancedUpdate()

11
addons/default/visiosoft/base-theme/resources/js/visiosoft.js
View File

@ -12,3 +12,14 @@ function crudAjax(params, url, type = 'GET', callback = () => {}, async = false,
...options
});
}
function getUserNavMenu(html, element) {
crudAjax({}, '/ajax/get-user-info', 'GET', function (callback) {
if (callback['userName']){
element.html(html);
$(element).find('.addBlock').html(callback['addBlockHtml']);
$(element).find('.username').html(callback['userName']);
$(element).find('.profile-img').attr('src', `${callback['profileImg']}`);
}
})
}

3
addons/default/visiosoft/defaultadmin-theme/resources/lang/en/control_panel.php
View File

@ -10,4 +10,7 @@ return [
// Users Module
'search_by_gsm_number' => 'Search By GSM Number',
// Adv Export
'choose_file_type' => 'Choose File Type For Export',
];

3
addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/control_panel.php
View File

@ -10,4 +10,7 @@ return [
// Users Module
'search_by_gsm_number' => 'GSM Numarasına Göre Ara',
// Adv Export
'choose_file_type' => 'Dışa Aktarmak İçin Dosya Türünü Seçin',
];

17
addons/default/visiosoft/defaultadmin-theme/resources/views/form/advs-export.twig Normal file
View File

@ -0,0 +1,17 @@
{% block content %}
<div class="container-fluid">
<div class="card">
</div>
</div>
<div class="container-fluid">
<div class="card">
<div class="card-header">
<h6>{{ trans('visiosoft.theme.defaultadmin::control_panel.choose_file_type') }}:</h6>
</div>
<div class="card-block">
<a href="?format=csv" class="btn btn-outline-primary">CSV</a>
<a href="?format=xlsx" class="btn btn-outline-primary">XLSX</a>
</div>
</div>
</div>
{% endblock %}

2
addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
View File

@ -39,7 +39,7 @@ class VisiosoftModuleProfileCreateAdressStream extends Migration
'required' => true,
],
'city' => [
'required' => true,
'required' => false,
],
'district',
'adress_content' => [

2
addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php
View File

@ -22,7 +22,7 @@ class AdressFormFields
'required' => true,
],
'city' => [
'required' => true,
'required' => false,
],
'district' => [
'required' => setting_value( 'visiosoft.module.profile::required_district'),

2
addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php
View File

@ -28,7 +28,7 @@ class AddressCompanyFormFields
'required' => true,
],
'city' => [
'required' => true,
'required' => false,
],
'district',
'adress_content' => [

6
addons/default/visiosoft/profile-module/src/Http/Controller/CacheController.php
View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\ProfileModule\Http\Controller;
use Anomaly\Streams\Platform\Http\Controller\PublicController;
use Anomaly\Streams\Platform\Image\Command\MakeImageInstance;
use Visiosoft\AddblockExtension\Command\addBlock;
class CacheController extends PublicController
@ -8,11 +9,14 @@ class CacheController extends PublicController
public function getUserInfo()
{
$user = auth()->user();
$profile_img = $this->dispatch(
new MakeImageInstance($user->file ?: 'theme::images/no_profile.svg', 'img')
)->url();
$user = $user ? $user->first_name . ' ' . $user->last_name : $user;
$getAddBlockHtml = new addBlock('navigation/dropdown', []);
$addBlockHtml = $getAddBlockHtml->handle();
return ['userName' => $user, 'addBlockHtml' => $addBlockHtml];
return ['userName' => $user, 'profileImg' => $profile_img, 'addBlockHtml' => $addBlockHtml];
}
}