Merge remote-tracking branch 'mainline/2.3.3-develop' into MC-19194

Author: danielrenaud

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php

@@ -111,20 +111,4 @@ public function getShippingLabel()
         }
         return $label;
     }
-
-    /**
-     * Get update totals url.
-     *
-     * @return string
-     */
-    public function getUpdateTotalsUrl(): string
-    {
-        return $this->getUrl(
-            'sales/*/updateQty',
-            [
-                'order_id' => $this->getSource()->getOrderId(),
-                'invoice_id' => $this->getRequest()->getParam('invoice_id', null),
-            ]
-        );
-    }
 }

app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Items.php

@@ -56,12 +56,7 @@ protected function _prepareLayout()
         $this->addChild(
             'update_button',
             \Magento\Backend\Block\Widget\Button::class,
-            ['label' => __('Update Qty\'s'), 'class' => 'update-button secondary', 'onclick' => $onclick]
-        );
-        $this->addChild(
-            'update_totals_button',
-            \Magento\Backend\Block\Widget\Button::class,
-            ['label' => __('Update Totals'), 'class' => 'update-totals-button secondary', 'onclick' => $onclick]
+            ['label' => __('Update Qty\'s'), 'class' => 'update-button', 'onclick' => $onclick]
         );
 
         if ($this->getCreditmemo()->canRefund()) {
@@ -181,16 +176,6 @@ public function getUpdateButtonHtml()
         return $this->getChildHtml('update_button');
     }
 
-    /**
-     * Get update totals button html
-     *
-     * @return string
-     */
-    public function getUpdateTotalsButtonHtml(): string
-    {
-        return $this->getChildHtml('update_totals_button');
-    }
-
     /**
      * Get update url
      *

app/code/Magento/Sales/Test/Mftf/Test/AdminCheckingCreditMemoUpdateTotalsTest.xml

@@ -18,6 +18,9 @@
             <testCaseId value="MC-18159"/>
             <useCaseId value="MC-17003"/>
             <group value="sales"/>
+            <skip>
+                <issueId value="MC-17003"/>
+            </skip>
         </annotations>
         <before>
             <!--Create product-->

app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml

@@ -100,7 +100,6 @@
                 <span class="title"><?= $block->escapeHtml(__('Refund Totals')) ?></span>
             </div>
             <?= $block->getChildHtml('creditmemo_totals') ?>
-            <div class="totals-actions"><?= $block->getUpdateTotalsButtonHtml() ?></div>
             <div class="order-totals-actions">
                 <div class="field choice admin__field admin__field-option field-append-comments">
                     <input id="notify_customer"
@@ -140,9 +139,8 @@ require(['jquery'], function(jQuery){
 
 //<![CDATA[
 var submitButtons = jQuery('.submit-button');
-var updateButtons = jQuery('.update-button,.update-totals-button');
-var fields = jQuery('.qty-input,.order-subtotal-table input[type="text"]');
-
+var updateButtons = jQuery('.update-button');
+var fields = jQuery('.qty-input');
 function enableButtons(buttons) {
     buttons.removeClass('disabled').prop('disabled', false);
 }

app/code/Magento/Theme/Test/Mftf/Test/AdminWatermarkUploadTest.xml

@@ -16,6 +16,9 @@
             <description value="Watermark images should be able to be uploaded in the admin"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-5796"/>
+            <skip>
+                <issueId value="MC-18496"/>
+            </skip>
             <group value="Watermark"/>
         </annotations>
         <before>

app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_total.less

@@ -22,10 +22,6 @@
     }
 }
 
-.totals-actions {
-    text-align: right;
-}
-
 .order-totals-actions {
     margin-top: @indent__s;
     .actions {

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Creditmemo/Totals.php

@@ -27,34 +27,6 @@ class Totals extends \Magento\Sales\Test\Block\Adminhtml\Order\Totals
      */
     protected $capture = '[name="invoice[capture_case]"]';
 
-    /**
-     * Refund Shipping css selector.
-     *
-     * @var string
-     */
-    private $refundShippingSelector = '#shipping_amount';
-
-    /**
-     * Adjustment Refund css selector.
-     *
-     * @var string
-     */
-    private $adjustmentRefundSelector = '#adjustment_positive';
-
-    /**
-     * Adjustment Fee css selector.
-     *
-     * @var string
-     */
-    private $adjustmentFeeSelector = '#adjustment_negative';
-
-    /**
-     * Update Totals button css selector.
-     *
-     * @var string
-     */
-    private $updateTotalsSelector = '.update-totals-button';
-
     /**
      * Submit invoice.
      *
@@ -85,44 +57,4 @@ public function setCaptureOption($option)
     {
         $this->_rootElement->find($this->capture, Locator::SELECTOR_CSS, 'select')->setValue($option);
     }
-
-    /**
-     * Get Refund Shipping input element.
-     *
-     * @return \Magento\Mtf\Client\ElementInterface
-     */
-    public function getRefundShippingElement()
-    {
-        return $this->_rootElement->find($this->refundShippingSelector, Locator::SELECTOR_CSS);
-    }
-
-    /**
-     * Get Adjustment Refund input element.
-     *
-     * @return \Magento\Mtf\Client\ElementInterface
-     */
-    public function getAdjustmentRefundElement()
-    {
-        return $this->_rootElement->find($this->adjustmentRefundSelector, Locator::SELECTOR_CSS);
-    }
-
-    /**
-     * Get Adjustment Fee input element.
-     *
-     * @return \Magento\Mtf\Client\ElementInterface
-     */
-    public function getAdjustmentFeeElement()
-    {
-        return $this->_rootElement->find($this->adjustmentFeeSelector, Locator::SELECTOR_CSS);
-    }
-
-    /**
-     * Click update totals button.
-     *
-     * @return void
-     */
-    public function clickUpdateTotals()
-    {
-        $this->_rootElement->find($this->updateTotalsSelector)->click();
-    }
 }

dev/tests/functional/tests/app/Magento/Sales/Test/TestStep/CreateCreditMemoStep.php

@@ -95,12 +95,8 @@ public function run()
             if ($this->compare($items, $refundData)) {
                 $this->orderCreditMemoNew->getFormBlock()->updateQty();
             }
-            $hasChangeTotals = $this->isTotalsDataChanged($refundData);
-            $this->orderCreditMemoNew->getFormBlock()->fillFormData($refundData);
-            if ($hasChangeTotals) {
-                $this->orderCreditMemoNew->getTotalsBlock()->clickUpdateTotals();
-            }
 
+            $this->orderCreditMemoNew->getFormBlock()->fillFormData($refundData);
             $this->orderCreditMemoNew->getFormBlock()->submit();
         }
 
@@ -120,30 +116,4 @@ protected function getCreditMemoIds()
         $this->salesOrderView->getOrderForm()->openTab('creditmemos');
         return $this->salesOrderView->getOrderForm()->getTab('creditmemos')->getGridBlock()->getIds();
     }
-
-    /**
-     * Is totals data changed.
-     *
-     * @param array $data
-     * @return bool
-     */
-    private function isTotalsDataChanged(array $data): bool
-    {
-        $compareData = [
-            'shipping_amount' =>
-                $this->orderCreditMemoNew->getTotalsBlock()->getRefundShippingElement()->getValue(),
-            'adjustment_positive' =>
-                $this->orderCreditMemoNew->getTotalsBlock()->getAdjustmentRefundElement()->getValue(),
-            'adjustment_negative' =>
-                $this->orderCreditMemoNew->getTotalsBlock()->getAdjustmentFeeElement()->getValue(),
-        ];
-
-        foreach ($compareData as $fieldName => $fieldValue) {
-            if (isset($data['form_data'][$fieldName]) && $fieldValue != $data['form_data'][$fieldName]) {
-                return true;
-            }
-        }
-
-        return false;
-    }
 }

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml

@@ -21,6 +21,7 @@
         </allow>
         <deny>
             <tag group="stable" value="no" />
+            <tag group="mftf_migrated" value="yes" />
         </deny>
     </rule>
 </config>

lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php

@@ -21,7 +21,6 @@ class ConfigOptionsListConstants
     const CONFIG_PATH_CRYPT_KEY = 'crypt/key';
     const CONFIG_PATH_SESSION_SAVE = 'session/save';
     const CONFIG_PATH_RESOURCE_DEFAULT_SETUP = 'resource/default_setup/connection';
-    const CONFIG_PATH_DB_CONNECTION_DEFAULT_DRIVER_OPTIONS = 'db/connection/default/driver_options';
     const CONFIG_PATH_DB_CONNECTION_DEFAULT = 'db/connection/default';
     const CONFIG_PATH_DB_CONNECTIONS = 'db/connection';
     const CONFIG_PATH_DB_PREFIX = 'db/table_prefix';
@@ -65,10 +64,6 @@ class ConfigOptionsListConstants
     const INPUT_KEY_DB_MODEL = 'db-model';
     const INPUT_KEY_DB_INIT_STATEMENTS = 'db-init-statements';
     const INPUT_KEY_DB_ENGINE = 'db-engine';
-    const INPUT_KEY_DB_SSL_KEY = 'db-ssl-key';
-    const INPUT_KEY_DB_SSL_CERT = 'db-ssl-cert';
-    const INPUT_KEY_DB_SSL_CA = 'db-ssl-ca';
-    const INPUT_KEY_DB_SSL_VERIFY = 'db-ssl-verify';
     const INPUT_KEY_RESOURCE = 'resource';
     const INPUT_KEY_SKIP_DB_VALIDATION = 'skip-db-validation';
     const INPUT_KEY_CACHE_HOSTS = 'http-cache-hosts';
@@ -109,20 +104,6 @@ class ConfigOptionsListConstants
     const KEY_MODEL = 'model';
     const KEY_INIT_STATEMENTS = 'initStatements';
     const KEY_ACTIVE = 'active';
-    const KEY_DRIVER_OPTIONS = 'driver_options';
-    /**#@-*/
-
-    /**#@+
-     * Array keys for database driver options configurations
-     */
-    const KEY_MYSQL_SSL_KEY = \PDO::MYSQL_ATTR_SSL_KEY;
-    const KEY_MYSQL_SSL_CERT = \PDO::MYSQL_ATTR_SSL_CERT;
-    const KEY_MYSQL_SSL_CA = \PDO::MYSQL_ATTR_SSL_CA;
-    /**
-     * Constant \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT cannot be used as it was introduced in PHP 7.1.4
-     * and Magento 2 is currently supporting PHP 7.1.3.
-     */
-    const KEY_MYSQL_SSL_VERIFY = 1014;
     /**#@-*/
 
     /**