Viggo de Vries
31941d7c23
Bump version 3.2.3 final
1年前
Christian Clauss
1f648de960
Keep GitHub Actions up to date with Dependabot (#4230)
https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
1年前
Christian Clauss
8f57e5cfae
make black (#4235)
1年前
Viggo de Vries
12d16f8979
change order in docs
1年前
Viggo de Vries
788f051ea9
3.2.3rc3 release + set final release date
1年前
Christian Clauss
84ef6431ec
README.rst: Fix typo (#4229)
1年前
Viggo de Vries
35315a2384
Update README.rst
1年前
Viggo de Vries
b50e65dae9
Merge branch 'releases/3.2.3a0'
1年前
Viggo de Vries
633c9a1206
add release to menu
1年前
Viggo de Vries
89829dd527
Release 3.2.3 alpha 1 (#4224)
* Prepare 3.2.3a1 release
* Load in translations
* Add release note
1年前
Viggo de Vries
fe1e606e4f
Add release note
1年前
Viggo de Vries
4903aeffc6
Load in translations
1年前
Viggo de Vries
17366b394d
Prepare 3.2.3a1 release
1年前
Gunther Waidacher
a7366b62a3
Update BasketMiddleware.get_basket() to show warning only if items have been merged (#4145)
* Update middleware.py
Show warning only if merged baskets had items, including the total number of items that have been merged.
* fix removed Tab
* pylint
* fix line wrap
* line wrap
* fix comment too long
* comment too long
* Fix message
* use f-string
* # pylint: disable=protected-access
* still don't know what py_lint wants me to correct...
* pylint: disable=unused-argument
* make black
* f-String replaced
* added test
* TestCase with get_messages
* set request.basket
* use middleware.get_basket()
* add product to cookie basket
* make black
* empty Basket
* post to "/"
* authenticate via EmailBackend
* make black
* basket from RequestFactory
* request.basket after middleware call
* factories.create_basket()
* fix imports
* message from context
* fix import
* WebTest
* make black
* WebTestCase
* fix white space
* WebTest again
* no assertIsRedirect member
* moved test to functional
* fix import
* set cookie
* BasketView.as_view()
* get("/")
* fix AssertionError
* use WebTestCase.get()
* make black
* RequestFactory again
* call middleware
* messages from response.context
* fix tipo
* get response from Client
* get response from Client
* use User model
* fix User creation
* fix get messages from context
* refactored
* make black!
* add product with post()
* fix tipo
* save basket
* check cookie key from response
* make black
* get further
* get cookie_basket
* do not follow
* fix whitespace
* make black
* no assertIsRedirect in TestCase
* WebTestCase again
* make black
* fix product
* check message 2
* check frirst message
* new strategy
* cookie_basket.num_items
* make black
* check message 2
* check message 3
* check message 3
* make black
* response.test_app
* self.app.get
* no follow in WebTestApp
* get_essages
* initialize client
* sseparate Test class
* check cookie
* make black
* no unquote
* check context
* follow
* post add to basket
* no RequestFactory
* save cookie in session
* fix product
* set client cookie
* check 2nd message
* set cookie in session
* follow again
* check message 2
* RequestFactory in between
* user
* request up
* check basket content
* login later
* WebTestCase again
* submit again
* get message from response cookies
* don't follow
* removed unused cookie
* test basket
* get basket
* TestCase again
* make black
* "oscar_open_basket"
* don't follow
* check messages from response.context
* message format
* define user in setUp
* pluralized merged basket message
* update message
* lint
---------
Co-authored-by: Samar Hassan <samarhassanphone@gmail.com >
1年前
frlnx
8051280e3a
fix link to documentation in the README.rst (#4223)
* fix link to documentation in the README.rst
* Update README.rst
---------
Co-authored-by: Viggo de Vries <viggo@highbiza.nl >
1年前
Gunther Waidacher
8c04b7d6af
Speedup Range.product_queryset(): exlude Products without parent from join (#4222)
1年前
dependabot[bot]
537084324d
Update django-environ requirement from <0.11,>=0.4 to >=0.4,<0.12 (#4159)
Updates the requirements on [django-environ](https://github.com/joke2k/django-environ ) to permit the latest version.
- [Release notes](https://github.com/joke2k/django-environ/releases )
- [Changelog](https://github.com/joke2k/django-environ/blob/main/CHANGELOG.rst )
- [Commits](https://github.com/joke2k/django-environ/compare/v0.4...v0.11.1 )
---
updated-dependencies:
- dependency-name: django-environ
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年前
dependabot[bot]
385a3e2fae
Bump jquery from 3.7.0 to 3.7.1 (#4155)
Bumps [jquery](https://github.com/jquery/jquery ) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/jquery/jquery/releases )
- [Commits](https://github.com/jquery/jquery/compare/3.7.0...3.7.1 )
---
updated-dependencies:
- dependency-name: jquery
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年前
dependabot[bot]
ccd6dd95c0
Bump nan from 2.17.0 to 2.18.0 (#4176)
Bumps [nan](https://github.com/nodejs/nan ) from 2.17.0 to 2.18.0.
- [Changelog](https://github.com/nodejs/nan/blob/main/CHANGELOG.md )
- [Commits](https://github.com/nodejs/nan/compare/v2.17.0...v2.18.0 )
---
updated-dependencies:
- dependency-name: nan
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年前
Ajay saini
2ec736876f
Update getting_started.rst fixed "Create database" indentation (#4207)
1年前
dependabot[bot]
1a7c8c6a5f
Bump sass from 1.62.1 to 1.69.5 (#4193)
Bumps [sass](https://github.com/sass/dart-sass ) from 1.62.1 to 1.69.5.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.62.1...1.69.5 )
---
updated-dependencies:
- dependency-name: sass
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年前
dependabot[bot]
702e7c7489
Bump eslint from 8.48.0 to 8.54.0 (#4211)
Bumps [eslint](https://github.com/eslint/eslint ) from 8.48.0 to 8.54.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.48.0...v8.54.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年前
dependabot[bot]
796475ec40
Bump @fortawesome/fontawesome-free from 6.4.0 to 6.5.1 (#4212)
Bumps [@fortawesome /fontawesome-free](https://github.com/FortAwesome/Font-Awesome ) from 6.4.0 to 6.5.1.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/6.x/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/6.4.0...6.5.1 )
---
updated-dependencies:
- dependency-name: "@fortawesome /fontawesome-free"
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年前
dependabot[bot]
42ad8c6fea
Bump tinymce from 6.4.2 to 6.8.1 (#4210)
Bumps [tinymce](https://github.com/tinymce/tinymce/tree/HEAD/modules/tinymce ) from 6.4.2 to 6.8.1.
- [Changelog](https://github.com/tinymce/tinymce/blob/develop/modules/tinymce/CHANGELOG.md )
- [Commits](https://github.com/tinymce/tinymce/commits/6.8.1/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 >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
1年前
Islam Mesha
413de1ffae
Register the Notification model to Django admin (#4186)
1年前
dependabot[bot]
8a6dca9ff7
Bump node-sass from 8.0.0 to 9.0.0 (#4113)
Bumps [node-sass](https://github.com/sass/node-sass ) from 8.0.0 to 9.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/v8.0.0...v9.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 >
Co-authored-by: dependabot[bot] <49699333 +dependabot[bot]@users.noreply.github.com >
1年前
Samar Hassan
ccf712a520
[Refactor] Move OfferWizardStepView to separate file (#4174)
* refactor :package: move OfferWizardStepView to separate file
* refactor :package: remove unused offer combinations code
* refactor :package: remove unused get_back_url method
1年前
Samar Hassan
352119466f
Merge pull request #4138 from django-oscar/register-discounts
Register discounts per line
1年前
Samar Hassan
d6787583b0
update comment
1年前
Lars van de Kerkhof
cdd03bde8c
Added missing implementation for computing line_price_excl_tax_incl_discounts when line_price_excl_tax is not known at all.
1年前
Viggodevries
627298822b
Remove comments and change exception names
2 年前
Lars van de Kerkhof
ce2a5129ae
Remove usage of deprecated propertie consumed and consumer
2 年前
Lars van de Kerkhof
49bc78f6a6
Don't use deprecated get_is_discountable in template
2 年前
Lars van de Kerkhof
51ca7be262
Fixes annoying tests failing if assets had been built
2 年前
Lars van de Kerkhof
44f2252b04
It shouldn't be needed to change the strategy to use a diffferent price object when OSCAR_OFFERS_INCL_TAX setting is changed
2 年前
Viggodevries
0bd835a068
Create line discount models so we know what discount was applied to what line
2 年前
Lars van de Kerkhof
2fdee65ccf
Implemented line_price_incl_tax_incl_discounts based on line_price_excl_tax_incl_discounts when only excl_tax_discounts is known.
2 年前
Lars van de Kerkhof
9902021aad
Implemented LineDiscountRegistry
2 年前
Lars van de Kerkhof
e6fb1897a4
Register discounts on the order line
2 年前
Viggo de Vries
9afb182d57
Check if child has parent not only on ID
1年前
Viggo de Vries
872e42a106
Return no attribute values if the product has not yet been saved (#4217)
1年前
Viggo de Vries
d94e52babc
Add codes to unidentifiable catalogue models (#4216)
* Add codes to unidentifiable catalogue models
* Add missing migration
1年前
Viggo de Vries
05b313b676
Add prepare save method to make it possible to bulk save attributes (#4209)
* Add prepare save method to make it possible to bulk save attributes
* change the order to be more logical
* Change order again
1年前
Samar Hassan
25092a272b
Merge pull request #4214 from django-oscar/fixes-broken-migration
Fixes broken migration of attribute values
1年前
Lars van de Kerkhof
dd5bb502f1
Fixes broken migration of attribute values
Currently _get_value calls other model properties which are not defined on the historical model.
Replace usage of historical model with a helper function
1年前
Samar Hassan
d0e83c6eb8
Merge pull request #4184 from vallabhtiwari/showIsActiveFalse
Fixes #3844 suspend offer doesn't display with is_active 'NO'
1年前
Samar Hassan
5b02de0893
Merge pull request #4179 from jamesp9/fix-broken-links
Fix broken Font Awesome links
1年前
Samar Hassan
80a10e522c
Merge pull request #4208 from Asp1ro/translation-patch
Wrong translation.
1年前
aspiro.near
5de6a1cb2f
Wrong translation. The correct translation of the phrase implies the imperative mood.
1年前
Voxin Muyli
c58332359e
setuptools recognises src these days, no config is needed. (#4206)
* setuptools recognises src these days, not config is needed.
Aded separate package command that follows the guide at https://github.com/django-oscar/django-oscar/wiki/Releasing
* removed unused function
1年前