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

Merge pull request #409 from jitendra-webkul/jitendra 

Get config for shipping and payment method updated
This commit is contained in:
JItendra Singh 2018-12-26 18:54:06 +05:30 committed by GitHub
parent a3d2f121aa 6b2b054f97
commit feb6c8cc76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
View File

@ -153,7 +153,7 @@
</span>
<span class="value">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -142,7 +142,7 @@
<tbody>
<tr>
<td>
{{ core()->getConfigData('paymentmethods.' . $invoice->order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
</td>
<td>
{{ $invoice->order->shipping_title }}

2
packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
View File

@ -153,7 +153,7 @@
</span>
<span class="value">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>

2
packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
View File

@ -160,7 +160,7 @@
</span>
<span class="value">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>

2
packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
View File

@ -153,7 +153,7 @@
</span>
<span class="value">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>

2
packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
View File

@ -149,7 +149,7 @@
</span>
<span class="value">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</span>
</div>

3
packages/Webkul/Core/src/Core.php
View File

@ -537,8 +537,7 @@ class Core
'code' => $field,
'locale_code' => $locale
]);
}
else {
} else {
$coreConfigValue = $this->coreConfigRepository->findOneWhere([
'code' => $field
]);

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('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()]));

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

@ -122,7 +122,7 @@
</div>
<div class="text">
{{ core()->getConfigData('paymentmethods.' . $cart->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $cart->payment->method . '.title') }}
</div>
</div>

2
packages/Webkul/Shop/src/Resources/views/customers/account/orders/pdf.blade.php
View File

@ -142,7 +142,7 @@
<tbody>
<tr>
<td>
{{ core()->getConfigData('paymentmethods.' . $invoice->order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $invoice->order->payment->method . '.title') }}
</td>
<td>
{{ $invoice->order->shipping_title }}

2
packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
View File

@ -483,7 +483,7 @@
</div>
<div class="box-content">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</div>
</div>
</div>

2
packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
View File

@ -91,7 +91,7 @@
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</div>
</div>
</div>

2
packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
View File

@ -89,7 +89,7 @@
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</div>
</div>
</div>

2
packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
View File

@ -101,7 +101,7 @@
</div>
<div style="font-weight: bold;font-size: 16px; color: #242424;">
{{ core()->getConfigData('paymentmethods.' . $order->payment->method . '.title') }}
{{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
</div>
</div>
</div>