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

upgrade to laravel 6

This commit is contained in:
rahul shukla 2019-12-30 17:10:38 +05:30
parent 5c0843c470
commit 4b2088e66e
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
View File

@ -54,7 +54,7 @@
<div class="form-container">
@csrf()
@if ($groups = array_get($config->items, request()->route('slug') . '.children.' . request()->route('slug2') . '.children'))
@if ($groups = \Illuminate\Support\Arr::get($config->items, request()->route('slug') . '.children.' . request()->route('slug2') . '.children'))
@foreach ($groups as $key => $item)

2
packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
View File

@ -4,7 +4,7 @@
<?php $keys = explode('.', $menu->currentKey); ?>
@if(isset($keys) && strlen($keys[0]))
@foreach (array_get($menu->items, current($keys) . '.children') as $item)
@foreach (\Illuminate\Support\Arr::get($menu->items, current($keys) . '.children') as $item)
<li class="{{ $menu->getActive($item) }}">
<a href="{{ $item['url'] }}">
{{ trans($item['name']) }}

10
packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
View File

@ -4,11 +4,11 @@
<?php $keys = explode('.', $menu->currentKey); ?>
@if ($items = array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children'))
@if ($items = \Illuminate\Support\Arr::get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children'))
<ul>
@foreach (array_get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
@foreach (\Illuminate\Support\Arr::get($menu->items, implode('.children.', array_slice($keys, 0, 2)) . '.children') as $item)
<li class="{{ $menu->getActive($item) }}">
<a href="{{ $item['url'] }}">
@ -17,14 +17,14 @@
</li>
@endforeach
</ul>
@endif
@else
@if ($items = array_get($config->items, request()->route('slug') . '.children'))
@if ($items = \Illuminate\Support\Arr::get($config->items, request()->route('slug') . '.children'))
<ul>

7
packages/Webkul/Checkout/src/Cart.php
View File

@ -12,6 +12,7 @@ use Webkul\Checkout\Models\CartPayment;
use Webkul\Customer\Repositories\WishlistRepository;
use Webkul\Customer\Repositories\CustomerAddressRepository;
use Illuminate\Support\Facades\Event;
use Illuminate\Support\Arr;
/**
* Facades handler for all the methods to be implemented in Cart.
@ -837,8 +838,8 @@ class Cart {
'base_tax_amount' => $data['base_tax_total'],
'discount_amount' => $data['discount_amount'],
'base_discount_amount' => $data['base_discount_amount'],
'billing_address' => array_except($data['billing_address'], ['id', 'cart_id']),
'payment' => array_except($data['payment'], ['id', 'cart_id']),
'billing_address' => Arr::except($data['billing_address'], ['id', 'cart_id']),
'payment' => Arr::except($data['payment'], ['id', 'cart_id']),
'channel' => core()->getCurrentChannel(),
];
@ -849,7 +850,7 @@ class Cart {
'shipping_description' => $data['selected_shipping_rate']['method_description'],
'shipping_amount' => $data['selected_shipping_rate']['price'],
'base_shipping_amount' => $data['selected_shipping_rate']['base_price'],
'shipping_address' => array_except($data['shipping_address'], ['id', 'cart_id']),
'shipping_address' => Arr::except($data['shipping_address'], ['id', 'cart_id']),
]);
}

5
packages/Webkul/Core/src/Repositories/SliderRepository.php
View File

@ -6,6 +6,7 @@ use Illuminate\Container\Container as App;
use Webkul\Core\Eloquent\Repository;
use Webkul\Core\Repositories\ChannelRepository;
use Storage;
use Illuminate\Support\Arr;
/**
* Slider Repository
@ -62,7 +63,7 @@ class SliderRepository extends Repository
$image = false;
if (isset($data['image'])) {
$image = $first = array_first($data['image'], function ($value, $key) {
$image = $first = Arr::first($data['image'], function ($value, $key) {
if ($value)
return $value;
else
@ -98,7 +99,7 @@ class SliderRepository extends Repository
$uploaded = $image = false;
if (isset($data['image'])) {
$image = $first = array_first($data['image'], function ($value, $key) {
$image = $first = Arr::first($data['image'], function ($value, $key) {
return $value ? $value : false;
});
}