totole/LaravelShoppingcart
1
0
Fork 0
mirror of https://github.com/kevin-DL/LaravelShoppingcart.git synced 2026-01-11 18:54:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from dtwebuk/6.0

Browse Source 
Updated to support Laravel 6.0
This commit is contained in:
Patrick
2019-09-06 18:05:24 +02:00
committed by GitHub
parent 0252107aa8 6f9aace218
commit bfbebfd391
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -7,7 +7,7 @@
[![Latest Unstable Version](https://poser.pugx.org/bumbummen99/shoppingcart/v/unstable)](https://packagist.org/packages/bumbummen99/shoppingcart)
[![License](https://poser.pugx.org/bumbummen99/shoppingcart/license)](https://packagist.org/packages/bumbummen99/shoppingcart)
This is a fork of [Crisane's LaravelShoppingcart](https://github.com/Crinsane/LaravelShoppingcart) extended with minor features compatible with Laravel 5.8.
This is a fork of [Crisane's LaravelShoppingcart](https://github.com/Crinsane/LaravelShoppingcart) extended with minor features compatible with Laravel 6.
## Installation

6
composer.json
View File

@@ -16,9 +16,9 @@
}
],
"require": {
"illuminate/support": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*",
"illuminate/session": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*",
"illuminate/events": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*"
"illuminate/support": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*||6.0.*",
"illuminate/session": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*||6.0.*",
"illuminate/events": "5.4.*||5.5.*||5.6.*||5.7.*||5.8.*||6.0.*"
},
"require-dev": {
"phpunit/phpunit": "~5.0||~6.0||~7.0||~8.0",

15
src/CartItem.php
View File

@@ -5,6 +5,7 @@ namespace Gloudemans\Shoppingcart;
use Gloudemans\Shoppingcart\Contracts\Buyable;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Support\Jsonable;
use Illuminate\Support\Arr;
class CartItem implements Arrayable, Jsonable
{
@@ -289,13 +290,13 @@ class CartItem implements Arrayable, Jsonable
*/
public function updateFromArray(array $attributes)
{
$this->id = array_get($attributes, 'id', $this->id);
$this->qty = array_get($attributes, 'qty', $this->qty);
$this->name = array_get($attributes, 'name', $this->name);
$this->price = array_get($attributes, 'price', $this->price);
$this->weight = array_get($attributes, 'weight', $this->weight);
$this->id = Arr::get($attributes, 'id', $this->id);
$this->qty = Arr::get($attributes, 'qty', $this->qty);
$this->name = Arr::get($attributes, 'name', $this->name);
$this->price = Arr::get($attributes, 'price', $this->price);
$this->weight = Arr::get($attributes, 'weight', $this->weight);
$this->priceTax = $this->price + $this->tax;
$this->options = new CartItemOptions(array_get($attributes, 'options', $this->options));
$this->options = new CartItemOptions(Arr::get($attributes, 'options', $this->options));
$this->rowId = $this->generateRowId($this->id, $this->options->all());
}
@@ -412,7 +413,7 @@ class CartItem implements Arrayable, Jsonable
*/
public static function fromArray(array $attributes)
{
$options = array_get($attributes, 'options', []);
$options = Arr::get($attributes, 'options', []);
return new self($attributes['id'], $attributes['name'], $attributes['price'], $attributes['weight'], $options);
}