ob-dj-store 0.0.17.9__py3-none-any.whl → 0.0.18.1__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → ob_dj_store-0.0.18.1.dist-info}/METADATA

@@ -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.dist-info → ob_dj_store-0.0.18.1.dist-info}/RECORD

@@ -3,17 +3,17 @@ ob_dj_store/apis/stores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 ob_dj_store/apis/stores/filters.py,sha256=zKBXPBoqIyFlSeZOECp97RTWvSLqNPnlPhEp7p8W5tE,9702
 ob_dj_store/apis/stores/urls.py,sha256=7vwogfIGcKS0hHYK3iBXKQwi1kCA_vuHY1eZt8rAspg,2021
 ob_dj_store/apis/stores/views.py,sha256=aE4LFPHzs_CtzZ8K5-vAbDn_51hyhi0KIsi7cV8dpkA,43372
-ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=unQr5K3TA5X7MJmwrBkTKS7zP7Tovtm42F64CCSjjNY,61750
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=kgLC1H2hjfKDRgvdwCp7ok7em73FtaxoiSF8sacXAIY,62012
 ob_dj_store/apis/tap/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/apis/tap/serializers.py,sha256=KPrBK4h2-fWvEVf6vOj2ww5-USV9WqpyYicIqoHIiXI,1065
 ob_dj_store/apis/tap/urls.py,sha256=bnOTv6an11kxpo_FdqlhsizlGPLVpNxBjCyKcf3_C9M,367
 ob_dj_store/apis/tap/views.py,sha256=VnVquybTHlJquxsC0RNTy20dtLXalchO0SlGjSDaBng,2666
 ob_dj_store/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/__init__.py,sha256=-izNGrxNn_nn3IQXd5pkuES9lSF-AHYb14yhNPozYCI,65
-ob_dj_store/core/stores/admin.py,sha256=bXyvIcAgBXv3GLjaJsbbld1ksuwzLzqJRE5GYAJhEqQ,12735
+ob_dj_store/core/stores/admin.py,sha256=_zg10EVLLOfL8CdSsG7mRpZmxrigBS6tx25XU55caJ8,13453
 ob_dj_store/core/stores/admin_inlines.py,sha256=2K8iDmP4h0CLIOqy3x-ZXXpgYnT2jqL4cg5YFdiho8s,2976
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
-ob_dj_store/core/stores/managers.py,sha256=Rhv_jTul29A0t_H7jiLQUewn4GnSbgYZ6kq4WAivvjc,9852
+ob_dj_store/core/stores/managers.py,sha256=lz2CE4PJCI1ViO-CU61LqTr43O41aGRQkbWZUR5Fmfg,9909
 ob_dj_store/core/stores/receivers.py,sha256=DljYC97C_e1mHduKw9Un6YQmxIdwSIter7yVVZwggFA,3768
 ob_dj_store/core/stores/settings_validation.py,sha256=eTkRaI6CG5OEJQyI5CF-cNAcvjzXf3GwX5sR97O3v98,3977
 ob_dj_store/core/stores/utils.py,sha256=l09CT9rst0DtcyUTlDQ47yjOxqI_ilN-Du0jbVGZF3c,3081
@@ -23,7 +23,7 @@ ob_dj_store/core/stores/gateway/tap/admin.py,sha256=3KgawxLjvpMsYXl_hx1DlKYpsMd-
 ob_dj_store/core/stores/gateway/tap/apps.py,sha256=kWwPjuAJeEmEasVDzUbvRsGaQWL-aYe4JDHNLvCVXPs,212
 ob_dj_store/core/stores/gateway/tap/managers.py,sha256=vjZAVFwV7FMIzNeaTh-A68RfFrfSoKEkuBI16VIAa10,875
 ob_dj_store/core/stores/gateway/tap/models.py,sha256=CG5lSG97xUX172zw2FKjYrgMEKxTPRxE0TB64I5KXQM,4852
-ob_dj_store/core/stores/gateway/tap/utils.py,sha256=FyiR_7bGFI3uJ65ogGTvjqmnVi_hRFxJEcSVwx3e-h0,5191
+ob_dj_store/core/stores/gateway/tap/utils.py,sha256=jsdE-ACKy7hUYXgQXCg1NFNF5H9I3mGVJabZHWhmKdg,5240
 ob_dj_store/core/stores/gateway/tap/migrations/0001_initial.py,sha256=_303R1R2tVVdPSMtwpuLUxvWbxQ2BML1Gsd-VhfnZEM,4808
 ob_dj_store/core/stores/gateway/tap/migrations/0002_auto_20220815_1610.py,sha256=gRsekTbqUH4h5yg5d1zWuai7Wiv6-rfsmjnXundgin8,674
 ob_dj_store/core/stores/gateway/tap/migrations/0003_auto_20220818_1938.py,sha256=pptUxq-AZtziRen5EvuahAVihcINEx_WTdpI28HBVUs,598
@@ -135,6 +135,7 @@ ob_dj_store/core/stores/migrations/0099_alter_product_name_arabic.py,sha256=dVv6
 ob_dj_store/core/stores/migrations/0100_remove_shippingmethod_type_arabic.py,sha256=3rwZhXsOqbo4jdW6AT5ClaDqXPYbMfP1JOesNzy-Ldw,347
 ob_dj_store/core/stores/migrations/0101_store_is_digital.py,sha256=yDs7c23WLdhnx82VBw0Fs_YJ0-IgfxLMvMsCkIiThFU,404
 ob_dj_store/core/stores/migrations/0102_partner_name_arabic.py,sha256=iJIiy5isLYv9Jv2sd-NOyZkwySNlXOEqGTOWE3wLH5w,411
+ob_dj_store/core/stores/migrations/0103_alter_paymentmethod_payment_provider.py,sha256=yCDvU60LMCrJM4BDdyl1PpMcAirJDAyjpqTDH_cjC8g,1079
 ob_dj_store/core/stores/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/models/__init__.py,sha256=VeWrDiIbw94ZDSFD-62rz9iTTW87iPdwDW5jcjxm7bs,2045
 ob_dj_store/core/stores/models/_address.py,sha256=8zV444A8M7P8yqQHjEOCROUykWPQ1ndSdd2IIX8wwWY,2207
@@ -144,15 +145,15 @@ ob_dj_store/core/stores/models/_feedback.py,sha256=eCUVgprNK5hSRKOS4M_pdR7QH2-rq
 ob_dj_store/core/stores/models/_inventory.py,sha256=ZU8xDMQZxLnFehkBEGWr-os4AF1IlCn5XnBxvRq9IAs,4314
 ob_dj_store/core/stores/models/_order.py,sha256=hFdlAQcN-iZM6_RaIWJ_FATwTER7pHCGoGSqc2prWBM,9710
 ob_dj_store/core/stores/models/_partner.py,sha256=Rm7viyuJWGT2abZcqu1axmLvi7bdlfmgL1qd2gzshVA,4544
-ob_dj_store/core/stores/models/_payment.py,sha256=LLXDKDeetCWauybC_VCtxxnD1PECKvuzQcPrnTBh6fs,6434
+ob_dj_store/core/stores/models/_payment.py,sha256=bzuf9J0rh1LwKrS_krtxa55x2rHYvwehupJop9zRy6A,6491
 ob_dj_store/core/stores/models/_product.py,sha256=F4GPoYXxmw-LC8Gben7RRFly-NmnjcvQhT6hrDggKbw,17665
-ob_dj_store/core/stores/models/_store.py,sha256=PM5pPJL7-1FNKN7zmwJCkNqZs2cxlzg5HNxPGqpVwlc,9633
+ob_dj_store/core/stores/models/_store.py,sha256=BVvxzhZbBj7bAtHljmodjCTsqCO2uKReyHmx-9r5zro,9633
 ob_dj_store/core/stores/models/_wallet.py,sha256=Eb1Sy79_M8PGrcfd5Bri0fT-bkwyqfkPHNyC2T7CR_0,5454
 ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/utils/helpers.py,sha256=o7wgypM7mI2vZqZKkhxnTcnHJC8GMQDOuYMnRwXr6tY,2058
 ob_dj_store/utils/model.py,sha256=DV7hOhTaZL3gh9sptts2jTUFlTArKG3i7oPioq9HLFE,303
 ob_dj_store/utils/utils.py,sha256=8UVAFB56qUSjJJ5f9vnermtw638gdFy4CFRCuMbns_M,1342
-ob_dj_store-0.0.17.9.dist-info/METADATA,sha256=awBG7XFsYkhj_uhHRTJrn6Fjs8vT8ZUzmZKodnl4Za4,2827
-ob_dj_store-0.0.17.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ob_dj_store-0.0.17.9.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.17.9.dist-info/RECORD,,
+ob_dj_store-0.0.18.1.dist-info/METADATA,sha256=vvIqd9hwnFkSm7YxiXHZwFmwVC35vzpXTNJB7PCCFkI,2827
+ob_dj_store-0.0.18.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ob_dj_store-0.0.18.1.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.18.1.dist-info/RECORD,,