Merge pull request #12 from roniahmadi/main

update uv
pi-apps · Oct 5, 2024 · 16cffa4 · 16cffa4
2 parents 832dbc6 + 6ad98ab
commit 16cffa4
Show file tree

Hide file tree

Showing 88 changed files with 929 additions and 4,673 deletions.
diff --git a/apidata/serializers/distric_serializer.py b/apidata/serializers/distric_serializer.py
@@ -1,10 +1,9 @@
 from rest_framework import serializers
 
-from master.models import Distric
+from master.models.distric import Distric
 
 
 class DistricSerializer(serializers.HyperlinkedModelSerializer):
-
     class Meta:
         model = Distric
         fields = ["url", "id", "code", "regency_code", "name"]
diff --git a/apidata/serializers/produks_serializer.py b/apidata/serializers/produks_serializer.py
@@ -35,9 +35,7 @@ def get_nama(self, obj):
             user = None
         else:
             languanges_code = user.languages.code if user.languages else "id"
-        translate_text = translater(
-            translate_to=languanges_code, page=obj.nama, values=obj.nama
-        )
+        translate_text = translater(translate_to=languanges_code, page=obj.nama, values=obj.nama)
         return translate_text
 
 
@@ -57,9 +55,7 @@ def get_nama(self, obj):
             user = None
         else:
             languanges_code = user.languages.code if user.languages else "id"
-        translate_text = translater(
-            translate_to=languanges_code, page=obj.nama, values=obj.nama
-        )
+        translate_text = translater(translate_to=languanges_code, page=obj.nama, values=obj.nama)
         return translate_text
 
 
@@ -79,14 +75,11 @@ def get_nama(self, obj):
             user = None
         else:
             languanges_code = user.languages.code if user.languages else "id"
-        translate_text = translater(
-            translate_to=languanges_code, page=obj.nama, values=obj.nama
-        )
+        translate_text = translater(translate_to=languanges_code, page=obj.nama, values=obj.nama)
         return translate_text
 
 
 class GambarProdukSerializer(serializers.HyperlinkedModelSerializer):
-
     class Meta:
         model = GambarProduk
         fields = ["gambar", "nama"]
@@ -144,10 +137,7 @@ def get_nama(self, obj):
 
     def get_count_star(self, obj):
         countstar = (
-            UlasanCart.objects.filter(produkitem_id=obj.id).aggregate(Avg("produk"))[
-                "produk__avg"
-            ]
-            or 0  # noqa: W503
+            UlasanCart.objects.filter(produkitem_id=obj.id).aggregate(Avg("produk"))["produk__avg"] or 0  # noqa: W503
         )
         return countstar
 
@@ -156,9 +146,7 @@ def get_produk_detail_url(self, obj):
         return urldetail
 
     def get_gambar(self, obj):
-        gambars = GambarProduk.objects.filter(
-            produk__pk=obj.pk, gambar__isnull=False
-        ).order_by("-pk")
+        gambars = GambarProduk.objects.filter(produk__pk=obj.pk, gambar__isnull=False).order_by("-pk")
         return GambarProdukSerializer(gambars, many=True).data
 
     def get_store(self, obj):

diff --git a/apidata/serializers/provinsi_serializer.py b/apidata/serializers/provinsi_serializer.py
@@ -1,10 +1,9 @@
 from rest_framework import serializers
 
-from master.models import Provinsi
+from master.models.provinsi import Provinsi
 
 
 class ProvinsiSerializer(serializers.HyperlinkedModelSerializer):
-
     class Meta:
         model = Provinsi
         fields = ["url", "id", "code", "nama"]
diff --git a/apidata/serializers/regency_serializer.py b/apidata/serializers/regency_serializer.py
@@ -1,10 +1,9 @@
 from rest_framework import serializers
 
-from master.models import Regency
+from master.models.regency import Regency
 
 
 class RegencySerializer(serializers.HyperlinkedModelSerializer):
-
     class Meta:
         model = Regency
         fields = ["url", "id", "code", "province_code", "name"]
diff --git a/apidata/viewsets/distric_viewset.py b/apidata/viewsets/distric_viewset.py
@@ -2,7 +2,7 @@
 from rest_framework import filters, viewsets
 
 from apidata.serializers.distric_serializer import DistricSerializer
-from master.models import Distric
+from master.models.distric import Distric
 
 
 class DistricViewSet(viewsets.ModelViewSet):

diff --git a/apidata/viewsets/provinsi_viewset.py b/apidata/viewsets/provinsi_viewset.py
@@ -2,7 +2,7 @@
 from rest_framework import filters, viewsets
 
 from apidata.serializers.provinsi_serializer import ProvinsiSerializer
-from master.models import Provinsi
+from master.models.provinsi import Provinsi
 
 
 class ProvinsiViewSet(viewsets.ModelViewSet):

diff --git a/apidata/viewsets/regency_viewset.py b/apidata/viewsets/regency_viewset.py
@@ -2,7 +2,7 @@
 from rest_framework import filters, viewsets
 
 from apidata.serializers.regency_serializer import RegencySerializer
-from master.models import Regency
+from master.models.regency import Regency
 
 
 class RegencyViewSet(viewsets.ModelViewSet):

diff --git a/frontend/serializers.py b/frontend/serializers.py
@@ -1,6 +1,9 @@
 from rest_framework import serializers
 
-from master.models import Distric, Provinsi, Regency, Village
+from master.models.distric import Distric
+from master.models.provinsi import Provinsi
+from master.models.regency import Regency
+from master.models.village import Village
 from produk.models import GambarProduk, Kategori, Produk
 from profiles.models import UserProfile, UserProfileAddress
 

diff --git a/frontend/templates/jual/index.html b/frontend/templates/jual/index.html
@@ -21,9 +21,10 @@ <h2 class="text-xl font-bold">{% translater user.languages.code "Back" "Back" %}
 {% endblock %}
 
 {% block content %}
-<div class="px-3 mt-3 mb-[60px] flex flex-col gap-2">
+<div class="px-8 pb-8 mt-3 flex flex-col gap-2">
     {% if messages %}
     <div class="bg-green-400 px-1 rounded-lg">
+
         {% for message in messages %}
             {{ message }}
         {% endfor %}
@@ -43,7 +44,7 @@ <h2 class="text-xl font-bold">{% translater user.languages.code "Back" "Back" %}
         </div>
         <div class="mb-6">
             <label class="block mb-2 font-medium text-slate-900">{% translater user.languages.code "Bahasa Deskripsi" "Bahasa Deskripsi" %}</label>
-            <select id="bahasa" class="bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-1" name="bahasa" required>
+            <select id="bahasa" class="bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-1 select-adder" name="bahasa" required>
                 {% for k in languages %}
                 <option value="{{ k.code }}">{{ k.alias }}</option>
                 {% endfor %}
@@ -58,7 +59,7 @@ <h2 class="text-xl font-bold">{% translater user.languages.code "Back" "Back" %}
         </div>
         <div class="mb-6">
             <label class="block mb-2 font-medium text-slate-900">{% translater user.languages.code "Negara" "Negara" %}</label>
-            <select id="negara" class="bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-1" name="negara" required>
+            <select id="negara" class="bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-1 select-adder" name="negara" required>
                 {% for k in country %}
                 <option value="{{ k.id }}">{{ k.name }}</option>
                 {% endfor %}
@@ -84,12 +85,12 @@ <h2 class="text-xl font-bold">{% translater user.languages.code "Back" "Back" %}
             </div>
         </div>
         <div class="mb-6">
-            <label class="block mb-2 font-medium text-slate-900" for="harga">{% translater user.languages.code "Harga" "Harge" %}</label>
+            <label class="block mb-2 font-medium text-slate-900" for="harga">{% translater user.languages.code "Harga" "Harga" %}</label>
             <div class="relative w-full">
                 <div class="absolute inset-y-0 left-0 flex items-center pl-3.5 pointer-events-none">
                     <span class="text-slate-500 font-medium">𝛑</span>
                 </div>
-                <input name="harga" type="text" id="email-address-icon" class="bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg w-full focus:ring-blue-500 focus:border-blue-500 block pl-10 p-1" placeholder="Masukkan harga produk" />
+                <input name="harga" type="text" id="email-address-icon" class="bg-slate-50 border border-slate-300 text-slate-900 text-sm rounded-lg w-full focus:ring-blue-500 focus:border-blue-500 block pl-10 p-1" placeholder="Masukkan harga produk" required/>
             </div>
         </div>
 
@@ -241,5 +242,8 @@ <h2 class="text-xl font-bold">{% translater user.languages.code "Back" "Back" %}
             ck.setData(vv)
         }
     })
+    $(document).ready(function(){
+        $(".select-adder").select2()
+    })
 </script>
 {% endblock %}
diff --git a/frontend/urls.py b/frontend/urls.py
@@ -10,7 +10,6 @@
 
 # Checkout
 from frontend.views.cart.add_to_cart_view import AddToCart
-from frontend.views.proccess.approve_view import Approve
 from frontend.views.cart.cart_json_view import CartJson
 from frontend.views.cart.toko_transaksi_view import TransaksiToko
 from frontend.views.completepayment_view import CompletePayment
@@ -32,6 +31,7 @@
 from frontend.views.payments_cart_view import PaymentsCart
 from frontend.views.piverification_view import VerificationCode
 from frontend.views.privacyandpolicy_view import PrivacyAndPolicy
+from frontend.views.proccess.approve_view import Approve
 from frontend.views.produk.produk_detail_view import ProdukDetail
 
 # produk
@@ -63,7 +63,7 @@
 from frontend.views.toko.archive_barang_view import ArchiveBarang
 
 # toko
-from frontend.views.toko.jual_view import Jual
+from frontend.views.toko.jual import Jual
 from frontend.views.toko.toko_view import Toko
 from frontend.views.toko_edit_view import TokoEdit
 from frontend.views.transaksi_selesai_view import TransaksiUserSelesaiJson
@@ -108,9 +108,7 @@
     # toko
     path("toko/<int:id>/", Toko.as_view(), name="toko"),
     path("toko/<int:id>/profile/edit", TokoEdit.as_view(), name="toko_profile_edit"),
-    path(
-        "toko/<int:id>/list_produk/", ListProdukToko.as_view(), name="list_produk_toko"
-    ),
+    path("toko/<int:id>/list_produk/", ListProdukToko.as_view(), name="list_produk_toko"),
     path(
         "toko/<int:id>/produk/<int:produk_id>/edit",
         EditBarang.as_view(),
@@ -208,9 +206,7 @@
     ),
     path("translate/json", TranslatedApi.as_view(), name="translated_json"),
     # firebase
-    path(
-        "firebase-messaging-sw.js", ServiceWorkerView.as_view(), name="service_worker"
-    ),
+    path("firebase-messaging-sw.js", ServiceWorkerView.as_view(), name="service_worker"),
     path("fcm-token", FcmSaveTokenView.as_view(), name="fcm_token"),
     path("validation-key.txt", VerificationCode.as_view(), name="verification"),
     path("sess/login", LoginView.as_view(), name="log_less"),

diff --git a/frontend/views/base_view.py b/frontend/views/base_view.py
@@ -4,7 +4,7 @@
 from django.views import View
 from firebase_admin import credentials
 
-from master.models import ConfigurationWebsite
+from master.models.configuration_website import ConfigurationWebsite
 
 
 class FrontPage(View):

diff --git a/frontend/views/beli_view.py b/frontend/views/beli_view.py
@@ -12,19 +12,15 @@
 class Beli(FrontPage):
     def get(self, request, id):
         profile = request.user
-        alamat = UserProfileAddress.objects.filter(
-            userprofile_id=profile.pk, is_primary=True
-        )
+        alamat = UserProfileAddress.objects.filter(userprofile_id=profile.pk, is_primary=True)
         alamat = alamat.first()
         # pajak = SettingWebsite.objects.filter(nama_pengaturan=3).first()
         pajak = self.configuration.pajak_beli
         pajak_persen = float(pajak) * 100
         cart_data = None
         try:
             cart = Cart.objects.get(user_id=request.user.id, status_pembayaran=1, pk=id)
-            cart_data = CartItem.objects.filter(
-                cart__user=request.user, cart__status_pembayaran=1
-            ).latest("pk")
+            cart_data = CartItem.objects.filter(cart__user=request.user, cart__status_pembayaran=1).latest("pk")
             jumlah = 0
             harga = cart_data.jumlah * cart_data.produk.harga
             jumlah = jumlah + harga

diff --git a/frontend/views/beranda/home.py b/frontend/views/beranda/home.py
@@ -4,7 +4,7 @@
 
 from frontend.models import Banner, Pengumuman
 from frontend.views.base_view import FrontPage
-from master.models import Negara
+from master.models.negara import Negara
 from produk.models import Kategori, Produk
 
 

diff --git a/frontend/views/cart/add_to_cart_view.py b/frontend/views/cart/add_to_cart_view.py
@@ -81,9 +81,7 @@ def post(self, request, id):
         user_cart.save()
         user_cart = UserCartItem.objects.get(pk=user_cart.id)
 
-        addr_user = UserProfileAddress.objects.filter(
-            userprofile_id=request.user.pk, is_primary=True
-        ).first()
+        addr_user = UserProfileAddress.objects.filter(userprofile_id=request.user.pk, is_primary=True).first()
         user_cart_address = AddressUserChartItem()
         user_cart_address.address = addr_user.address
         user_cart_address.province = addr_user.province

diff --git a/frontend/views/cart/toko_transaksi_view.py b/frontend/views/cart/toko_transaksi_view.py
@@ -9,8 +9,9 @@
 from firebase_admin import messaging
 
 from frontend.views.base_view import FrontPage
+from master.models.expedisi import Expedisi
 from produk.models import Cart, CartItem
-from store.models import Expedisi, UserStore
+from store.models import UserStore
 
 
 @method_decorator(csrf_exempt, name="dispatch")
@@ -42,21 +43,15 @@ def post(self, request, id):
                         )
                         return redirect(f"{urls_redirect}?status={str(status)}")
                     from apidata.resi_check import ResiCheck
-                    from master.models import ConfigurationWebsite
+                    from master.models.configuration_website import ConfigurationWebsite
 
                     konfigurasi = ConfigurationWebsite.get_solo()
-                    cekinit = ResiCheck(
-                        url=konfigurasi.url_check_resi, api=konfigurasi.api_check_resi
-                    )
-                    code_expedisi = Expedisi.objects.get(
-                        id=request.POST.get("expedisi")
-                    )
+                    cekinit = ResiCheck(url=konfigurasi.url_check_resi, api=konfigurasi.api_check_resi)
+                    code_expedisi = Expedisi.objects.get(id=request.POST.get("expedisi"))
                     status_posisi = "dikirim"
                     if not konfigurasi.bypass_expedisi:
                         if code_expedisi.source_request == 1:
-                            cekresi = cekinit.check_resi(
-                                resi=resi, courier=code_expedisi.code
-                            )
+                            cekresi = cekinit.check_resi(resi=resi, courier=code_expedisi.code)
                             if cekresi.status_code != 200:
                                 url_redirect = reverse(
                                     "transaksi_toko",
@@ -73,9 +68,7 @@ def post(self, request, id):
                                 return redirect(f"{url_redirect}?status={str(status)}")
                         elif code_expedisi.source_request == 2:
                             cekinit.api = konfigurasi.api_biteship
-                            cekresi = cekinit.check_resi_bitesip(
-                                resi=resi, courier=code_expedisi.code
-                            )
+                            cekresi = cekinit.check_resi_bitesip(resi=resi, courier=code_expedisi.code)
                             if cekresi.status_code != 200:
                                 cart.save()
                                 messages.success(request, "Nomor resi valid")
@@ -153,9 +146,7 @@ def send_mail(self, request):
                 to = [
                     request.user.email,
                 ]
-                sendd = EmailMessage(
-                    subject, html, from_email, to, connection=connection
-                )
+                sendd = EmailMessage(subject, html, from_email, to, connection=connection)
                 sendd.content_subtype = "html"
                 sendd.send()
         except SMTPException as e: