Skip to content

Commit

Permalink
some code fixes, remove class names, improve ternary operator
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonfres
jonfres committed Jul 3, 2017
1 parent d2d5028 commit 32f80ff
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 180 deletions.
5 changes: 1 addition & 4 deletions app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
use Magento\InventoryApi\Api\StockRepositoryInterface;
use Magento\InventoryApi\Api\Data\StockInterface;

/**
* Class Edit
*/
class Edit extends Action
{
/**
Expand All @@ -42,7 +39,7 @@ public function __construct(
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function execute()
{
Expand Down
5 changes: 1 addition & 4 deletions app/code/Magento/Inventory/Controller/Adminhtml/Stock/Index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
use Magento\Backend\Model\View\Result\Page;
use Magento\Framework\Controller\ResultFactory;

/**
* Class Index
*/
class Index extends Action
{
/**
Expand All @@ -20,7 +17,7 @@ class Index extends Action
const ADMIN_RESOURCE = 'Magento_Inventory::stock';

/**
* {@inheritdoc}
* @inheritdoc
*/
public function execute()
{
Expand Down
5 changes: 1 addition & 4 deletions app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
use Magento\Backend\Model\View\Result\Page;
use Magento\Framework\Controller\ResultFactory;

/**
* Class NewAction
*/
class NewAction extends Action
{
/**
Expand All @@ -21,7 +18,7 @@ class NewAction extends Action
const ADMIN_RESOURCE = 'Magento_Inventory::stock';

/**
* {@inheritdoc}
* @inheritdoc
*/
public function execute()
{
Expand Down
10 changes: 4 additions & 6 deletions app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
use Magento\InventoryApi\Api\Data\StockInterfaceFactory;
use Magento\InventoryApi\Api\StockRepositoryInterface;

/**
* Class Save
*/
class Save extends Action
{
/**
Expand Down Expand Up @@ -75,16 +72,15 @@ public function __construct(
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function execute()
{
$resultRedirect = $this->resultRedirectFactory->create();
$requestData = $this->getRequest()->getParam('general');
if ($this->getRequest()->isPost() && $requestData) {
try {
$stockId = !empty($requestData[StockInterface::STOCK_ID])
? $requestData[StockInterface::STOCK_ID] : null;
$stockId = $requestData[StockInterface::STOCK_ID]??null;

$stockId = $this->processSave($stockId, $requestData);
// Keep data for plugins on Save controller. Now we can not call separate services from one form.
Expand Down Expand Up @@ -114,6 +110,8 @@ public function execute()
}

/**
* Saves inventory stock and returns stock id
*
* @param int $stockId
* @param array $requestData
* @return int
Expand Down
162 changes: 0 additions & 162 deletions app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,168 +106,6 @@
</editor>
</settings>
</column>
<!--<column name="contact_name" sortOrder="40">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
</editor>
<label translate="true">Contact Name</label>
<visible>false</visible>
</settings>
</column>
<column name="email" sortOrder="50">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="validate-email" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Email</label>
<visible>false</visible>
</settings>
</column>
<column name="enabled" component="Magento_Ui/js/grid/columns/select" sortOrder="50">
<settings>
<label translate="true">Is Enabled</label>
<filter>select</filter>
<dataType>select</dataType>
<options>
<option name="0" xsi:type="array">
<item name="value" xsi:type="number">1</item>
<item name="label" xsi:type="string" translate="true">Enabled</item>
</option>
<option name="1" xsi:type="array">
<item name="value" xsi:type="number">0</item>
<item name="label" xsi:type="string" translate="true">Disabled</item>
</option>
</options>
</settings>
</column>
<column name="latitude" sortOrder="60">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="validate-number" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Latitude</label>
<visible>false</visible>
</settings>
</column>
<column name="longitude" sortOrder="70">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="validate-number" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Longitude</label>
<visible>false</visible>
</settings>
</column>
<column name="country_id" component="Magento_Ui/js/grid/columns/select" sortOrder="80">
<settings>
<options class="Magento\Directory\Model\Config\Source\Country"/>
<visible>false</visible>
<filter>select</filter>
<dataType>select</dataType>
<label translate="true">Country</label>
</settings>
</column>
<column name="region_id" component="Magento_Ui/js/grid/columns/select" sortOrder="90">
<settings>
<options class="Magento\Inventory\Model\OptionSource\RegionSource"/>
<visible>false</visible>
<filter>select</filter>
<dataType>select</dataType>
<label translate="true">State/Province</label>
</settings>
</column>
<column name="region" sortOrder="100">
<settings>
<filter>text</filter>
<label translate="true">State/Province</label>
<visible>false</visible>
</settings>
</column>
<column name="city" sortOrder="110">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
</editor>
<label translate="true">City</label>
<visible>false</visible>
</settings>
</column>
<column name="street" sortOrder="120">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
</editor>
<label translate="true">Street</label>
<visible>false</visible>
</settings>
</column>
<column name="postcode" sortOrder="130">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="required-entry" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Postcode</label>
<visible>false</visible>
</settings>
</column>
<column name="phone" sortOrder="140">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="validate-phoneStrict" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Phone</label>
<visible>false</visible>
</settings>
</column>
<column name="fax" sortOrder="150">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="validate-fax" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Fax</label>
<visible>false</visible>
</settings>
</column>
<column name="priority" sortOrder="160">
<settings>
<filter>text</filter>
<editor>
<editorType>text</editorType>
<validation>
<rule name="validate-integer" xsi:type="boolean">true</rule>
</validation>
</editor>
<label translate="true">Priority</label>
</settings>
</column>-->
<actionsColumn name="actions" class="Magento\Backend\Ui\Component\Listing\Column\EditAction">
<argument name="data" xsi:type="array">
<item name="config" xsi:type="array">
Expand Down

0 comments on commit 32f80ff

Please sign in to comment.