From 4b2088e66e91266b103647d613e67d8019fba13d Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Mon, 30 Dec 2019 17:10:38 +0530
Subject: [PATCH] upgrade to laravel 6

---
 .../src/Resources/views/configuration/index.blade.php  |  2 +-
 .../src/Resources/views/layouts/nav-aside.blade.php    |  2 +-
 .../Admin/src/Resources/views/layouts/tabs.blade.php   | 10 +++++-----
 packages/Webkul/Checkout/src/Cart.php                  |  7 ++++---
 .../Webkul/Core/src/Repositories/SliderRepository.php  |  5 +++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
index cf1de3a02..d31e62144 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/index.blade.php
@@ -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)
 
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
index a4d47543b..d3f9e1e7c 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php
@@ -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']) }}
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
index 2841c152f..06601d2fe 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/tabs.blade.php
@@ -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>
 
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index 6e9cc6885..8433552de 100755
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -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']),
             ]);
         }
 
diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php
index 308f3c568..6317583a2 100755
--- a/packages/Webkul/Core/src/Repositories/SliderRepository.php
+++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php
@@ -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;
             });
         }