Skip to content

Commit

Permalink
🔃 [EngCom] Public Pull Requests - 2.2-develop
Browse files Browse the repository at this point in the history 
Accepted Public Pull Requests:
 - #16576: [Backport] Declare module namespace before template path name (by @mageprince)
 - #16557: Updated SynonymGroup.xml (by @sanganinamrata)
 - #16553: Update mini-cart checkout translations (by @JeroenVanLeusden)
 - #16549: Corrected function comment (by @sanganinamrata)
 - #16524: Clear converted file data  (by @gelanivishal)
 - #16517: Fix responsive tables showing broken heading (by @LordZardeck)
 - #16393: Rework for PR #16222 . (by @phoenix128)
 - #16090: Added and removed unnecessary translation for label/comment tags (by @yogeshks)
 - #16581: Removed double occurrences from files. (by @sanganinamrata)
 - #15909: [Backport] Fix for Wrong price amount on product page (by @gelanivishal)


Fixed GitHub Issues:
 - #11717: Wrong price amount on product page (reported by @HirokazuNishi) has been fixed in #15909 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. ea16687
     2. 8a4d966
  • Loading branch information
Stanislav Idolov authored Jul 7, 2018
2 parents aa6b899 + 575e071 commit d91c0c0
Show file tree
Hide file tree
Showing 82 changed files with 219 additions and 144 deletions.
28 changes: 14 additions & 14 deletions app/code/Magento/Backend/etc/adminhtml/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</group>
<group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Image Processing Settings</label>
<field id="default_adapter" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<field id="default_adapter" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<label>Image Adapter</label>
<source_model>Magento\Config\Model\Config\Source\Image\Adapter</source_model>
<backend_model>Magento\Config\Model\Config\Backend\Image\Adapter</backend_model>
Expand Down Expand Up @@ -298,11 +298,11 @@
<label>Disable Email Communications</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
<field id="host" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="host" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Host</label>
<comment>For Windows server only.</comment>
</field>
<field id="port" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="port" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Port (25)</label>
<comment>For Windows server only.</comment>
</field>
Expand Down Expand Up @@ -419,7 +419,7 @@
<![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
</comment>
</field>
<field id="redirect_to_base" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Auto-redirect to Base URL</label>
<source_model>Magento\Config\Model\Config\Source\Web\Redirect</source_model>
<comment>I.e. redirect from http://example.com/store/ to http://www.example.com/store/</comment>
Expand All @@ -432,15 +432,15 @@
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
</group>
<group id="unsecure" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<group id="unsecure" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Base URLs</label>
<comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/</comment>
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Base URL</label>
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>Specify URL or {{base_url}} placeholder.</comment>
</field>
<field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Base Link URL</label>
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
Expand All @@ -450,21 +450,21 @@
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
</field>
<field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Base URL for User Media Files</label>
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
</field>
</group>
<group id="secure" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Base URLs (Secure)</label>
<comment>Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/</comment>
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Secure Base URL</label>
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
</field>
<field id="base_link_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Secure Base Link URL</label>
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
Expand All @@ -474,24 +474,24 @@
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
</field>
<field id="base_media_url" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Secure Base URL for User Media Files</label>
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
</field>
<field id="use_in_frontend" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Use Secure URLs on Storefront</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
<comment>Enter https protocol to use Secure URLs on Storefront.</comment>
</field>
<field id="use_in_adminhtml" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<field id="use_in_adminhtml" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
<label>Use Secure URLs in Admin</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
<comment>Enter https protocol to use Secure URLs in Admin.</comment>
</field>
<field id="enable_hsts" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="enable_hsts" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Enable HTTP Strict Transport Security (HSTS)</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
Expand All @@ -501,7 +501,7 @@
<field id="use_in_adminhtml">1</field>
</depends>
</field>
<field id="enable_upgrade_insecure" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="enable_upgrade_insecure" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Upgrade Insecure Requests</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<backend_model>Magento\Config\Model\Config\Backend\Secure</backend_model>
Expand Down
22 changes: 11 additions & 11 deletions app/code/Magento/Braintree/etc/adminhtml/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,18 @@
<label>Vault Title</label>
<config_path>payment/braintree_cc_vault/title</config_path>
</field>
<field id="merchant_account_id" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="merchant_account_id" translate="label comment" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Merchant Account ID</label>
<comment>If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.</comment>
<config_path>payment/braintree/merchant_account_id</config_path>
</field>
<field id="fraudprotection" translate="label" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="fraudprotection" translate="label comment" type="select" sortOrder="34" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Advanced Fraud Protection</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section</comment>
<config_path>payment/braintree/fraudprotection</config_path>
</field>
<field id="kount_id" translate="label" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="kount_id" translate="label comment" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Kount Merchant ID</label>
<comment><![CDATA[Used for direct fraud tool integration. Make sure you also contact <a href="mailto:accounts@braintreepayments.com">accounts@braintreepayments.com</a> to setup your Kount account.]]></comment>
<depends>
Expand All @@ -108,7 +108,7 @@
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/braintree/debug</config_path>
</field>
<field id="useccv" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="useccv" translate="label comment" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
<label>CVV Verification</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.</comment>
Expand Down Expand Up @@ -149,7 +149,7 @@
<group id="braintree_paypal" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
<label>PayPal through Braintree</label>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
<field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="title" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Title</label>
<config_path>payment/braintree_paypal/title</config_path>
<comment>It is recommended to set this value to "PayPal" per store views.</comment>
Expand Down Expand Up @@ -187,7 +187,7 @@
<can_be_empty>1</can_be_empty>
<config_path>payment/braintree_paypal/specificcountry</config_path>
</field>
<field id="require_billing_address" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="require_billing_address" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Require Customer's Billing Address</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/braintree_paypal/require_billing_address</config_path>
Expand All @@ -203,7 +203,7 @@
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/braintree_paypal/debug</config_path>
</field>
<field id="display_on_shopping_cart" translate="label" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
<field id="display_on_shopping_cart" translate="label comment" type="select" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Display on Shopping Cart</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<config_path>payment/braintree_paypal/display_on_shopping_cart</config_path>
Expand Down Expand Up @@ -239,29 +239,29 @@
<config_path>payment/braintree/verify_specific_countries</config_path>
</field>
</group>
<group id="braintree_dynamic_descriptor" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
<group id="braintree_dynamic_descriptor" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="50">
<label>Dynamic Descriptors</label>
<comment><![CDATA[Dynamic descriptors are sent on a per-transaction basis and define what will appear on your customers credit card statements for a specific purchase.
The clearer the description of your product, the less likely customers will issue chargebacks due to confusion or non-recognition.
Dynamic descriptors are not enabled on all accounts by default. If you receive a validation error of 92203 or if your dynamic descriptors are not displaying as expected,
please <a href="mailto:support@getbraintree.com">Braintree Support</a>.]]></comment>
<frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
<field id="name" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="name" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Name</label>
<config_path>payment/braintree/descriptor_name</config_path>
<comment>
The value in the business name field of a customer's statement. Company name/DBA section must be either 3, 7 or 12 characters
and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
</comment>
</field>
<field id="phone" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="phone" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Phone</label>
<config_path>payment/braintree/descriptor_phone</config_path>
<comment>
The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
</comment>
</field>
<field id="url" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="url" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>URL</label>
<config_path>payment/braintree/descriptor_url</config_path>
<comment>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
protected $_template = 'default.phtml';
protected $_template = 'Magento_Captcha::default.phtml';

/**
* @var string
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template
*
* @var string
*/
protected $_template = 'catalog/category/edit/assign_products.phtml';
protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml';

/**
* @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @var string
*/
protected $_template = 'catalog/category/tree.phtml';
protected $_template = 'Magento_Catalog::catalog/category/tree.phtml';

/**
* @var \Magento\Backend\Model\Auth\Session
Expand Down
Loading

0 comments on commit d91c0c0

Please sign in to comment.