Commit Graph

59 Commits

Author SHA1 Message Date
Patrick
06a828208b Update CartItem.php 2022-02-03 00:00:30 +01:00
Patrick
211d4f4022 Update CartItem.php 2022-01-18 01:05:19 +01:00
Patrick
23325c2bb7 Update CartItem.php 2022-01-18 00:50:01 +01:00
Patrick
c67d72d65c Update CartItem.php 2022-01-17 23:47:34 +01:00
Patrick
9501f4c062 Update CartItem.php 2022-01-17 23:46:40 +01:00
Patrick
2f5018db5a Update CartItem.php 2022-01-17 23:45:40 +01:00
Patrick
20a4afd2ea Merge branch 'master' into master 2022-01-17 19:26:37 +01:00
Patrick
09378ab742 Update CartItem.php 2022-01-17 19:24:12 +01:00
Andrew Minion
58f8648935 add handling for arrays 2021-12-10 10:35:36 -06:00
Andrew Minion
9a7d88fc35 fix docs 2021-12-03 12:21:53 -06:00
Chris Thompson
01f7bb04e8 Fixing continous-integration complaint 2021-12-01 08:36:30 -05:00
Chris Thompson
dcd41d3790 Make the CartItem aware of its cart instance 2021-11-30 17:25:47 -05:00
Patrick Henninger
a215c63165 Style CI 2020-08-29 22:12:00 +02:00
Patrick Henninger
43e440c485 Add Calculator Contract,
Add some checking for calculators,
2020-08-29 22:09:38 +02:00
Patrick Henninger
e5b93829c5 Remove leftover typehint 2020-08-29 16:21:57 +02:00
Patrick Henninger
791747c28d StyleCI 2020-08-29 16:19:12 +02:00
Patrick Henninger
238d8cf7d9 Refactor gross price / default into calculators,
Remove gross_price from config replaced with calculator
2020-08-29 16:18:05 +02:00
Patrick
ae0a976785 Prevent negative subtotal
Manual merge of 33fc42dae1
2020-08-29 15:47:33 +02:00
Patrick Henninger
085693def0 StyleCI 2020-07-28 15:36:04 +02:00
sartoric
2078f119ec Enable gross price as base price 2020-02-12 22:42:41 +01:00
Patrick Henninger
7b29fe376d StyleCI 2020-01-18 17:29:06 +01:00
sartoric
9cdacf901c changed the strategy for cart values calculation (taxes per row),
test,
some fixes
2020-01-14 22:33:12 +01:00
sartoric
de1bf2a5ea fix issue with the priceTax value that is not dynamically retrieved 2020-01-09 19:15:48 +01:00
Patrick Henninger
d0cf5d7ab0 Corrected PHPDoc 2019-10-21 19:52:03 +02:00
Cristian
f31c153e3e Update CartItem.php
weight variable in if block
2019-10-21 19:00:34 +02:00
Patrick Henninger
14e8a40534 Changed $taxRate from private to public, Solve https://github.com/Crinsane/LaravelShoppingcart/issues/436 2019-09-27 19:00:10 +02:00
Dan Tomlinson
7401f5bbb1 Replaced array_get with Arr::get as the helper method has been removed in 6.0 2019-09-06 16:49:50 +01:00
Patrick
0c36a1d72e Update CartItem.php
Revert last change
2019-06-23 00:24:25 +02:00
Patrick
9d6a5dab8c Update CartItem.php
Remove strlen from weight
2019-06-23 00:11:50 +02:00
Patrick Henninger
9e35faece2 Add validation and exception for weight to CartItem Constructor 2019-05-12 17:23:14 +02:00
Patrick Henninger
e83371d542 Removed unneccessary return statements 2019-03-01 15:11:31 +01:00
Patrick Henninger
1499475663 Replaced deprecated OR operator https://getcomposer.org/doc/articles/versions.md#version-range
Added 5.8.* compatibility
Updated dependency versions
Added phpunit result cache to gitignore
2019-03-01 14:59:44 +01:00
Patrick Henninger
5636a36388 Codestyle
ignore tests added to styleci.yml
2019-01-14 18:16:29 +01:00
Patrick Henninger
862030288c Codestyle 2019-01-14 18:11:13 +01:00
Patrick Henninger
0521280040 Further codestyle changes 2019-01-14 17:54:38 +01:00
Patrick Henninger
70073ccb92 manuall readded reverted changes 2019-01-09 13:06:16 +01:00
Patrick Henninger
55f1c4617f Revert "Manually merged https://github.com/Crinsane/LaravelShoppingcart/pull/502"
This reverts commit 5d117a0acd.
2019-01-09 12:22:25 +01:00
Patrick Henninger
dcab743407 Revert "Code formatting & quality"
This reverts commit 52a56768ba.
2019-01-09 12:22:15 +01:00
Patrick Henninger
52a56768ba Code formatting & quality
Cleaned up __get methods
2019-01-08 20:53:41 +01:00
Patrick Henninger
5d117a0acd Manually merged https://github.com/Crinsane/LaravelShoppingcart/pull/502
Added more tests
2019-01-08 20:00:28 +01:00
Patrick Henninger
1190d72b52 Add changes from https://github.com/Crinsane/LaravelShoppingcart/pull/350
Add changes from https://github.com/Crinsane/LaravelShoppingcart/pull/349
Add changes from https://github.com/Crinsane/LaravelShoppingcart/pull/478
2018-12-28 03:50:42 +01:00
Patrick Henninger
388951d289 Fixed cart calculation methods 2018-12-21 17:32:55 +01:00
Patrick Henninger
9e4c6c4a71 Adjusted calcualtion tests need specific discount tests 2018-12-21 15:52:00 +01:00
Patrick Henninger
48df3f5d74 Adjusted for global discount
Fixed tests for Laravel 5.7
2018-12-21 15:18:27 +01:00
John Markese
803703d170 Update CartItem.php
Fix fatal error caused by instantiating a null associatedModel.
2017-08-22 10:29:39 -05:00
Rob Gloudemans
39de887e09 Made CartItem implement Jsonable, so it can be cast to json by laravel when building a response 2017-05-21 16:38:33 +02:00
Rob Gloudemans
143d51b22b Make associate() and setTaxRate() return self so it can be chained 2016-10-13 12:10:37 +02:00
Nadir Absemetov
2b59ca8f0e Update CartItem.php
Save options value in updateFromArray function
2016-10-12 17:24:49 +03:00
jorge
b313f8af43 fix falsy format numbers 2016-09-07 15:05:06 -04:00
Rob Gloudemans
476f248e8d Merge pull request #202 from jorgejavierleon/config_number_format
Set default number format in config file
2016-09-05 08:26:29 +02:00