Fix dropdown select and optimized directory helper

Block/Adminhtml/City/Edit/BackButton.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © 2018 EaDesign by Eco Active S.R.L.
+ * See LICENSE for license details.
+ */
+
+namespace Eadesigndev\RomCity\Block\Adminhtml\City\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+class BackButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Back'),
+            'on_click' => sprintf("location.href = '%s';", $this->getUrl('*/*/')),
+            'class' => 'back',
+            'sort_order' => 10
+        ];
+    }
+}

Block/Adminhtml/City/Edit/DeleteButton.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2018 EaDesign by Eco Active S.R.L.
+ * See LICENSE for license details.
+ */
+
+namespace Eadesigndev\RomCity\Block\Adminhtml\City\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+class DeleteButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        $cityId = $this->getCityId();
+
+        if ($cityId) {
+            $data = [
+                'label' => __('Delete'),
+                'class' => 'delete',
+                'on_click' => sprintf(
+                    "deleteConfirm('%s', '%s')",
+                    __('Are you sure you want to delete this city?'),
+                    $this->getUrl('*/*/delete', ['entity_id' => $cityId])
+                ),
+                'sort_order' => 20
+            ];
+        }
+
+        return $data;
+    }
+}

Block/Adminhtml/City/Edit/GenericButton.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2018 EaDesign by Eco Active S.R.L.
+ * See LICENSE for license details.
+ */
+
+namespace Eadesigndev\RomCity\Block\Adminhtml\City\Edit;
+
+use Magento\Backend\Block\Widget\Context;
+
+class GenericButton
+{
+    /**
+     * @var Context
+     */
+    protected $context;
+
+    public function __construct(Context $context)
+    {
+        $this->context = $context;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getCityId(): ?int
+    {
+        $id = $this->context->getRequest()->getParam('entity_id');
+
+        return $id ? (int)$id : null;
+    }
+
+    /**
+     * @param string $route
+     * @param array $params
+     * @return string
+     */
+    public function getUrl($route = '', $params = []): string
+    {
+        return $this->context->getUrlBuilder()->getUrl($route, $params);
+    }
+}

Block/Adminhtml/City/Edit/SaveButton.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © 2018 EaDesign by Eco Active S.R.L.
+ * See LICENSE for license details.
+ */
+
+namespace Eadesigndev\RomCity\Block\Adminhtml\City\Edit;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+class SaveButton extends GenericButton implements ButtonProviderInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getButtonData()
+    {
+        return [
+            'label' => __('Save City'),
+            'class' => 'save primary',
+            'data_attribute' => [
+                'mage-init' => [
+                    'buttonAdapter' => [
+                        'actions' => [
+                            [
+                                'targetName' => 'xtea_romcity_form.xtea_romcity_form',
+                                'actionName' => 'save',
+                                'params' => [true]
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+            'sort_order' => 90
+        ];
+    }
+}

Block/Adminhtml/ConfigButton.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © 2018 EaDesign by Eco Active S.R.L.
+ * See LICENSE for license details.
+ */
+
+namespace Eadesigndev\RomCity\Block\Adminhtml;
+
+use Eadesigndev\RomCity\Block\Adminhtml\City\Edit\GenericButton;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+class ConfigButton extends GenericButton implements ButtonProviderInterface
+{
+    protected $_backendUrl;
+
+    public function __construct(
+        \Magento\Backend\Model\UrlInterface $backendUrl
+    ) {
+
+        $this->_backendUrl = $backendUrl;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getButtonData()
+    {        
+        return [
+            'label' => __('Go to Import Cities'),
+            'on_click' => sprintf("location.href = '%s';", $this->_backendUrl->getUrl('admin/system_config/index')),
+            'class' => 'secondary',
+            'sort_order' => 10
+        ];
+    }
+}

Block/Adminhtml/Order/Create/Billing/Address.php

@@ -0,0 +1,176 @@
+<?php
+
+namespace Eadesigndev\RomCity\Block\Adminhtml\Order\Create\Billing;
+
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Eadesigndev\RomCity\Api\RomCityRepositoryInterface;
+
+class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address
+{
+    /** @var \Magento\Framework\Api\SearchCriteriaBuilder */
+    private $criteriaBuilder;
+
+    /** @var \Eadesigndev\RomCity\Api\RomCityRepositoryInterface */
+    private $cityRepository;
+
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Model\Session\Quote $sessionQuote,
+        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+        PriceCurrencyInterface $priceCurrency,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
+        \Magento\Directory\Helper\Data $directoryHelper,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Customer\Model\Metadata\FormFactory $customerFormFactory,
+        \Magento\Customer\Model\Options $options,
+        \Magento\Customer\Helper\Address $addressHelper,
+        \Magento\Customer\Api\AddressRepositoryInterface $addressService,
+        \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder,
+        \Magento\Framework\Api\FilterBuilder $filterBuilder,
+        \Magento\Customer\Model\Address\Mapper $addressMapper,
+        RomCityRepositoryInterface $cityRepository,
+        array $data = []
+    ){
+        parent::__construct(
+            $context,
+            $sessionQuote,
+            $orderCreate,
+            $priceCurrency,
+            $formFactory,
+            $dataObjectProcessor,
+            $directoryHelper,
+            $jsonEncoder,
+            $customerFormFactory,
+            $options,
+            $addressHelper,
+            $addressService,
+            $criteriaBuilder,
+            $filterBuilder,
+            $addressMapper,
+            $data
+        );
+
+        $this->cityRepository = $cityRepository;    
+        $this->criteriaBuilder = $criteriaBuilder;
+
+    }
+
+    /**
+     * Prepare Form and add elements to form
+     *
+     * @return $this
+     */
+    /*protected function _prepareForm()
+    {
+        parent::_prepareForm();
+
+        $formValues = $this->getFormValues();
+        $countryElement = $this->_form->getElement('country_id');
+        $regionIdElement = $this->_form->getElement('region_id');
+        $regionId = $regionIdElement->getValue();
+        $countryId = $countryElement->getValue();
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter('region_id', $regionId)
+            ->create();
+
+        $cityValue = $formValues['city'];
+        $cityId = null;
+        $values = [__('Please select city')];
+        if ($regionId) {
+            $cities = $this->cityRepository->getList($searchCriteria)->getItems();
+            foreach($cities as $city) {
+                if ($city->getCity() === $cityValue) {
+                    $cityId = $city->getCity();
+                }
+                $values[$city->getCity()] = $city->getCity();
+            }
+        }
+
+        $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');
+        $cityAttribute = $addressForm->getAttribute('city');
+        if ($countryId == 'RO') {
+            $this->_form = $this->_form->removeField('city');
+            foreach($this->_form->getElements() as $fieldset){
+                $fieldset->removeField('city');
+                $fieldset->addField('city', 'select', [
+                    'name' => 'order[billing_address]' . '[' . $cityAttribute->getAttributeCode() . ']',
+                    'label' => __($cityAttribute->getStoreLabel()),
+                    'class' => $this->getValidationClasses($cityAttribute),
+                    'required' => $cityAttribute->isRequired(),
+                    'values' => $values,
+                    'value' => $cityId
+                ], 'region');
+            }
+
+        }
+
+        return $this;
+    }*/
+
+protected function _prepareForm()
+{
+    parent::_prepareForm();
+
+    $formValues = (array)$this->getFormValues();
+
+    $countryElement  = $this->_form->getElement('country_id');
+    $regionIdElement = $this->_form->getElement('region_id');
+
+    $regionId  = $regionIdElement ? (int)$regionIdElement->getValue() : 0;
+    $countryId = $countryElement ? (string)$countryElement->getValue() : '';
+
+    // FIX 1: safe read
+    $cityValue = (string)($formValues['city'] ?? '');
+
+    $cityId  = null;
+    //$values  = [__('Please select city')];
+    $values = [['value' => '', 'label' => __('Please select city')]];
+
+    if ($regionId) {
+        // FIX 2: use the criteria builder that exists on the parent block
+        $searchCriteria = $this->criteriaBuilder
+            ->addFilter('region_id', $regionId)
+            ->create();
+
+        $cities = $this->cityRepository->getList($searchCriteria)->getItems();
+        foreach ($cities as $city) {
+            $cityName = (string)$city->getCity();
+
+            if ($cityName !== '') {
+                if ($cityName === $cityValue) {
+                    $cityId = $cityName;
+                }
+                $values[$cityName] = $cityName;
+            }
+        }
+    }
+
+    $addressForm = $this->_customerFormFactory->create('customer_address', 'adminhtml_customer_address');
+    $cityAttribute = $addressForm->getAttribute('city');
+
+    if ($countryId === 'RO' && $cityAttribute) {
+        // remove city field from the main form + fieldsets (your existing logic)
+        $this->_form = $this->_form->removeField('city');
+        foreach ($this->_form->getElements() as $fieldset) {
+            $fieldset->removeField('city');
+            $fieldset->addField(
+                'city',
+                'select',
+                [
+                    'name'     => 'order[billing_address][' . $cityAttribute->getAttributeCode() . ']',
+                    'label'    => __($cityAttribute->getStoreLabel()),
+                    'class'    => $this->getValidationClasses($cityAttribute),
+                    'required' => (bool)$cityAttribute->isRequired(),
+                    'values'   => $values,
+                    'value'    => $cityId
+                ],
+                'region'
+            );
+        }
+    }
+
+    return $this;
+}
+
+}