merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved payment package code style

This commit is contained in:
Jitendra Singh 2020-02-19 19:31:17 +05:30
parent ad4ab855e0
commit c81c46f9d6
4 changed files with 101 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/Webkul/Payment/src/Config/paymentmethods.php
View File

@ -1,31 +1,31 @@
<?php
return [
'cashondelivery' => [
'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
]
];

142
packages/Webkul/Payment/src/Config/system.php
View File

@ -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',

10
packages/Webkul/Payment/src/Payment.php
View File

@ -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(),
];
}
}

9
packages/Webkul/Payment/src/Payment/Payment.php
View File

@ -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;
}