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

* 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]>

ecommerce/extensions/api/v2/tests/views/test_publication.py

@@ -269,11 +269,11 @@ def assert_seat_saved(self, course, expected, test_mobile_seats=False):
         if test_mobile_seats and verified_product:
             android_seat = course.seat_products.get(title='Android ' + seat_title)
             self.assertEqual(android_seat.expires, expires)
-            self.assertEqual(android_seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price'])
+            self.assertEqual(android_seat.stockrecords.get(partner=self.partner).price, expected['price'])
 
             ios_seat = course.seat_products.get(title='Ios ' + seat_title)
             self.assertEqual(ios_seat.expires, expires)
-            self.assertEqual(ios_seat.stockrecords.get(partner=self.partner).price_excl_tax, expected['price'])
+            self.assertEqual(ios_seat.stockrecords.get(partner=self.partner).price, expected['price'])
 
         return seat
 

ecommerce/extensions/catalogue/migrations/0056_auto_20231108_1355.py

@@ -0,0 +1,97 @@
+# Generated by Django 3.2.20 on 2023-11-08 13:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0055_sf_opp_line_item_ent_attr'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='option',
+            options={'ordering': ['name'], 'verbose_name': 'Option', 'verbose_name_plural': 'Options'},
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='category',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AddField(
+            model_name='historicalcategory',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='historicalcategory',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AddField(
+            model_name='historicaloption',
+            name='required',
+            field=models.BooleanField(default=False, verbose_name='Is this option required?'),
+        ),
+        migrations.AddField(
+            model_name='historicalproduct',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='historicalproduct',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AddField(
+            model_name='option',
+            name='required',
+            field=models.BooleanField(default=False, verbose_name='Is this option required?'),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='meta_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Meta description'),
+        ),
+        migrations.AddField(
+            model_name='product',
+            name='meta_title',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Meta title'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloption',
+            name='name',
+            field=models.CharField(db_index=True, max_length=128, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='historicaloption',
+            name='type',
+            field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date')], default='text', max_length=255, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='historicalproductattributevalue',
+            name='value_boolean',
+            field=models.BooleanField(blank=True, db_index=True, null=True, verbose_name='Boolean'),
+        ),
+        migrations.AlterField(
+            model_name='option',
+            name='name',
+            field=models.CharField(db_index=True, max_length=128, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='option',
+            name='type',
+            field=models.CharField(choices=[('text', 'Text'), ('integer', 'Integer'), ('boolean', 'True / False'), ('float', 'Float'), ('date', 'Date')], default='text', max_length=255, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='productattributevalue',
+            name='value_boolean',
+            field=models.BooleanField(blank=True, db_index=True, null=True, verbose_name='Boolean'),
+        ),
+    ]

ecommerce/extensions/catalogue/migrations/0057_merge_20240119_1219.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.20 on 2024-01-19 12:19
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0056_add_variant_id_seat_product_attr'),
+        ('catalogue', '0056_auto_20231108_1355'),
+    ]
+
+    operations = [
+    ]

ecommerce/extensions/catalogue/migrations/0058_merge_20240212_0911.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.2.20 on 2024-02-12 09:11
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('catalogue', '0057_add_app_store_id_product_attr'),
+        ('catalogue', '0057_merge_20240119_1219'),
+    ]
+
+    operations = [
+    ]

ecommerce/extensions/voucher/migrations/0013_make_voucher_names_unique.py

@@ -17,13 +17,9 @@ def make_voucher_names_unique(apps, schema_editor):
         updates = []
 
         for obj in page.object_list:
-<<<<<<< HEAD
             obj.name = '%d - %s' % (obj.id, obj.name)
             if len(obj.name) > 128:
                 obj.name = obj.name[:128]
-=======
-            obj.name = '%d - %s' % (obj.id, obj.name[:128 - len(obj.id)])
->>>>>>> cfc34a88d ([Copy]Django Oscar Upgrade to version 3.1 [#4102] (#4125))
             updates.append(obj)
 
         Voucher.objects.bulk_update(updates, ['name'])