Skip to content

Commit

Permalink
Merge branch 'release/1.4.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ametad
ametad committed Aug 11, 2017
2 parents b3e31bf + ca819da commit e09a669
Show file tree
Hide file tree
Showing 38 changed files with 1,438 additions and 1,056 deletions.
76 changes: 38 additions & 38 deletions components/Company.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,46 @@
class Company extends ComponentBase
{

public function componentDetails()
{
return [
'name' => 'hambern.company::lang.components.company.name',
'description' => 'hambern.company::lang.components.company.description',
];
}
public function componentDetails()
{
return [
'name' => 'hambern.company::lang.components.company.name',
'description' => 'hambern.company::lang.components.company.description',
];
}

public function defineProperties()
{
return [];
}
public function defineProperties()
{
return [];
}

public function onRun()
{
$settings = Settings::instance();
$company = new Model();
$company->name = $settings->name;
$company->slogan = $settings->slogan;
$company->logo = $settings->logo;
$company->story = $settings->story;
$company->phone = $settings->phone;
$company->fax = $settings->fax;
$company->email = $settings->email;
$company->address = $settings->address;
$company->social_media = $settings->social_media;
$company->contact = $this->contact();
$company->street_name = $settings->street_name;
$company->street_number = $settings->street_number;
$company->zip = $settings->zip;
$company->city = $settings->city;
$this->page['company'] = $company;
}
public function onRun()
{
$settings = Settings::instance();
$company = new Model();
$company->name = $settings->name;
$company->slogan = $settings->slogan;
$company->logo = $settings->logo;
$company->story = $settings->story;
$company->phone = $settings->phone;
$company->fax = $settings->fax;
$company->email = $settings->email;
$company->address = $settings->address;
$company->social_media = $settings->social_media;
$company->contact = $this->contact();
$company->street_name = $settings->street_name;
$company->street_number = $settings->street_number;
$company->zip = $settings->zip;
$company->city = $settings->city;
$this->page['company'] = $company;
}

public function contact()
{
if ($employee = Employee::find(Settings::get('contact'))) {
return $employee;
}
return Employee::orderBy('id', 'asc')->first();
}
public function contact()
{
if ($employee = Employee::find(Settings::get('contact'))) {
return $employee;
}
return Employee::orderBy('id', 'asc')->first();
}

}
167 changes: 82 additions & 85 deletions components/Component.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,94 +9,91 @@
class Component extends ComponentBase
{

public $item;
public $list;
public $table;
public $item;
public $list;
public $table;

public function componentDetails()
{
}
public function componentDetails()
{
}

public function defineProperties()
{
return [
'itemId' => [
'title' => 'hambern.company::lang.labels.item_id',
'description' => 'hambern.company::lang.descriptions.item_id',
'default' => '',
'type' => 'string',
'validationPattern' => '^[0-9]+$',
],
'maxItems' => [
'title' => 'hambern.company::lang.labels.max_items',
'description' => 'hambern.company::lang.descriptions.max_items',
'default' => 36,
'type' => 'string',
'validationPattern' => '^[0-9]+$',
],
'orderBy' => [
'title' => 'hambern.company::lang.labels.order_by',
'description' => 'hambern.company::lang.descriptions.order_by',
'type' => 'dropdown',
'default' => 'id',
'group' => 'hambern.company::lang.labels.order',
],
'sort' => [
'title' => 'hambern.company::lang.labels.sort',
'description' => 'hambern.company::lang.descriptions.sort',
'type' => 'dropdown',
'default' => 'desc',
'group' => 'hambern.company::lang.labels.order',
],
'paginate' => [
'title' => 'hambern.company::lang.labels.paginate',
'description' => 'hambern.company::lang.descriptions.paginate',
'type' => 'checkbox',
'default' => false,
'group' => 'hambern.company::lang.labels.paginate',
],
'page' => [
'title' => 'hambern.company::lang.labels.page',
'description' => 'hambern.company::lang.descriptions.page',
'type' => 'string',
'default' => '1',
'validationPattern' => '^[0-9]+$',
'group' => 'hambern.company::lang.labels.paginate',
],
'perPage' => [
'title' => 'hambern.company::lang.labels.per_page',
'description' => 'hambern.company::lang.descriptions.per_page',
'type' => 'string',
'default' => '12',
'validationPattern' => '^[0-9]+$',
'group' => 'hambern.company::lang.labels.paginate',
],
];
}
public function defineProperties()
{
return [
'itemId' => [
'title' => 'hambern.company::lang.labels.item_id',
'description' => 'hambern.company::lang.descriptions.item_id',
'default' => '{{ :model }}',
],
'modelIdentifier' => [
'title' => 'hambern.company::lang.misc.model_identifier',
'description' => 'hambern.company::lang.descriptions.model_identifier',
'type' => 'dropdown',
'options' => ['id' => 'id', 'slug' => 'slug'],
'default' => 'id',
],
'maxItems' => [
'title' => 'hambern.company::lang.labels.max_items',
'description' => 'hambern.company::lang.descriptions.max_items',
'default' => 36,
'type' => 'string',
'validationPattern' => '^[0-9]+$',
],
'orderBy' => [
'title' => 'hambern.company::lang.labels.order_by',
'description' => 'hambern.company::lang.descriptions.order_by',
'type' => 'dropdown',
'default' => 'id',
'group' => 'hambern.company::lang.labels.order',
],
'sort' => [
'title' => 'hambern.company::lang.labels.sort',
'description' => 'hambern.company::lang.descriptions.sort',
'type' => 'dropdown',
'default' => 'desc',
'group' => 'hambern.company::lang.labels.order',
],
'paginate' => [
'title' => 'hambern.company::lang.labels.paginate',
'description' => 'hambern.company::lang.descriptions.paginate',
'type' => 'checkbox',
'default' => false,
'group' => 'hambern.company::lang.labels.paginate',
],
'page' => [
'title' => 'hambern.company::lang.labels.page',
'description' => 'hambern.company::lang.descriptions.page',
'type' => 'string',
'default' => '1',
'validationPattern' => '^[0-9]+$',
'group' => 'hambern.company::lang.labels.paginate',
],
'perPage' => [
'title' => 'hambern.company::lang.labels.per_page',
'description' => 'hambern.company::lang.descriptions.per_page',
'type' => 'string',
'default' => '12',
'validationPattern' => '^[0-9]+$',
'group' => 'hambern.company::lang.labels.paginate',
],
];
}

public function getSortOptions()
{
return [
'desc' => Lang::get('hambern.company::lang.labels.descending'),
'asc' => Lang::get('hambern.company::lang.labels.ascending'),
];
}
public function getSortOptions()
{
return [
'desc' => Lang::get('hambern.company::lang.labels.descending'),
'asc' => Lang::get('hambern.company::lang.labels.ascending'),
];
}

public function getOrderByOptions()
{
$schema = Schema::getColumnListing($this->table);
foreach ($schema as $column) {
$options[$column] = ucwords(str_replace('_', ' ', $column));
}
return $options;
}
public function getOrderByOptions()
{
$schema = Schema::getColumnListing($this->table);
foreach ($schema as $column) {
$options[$column] = ucwords(str_replace('_', ' ', $column));
}
return $options;
}

public function getFilterTagOptions()
{
$options = [Lang::get('hambern.company::lang.labels.show_all')];
$tags = Tag::all();
if ($tags)
$options += $tags->lists('name', 'id');
return $options;
}
}
Loading

0 comments on commit e09a669

Please sign in to comment.