+
+ {{trans('visiosoft.module.advs::button.create_configurations')}}
+
{{ trans('visiosoft.module.advs::field.edit') }}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index bf879d2ad..44a7f571c 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -13,6 +13,8 @@ use Visiosoft\LocationModule\Country\CountryModel;
use Visiosoft\CartsModule\Cart\Command\GetCart;
use Visiosoft\LocationModule\District\DistrictModel;
use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel;
+use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface;
+use Visiosoft\LocationModule\Village\VillageModel;
class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
{
@@ -67,9 +69,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
return $query->where('advs_advs.slug', '!=', "");
}
- public function userAdv($nullable_ad = false)
+ public function userAdv($nullable_ad = false, $checkRole = true)
{
- if (Auth::user()->hasRole('admin')) {
+ if (Auth::user()->hasRole('admin') && $checkRole) {
return $this->getAdv(null, $nullable_ad);
} else {
return $this->getAdv(null, $nullable_ad)
@@ -373,8 +375,19 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
return $neighborhood ? $neighborhood->name : false;
}
+ public function getVillage()
+ {
+ $village = app(VillageRepositoryInterface::class)->find($this->village);
+ return $village ? $village->name : false;
+ }
+
public function expired()
{
return $this->finish_at ? $this->finish_at < Carbon::now() : true;
}
+
+ public function getProductOptionsValues()
+ {
+ return $this->product_options_value;
+ }
}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index e39e5580a..f61347c48 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -447,4 +447,30 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
->orderBy('count_show_ad', 'desc')
->paginate(setting_value('visiosoft.module.advs::popular_ads_limit', setting_value('streams::per_page')));
}
+
+ public function getName($id){
+ return $this->find($id)->name;
+ }
+
+ public function approveAds($adsIDs)
+ {
+ $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time');
+ $ads = $this->newQuery()->whereIn('advs_advs.id', $adsIDs)->update([
+ 'status' => 'approved',
+ 'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')),
+ 'publish_at' => date('Y-m-d H:i:s')
+ ]);
+
+ return $ads;
+ }
+
+ public function getUserAds($userID = null)
+ {
+ $userID = auth_id_if_null($userID);
+ return $this->newQuery()
+ ->where('advs_advs.created_by_id', $userID)
+ ->where('status', 'approved')
+ ->where('finish_at', '>', date('Y-m-d H:i:s'))
+ ->get();
+ }
}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php
new file mode 100644
index 000000000..ef50835c4
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php
@@ -0,0 +1,79 @@
+newQuery()
+ ->leftJoin('cats_category', function ($q){
+ $q->on('cats_category.id', 'advs_advs.cat1')
+ ->orOn('cats_category.id', 'advs_advs.cat2')
+ ->orOn('cats_category.id', 'advs_advs.cat3')
+ ->orOn('cats_category.id', 'advs_advs.cat4')
+ ->orOn('cats_category.id', 'advs_advs.cat5')
+ ->orOn('cats_category.id', 'advs_advs.cat6')
+ ->orOn('cats_category.id', 'advs_advs.cat7')
+ ->orOn('cats_category.id', 'advs_advs.cat8')
+ ->orOn('cats_category.id', 'advs_advs.cat9')
+ ->orOn('cats_category.id', 'advs_advs.cat10');
+ })
+ ->leftJoin('cats_category_translations', 'cats_category.id', 'cats_category_translations.entry_id')
+ ->leftJoin('location_countries_translations','advs_advs.country_id', 'location_countries_translations.entry_id')
+ ->leftJoin('location_cities_translations','advs_advs.city', 'location_cities_translations.entry_id')
+ ->leftJoin('location_districts_translations','advs_advs.district', 'location_districts_translations.entry_id')
+ ->where('cats_category_translations.locale',Request()->session()->get('_locale', setting_value('streams::default_locale', 'en')))
+ ->where('advs_advs_translations.locale',Request()->session()->get('_locale', setting_value('streams::default_locale', 'en')))
+ ->select(['advs_advs.*', 'location_countries_translations.name as country', 'location_cities_translations.name as city_name', 'location_districts_translations.name as district', DB::raw("group_concat(default_cats_category_translations.name SEPARATOR ', ') as categories")])
+ ->groupBy('advs_advs.id')
+ ->get();
+
+ return $cats;
+ }
+
+ public function map($adv): array
+ {
+ return [
+ $adv->id,
+ $adv->name,
+ strip_tags($adv->advs_desc),
+ $adv->currency,
+ $adv->price,
+ $adv->standard_price,
+ $adv->created_by_id,
+ $adv->categories,
+ $adv->country,
+ $adv->city_name,
+ $adv->district,
+ ];
+ }
+
+ public function headings(): array
+ {
+ return [
+ 'ID',
+ trans('module::field.name.name'),
+ trans('module::field.description'),
+ trans('module::field.currency.name'),
+ trans('module::field.price.name'),
+ trans('module::field.standard_price.name'),
+ trans('module::field.created'),
+ trans('module::field.categories'),
+ trans('module::field.country.name'),
+ trans('module::field.city.name'),
+ trans('module::field.district.name'),
+ ];
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php b/addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php
new file mode 100644
index 000000000..4541f1a40
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php
@@ -0,0 +1,18 @@
+userID = $userID;
+ }
+
+ public function handle(AdvRepositoryInterface $advRepository)
+ {
+ return $advRepository->getUserAds($this->userID);
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
index a9cb314fd..42968fa28 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
@@ -4,5 +4,83 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
interface AdvInterface extends EntryInterface
{
+ public function is_enabled($slug);
+
+ public function is_enabled_extension($slug);
+
+ public function is_active($id);
+
+ public function getAdv($id = null, $nullable_ad = false, $trashed = false);
+
+ public function userAdv($nullable_ad = false, $checkRole = true);
+
+ public function getAdvByCat($cat_id);
+
+ public function pendingAdvsByUser();
+
+ public function favsAdvsByUser($fav_ids);
+
+ public function myAdvsByUser();
+
+ public function foreignCurrency($currency, $price, $isUpdate, $settings);
+
+ public function popularAdvs();
+
+ public function advsofDay();
+
+ public function statusAds($id, $status);
+
+ public function finish_at_Ads($id, $endDate);
+
+ public function publish_at_Ads($id);
+
+ public function getLastUserAdv();
+
+ public function getLocationNames($advs);
+
+ public function isAdv($id);
+
+ public function addCart($item, $quantity = 1, $name = null);
+
+ public function getAdvDetailLinkByModel($object, $type = null);
+
+ public function getAdvDetailLinkByAdId($id);
+
+ public function getAdvimage($id);
+
+ public function getLatestField($slug);
+
+ public function updateStock($id, $quantity);
+
+ public function stockControl($id, $quantity);
+
+ public function saveCustomField($category_id, $field_id, $name);
+
+ public function customfields();
+
+ public function priceFormat($adv);
+
+ public function AddAdsDefaultCoverImage($ad);
+
+ public function GetAdsDefaultCoverImageByAdId($id);
+
+ public function viewed_Ad($id);
+
+ public function getRecommended($id);
+
+ public function authControl();
+
+ public function inStock();
+
+ public function getCity();
+
+ public function getDistrict();
+
+ public function getNeighborhood();
+
+ public function getVillage();
+
public function expired();
+
+ public function getProductOptionsValues();
}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php
index 4118d90a4..589404ee8 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php
@@ -44,4 +44,10 @@ interface AdvRepositoryInterface extends EntryRepositoryInterface
public function getByUsersIDs($usersIDs);
public function getPopular();
+
+ public function getName($id);
+
+ public function approveAds($adsIDs);
+
+ public function getUserAds($userID = null);
}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
index 0623c5ca6..8f58892f5 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
@@ -60,7 +60,8 @@ class AdvFormBuilder extends FormBuilder
],
'files',
'popular_adv',
- 'adv_day'
+ 'adv_day',
+ 'product_options_value'
];
protected $category = null;
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModule.php b/addons/default/visiosoft/advs-module/src/AdvsModule.php
index 0eda5defc..e7835c641 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModule.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModule.php
@@ -37,9 +37,22 @@ class AdvsModule extends Module
],
],
],
+ 'product_options' => [
+ 'title' => 'visiosoft.module.advs::section.product_options.title',
+ 'buttons' => [
+ 'new_productoption',
+ ],
+ ],
+ 'productoptions_value' => [
+ 'title' => 'visiosoft.module.advs::section.productoptions_value.title',
+ 'buttons' => [
+ 'new_productoptions_value',
+ ],
+ ],
+ 'option_configuration',
'assets_clear' => [
- 'title' => 'visiosoft.module.advs::section.assets_clear.name',
- 'href' => '/admin/assets/clear',
+ 'title' => 'visiosoft.module.advs::section.assets_clear.name',
+ 'href' => '/admin/assets/clear',
]
// 'custom_fields' => [
// 'buttons' => [
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
index 475def11a..40186316b 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
@@ -7,9 +7,9 @@ use Visiosoft\AdvsModule\Adv\Command\appendRequestURL;
use Visiosoft\AdvsModule\Adv\Command\GetAd;
use Visiosoft\AdvsModule\Adv\Command\getExchange;
use Visiosoft\AdvsModule\Adv\Command\getPopular;
+use Visiosoft\AdvsModule\Adv\Command\GetUserAds;
use Visiosoft\AdvsModule\Adv\Command\isActive;
use Visiosoft\AdvsModule\Adv\Command\LatestAds;
-use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
use Visiosoft\AdvsModule\Currency\Currency;
use Visiosoft\AdvsModule\Currency\CurrencyFormat;
@@ -78,6 +78,12 @@ class AdvsModulePlugin extends Plugin
->get();
}
),
+ new \Twig_SimpleFunction(
+ 'getUserAds',
+ function ($userID = null) {
+ return $this->dispatch(new GetUserAds($userID));
+ }
+ ),
new \Twig_SimpleFunction(
'getUserPassiveAdvs',
function ($user = null) {
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 74041899a..1070f7bb7 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -15,6 +15,12 @@ use Visiosoft\AdvsModule\Http\Middleware\SetLang;
use Visiosoft\AdvsModule\Listener\AddAdvsSettingsScript;
use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
use Visiosoft\AdvsModule\Option\OptionRepository;
+use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
+use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationRepository;
+use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface;
+use Visiosoft\AdvsModule\Productoption\ProductoptionRepository;
+use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface;
+use Visiosoft\AdvsModule\ProductoptionsValue\ProductoptionsValueRepository;
use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface;
use Visiosoft\LocationModule\Village\VillageRepository;
use Visiosoft\LocationModule\Village\VillageModel;
@@ -75,6 +81,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
],
'admin/advs-users/choose/{advId}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@choose',
'admin/class/actions/{id}/{type}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@actions',
+ 'admin/advs/export' => [
+ 'as' => 'advs::exportAdvs',
+ 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@exportAdvs',
+ ],
// advsController
'advs/list' => [
@@ -210,6 +220,28 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
// Others
'advs/ttr/{id}' => 'Visiosoft\PackagesModule\Http\Controller\packageFEController@advsStatusbyUser',
+
+ //Configurations Admin Controller
+ 'admin/advs/option_configuration/create' => [
+ 'as' => 'visiosoft.module.advs::configrations.create',
+ 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@create',
+ ],
+ 'admin/advs/option_configuration' => [
+ 'as' => 'visiosoft.module.advs::configrations.index',
+ 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@index',
+ ],
+
+ //Configuration Controller
+ 'advs/option_configuration/create' => [
+ 'as' => 'visiosoft.module.advs::user.configrations.create',
+ 'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@create',
+ ],
+ 'conf/addCart' => [
+ 'as' => 'configuration::add_cart',
+ 'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@confAddCart',
+ ],
+
+
];
/**
@@ -290,6 +322,9 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
CategoryRepositoryInterface::class => CategoryRepository::class,
CountryRepositoryInterface::class => CountryRepository::class,
OptionRepositoryInterface::class => OptionRepository::class,
+ ProductoptionRepositoryInterface::class => ProductoptionRepository::class,
+ OptionConfigurationRepositoryInterface::class => OptionConfigurationRepository::class,
+ ProductoptionsValueRepositoryInterface::class => ProductoptionsValueRepository::class,
];
/**
@@ -344,22 +379,30 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
'general_settings' => [
'title' => 'visiosoft.module.advs::button.general_settings',
'href' => '/admin/settings/modules/visiosoft.module.advs',
+ 'page' => 'anomaly.module.settings'
],
'theme_settings' => [
'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name',
'href' => url('admin/settings/themes/' . setting_value('streams::standard_theme')),
+ 'page' => 'anomaly.module.settings'
],
'assets_clear' => [
'title' => 'visiosoft.module.advs::section.assets_clear.name',
'href' => route('assets_clear'),
+ 'page' => 'anomaly.module.settings'
],
+ 'export' => [
+ 'title' => 'visiosoft.module.advs::button.export',
+ 'href' => route('advs::exportAdvs'),
+ 'page' => 'visiosoft.module.advs'
+ ]
];
foreach ($settings_url as $key => $value) {
- $addonCollection->get('anomaly.module.settings')->addSection($key, $value);
+ $addonCollection->get($value['page'])->addSection($key, $value);
}
- // Disable file versioning
+ // Disable file versioning
$fileModel->disableVersioning();
}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
index e0268b5d5..2321df840 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
@@ -25,6 +25,8 @@ use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
use Visiosoft\CatsModule\Category\CategoryModel;
use Visiosoft\LocationModule\City\CityModel;
use Visiosoft\AlgoliaModule\Search\SearchModel;
+use Maatwebsite\Excel\Facades\Excel;
+use Visiosoft\AdvsModule\Adv\AdvsExport;
class AdvsController extends AdminController
{
@@ -106,6 +108,10 @@ class AdvsController extends AdminController
'replicate' => [
'text' => 'Replicate',
],
+ 'create_configration' => [
+ 'text' => trans('visiosoft.module.advs::button.create_configurations'),
+ 'href' => route('visiosoft.module.advs::configrations.create')."?ad={entry.id}"
+ ],
],
],
]);
@@ -341,4 +347,9 @@ class AdvsController extends AdminController
Return Back";
echo "
Return Admin Panel";
}
+
+
+ public function exportAdvs(){
+ return Excel::download(new AdvsExport(), 'advs-' . time() . '.xlsx');
+ }
}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php
new file mode 100644
index 000000000..2115f408f
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php
@@ -0,0 +1,32 @@
+render();
+ }
+
+ /**
+ * Create a new entry.
+ *
+ * @param OptionConfigurationFormBuilder $form
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function create(OptionConfigurationFormBuilder $form)
+ {
+ $form->setOption('redirect', route('visiosoft.module.advs::configrations.index'));
+ return $form->render();
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php
new file mode 100644
index 000000000..c4e57e82d
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php
@@ -0,0 +1,43 @@
+render();
+ }
+
+ /**
+ * Create a new entry.
+ *
+ * @param ProductoptionFormBuilder $form
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function create(ProductoptionFormBuilder $form)
+ {
+ return $form->render();
+ }
+
+ /**
+ * Edit an existing entry.
+ *
+ * @param ProductoptionFormBuilder $form
+ * @param $id
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function edit(ProductoptionFormBuilder $form, $id)
+ {
+ return $form->render($id);
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php
new file mode 100644
index 000000000..2a5acfb58
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php
@@ -0,0 +1,43 @@
+render();
+ }
+
+ /**
+ * Create a new entry.
+ *
+ * @param ProductoptionsValueFormBuilder $form
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function create(ProductoptionsValueFormBuilder $form)
+ {
+ return $form->render();
+ }
+
+ /**
+ * Edit an existing entry.
+ *
+ * @param ProductoptionsValueFormBuilder $form
+ * @param $id
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function edit(ProductoptionsValueFormBuilder $form, $id)
+ {
+ return $form->render($id);
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
new file mode 100644
index 000000000..b3f4ce198
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
@@ -0,0 +1,61 @@
+advRepository = $advRepository;
+ $this->adv_model = $advModel;
+ $this->optionConfigurationModel = $optionConfigurationModel;
+ $this->optionConfigurationRepository = $optionConfigurationRepository;
+ parent::__construct();
+ }
+
+ public function create(OptionConfigurationFormBuilder $form)
+ {
+ $form->setOption('redirect', route('advs_preview', [request('ad')]));
+ return $form->render();
+ }
+
+ public function confAddCart()
+ {
+
+ if($conf = $this->optionConfigurationRepository->find($this->request->configuration))
+ {
+ $conf->name = $conf->getName();
+
+ $this->adv_model->authControl();
+
+ if ($conf->stock < $this->request->quantity){
+ return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]);
+ }else{
+ $cart = $this->dispatch(new GetCart());
+ $cart->add($conf, $this->request->quantity);
+ return $this->redirect->to(route('visiosoft.module.carts::cart'));
+ }
+ }
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
index bea56a763..2204a7e44 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
@@ -19,6 +19,10 @@ use Visiosoft\AdvsModule\Adv\Event\showAdPhone;
use Visiosoft\AdvsModule\Adv\Event\viewAd;
use Visiosoft\AdvsModule\Adv\Form\AdvFormBuilder;
use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
+use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
+use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel;
+use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface;
+use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface;
use Visiosoft\AlgoliaModule\Search\SearchModel;
use Visiosoft\CatsModule\Category\CategoryModel;
use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
@@ -32,6 +36,7 @@ use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel;
use Visiosoft\LocationModule\Village\VillageModel;
use Visiosoft\PackagesModule\Package\PackageModel;
use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface;
+use Visiosoft\SeoModule\Legend\Command\AddMetaData;
class AdvsController extends PublicController
{
@@ -40,6 +45,10 @@ class AdvsController extends PublicController
private $adv_model;
private $adv_repository;
+ private $optionConfigurationRepository;
+ private $productOptionRepository;
+ private $productOptionsValueRepository;
+
private $country_repository;
private $city_model;
@@ -66,6 +75,10 @@ class AdvsController extends PublicController
AdvModel $advModel,
AdvRepositoryInterface $advRepository,
+ OptionConfigurationRepositoryInterface $optionConfigurationRepository,
+ ProductoptionRepositoryInterface $productOptionRepository,
+ ProductoptionsValueRepositoryInterface $productOptionsValueRepository,
+
CountryRepositoryInterface $country_repository,
CityModel $city_model,
@@ -94,6 +107,10 @@ class AdvsController extends PublicController
$this->adv_model = $advModel;
$this->adv_repository = $advRepository;
+ $this->optionConfigurationRepository = $optionConfigurationRepository;
+ $this->productOptionRepository = $productOptionRepository;
+ $this->productOptionsValueRepository = $productOptionsValueRepository;
+
$this->country_repository = $country_repository;
$this->city_model = $city_model;
@@ -254,15 +271,6 @@ class AdvsController extends PublicController
if ($categoryId) {
- $seo_keywords = $this->category_model->getMeta_keywords($categoryId->id);
- $seo_description = $this->category_model->getMeta_description($categoryId->id);
- $seo_title = $this->category_model->getMeta_title($categoryId->id);
-
- $this->template->set('og_description', $seo_description);
- $this->template->set('meta_description', $seo_description);
- $this->template->set('meta_title', $seo_title);
- $this->template->set('meta_keywords', implode(', ', $seo_keywords));
-
$mainCats = $this->category_model->getMains($categoryId->id);
$current_cat = $this->category_model->getCat($categoryId->id);
$mainCats[] = [
@@ -369,34 +377,7 @@ class AdvsController extends PublicController
$viewType = $this->requestHttp->cookie('viewType');
- $catText = '';
- if (!$allCats) {
- if (count($mainCats) == 1 || count($mainCats) == 2) {
- $catText = end($mainCats)['val'];
- } elseif (count($mainCats) > 2) {
- $catArray = array_slice($mainCats, 2);
- $catText = '';
- $loop = 0;
- foreach ($catArray as $cat) {
- $catText = !$loop ? $catText . $cat['val'] : $catText . ' ' . $cat['val'];
- $loop++;
- }
- }
-
- if ($cityId) {
- $catText = "$cityId->name $catText";
- }
-
- $this->template->set('showTitle', false);
- $this->template->set('meta_title', $catText);
- }
-
- $user = null;
- if (!empty($param['user'])) {
- $user = $this->userRepository->find($param['user']);
- $this->template->set('showTitle', false);
- $this->template->set('meta_title', $user->name() . ' ' . trans('visiosoft.module.advs::field.ads'));
- }
+ list('catText' => $catText, 'user' => $user) = $this->handleSeo($categoryId, $mainCats, $cityId);
$compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'param',
'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges',
@@ -405,6 +386,71 @@ class AdvsController extends PublicController
return $this->viewTypeBasedRedirect($viewType, $compact);
}
+ private function handleSeo($category, $mainCats, $city)
+ {
+ $showTitle = true;
+ $metaTitle = '';
+ $catText = '';
+
+ if ($category) {
+ $seo_keywords = $this->category_model->getMeta_keywords($category->id);
+ $seo_description = $this->category_model->getMeta_description($category->id);
+
+ $metaTitle = $this->category_model->getMeta_title($category->id);
+ $metaDesc = $seo_description;
+
+ $this->template->set('meta_keywords', implode(', ', $seo_keywords));
+
+ if ($city) {
+ $catText = "$city->name $catText";
+ } elseif (count($mainCats) == 1 || count($mainCats) == 2) {
+ $catText = end($mainCats)['val'];
+ } elseif (count($mainCats) > 2) {
+ $catArray = array_slice($mainCats, 2);
+ $loop = 0;
+ foreach ($catArray as $cat) {
+ $catText = !$loop ? $catText . $cat['val'] : $catText . ' ' . $cat['val'];
+ $loop++;
+ }
+ }
+ $metaTitle = $catText ?: $metaTitle;
+
+ if (is_module_installed('visiosoft.module.seo')) {
+ $metaData = dispatch_now(new AddMetaData($category->id, 'category'));
+ if ($metaData) {
+ list('metaTitle' => $seoMetaTitle, 'metaDesc' => $seoMetaDesc) = $metaData;
+ $metaTitle = $seoMetaTitle ?: $metaTitle;
+ $metaDesc = $seoMetaDesc ?: $metaDesc;
+ }
+ }
+
+ $this->template->set('og_description', $metaDesc);
+ $this->template->set('meta_description', $metaDesc);
+
+ $showTitle = false;
+ }
+
+ $user = null;
+ if (\request()->user) {
+ $user = $this->userRepository->find(\request()->user);
+ $showTitle = false;
+ $metaTitle = $user->name() . ' ' . trans('visiosoft.module.advs::field.ads');
+ }
+
+ $this->template->set('showTitle', $showTitle);
+ $this->template->set('meta_title', $metaTitle);
+
+ // Set rel="canonical"
+ if (\request()->sort_by || \request()->doping) {
+ $canonParam = \request()->all();
+ unset($canonParam['sort_by'], $canonParam['doping']);
+ $canonUrl = fullLink($canonParam, \request()->url());
+ $this->template->set('additional_meta', "
");
+ }
+
+ return compact('catText', 'user');
+ }
+
public function viewTypeBasedRedirect($viewType, $compact)
{
if (!$viewType) {
@@ -433,7 +479,7 @@ class AdvsController extends PublicController
$adv = $this->adv_repository->getListItemAdv($id);
- if ($adv && !$adv->expired()) {
+ if ($adv && (!$adv->expired() || $adv->created_by_id === \auth()->id())) {
if ($this->adv_model->is_enabled('complaints')) {
$complaints = ComplaintsComplainTypesEntryModel::all();
@@ -484,13 +530,6 @@ class AdvsController extends PublicController
$this->event->dispatch(new viewAd($adv));//view ad
- $this->template->set('meta_keywords', implode(',', explode(' ', $adv->name)));
- $this->template->set('meta_description', strip_tags($adv->advs_desc, ''));
- $this->template->set('showTitle', false);
- $this->template->set(
- 'meta_title',
- $adv->name . " " . end($categories)['name'] . ' ' . setting_value('streams::domain')
- );
if (substr($adv->cover_photo, 0, 4) === "http") {
$coverPhoto = $adv->cover_photo;
} else {
@@ -500,11 +539,38 @@ class AdvsController extends PublicController
$coverPhoto = \Illuminate\Support\Facades\Request::root() . '/' . $adv->cover_photo;
}
}
- $this->template->set('meta_image', $coverPhoto);
- if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") {
+ $metaTitle = $adv->name . " " . end($categories)['name'] . ' ' . setting_value('streams::domain');
+ $metaDesc = strip_tags($adv->advs_desc, '');
+
+ if (is_module_installed('visiosoft.module.seo')) {
+ $metaData = dispatch_now(new AddMetaData($adv->cat1, 'ad', $adv->id));
+ if ($metaData) {
+ list('metaTitle' => $seoMetaTitle, 'metaDesc' => $seoMetaDesc) = $metaData;
+ $metaTitle = $seoMetaTitle ?: $metaTitle;
+ $metaDesc = $seoMetaDesc ?: $metaDesc;
+ }
+ }
+
+ $coverPhotoInfo = pathinfo($coverPhoto);
+ if (substr($coverPhotoInfo['basename'], 0, 3) === "tn-") {
+ $ogImage = substr(basename($coverPhotoInfo['basename']), 3);
+ $ogImage = $coverPhotoInfo['dirname'] . "/$ogImage";
+ } else {
+ $ogImage = $coverPhoto;
+ }
+
+ $this->template->set('meta_image', $ogImage);
+ $this->template->set('meta_keywords', implode(',', explode(' ', $adv->name)));
+ $this->template->set('meta_description', $metaDesc);
+ $this->template->set('showTitle', false);
+ $this->template->set('meta_title', $metaTitle);
+
+ $configurations = $this->optionConfigurationRepository->getConf($adv->id);
+
+ if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") {
return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints',
- 'recommended_advs', 'categories', 'features', 'comments', 'qrSRC', 'options'));
+ 'recommended_advs', 'categories', 'features', 'comments', 'qrSRC', 'options', 'configurations'));
} else {
return back();
}
@@ -545,7 +611,7 @@ class AdvsController extends PublicController
$isActiveDopings = $this->adv_model->is_enabled('dopings');
return $this->view->make('visiosoft.module.advs::new-ad/preview/preview',
- compact('adv', 'categories', 'features', 'isActiveDopings', 'options'));
+ compact('adv', 'categories', 'features', 'isActiveDopings', 'configurations'));
}
public function getLocations()
@@ -643,8 +709,7 @@ class AdvsController extends PublicController
CategoryRepositoryInterface $categoryRepository,
Dispatcher $events,
AdvModel $advModel,
- AdressRepositoryInterface $address,
- CategoryModel $categoryModel
+ AdressRepositoryInterface $address
)
{
if (!Auth::user()) {
@@ -659,10 +724,21 @@ class AdvsController extends PublicController
/* Update Adv */
$adv = AdvsAdvsEntryModel::find($request->update_id);
+
+ //Set Old Price
+ $old_price = ($adv->slug == "") ? $request->price : $adv->price;
+ $adv->old_price = $old_price;
+
+
+ $allowPendingAdCreation = false;
if ($advModel->is_enabled('packages') and $adv->slug == "") {
$cat = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForNewAd($request);
if (!is_null($cat)) {
- return redirect('/');
+ if (array_key_exists('allowPendingAds', $cat)) {
+ $allowPendingAdCreation = $cat['allowPendingAds'];
+ } else {
+ return redirect($cat['redirect']);
+ }
}
}
@@ -717,7 +793,7 @@ class AdvsController extends PublicController
}
// Auto approve
- if (setting_value('visiosoft.module.advs::auto_approve')) {
+ if (setting_value('visiosoft.module.advs::auto_approve') && !$allowPendingAdCreation) {
$defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time');
$adv->update([
'status' => 'approved',
@@ -762,7 +838,11 @@ class AdvsController extends PublicController
return redirect('/advs/edit_advs/' . $request->update_id)->with('cats_d', $cats_d)->with('request', $request);
}
event(new CreatedAd($adv));
- return redirect(route('advs_preview', [$request->update_id]));
+ if ($allowPendingAdCreation) {
+ return redirect(route("visiosoft.module.packages::buy_package") . '?ad_id=' . $adv->id);
+ } else {
+ return redirect(route('advs_preview', [$request->update_id]));
+ }
}
/* New Create Adv */
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php
new file mode 100644
index 000000000..99be0f686
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php
@@ -0,0 +1,8 @@
+has('ad'))
+ {
+ $ad = $advRepository->find(request('ad'));
+
+ $options = $ad->getProductOptionsValues()->groupBy('product_option_id');
+
+ $options_fields = array();
+
+ foreach ($options as $option_id => $option_values)
+ {
+ if($option = $productOptionRepository->find($option_id))
+ {
+ $options_fields['option-'.$option->getId()] = [
+ 'type' => 'anomaly.field_type.select',
+ 'label' => $option->getName(),
+ 'required' => true,
+ 'config' => [
+ 'options' => $option_values->pluck('name','id')->all(),
+ ]
+ ];
+ }
+ }
+ $fields = array_merge($options_fields, ['price', 'currency', 'stock']);
+
+ $builder->setFields($fields);
+ }
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php
new file mode 100644
index 000000000..da93db1c2
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php
@@ -0,0 +1,35 @@
+canSave()) {
+ return;
+ }
+
+ $parameters = $builder->getPostData();
+ $parameters['parent_adv_id'] = request()->get('ad');
+
+ $option_json = array();
+
+ foreach ($parameters as $key => $parameter_value) {
+ if (substr($key, 0, 7) === "option-") {
+ $option_id = substr($key, 7);
+ $option_json[$option_id] = $parameter_value;
+ unset($parameters[$key]);
+ }
+ }
+ $option_json = ['option_json' => json_encode($option_json)];
+ $configration = array_merge($parameters, $option_json);
+
+
+ $entry = $repository->create($configration);
+ $builder->setFormEntry($entry);
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php
new file mode 100644
index 000000000..64c3e2d1d
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php
@@ -0,0 +1,8 @@
+find($this->parent_adv_id))
+ {
+ $configurations_item = json_decode($this->option_json, true);
+ $option_group_value = "";
+
+ foreach ($configurations_item as $option_id => $value) {
+ $value_entry = app(ProductoptionsValueRepositoryInterface::class)->find($value);
+ $option_group_value .= " " . $value_entry->getName();
+ }
+
+ return $adv->name . ' | ' . trim($option_group_value, ' ');
+ }
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php
new file mode 100644
index 000000000..a954f8a1d
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php
@@ -0,0 +1,8 @@
+model = $model;
+ $this->advRepository = $advRepository;
+ $this->productOptionsValueRepository = $productoptionsValueRepository;
+ }
+
+ public function createConfigration($ad_id, $price, $currency, $stock, $option_json)
+ {
+ return $this->create([
+ 'parent_adv_id' => $ad_id,
+ 'price' => $price,
+ 'currency' => $currency,
+ 'stock' => $stock,
+ 'option_json' => $option_json,
+ ]);
+ }
+
+ public function getConf($ad_id)
+ {
+ $adv = $this->advRepository->find($ad_id);
+ $configurations = array();
+
+ $product_configurations = $this->model->where('stock', '>', '0')->where('parent_adv_id', $ad_id)->get();
+
+ foreach ($product_configurations as $product_configuration) {
+ $configurations_item = json_decode($product_configuration->option_json, true);
+ $option_group_value = "";
+ foreach ($configurations_item as $option_id => $value) {
+ $value_entry = $this->productOptionsValueRepository->find($value);
+ $option_group_value .= " " . $value_entry->getName();
+ }
+ $configurations[$product_configuration->getId()] = [
+ 'name' => $option_group_value,
+ 'price' => $product_configuration->price,
+ 'currency' => $product_configuration->currency,
+ 'stock' => $product_configuration->stock,
+ 'adv' => $adv->name . ' (' . trim($option_group_value, ' ') . ')',
+ ];
+ }
+
+ return $configurations;
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php
new file mode 100644
index 000000000..87fe2c59c
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php
@@ -0,0 +1,8 @@
+setColumns([
+ 'name' => [
+ 'value' => function (EntryModel $entry,
+ AdvRepositoryInterface $advRepository) {
+
+ $adv = $advRepository->findById($entry->parent_adv_id);
+ return "
parent_adv_id]) . "'>$adv->name";
+ }
+ ],
+ 'option_json' => [
+ 'value' => function (EntryModel $entry,
+ ProductoptionRepositoryInterface $productOptionRepository,
+ ProductoptionsValueRepositoryInterface $productOptionsValueRepository) {
+
+ $values = json_decode($entry->option_json);
+ $text = "";
+
+ foreach ($values as $key => $value) {
+ $productOption = $productOptionRepository->findBy('entry_id', $key);
+ $productOptionsValue = $productOptionsValueRepository->findBy('entry_id', $value);
+
+ $text .=
+ '
' .
+ $productOption->name . ': ' . $productOptionsValue->name .
+ '';
+
+ }
+
+ return $text;
+ }
+ ],
+ ]);
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php
new file mode 100644
index 000000000..ce3958242
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php
@@ -0,0 +1,21 @@
+categoryRepository = $categoryRepository;
+ }
+
+ public function handle(SelectFieldType $fieldType)
+ {
+ $categories = $this->categoryRepository->mainCats();
+ $options = $categories->pluck('name', 'id')->all();
+ $fieldType->setOptions($options);
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php
new file mode 100644
index 000000000..66e68c2dc
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php
@@ -0,0 +1,8 @@
+name;
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php
new file mode 100644
index 000000000..e1a582328
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php
@@ -0,0 +1,8 @@
+model = $model;
+ }
+
+ public function getWithCategoryId($id)
+ {
+ return $this->findAllBy('category',$id);
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php
new file mode 100644
index 000000000..8067574e6
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php
@@ -0,0 +1,8 @@
+getWithCategoryId(7)->pluck('id')->all();
+
+ $values = $value_repository->getWithOptionsId($options_id);
+ return parent::setTableEntries($values);
+ }
+ /**
+ * The table views.
+ *
+ * @var array|string
+ */
+ protected $views = [];
+
+ /**
+ * The table filters.
+ *
+ * @var array|string
+ */
+ protected $filters = [];
+
+ /**
+ * The table columns.
+ *
+ * @var array|string
+ */
+ protected $columns = [];
+
+ /**
+ * The table buttons.
+ *
+ * @var array|string
+ */
+ protected $buttons = [
+ 'edit'
+ ];
+
+ /**
+ * The table actions.
+ *
+ * @var array|string
+ */
+ protected $actions = [
+ 'delete'
+ ];
+
+ /**
+ * The table options.
+ *
+ * @var array
+ */
+ protected $options = [];
+
+ /**
+ * The table assets.
+ *
+ * @var array
+ */
+ protected $assets = [];
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php
new file mode 100644
index 000000000..82fbb4f25
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php
@@ -0,0 +1,8 @@
+name;
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php
new file mode 100644
index 000000000..0e323b8d3
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php
@@ -0,0 +1,8 @@
+model = $model;
+ }
+
+ public function getWithOptionsId(array $ids)
+ {
+ return $this->newQuery()->whereIn('product_option_id', $ids)->get();
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php
new file mode 100644
index 000000000..e912ae9bf
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php
@@ -0,0 +1,8 @@
+
+ * @author Ryan Thompson
+ */
+class LookupTableBuilder extends \Anomaly\MultipleFieldType\Table\LookupTableBuilder
+{
+ public function setTableEntries(\Illuminate\Support\Collection $entries)
+ {
+ $option_repository = app(ProductoptionRepositoryInterface::class);
+ $value_repository = app(ProductoptionsValueRepositoryInterface::class);
+
+ $options_id = $option_repository->getWithCategoryId(7)->pluck('id')->all();
+
+ $values = $value_repository->getWithOptionsId($options_id);
+ return parent::setTableEntries($values);
+ }
+
+ protected $filters = [
+ 'product_option'
+ ];
+
+ /**
+ * The table columns.
+ *
+ * @var array
+ */
+ protected $columns = [
+ 'name', 'product_option'
+ ];
+}
diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php
new file mode 100644
index 000000000..dccc81c96
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php
@@ -0,0 +1,21 @@
+
+ * @author Ryan Thompson
+ */
+class SelectedTableBuilder extends \Anomaly\MultipleFieldType\Table\SelectedTableBuilder
+{
+
+ /**
+ * The table columns.
+ *
+ * @var array
+ */
+ protected $columns = [
+ 'name', 'product_option'
+ ];
+}
diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php
new file mode 100644
index 000000000..b9a42c19b
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php
@@ -0,0 +1,21 @@
+
+ * @author Ryan Thompson
+ */
+class ValueTableBuilder extends \Anomaly\MultipleFieldType\Table\ValueTableBuilder
+{
+
+ /**
+ * The table columns.
+ *
+ * @var array
+ */
+ protected $columns = [
+ 'name', 'product_option'
+ ];
+}
diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php
new file mode 100644
index 000000000..8c331821d
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php
@@ -0,0 +1,68 @@
+ [
+ 'value' => 'entry.name'
+ ],
+ 'product_option',
+ ];
+
+ /**
+ * The table buttons.
+ *
+ * @var array|string
+ */
+ protected $buttons = [
+ 'edit'
+ ];
+
+ /**
+ * The table actions.
+ *
+ * @var array|string
+ */
+ protected $actions = [
+ 'delete'
+ ];
+
+ /**
+ * The table options.
+ *
+ * @var array
+ */
+ protected $options = [];
+
+ /**
+ * The table assets.
+ *
+ * @var array
+ */
+ protected $assets = [];
+
+}
diff --git a/addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php b/addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php
new file mode 100644
index 000000000..d3b82188e
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php
@@ -0,0 +1,23 @@
+moduleNamespace = $moduleNamespace;
+ $this->checkEnabled = $checkEnabled;
+ }
+
+ public function handle(ModuleRepositoryInterface $moduleRepository)
+ {
+ if ($module = $moduleRepository->findBy('namespace', $this->moduleNamespace)) {
+ return $this->checkEnabled ? $module->installed && $module->enabled : boolval($module->installed);
+ }
+ return false;
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php b/addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php
new file mode 100644
index 000000000..05d5fb29c
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php
@@ -0,0 +1,34 @@
+ [
+ 'name' => trans('visiosoft.module.advs::field.balances'),
+ 'entry_type' => 'Visiosoft\BalancesModule\Balance\BalanceModel'
+ ],
+ 'packages' => [
+ 'name' => trans('visiosoft.module.advs::field.packages'),
+ 'entry_type' => 'Visiosoft\PackagesModule\Package\PackageModel'
+ ],
+ 'dopings' => [
+ 'name' => trans('visiosoft.module.advs::field.dopings'),
+ 'entry_type' => 'Anomaly\Streams\Platform\Model\Dopings\DopingsDopingsEntryModel'
+ ],
+ 'advs' => [
+ 'name' => trans('visiosoft.module.advs::field.advs'),
+ 'entry_type' => 'Visiosoft\AdvsModule\Adv\AdvModel'
+ ],
+ 'site' => [
+ 'name' => trans('visiosoft.module.advs::field.site'),
+ 'entry_type' => 'Visiosoft\SiteModule\Addon\AddonModel'
+ ],
+ 'subscriptions' => [
+ 'name' => trans('visiosoft.module.advs::field.subscriptions'),
+ 'entry_type' => 'Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel'
+ ],
+ ];
+ }
+}
diff --git a/addons/default/visiosoft/advs-module/src/Support/_helpers.php b/addons/default/visiosoft/advs-module/src/Support/_helpers.php
index 834968bdb..45c94b635 100644
--- a/addons/default/visiosoft/advs-module/src/Support/_helpers.php
+++ b/addons/default/visiosoft/advs-module/src/Support/_helpers.php
@@ -2,9 +2,33 @@
use Illuminate\Contracts\Bus\Dispatcher;
use Visiosoft\AdvsModule\Adv\Command\appendRequestURL;
+use Visiosoft\AdvsModule\Support\Command\CheckModuleInstalled;
+use Visiosoft\AdvsModule\Support\Command\GetBuyables;
-if (!function_exists('fullLink')) {
+if (!function_exists('fullLink'))
+{
function fullLink($request, $url, $newParameters = array()) {
return app(Dispatcher::class)->dispatch(new appendRequestURL($request, $url, $newParameters));
}
+}
+
+if (!function_exists('is_module_installed'))
+{
+ function is_module_installed($moduleNamespace, $checkEnabled = true) {
+ return dispatch_now(new CheckModuleInstalled($moduleNamespace, $checkEnabled));
+ }
+}
+
+if (!function_exists('get_buyables'))
+{
+ function get_buyables() {
+ return dispatch_now(new GetBuyables());
+ }
+}
+
+if (!function_exists('auth_id_if_null'))
+{
+ function auth_id_if_null($userId) {
+ return $userId ?: auth()->id();
+ }
}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
index 950b34146..7e08b05f8 100644
--- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
@@ -9,7 +9,7 @@ return [
'fields' => [
'home_page_sub_categories_limit', 'navigation_title', 'navigation_action', 'date_fields',
'price_fields', 'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn',
- 'register_page_instruction_logo', 'register_page_alert_link'
+ 'register_page_instruction_logo', 'register_page_alert_link', 'default_country'
],
],
'template' => [
diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
index 791e3a74b..813cf0050 100644
--- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
@@ -1,5 +1,5 @@
[
'type' => 'anomaly.field_type.boolean',
diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js
index 66535c2a8..0bffd3409 100644
--- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js
+++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js
@@ -1,4 +1,6 @@
function phoneMask(fields) {
+ var country = document.getElementById('default-phone-country')
+ ? document.getElementById('default-phone-country').innerText : null;
var inputQueries = document.querySelectorAll(fields);
inputQueries.forEach(function (inputQuery, key) {
var iti = intlTelInput(inputQuery, {
@@ -8,7 +10,7 @@ function phoneMask(fields) {
geoIpLookup: function (success, failure) {
$.get("https://ipinfo.io", function () {
}, "jsonp").always(function (resp) {
- var countryCode = (resp && resp.country) ? resp.country : "";
+ var countryCode = country ? country : (resp && resp.country) ? resp.country : "";
success(countryCode);
})
}
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php
index 8221638f8..8ccab5bff 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'حد الفئات الفرعية للصفحة الرئيسية',
],
+ 'default_country' => [
+ 'name' => 'صفحة التسجيل ، البلد الافتراضي للهاتف',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/az/setting.php b/addons/default/visiosoft/base-theme/resources/lang/az/setting.php
index 8317d134d..d3d7a5483 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/az/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/az/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Əsas alt kateqoriyalar məhdudiyyəti',
],
+ 'default_country' => [
+ 'name' => 'Qeydiyyat səhifəsi, telefon üçün standart ölkə',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php b/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php
index 37dd14199..083bc581b 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'হোমপেজ সাব বিভাগের সীমা',
],
+ 'default_country' => [
+ 'name' => 'ফোনের জন্য পৃষ্ঠা, ডিফল্ট দেশ নিবন্ধ করুন',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/de/setting.php b/addons/default/visiosoft/base-theme/resources/lang/de/setting.php
index ec0ba8165..b535ea2ec 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/de/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/de/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Homepage Unterkategorien Limit',
],
+ 'default_country' => [
+ 'name' => 'Registrierungsseite, Standardland für Telefon',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/el/setting.php b/addons/default/visiosoft/base-theme/resources/lang/el/setting.php
index 4f4c3ecfc..7f8e37b92 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/el/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/el/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Όριο υποκατηγοριών αρχικής σελίδας',
],
+ 'default_country' => [
+ 'name' => 'Σελίδα εγγραφής, προεπιλεγμένη χώρα για τηλέφωνο',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
index f927a8a08..01ae47cf2 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Homepage Sub Categories Limit',
],
+ 'default_country' => [
+ 'name' => 'Register page, default country for phone',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/es/setting.php b/addons/default/visiosoft/base-theme/resources/lang/es/setting.php
index f6a949c76..d505c2f04 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/es/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/es/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Límite de subcategorías de la página de inicio',
],
+ 'default_country' => [
+ 'name' => 'Página de registro, país predeterminado para el teléfono',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php b/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php
index d77025933..3c0671d87 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'زیرمجموعه ها',
],
+ 'default_country' => [
+ 'name' => 'صفحه ثبت نام ، کشور پیش فرض تلفن',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php b/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php
index c9b04e6e3..4cdc5fe72 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Limite des sous-catégories de la page d\'accueil',
],
+ 'default_country' => [
+ 'name' => 'Page d\'enregistrement, pays par défaut pour le téléphone',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/he/setting.php b/addons/default/visiosoft/base-theme/resources/lang/he/setting.php
index fd6e10e06..77f45592b 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/he/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/he/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'מגבלת קטגוריות המשנה לדף הבית',
],
+ 'default_country' => [
+ 'name' => 'דף הרשמה, ארץ ברירת המחדל לטלפון',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php b/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php
index 91ac0ef7e..fb4dcb8d2 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'मुखपृष्ठ उप श्रेणियाँ श्रेणियाँ सीमा',
],
+ 'default_country' => [
+ 'name' => 'रजिस्टर पेज, फोन के लिए डिफ़ॉल्ट देश',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/it/setting.php b/addons/default/visiosoft/base-theme/resources/lang/it/setting.php
index 30d283ac0..f6ba36f00 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/it/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/it/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Limite delle sottocategorie della home page',
],
+ 'default_country' => [
+ 'name' => 'Pagina di registrazione, paese predefinito per il telefono',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php
index 9ca3676c1..f91bc8f5f 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'ホームページのサブカテゴリの制限',
],
+ 'default_country' => [
+ 'name' => '登録ページ、電話のデフォルトの国',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php
index d1fa6353e..8baafa55e 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => '홈페이지 하위 카테고리 제한',
],
+ 'default_country' => [
+ 'name' => '등록 페이지, 전화의 기본 국가',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php b/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php
index 2b23dac74..96546c7ac 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Limiet subcategorieën op homepage',
],
+ 'default_country' => [
+ 'name' => 'Registratiepagina, standaardland voor telefoon',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php b/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php
index 5f3e95453..511898486 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Limit podkategorii strony głównej',
],
+ 'default_country' => [
+ 'name' => 'Strona rejestracji, domyślny kraj dla telefonu',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php b/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php
index 26ef6f439..f192800fe 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Limite de subcategorias da página inicial',
],
+ 'default_country' => [
+ 'name' => 'Página de registro, país padrão para telefone',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php
index 10067e769..03263f563 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Limita de subcategorii pentru pagina principală',
],
+ 'default_country' => [
+ 'name' => 'Pagina de înregistrare, țara implicită pentru telefon',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php
index 9849ee374..08dfb72f6 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Ограничение подкатегорий домашней страницы',
],
+ 'default_country' => [
+ 'name' => 'Страница регистрации, страна по умолчанию для телефона',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php
index 7286cbb1a..b6b542e51 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Nënkategoritë e faqes kryesore Kufiri',
],
+ 'default_country' => [
+ 'name' => 'Faqja e regjistrimit, vendi i paracaktuar për telefon',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php
index 9d805bc60..052911649 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Hemsida Underkategorier Begränsning',
],
+ 'default_country' => [
+ 'name' => 'Registrera sida, standardland för telefon',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
index 5ff970318..161be2f65 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php
@@ -27,9 +27,9 @@ return [
// Registration instructions
'personal_registration_header' => 'Bireysel Üyelik Avantajları Nelerdir?',
'personal_registration_body' => 'Evinizi, arabanızı satmak ve kiralamak, kullanılmayan eşyalarınızı satmak, yenilerini almak.',
- 'personal_registration_list_1' => 'Ücretsiz bir reklam gönderin,',
- 'personal_registration_list_2' => 'İlgilendiğiniz reklamları ekleyin, favorilerinize ekledikten sonra fiyat değişikliklerini takip edin, kriterlerinize uygun favori aramalar oluşturun,',
- 'personal_registration_list_3' => 'Sitedeki reklam sahiplerine mesaj gönderin.',
+ 'personal_registration_list_1' => 'Ücretsiz bir İlan gönderin,',
+ 'personal_registration_list_2' => 'İlgilendiğiniz ilanları ekleyin, favorilerinize ekledikten sonra fiyat değişikliklerini takip edin, kriterlerinize uygun favori aramalar oluşturun,',
+ 'personal_registration_list_3' => 'Sitedeki İlan sahiplerine mesaj gönderin.',
'register_information_note' => 'Bu sayfadaki bilgiler ' . env('APPLICATION_DOMAIN') . ' üyelik. Kişisel verilerin korunması hakkında ayrıntılı bilgiyi burada bulabilirsiniz.',
// Register page
@@ -45,7 +45,7 @@ return [
// Side menu links
'company_directory' => 'Firma Rehberi',
- 'popular_ads' => 'popüler reklamlar',
+ 'popular_ads' => 'Popüler İlanlar',
'last_48_hours' => 'son 48 saat',
'secure_e-commerce_ads' => 'güvenli e-ticaret',
'sms' => 'Kısa Mesaj Gönder (SMS)',
diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php b/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php
index b5e3e3bb3..0ab08307f 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php
@@ -20,10 +20,10 @@ return [
'name' => 'Breadcrumb',
],
'ad_details' => [
- 'name' => 'Reklam Ayrıntıları',
+ 'name' => 'İlan Ayrıntıları',
],
'ad_details_tab' => [
- 'name' => 'Reklam Ayrıntıları Sekmesi',
+ 'name' => 'İlan Ayrıntıları Sekmesi',
],
'latest_and_view_all_btn' => [
'name' => 'Tümünü Görüntüle',
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Ana Sayfa Alt Kategoriler Sınırı',
],
+ 'default_country' => [
+ 'name' => 'Kayıt sayfası, telefon için varsayılan ülke',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php b/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php
index f74df18be..564dca707 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Підкатегорії домашньої сторінки Обмеження',
],
+ 'default_country' => [
+ 'name' => 'Сторінка реєстрації, країна за замовчуванням для телефону',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php
index b63083f14..ab7f1b6c9 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'مرکزی صفحہ ذیلی زمرے کی حد',
],
+ 'default_country' => [
+ 'name' => 'صفحہ کیلئے رجسٹر ، فون کے لئے پہلے سے طے شدہ ملک',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php b/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php
index c133c17cb..9db82be46 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php
@@ -40,4 +40,7 @@ return [
'home_page_sub_categories_limit' => [
'name' => 'Giới hạn danh mục phụ của trang chủ',
],
+ 'default_country' => [
+ 'name' => 'Trang đăng ký, quốc gia mặc định cho điện thoại',
+ ]
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig
index c63a55cb9..00e7c48d7 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig
@@ -56,6 +56,7 @@