diff --git a/addons/default/visiosoft/advs-module/resources/config/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings.php index 7e530aa34..81c97ae19 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings.php @@ -7,61 +7,68 @@ use Visiosoft\LocationModule\Country\CountryModel; return [ 'site_address' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.site_address', - 'env' => 'ADV_SITE_ADDRESS', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.site_address', + 'env' => 'ADV_SITE_ADDRESS', 'config' => [ 'default_value' => 'visiosoft.com.tr', 'disabled' => true, ], ], + "favicon" => [ + "type" => "anomaly.field_type.file", + "config" => [ + "folders" => ['favicon'], + "mode" => "upload", + ] + ], 'auto_approve' => [ - 'type' => 'anomaly.field_type.boolean', - 'bind' => 'adv.auto_approve', - 'env' => 'ADV_AUTO_APPROVE', + 'type' => 'anomaly.field_type.boolean', + 'bind' => 'adv.auto_approve', + 'env' => 'ADV_AUTO_APPROVE', 'config' => [ 'default_value' => true, ], ], 'default_published_time' => [ - 'type' => 'anomaly.field_type.integer', - 'bind' => 'adv.default_published_time', - 'env' => 'ADV_PUBLISH_TIME', + 'type' => 'anomaly.field_type.integer', + 'bind' => 'adv.default_published_time', + 'env' => 'ADV_PUBLISH_TIME', 'required' => true, - 'config' => [ + 'config' => [ 'default_value' => 10, ], ], 'default_adv_limit' => [ - 'type' => 'anomaly.field_type.integer', - 'bind' => 'adv.default_adv_limit', - 'env' => 'ADV_LIMIT', + 'type' => 'anomaly.field_type.integer', + 'bind' => 'adv.default_adv_limit', + 'env' => 'ADV_LIMIT', 'required' => true, - 'config' => [ + 'config' => [ 'default_value' => 15, ], ], 'address' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.address', - 'env' => 'ADV_ADDRESS', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.address', + 'env' => 'ADV_ADDRESS', 'config' => [ 'default_value' => 'Basaksehir Istanbul', ], ], 'phone' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.phone', - 'env' => 'ADV_PHONE', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.phone', + 'env' => 'ADV_PHONE', 'config' => [ 'default_value' => '212 555 55 55', ], ], 'iban_numbers' => [ - 'type' => 'anomaly.field_type.wysiwyg', - 'bind' => 'adv.iban', - 'env' => 'ADV_IBAN', + 'type' => 'anomaly.field_type.wysiwyg', + 'bind' => 'adv.iban', + 'env' => 'ADV_IBAN', 'config' => [ 'default_value' => '

TR00 0000 0000 0000 0000 0000 00

', ], @@ -69,8 +76,8 @@ return [ 'default_country' => [ 'type' => 'anomaly.field_type.relationship', - 'bind' => 'adv.default_country', - 'env' => 'ADV_COUNTRY', + 'bind' => 'adv.default_country', + 'env' => 'ADV_COUNTRY', 'config' => [ 'related' => CountryModel::class, "default_value" => 212, @@ -78,8 +85,8 @@ return [ ], 'default_city' => [ 'type' => 'anomaly.field_type.relationship', - 'bind' => 'adv.default_city', - 'env' => 'ADV_CITY', + 'bind' => 'adv.default_city', + 'env' => 'ADV_CITY', 'config' => [ 'related' => LocationCitiesEntryModel::class, "default_value" => 34, @@ -87,8 +94,8 @@ return [ ], 'default_district' => [ 'type' => 'anomaly.field_type.relationship', - 'bind' => 'adv.default_district', - 'env' => 'ADV_DISTRICT', + 'bind' => 'adv.default_district', + 'env' => 'ADV_DISTRICT', 'config' => [ 'related' => LocationDistrictsEntryModel::class, "default_value" => 1091, @@ -97,46 +104,46 @@ return [ 'contact_mail' => [ - 'type' => 'anomaly.field_type.email', - 'bind' => 'adv.contact_mail', - 'env' => 'ADV_MAIL', + 'type' => 'anomaly.field_type.email', + 'bind' => 'adv.contact_mail', + 'env' => 'ADV_MAIL', ], 'google_map_key' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.google_map_key', - 'env' => 'ADV_MAP_KEY', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.google_map_key', + 'env' => 'ADV_MAP_KEY', 'config' => [ 'default_value' => 'AIzaSyCAGc0z8kg9rKGVy2FizFKoz0FoWWWzoGQ', ], ], 'google_statistic_code' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.google_statistic_code', - 'env' => 'ADV_GOOGLE_STATISTIC_CODE', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.google_statistic_code', + 'env' => 'ADV_GOOGLE_STATISTIC_CODE', 'config' => [ 'default_value' => '', ], ], 'map_coordinates_long' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.map_coordinates_long', - 'env' => 'ADV_MAP_LONG', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.map_coordinates_long', + 'env' => 'ADV_MAP_LONG', 'config' => [ 'default_value' => '28.74558607285155', ], ], 'map_coordinates_lat' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.map_coordinates_lat', - 'env' => 'ADV_MAP_LAT', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.map_coordinates_lat', + 'env' => 'ADV_MAP_LAT', 'config' => [ 'default_value' => '40.97817786299617', ], ], 'logo' => [ 'type' => 'anomaly.field_type.file', - 'bind' => 'adv.logo', - 'env' => 'ADV_LOGO', + 'bind' => 'adv.logo', + 'env' => 'ADV_LOGO', 'config' => [ 'folders' => ["images"], 'mode' => 'upload', @@ -144,17 +151,17 @@ return [ ], 'ogImage' => [ 'type' => 'anomaly.field_type.file', - 'bind' => 'adv.ogImage', - 'env' => 'ADV_OG_IMAGE', + 'bind' => 'adv.ogImage', + 'env' => 'ADV_OG_IMAGE', 'config' => [ 'folders' => ["images"], 'mode' => 'upload', ] ], 'currencies' => [ - "type" => "anomaly.field_type.checkboxes", - 'bind' => 'adv.currencies', - 'env' => 'ADV_CURRENCIES', + "type" => "anomaly.field_type.checkboxes", + 'bind' => 'adv.currencies', + 'env' => 'ADV_CURRENCIES', 'config' => [ "default_value" => 'a:1:{i:0;s:1:"0";}', 'options' => Config::get('streams::currencies.enabled') @@ -162,69 +169,69 @@ return [ ], 'free_currencyconverterapi_key' => [ "type" => "anomaly.field_type.text", - 'bind' => 'adv.free_currencyconverterapi_key', - 'env' => 'ADV_CURRENCY_CONVERT_API_KEY', + 'bind' => 'adv.free_currencyconverterapi_key', + 'env' => 'ADV_CURRENCY_CONVERT_API_KEY', 'config' => [ "default_value" => "1eea72940f3868c77420" ] ], 'default_currency' => [ - 'type' => 'anomaly.field_type.select', - 'bind' => 'adv.default_currency', - 'env' => 'ADV_CURRENCY', - 'config' => [ - 'handler' => 'currencies', + 'type' => 'anomaly.field_type.select', + 'bind' => 'adv.default_currency', + 'env' => 'ADV_CURRENCY', + 'config' => [ + 'handler' => 'currencies', "default_value" => 'USD', ], ], - 'default_GET' => [ - 'type' => 'anomaly.field_type.select', - 'bind' => 'adv.default_GET', - 'env' => 'ADV_GET', - 'config' => [ + 'default_GET' => [ + 'type' => 'anomaly.field_type.select', + 'bind' => 'adv.default_GET', + 'env' => 'ADV_GET', + 'config' => [ 'default_value' => 0, - 'options' => [ - 0 => 'False', - 1 => 'True', + 'options' => [ + 0 => 'False', + 1 => 'True', ], ], ], 'twitter' => [ 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.twitter', - 'env' => 'ADV_TWITTER', + 'bind' => 'adv.twitter', + 'env' => 'ADV_TWITTER', 'config' => [ 'default_value' => '/twitter.com/visiosoft' ] ], 'facebook' => [ 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.facebook', - 'env' => 'ADV_FACEBOOK', + 'bind' => 'adv.facebook', + 'env' => 'ADV_FACEBOOK', 'config' => [ 'default_value' => '/facebook.com/visiosoft' ] ], 'youtube' => [ 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.youtube', - 'env' => 'ADV_YOUTUBE', + 'bind' => 'adv.youtube', + 'env' => 'ADV_YOUTUBE', 'config' => [ 'default_value' => '/youtube.com/visiosoft' ] ], 'google' => [ 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.google', - 'env' => 'ADV_GOOGLE', + 'bind' => 'adv.google', + 'env' => 'ADV_GOOGLE', 'config' => [ 'default_value' => '/plus.google.com/visiosoft' ] ], 'watermark_type' => [ - 'type' => 'anomaly.field_type.select', - 'bind' => 'adv.watermark_type', - 'env' => 'ADV_WATERMARK_TYPE', + 'type' => 'anomaly.field_type.select', + 'bind' => 'adv.watermark_type', + 'env' => 'ADV_WATERMARK_TYPE', 'required' => true, 'config' => [ 'options' => ['image' => 'Image', 'text' => 'Text'], @@ -232,22 +239,22 @@ return [ ] ], 'watermark_text' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.watermark_text', - 'env' => 'ADV_WATERMARK_TEXT', + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.watermark_text', + 'env' => 'ADV_WATERMARK_TEXT', ], 'watermark_image' => [ - 'type' => 'anomaly.field_type.file', - 'bind' => 'adv.watermark_image', - 'env' => 'ADV_WATERMARK_IMAGE', - 'config' => [ + 'type' => 'anomaly.field_type.file', + 'bind' => 'adv.watermark_image', + 'env' => 'ADV_WATERMARK_IMAGE', + 'config' => [ 'default_value' => '', ], ], 'watermark_position' => [ - 'type' => 'anomaly.field_type.select', - 'bind' => 'adv.watermark_position', - 'env' => 'ADV_WATERMARK_POSITION', + 'type' => 'anomaly.field_type.select', + 'bind' => 'adv.watermark_position', + 'env' => 'ADV_WATERMARK_POSITION', 'required' => true, 'config' => [ 'options' => ['top-right' => 'Top Right', 'top-left' => 'Top Left', 'bottom-right' => 'Bottom Right', 'bottom-left' => 'Bottom Left', 'center' => 'Middle'], @@ -255,37 +262,37 @@ return [ ] ], 'watermark_opacity' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.watermark_opacity', - 'env' => 'ADV_WATERMARK_OPACITY', - 'config' => [ + 'type' => 'anomaly.field_type.text', + 'bind' => 'adv.watermark_opacity', + 'env' => 'ADV_WATERMARK_OPACITY', + 'config' => [ 'default_value' => '80', ], ], 'listing_page_image' => [ - 'type' => 'anomaly.field_type.file', - 'bind' => 'adv.listing_page_image', - 'env' => 'ADV_LISTING_PAGE_IMAGE', + 'type' => 'anomaly.field_type.file', + 'bind' => 'adv.listing_page_image', + 'env' => 'ADV_LISTING_PAGE_IMAGE', 'config' => [ 'folders' => ["adv_listing_page"], 'mode' => 'upload', ] ], - 'enabled_currencies' => [ - 'bind' => 'streams::currencies.enabled', - 'env' => 'ADV_ENABLED_CURRENCIES', - 'type' => 'anomaly.field_type.checkboxes', + 'enabled_currencies' => [ + 'bind' => 'streams::currencies.enabled', + 'env' => 'ADV_ENABLED_CURRENCIES', + 'type' => 'anomaly.field_type.checkboxes', 'required' => true, - 'config' => [ + 'config' => [ 'default_value' => function () { return [config('streams::currencies.default')]; }, - 'options' => function () { + 'options' => function () { $json = file_get_contents("https://openexchangerates.org/api/currencies.json"); $cur = array(); - foreach(json_decode($json, true) as $key => $value){ + foreach (json_decode($json, true) as $key => $value) { $cur[$key] = $value; } return $cur; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 917fc7d39..6b89c2c6d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -16,6 +16,9 @@ return [ 'phone' => [ 'name' => 'Contact Phone', ], + 'favicon' => [ + 'name' => 'Favicon', + ], 'contact_mail' => [ 'name' => 'Contact Mail', 'warning' => 'Auto added sitename info@sitename ', diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php b/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php index 17b9b0c31..455340cc8 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleSeeder.php @@ -1,5 +1,7 @@ disks = $disks; + $this->folders = $folders; + } + /** * Run the seeder. */ public function run() { + $disk = $this->disks->findBySlug('local'); + + $this->folders->create( + [ + 'en' => [ + 'name' => 'Favicon', + 'description' => 'A folder for Favicon.', + ], + 'slug' => 'favicon', + 'disk' => $disk, + 'allowed_types' => [ + 'ico' + ], + ] + ); + //Download demo SQL $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig index e94c14fd7..54b6840ae 100644 --- a/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/default-theme/resources/views/partials/metadata.twig @@ -39,7 +39,7 @@ -{#{{ favicons("theme::img/favicon.png") }}#} +{{ favicons(url('files/' ~ file(setting_value('visiosoft.module.advs::favicon')).path)) }} {# Base Theme Components #} {{ asset_add("theme.css", "theme::scss/bootstrap/bootstrap.scss") }}