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

change way for default shipping & payment method selection

This commit is contained in:
rahul shukla 2019-10-01 16:26:49 +05:30
parent 45ff0b5602
commit d27dfd1c1e
8 changed files with 19 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,7 @@ return [
'description' => 'shop::app.checkout.onepage.cash-desc',
'class' => 'Webkul\Payment\Payment\CashOnDelivery',
'active' => true,
'sort' => 1,
'default' => 'yes'
'sort' => 1
],
'moneytransfer' => [
@ -16,8 +15,7 @@ return [
'description' => 'shop::app.checkout.onepage.money-desc',
'class' => 'Webkul\Payment\Payment\MoneyTransfer',
'active' => true,
'sort' => 2,
'default' => 'no'
'sort' => 2
],
'paypal_standard' => [
@ -28,7 +26,6 @@ return [
'sandbox' => true,
'active' => true,
'business_account' => 'test@webkul.com',
'sort' => 3,
'default' => 'no'
'sort' => 3
]
];

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

@ -62,14 +62,7 @@ return [
'value' => 4
]
],
], [
'name' => 'default',
'title' => 'admin::app.admin.system.default',
'type' => 'boolean',
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
],
]
]
], [
'key' => 'sales.paymentmethods.moneytransfer',
@ -124,14 +117,7 @@ return [
'value' => 4
]
],
], [
'name' => 'default',
'title' => 'admin::app.admin.system.default',
'type' => 'boolean',
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
],
]
]
], [
'key' => 'sales.paymentmethods.paypal_standard',
@ -192,14 +178,7 @@ return [
'value' => 4
]
],
], [
'name' => 'default',
'title' => 'admin::app.admin.system.default',
'type' => 'boolean',
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
],
]
]
]
];

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

@ -41,7 +41,6 @@ class Payment
'method_title' => $object->getTitle(),
'description' => $object->getDescription(),
'sort' => $object->getSortOrder(),
'default' => $object->getDefaultMethod(),
];
}
}

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

@ -119,14 +119,4 @@ abstract class Payment
{
return $this->getConfigData('sort');
}
/**
* Returns default payment method.
*
* @return boolean
*/
public function getDefaultMethod()
{
return $this->getConfigData('default');
}
}

6
packages/Webkul/Shipping/src/Config/carriers.php
View File

@ -8,8 +8,7 @@ return [
'active' => true,
'default_rate' => '10',
'type' => 'per_unit',
'class' => 'Webkul\Shipping\Carriers\FlatRate',
'default' => 'yes',
'class' => 'Webkul\Shipping\Carriers\FlatRate'
],
'free' => [
@ -18,7 +17,6 @@ return [
'description' => 'Free Shipping',
'active' => true,
'default_rate' => '0',
'class' => 'Webkul\Shipping\Carriers\Free',
'default' => 'yes',
'class' => 'Webkul\Shipping\Carriers\Free'
]
];

18
packages/Webkul/Shipping/src/Config/system.php
View File

@ -43,14 +43,7 @@ return [
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'default',
'title' => 'admin::app.admin.system.default',
'type' => 'boolean',
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
],
]
]
], [
'key' => 'sales.carriers.flatrate',
@ -106,14 +99,7 @@ return [
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
], [
'name' => 'default',
'title' => 'admin::app.admin.system.default',
'type' => 'boolean',
'validation' => 'required',
'channel_based' => false,
'locale_based' => true
],
]
]
], [
'key' => 'sales.shipping',

1
packages/Webkul/Shipping/src/Shipping.php
View File

@ -98,7 +98,6 @@ class Shipping
if (! isset($rates[$rate->carrier])) {
$rates[$rate->carrier] = [
'carrier_title' => $rate->carrier_title,
'default' => core()->getConfigData('sales.carriers.' . $rate->carrier. '.default'),
'rates' => []
];
}

14
packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
View File

@ -372,11 +372,13 @@
staticRenderFns: shippingTemplateRenderFns,
mounted: function() {
var first_iteration = true;
for (method in shippingMethods) {
if (shippingMethods[method]['default'] == 'yes' || shippingMethods[method]['default'] == 1) {
if (first_iteration) {
for (rate in shippingMethods[method]['rates']) {
this.selected_shipping_method = shippingMethods[method]['rates'][rate]['method'];
first_iteration = false;
this.methodSelected();
}
}
@ -425,10 +427,12 @@
staticRenderFns: paymentTemplateRenderFns,
mounted: function() {
for (method in paymentMethods) {
if (paymentMethods[method]['default'] == 'yes' || paymentMethods[method]['default'] == 1) {
this.payment.method = paymentMethods[method]['method'];
var first_iteration = true;
for (method in paymentMethods) {
if (first_iteration) {
this.payment.method = paymentMethods[method]['method'];
first_iteration = false;
this.methodSelected();
}
}