Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Copy]Django Oscar Upgrade to version 3.2 #4109

Open
wants to merge 27 commits into
base: 2u/main
Choose a base branch
from
Open

[Copy]Django Oscar Upgrade to version 3.2 #4109

wants to merge 27 commits into from

Commits on Jan 19, 2024

  1. chore: django oscar version upgrade to 3.1

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1f826da View commit details
    Browse the repository at this point in the history

  2. chore: djano oscar version upgrade to 3.1

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    3efe055 View commit details
    Browse the repository at this point in the history

  3. feat: master merge

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    aa6ed45 View commit details
    Browse the repository at this point in the history

  4. feat: add data migration to make voucher names unique

    @mumarkhan999 @zubair-ce07
    mumarkhan999 authored and zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1344114 View commit details
    Browse the repository at this point in the history

  5. fix: removed code

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    9e84c8d View commit details
    Browse the repository at this point in the history

  6. feat: master merge

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    30357f0 View commit details
    Browse the repository at this point in the history

  7. feat: master merge

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    73c45fc View commit details
    Browse the repository at this point in the history

  8. refactor: updated django oscar templates

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    f027acb View commit details
    Browse the repository at this point in the history

  9. feat: master merge

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    fd18782 View commit details
    Browse the repository at this point in the history

  10. feat: master merge

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    91eb425 View commit details
    Browse the repository at this point in the history

  11. refactor: updated price field name

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    13bc01f View commit details
    Browse the repository at this point in the history

  12. refactor: update price field name

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    33959c2 View commit details
    Browse the repository at this point in the history

  13. feat: master merge

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    bb2fcbb View commit details
    Browse the repository at this point in the history

  14. feat: added refund functionality

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    c2e0632 View commit details
    Browse the repository at this point in the history

  15. fix: migration issue

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    981ccf5 View commit details
    Browse the repository at this point in the history

  16. fix: updated field name

    @zubair-ce07
    zubair-ce07 committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1dd66d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. refactor: updated field name

    @zubair-ce07
    zubair-ce07 committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    92e5d26 View commit details
    Browse the repository at this point in the history

  2. Merge branch '2u/main' into zubair-django-oscar31-update-copy-3

    @zubair-ce07
    zubair-ce07 authored Jan 22, 2024
    Configuration menu
    Copy the full SHA
    efcc407 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Merge branch '2u/main' into zubair-django-oscar31-update-copy-3

    @zubair-ce07
    zubair-ce07 authored Jan 23, 2024
    Configuration menu
    Copy the full SHA
    8e06f46 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. chore: PR to upgrade django oscar to version 3.2

    @zubair-ce07
    zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    0073c96 View commit details
    Browse the repository at this point in the history

  2. feat: resloved reserved keywords conflict

    @zubair-ce07
    zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    58c3240 View commit details
    Browse the repository at this point in the history

  3. feat: add data mmigration to make basket_lineattribute value json com… 

    …patible
    @mumarkhan999 @zubair-ce07
    mumarkhan999 authored and zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    76fc08c View commit details
    Browse the repository at this point in the history

  4. fix: merged master

    @zubair-ce07
    zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    da02c63 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'zubair-django-oscar31-update' into zubair-django-oscar3… 

    …2-update
    @zubair-ce07
    zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    a19b58a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into zubair-django-oscar32-update

    @zubair-ce07
    zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    9ab6fc6 View commit details
    Browse the repository at this point in the history

  7. fix: merge migration

    @zubair-ce07
    zubair-ce07 committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    3255b90 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2024

  1. feat: add data mmigration to make order_lineattribute value json comp… 

    …atible
    @mumarkhan999 @zubair-ce07
    mumarkhan999 authored and zubair-ce07 committed Feb 2, 2024
    Configuration menu
    Copy the full SHA
    f97c2a7 View commit details
    Browse the repository at this point in the history