From 7b1eef9308819e7deb4b614c99f8c56ac241a4c6 Mon Sep 17 00:00:00 2001
From: Nikola Lardev <nikolalardev@gmail.com>
Date: Fri, 30 Aug 2019 09:33:58 +0300
Subject: [PATCH] Create remaining configuration settings #16 code review fixes

---
 admin/Source/Currencies.php         |  2 +-
 admin/Source/PaymentAction.php      | 28 ++++++++++++++++++++++++++++
 admin/etc/adminhtml/system.xml      | 14 +++++++-------
 admin/etc/config.xml                |  2 +-
 admin/etc/module.xml                |  6 +-----
 card-admin/Model/Source/Cctype.php  |  2 +-
 card-admin/etc/adminhtml/system.xml |  4 +---
 7 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 admin/Source/PaymentAction.php

diff --git a/admin/Source/Currencies.php b/admin/Source/Currencies.php
index 72b6c26..efe3c79 100644
--- a/admin/Source/Currencies.php
+++ b/admin/Source/Currencies.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Data\OptionSourceInterface;
 
 /**
- * Class ConnectionType
+ * Class Currencies
  */
 class Currencies implements OptionSourceInterface
 {
diff --git a/admin/Source/PaymentAction.php b/admin/Source/PaymentAction.php
new file mode 100644
index 0000000..5748147
--- /dev/null
+++ b/admin/Source/PaymentAction.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Pronko Consulting (https://www.pronkoconsulting.com)
+ * See LICENSE for the license details.
+ */
+declare(strict_types = 1);
+
+namespace Pronko\LiqPayAdmin\Source;
+
+class PaymentAction implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            [
+                'value' => 'authorize',
+                'label' => __('Authorize Only'),
+            ],
+            [
+                'value' => 'authorize_capture',
+                'label' => __('Authorize and Capture')
+            ]
+        ];
+    }
+}
diff --git a/admin/etc/adminhtml/system.xml b/admin/etc/adminhtml/system.xml
index 62c32af..63a2b61 100755
--- a/admin/etc/adminhtml/system.xml
+++ b/admin/etc/adminhtml/system.xml
@@ -36,9 +36,9 @@
                             <source_model>Pronko\LiqPayAdmin\Source\ConnectionType</source_model>
                             <config_path>payment/pronko_liqpay/connection_type</config_path>
                         </field>
-                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                        <field id="payment_action" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                             <label>Payment Action</label>
-                            <source_model>Magento\AuthorizenetAcceptjs\Model\Adminhtml\Source\PaymentAction</source_model>
+                            <source_model>Pronko\LiqPayAdmin\Source\PaymentAction</source_model>
                             <config_path>payment/pronko_liqpay/payment_action</config_path>
                         </field>
                     </group>
@@ -85,18 +85,18 @@
                             <label>Maximum Order Total</label>
                             <config_path>payment/pronko_liqpay/maximum_order_total</config_path>
                         </field>
-                        <field id="sort_order" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                        <field id="sort_total" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Sort Total</label>
-                            <config_path>payment/pronko_liqpay/sort_order</config_path>
+                            <config_path>payment/pronko_liqpay/sort_total</config_path>
                         </field>
-                        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                             <label>New Order Status</label>
-                            <source_model>Magento\Sales\Model\Config\Source\Order\Status\Processing</source_model>
+                            <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
                         </field>
                         <field id="accepted_currencies" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                             <label>Accepted Currencies</label>
                             <source_model>Pronko\LiqPayAdmin\Source\Currencies</source_model>
-                            <config_path>payment/pronko_liqpay/mode</config_path>
+                            <config_path>payment/pronko_liqpay/accepted_currencies</config_path>
                         </field>
                     </group>
                  </group>
diff --git a/admin/etc/config.xml b/admin/etc/config.xml
index bbfe341..e8c07ef 100644
--- a/admin/etc/config.xml
+++ b/admin/etc/config.xml
@@ -18,4 +18,4 @@
             </pronko_liqpay_section>
         </payment>
     </default>
-</config>
\ No newline at end of file
+</config>
diff --git a/admin/etc/module.xml b/admin/etc/module.xml
index 08ceefa..b0ce250 100644
--- a/admin/etc/module.xml
+++ b/admin/etc/module.xml
@@ -6,9 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Pronko_LiqPayAdmin">
-        <sequence>
-            <module name="Magento_Sales"/>
-        </sequence>
-    </module>
+    <module name="Pronko_LiqPayAdmin" />
 </config>
diff --git a/card-admin/Model/Source/Cctype.php b/card-admin/Model/Source/Cctype.php
index 11708bb..f5c4037 100644
--- a/card-admin/Model/Source/Cctype.php
+++ b/card-admin/Model/Source/Cctype.php
@@ -18,6 +18,6 @@ class Cctype extends PaymentCctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'DN'];
+        return ['VI', 'MC'];
     }
 }
\ No newline at end of file
diff --git a/card-admin/etc/adminhtml/system.xml b/card-admin/etc/adminhtml/system.xml
index 7a2dbbd..6648b6e 100644
--- a/card-admin/etc/adminhtml/system.xml
+++ b/card-admin/etc/adminhtml/system.xml
@@ -7,12 +7,10 @@
                 <group id="pronko_liqpay" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>LiqPay</label>
                     <fieldset_css>complex</fieldset_css>
-                    <attribute type="displayIn">other_payment_methods</attribute>
                     <group id="pronko_liqpay_card_payment" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="5">
                         <label>Card Payment</label>
-                        <attribute type="expanded">1</attribute>
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
-                        <field id="cctypes" translate="label" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
+                        <field id="cctypes" translate="label" type="multiselect" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                             <label>Credit Card Types</label>
                             <source_model>Pronko\LiqPayCardAdmin\Model\Source\Cctype</source_model>
                         </field>