Elia Luca Bottos
5bb9df3475
Bug AbsoluteDiscountBenefit (#3954)
* fix bug AbsoluteDiscountBenefit. Now discount is applied to all product and not one time on the basket only
* Revert "fix bug AbsoluteDiscountBenefit. Now discount is applied to all product and not one time on the basket only"
This reverts commit afae2c7ded .
* fix :wrench: update description for existing absolute discount
* feat :star: add migration file for absolute benefit description
* Revert "feat :star: add migration file for absolute benefit description"
This reverts commit 896c381f25 .
* fix :wrench: edit existing migration file for absolute discount benefit
---------
Co-authored-by: Samar Hassan <samarhassanphone@gmail.com >
2 år sedan
Voxin Muyli
2cc14b9eae
Merge pull request #4131 from django-oscar/dependabot/pip/whitenoise-gte-5.2-and-lt-6.6
Update whitenoise requirement from <6.5,>=5.2 to >=5.2,<6.6
2 år sedan
Voxin Muyli
aa2e3f0eeb
Merge pull request #4132 from django-oscar/dependabot/pip/django-redis-gte-4.12-and-lt-5.4
Update django-redis requirement from <5.3,>=4.12 to >=4.12,<5.4
2 år sedan
Voxin Muyli
1a1d12fe92
Merge pull request #4157 from django-oscar/dependabot/npm_and_yarn/eslint-8.48.0
Bump eslint from 8.43.0 to 8.48.0
2 år sedan
Voxin Muyli
fb990b9979
Merge pull request #4158 from django-oscar/dependabot/pip/redis-gte-3.5-and-lt-5.1
Update redis requirement from <4.6,>=3.5 to >=3.5,<5.1
2 år sedan
Voxin Muyli
c659a14812
Merge pull request #4160 from django-oscar/dependabot/pip/django-debug-toolbar-gte-2.2-and-lt-4.3
Update django-debug-toolbar requirement from <4.2,>=2.2 to >=2.2,<4.3
2 år sedan
Voxin Muyli
2d48d3d901
Merge pull request #4151 from blondelg/fix_readme_typo
Correct typo in README.rst
2 år sedan
Viggo de Vries
c8e03e917d
Always use the sphinx_rtd_theme (#4165)
2 år sedan
Viggodevries
4205a1a81d
add new .readthedocs config file (old way is deprecated late september 2023)
2 år sedan
Viggodevries
bb331a2624
Fix versioning
2 år sedan
Viggo de Vries
61a0886b56
3.2.1a (#4161)
* Up version to 3.2.1a
* Add 3.2.1 release note
* change
2 år sedan
dependabot[bot]
62cb2636d6
Update django-debug-toolbar requirement from <4.2,>=2.2 to >=2.2,<4.3
Updates the requirements on [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar ) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases )
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst )
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.2...4.2 )
---
updated-dependencies:
- dependency-name: django-debug-toolbar
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2 år sedan
dependabot[bot]
225734a2d2
Update redis requirement from <4.6,>=3.5 to >=3.5,<5.1
Updates the requirements on [redis](https://github.com/redis/redis-py ) to permit the latest version.
- [Release notes](https://github.com/redis/redis-py/releases )
- [Changelog](https://github.com/redis/redis-py/blob/master/CHANGES )
- [Commits](https://github.com/redis/redis-py/compare/3.5.0...v5.0.0 )
---
updated-dependencies:
- dependency-name: redis
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2 år sedan
dependabot[bot]
4fcc7029d2
Bump eslint from 8.43.0 to 8.48.0
Bumps [eslint](https://github.com/eslint/eslint ) from 8.43.0 to 8.48.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.43.0...v8.48.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2 år sedan
Geoffroy Blondel
6782521a14
correct typo in README.rst
2 år sedan
Viggo de Vries
5edac196f4
Save tax codes on the basket and order for reference (#4136)
* Add tax codes to basket and order
* Rename to tax_code
2 år sedan
Viggodevries
87161041df
Black and Lint fixes
2 år sedan
Samar Hassan
e65efaa136
fix :wrench: reduce db calls in range listing (#4128)
2 år sedan
Lars van de Kerkhof
495100d892
Reintroduce accidentally deleted Exception ModuleNotFoundError
2 år sedan
dependabot[bot]
febdfd35ae
Update django-redis requirement from <5.3,>=4.12 to >=4.12,<5.4
Updates the requirements on [django-redis](https://github.com/jazzband/django-redis ) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-redis/releases )
- [Changelog](https://github.com/jazzband/django-redis/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/jazzband/django-redis/compare/4.12.0...5.3.0 )
---
updated-dependencies:
- dependency-name: django-redis
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2 år sedan
dependabot[bot]
4d116ba3bb
Update whitenoise requirement from <6.5,>=5.2 to >=5.2,<6.6
Updates the requirements on [whitenoise](https://github.com/evansd/whitenoise ) to permit the latest version.
- [Changelog](https://github.com/evansd/whitenoise/blob/main/docs/changelog.rst )
- [Commits](https://github.com/evansd/whitenoise/compare/v5.2.0...6.5.0 )
---
updated-dependencies:
- dependency-name: whitenoise
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
2 år sedan
patrick-agbokou
832c2af12d
Update basket_totals.html - Fixed surcharges display (#4127)
2 år sedan
Joey
88e7d67dd1
Add a .git-blame-ignore-revs file to ignore the black & pylint commit in blame view. (#4129)
2 år sedan
Hertog Jan
c9af48338d
Implement black and Pylint (#4126)
2 år sedan
Gunther Waidacher
1d55f8df07
Manage excluded_products in ranges dashboard (#4073)
File Upload for excluded_products
* Add more tests and fix file upload processor by comma.
---------
Co-authored-by: Joey Jurjens <joey@highbiza.nl >
2 år sedan
dependabot[bot]
1a8aaef202
Update flake8 requirement from <6.0.0 to <7.0.0 (#4110)
Updates the requirements on [flake8](https://github.com/pycqa/flake8 ) to permit the latest version.
- [Commits](https://github.com/pycqa/flake8/compare/0.1...6.0.0 )
---
updated-dependencies:
- dependency-name: flake8
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
2 år sedan
dependabot[bot]
8da1ab19e2
Bump eslint from 8.39.0 to 8.43.0 (#4125)
Bumps [eslint](https://github.com/eslint/eslint ) from 8.39.0 to 8.43.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v8.39.0...v8.43.0 )
---
updated-dependencies:
- dependency-name: eslint
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
2 år sedan
dependabot[bot]
af38ab9901
Update django-debug-toolbar requirement from <4.1,>=2.2 to >=2.2,<4.2 (#4112)
Updates the requirements on [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar ) to permit the latest version.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases )
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst )
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.2...4.1 )
---
updated-dependencies:
- dependency-name: django-debug-toolbar
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
Co-authored-by: Viggo de Vries <viggo@highbiza.nl >
2 år sedan
Viggo de Vries
a97c94c21d
Remove Werkzeug dependency, creates security errors. (#4122)
If you want to use Werkzeug please install yourselves in development environment
2 år sedan
dependabot[bot]
69cb519482
Bump jquery from 3.6.4 to 3.7.0 (#4114)
Bumps [jquery](https://github.com/jquery/jquery ) from 3.6.4 to 3.7.0.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.6.4...3.7.0 )
---
updated-dependencies:
- dependency-name: jquery
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
2 år sedan
Voxin Muyli
640edfca5e
Make the oscar migrations able to handle different DEFAULT_AUTO_FIELD settings (#4121)
2 år sedan
Viggo de Vries
7651cb54ff
Only change order line status when status is available (#3948)
* Only change order line status when status is available
It's possible for lines to have a completely different status than the order.
When a line is at an "end status" where it cannot change anymore this will result in the line being changed to something you might not want.
* line status test
2 år sedan
Voxin Muyli
de7363c315
Merge pull request #4120 from samar-hassan/samar/optimize-offer-listing
[FEAT] Optimize Offer Listing page
2 år sedan
Voxin Muyli
d5d4e005c2
Merge pull request #4118 from jribbens/master
Fix convert_to_valid_json migrations
2 år sedan
Samar Hassan
3a4015e47f
fix :wrench: resolve flake8 import error
2 år sedan
Samar Hassan
2e4cfb4ffb
refactor :package: reduce db calls in offer listing page
2 år sedan
Jon Ribbens
2b436b8f3c
Fix convert_to_valid_json migrations
Closes django-oscar/django-oscar#4117
2 år sedan
Viggo de Vries
c7d5676354
Django 4.2, Python 3.11 (#4098)
* Add Python 3.10 to test suite
* Support Django 4.2, remove Python 3.7 support and add Python 3.11 support
---------
Co-authored-by: Craig Weber <crgwbr@gmail.com >
2 år sedan
Voxin Muyli
f36a933599
Merge pull request #4108 from WaqarAnwar/fixed-extra-)-in-apps.py
Fixed extra ) in apps.py
2 år sedan
Gunther Waidacher
8aa90a8cea
Speeding up Range.product_queryset() (#4100)
* Update abstract_models.py
Speeding up Range.product_queryset()
* one query less
* exclude parent_excludes query
* revert to previous Version
* save join over parent_excludes
* comment
* Improved readability.
---------
Co-authored-by: Lars van de Kerkhof <lars@permanentmarkers.nl >
2 år sedan
Samar Hassan
87a0bf2616
fix :bug: remove duplicate count in voucher offers (#4107)
2 år sedan
WaqarAnwar
a75d5acd97
fixed-extra-)-in-apps.py
2 år sedan
Joey
9aa30727ac
Use entire queryset for offer report download rather than paginated one (#4105)
* Use entire queryset for offer report download rather than paginated queryset
* Add offer order report test
* Specify order number in create_order factory
2 år sedan
Voxin Muyli
3c0f3adf39
Hutchison/master (#4106)
* Fixes a potential redirect loop in ProductDetailView if URL includes certain characters
If the URL includes a colon ':' then the ProductDetailView is getting
trapped into a redirect loop.
* Added test to prove the point
---------
Co-authored-by: Martin Darmüntzel <martin@trivialanalog.de >
2 år sedan
Voxin Muyli
c862b4c8d7
When there are product discountable true and variant discountable false in cart in the same time, discount is calculated for variant which is incorrect. (#4102)
* fix use get_is_discountable instead is_discountable attribute from product
* add test case
* add check discount percentage in test
* Fix test case
* remove file setting
* basket add product in test
* Make the test pass
---------
Co-authored-by: Kaew <ajchariya.ung@gmail.com >
2 år sedan
brahim12chamakh
1d1590f2a6
project contribution section and code of conduct (#4088)
* project contribution section and code of conduct
* emails uploaded
---------
Co-authored-by: Brahim Chamakh <brahim.chamakh@medtech.tn >
2 år sedan
dependabot[bot]
8fb6dc37ef
Bump inputmask from 5.0.7 to 5.0.8 (#4081)
Bumps [inputmask](https://github.com/RobinHerbots/Inputmask ) from 5.0.7 to 5.0.8.
- [Release notes](https://github.com/RobinHerbots/Inputmask/releases )
- [Commits](https://github.com/RobinHerbots/Inputmask/compare/5.0.7...5.0.8 )
---
updated-dependencies:
- dependency-name: inputmask
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
2 år sedan
Joey
26423e9f78
changed keyOrder to form.field_order (#4101)
* changed keyOrder to form.field_order
Django has it's own form.field_order for a long time (version 1.9). This was also crashing with a AttributeError in keyOrder.
* Lint
---------
Co-authored-by: Rafael Ferreira <rafael@queo.pt >
2 år sedan
Joey Jurjens
72e60e9f95
Change basket quantity error message in tests as well.
2 år sedan
Wessellix
1f2772c4b1
Don't allow adding to basket if the product has no price. (#4013)
2 år sedan