diff --git a/packages/Sarga/Payment/Config/system.php b/packages/Sarga/Payment/Config/system.php index 73cd32c3a..9df7c6a88 100644 --- a/packages/Sarga/Payment/Config/system.php +++ b/packages/Sarga/Payment/Config/system.php @@ -1,6 +1,14 @@ 'sales.paymentmethods', + 'name' => 'admin::app.admin.system.payment-methods', + 'sort' => 3, + ], [ 'key' => 'sales.paymentmethods.cash100', 'name' => 'Nakit 100', @@ -9,29 +17,28 @@ return [ [ 'name' => 'title', 'title' => 'admin::app.admin.system.title', - 'type' => 'depends', - 'depend' => 'active:1', + 'type' => 'text', 'validation' => 'required_if:active,1', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => true, ], [ 'name' => 'description', 'title' => 'admin::app.admin.system.description', 'type' => 'textarea', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => true, ], [ 'name' => 'instructions', 'title' => 'admin::app.admin.system.instructions', 'type' => 'textarea', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => true, ], [ 'name' => 'generate_invoice', 'title' => 'admin::app.admin.system.generate-invoice', 'type' => 'boolean', 'default_value' => false, - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => false, ], [ 'name' => 'invoice_status', @@ -48,7 +55,7 @@ return [ ], ], 'info' => 'admin::app.admin.system.generate-invoice-applicable', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => false, ], [ 'name' => 'order_status', @@ -67,15 +74,15 @@ return [ ], ], 'info' => 'admin::app.admin.system.generate-invoice-applicable', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => false, ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', 'type' => 'boolean', 'validation' => 'required', - 'channel_based' => true, - 'locale_based' => true, + 'channel_based' => false, + 'locale_based' => false, ], [ 'name' => 'sort', 'title' => 'admin::app.admin.system.sort_order', @@ -106,29 +113,28 @@ return [ [ 'name' => 'title', 'title' => 'admin::app.admin.system.title', - 'type' => 'depends', - 'depend' => 'active:1', + 'type' => 'text', 'validation' => 'required_if:active,1', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => true, ], [ 'name' => 'description', 'title' => 'admin::app.admin.system.description', 'type' => 'textarea', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => true, ], [ 'name' => 'instructions', 'title' => 'admin::app.admin.system.instructions', 'type' => 'textarea', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => true, ], [ 'name' => 'generate_invoice', 'title' => 'admin::app.admin.system.generate-invoice', 'type' => 'boolean', 'default_value' => false, - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => false, ], [ 'name' => 'invoice_status', @@ -145,7 +151,7 @@ return [ ], ], 'info' => 'admin::app.admin.system.generate-invoice-applicable', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => false, ], [ 'name' => 'order_status', @@ -164,15 +170,15 @@ return [ ], ], 'info' => 'admin::app.admin.system.generate-invoice-applicable', - 'channel_based' => true, + 'channel_based' => false, 'locale_based' => false, ], [ 'name' => 'active', 'title' => 'admin::app.admin.system.status', 'type' => 'boolean', 'validation' => 'required', - 'channel_based' => true, - 'locale_based' => true, + 'channel_based' => false, + 'locale_based' => false, ], [ 'name' => 'sort', 'title' => 'admin::app.admin.system.sort_order', @@ -203,8 +209,7 @@ return [ [ 'name' => 'title', 'title' => 'admin::app.admin.system.title', - 'type' => 'depends', - 'depend' => 'active:1', + 'type' => 'text', 'validation' => 'required_if:active,1', 'channel_based' => false, 'locale_based' => true, @@ -269,7 +274,7 @@ return [ 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true, + 'locale_based' => false, ], [ 'name' => 'sort', 'title' => 'admin::app.admin.system.sort_order', @@ -299,8 +304,7 @@ return [ [ 'name' => 'title', 'title' => 'admin::app.admin.system.title', - 'type' => 'depends', - 'depend' => 'active:1', + 'type' => 'text', 'validation' => 'required_if:active,1', 'channel_based' => false, 'locale_based' => true, @@ -365,7 +369,7 @@ return [ 'type' => 'boolean', 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true, + 'locale_based' => false, ], [ 'name' => 'sort', 'title' => 'admin::app.admin.system.sort_order', @@ -391,13 +395,12 @@ return [ [ 'key' => 'sales.paymentmethods.altynasyr', 'name' => 'Online AltynAsyr', - 'sort' => 4, + 'sort' => 5, 'fields' => [ [ 'name' => 'title', 'title' => 'admin::app.admin.system.title', - 'type' => 'depends', - 'depend' => 'active:1', + 'type' => 'text', 'validation' => 'required_if:active,1', 'channel_based' => false, 'locale_based' => true, diff --git a/packages/Webkul/Payment/src/Config/paymentmethods.php b/packages/Webkul/Payment/src/Config/paymentmethods.php index be413c2b9..a542526fa 100755 --- a/packages/Webkul/Payment/src/Config/paymentmethods.php +++ b/packages/Webkul/Payment/src/Config/paymentmethods.php @@ -1,20 +1,20 @@ [ -// 'code' => 'cashondelivery', -// 'title' => 'Cash On Delivery', -// 'description' => 'Cash On Delivery', -// 'class' => 'Webkul\Payment\Payment\CashOnDelivery', -// 'active' => true, -// 'sort' => 1, -// ], -// -// 'moneytransfer' => [ -// 'code' => 'moneytransfer', -// 'title' => 'Money Transfer', -// 'description' => 'Money Transfer', -// 'class' => 'Webkul\Payment\Payment\MoneyTransfer', -// 'active' => true, -// 'sort' => 2, -// ] + 'cashondelivery' => [ + 'code' => 'cashondelivery', + 'title' => 'Cash On Delivery', + 'description' => 'Cash On Delivery', + 'class' => 'Webkul\Payment\Payment\CashOnDelivery', + 'active' => true, + 'sort' => 1, + ], + + 'moneytransfer' => [ + 'code' => 'moneytransfer', + 'title' => 'Money Transfer', + 'description' => 'Money Transfer', + 'class' => 'Webkul\Payment\Payment\MoneyTransfer', + 'active' => true, + 'sort' => 2, + ] ]; \ No newline at end of file diff --git a/packages/Webkul/Payment/src/Config/system.php b/packages/Webkul/Payment/src/Config/system.php index 81b761135..16a550c79 100755 --- a/packages/Webkul/Payment/src/Config/system.php +++ b/packages/Webkul/Payment/src/Config/system.php @@ -12,193 +12,192 @@ return [ 'key' => 'sales.paymentmethods', 'name' => 'admin::app.admin.system.payment-methods', 'sort' => 3, + ], [ + 'key' => 'sales.paymentmethods.cashondelivery', + 'name' => 'admin::app.admin.system.cash-on-delivery', + 'sort' => 1, + 'fields' => [ + [ + 'name' => 'title', + 'title' => 'admin::app.admin.system.title', + 'type' => 'depends', + 'depend' => 'active:1', + 'validation' => 'required_if:active,1', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'description', + 'title' => 'admin::app.admin.system.description', + 'type' => 'textarea', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'instructions', + 'title' => 'admin::app.admin.system.instructions', + 'type' => 'textarea', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'generate_invoice', + 'title' => 'admin::app.admin.system.generate-invoice', + 'type' => 'boolean', + 'default_value' => false, + 'channel_based' => true, + 'locale_based' => false, + ], [ + 'name' => 'invoice_status', + 'title' => 'admin::app.admin.system.set-invoice-status', + 'validation' => 'required_if:generate_invoice,1', + 'type' => 'select', + 'options' => [ + [ + 'title' => 'admin::app.sales.invoices.status-pending', + 'value' => 'pending', + ], [ + 'title' => 'admin::app.sales.invoices.status-paid', + 'value' => 'paid', + ], + ], + 'info' => 'admin::app.admin.system.generate-invoice-applicable', + 'channel_based' => true, + 'locale_based' => false, + ], [ + 'name' => 'order_status', + 'title' => 'admin::app.admin.system.set-order-status', + 'type' => 'select', + 'options' => [ + [ + 'title' => 'admin::app.sales.orders.order-status-pending', + 'value' => 'pending', + ], [ + 'title' => 'admin::app.sales.orders.order-status-pending-payment', + 'value' => 'pending_payment', + ], [ + 'title' => 'admin::app.sales.orders.order-status-processing', + 'value' => 'processing', + ], + ], + 'info' => 'admin::app.admin.system.generate-invoice-applicable', + 'channel_based' => true, + 'locale_based' => false, + ], [ + 'name' => 'active', + 'title' => 'admin::app.admin.system.status', + 'type' => 'boolean', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'sort', + 'title' => 'admin::app.admin.system.sort_order', + 'type' => 'select', + 'options' => [ + [ + 'title' => '1', + 'value' => 1, + ], [ + 'title' => '2', + 'value' => 2, + ], [ + 'title' => '3', + 'value' => 3, + ], [ + 'title' => '4', + 'value' => 4, + ], + ], + ], + ], + ], [ + 'key' => 'sales.paymentmethods.moneytransfer', + 'name' => 'admin::app.admin.system.money-transfer', + 'sort' => 2, + 'fields' => [ + [ + 'name' => 'title', + 'title' => 'admin::app.admin.system.title', + 'type' => 'depends', + 'depend' => 'active:1', + 'validation' => 'required_if:active,1', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'description', + 'title' => 'admin::app.admin.system.description', + 'type' => 'textarea', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'generate_invoice', + 'title' => 'Automatically generate the invoice after placing an order', + 'type' => 'boolean', + 'default_value' => false, + 'channel_based' => true, + 'locale_based' => false, + ], [ + 'name' => 'invoice_status', + 'title' => 'Invoice status after creating the invoice', + 'type' => 'select', + 'options' => [ + [ + 'title' => 'admin::app.sales.invoices.status-pending', + 'value' => 'pending', + ], [ + 'title' => 'admin::app.sales.invoices.status-paid', + 'value' => 'paid', + ], + ], + 'info' => 'admin::app.admin.system.generate-invoice-applicable', + ], [ + 'name' => 'order_status', + 'title' => 'Order status after creating the invoice', + 'type' => 'select', + 'options' => [ + [ + 'title' => 'admin::app.sales.orders.order-status-pending', + 'value' => 'pending', + ], [ + 'title' => 'admin::app.sales.orders.order-status-pending-payment', + 'value' => 'pending_payment', + ], [ + 'title' => 'admin::app.sales.orders.order-status-processing', + 'value' => 'processing', + ], + ], + 'info' => 'admin::app.admin.system.generate-invoice-applicable', + ], [ + 'name' => 'mailing_address', + 'title' => 'admin::app.admin.system.mailing-address', + 'type' => 'textarea', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'active', + 'title' => 'admin::app.admin.system.status', + 'type' => 'boolean', + 'validation' => 'required', + 'channel_based' => true, + 'locale_based' => true, + ], [ + 'name' => 'sort', + 'title' => 'admin::app.admin.system.sort_order', + 'type' => 'select', + 'options' => [ + [ + 'title' => '1', + 'value' => 1, + ], [ + 'title' => '2', + 'value' => 2, + ], [ + 'title' => '3', + 'value' => 3, + ], [ + 'title' => '4', + 'value' => 4, + ], + ], + ], + ], ], -// [ -// 'key' => 'sales.paymentmethods.cashondelivery', -// 'name' => 'admin::app.admin.system.cash-on-delivery', -// 'sort' => 1, -// 'fields' => [ -// [ -// 'name' => 'title', -// 'title' => 'admin::app.admin.system.title', -// 'type' => 'depends', -// 'depend' => 'active:1', -// 'validation' => 'required_if:active,1', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'description', -// 'title' => 'admin::app.admin.system.description', -// 'type' => 'textarea', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'instructions', -// 'title' => 'admin::app.admin.system.instructions', -// 'type' => 'textarea', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'generate_invoice', -// 'title' => 'admin::app.admin.system.generate-invoice', -// 'type' => 'boolean', -// 'default_value' => false, -// 'channel_based' => true, -// 'locale_based' => false, -// ], [ -// 'name' => 'invoice_status', -// 'title' => 'admin::app.admin.system.set-invoice-status', -// 'validation' => 'required_if:generate_invoice,1', -// 'type' => 'select', -// 'options' => [ -// [ -// 'title' => 'admin::app.sales.invoices.status-pending', -// 'value' => 'pending', -// ], [ -// 'title' => 'admin::app.sales.invoices.status-paid', -// 'value' => 'paid', -// ], -// ], -// 'info' => 'admin::app.admin.system.generate-invoice-applicable', -// 'channel_based' => true, -// 'locale_based' => false, -// ], [ -// 'name' => 'order_status', -// 'title' => 'admin::app.admin.system.set-order-status', -// 'type' => 'select', -// 'options' => [ -// [ -// 'title' => 'admin::app.sales.orders.order-status-pending', -// 'value' => 'pending', -// ], [ -// 'title' => 'admin::app.sales.orders.order-status-pending-payment', -// 'value' => 'pending_payment', -// ], [ -// 'title' => 'admin::app.sales.orders.order-status-processing', -// 'value' => 'processing', -// ], -// ], -// 'info' => 'admin::app.admin.system.generate-invoice-applicable', -// 'channel_based' => true, -// 'locale_based' => false, -// ], [ -// 'name' => 'active', -// 'title' => 'admin::app.admin.system.status', -// 'type' => 'boolean', -// 'validation' => 'required', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'sort', -// 'title' => 'admin::app.admin.system.sort_order', -// 'type' => 'select', -// 'options' => [ -// [ -// 'title' => '1', -// 'value' => 1, -// ], [ -// 'title' => '2', -// 'value' => 2, -// ], [ -// 'title' => '3', -// 'value' => 3, -// ], [ -// 'title' => '4', -// 'value' => 4, -// ], -// ], -// ], -// ], -// ], [ -// 'key' => 'sales.paymentmethods.moneytransfer', -// 'name' => 'admin::app.admin.system.money-transfer', -// 'sort' => 2, -// 'fields' => [ -// [ -// 'name' => 'title', -// 'title' => 'admin::app.admin.system.title', -// 'type' => 'depends', -// 'depend' => 'active:1', -// 'validation' => 'required_if:active,1', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'description', -// 'title' => 'admin::app.admin.system.description', -// 'type' => 'textarea', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'generate_invoice', -// 'title' => 'Automatically generate the invoice after placing an order', -// 'type' => 'boolean', -// 'default_value' => false, -// 'channel_based' => true, -// 'locale_based' => false, -// ], [ -// 'name' => 'invoice_status', -// 'title' => 'Invoice status after creating the invoice', -// 'type' => 'select', -// 'options' => [ -// [ -// 'title' => 'admin::app.sales.invoices.status-pending', -// 'value' => 'pending', -// ], [ -// 'title' => 'admin::app.sales.invoices.status-paid', -// 'value' => 'paid', -// ], -// ], -// 'info' => 'admin::app.admin.system.generate-invoice-applicable', -// ], [ -// 'name' => 'order_status', -// 'title' => 'Order status after creating the invoice', -// 'type' => 'select', -// 'options' => [ -// [ -// 'title' => 'admin::app.sales.orders.order-status-pending', -// 'value' => 'pending', -// ], [ -// 'title' => 'admin::app.sales.orders.order-status-pending-payment', -// 'value' => 'pending_payment', -// ], [ -// 'title' => 'admin::app.sales.orders.order-status-processing', -// 'value' => 'processing', -// ], -// ], -// 'info' => 'admin::app.admin.system.generate-invoice-applicable', -// ], [ -// 'name' => 'mailing_address', -// 'title' => 'admin::app.admin.system.mailing-address', -// 'type' => 'textarea', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'active', -// 'title' => 'admin::app.admin.system.status', -// 'type' => 'boolean', -// 'validation' => 'required', -// 'channel_based' => true, -// 'locale_based' => true, -// ], [ -// 'name' => 'sort', -// 'title' => 'admin::app.admin.system.sort_order', -// 'type' => 'select', -// 'options' => [ -// [ -// 'title' => '1', -// 'value' => 1, -// ], [ -// 'title' => '2', -// 'value' => 2, -// ], [ -// 'title' => '3', -// 'value' => 3, -// ], [ -// 'title' => '4', -// 'value' => 4, -// ], -// ], -// ], -// ], -// ], ]; diff --git a/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php b/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php index a3d794d50..837576c26 100755 --- a/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php +++ b/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php @@ -29,7 +29,7 @@ class PaymentServiceProvider extends ServiceProvider { $this->registerFacades(); - $this->registerConfig(); +// $this->registerConfig(); } /** * Register Bouncer as a singleton.