Orinda Harrison(Mitch)
7a565ff42b
Add pre-commit configuration file (#3643)
5 лет назад
dependabot-preview[bot]
f16c62235b
Bump eslint from 7.18.0 to 7.19.0
Bumps [eslint](https://github.com/eslint/eslint ) from 7.18.0 to 7.19.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.18.0...v7.19.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
1fd9f0c337
Bump eslint from 7.16.0 to 7.18.0
Bumps [eslint](https://github.com/eslint/eslint ) from 7.16.0 to 7.18.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.16.0...v7.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
99fe2ff789
Bump @fortawesome/fontawesome-free from 5.15.1 to 5.15.2
Bumps [@fortawesome /fontawesome-free](https://github.com/FortAwesome/Font-Awesome ) from 5.15.1 to 5.15.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases )
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md )
- [Commits](https://github.com/FortAwesome/Font-Awesome/compare/5.15.1...5.15.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
c56f3143b7
Bump pillow from 8.0.1 to 8.1.0
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 8.0.1 to 8.1.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases )
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst )
- [Commits](https://github.com/python-pillow/Pillow/compare/8.0.1...8.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
Maik Hoepfel
4e21df6561
Improve upgrading instructions
I struggled with migrations when upgrading from Oscar 2.0.4 to 2.1.
@solarissmoke kindly helped out, and I want to say thank you by adding
the bits I learned to the docs.
5 лет назад
Samir Shah
01edabb29f
Tag version 3.0
5 лет назад
Samir Shah
4e0081f04c
Update translation files.
5 лет назад
Basil Dubyk
5e1986388f
Fix non-exclusive offers with count condition
Issue: https://github.com/django-oscar/django-oscar/issues/3162
* Checking of `offer.benefit.max_affected_items` removed from the
`available` method of `LineOfferConsumer` class - available items should
not be limited by related benefit (it should be considered when applying
the offer).
* Improved `apply` method of `PercentageDiscountBenefit` - affected
items must include "quantities with discount applied".
* `is_satisfied` method of `CountCondition` updated to pass `offer`
instead of `None` to `line.quantity_without_offer_discount` - this
change is required to fix the initial issue.
* Updated `test_available_with_offer` test - initially this test was
added to check the lines that we removed from the `available` method of
`LineOfferConsumer` class (See fda27a183d/).
* Added tests to confirm that the initial issue is fixed.
5 лет назад
Matthias Brück
042879534c
Fix template variable syntax in dashboard order detail template (#3625)
5 лет назад
Voxin Muyli
def485209b
Fix querying of products within subcategories in RangeQuerySet.contains_product (#3543)
5 лет назад
Basil Dubyk
d49782a2fe
Remove redundant code from Benefit class methods (#3624)
5 лет назад
Victor Munene
5b67f56c87
Refactor order search form to be inclusive of orders placed on 'to' date
5 лет назад
Orinda Harrison(Mitch)
a4d07e0284
Remove unused ajax-loader.gif which was superseded by Boostrap 4's CSS spinner (#3622)
5 лет назад
Muhammad Qasim Gulzar
05d1186019
Pass request argument to Site.objects.get_current in OrderPlacementMixin (#3615)
Co-authored-by: qasimgulzar <pent007#@>
5 лет назад
django-doctor
9f5c584c5d
Allow user address data migration to be run backwards as a no-op (#3616)
Co-authored-by: Django Doctor <help@django.doctor >
5 лет назад
Samir Shah
f106f64d7f
Fix reference to static file path in exception message for symlink_missing_image.
5 лет назад
Voxin Muyli
aadacc3c46
Fix slow range query on postgres with lots of categories (#3603)
Postgres does the category subquery multiple times, even when there are no
categories. That makes this query VERY slow when there are a lot of categories.
This PR removes the subqueries and instead constructs an or clause on all the
categories in the range. This means ranges now perform 2 queries instead of 1
but this is still a lot faster.
5 лет назад
Victor Munene
2fe4036bf7
Make option group required for option and multi-option attribute types.
5 лет назад
dependabot-preview[bot]
c5ba3aa48a
Bump eslint from 7.14.0 to 7.16.0
Bumps [eslint](https://github.com/eslint/eslint ) from 7.14.0 to 7.16.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.14.0...v7.16.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
ac38bb789e
Bump tinymce from 5.6.1 to 5.6.2
Bumps [tinymce](https://github.com/tinymce/tinymce-dist ) from 5.6.1 to 5.6.2.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases )
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/master/changelog.txt )
- [Commits](https://github.com/tinymce/tinymce-dist/compare/5.6.1...5.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
a399b49027
Bump isort from 5.6.4 to 5.7.0
Bumps [isort](https://github.com/pycqa/isort ) from 5.6.4 to 5.7.0.
- [Release notes](https://github.com/pycqa/isort/releases )
- [Changelog](https://github.com/PyCQA/isort/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/pycqa/isort/compare/5.6.4...5.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
aeb810c619
Bump requests from 2.25.0 to 2.25.1
Bumps [requests](https://github.com/psf/requests ) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/psf/requests/releases )
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md )
- [Commits](https://github.com/psf/requests/compare/v2.25.0...v2.25.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
05c7c59ffb
Update django-debug-toolbar requirement from <3.2,>=2.2 to >=2.2,<3.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/master/docs/changes.rst )
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/2.2...3.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
Samir Shah
5c4d08e596
Bump version to 3.0b1.
5 лет назад
Samir Shah
8f7f2b541a
Update translation files.
5 лет назад
Stian Aurdal
7fd0da8c2f
Fix references to moved email templates in documentation.
5 лет назад
dependabot-preview[bot]
4cff5247d9
Bump node-sass from 4.14.1 to 5.0.0
Bumps [node-sass](https://github.com/sass/node-sass ) from 4.14.1 to 5.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/v4.14.1...v5.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
1ce7603d7c
Bump tempusdominus-bootstrap-4 from 5.1.2 to 5.39.0
Bumps [tempusdominus-bootstrap-4](https://github.com/tempusdominus/bootstrap-4 ) from 5.1.2 to 5.39.0.
- [Release notes](https://github.com/tempusdominus/bootstrap-4/releases )
- [Commits](https://github.com/tempusdominus/bootstrap-4/compare/5.1.2...5.39.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
2489e53bf5
Bump tinymce from 5.5.1 to 5.6.1
Bumps [tinymce](https://github.com/tinymce/tinymce-dist ) from 5.5.1 to 5.6.1.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases )
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/master/changelog.txt )
- [Commits](https://github.com/tinymce/tinymce-dist/compare/5.5.1...5.6.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
Joseph Wayodi
afd4267a34
Add option to create line models in OrderFactory
5 лет назад
Joseph Wayodi
f02a6babde
Fix Bootstrap 4 help-text components
- Also fix typo in template
- Also remove no-longer-used "bootstrap-datetime-picker" from
"package.json"
5 лет назад
dependabot-preview[bot]
c8bf3bc453
[Security] Bump ini from 1.3.5 to 1.3.7
Bumps [ini](https://github.com/isaacs/ini ) from 1.3.5 to 1.3.7. **This update includes a security fix.**
- [Release notes](https://github.com/isaacs/ini/releases )
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
Samir Shah
cca7ffe608
Bump version to 3.0b and update release notes.
5 лет назад
Joseph Wayodi
8f2111f2e7
Fix various Bootstrap 4 and other template issues
- Hide edit link on mobile, on flatpages
- Hide column headers on mobile, on basket page "Items to buy later"
table
- Hide edit link on mobile, on category page
- Move dislay of various elements from "sm" to "md" grid tier
- Display error icon on navigation tab, on dashboard category-form page
- Increase "z-index" of dropdown menu on dashboard, so that it appears
above all other elements
- Remove useless "top-spacer" class from dashboard review-list page
- Fix typo in use of template tag, on dashboard category-delete page
- Remove repeated display of non-field errors, and hidden fields, on
dashboard category-form page
5 лет назад
Samir Shah
5faa5f44dd
Remove setting of default value via Javascript in time picker inputs.
Where an initial value is required, this should be set on the form field
itself.
Fixes #3590 .
5 лет назад
Samir Shah
806ef2e65c
Adjust Github action workflow config to run only for master branch.
5 лет назад
Samir Shah
a11bd4d5d1
Add Github Actions workflows for tests, remove Travis CI config.
5 лет назад
Tuomas Jaakola
7d77e8ae67
Add blocks to nav_primary.html to make it easier to customise (#3593)
5 лет назад
Tuomas Jaakola
818e1e9f23
Add blocks to layout_2_col.html template to make it easier to customise (#3591)
5 лет назад
dependabot-preview[bot]
6bc0729dad
Bump gulp-sourcemaps from 2.6.5 to 3.0.0
Bumps [gulp-sourcemaps](https://github.com/gulp-sourcemaps/gulp-sourcemaps ) from 2.6.5 to 3.0.0.
- [Release notes](https://github.com/gulp-sourcemaps/gulp-sourcemaps/releases )
- [Commits](https://github.com/gulp-sourcemaps/gulp-sourcemaps/compare/v2.6.5...v3.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
e311b1c245
Bump flake8-debugger from 3.2.1 to 4.0.0
Bumps [flake8-debugger](https://github.com/jbkahn/flake8-debugger ) from 3.2.1 to 4.0.0.
- [Release notes](https://github.com/jbkahn/flake8-debugger/releases )
- [Commits](https://github.com/jbkahn/flake8-debugger/compare/3.2.1...4.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
05c148a217
Update django-extensions requirement from <3.1,>=2.2 to >=2.2,<3.2
Updates the requirements on [django-extensions](https://github.com/django-extensions/django-extensions ) to permit the latest version.
- [Release notes](https://github.com/django-extensions/django-extensions/releases )
- [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md )
- [Commits](https://github.com/django-extensions/django-extensions/compare/2.2.0...3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
9f6b11b2db
Bump requests from 2.24.0 to 2.25.0
Bumps [requests](https://github.com/psf/requests ) from 2.24.0 to 2.25.0.
- [Release notes](https://github.com/psf/requests/releases )
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md )
- [Commits](https://github.com/psf/requests/compare/v2.24.0...v2.25.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
dependabot-preview[bot]
98e805a1e9
Bump eslint from 7.13.0 to 7.14.0
Bumps [eslint](https://github.com/eslint/eslint ) from 7.13.0 to 7.14.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.13.0...v7.14.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 лет назад
Tuomas Jaakola
9e1ce04656
Add template block around table header in basket_totals template for easier overriding (#3589)
5 лет назад
Orinda Harrison(Mitch)
ccef3c6afb
Pass currency to shipping_discount benefit methods so that the charge can be determined based on the basket currency (#3574)
5 лет назад
Basil Dubyk
0f3df5fca9
Fix rendering of upsell messages for exclusive offers (#3548)
* Improve `available` method of `LineOfferConsumer` class
* Add `quantity_available_for_offer` method to `AbstractLine` class
* Improve conditions: "Get num matches" methods updated to use `quantity_available_for_offer`
method of `Line` model.
* Improve conditions: `get_upsell_message` methods updated to show upsell message only in
the cases where `delta` > 0.
* Ensure basket upsell messages are not `None`
5 лет назад
jolob5l
310f82ea51
Use database aggregation to calculate basket totals before discount. (#3576)
5 лет назад
Orinda Harrison(Mitch)
af4054be25
Pass currency to Benefit.round method, so that rounding can vary based on currency (#3575)
5 лет назад