-
+
+
+
+
+
+
+
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index a82a57656..73013aa25 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -123,16 +123,18 @@
{% if setting_value('visiosoft.module.advs::show_post_ad_agreement') %}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index b7227eda5..e9e653c1e 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Visiosoft\AdvsModule\Adv\Contract\AdvInterface;
use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel;
+use Visiosoft\AdvsModule\Support\Command\Currency;
use Visiosoft\LocationModule\City\CityModel;
use Visiosoft\LocationModule\Country\CountryModel;
use Visiosoft\CartsModule\Cart\Command\GetCart;
@@ -17,6 +18,49 @@ use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface;
class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
{
+ protected $appends = [
+ 'detail_url',
+ 'currency_price',
+ 'category1',
+ 'category2',
+ 'thumbnail',
+ ];
+
+ public function getDetailUrlAttribute()
+ {
+ // Checking for slug
+ if($this->attributes)
+ {
+ return $this->getAdvDetailLinkByModel($this, 'list');
+ }
+ }
+
+ public function getCurrencyPriceAttribute()
+ {
+ return app(Currency::class)->format($this->price, $this->currency);
+ }
+
+ public function getCategory1Attribute()
+ {
+ return $this->hasMany('Visiosoft\CatsModule\Category\CategoryModel', 'id', 'cat1')->first();
+
+ }
+
+ public function getCategory2Attribute()
+ {
+ return $this->hasMany('Visiosoft\CatsModule\Category\CategoryModel', 'id', 'cat1')->first();
+
+ }
+
+ public function getThumbnailAttribute()
+ {
+ if ($this->cover_photo == null) {
+ return $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image.png', 'img'))->url();
+ } else {
+ return url($this->cover_photo);
+ }
+ }
+
public function getTransNameAttribute()
{
if (is_null($this->name)) {
@@ -278,12 +322,10 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function stockControl($id, $quantity)
{
- if($adv = $this->getAdv($id))
- {
+ if ($adv = $this->getAdv($id)) {
$stock = $adv->stock;
- if($stock and $stock >= $quantity)
- {
+ if ($stock and $stock >= $quantity) {
return 1;
}
}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index b5daa5812..cb5dee0b0 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -58,8 +58,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$delimiter = '_';
$keyword = str_slug($param['keyword'], $delimiter);
$query = $query->where(function ($query) use ($keyword) {
- $query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%')
- ->orWhere('slug', 'like', '%' . $keyword . '%')
+ $query->where('slug', 'like', '%' . $keyword . '%')
->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%');
});
}
@@ -396,11 +395,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$ads = $this->model->getLocationNames($latest_advs);
- foreach ($ads as $index => $ad) {
- $ads[$index]->detail_url = $this->model->getAdvDetailLinkByModel($ad, 'list');
- $ads[$index] = $this->model->AddAdsDefaultCoverImage($ad);
- }
-
return $ads;
}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php b/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php
new file mode 100644
index 000000000..27de8eab1
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php
@@ -0,0 +1,25 @@
+cat_id = $cat_id;
+ }
+
+ public function handle()
+ {
+ $option_repository = app(ProductoptionRepositoryInterface::class);
+ $value_repository = app(ProductoptionsValueRepositoryInterface::class);
+
+ $options_id = $option_repository->getWithCategoryId($this->cat_id)->pluck('id')->all();
+
+ return count($value_repository->getWithOptionsId($options_id));
+ }
+}
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 e5f836d7a..c9f6eb197 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
@@ -57,6 +57,7 @@ class AdvFormBuilder extends FormBuilder
'cat9',
'cat10',
'currency',
+ 'tax',
'online_payment',
'stock',
'country' => [
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
index 162329dc5..0a1bcc3e3 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php
@@ -115,6 +115,12 @@ class AdvsModulePlugin extends Plugin
);
}
),
+ new \Twig_SimpleFunction(
+ 'is_module_enabled',
+ function ($slug) {
+ return app(AdvModel::class)->is_enabled($slug);
+ }
+ )
];
}
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 937d1e0da..04f7a4348 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -146,10 +146,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
'as' => 'adv_add_cart_ajax',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@addCart',
],
- 'ajax/countPhone' => [
- 'as' => 'adv_count_show_phone',
- 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@showPhoneCounter',
- ],
'view/{type}' => [
'as' => 'visiosoft.module.advs::view_type',
'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@viewType',
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 6a786d521..5cbe78018 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -10,6 +10,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cookie;
use Visiosoft\AdvsModule\Adv\AdvModel;
+use Visiosoft\AdvsModule\Adv\Command\IsOptionsByCategory;
use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
use Visiosoft\AdvsModule\Adv\Event\ChangedStatusAd;
use Visiosoft\AdvsModule\Adv\Event\CreatedAd;
@@ -21,6 +22,8 @@ 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\CatsModule\Category\Contract\CategoryRepositoryInterface;
use Visiosoft\LocationModule\City\CityModel;
use Visiosoft\LocationModule\City\CityRepository;
@@ -992,9 +995,14 @@ class AdvsController extends PublicController
$hidePrice = in_array($adv['cat1'], $hidePriceCats);
}
+ /* Check Options
+ * Added to query if there are product options.
+ */
+ $is_options = dispatch_now(new IsOptionsByCategory($adv['cat1']));
+
return $this->view->make(
'visiosoft.module.advs::new-ad/new-create',
- compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice')
+ compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice','is_options')
);
}
diff --git a/addons/default/visiosoft/base-theme/resources/css/offline.scss b/addons/default/visiosoft/base-theme/resources/css/offline.scss
new file mode 100644
index 000000000..03b25a263
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/css/offline.scss
@@ -0,0 +1,37 @@
+#offline {
+ display: none;
+
+ & > div {
+ min-height: 100vh;
+
+ svg {
+ height: 12rem;
+ width: auto;
+ }
+
+ h1 {
+ font-weight: 400;
+ font-size: 1.5rem;
+ }
+
+ p {
+ color: #7B7B90;
+ }
+
+ button {
+ background-color: #ebeeff;
+ color: #007eff;
+ padding: .75rem 1.75rem;
+ font-weight: 700;
+ border-radius: 7px;
+
+ &:focus {
+ outline: 5px auto #007eff;
+ }
+
+ .spinner-border {
+ display: none;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/images/unplugged.svg b/addons/default/visiosoft/base-theme/resources/images/unplugged.svg
new file mode 100644
index 000000000..4152a2b22
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/images/unplugged.svg
@@ -0,0 +1,2 @@
+
+
diff --git a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
index a52c5dc3e..89c727b4d 100644
--- a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
+++ b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
@@ -1,5 +1,20 @@
-// (function (window, document) {
-//
-// // Go!
-//
-// })(window, document);
+(function (window, document) {
+ /* Offline */
+ window.addEventListener('offline', () => {
+ $('body > *').hide();
+ $('#offline').show();
+ });
+
+ $('#offline button').click(function () {
+ $('.spinner-border', this).css('display', 'inline-block')
+
+ setTimeout(() => {
+ if (window.navigator.onLine) {
+ window.location.reload();
+ } else {
+ $('.spinner-border', this).hide()
+ }
+ }, 250)
+ })
+ /* End Offline */
+})(window, document);
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
index 4c0d09949..1dbcef01d 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php
@@ -56,4 +56,10 @@ return [
'list' => 'List',
'instruction_description' => 'Instruction Description',
'instruction_list' => 'Instruction List',
+
+ // Offline
+ 'connection_problem' => 'Connection problem',
+ 'your_internet_connection_is_broken' => 'Your internet connection is broken,',
+ 'we_miss_you_so_much_already' => 'we miss you so much already!',
+ 'try_again' => 'Try again',
];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig
index 04b3fefe9..e7973bae5 100644
--- a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig
@@ -14,5 +14,7 @@
{% endblock %}