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

Zubair django oscar31 test pr2 #4142

Draft
wants to merge 24 commits into
base: 2u/main
Choose a base branch
from
Draft

Zubair django oscar31 test pr2 #4142

wants to merge 24 commits into from

Conversation

zubair-ce07
Copy link
Contributor

⛔️ MAIN BRANCH WARNING! 2U EMPLOYEES must make branches against the 2u/main BRANCH

  • I have checked the branch to which I would like to merge.

⛔️ DEPRECATION WARNING

This repository is deprecated and in maintainence-only operation while we work on a replacement, please see this announcement for more information.

Although we have stopped integrating new contributions, we always appreciate security disclosures and patches sent to [email protected]

Anyone internally merging to this repository is expected to release and monitor their changes; if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released.

Required Testing

  • Before deploying this change, complete a purchase in the stage environment.
    (^ We can remove that manual check once REV-2624 is done and the corresponding e2e test runs again)

Description

Describe what this pull request changes, and why these changes were made. How will these changes affect other people, installations of edx, etc.?
Please include links to any relevant ADRs, design artifacts, and decision documents. Make sure to document the rationale behind significant changes in the repo, per OEP-19, and can be
linked here.

Useful information to include:

  • Which edX user roles will this change impact? Common user roles are "Learner", "Course Author", "Developer", and "Operator".
  • Include screenshots for changes to the UI (ideally, both "before" and "after" screenshots, if applicable).
  • Provide links to the description of corresponding configuration changes. Remember to correctly annotate these changes.

Supporting information

Link to other information about the change, such as Jira issues, GitHub issues, or Discourse discussions.
Be sure to check they are publicly readable, or if not, repeat the information here.

Testing instructions

Please provide detailed step-by-step instructions for testing this change; how did YOU test this change?

Other information

Include anything else that will help reviewers and consumers understand the change.

  • Does this change depend on other changes elsewhere?
  • Any special concerns or limitations? For example: deprecations, migrations, OpenEdx vs. edx.org differences, development vs. production environment differences, security, or accessibility.

@zubair-ce07
# This is a combination of 2 commits.
58f1e3f 
# This is the 1st commit message:

parent 77569a7
author zubair-ce07 <[email protected]> 1699769216 +0500
committer zubair-ce07 <[email protected]> 1709104204 +1100

chore: django oscar version upgrade to 3.1

chore: djano oscar version upgrade to 3.1

feat: master merge

feat: add data migration to make voucher names unique

fix: removed code

feat: master merge

feat: master merge

refactor: updated django oscar templates

feat: master merge

feat: master merge

refactor: updated price field name

refactor: update price field name

feat: master merge

feat: added refund functionality

fix: migration issue

fix: updated field name

refactor: updated field name

refactor: Add course info to Stripe Payment Intent metadata (#4100)

REV-3816

Revert "refactor: Add course info to Stripe Payment Intent metadata" (#4106)

refactor: Add courses metadata from basket to Stripe Payment Intent (#4107)

fix: Clip courses metadata value to less than 500 characters for Stripe (#4110)

chore: bump ecommerce worker version (#4113)

feat: Configure Mobile IAP cronjob to create iOS products on AppStore (#4112)

* feat: Configure Mobile IAP cronjob to create iOS products on AppStore

---------

Co-authored-by: Abdul  Moeez Zahid <[email protected]>

fix: Remove stripe response log with sensitive info (#4121)

REV-3852

feat: Update ios product price on price change from discovery (#4118)

* feat: update ios product price on price change from discovery

* feat: set ios product availability in appstore

* chore: reftacored code

* fix: refatcored code

fix: fixed ios seat attribute change (#4123)

fix: merged migrations

refactor: updated price field name

refactor: updated price field name

fix: removed unwanted changes

fix: removed unwanted changes coming from master branch

fix: removed unwanted changes coming from master branch

fix: fixed migration

fix: updated migration

[Copy]Django Oscar Upgrade to version 3.1 [#4102] (#4125)

* chore: django oscar version upgrade to 3.1

* chore: djano oscar version upgrade to 3.1

* feat: master merge

* feat: add data migration to make voucher names unique

* fix: removed code

* feat: master merge

* feat: master merge

* refactor: updated django oscar templates

* feat: master merge

* feat: master merge

* refactor: updated price field name

* refactor: update price field name

* feat: master merge

* feat: added refund functionality

* fix: migration issue

* fix: updated field name

* refactor: updated field name

* fix: merged migrations

* refactor: updated price field name

* refactor: updated price field name

* fix: removed unwanted changes

* fix: removed unwanted changes coming from master branch

* fix: removed unwanted changes coming from master branch

* fix: fixed migration

---------

Co-authored-by: Muhammad Umar Khan <[email protected]>

# This is the commit message #2:

fix: fixed issue in migration numbers
@zubair-ce07 zubair-ce07 changed the base branch from master to 2u/main March 1, 2024 07:59
@zubair-ce07 zubair-ce07 force-pushed the zubair-django-oscar31-test-PR2 branch 3 times, most recently from eab2a0c to 84b8f34 Compare March 1, 2024 09:22
zubair-ce07 and others added 22 commits March 1, 2024 20:32
@zubair-ce07
parent 77569a7
819eaa8 
author zubair-ce07 <[email protected]> 1699769216 +0500
committer zubair-ce07 <[email protected]> 1709104204 +1100

chore: django oscar version upgrade to 3.1

chore: djano oscar version upgrade to 3.1

feat: master merge

feat: add data migration to make voucher names unique

fix: removed code

feat: master merge

feat: master merge

refactor: updated django oscar templates

feat: master merge

feat: master merge

refactor: updated price field name

refactor: update price field name

feat: master merge

feat: added refund functionality

fix: migration issue

fix: updated field name

refactor: updated field name

refactor: Add course info to Stripe Payment Intent metadata (#4100)

REV-3816

Revert "refactor: Add course info to Stripe Payment Intent metadata" (#4106)

refactor: Add courses metadata from basket to Stripe Payment Intent (#4107)

fix: Clip courses metadata value to less than 500 characters for Stripe (#4110)

chore: bump ecommerce worker version (#4113)

feat: Configure Mobile IAP cronjob to create iOS products on AppStore (#4112)

* feat: Configure Mobile IAP cronjob to create iOS products on AppStore

---------

Co-authored-by: Abdul  Moeez Zahid <[email protected]>

fix: Remove stripe response log with sensitive info (#4121)

REV-3852

feat: Update ios product price on price change from discovery (#4118)

* feat: update ios product price on price change from discovery

* feat: set ios product availability in appstore

* chore: reftacored code

* fix: refatcored code

fix: fixed ios seat attribute change (#4123)

fix: merged migrations

refactor: updated price field name

refactor: updated price field name

fix: removed unwanted changes

fix: removed unwanted changes coming from master branch

fix: removed unwanted changes coming from master branch

fix: fixed migration

fix: updated migration

[Copy]Django Oscar Upgrade to version 3.1 [#4102] (#4125)

* chore: django oscar version upgrade to 3.1

* chore: djano oscar version upgrade to 3.1

* feat: master merge

* feat: add data migration to make voucher names unique

* fix: removed code

* feat: master merge

* feat: master merge

* refactor: updated django oscar templates

* feat: master merge

* feat: master merge

* refactor: updated price field name

* refactor: update price field name

* feat: master merge

* feat: added refund functionality

* fix: migration issue

* fix: updated field name

* refactor: updated field name

* fix: merged migrations

* refactor: updated price field name

* refactor: updated price field name

* fix: removed unwanted changes

* fix: removed unwanted changes coming from master branch

* fix: removed unwanted changes coming from master branch

* fix: fixed migration

---------

Co-authored-by: Muhammad Umar Khan <[email protected]>

fix: fixed issue in migration numbers

feat: made migration idempotent

feat: fixed test

fix: fixed migration
@julianajlk @zubair-ce07
refactor: Add course info to Stripe Payment Intent metadata (#4100)
9b4d740 
REV-3816
@julianajlk @zubair-ce07
Revert "refactor: Add course info to Stripe Payment Intent metadata" (#…
ba09a9f 
…4106)
@julianajlk @zubair-ce07
refactor: Add courses metadata from basket to Stripe Payment Intent (#…
e27cb14 
…4107)
@jawad-khan @zubair-ce07
feat: Update ios product price on price change from discovery (#4118)
9fd6eb3 
* feat: update ios product price on price change from discovery

* feat: set ios product availability in appstore

* chore: reftacored code

* fix: refatcored code
@zubair-ce07 @mumarkhan999
[Copy]Django Oscar Upgrade to version 3.1 (#4102)
8b2f81c 
* chore: django oscar version upgrade to 3.1

* chore: djano oscar version upgrade to 3.1

* feat: master merge

* feat: add data migration to make voucher names unique

* fix: removed code

* feat: master merge

* feat: master merge

* refactor: updated django oscar templates

* feat: master merge

* feat: master merge

* refactor: updated price field name

* refactor: update price field name

* feat: master merge

* feat: added refund functionality

* fix: migration issue

* fix: updated field name

* refactor: updated field name

* fix: merged migrations

* refactor: updated price field name

* refactor: updated price field name

* fix: removed unwanted changes

* fix: removed unwanted changes coming from master branch

* fix: removed unwanted changes coming from master branch

---------

Co-authored-by: Muhammad Umar Khan <[email protected]>
@christopappas @zubair-ce07
Cpappas/revert oscar 3.1 (#4128)
417ea55 
* Revert "[Copy]Django Oscar Upgrade to version 3.1 [#4102] [#4125] (#4126)"

This reverts commit 77c8be5.

* Revert "[Copy]Django Oscar Upgrade to version 3.1 [#4102] (#4125)"

This reverts commit cfc34a8.

* Revert "[Copy]Django Oscar Upgrade to version 3.1  (#4102)"

This reverts commit 06b5abd.
@jawad-khan @zubair-ce07
Fix: Support create-mobile-skus to run again if failed (#4129)
108795f 
* fix: Support create-mobile-skus to run again if we found an error previously
@moeez96 @zubair-ce07
fix: Enable enrollment code purchase with mobile seats (#4130)
a8e939f 
* fix: Enable enrollment code purchase with mobile seats

* test: Add unit test

---------

Co-authored-by: Abdul  Moeez Zahid <[email protected]>
@moeez96 @zubair-ce07
fix: Fix send email error and add tests (#4135)
a04b13f 
* fix: Fix send email error and add tests

---------

Co-authored-by: Abdul  Moeez Zahid <[email protected]>
Co-authored-by: Abdul  Moeez Zahid <[email protected]>
@zubair-ce07 @christopappas
Management command to update voucher names and make them unique (#4134)
499d1fa 
* chore: Added management command to update voucher names to be unique

---------

Co-authored-by: Chris Pappas <[email protected]>
Co-authored-by: Chris Pappas <[email protected]>
@christopappas @zubair-ce07
feat: update_voucher_names now can be run synchronously and can batch… (
ad23224 
#4137)

* feat: update_voucher_names now can be run synchronously and can batch sleep

* feat: update_voucher_name mgmt command can start at an offset

* fix: split update logic from task for quality reasons
@zubair-ce07
fix: price field name
cf759d0
@zubair-ce07
fix: unique voucher name
36f26ca
@zubair-ce07
fix: white space
bc43d4d
@zubair-ce07
fix: unique voucher name
1b774a8
@zubair-ce07
fix: unique voucher name
a54f377
@julianajlk @zubair-ce07
refactor: Add course info to Stripe Payment Intent metadata (#4100)
3afb947 
REV-3816
@zubair-ce07
fix: merge conflicts
e60cf61
@zubair-ce07
fix: unique voucher names
5e8e013
@zubair-ce07
fix: updated code
3e7cf18
@zubair-ce07
fix: new line
6aa7e8d
@zubair-ce07 zubair-ce07 force-pushed the zubair-django-oscar31-test-PR2 branch from e3bf02a to 6aa7e8d Compare March 1, 2024 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zubair-ce07 @julianajlk @jawad-khan @christopappas @moeez96