diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php index c3ff863ad..1b49391ae 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -38,4 +38,5 @@ return [ 'new_options_configuration' => 'New Options configuration', 'new_option_configuration' => 'New Option configuration', 'new_option_configuration' => 'New Option configuration', + 'create_configurations' => 'Create Configurations', ]; diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index 243164093..f016f7040 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -16,7 +16,7 @@ {% endif %} - Konfigürasyon Oluştur + {{trans('visiosoft.module.advs::button.create_configurations')}} @@ -33,7 +33,7 @@
- Konfigürasyon Oluştur + {{trans('visiosoft.module.advs::button.create_configurations')}} {{ trans('visiosoft.module.advs::field.edit') }} 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 44f95278e..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 @@ -109,7 +109,7 @@ class AdvsController extends AdminController 'text' => 'Replicate', ], 'create_configration' => [ - 'text' => 'Create Configrations', + 'text' => trans('visiosoft.module.advs::button.create_configurations'), 'href' => route('visiosoft.module.advs::configrations.create')."?ad={entry.id}" ], ], diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php index d483bd89c..a72308585 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php @@ -7,4 +7,6 @@ interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterfac public function createConfigration($ad_id,$price,$currency,$stock,$option_json); public function getConf($ad_id); + + public function getName($id); } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php index c81b0405e..8b862fe54 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -6,10 +6,5 @@ use Anomaly\Streams\Platform\Model\Advs\AdvsOptionConfigurationEntryModel; class OptionConfigurationModel extends AdvsOptionConfigurationEntryModel implements OptionConfigurationInterface { - public function getName($id) - { - $configuration = $this->find($id); - $adv = $this->adv_model->find($configuration->parent_adv_id); - dd($adv); - } + } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php index ca2ba2820..1ed025ce3 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php @@ -45,47 +45,27 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon ]); } - public function getConf($ad_id, $conf_id = null) + public function getConf($ad_id) { $adv = $this->advRepository->find($ad_id); $configurations = array(); - if ($conf_id == null) { - $product_configurations = $this->model->where('stock', '>', '0')->where('parent_adv_id', $ad_id)->get(); + $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, ' ') . ')', - ]; - } - } else { - $product_configuration = $this->model->find($conf_id); + 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 = [ - 'name' => trim($option_group_value), + $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;