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 pull request #577 from openclassify/dia

Browse Source 
#1522 Register fixes
This commit is contained in:
Fatih Alp 2020-05-21 18:47:24 +03:00 committed by GitHub
commit 8ef36b565e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 181 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
phoneMask("input[name='phone'],input[name='land_phone']");
// phoneMask("input[name='phone'],input[name='land_phone']");
// Phone register validation
//setup before functions

6
addons/default/visiosoft/base-theme/resources/lang/en/field.php
View File

@ -50,4 +50,10 @@ return [
'secure_e-commerce_ads' => 'Secure e-Commerce Ads',
'sms' => 'Send Text Message (SMS)',
'mail' => 'Send Mail',
// Register instruction seed
'register_instructions' => 'Register Instructions',
'list' => 'List',
'instruction_description' => 'Instruction Description',
'instruction_list' => 'Instruction List',
];

21
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
View File

@ -34,29 +34,10 @@
</div>
{{ addBlock('register/corporate-register')|raw }}
</div>
<div class="col-12 col-md-6 py-3 pr-0 instructions d-none d-md-block">
<div class="border personal-advantages py-5 px-5">
<div class="d-flex align-items-center mb-4">
{% if setting_value('visiosoft.theme.base::register_page_instruction_logo') %}
<img class="mr-3"
src="{{ file(setting_value('visiosoft.theme.base::register_page_instruction_logo')).url }}">
{% endif %}
<h4 class="mb-0">
{{ trans('visiosoft.theme.base::field.personal_registration_header') }}
</h4>
</div>
<div class="mb-4">
{{ trans('visiosoft.theme.base::field.personal_registration_body') }}
</div>
<ul class="pl-4">
<li>{{ trans('visiosoft.theme.base::field.personal_registration_list_1') }}</li>
<li>{{ trans('visiosoft.theme.base::field.personal_registration_list_2') }}</li>
<li>{{ trans('visiosoft.theme.base::field.personal_registration_list_3') }}</li>
</ul>
</div>
{{ blocks('register-instructions') }}
{{ addBlock('register/instructions')|raw }}

17
addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php Normal file
View File

@ -0,0 +1,17 @@
<?php namespace Visiosoft\BaseTheme;
use Anomaly\Streams\Platform\Database\Seeder\Seeder;
use Visiosoft\BaseTheme\Seed\RegisterInstructionSeeder;
class BaseThemeSeeder extends Seeder
{
/**
* Run the seeder.
*/
public function run()
{
// Register Instruction Seeder
$this->call(RegisterInstructionSeeder::class);
}
}

156
addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php Normal file
View File

@ -0,0 +1,156 @@
<?php namespace Visiosoft\BaseTheme\Seed;
use Anomaly\BlocksModule\Area\Contract\AreaRepositoryInterface;
use Anomaly\BlocksModule\Type\Contract\TypeRepositoryInterface;
use Anomaly\Streams\Platform\Assignment\Contract\AssignmentRepositoryInterface;
use Anomaly\Streams\Platform\Field\Contract\FieldRepositoryInterface;
use Anomaly\Streams\Platform\Stream\Contract\StreamRepositoryInterface;
use Illuminate\Database\Seeder;
use Anomaly\BlocksModule\Block\Contract\BlockRepositoryInterface;
class RegisterInstructionSeeder extends Seeder
{
private $areaRepository;
private $blocksTypeRepository;
private $fieldRepository;
private $assignmentRepository;
private $streamRepository;
private $blockRepository;
public function __construct(
AreaRepositoryInterface $areaRepository,
TypeRepositoryInterface $blocksTypeRepository,
FieldRepositoryInterface $fieldRepository,
AssignmentRepositoryInterface $assignmentRepository,
StreamRepositoryInterface $streamRepository,
BlockRepositoryInterface $blockRepository
) {
$this->areaRepository = $areaRepository;
$this->blocksTypeRepository = $blocksTypeRepository;
$this->fieldRepository = $fieldRepository;
$this->assignmentRepository = $assignmentRepository;
$this->streamRepository = $streamRepository;
$this->blockRepository = $blockRepository;
}
/**
* Run the database seeds.
*/
public function run()
{
// Create block area
if ($registerInstructionsArea = $this->areaRepository->findBySlug('register-instructions')) {
$registerInstructionsArea->delete();
}
$registerInstructionsArea = $this->areaRepository->create([
'name' => trans('visiosoft.theme.base::field.register_instructions'),
'slug' => 'register-instructions',
]);
// Create block type
if ($blockType = $this->blocksTypeRepository->getModel()->withTrashed()->where('slug', 'list')->first()) {
$blockType->forceDelete();
}
$blockType = $this->blocksTypeRepository->create([
'name' => trans('visiosoft.theme.base::field.list'),
'slug' => 'list',
'category' => 'other',
'content_layout' => '<div class="border {{ block.area.slug == \'register-instructions\' ? \'personal-advantages\' : \'corporate-advantages\' }} py-5 px-5">
<div class="d-flex align-items-center mb-4">
{% if setting_value(\'visiosoft.theme.base::register_page_instruction_logo\') %}
<img class="mr-3" src="{{ file(setting_value(\'visiosoft.theme.base::register_page_instruction_logo\')).url }}">
{% endif %}
<h4 class="mb-0">
{{ block.title }}
</h4>
</div>
<div class="mb-4">
{{ block.instruction_description }}
</div>
<ul class="pl-4">
{% for listItem in block.instruction_list.values %}
<li>{{ listItem }}</li>
{% endfor %}
</ul>
</div>',
'wrapper_layout' => '{% extends "anomaly.module.blocks::types.wrapper" %}'
]);
// Create block stream
if ($listBlock = $this->streamRepository->findBySlugAndNamespace('list_blocks', 'blocks')) {
$listBlock->delete();
}
$listBlock = $this->streamRepository->create([
'name' => trans('visiosoft.theme.base::field.list'),
'namespace' => 'blocks',
'slug' => 'list_blocks',
'prefix' => 'blocks_',
'translatable' => 1,
]);
// Create block fields
$blocksFields = [
'instruction_description' => [
'name' => trans('visiosoft.theme.base::field.instruction_description'),
'namespace' => 'blocks',
'slug' => 'instruction_description',
'type' => 'anomaly.field_type.text',
"config" => [
"type" => "text",
]
],
'instruction_list' => [
'name' => trans('visiosoft.theme.base::field.instruction_list'),
'namespace' => 'blocks',
'slug' => 'instruction_list',
'type' => 'visiosoft.field_type.list',
"config" => [
"type" => "text",
]
]
];
foreach ($blocksFields as $blocksField) {
if ($field = $this->fieldRepository->findBySlugAndNamespace($blocksField['slug'], $blocksField['namespace'])) {
$field->delete();
}
$field = $this->fieldRepository->create([
'name' => $blocksField['name'],
'namespace' => $blocksField['namespace'],
'slug' => $blocksField['slug'],
'type' => $blocksField['type'],
'locked' => 0,
"config" => $blocksField['config']
]);
$this->assignmentRepository->create([
'stream_id' => $listBlock->getId(),
'field_id' => $field->id,
'label' => $blocksField['name'],
'translatable' => 1,
]);
}
// Add default instructions
$blockFieldId = $this->fieldRepository->findBySlugAndNamespace('blocks', 'blocks')->getId();
$block = $this->blockRepository->create([
'title' => trans('visiosoft.theme.base::field.personal_registration_header'),
'field' => $blockFieldId,
'extension' => 'anomaly.extension.list_block',
'display_title' => false,
]);
$blockInfo = app('Anomaly\Streams\Platform\Model\Blocks\BlocksListBlocksEntryModel')->newQuery()->create([
'instruction_description' => trans('visiosoft.theme.base::field.personal_registration_body'),
'instruction_list' => [
trans('visiosoft.theme.base::field.personal_registration_list_1'),
trans('visiosoft.theme.base::field.personal_registration_list_2'),
trans('visiosoft.theme.base::field.personal_registration_list_3'),
]
]);
$block->update([
'area_id' => $registerInstructionsArea->getId(),
'area_type' => get_class($registerInstructionsArea),
'entry_id' => $blockInfo->id,
'entry_type' => get_class($blockInfo),
]);
}
}