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

Merge pull request #13 from bumbummen99/master

Browse Source 
Merge latest updates to backport
This commit is contained in:
Patrick
2019-06-26 17:37:43 +02:00
committed by GitHub
parent e21c2e93ab 74607eb5eb
commit 8808397a02
6 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -306,8 +306,8 @@ $cart->setTax($rowId, 21);
You can use the `setGlobalTax()` method to change the tax rate for all items in the cart. New items will receive the setGlobalTax as well. You can use the `setGlobalTax()` method to change the tax rate for all items in the cart. New items will receive the setGlobalTax as well.
```php ```php
Cart::setGlobalDiscount(21); Cart::setGlobalTax(21);
$cart->setGlobalDiscount(21); $cart->setGlobalTax(21);
``` ```
### Cart::setGlobalDiscount($discountRate) ### Cart::setGlobalDiscount($discountRate)
@@ -315,8 +315,8 @@ $cart->setGlobalDiscount(21);
You can use the `setGlobalDiscount()` method to change the discount rate for all items in the cart. New items will receive the discount as well. You can use the `setGlobalDiscount()` method to change the discount rate for all items in the cart. New items will receive the discount as well.
```php ```php
Cart::setGlobalDiscount(21); Cart::setGlobalDiscount(50);
$cart->setGlobalDiscount(21); $cart->setGlobalDiscount(50);
``` ```
### Cart::setDiscount($rowId, $taxRate) ### Cart::setDiscount($rowId, $taxRate)

6
composer.json
View File

@@ -6,11 +6,13 @@
"authors": [ "authors": [
{ {
"name": "Rob Gloudemans", "name": "Rob Gloudemans",
"email": "info@robgloudemans.nl" "email": "info@robgloudemans.nl",
"homepage": "http://robgloudemans.nl/"
}, },
{ {
"name": "Patrick Henninger", "name": "Patrick Henninger",
"email": "privat@skyraptor.eu" "email": "privat@skyraptor.eu",
"homepage": "https://skyraptor.eu/"
} }
], ],
"require": { "require": {

2
src/Cart.php
View File

@@ -110,7 +110,7 @@ class Cart
* *
* @return \Gloudemans\Shoppingcart\CartItem * @return \Gloudemans\Shoppingcart\CartItem
*/ */
public function add($id, $name = null, $qty = null, $price = null, $weight = null, array $options = []) public function add($id, $name = null, $qty = null, $price = null, $weight = 0, array $options = [])
{ {
if ($this->isMulti($id)) { if ($this->isMulti($id)) {
return array_map(function ($item) { return array_map(function ($item) {

3
src/CartItem.php
View File

@@ -97,6 +97,9 @@ class CartItem implements Arrayable, Jsonable
if (strlen($price) < 0 || !is_numeric($price)) { if (strlen($price) < 0 || !is_numeric($price)) {
throw new \InvalidArgumentException('Please supply a valid price.'); throw new \InvalidArgumentException('Please supply a valid price.');
} }
if (strlen($price) < 0 || !is_numeric($weight)) {
throw new \InvalidArgumentException('Please supply a valid weight.');
}
$this->id = $id; $this->id = $id;
$this->name = $name; $this->name = $name;

2
src/ShoppingcartServiceProvider.php
View File

@@ -30,6 +30,6 @@ class ShoppingcartServiceProvider extends ServiceProvider
$this->publishes([ $this->publishes([
realpath(__DIR__.'/Database/migrations') => $this->app->databasePath().'/migrations', realpath(__DIR__.'/Database/migrations') => $this->app->databasePath().'/migrations',
]); ], 'migrations');
} }
} }

13
tests/CartTest.php
View File

@@ -264,6 +264,19 @@ class CartTest extends TestCase
$cart->add(1, 'Some title', 1, 'invalid'); $cart->add(1, 'Some title', 1, 'invalid');
} }
/**
* @test
*/
public function it_will_validate_the_weight()
{
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Please supply a valid weight');
$cart = $this->getCart();
$cart->add(1, 'Some title', 1, 10.00, 'invalid');
}
/** @test */ /** @test */
public function it_will_update_the_cart_if_the_item_already_exists_in_the_cart() public function it_will_update_the_cart_if_the_item_already_exists_in_the_cart()
{ {