ob-dj-store 0.0.20.2__tar.gz → 0.0.20.4__tar.gz

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/.github/workflows/test-build.yml

@@ -22,13 +22,13 @@ jobs:
         run: touch docker-compose.local.env
 
       - name: Build
-        run: docker-compose up -d
+        run: docker compose up -d
 
       - name: Test Code Linter
-        run: docker-compose run --rm app pre-commit run --all-files
+        run: docker compose run --rm app pre-commit run --all-files
 
       - name: Run test suite
-        run: docker-compose run --rm app pytest
+        run: docker compose run --rm app pytest
 
 #      - name: Upload coverage to Codecov
 #        uses: codecov/codecov-action@v2

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/.pre-commit-config.yaml

@@ -1,31 +1,30 @@
+default_language_version:
+  python: python3.9
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v4.1.0
     hooks:
       - id: check-merge-conflict
       - id: check-added-large-files
       - id: check-ast
       - id: check-symlinks
       - id: check-yaml
-        args: ['--unsafe']
       - id: trailing-whitespace
       - id: check-json
       - id: debug-statements
-      - id: detect-aws-credentials
-        args:
-        - --allow-missing-credentials
       - id: pretty-format-json
-        args:
-        - --autofix
+        args: ["--autofix", "--allow-missing-credentials"]
         exclude: Pipfile.lock
   - repo: https://github.com/asottile/seed-isort-config
     rev: v2.2.0
     hooks:
       - id: seed-isort-config
+        language_version: python3.9
   - repo: https://github.com/PyCQA/isort
     rev: 5.12.0
     hooks:
       - id: isort
+        language_version: python3.9
         args: ["--profile", "black"]
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
@@ -43,7 +42,8 @@ repos:
         exclude: '^\..*'
         args: ["--in-place", "--remove-all-unused-imports"]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 19.10b0
     hooks:
       - id: black
-        args: ["--target-version", "py38"]
+        language_version: python3.9
+        additional_dependencies: ['click==8.0.4']

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/Makefile

@@ -12,7 +12,7 @@ help:
 	@echo "dist:         package"
 	@echo "install:      install the package to the active Python's site-packages"
 	@echo "docs_check:   check sphinx docs for spelling warnings"
-	@echo "build - Build (usually, requires to build when changes happen to the Dockerfile or docker-compose.yml)"
+	@echo "build - Build (usually, requires to build when changes happen to the Dockerfile or docker compose.yml)"
 
 clean: clean-build clean-pyc clean-test
 
@@ -38,7 +38,7 @@ lint_tests:
 	flake8 leviathan_serving tests
 
 test:
-	docker-compose run --rm app pytest
+	docker compose run --rm app pytest
 
 test-all:
 	tox
@@ -79,16 +79,16 @@ lint:
 	pre-commit run --all-files
 
 bash:
-	docker-compose run --rm app bash
+	docker compose run --rm app bash
 
 migrations:
-	docker-compose run --rm app python manage.py makemigrations
+	docker compose run --rm app python manage.py makemigrations
 
 migrate:
-	docker-compose run --rm app python manage.py migrate
+	docker compose run --rm app python manage.py migrate
 
 up:
-	docker-compose up migrate -d && docker-compose up -d
+	docker compose up migrate -d && docker compose up -d
 
 build:
-	docker-compose build
+	docker compose build

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ob-dj-store
-Version: 0.0.20.2
+Version: 0.0.20.4
 Summary: OBytes django application for managing ecommerce stores.
 Home-page: https://www.obytes.com/
 Author: OBytes
@@ -25,6 +25,7 @@ Requires-Dist: djangorestframework-gis
 Requires-Dist: django-filter
 Requires-Dist: django-leaflet
 Requires-Dist: django-countries
+Dynamic: requires-dist
 
 ## OBytes Django Store App
 

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/config/settings.py

@@ -284,9 +284,7 @@ REST_FRAMEWORK = {
         "rest_framework_simplejwt.authentication.JWTAuthentication",
         "rest_framework.authentication.SessionAuthentication",
     ),
-    "DEFAULT_FILTER_BACKENDS": [
-        "django_filters.rest_framework.DjangoFilterBackend",
-    ],
+    "DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend",],
     "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
     "PAGE_SIZE": 50,
     "TEST_REQUEST_RENDERER_CLASSES": [
@@ -317,7 +315,7 @@ PAYPAL = "paypal"
 STRIPE = "stripe"
 WALLET = "wallet"
 GIFT = "gift"
-APPLE_PAY = "apple_pay"
+APPLE_PAY = "src_apple_pay"
 GOOGLE_PAY = "google_pay"
 MADA = "src_sa.mada"
 BENEFIT = "src_bh.benefit"
@@ -372,9 +370,7 @@ DIGITAL_PRODUCTS_REQUIRED_KEYS = (
 MULTIPLE_FAVORITE_EXTRA = 1
 SIGNLE_FAVORITE_EXTRA = 0
 FAVORITE_TYPES = {
-    "Store": {
-        "path": "ob_dj_store.core.stores.models._store.Store",
-    },
+    "Store": {"path": "ob_dj_store.core.stores.models._store.Store",},
     "Product": {
         "path": "ob_dj_store.core.stores.models._product.Product",
         "extras": {

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/ob_dj_store/apis/stores/filters.py

@@ -49,11 +49,7 @@ class StoreFilter(filters.FilterSet):
         return queryset.filter(address__country=value)
 
     def by_shipping_methods_names(self, queryset, name, value):
-        return queryset.filter(
-            shipping_methods__name__in=[
-                value,
-            ]
-        )
+        return queryset.filter(shipping_methods__name__in=[value,])
 
     def by_open_stores(self, queryset, name, value):
         if value:
@@ -186,9 +182,7 @@ class CategoryFilter(filters.FilterSet):
 
     def by_type(self, queryset, name, value):
         return (
-            queryset.filter(
-                subcategories__products__type=value,
-            )
+            queryset.filter(subcategories__products__type=value,)
             .prefetch_related(
                 Prefetch(
                     "subcategories",
@@ -198,9 +192,7 @@ class CategoryFilter(filters.FilterSet):
                 ),
                 Prefetch(
                     "subcategories__products",
-                    queryset=Product.objects.filter(
-                        is_active=True,
-                    ).distinct(),
+                    queryset=Product.objects.filter(is_active=True,).distinct(),
                 ),
             )
             .distinct()
@@ -241,10 +233,7 @@ class FavoriteFilter(filters.FilterSet):
             product_variants__inventories__store__pk=value
         ).values_list("id", flat=True)
         content_type = ContentType.objects.get_for_model(Product)
-        return queryset.filter(
-            content_type=content_type,
-            object_id__in=products_ids,
-        )
+        return queryset.filter(content_type=content_type, object_id__in=products_ids,)
 
 
 class PaymentMethodFilter(filters.FilterSet):
@@ -267,10 +256,7 @@ class PaymentMethodFilter(filters.FilterSet):
 
 class WalletFilter(filters.FilterSet):
     currency = filters.CharFilter(
-        method="by_currency",
-        validators=[
-            validate_currency,
-        ],
+        method="by_currency", validators=[validate_currency,],
     )
     country = filters.CharFilter(method="by_country")
 

{ob_dj_store-0.0.20.2 → ob_dj_store-0.0.20.4}/ob_dj_store/apis/stores/rest/serializers/serializers.py

@@ -329,8 +329,7 @@ class OrderSerializer(serializers.ModelSerializer):
         return store
 
     def _validate_user_address(
-        self,
-        attrs,
+        self, attrs,
     ):
         if "shipping_address" not in attrs:
             raise ValidationError(
@@ -417,13 +416,9 @@ class OrderSerializer(serializers.ModelSerializer):
                     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(
-                        _("Pickup time must be between store's opening hours")
-                    )
-            elif (
-                not op_hour.always_open
+            if (
+                op_hour.is_open_after_midnight
+                and not op_hour.always_open
                 and pickup_time_time > to_hour
                 or pickup_time_time < from_hour
             ):
@@ -736,9 +731,7 @@ class CartItemSerializer(
             "is_multi_variant",
         )
         extra_kwargs = {
-            "store": {
-                "required": True,
-            },
+            "store": {"required": True,},
         }
 
     def get_is_multi_variant(self, obj):
@@ -779,9 +772,9 @@ class CartItemSerializer(
         favorites = Favorite.objects.favorites_for_object(
             obj.product_variant.product, user
         )
-        customization = [
-            obj.product_variant,
-        ] + [attribute_choice for attribute_choice in obj.attribute_choices.all()]
+        customization = [obj.product_variant,] + [
+            attribute_choice for attribute_choice in obj.attribute_choices.all()
+        ]
         for favorite in favorites:
             content_objects = [
                 instance.content_object for instance in favorite.extras.all()
@@ -1172,7 +1165,6 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
             "image",
             "busy_mode",
             "name_arabic",
-            "is_open_after_midnight",
         )
         extra_kwargs = {
             "image": {"read_only": True, "required": False},
@@ -1186,16 +1178,16 @@ class StoreSerializer(ArabicFieldsMixin, FavoriteMixin, serializers.ModelSeriali
         if current_op_hour:
             from_hour = current_op_hour.from_hour
             to_hour = current_op_hour.to_hour
-            if current_time.tzinfo.zone != "Asia/Dubai":
-                if obj.currency == "AED":
-                    try:
-                        current_time += timedelta(hours=1)
-                    except Exception as e:
-                        logger.info(
-                            f"The fix for UAE stores timezone failed due to this error {e}"
-                        )
-
-            if obj.is_open_after_midnight:
+            # if current_time.tzinfo.zone != "Asia/Dubai":
+            #     if obj.currency == "AED":
+            #         try:
+            #             current_time += timedelta(hours=1)
+            #         except Exception as e:
+            #             logger.info(
+            #                 f"The fix for UAE stores timezone failed due to this error {e}"
+            #             )
+
+            if current_op_hour.is_open_after_midnight:
                 return True if to_hour < current_time.time() < from_hour else False
 
             if current_op_hour.always_open:
@@ -1817,9 +1809,7 @@ class PartnerAuthInfoSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
                     status=OneTruePairing.Statuses.init,
                     created_at__gte=timeout,
                 ).get(
-                    email=attrs["email"],
-                    partner_otp_auth__partner=partner,
-                    user=user,
+                    email=attrs["email"], partner_otp_auth__partner=partner, user=user,
                 )
                 self.context["otp"] = otp
             except ObjectDoesNotExist as e:
@@ -1856,11 +1846,7 @@ class PartnerAuthInfoSerializer(ArabicFieldsMixin, serializers.ModelSerializer):
             otp.status = OneTruePairing.Statuses.used
             otp.save()
         partner_auth_info = PartnerAuthInfo.objects.update_or_create(
-            user=user,
-            defaults={
-                "partner": partner,
-                "email": validated_data["email"],
-            },
+            user=user, defaults={"partner": partner, "email": validated_data["email"],},
         )
         return partner_auth_info