diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php index 0f1e87a29..2961bbc3c 100644 --- a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php @@ -15,7 +15,7 @@ class VisiosoftModuleAdvsCreateProductoptionsStream extends Migration protected $delete = true; protected $fields = [ - 'categories' => [ + 'category' => [ 'type' => 'anomaly.field_type.select', 'config' => [ 'handler' => 'Visiosoft\AdvsModule\OptionHandler\CategoriesOptions@handle' @@ -43,7 +43,7 @@ class VisiosoftModuleAdvsCreateProductoptionsStream extends Migration * @var array */ protected $assignments = [ - 'categories', + 'category', 'name' => [ 'translatable' => true, 'required' => true, diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index f650cb5a0..6fd4f4005 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -137,7 +137,9 @@ return [ 'oldest' => 'Oldest', 'address_a_z' => 'Address (A to Z)', 'address_z_a' => 'Address (Z to A)', - 'categories' => 'Categories', + 'categories' => [ + 'name' => 'Categories' + ], 'all_categories' => 'All Categories', 'location' => 'Location', 'send_message' => 'Send Message', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php index fa686c524..cdd4948d1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php @@ -46,18 +46,12 @@ return [ ], 'ads_image' => 'Ads Image', 'product_options' => [ - 'title' => 'Product Options', + 'title' => 'Options', ], 'productoptions_value' => [ - 'title' => 'Productoptions value', - ], - 'options_configuration' => [ - 'title' => 'Options configuration', + 'title' => 'Options Value', ], 'option_configuration' => [ - 'title' => 'Option configuration', - ], - 'option_configuration' => [ - 'title' => 'Option configuration', + 'title' => 'Configuration', ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php index bd46a1466..761fa569d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php @@ -23,18 +23,12 @@ return [ 'name' => 'Options', ], 'product_options' => [ - 'name' => 'Produc Options', + 'name' => 'Product Options', ], 'productoptions_value' => [ - 'name' => 'Productoptions value', - ], - 'options_configuration' => [ - 'name' => 'Options configuration', + 'name' => 'Options value', ], 'option_configuration' => [ - 'name' => 'Option configuration', - ], - 'option_configuration' => [ - 'name' => 'Option configuration', + 'name' => 'Configuration', ], ]; diff --git a/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php index 4083e31f0..ce3958242 100644 --- a/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php +++ b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php @@ -15,7 +15,7 @@ class CategoriesOptions public function handle(SelectFieldType $fieldType) { $categories = $this->categoryRepository->mainCats(); - $options[] = $categories->pluck('name', 'id'); + $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/ProductoptionRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php index 3f79de073..419fe12d1 100644 --- a/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php @@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; interface ProductoptionRepositoryInterface extends EntryRepositoryInterface { - + public function getWithCategoryId($id); } diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php index 3bb583b27..639d328c8 100644 --- a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php @@ -22,4 +22,9 @@ class ProductoptionRepository extends EntryRepository implements ProductoptionRe { $this->model = $model; } + + public function getWithCategoryId($id) + { + return $this->findAllBy('category',$id); + } } diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php b/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php index 50dbe3713..36dc31d43 100644 --- a/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php @@ -1,10 +1,22 @@ getWithCategoryId(7)->pluck('id')->all(); + + $values = $value_repository->getWithOptionsId($options_id); + return parent::setTableEntries($values); + } /** * The table views. * diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php index 80d519f08..8ad968cc2 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php @@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; interface ProductoptionsValueRepositoryInterface extends EntryRepositoryInterface { - + public function getWithOptionsId(array $ids); } diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php index 7dbc8e29e..0f68a0aec 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php @@ -6,20 +6,25 @@ use Anomaly\Streams\Platform\Entry\EntryRepository; class ProductoptionsValueRepository extends EntryRepository implements ProductoptionsValueRepositoryInterface { - /** - * The entry model. - * - * @var ProductoptionsValueModel - */ - protected $model; + /** + * The entry model. + * + * @var ProductoptionsValueModel + */ + protected $model; - /** - * Create a new ProductoptionsValueRepository instance. - * - * @param ProductoptionsValueModel $model - */ - public function __construct(ProductoptionsValueModel $model) - { - $this->model = $model; - } + /** + * Create a new ProductoptionsValueRepository instance. + * + * @param ProductoptionsValueModel $model + */ + public function __construct(ProductoptionsValueModel $model) + { + $this->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/Support/MultipleFieldType/LookupTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php index 07d441e94..da83a178c 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php @@ -1,5 +1,9 @@ getWithCategoryId(7)->pluck('id')->all(); + + $values = $value_repository->getWithOptionsId($options_id); + return parent::setTableEntries($values); + } protected $filters = [ 'product_option'