ob-dj-store 0.0.19.4__py3-none-any.whl → 0.0.19.6__py3-none-any.whl

ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -1,7 +1,7 @@
 import calendar
 import logging
 import typing
-from datetime import time, timedelta
+from datetime import timedelta
 from decimal import Decimal
 
 import pycountry
@@ -56,7 +56,7 @@ from ob_dj_store.core.stores.models import (
     WalletTransaction,
 )
 from ob_dj_store.core.stores.models._inventory import Inventory
-from ob_dj_store.core.stores.utils import PartnerAuth, distance
+from ob_dj_store.core.stores.utils import PartnerAuth, distance, get_currency_by_country
 
 logger = logging.getLogger(__name__)
 
@@ -405,9 +405,12 @@ class OrderSerializer(serializers.ModelSerializer):
             from_hour = op_hour.from_hour
             to_hour = op_hour.to_hour
             if store.currency == "AED":
-                from_hour = time(from_hour.hour + 1, from_hour.minute, from_hour.second)
-                to_hour = time(to_hour.hour + 1, to_hour.minute, to_hour.second)
-
+                try:
+                    pickup_time_time += timedelta(hours=1)
+                except Exception as e:
+                    logger.info(
+                        f"The fix for UAE stores timezone failed due to this error {e}"
+                    )
             if store.is_open_after_midnight:
                 if to_hour < pickup_time_time < from_hour:
                     raise serializers.ValidationError(
@@ -535,7 +538,12 @@ class OrderSerializer(serializers.ModelSerializer):
             amount = gift_details["price"]
             order = Order.objects.create(customer=user, **validated_data)
             orders.append(order)
-            currency = gift_details["currency"]
+            try:
+                default_currency = get_currency_by_country(user.country.code)
+            except Exception as e:
+                default_currency = "KWD"
+                logger.info(f"Couldn't fetch currency due to this error {e}")
+            currency = gift_details.get("currency", default_currency)
         else:
             cart = user.cart
             stores = Store.objects.filter(store_items__cart=cart).distinct()

ob_dj_store/core/stores/admin.py

@@ -84,6 +84,8 @@ class StoreAdmin(LeafletGeoAdmin):
         "minimum_order_amount",
         "delivery_charges",
         "min_free_delivery_amount",
+        "created_at",
+        "updated_at",
     ]
     # define the pickup addresses field as a ManyToManyField
     # to the address model
@@ -149,7 +151,7 @@ class CategoryAdmin(admin.ModelAdmin):
         )
 
 
-class ProductVariantAdmin(admin.ModelAdmin):
+class ProductVariantAdmin(ImportExportModelAdmin, admin.ModelAdmin):
     inlines = [
         InventoryInlineAdmin,
         ProductAttributeInlineAdmin,

{ob_dj_store-0.0.19.4.dist-info → ob_dj_store-0.0.19.6.dist-info}/METADATA

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

{ob_dj_store-0.0.19.4.dist-info → ob_dj_store-0.0.19.6.dist-info}/RECORD

@@ -3,14 +3,14 @@ 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=WEhhBGimQS-hOBGrtdvexVtq2Z0wU2RR_ZyPgqOVVJs,64029
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=vpO_IXF2Fqfy7ML013nWRLeXAVZmpf3pLavotLaEr-M,64410
 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=vG0rC-PQHCnrbNsPW1gClx0rkaIjALEAuj5cQKmCTo0,2664
 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=oHqzB8lc8A5clzo4tDTAROIAMDGxUXou5jdD-wmrlHQ,14435
+ob_dj_store/core/stores/admin.py,sha256=fGjjpDkPzQM2Fwo5yGzeoeSpX2CW2RJQ4kfftD5NwyM,14503
 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=lz2CE4PJCI1ViO-CU61LqTr43O41aGRQkbWZUR5Fmfg,9909
@@ -155,7 +155,7 @@ ob_dj_store/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 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.19.4.dist-info/METADATA,sha256=NASBbqSP9CQtYc8W1kGDCZDjmUtIhzkTQZlqr6DpUl0,2827
-ob_dj_store-0.0.19.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-ob_dj_store-0.0.19.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.19.4.dist-info/RECORD,,
+ob_dj_store-0.0.19.6.dist-info/METADATA,sha256=rqdkn9xKtui3jW-njVv9yaS0UzwCqytDb_GllHO_p8o,2827
+ob_dj_store-0.0.19.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+ob_dj_store-0.0.19.6.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.19.6.dist-info/RECORD,,