diff --git a/view/adminhtml/ui_component/payone_orders_grid.xml b/view/adminhtml/ui_component/payone_orders_grid.xml
index f026ce26..18fe655d 100644
--- a/view/adminhtml/ui_component/payone_orders_grid.xml
+++ b/view/adminhtml/ui_component/payone_orders_grid.xml
@@ -28,436 +28,282 @@
-
- payone_orders_grid.sales_order_grid_data_source
- - payone_orders_grid.sales_order_grid_data_source
-
- - sales_order_columns
- -
-
-
-
- add
- - Create New Order
- - primary
- - sales/order_create/start
-
-
-
- Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
- sales_order_grid_data_source
- entity_id
- id
-
- -
-
-
-
-
- -
-
- Magento_Ui/js/grid/provider
-
-
+
+
+
+
+ sales_order_columns
+
+ payone_orders_grid.sales_order_grid_data_source
+
+
+
+
+
+
+ Magento_Sales::sales_order
+
+
+ id
+ main_table.entity_id
+
+
-
-
- -
-
- ui/grid/toolbar
-
-
-
-
- -
-
-
-
- payone_orders_grid
-
-
-
-
-
-
- -
-
-
-
- payone_orders_grid.sales_order_grid.sales_order_columns
-
- - Magento_Ui/js/grid/controls/columns
- - dataGridActions
-
-
-
-
-
- -
-
- payone_orders_grid.sales_order_grid.sales_order_columns.ids
-
-
-
-
-
- -
-
- payone_orders_grid.sales_order_grid_data_source
- - payone_orders_grid.sales_order_grid.listing_top.listing_filters_chips
- -
-
- payone_orders_grid.sales_order_grid.listing_top.bookmarks
- - current.search
-
-
-
-
+
+
+ true
+
+
+
+
-
- -
-
- payone_orders_grid.sales_order_grid.sales_order_columns
- -
-
- payone_orders_grid.sales_order_grid.listing_top.bookmarks
- - current.filters
-
- -
-
- payone_orders_grid.sales_order_grid.listing_top.listing_filters
- -
-
- payone_orders_grid.sales_order_grid.sales_order_columns.${ $.index }:visible
-
-
-
-
-
-
- Magento\Store\Ui\Component\Listing\Column\Store\Options
-
-
- -
-
- All Store Views
- - store_id
- - Purchase Point
-
-
+
+
+
+ All Store Views
+
+ store_id
+
+ ns = ${ $.ns }, index = ${ $.index }:visible
+
+
-
-
- -
-
- payone_orders_grid.sales_order_grid.sales_order_columns.ids
- - entity_id
-
-
+
-
- -
-
- cancel
- - Cancel
-
-
+
+
+ cancel
+
+
-
- -
-
- hold_order
- - Hold
-
-
+
+
+ hold_order
+
+
-
- -
-
- unhold_order
- - Unhold
-
-
+
+
+ unhold_order
+
+
-
- -
-
- pdfinvoices_order
- - Print Invoices
-
-
+
+
+ pdfinvoices_order
+
+
-
- -
-
- pdfshipments_order
- - Print Packing Slips
-
-
+
+
+ pdfshipments_order
+
+
-
- -
-
- pdfcreditmemos_order
- - Print Credit Memos
-
-
+
+
+ pdfcreditmemos_order
+
+
-
- -
-
- pdfdocs_order
- - Print All
-
-
+
+
+ pdfdocs_order
+
+
-
- -
-
- print_shipping_label
- - Print Shipping Labels
-
-
+
+
+ print_shipping_label
+
+
-
-
- -
-
-
-
- payone_orders_grid.sales_order_grid.listing_top.bookmarks
- - current.paging
-
- - payone_orders_grid.sales_order_grid.sales_order_columns.ids
-
-
-
-
+
+
-
- -
-
-
-
- payone_orders_grid.sales_order_grid.listing_top.bookmarks
- - current
-
- -
-
-
-
- payone_orders_grid.sales_order_grid.sales_order_columns.actions
- - applyAction
- -
-
- view
- - ${ $.$data.rowIndex }
-
+
+
+
+ - payone_orders_grid.sales_order_grid.sales_order_columns.actions
+ - applyAction
+ -
+
- view
+ - ${ $.$data.rowIndex }
- -
-
- payone_orders_grid.sales_order_grid.listing_top.bookmarks
- - columns.${ $.index }
- - current.${ $.storageConfig.root}
-
-
-
-
+
+
+
-
- -
-
- entity_id
-
-
+
+ entity_id
+
-
- -
-
- text
- - desc
- - ID
-
-
+
+ text
+
+
-
- -
-
- text
- - Txid
-
-
+
+ text
+
+
-
- -
-
- text
- - Refnr
-
-
+
+ text
+
+
-
- -
-
- text
- - Auth-mode
-
-
+
+ text
+
+
-
- -
-
- text
- - PAYONE Status
-
-
+
+ text
+
+
-
-
- - Magento\Sales\Ui\Component\Listing\Column\Status\Options
- -
-
- select
- - Magento_Ui/js/grid/columns/select
- - select
- - Status
-
-
+
+
+ select
+
+ select
+
+
-
- -
-
- text
- - Bill-to Name
-
-
+
+ text
+
+
-
- -
-
- text
- - Ship-to Name
-
-
+
+ text
+
+
-
- -
-
- textRange
- - Grand Total (Purchased)
-
-
+
+ textRange
+
+
-
-
- -
-
- dateRange
- - Magento_Ui/js/grid/columns/date
- - date
- - Purchase Date
-
-
-
-
-
- - Magento\Sales\Ui\Component\Listing\Column\Status\Options
- -
-
- select
- - Magento_Ui/js/grid/columns/select
- - select
- - Status
-
-
+
+
+ dateRange
+ date
+
+ desc
+
-
- -
-
- text
- - ui/grid/cells/html
- - false
- - Billing Address
-
-
+
+ text
+
+ ui/grid/cells/html
+ false
+
-
- -
-
- text
- - ui/grid/cells/html
- - false
- - Shipping Address
-
-
+
+ text
+
+ ui/grid/cells/html
+ false
+
-
- -
-
- text
- - false
- - Shipping Information
-
-
+
+ text
+
+ false
+
-
- -
-
- text
- - false
- - Customer Email
-
-
+
+ text
+
+ false
+
-
-
- - Magento\Customer\Ui\Component\Listing\Column\Group\Options
- -
-
- select
- - Magento_Ui/js/grid/columns/select
- - false
- - select
- - Customer Group
-
-
+
+
+ select
+
+ select
+
+ false
+
-
- -
-
- textRange
- - false
- - Subtotal
-
-
+
+ textRange
+
+ false
+
-
- -
-
- textRange
- - false
- - Shipping and Handling
-
-
+
+ textRange
+
+ false
+
-
- -
-
- text
- - false
- - Customer Name
-
-
+
+ text
+
+ false
+
-
-
- - Magento\Payment\Ui\Component\Listing\Column\Method\Options
- -
-
- select
- - Magento_Ui/js/grid/columns/select
- - false
- - select
- - Payment Method
-
-
+
+
+ select
+
+ select
+
+ false
+
-
-
- -
-
- textRange
- - false
- - Total Refunded
-
-
+
+
+ textRange
+
+ false
+
-
-
- entity_id
- sales/order/view
- order_id
+
+ entity_id
+
diff --git a/view/adminhtml/ui_component/payone_protocol_api_grid.xml b/view/adminhtml/ui_component/payone_protocol_api_grid.xml
index 55c72880..5411fe78 100644
--- a/view/adminhtml/ui_component/payone_protocol_api_grid.xml
+++ b/view/adminhtml/ui_component/payone_protocol_api_grid.xml
@@ -28,180 +28,103 @@
-
- payone_protocol_api_grid.payone_protocol_api_grid_data_source
- - payone_protocol_api_grid.payone_protocol_api_grid_data_source
- - payone_protocol_api_columns
-
-
- Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
- payone_protocol_api_grid_data_source
- id
- id
-
- -
-
-
-
-
- -
-
- Magento_Ui/js/grid/provider
-
-
+
+ payone_protocol_api_columns
+
+ payone_protocol_api_grid.payone_protocol_api_grid_data_source
+
+
+
+
+
+
+ Payone_Core::payone_protocol_api
+
+
+ id
+ main_table.id
+
+
-
-
- -
-
- ui/grid/toolbar
-
-
-
-
- -
-
-
-
- payone_protocol_api_grid
-
-
-
-
-
-
- -
-
-
-
- payone_protocol_api_grid.payone_protocol_api_grid.payone_protocol_api_columns
-
- - Magento_Ui/js/grid/controls/columns
- - dataGridActions
-
-
-
+
+
+ true
+
+
+
-
- -
-
- payone_protocol_api_grid.payone_protocol_api_grid.payone_protocol_api_columns
- -
-
- payone_protocol_api_grid.payone_protocol_api_grid.listing_top.bookmarks
- - current.filters
-
- -
-
- payone_protocol_api_grid.payone_protocol_api_grid.listing_top.listing_filters
- -
-
- payone_protocol_api_grid.payone_protocol_api_grid.payone_protocol_api_columns.${ $.index }:visible
-
-
-
-
-
-
- Magento\Store\Ui\Component\Listing\Column\Store\Options
-
-
- -
-
- All Store Views
- - store_id
- - Store-ID
-
-
+
+
+
+ All Store Views
+
+ store_id
+
+ ns = ${ $.ns }, index = ${ $.index }:visible
+
+
-
-
- -
-
-
-
- payone_protocol_api_grid.payone_protocol_api_grid.listing_top.bookmarks
- - current.paging
-
- - payone_protocol_api_grid.payone_protocol_api_grid.payone_protocol_api_columns.ids
-
-
-
-
+
+
-
- -
-
-
-
- payone_protocol_api_grid.payone_protocol_api_grid.listing_top.bookmarks
- - current
-
- -
-
-
-
- payone_protocol_api_grid.payone_protocol_api_grid.payone_protocol_api_columns.actions
- - applyAction
- -
-
- view
- - ${ $.$data.rowIndex }
-
-
- -
-
- payone_protocol_api_grid.payone_protocol_api_grid.listing_top.bookmarks
- - columns.${ $.index }
- - current.${ $.storageConfig.root}
+
+
+
+ - payone_protocol_api_grid.payone_protocol_api_grid.payone_protocol_api_columns.actions
+ - applyAction
+ -
+
- view
+ - ${ $.$data.rowIndex }
-
-
-
+
+
+
-
- -
-
- id
- - desc
- - ID
-
-
+
+ id
+ desc
+
+
-
- -
-
- text
- - asc
- - OrderId
-
-
+
+ text
+
+
-
- -
-
- text
- - Txid
-
-
+
+ text
+
+
-
- -
-
- text
- - RefNr
-
-
+
+ text
+
+
-
- -
-
- text
- - asc
- - Request
-
-
+
+ text
+
+
-
- -
-
- text
- - asc
- - Response
-
-
+
+ text
+
+
-
-
- -
-
- dateRange
- - Magento_Ui/js/grid/columns/date
- - date
- - Create Date
-
-
+
+
+ dateRange
+ date
+
+
diff --git a/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml b/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml
index 511a8db5..57032b88 100644
--- a/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml
+++ b/view/adminhtml/ui_component/payone_protocol_transactionstatus_grid.xml
@@ -28,211 +28,128 @@
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source
- - payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source
- - payone_protocol_api_columns
-
-
- Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider
- payone_protocol_transactionstatus_grid_data_source
- id
- id
-
- -
-
-
-
-
- -
-
- Magento_Ui/js/grid/provider
-
-
+
+ payone_protocol_transactionstatus_columns
+
+ payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid_data_source
+
+
+
+
+
+
+ Payone_Core::payone_protocol_transactionstatus
+
+
+ id
+ main_table.id
+
+
-
-
- -
-
- ui/grid/toolbar
-
-
-
-
- -
-
-
-
- payone_protocol_transactionstatus_grid
-
-
-
-
-
-
- -
-
-
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_api_columns
-
- - Magento_Ui/js/grid/controls/columns
- - dataGridActions
-
-
-
+
+
+ true
+
+
+
-
- -
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_api_columns
- -
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.listing_top.bookmarks
- - current.filters
-
- -
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.listing_top.listing_filters
- -
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_api_columns.${ $.index }:visible
-
-
-
-
-
-
- Magento\Store\Ui\Component\Listing\Column\Store\Options
-
-
- -
-
- All Store Views
- - store_id
- - Store-ID
-
-
+
+
+
+ All Store Views
+
+ store_id
+
+ ns = ${ $.ns }, index = ${ $.index }:visible
+
+
-
-
- -
-
-
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.listing_top.bookmarks
- - current.paging
-
- - payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_api_columns.ids
-
-
-
-
-
-
- -
-
-
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.listing_top.bookmarks
- - current
-
- -
-
-
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_api_columns.actions
- - applyAction
- -
-
- view
- - ${ $.$data.rowIndex }
-
-
- -
-
- payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.listing_top.bookmarks
- - columns.${ $.index }
- - current.${ $.storageConfig.root}
+
+
+
+
+
+
+ - payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_grid.payone_protocol_transactionstatus_columns.actions
+ - applyAction
+ -
+
- view
+ - ${ $.$data.rowIndex }
-
-
-
+
+
+
-
- -
-
- id
- - desc
- - ID
-
-
+
+ id
+ desc
+
+
-
- -
-
- text
- - Txid
-
-
+
+ text
+
+
-
- -
-
- text
- - Reference
-
-
+
+ text
+
+
-
- -
-
- text
- - Last Txaction
-
-
+
+ text
+
+
-
-
- -
-
- dateRange
- - Magento_Ui/js/grid/columns/date
- - date
- - TxTime
-
-
+
+
+ dateRange
+ date
+
+
-
- -
-
- text
- - Sequencenumber
-
-
+
+ text
+
+
-
- -
-
- text
- - Clearingtype
-
-
+
+ text
+
+
-
- -
-
- textRange
- - Receivable
-
-
+
+ textRange
+
+
-
- -
-
- textRange
- - Balance
-
-
+
+ textRange
+
+
-
- -
-
- textRange
- - Price
-
-
+
+ textRange
+
+
-
-
- -
-
- dateRange
- - Magento_Ui/js/grid/columns/date
- - date
- - Created At
-
-
+
+
+ dateRange
+ date
+
+
diff --git a/view/adminhtml/web/js/grid/data-storage-mixin.js b/view/adminhtml/web/js/grid/data-storage-mixin.js
index fdc92366..318d2caf 100644
--- a/view/adminhtml/web/js/grid/data-storage-mixin.js
+++ b/view/adminhtml/web/js/grid/data-storage-mixin.js
@@ -32,7 +32,7 @@ define([
initConfig: function () {
this._super();
- if (this.name.indexOf("payone") !== -1) {
+ if (this.name.indexOf("payone_protocol") !== -1) {
this.indexField = "id";
}