Joey
88e7d67dd1
Add a .git-blame-ignore-revs file to ignore the black & pylint commit in blame view. (#4129)
1 gadu atpakaļ
Hertog Jan
c9af48338d
Implement black and Pylint (#4126)
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
Viggo de Vries
a97c94c21d
Remove Werkzeug dependency, creates security errors. (#4122)
If you want to use Werkzeug please install yourselves in development environment
1 gadu atpakaļ
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 >
1 gadu atpakaļ
Voxin Muyli
640edfca5e
Make the oscar migrations able to handle different DEFAULT_AUTO_FIELD settings (#4121)
1 gadu atpakaļ
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
1 gadu atpakaļ
Voxin Muyli
de7363c315
Merge pull request #4120 from samar-hassan/samar/optimize-offer-listing
[FEAT] Optimize Offer Listing page
1 gadu atpakaļ
Voxin Muyli
d5d4e005c2
Merge pull request #4118 from jribbens/master
Fix convert_to_valid_json migrations
1 gadu atpakaļ
Samar Hassan
3a4015e47f
fix :wrench: resolve flake8 import error
1 gadu atpakaļ
Samar Hassan
2e4cfb4ffb
refactor :package: reduce db calls in offer listing page
1 gadu atpakaļ
Jon Ribbens
2b436b8f3c
Fix convert_to_valid_json migrations
Closes django-oscar/django-oscar#4117
1 gadu atpakaļ
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 >
1 gadu atpakaļ
Voxin Muyli
f36a933599
Merge pull request #4108 from WaqarAnwar/fixed-extra-)-in-apps.py
Fixed extra ) in apps.py
1 gadu atpakaļ
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 >
1 gadu atpakaļ
Samar Hassan
87a0bf2616
fix :bug: remove duplicate count in voucher offers (#4107)
1 gadu atpakaļ
WaqarAnwar
a75d5acd97
fixed-extra-)-in-apps.py
1 gadu atpakaļ
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
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
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 >
1 gadu atpakaļ
Joey Jurjens
72e60e9f95
Change basket quantity error message in tests as well.
1 gadu atpakaļ
Wessellix
1f2772c4b1
Don't allow adding to basket if the product has no price. (#4013)
1 gadu atpakaļ
Joey
b39920547d
If a product has a option it cannot be oversold (#4096)
* if a product has a option it cannot be oversold
* Improve error message
---------
Co-authored-by: wessel <wessel@highbiza.nl >
Co-authored-by: Lars van de Kerkhof <lars@permanentmarkers.nl >
1 gadu atpakaļ
Voxin Muyli
a096658ee7
Updated javascript dependencies with nom audit (#4099)
1 gadu atpakaļ
Voxin Muyli
eca7cee5f2
Merge pull request #4080 from django-oscar/dependabot/npm_and_yarn/tinymce/tinymce-jquery-2.1.0
Bump @tinymce /tinymce-jquery from 2.0.0 to 2.1.0
2 gadus atpakaļ
dependabot[bot]
67d8c26aae
Bump @tinymce/tinymce-jquery from 2.0.0 to 2.1.0
Bumps [@tinymce /tinymce-jquery](https://github.com/tinymce/tinymce-jquery ) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/tinymce/tinymce-jquery/releases )
- [Changelog](https://github.com/tinymce/tinymce-jquery/blob/main/CHANGELOG.md )
- [Commits](https://github.com/tinymce/tinymce-jquery/compare/2.0.0...2.1.0 )
---
updated-dependencies:
- dependency-name: "@tinymce /tinymce-jquery"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2 gadus atpakaļ
Voxin Muyli
5707823e2a
Merge pull request #4089 from django-oscar/dependabot/npm_and_yarn/tinymce-6.4.2
Bump tinymce from 6.1.2 to 6.4.2
2 gadus atpakaļ
Voxin Muyli
4d0a5ba5d3
Merge pull request #4022 from django-oscar/dependabot/npm_and_yarn/node-sass-8.0.0
Bump node-sass from 7.0.1 to 8.0.0
2 gadus atpakaļ
Lars van de Kerkhof
8d545105ec
flake8 6 requires a too large version of python
2 gadus atpakaļ
dependabot[bot]
ab7171c6c5
Bump node-sass from 7.0.1 to 8.0.0
Bumps [node-sass](https://github.com/sass/node-sass ) from 7.0.1 to 8.0.0.
- [Release notes](https://github.com/sass/node-sass/releases )
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/node-sass/compare/v7.0.1...v8.0.0 )
---
updated-dependencies:
- dependency-name: node-sass
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2 gadus atpakaļ
Voxin Muyli
6cf61334e2
Merge pull request #3998 from django-oscar/dependabot/npm_and_yarn/nan-2.17.0
Bump nan from 2.16.0 to 2.17.0
2 gadus atpakaļ
dependabot[bot]
49283be3f2
Bump flake8 from 4.0.1 to 6.0.0 (#4021)
* Bump flake8 from 4.0.1 to 6.0.0
Bumps [flake8](https://github.com/pycqa/flake8 ) from 4.0.1 to 6.0.0.
- [Release notes](https://github.com/pycqa/flake8/releases )
- [Commits](https://github.com/pycqa/flake8/compare/4.0.1...6.0.0 )
---
updated-dependencies:
- dependency-name: flake8
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
* Fixes pyflakes errors
---------
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
Co-authored-by: Lars van de Kerkhof <lars@permanentmarkers.nl >
2 gadus atpakaļ
Caio Jhonny
5905bc9ffb
Update getting_started.rst (#3991)
* remove in deveopment (#3941 )
* Update getting_started.rst
Missing pip installation for virtualenv instructions
* Update getting_started.rst
---------
Co-authored-by: Viggo de Vries <viggo@highbiza.nl >
Co-authored-by: Voxin Muyli <lars@permanentmarkers.nl >
2 gadus atpakaļ
Gunther Waidacher
26d57aea0e
Update how_to_integrate_payment.rst (#4087)
Added example how to integrate 'cash-on-delivery'
2 gadus atpakaļ
Voxin Muyli
d847076909
Merge pull request #3914 from turrisxyz/setup-permissions
chore: Set permissions for GitHub actions
2 gadus atpakaļ
Voxin Muyli
ef4e0a511a
Merge pull request #3996 from django-oscar/basket_voucher_from_voucherset_name
Use voucher_set name for vouchers in basket totals template
2 gadus atpakaļ
dependabot[bot]
07c0bb2d49
Bump tinymce from 6.1.2 to 6.4.2
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 6.1.2 to 6.4.2.
- [Release notes](https://github.com/tinymce/tinymce/releases )
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md )
- [Commits](https://github.com/tinymce/tinymce/commits/6.4.2/modules/tinymce )
---
updated-dependencies:
- dependency-name: tinymce
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2 gadus atpakaļ
dependabot[bot]
53b0deb765
Bump eslint from 8.33.0 to 8.39.0 (#4090)
Bumps [eslint](https://github.com/eslint/eslint ) from 8.33.0 to 8.39.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.33.0...v8.39.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 gadus atpakaļ
Alexey
55b3773050
i18n fixes (#3965)
* i18n fixes
Use i18n for search placeholder
Add i18n usage for Surcharge and Range abstract models where it was
missing
* Add trans to aria-label
* Add missing verbose names in migrations
---------
Co-authored-by: Viggodevries <viggo@highbiza.nl >
2 gadus atpakaļ
Voxin Muyli
675ad831f3
Merge pull request #4097 from django-oscar/fix_makemigrations_issues
Add default auto field for django 3
2 gadus atpakaļ
Viggodevries
9bf66a51b4
Add default auto field for django 3
2 gadus atpakaļ
Voxin Muyli
e7a5c538a4
Merge pull request #4093 from django-oscar/dependabot/npm_and_yarn/sass-1.62.1
Bump sass from 1.58.0 to 1.62.1
2 gadus atpakaļ
Voxin Muyli
44342df462
Create SECURITY.md (#4094)
* Create SECURITY.md
* Update SECURITY.md
Use github private reporting
2 gadus atpakaļ
Gunther Waidacher
a01ae6b5dd
Update how_to_setup_solr.rst (#4085)
Added instructions to add custom product attributes to Solr index and OSCAR_SEARCH_FACETS
2 gadus atpakaļ