diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php index 3bfdf2574..90bb314a5 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php @@ -153,7 +153,7 @@ - {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php index f5329d212..6d1df23d6 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php @@ -142,7 +142,7 @@ - {{ core()->getConfigData('paymentmethods.' . $invoice->order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }} {{ $invoice->order->shipping_title }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php index 967b099bf..392b766e1 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php @@ -153,7 +153,7 @@ - {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php index a2940d97a..030e6c8cb 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php @@ -160,7 +160,7 @@ - {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php index af2e0b615..eae212a51 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php @@ -153,7 +153,7 @@ - {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php index 9359dfbd6..154d058c0 100644 --- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php @@ -149,7 +149,7 @@ - {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index aeba6ae3c..82bd7d870 100644 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -537,8 +537,7 @@ class Core 'code' => $field, 'locale_code' => $locale ]); - } - else { + } else { $coreConfigValue = $this->coreConfigRepository->findOneWhere([ 'code' => $field ]); diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index 91b0237a7..e2fdcf72e 100644 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -78,7 +78,7 @@ class OrderRepository extends Repository unset($data['channel']); } - $data['status'] = core()->getConfigData('paymentmethods.' . $data['payment']['method'] . '.order_status') ?? 'pending'; + $data['status'] = core()->getConfigData('sales.paymentmethods.' . $data['payment']['method'] . '.order_status') ?? 'pending'; $order = $this->model->create(array_merge($data, ['increment_id' => $this->generateIncrementId()])); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index b8848fe8b..59a92746e 100644 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -122,7 +122,7 @@
- {{ core()->getConfigData('paymentmethods.' . $cart->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $cart->payment->method . '.title') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php index b95ccbcfc..3a500402a 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php @@ -142,7 +142,7 @@ - {{ core()->getConfigData('paymentmethods.' . $invoice->order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }} {{ $invoice->order->shipping_title }} diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php index fe2abd354..a6be5135d 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php @@ -483,7 +483,7 @@
- {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php index df09c3823..d22054e6c 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php @@ -91,7 +91,7 @@
- {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php index cd0b7a1c2..6fdfb0405 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php @@ -89,7 +89,7 @@
- {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php index a0b0e2124..e9f346051 100644 --- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php @@ -101,7 +101,7 @@
- {{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }} + {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}