Merge pull request #13 from roniahmadi/main

update add transaction module
pi-apps · Oct 5, 2024 · 134afa4 · 134afa4
2 parents 16cffa4 + 99ef6c9
commit 134afa4
Show file tree

Hide file tree

Showing 37 changed files with 234 additions and 582 deletions.
diff --git a/README.md b/README.md
@@ -2,3 +2,7 @@
 Gerai Pi Indonesia is one of the P2App Marketplaces which will become a Digitalization Transaction Bridge driven by Pi Coin as a Crypto Currency by prioritizing Trust in the Indonesian Pi/Pioneer Community
 
 # Developer of Geraipi
+Comingsoon
+
+# Vission and Mission of geraipi
+Comingsoon
diff --git a/frontend/templates/checkout/home_beli.html b/frontend/templates/checkout/home_beli.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %} 
 {% load static translater %} 
 {% block content %}
-<div class="mt-3 mb-4">
+<div class="mt-3 pb-10">
     <form action="" method="post" id="sbbutton">
         <div class="h-screen mx-3">
             {% if messages %}

diff --git a/frontend/templates/layout.html b/frontend/templates/layout.html
@@ -85,7 +85,7 @@
     </head>
 
     <body style="background-color: aliceblue">
-        <div class="container-mobile mx-auto bg-white scroll-smooth min-h-screen no-scrollbar">
+        <div class="mx-auto bg-white scroll-smooth min-h-screen no-scrollbar max-w-[450px]">
             {% block header %} 
                 {% include 'component/header_home.html' %} 
             {% endblock %}

diff --git a/frontend/templates/toko/listtransaksi.html b/frontend/templates/toko/listtransaksi.html
@@ -194,7 +194,7 @@ <h3 class="text-lg font-bold text-center">Detail Barang ({{ tr.cart.kode }})</h3
                             {% if tr.cart.status_toko == 2 %}
                             <button class="btn btn-sm btn-success" type="button" onclick="sendKurir('transaksi-{{tr.cart.id}}')">Kirim</button>
                             {% elif tr.cart.status_toko == 3 %}
-                            <a class="btn btn-sm btn-success" href="#">Laporkan</a>
+                            <a class="btn btn-sm btn-success" href="{% url 'toko_laporkan' id=tr.cart.id %}">Laporkan</a>
                             {% endif %}
                             <!-- if there is a button in form, it will close the modal -->
                             <button class="btn btn-sm" type="submit">Close</button>

diff --git a/frontend/templates/toko/report.html b/frontend/templates/toko/report.html
@@ -0,0 +1,30 @@
+{% extends 'layout.html' %} 
+{% load static translater%} 
+{% load i18n %}
+{% block content %}
+<div class="mt-3 mb-4 min-h-screen mx-5">
+    <div class="card max-w-full">
+        <div class="card-body p-[1rem]">
+            <div class="">
+                Laporan Toko <b>{{ user_toko }}</b>
+            </div>
+            <div>
+                <table class="w-full">
+                    <tr>
+                        <td class="w-[1rem]" >Pembeli</td>
+                        <td class="px-1 w-[.1rem]">:</td>
+                        <td>-</td>
+                    </tr>
+                    <tr>
+                        <td class="w-[1rem]">Catatan</td>
+                        <td class="px-1 w-[.1rem]">:</td>
+                        <td></td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
+{% block bottom_nav %}
+{% endblock %}
diff --git a/frontend/urls.py b/frontend/urls.py
@@ -77,6 +77,7 @@
 from frontend.views.withdrawl_toko_view import WithdrawlToko
 from frontend.views.withdrawl_view import Withdrawl
 from frontend.views.withdrawltokojson_view import WithdrawlTokoJson
+from frontend.views.toko.report import ReportToko
 
 urlpatterns = [
     path("", Splash.as_view(), name="splash"),
@@ -137,6 +138,7 @@
         name="withdrawl_toko_json",
     ),
     path("toko/<int:id>/transaksi/", TransaksiToko.as_view(), name="transaksi_toko"),
+    path("toko/transaksi/<int:id>/report", ReportToko.as_view(), name="toko_laporkan"),
     # user
     path("user/withdrawl/", Withdrawl.as_view(), name="withdrawl"),
     path(

diff --git a/frontend/views/toko/report.py b/frontend/views/toko/report.py
@@ -0,0 +1,26 @@
+from django.shortcuts import redirect, render
+from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
+
+from frontend.views.base_view import FrontPage
+from store.models import UserStore
+from transaction.models import Report, ReportImage
+
+
+@method_decorator(csrf_exempt, name="dispatch")
+class ReportToko(FrontPage):
+    def get(self, request, id):
+        user_setting = request.user.id
+        user_toko = request.user.userstore_set.first()
+        return render(request, "toko/report.html", {"user_toko": user_toko})
+
+    def post(self, request, id):
+        user = UserStore.objects.filter(users_id=id).first()
+        if user is None:
+            user = UserStore.objects.create(users_id=id)
+        if request.POST.get("setuju"):
+            user.aggrement = True
+        else:
+            user.aggrement = False
+        user.save()
+        return redirect("/toko/" + str(id))
diff --git a/master/admin_view/distric.py b/master/admin_view/distric.py
@@ -20,4 +20,3 @@ class Meta:
 
 class DistricAdmin(ImportExportModelAdmin):
     resource_classes = [DistricResource]
-
diff --git a/master/admin_view/provinsi.py b/master/admin_view/provinsi.py
@@ -12,4 +12,3 @@ class Meta:
 
 class ProvinsiAdmin(ImportExportModelAdmin):
     resource_classes = [ProvinsiResource]
-
diff --git a/master/admin_view/regency.py b/master/admin_view/regency.py
@@ -20,4 +20,3 @@ class Meta:
 
 class RegencyAdmin(ImportExportModelAdmin):
     resource_classes = [RegencyResource]
-
diff --git a/master/admin_view/region.py b/master/admin_view/region.py
@@ -13,4 +13,4 @@ class Meta:
 
 
 class RegionAdmin(ImportExportModelAdmin):
-    resource_classes = [RegionResource]
+    resource_classes = [RegionResource]
diff --git a/master/admin_view/subregion.py b/master/admin_view/subregion.py
@@ -19,4 +19,4 @@ class Meta:
 
 
 class SubRegionAdmin(ImportExportModelAdmin):
-    resource_classes = [SubRegionResource]
+    resource_classes = [SubRegionResource]
diff --git a/master/admin_view/village.py b/master/admin_view/village.py
@@ -19,4 +19,4 @@ class Meta:
 
 
 class VillageAdmin(ImportExportModelAdmin):
-    resource_classes = [VillageResource]
+    resource_classes = [VillageResource]
diff --git a/master/models/configuration_website.py b/master/models/configuration_website.py
@@ -15,4 +15,4 @@ class ConfigurationWebsite(SingletonModel):
 
     api_biteship = models.CharField(blank=True, null=True, max_length=255)
     verification = models.CharField(blank=True, null=True, max_length=255)
-    bypass_expedisi = models.BooleanField(default=False)
+    bypass_expedisi = models.BooleanField(default=False)
diff --git a/master/models/expedisi.py b/master/models/expedisi.py
@@ -1,16 +1,12 @@
 from django.db import models
+from master.utils import SOURCE_REQUEST
 
 
 class Expedisi(models.Model):
-    SOURCE_REQUEST = [
-        (1, "Raja Ongkir"),
-        (2, "Biteship"),
-    ]
     code = models.CharField(max_length=255, null=True, blank=True)
     nama = models.CharField(max_length=255)
     url_request = models.URLField(null=True, blank=True)
     source_request = models.IntegerField(choices=SOURCE_REQUEST, default=1)
 
     def __str__(self):
         return self.nama
-
diff --git a/master/utils.py b/master/utils.py
@@ -0,0 +1,4 @@
+SOURCE_REQUEST = [
+    (1, "Raja Ongkir"),
+    (2, "Biteship"),
+]
diff --git a/templatenew/__init__.py → store/models/store.py b/templatenew/__init__.py → store/models/store.py
diff --git a/templatenew/migrations/__init__.py → store/models/store_addres.py b/templatenew/migrations/__init__.py → store/models/store_addres.py
diff --git a/templatenew/admin.py b/templatenew/admin.py
diff --git a/templatenew/apps.py b/templatenew/apps.py
diff --git a/templatenew/models.py b/templatenew/models.py
diff --git a/templatenew/templates/component/bottom_page.html b/templatenew/templates/component/bottom_page.html
diff --git a/templatenew/templates/component/navbar_page.html b/templatenew/templates/component/navbar_page.html
diff --git a/templatenew/templates/home/page.html b/templatenew/templates/home/page.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ class Meta:

		class DistricAdmin(ImportExportModelAdmin):
		resource_classes = [DistricResource]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ class Meta:

		class ProvinsiAdmin(ImportExportModelAdmin):
		resource_classes = [ProvinsiResource]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ class Meta:

		class RegencyAdmin(ImportExportModelAdmin):
		resource_classes = [RegencyResource]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@ class Meta:


		class RegionAdmin(ImportExportModelAdmin):
		resource_classes = [RegionResource]
		resource_classes = [RegionResource]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ class Meta:


		class SubRegionAdmin(ImportExportModelAdmin):
		resource_classes = [SubRegionResource]
		resource_classes = [SubRegionResource]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,4 @@ class Meta:


		class VillageAdmin(ImportExportModelAdmin):
		resource_classes = [VillageResource]
		resource_classes = [VillageResource]