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

Fixed issue #390

This commit is contained in:
jitendra 2019-01-25 19:44:07 +05:30
parent 45c8bba4f5
commit 7cf585c8da
3 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@ return [
'title' => 'Cash On Delivery',
'description' => 'Cash On Delivery',
'class' => 'Webkul\Payment\Payment\CashOnDelivery',
'order_status' => 'pending',
'active' => true
],
@ -14,7 +13,6 @@ return [
'title' => 'Money Transfer',
'description' => 'Money Transfer',
'class' => 'Webkul\Payment\Payment\MoneyTransfer',
'order_status' => 'pending',
'active' => true
],
@ -23,7 +21,6 @@ return [
'title' => 'Paypal Standard',
'description' => 'Paypal Standard',
'class' => 'Webkul\Paypal\Payment\Standard',
'order_status' => 'pending_payment',
'sandbox' => true,
'active' => true,
'business_account' => 'test@webkul.com'

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

@ -27,20 +27,6 @@ return [
'type' => 'textarea',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'order_status',
'title' => 'Order Status',
'type' => 'select',
'options' => [
[
'title' => 'Pending',
'value' => 'pending'
], [
'title' => 'Pending Payment',
'value' => 'pending_payment'
]
],
'validation' => 'required'
], [
'name' => 'active',
'title' => 'Status',
@ -75,20 +61,6 @@ return [
'type' => 'textarea',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'order_status',
'title' => 'Order Status',
'type' => 'select',
'options' => [
[
'title' => 'Pending',
'value' => 'pending'
], [
'title' => 'Pending Payment',
'value' => 'pending_payment'
]
],
'validation' => 'required'
], [
'name' => 'active',
'title' => 'Status',
@ -123,20 +95,6 @@ return [
'type' => 'textarea',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'order_status',
'title' => 'Order Status',
'type' => 'select',
'options' => [
[
'title' => 'Pending',
'value' => 'pending'
], [
'title' => 'Pending Payment',
'value' => 'pending_payment'
]
],
'validation' => 'required'
], [
'name' => 'business_account',
'title' => 'Business Account',

2
packages/Webkul/Sales/src/Repositories/OrderRepository.php
View File

@ -78,7 +78,7 @@ class OrderRepository extends Repository
unset($data['channel']);
}
$data['status'] = core()->getConfigData('sales.paymentmethods.' . $data['payment']['method'] . '.order_status') ?? 'pending';
$data['status'] = 'pending';
$order = $this->model->create(array_merge($data, ['increment_id' => $this->generateIncrementId()]));