Skip to content

Commit cc65df0

Browse files
author
Viktor Tymchynskyi
committed
Merge remote-tracking branch 'origin/MAGETWO-34273' into develop
2 parents 242d6f5 + 085b26a commit cc65df0

File tree

2 files changed

+1
-2
lines changed
  • app/code/Magento/OfflinePayments/etc/adminhtml
  • dev/tools/Magento/Tools/Migration/factory_table_names

2 files changed

+1
-2
lines changed

app/code/Magento/OfflinePayments/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<label>Automatically Invoice All Items</label>
167167
<source_model>Magento\Payment\Model\Source\Invoice</source_model>
168168
<depends>
169-
<field id="order_status" separator=",">processing,processed_ogone</field>
169+
<field id="order_status" separator=",">processing</field>
170170
</depends>
171171
</field>
172172
<field id="sort_order" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">

dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@
230230
'oauth/consumer' => 'oauth_consumer',
231231
'oauth/nonce' => 'oauth_nonce',
232232
'oauth/token' => 'oauth_token',
233-
'ogone/api_debug' => 'ogone_api_debug',
234233
'oscommerce/catalog_category' => 'catalog_category_entity',
235234
'oscommerce/catalog_product_website' => 'catalog_product_website',
236235
'oscommerce/oscommerce' => 'oscommerce_import',

0 commit comments

Comments
 (0)