ob-dj-store 0.0.21.9__py3-none-any.whl → 0.0.22.1__py3-none-any.whl

ob_dj_store/core/stores/models/_wallet.py

@@ -120,8 +120,18 @@ class Wallet(models.Model):
             method=payment_method,
             amount=amount,
         )
-        tap_payment = payment.tap_payment
-        return (tap_payment.payment_url, tap_payment.charge_id)
+
+        provider = payment_method.payment_provider
+        if provider == settings.TAP_ALL:
+            return (payment.tap_payment.payment_url, payment.tap_payment.charge_id)
+        elif provider == settings.STRIPE:
+            return (
+                payment.stripe_payment.payment_url,
+                payment.stripe_payment.payment_intent_id,
+            )
+        else:
+            logger.warning(f"Unsupported payment provider: {provider}")
+            return (None, None)
 
 
 class WalletTransaction(models.Model):

ob_dj_store/core/stores/receivers.py

@@ -1,3 +1,5 @@
+import logging
+
 from django.conf import settings
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
@@ -15,6 +17,8 @@ from ob_dj_store.core.stores.models import (
 from ob_dj_store.core.stores.utils import get_currency_by_country
 from ob_dj_store.utils.utils import resize_image
 
+logger = logging.getLogger(__name__)
+
 
 @receiver(
     post_save,
@@ -22,19 +26,37 @@ from ob_dj_store.utils.utils import resize_image
     dispatch_uid="create_customer_cart_and_wallet_handler",
 )
 def create_customer_cart_and_wallet_handler(sender, instance, created, **kwargs):
-    if not created:
-        return
-    cart = Cart(customer=instance)
-    cart.save()
-    wallet_media = WalletMedia.objects.filter(is_default=True)
-    wallet_currencies = settings.WALLET_CURRENCIES
-    if getattr(instance, "country", "") and instance.country:
-        currency = get_currency_by_country(instance.country.code)
-        if currency not in wallet_currencies:
-            wallet_currencies = settings.US_WALLET_CURRENCIES
-
-    for currency in wallet_currencies:
-        instance.wallets.create(currency=currency, media_image=wallet_media.first())
+    try:
+        logger.info(f"Creating cart and wallet for user {instance.id}")
+        if not hasattr(instance, "cart"):
+            cart = Cart(customer=instance)
+            cart.save()
+
+        wallet_media = WalletMedia.objects.filter(is_default=True)
+        wallet_currencies = settings.WALLET_CURRENCIES
+        logger.info(f"Wallet currencies: {wallet_currencies}")
+        # getattr(instance, "country", "") : only for bypassing ob_dj_store users
+        if getattr(instance, "country", "") and instance.country:
+            currency = get_currency_by_country(instance.country.code)
+            if currency not in wallet_currencies:
+                wallet_currencies = settings.US_WALLET_CURRENCIES
+        logger.info(f"Wallet currencies: {wallet_currencies}")
+
+        # check if wallet exists since we now run the signal on every user update
+        for currency in wallet_currencies:
+            instance.wallets.get_or_create(
+                currency=currency, media_image=wallet_media.first()
+            )
+
+        # delete gcc wallets if exists for US based users
+        if getattr(instance, "country", "") and instance.country:
+            currency = get_currency_by_country(instance.country.code)
+            if currency not in settings.US_WALLET_CURRENCIES:
+                instance.wallets.filter(
+                    currency__in=settings.WALLET_CURRENCIES
+                ).delete()
+    except Exception:
+        logger.error(f"Error creating cart for user {instance.id}")
 
 
 # add receiver to ProductVariant to create inventory

{ob_dj_store-0.0.21.9.dist-info → ob_dj_store-0.0.22.1.dist-info}/METADATA

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

{ob_dj_store-0.0.21.9.dist-info → ob_dj_store-0.0.22.1.dist-info}/RECORD

@@ -18,7 +18,7 @@ ob_dj_store/core/stores/admin.py,sha256=aI1t3nIeOw_Vcy2E2LNaAxMRX2GjvVrVeBaH-n4I
 ob_dj_store/core/stores/admin_inlines.py,sha256=9_35VwwRh5w8YU2CRTJ7sENUjF-D-J-o9jXhLEPpS3w,2900
 ob_dj_store/core/stores/apps.py,sha256=ZadmEER_dNcQTH617b3fAsYZJSyRw0g46Kjp4eOAsOU,498
 ob_dj_store/core/stores/managers.py,sha256=Q0PUB_LSz0bufJ0OfgHuvSC-5uAGSsDDlhitisFJqw4,10141
-ob_dj_store/core/stores/receivers.py,sha256=qL9PNuGe_rcnq89pRoxeFRkZA4uAbpmqmc0T-kW7J4E,4015
+ob_dj_store/core/stores/receivers.py,sha256=iQZfQo_6hUipUFX4VMRHkTc54CCNPf0-NSmXNyzzwhU,5008
 ob_dj_store/core/stores/settings_validation.py,sha256=eTkRaI6CG5OEJQyI5CF-cNAcvjzXf3GwX5sR97O3v98,3977
 ob_dj_store/core/stores/utils.py,sha256=r6YdjQu5gsrZmO_qgXb21xcB50tbAI9vffN4Yp6n6iA,3427
 ob_dj_store/core/stores/gateway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -167,12 +167,12 @@ ob_dj_store/core/stores/models/_partner.py,sha256=OuYvevUWn1sYHs9PcFf51EUUC1uqyt
 ob_dj_store/core/stores/models/_payment.py,sha256=SfAMVrdP2Hfz604AyO8EOjeiOgGMeJ8My0s5U4GZ7Yc,6650
 ob_dj_store/core/stores/models/_product.py,sha256=KUi2hkA4VNCrWwWp3AM_tkubFptpOdiFt0Twzi2wW14,18535
 ob_dj_store/core/stores/models/_store.py,sha256=0K-CNJWuXNqeyULL1J0M9hiNcVla0UNNjdCdN_nzNEE,9833
-ob_dj_store/core/stores/models/_wallet.py,sha256=YvT-rvED-jrYjePLJpvdLXXoBudR6TGPu5cNE0m2fWo,5643
+ob_dj_store/core/stores/models/_wallet.py,sha256=QktPaDH2gOGDyOqBqY0lXU91gL2_MhHhy2d7GcCO1ZA,6019
 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.21.9.dist-info/METADATA,sha256=NXl_1kU9ayMBqYtsW3auF2nr4Z-lA0E3V4KbI58dQXA,2850
-ob_dj_store-0.0.21.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ob_dj_store-0.0.21.9.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.21.9.dist-info/RECORD,,
+ob_dj_store-0.0.22.1.dist-info/METADATA,sha256=EPL0g7lRSJkPFVBKE0cEmKXzmKXVqQuT8ZRGtltup3k,2850
+ob_dj_store-0.0.22.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ob_dj_store-0.0.22.1.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.22.1.dist-info/RECORD,,