jolob5l
310f82ea51
Use database aggregation to calculate basket totals before discount. (#3576)
5 anos atrás
Orinda Harrison(Mitch)
af4054be25
Pass currency to Benefit.round method, so that rounding can vary based on currency (#3575)
5 anos atrás
Joseph Wayodi
d0796cdc2b
Fix checkout.ThankYouView.get_object to never raise DoesNotExist error
Also fix "is_anonymous" attribute value in WebTestCase subclass.
5 anos atrás
Orinda Harrison(Mitch)
d9eb41419f
Fix currency formatting in basket and condition methods to use the basket currency instead of the Oscar default (#3571)
5 anos atrás
dependabot-preview[bot]
ef0e6cdcdc
Update ipython requirement from <7.19,>=7.12 to >=7.12,<7.20
Updates the requirements on [ipython](https://github.com/ipython/ipython ) to permit the latest version.
- [Release notes](https://github.com/ipython/ipython/releases )
- [Commits](https://github.com/ipython/ipython/compare/7.12.0...7.19.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
dependabot-preview[bot]
1106ed913e
Bump eslint from 7.11.0 to 7.13.0
Bumps [eslint](https://github.com/eslint/eslint ) from 7.11.0 to 7.13.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.11.0...v7.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
Samir Shah
e3db658880
Remove unused Transifex script and Travis config.
5 anos atrás
dependabot-preview[bot]
b452800d75
Bump ipdb from 0.13.3 to 0.13.4
Bumps [ipdb](https://github.com/gotcha/ipdb ) from 0.13.3 to 0.13.4.
- [Release notes](https://github.com/gotcha/ipdb/releases )
- [Changelog](https://github.com/gotcha/ipdb/blob/master/HISTORY.txt )
- [Commits](https://github.com/gotcha/ipdb/compare/0.13.3...0.13.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
dependabot-preview[bot]
cdf4025f26
Bump pillow from 7.2.0 to 8.0.1
Bumps [pillow](https://github.com/python-pillow/Pillow ) from 7.2.0 to 8.0.1.
- [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/7.2.0...8.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
Farooq Azam
2c3e633c7d
Create a mixin for filtering partner's products in dashboard views, for easier overriding (#3566)
5 anos atrás
dependabot-preview[bot]
713c341ad3
Bump flake8 from 3.8.3 to 3.8.4
Bumps [flake8](https://gitlab.com/pycqa/flake8 ) from 3.8.3 to 3.8.4.
- [Release notes](https://gitlab.com/pycqa/flake8/tags )
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.8.3...3.8.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
dependabot-preview[bot]
60dd332a8c
Bump isort from 5.5.4 to 5.6.4
Bumps [isort](https://github.com/pycqa/isort ) from 5.5.4 to 5.6.4.
- [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.5.4...5.6.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
Samir Shah
cbfd742346
Render only top level categories in primary navigation menu.
5 anos atrás
Basil Dubyk
7c5f745919
Improve `test_post_process_urls_adds_decorator`
Use function as the return value of `get_url_decorator`. This change
needed because `get_url_decorator` method of `OscarConfigMixin` class
returns function or `None` and not string.
5 anos atrás
Samir Shah
c30de9d008
Prepare 3.0 alpha release. (#3547)
5 anos atrás
Samir Shah
ec27400573
Add communication app to table of contents for apps in documentation.
Fixes #3517 .
5 anos atrás
Joseph Wayodi
33caaaf036
Remove unused redundant report generator repository code
5 anos atrás
Joseph Wayodi
7107978861
Remove redundant date filtering of queryset in report-generator classes
It is done by default, from the "__init__" method of the parent class,
since commit 18eca6f76c .
5 anos atrás
Samir Shah
def974363a
Update Travis CI badge in readme to reflect migration to travis-ci.com.
5 anos atrás
Samir Shah
c15b7e0951
Merge pull request #3550 from jwayodi/fix/report-generator-date-range-filter-field-lookups
Fix field lookups in ReportGenerator.filter_with_date_range
5 anos atrás
Samir Shah
7a3ce5f0c4
Merge pull request #3549 from jwayodi/fix/checking-field-checkbox-input-widget-type
Fix checking field's "widget_type" value for CheckboxInput widget
5 anos atrás
Joseph Wayodi
9cd3c2e35b
Fix field lookups in ReportGenerator.filter_with_date_range
It currently does not include 23:59:59, 00:00:00, and datetimes in the
one second between.
5 anos atrás
Joseph Wayodi
5171c5f170
Fix checking field's "widget_type" value for CheckboxInput widget
Regression introduced in commit 4bdf5df9b1 .
5 anos atrás
Samir Shah
480086c048
Further cleanups and fixes for dashboard styles. (#3545)
- Remove unnecessary CSS in favour of Bootstrap defaults.
- Remove use of btn-lg whose presentation was being overridden in CSS.
- Fix a few classes on HTML elements.
- Fix required field styling, and remove duplicate non_field_errors on product edit page.
5 anos atrás
Samir Shah
3d780460b7
Merge pull request #3546 from solarissmoke/fix/data-loading
Replace Bootstrap 3 stateful button handling with custom JS for loading state.
5 anos atrás
Samir Shah
73ef2cb3b3
Replace Bootstrap 3 stateful button handling with custom JS for loading state.
5 anos atrás
Samir Shah
d0b948dce2
Update translation files.
5 anos atrás
Capelito
e5e8834a26
Make inactive products and categories identifiable in dashboard list views (#3538)
5 anos atrás
Orinda Harrison(Mitch)
2599135e93
Add SEO fields to product and category models and make editable in the dashboard (#3534)
5 anos atrás
Voxin Muyli
226b173bf1
Fix field name conflict in product_class_as_queryset annotation. (#3542)
5 anos atrás
Samir Shah
5724a3a996
Update translations.
5 anos atrás
Samir Shah
295593b456
Merge pull request #3527 from django-oscar/dependabot/pip/django-debug-toolbar-gte-2.2-and-lt-3.2
Update django-debug-toolbar requirement from <2.3,>=2.2 to >=2.2,<3.2
5 anos atrás
Samir Shah
73b2d0c45f
Merge pull request #3541 from solarissmoke/fix/npm-deps
Update several npm dependencies.
5 anos atrás
Samir Shah
2adabc4ea2
Update several npm dependencies.
5 anos atrás
dependabot-preview[bot]
dbfb44d500
Update django-debug-toolbar requirement from <2.3,>=2.2 to >=2.2,<3.2
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.1.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
Samir Shah
b0244bce2e
Merge pull request #3302 from solarissmoke/feature/bs4
Port all core templates and styles to Bootstrap 4.
5 anos atrás
Samir Shah
4bdf5df9b1
Port all core templates and styles to Bootstrap 4.
Co-authored-by: Basil Dubyk <samitnuk.work@gmail.com >
Co-authored-by: Alexander Gaevsky <sasha@sasha0.ru >
Co-authored-by: Joseph Wayodi <jwayodi@gmail.com >
5 anos atrás
andruten
724d8b7f67
Use Django ORM intead of raw query voucher util get_unused_code. Add separator kwarg in the method docstring (#3540)
Co-authored-by: Andrés Usán <a.usan@i2tic.com >
5 anos atrás
Jan Fabry
c91f910445
Add support for Django 3.1 (#3516)
5 anos atrás
Basil Dubyk
6d9e6dd99d
Modify `test_is_public_on` and `test_is_public_off`
Instead of checking for truthiness we should check for equality
(because any status code is `True`).
5 anos atrás
Basil Dubyk
819a6a3a8c
Modify `BasketThresholdTest` class
`override_settings` used instead of updating setting in `setUp`/`tearDown`.
5 anos atrás
Basil Dubyk
d4748cdb33
Remove useless line
5 anos atrás
Alexander Gaevsky
18eca6f76c
Refactor report generators to be easier to extend, and fix date range filtering in CSV exports (#3501)
5 anos atrás
Samir Shah
f333a82773
Include sorl-thumbnail in installation steps for getting started docs.
5 anos atrás
Samir Shah
8b62f96f3d
Merge pull request #3529 from django-oscar/dependabot/npm_and_yarn/eslint-7.10.0
Bump eslint from 7.8.0 to 7.10.0
5 anos atrás
Samir Shah
1f17103468
Merge pull request #3528 from django-oscar/dependabot/npm_and_yarn/tinymce-5.5.1
Bump tinymce from 5.4.2 to 5.5.1
5 anos atrás
Alexander Gaevsky
5e4c7c0187
Make SimpleBasketForm a bit easier to redefine when BasketForm has been overridden (#3504)
5 anos atrás
dependabot-preview[bot]
33d07cb1fa
Bump eslint from 7.8.0 to 7.10.0
Bumps [eslint](https://github.com/eslint/eslint ) from 7.8.0 to 7.10.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.8.0...v7.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
dependabot-preview[bot]
f946587ce0
Bump tinymce from 5.4.2 to 5.5.1
Bumps [tinymce](https://github.com/tinymce/tinymce-dist ) from 5.4.2 to 5.5.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.4.2...5.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás
dependabot-preview[bot]
8de99e51cb
Bump isort from 5.4.2 to 5.5.4
Bumps [isort](https://github.com/pycqa/isort ) from 5.4.2 to 5.5.4.
- [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.4.2...5.5.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
5 anos atrás