ob-dj-store 0.0.17.9__tar.gz → 0.0.18.1__tar.gz

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.17.9
+Version: 0.0.18.1
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/config/settings.py

@@ -319,6 +319,8 @@ WALLET = "wallet"
 GIFT = "gift"
 APPLE_PAY = "apple_pay"
 GOOGLE_PAY = "google_pay"
+MADA = "src_sa.mada"
+BENEFIT = "src_bh.benefit"
 
 PAYMENT_PROVIDER_CHOICES = (
     (COD, _("cash on delivery")),
@@ -331,6 +333,8 @@ PAYMENT_PROVIDER_CHOICES = (
     (GIFT, _("Gift")),
     (APPLE_PAY, _("Apple Pay")),
     (GOOGLE_PAY, _("Google Pay")),
+    (MADA, _("Mada")),
+    (BENEFIT, _("Benefit")),
 )
 DIGITAL_PAYMENT_METHODS = [TAP_KNET, TAP_CREDIT_CARD, TAP_ALL, GOOGLE_PAY]
 DEFAULT_CURRENCY = "kwd"

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -480,9 +480,10 @@ class OrderSerializer(serializers.ModelSerializer):
     def perform_payment(self, amount, payment_method, order_store, orders, currency):
         from ob_dj_store.core.stores.gateway.tap.utils import TapException
 
+        user = self.context["request"].user
         try:
             payment = Payment.objects.create(
-                user=self.context["request"].user,
+                user=user,
                 amount=amount,
                 method=payment_method,
                 currency=currency,
@@ -493,7 +494,10 @@ class OrderSerializer(serializers.ModelSerializer):
             raise serializers.ValidationError(detail=err.messages)
         except TapException as err:
             raise serializers.ValidationError({"tap": _(str(err))})
-        except ObjectDoesNotExist:
+        except ObjectDoesNotExist as err:
+            logger.error(
+                f"Payment Object not created: user:{user}, method:{payment_method}, currency:{currency}, error:{err}"
+            )
             tap_transaction = None
 
         return {
@@ -1527,6 +1531,8 @@ class WalletTopUpSerializer(serializers.Serializer):
                 store_settings.TAP_ALL,
                 store_settings.APPLE_PAY,
                 store_settings.GOOGLE_PAY,
+                store_settings.MADA,
+                store_settings.BENEFIT,
             ]
         ),
         required=True,

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store/core/stores/admin.py

@@ -3,6 +3,7 @@ from typing import Any
 
 from django import forms
 from django.contrib import admin
+from django.db.models.functions import ExtractWeek
 from django.utils.translation import gettext_lazy as _
 from import_export.admin import ImportExportModelAdmin
 from leaflet.admin import LeafletGeoAdmin
@@ -300,6 +301,26 @@ class AdressAdmin(LeafletGeoAdmin):
     ]
 
 
+class WeekNumberFilter(admin.SimpleListFilter):
+    title = _("Week Number")
+    parameter_name = "week_number"
+
+    def lookups(self, request, model_admin):
+        return (
+            ("1", _("Week 1")),
+            ("2", _("Week 2")),
+            ("3", _("Week 3")),
+            ("4", _("Week 4")),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value():
+            queryset = queryset.annotate(week_number=ExtractWeek("created_at")).filter(
+                week_number=self.value()
+            )
+        return queryset
+
+
 class OrderAdmin(ImportExportModelAdmin, admin.ModelAdmin):
     list_display = [
         "id",
@@ -318,11 +339,13 @@ class OrderAdmin(ImportExportModelAdmin, admin.ModelAdmin):
         "id",
     ]
     date_hierarchy = "created_at"
+
     list_filter = [
         "payment_method",
         "shipping_method",
         "store",
         "status",
+        WeekNumberFilter,  # Include the filter instance instead of the class name
     ]
 
     def get_queryset(self, request):
@@ -422,9 +445,11 @@ class WalletTransactionAdmin(ImportExportModelAdmin, admin.ModelAdmin):
     ]
     search_fields = [
         "wallet__user__email",
-        "wallet__user__currency",
+        "wallet__currency",
     ]
 
+    autocomplete_fields = ["wallet"]
+
     def user(self, obj) -> typing.Text:
         return obj.wallet.user.email
 

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store/core/stores/gateway/tap/utils.py

@@ -133,6 +133,8 @@ def initiate_payment(
         settings.TAP_CREDIT_CARD,
         settings.TAP_KNET,
         settings.TAP_ALL,
+        settings.MADA,
+        settings.BENEFIT,
     ]
     if not payment_transaction and source in tap_sources:
         # TODO: How does this issue occur and is this the best way to handle it?

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store/core/stores/managers.py

@@ -82,6 +82,8 @@ class PaymentManager(models.Manager):
             settings.TAP_ALL,
             settings.APPLE_PAY,
             settings.GOOGLE_PAY,
+            settings.MADA,
+            settings.BENEFIT,
         ]:
             source = gateway
             TapPayment.objects.create(

ob-dj-store-0.0.18.1/ob_dj_store/core/stores/migrations/0103_alter_paymentmethod_payment_provider.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.2.8 on 2024-01-04 14:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("stores", "0102_partner_name_arabic"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="paymentmethod",
+            name="payment_provider",
+            field=models.CharField(
+                choices=[
+                    ("cod", "cash on delivery"),
+                    ("src_all", "TAP all payment methods"),
+                    ("src_card", "Tap Credit Card"),
+                    ("src_kw.knet", "Tap knet"),
+                    ("paypal", "Paypal"),
+                    ("stripe", "Stripe"),
+                    ("wallet", "Wallet"),
+                    ("gift", "Gift"),
+                    ("apple_pay", "Apple Pay"),
+                    ("google_pay", "Google Pay"),
+                    ("src_sa.mada", "Mada"),
+                    ("src_bh.benefit", "Benefit"),
+                ],
+                default="cod",
+                max_length=20,
+            ),
+        ),
+    ]

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store/core/stores/models/_payment.py

@@ -185,6 +185,8 @@ class Payment(models.Model):
             settings.TAP_CREDIT_CARD,
             settings.TAP_KNET,
             settings.TAP_ALL,
+            settings.MADA,
+            settings.BENEFIT,
         ]:
             payment_url = self.tap_payment.payment_url
         return payment_url

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store/core/stores/models/_store.py

@@ -82,7 +82,7 @@ class PaymentMethod(models.Model):
     """
 
     payment_provider = models.CharField(
-        max_length=12,
+        max_length=20,
         choices=settings.PAYMENT_PROVIDER_CHOICES,
         default="cod",
     )

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-dj-store
-Version: 0.0.17.9
+Version: 0.0.18.1
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes

{ob-dj-store-0.0.17.9 → ob-dj-store-0.0.18.1}/ob_dj_store.egg-info/SOURCES.txt

@@ -175,6 +175,7 @@ ob_dj_store/core/stores/migrations/0099_alter_product_name_arabic.py
 ob_dj_store/core/stores/migrations/0100_remove_shippingmethod_type_arabic.py
 ob_dj_store/core/stores/migrations/0101_store_is_digital.py
 ob_dj_store/core/stores/migrations/0102_partner_name_arabic.py
+ob_dj_store/core/stores/migrations/0103_alter_paymentmethod_payment_provider.py
 ob_dj_store/core/stores/migrations/__init__.py
 ob_dj_store/core/stores/models/__init__.py
 ob_dj_store/core/stores/models/_address.py