ob-dj-store 0.0.18.4__py3-none-any.whl → 0.0.18.7__py3-none-any.whl

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

@@ -1116,6 +1116,7 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             "image",
             "busy_mode",
             "name_arabic",
+            "is_open_after_midnight",
         )
         extra_kwargs = {
             "image": {"read_only": True, "required": False},
@@ -1124,9 +1125,20 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
     def get_is_closed(self, obj):
         if obj.busy_mode:
             return True
+
         current_time = localtime(now())
         current_op_hour = obj.current_opening_hours
         if current_op_hour:
+
+            if obj.is_open_after_midnight:
+                return (
+                    True
+                    if current_op_hour.to_hour
+                    < current_time.time()
+                    < current_op_hour.from_hour
+                    else False
+                )
+
             if current_op_hour.always_open:
                 return False
             return (

ob_dj_store/core/stores/admin.py

@@ -109,6 +109,7 @@ class StoreAdmin(LeafletGeoAdmin):
                     "pickup_addresses",
                     "image",
                     "currency",
+                    "is_open_after_midnight",
                 )
             },
         ),

ob_dj_store/core/stores/models/_cart.py

@@ -8,6 +8,7 @@ from django.utils.translation import gettext_lazy as _
 
 from ob_dj_store.core.stores.managers import CartItemManager, CartManager
 from ob_dj_store.core.stores.models._partner import PartnerAuthInfo
+from ob_dj_store.core.stores.utils import round_up_tie
 
 
 class Cart(models.Model):
@@ -32,7 +33,7 @@ class Cart(models.Model):
         amount = Decimal(
             sum(map(lambda item: Decimal(item.tax_amount), self.items.all()))
         )
-        return amount
+        return round_up_tie(amount, 3)
 
     def get_applied_tax_amount(self):
         tax_amount = 0
@@ -75,11 +76,13 @@ class Cart(models.Model):
 
     @property
     def discount_offer_amount(self):
-        return sum(map(lambda item: item.discount_amount, self.items.all()))
+        return round_up_tie(
+            sum(map(lambda item: item.discount_amount, self.items.all())), 3
+        )
 
     @property
     def total_price_with_discount(self):
-        return self.total_price - self.discount_offer_amount
+        return self.total_price - Decimal(self.discount_offer_amount)
 
     def __str__(self):
         return f"Cart - {self.customer.email} with total price {self.total_price}"

ob_dj_store/core/stores/utils.py

@@ -1,5 +1,6 @@
 import math
 from datetime import timedelta
+from decimal import ROUND_HALF_UP, Decimal
 
 import pycountry
 from django.core.exceptions import ValidationError
@@ -80,6 +81,15 @@ def validate_currency(value):
         )
 
 
+def round_up_tie(value, decimal_places=3):
+    """Helper function to always round up when the 4th decimal is a 5"""
+    decimal_value = Decimal(str(value))
+    rounded_value = decimal_value.quantize(
+        Decimal("1e-{0}".format(decimal_places)), rounding=ROUND_HALF_UP
+    )
+    return Decimal(rounded_value)
+
+
 def get_arabic_fields(model, static_fields):
     all_fields = [field.name for field in model._meta.get_fields()]
     arabic_fields = {

{ob_dj_store-0.0.18.4.dist-info → ob_dj_store-0.0.18.7.dist-info}/METADATA

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

{ob_dj_store-0.0.18.4.dist-info → ob_dj_store-0.0.18.7.dist-info}/RECORD

@@ -3,20 +3,20 @@ 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=8Sj5KA_3Yx3m_a2P9nltdvO84D__zKaSCdzuCxnxqFo,62874
+ob_dj_store/apis/stores/rest/serializers/serializers.py,sha256=yZHKYh77rc37-Ve0MwuDOcf5NoCtlh20hRfP8H2hxCc,63194
 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=R_4EJRjsgLKcIN-B3b5T_rb_IgOJhU2r4xLSlnasnWo,2665
 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=_zg10EVLLOfL8CdSsG7mRpZmxrigBS6tx25XU55caJ8,13453
+ob_dj_store/core/stores/admin.py,sha256=FXu87VzZPaT1KXf3haY4YjzkK_FjxQp2A-JZXUkwA2I,13499
 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
 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
+ob_dj_store/core/stores/utils.py,sha256=-oHJot3pLF2sLE3Bv0AU_qXFshNOAO3h8Y1yMfgF6K8,3439
 ob_dj_store/core/stores/gateway/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ob_dj_store/core/stores/gateway/tap/__init__.py,sha256=5Z6azpb6tmr1nRvKwQWzlYw9ruvw-9ZMBWRqEngDKTM,40
 ob_dj_store/core/stores/gateway/tap/admin.py,sha256=3KgawxLjvpMsYXl_hx1DlKYpsMd-ojSA4FNazVA4CIk,1183
@@ -141,7 +141,7 @@ ob_dj_store/core/stores/migrations/0105_store_is_open_after_midnight.py,sha256=8
 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
-ob_dj_store/core/stores/models/_cart.py,sha256=QLQlRZPCmb7JcM_872oruEEy10rXmlm7hbJHEXsUICI,7090
+ob_dj_store/core/stores/models/_cart.py,sha256=I5Mv-OkmV3W26GLPpNBAEaDRsbSbfPCJGJ1-MR6fG4Y,7210
 ob_dj_store/core/stores/models/_favorite.py,sha256=3yyMCoiftGOPAQwkMI2J29r3x6NJsRYri9f8gXiF1e8,3306
 ob_dj_store/core/stores/models/_feedback.py,sha256=eCUVgprNK5hSRKOS4M_pdR7QH2-rqhoYevlpykhCOLg,1472
 ob_dj_store/core/stores/models/_inventory.py,sha256=ZU8xDMQZxLnFehkBEGWr-os4AF1IlCn5XnBxvRq9IAs,4314
@@ -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.18.4.dist-info/METADATA,sha256=mX65-LuO-GUIqNwvZOV4rniq4Agx4Xp3dpTAGeNmYAI,2827
-ob_dj_store-0.0.18.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-ob_dj_store-0.0.18.4.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
-ob_dj_store-0.0.18.4.dist-info/RECORD,,
+ob_dj_store-0.0.18.7.dist-info/METADATA,sha256=u585C53kGBFTWdVM-y8tzELuzCdvJUSGM7I98KUKpn0,2827
+ob_dj_store-0.0.18.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+ob_dj_store-0.0.18.7.dist-info/top_level.txt,sha256=CZG3G0ptTkzGnc0dFYN-ZD7YKdJBmm47bsmGwofD_lk,12
+ob_dj_store-0.0.18.7.dist-info/RECORD,,