From c81c46f9d67bb3ad27378fe85e0fb6390a19023e Mon Sep 17 00:00:00 2001 From: Jitendra Singh Date: Wed, 19 Feb 2020 19:31:17 +0530 Subject: [PATCH] Improved payment package code style --- .../Payment/src/Config/paymentmethods.php | 38 ++--- packages/Webkul/Payment/src/Config/system.php | 142 +++++++++--------- packages/Webkul/Payment/src/Payment.php | 10 +- .../Webkul/Payment/src/Payment/Payment.php | 9 +- 4 files changed, 101 insertions(+), 98 deletions(-) diff --git a/packages/Webkul/Payment/src/Config/paymentmethods.php b/packages/Webkul/Payment/src/Config/paymentmethods.php index 5f5b6433c..19d0f6920 100755 --- a/packages/Webkul/Payment/src/Config/paymentmethods.php +++ b/packages/Webkul/Payment/src/Config/paymentmethods.php @@ -1,31 +1,31 @@ [ - 'code' => 'cashondelivery', - 'title' => 'Cash On Delivery', + 'cashondelivery' => [ + 'code' => 'cashondelivery', + 'title' => 'Cash On Delivery', 'description' => 'Cash On Delivery', - 'class' => 'Webkul\Payment\Payment\CashOnDelivery', - 'active' => true, - 'sort' => 1 + 'class' => 'Webkul\Payment\Payment\CashOnDelivery', + 'active' => true, + 'sort' => 1 ], - 'moneytransfer' => [ - 'code' => 'moneytransfer', - 'title' => 'Money Transfer', + 'moneytransfer' => [ + 'code' => 'moneytransfer', + 'title' => 'Money Transfer', 'description' => 'Money Transfer', - 'class' => 'Webkul\Payment\Payment\MoneyTransfer', - 'active' => true, - 'sort' => 2 + 'class' => 'Webkul\Payment\Payment\MoneyTransfer', + 'active' => true, + 'sort' => 2 ], 'paypal_standard' => [ - 'code' => 'paypal_standard', - 'title' => 'Paypal Standard', - 'description' => 'Paypal Standard', - 'class' => 'Webkul\Paypal\Payment\Standard', - 'sandbox' => true, - 'active' => true, + 'code' => 'paypal_standard', + 'title' => 'Paypal Standard', + 'description' => 'Paypal Standard', + 'class' => 'Webkul\Paypal\Payment\Standard', + 'sandbox' => true, + 'active' => true, 'business_account' => 'test@webkul.com', - 'sort' => 3 + 'sort' => 3 ] ]; \ 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 d528ef7ed..a926123e9 100755 --- a/packages/Webkul/Payment/src/Config/system.php +++ b/packages/Webkul/Payment/src/Config/system.php @@ -2,42 +2,42 @@ return [ [ - 'key' => 'sales', + 'key' => 'sales', 'name' => 'admin::app.admin.system.sales', 'sort' => 1 ], [ - 'key' => 'sales.paymentmethods', + 'key' => 'sales.paymentmethods', 'name' => 'admin::app.admin.system.payment-methods', 'sort' => 2, ], [ - 'key' => 'sales.paymentmethods.cashondelivery', - 'name' => 'admin::app.admin.system.cash-on-delivery', - 'sort' => 1, + 'key' => 'sales.paymentmethods.cashondelivery', + 'name' => 'admin::app.admin.system.cash-on-delivery', + 'sort' => 1, 'fields' => [ [ - 'name' => 'title', - 'title' => 'admin::app.admin.system.title', - 'type' => 'text', - 'validation' => 'required', + 'name' => 'title', + 'title' => 'admin::app.admin.system.title', + 'type' => 'text', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'description', - 'title' => 'admin::app.admin.system.description', - 'type' => 'textarea', + 'name' => 'description', + 'title' => 'admin::app.admin.system.description', + 'type' => 'textarea', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'active', - 'title' => 'admin::app.admin.system.status', - 'type' => 'boolean', - 'validation' => 'required', + 'name' => 'active', + 'title' => 'admin::app.admin.system.status', + 'type' => 'boolean', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'sort', - 'title' => 'admin::app.admin.system.sort_order', - 'type' => 'select', + 'name' => 'sort', + 'title' => 'admin::app.admin.system.sort_order', + 'type' => 'select', 'options' => [ [ 'title' => '1', @@ -56,34 +56,34 @@ return [ ] ] ], [ - 'key' => 'sales.paymentmethods.moneytransfer', - 'name' => 'admin::app.admin.system.money-transfer', - 'sort' => 2, + 'key' => 'sales.paymentmethods.moneytransfer', + 'name' => 'admin::app.admin.system.money-transfer', + 'sort' => 2, 'fields' => [ [ - 'name' => 'title', - 'title' => 'admin::app.admin.system.title', - 'type' => 'text', - 'validation' => 'required', + 'name' => 'title', + 'title' => 'admin::app.admin.system.title', + 'type' => 'text', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'description', - 'title' => 'admin::app.admin.system.description', - 'type' => 'textarea', + 'name' => 'description', + 'title' => 'admin::app.admin.system.description', + 'type' => 'textarea', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'active', - 'title' => 'admin::app.admin.system.status', - 'type' => 'boolean', - 'validation' => 'required', + 'name' => 'active', + 'title' => 'admin::app.admin.system.status', + 'type' => 'boolean', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'sort', - 'title' => 'admin::app.admin.system.sort_order', - 'type' => 'select', + 'name' => 'sort', + 'title' => 'admin::app.admin.system.sort_order', + 'type' => 'select', 'options' => [ [ 'title' => '1', @@ -102,47 +102,47 @@ return [ ] ] ], [ - 'key' => 'sales.paymentmethods.paypal_standard', - 'name' => 'admin::app.admin.system.paypal-standard', - 'sort' => 3, + 'key' => 'sales.paymentmethods.paypal_standard', + 'name' => 'admin::app.admin.system.paypal-standard', + 'sort' => 3, 'fields' => [ [ - 'name' => 'title', - 'title' => 'admin::app.admin.system.title', - 'type' => 'text', - 'validation' => 'required', + 'name' => 'title', + 'title' => 'admin::app.admin.system.title', + 'type' => 'text', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'description', - 'title' => 'admin::app.admin.system.description', - 'type' => 'textarea', + 'name' => 'description', + 'title' => 'admin::app.admin.system.description', + 'type' => 'textarea', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'business_account', - 'title' => 'admin::app.admin.system.business-account', - 'type' => 'select', - 'type' => 'text', + 'name' => 'business_account', + 'title' => 'admin::app.admin.system.business-account', + 'type' => 'select', + 'type' => 'text', 'validation' => 'required' ], [ - 'name' => 'active', - 'title' => 'admin::app.admin.system.status', - 'type' => 'boolean', - 'validation' => 'required', + 'name' => 'active', + 'title' => 'admin::app.admin.system.status', + 'type' => 'boolean', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'sandbox', - 'title' => 'admin::app.admin.system.sandbox', - 'type' => 'boolean', - 'validation' => 'required', + 'name' => 'sandbox', + 'title' => 'admin::app.admin.system.sandbox', + 'type' => 'boolean', + 'validation' => 'required', 'channel_based' => false, - 'locale_based' => true + 'locale_based' => true ], [ - 'name' => 'sort', - 'title' => 'admin::app.admin.system.sort_order', - 'type' => 'select', + 'name' => 'sort', + 'title' => 'admin::app.admin.system.sort_order', + 'type' => 'select', 'options' => [ [ 'title' => '1', diff --git a/packages/Webkul/Payment/src/Payment.php b/packages/Webkul/Payment/src/Payment.php index e70df5d0b..ac769f5fb 100755 --- a/packages/Webkul/Payment/src/Payment.php +++ b/packages/Webkul/Payment/src/Payment.php @@ -18,8 +18,8 @@ class Payment return [ 'jump_to_section' => 'payment', - 'paymentMethods' => $this->getPaymentMethods(), - 'html' => view('shop::checkout.onepage.payment', compact('paymentMethods'))->render() + 'paymentMethods' => $this->getPaymentMethods(), + 'html' => view('shop::checkout.onepage.payment', compact('paymentMethods'))->render() ]; } @@ -37,10 +37,10 @@ class Payment if ($object->isAvailable()) { $paymentMethods[] = [ - 'method' => $object->getCode(), + 'method' => $object->getCode(), 'method_title' => $object->getTitle(), - 'description' => $object->getDescription(), - 'sort' => $object->getSortOrder(), + 'description' => $object->getDescription(), + 'sort' => $object->getSortOrder(), ]; } } diff --git a/packages/Webkul/Payment/src/Payment/Payment.php b/packages/Webkul/Payment/src/Payment/Payment.php index 898fe64ce..b7ee17b23 100755 --- a/packages/Webkul/Payment/src/Payment/Payment.php +++ b/packages/Webkul/Payment/src/Payment/Payment.php @@ -80,8 +80,9 @@ abstract class Payment */ public function setCart() { - if (! $this->cart) + if (! $this->cart) { $this->cart = Cart::getCart(); + } } /** @@ -91,8 +92,9 @@ abstract class Payment */ public function getCart() { - if (! $this->cart) + if (! $this->cart) { $this->setCart(); + } return $this->cart; } @@ -104,8 +106,9 @@ abstract class Payment */ public function getCartItems() { - if (! $this->cart) + if (! $this->cart) { $this->setCart(); + } return $this->cart->items; }