Skip to content

Fixed ACL configuration. Added comments as translatable in Store Config. #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vmalyk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed ACL configuration. Added comments as translatable in Store Config. #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions etc/acl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
<acl>
<resources>
<resource id="Magento_Backend::admin">
<resource id="Magento_Sales::sales">
<resource id="DpdConnect_Shipping::dpd_menu" title="DPD" translate="title" sortOrder="10">
<resource id="DpdConnect_Shipping::batch_menu" title="DPD Batches" translate="title" sortOrder="11" />
<resource id="DpdConnect_Shipping::label_menu" title="DPD Labels" translate="title" sortOrder="12" />
</resource>
</resource>
<resource id="Magento_Backend::stores">
<resource id="Magento_Backend::stores_settings">
<resource id="Magento_Config::config">
<resource id="DpdConnect_Shipping::configuration" title="DPD Parcelservice" translate="title" sortOrder="340" />
</resource>
</resource>
</resource>
</resource>
</resources>
</acl>
</config>
14 changes: 0 additions & 14 deletions etc/adminhtml/acl.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion etc/adminhtml/system.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<section id="dpdshipping" translate="label" type="text" sortOrder="340" showInDefault="1" showInWebsite="1" showInStore="1">
<label>DPD Parcelservice</label>
<tab>sales</tab>
<resource>Sales_DPDShipping::configuration</resource>
<resource>DpdConnect_Shipping::configuration</resource>
<class>dpd-shipping</class>

<group id="header" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system/dpd/advanced.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<label>Save labels as file</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
<field id="label_path" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1"
<field id="label_path" translate="label comment" type="text" sortOrder="60" showInDefault="1" showInWebsite="1"
showInStore="0">
<label>Store labels in</label>
<depends>
Expand Down
4 changes: 2 additions & 2 deletions etc/adminhtml/system/dpd/api.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>

<field id="async_threshold" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="async_threshold" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Async threshold</label>
<comment>Mass generation of labels above this number will be done Async</comment>
<depends>
<field id="dpdshipping/api/async_enabled">1</field>
</depends>
</field>

<field id="endpoint" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="endpoint" translate="label comment" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Endpoint (ONLY use this if instructed, otherwise leave empty)</label>
<comment>The DPD Connect endpoint to use (useful for development)</comment>
</field>
Expand Down
10 changes: 5 additions & 5 deletions etc/adminhtml/system/dpd/product_attribute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@
<group id="product_attribute" translate="label" sortOrder="50" showInDefault="1" showInWebsite="1"
showInStore="0">
<label>Product attributes</label>
<field id="hs_code" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<field id="hs_code" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Harmonized System code</label>
<source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
<comment>The product Harmonized System code</comment>
</field>

<field id="dimension_length" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<field id="dimension_length" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Product Length</label>
<source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
<comment>The product length attribute</comment>
</field>

<field id="dimension_width" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<field id="dimension_width" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Product Width</label>
<source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
<comment>The product width attribute</comment>
</field>

<field id="dimension_height" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<field id="dimension_height" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Product Height</label>
<source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
<comment>The product height attribute</comment>
</field>

<field id="dimension_depth" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<field id="dimension_depth" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
<label>Product Depth</label>
<source_model>DpdConnect\Shipping\Config\Source\Settings\ProductAttribute</source_model>
<comment>The product depth attribute</comment>
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system/dpd/shipping_origin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
-->
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
<group id="shipping_origin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
<group id="shipping_origin" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1"
showInStore="1">
<label>Shipping Origin</label>
<comment>These settings are used as Sender on shipping labels</comment>
Expand Down
4 changes: 2 additions & 2 deletions etc/adminhtml/system/dpd/store_information.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
-->
<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
<group id="store_information" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
<group id="store_information" translate="label" type="text comment" sortOrder="30" showInDefault="1" showInWebsite="1"
showInStore="1">
<comment>The store address is used in shipping lists</comment>

Expand Down Expand Up @@ -77,7 +77,7 @@
showInStore="1">
<label>Eori number</label>
</field>
<field id="sprn" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
<field id="sprn" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1"
showInStore="1">
<label>HMRC number</label>
<comment>Mandatory if the value of the parcel is ≤ £ 135.</comment>
Expand Down