Merge pull request #2 from roniahmadi/main

update main
pi-apps · Jul 9, 2024 · 94cbd47 · 94cbd47 · Nice-1976 · Jul 13, 2024
2 parents c2c2ca3 + 6d35f3c
commit 94cbd47
Show file tree

Hide file tree

Showing 15 changed files with 243 additions and 47 deletions.
diff --git a/frontend/static/video.webm b/frontend/static/video.webm
diff --git a/frontend/templates/aboutapps.html b/frontend/templates/aboutapps.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %} {% load static %} {% block content %}
 
-<div class="container p-4 h-full">
+<div class="container p-4 min-h-screen">
     <div class="">
         <div class="grid grid-cols-1 gap-1 text-center shadow-lg pb-2 border rounded-lg p-3">
             <h1>Gerai Pi Indonesia - P2App Marketplace</h1>

diff --git a/frontend/templates/checkout/home_beli.html b/frontend/templates/checkout/home_beli.html
@@ -37,6 +37,10 @@ <h4 class="">{{ produk.harga }} 𝛑</h4>
                             </strong>
                         </div>
                     </div>
+                    <div class="my-2">
+                        <label for="catatan">{% translater user.languages.code "Catatan:" "Catatan:" %}</label>
+                        <textarea name="catatan" id="" class="w-full rounded-lg"></textarea>
+                    </div>
                 </div>
             </div>
             <div class="my-3">

diff --git a/frontend/templates/mail_template.html b/frontend/templates/mail_template.html
@@ -1,12 +1,191 @@
+{% load static %}
 <!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Mail Success</title>
-</head>
-<body>
-    <h4>Ringkasan Transaksi </h4><br>
-    <h4>Transaksi Berhasil</h4>
-</body>
-</html>
+<html>
+	<head>
+		<meta charset="utf-8" />
+		<title>GeraiPi Invoice</title>
+
+		<style>
+			.invoice-box {
+				max-width: 800px;
+				margin: auto;
+				padding: 30px;
+				border: 1px solid #eee;
+				box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
+				font-size: 16px;
+				line-height: 24px;
+				font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
+				color: #555;
+			}
+
+			.invoice-box table {
+				width: 100%;
+				line-height: inherit;
+				text-align: left;
+			}
+
+			.invoice-box table td {
+				padding: 5px;
+				vertical-align: top;
+			}
+
+			.invoice-box table tr td:nth-child(2) {
+				text-align: right;
+			}
+
+			.invoice-box table tr.top table td {
+				padding-bottom: 20px;
+			}
+
+			.invoice-box table tr.top table td.title {
+				font-size: 45px;
+				line-height: 45px;
+				color: #333;
+			}
+
+			.invoice-box table tr.information table td {
+				padding-bottom: 40px;
+			}
+
+			.invoice-box table tr.heading td {
+				background: #eee;
+				border-bottom: 1px solid #ddd;
+				font-weight: bold;
+			}
+
+			.invoice-box table tr.details td {
+				padding-bottom: 20px;
+			}
+
+			.invoice-box table tr.item td {
+				border-bottom: 1px solid #eee;
+			}
+
+			.invoice-box table tr.item.last td {
+				border-bottom: none;
+			}
+
+			.invoice-box table tr.total td:nth-child(2) {
+				border-top: 2px solid #eee;
+				font-weight: bold;
+			}
+
+			@media only screen and (max-width: 600px) {
+				.invoice-box table tr.top table td {
+					width: 100%;
+					display: block;
+					text-align: center;
+				}
+
+				.invoice-box table tr.information table td {
+					width: 100%;
+					display: block;
+					text-align: center;
+				}
+			}
+
+			/** RTL **/
+			.invoice-box.rtl {
+				direction: rtl;
+				font-family: Tahoma, 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;
+			}
+
+			.invoice-box.rtl table {
+				text-align: right;
+			}
+
+			.invoice-box.rtl table tr td:nth-child(2) {
+				text-align: left;
+			}
+		</style>
+	</head>
+
+	<body>
+		<div class="invoice-box">
+			<table cellpadding="0" cellspacing="0">
+				<tr class="top">
+					<td colspan="2">
+						<table>
+							<tr>
+								<td class="title">
+									<img
+										src="{% static 'logo.png' %}"
+										style="width: 100%; max-width: 300px"
+									/>
+								</td>
+
+								<td>
+									Invoice #: 123<br />
+									Created: January 1, 2023<br />
+									Due: February 1, 2023
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+
+				<tr class="information">
+					<td colspan="2">
+						<table>
+							<tr>
+								<td>
+									Sparksuite, Inc.<br />
+									12345 Sunny Road<br />
+									Sunnyville, CA 12345
+								</td>
+
+								<td>
+									Acme Corp.<br />
+									John Doe<br />
+									[email protected]
+								</td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+
+				<tr class="heading">
+					<td>Payment Method</td>
+
+					<td>Check #</td>
+				</tr>
+
+				<tr class="details">
+					<td>Check</td>
+
+					<td>1000</td>
+				</tr>
+
+				<tr class="heading">
+					<td>Item</td>
+
+					<td>Price</td>
+				</tr>
+
+				<tr class="item">
+					<td>Website design</td>
+
+					<td>$300.00</td>
+				</tr>
+
+				<tr class="item">
+					<td>Hosting (3 months)</td>
+
+					<td>$75.00</td>
+				</tr>
+
+				<tr class="item last">
+					<td>Domain name (1 year)</td>
+
+					<td>$10.00</td>
+				</tr>
+
+				<tr class="total">
+					<td></td>
+
+					<td>Total: $385.00</td>
+				</tr>
+			</table>
+		</div>
+	</body>
+</html>
diff --git a/frontend/templates/member/register.html b/frontend/templates/member/register.html
@@ -4,7 +4,7 @@
 <div class="container p-4">
     <div class="">
         <div class="grid grid-cols-1 gap-1 shadow-lg pb-2 border rounded-lg p-3">
-            <p><strong>GeraiPi Army Uniform</strong></p>
+            <p class="text-center"><strong>GeraiPi Army Uniform</strong></p>
             <p>
                 <strong>GeraiPi Army Uniform</strong> adalah salah satu bentuk <strong>Identitas Ekosistem Utilitas Pi</strong> sekalikus <strong>Kebanggaan Pioner</strong> bisa bergabung dan berkontribusi sebagai <strong>Penyedia layanan ( Vendor Produk )</strong> Melalui GeraiPi Indonesia Marketplace.
             </p>
@@ -35,7 +35,11 @@
                 <form action="" method="POST">
                     {% csrf_token %}
                     <input type="hidden" name="applied" value="0" />
-                    <button type="submit" class="bg-green-600 text-center p-3 mt-8 rounded">Daftar</button>
+                    <div class="my-2">
+                        <label for="" class="px-2">Nama</label>
+                        <input type="text" name="name" class="w-full rounded-full" required>
+                    </div>
+                    <button type="submit" class="bg-green-600 text-center  mt-8 rounded w-full">Daftar</button>
                 </form>
             {% endif %}
 

diff --git a/frontend/templates/privacyandpolicy.html b/frontend/templates/privacyandpolicy.html
@@ -1,6 +1,8 @@
-{% extends 'layout.html' %} {% load static %} {% block content %}
+{% extends 'layout.html' %} 
+{% load static %} 
+{% block content %}
 
-<div class="container p-4 h-full">
+<div class="container p-4">
     <div class="">
         <div class="grid grid-cols-1 gap-1 shadow-lg pb-2 border rounded-lg p-3">
             <div className="border rounded-lg p-1">

diff --git a/frontend/templates/profil/transaksi_user.html b/frontend/templates/profil/transaksi_user.html
@@ -1,5 +1,7 @@
 {% extends 'layout.html' %} 
 {% load static %} 
+{% block bottom_nav %}
+{% endblock %}
 {% block content %}
 <div class="mt-3 mb-[100px] {% if transaksi_data|length > 2 %}{%else%} h-screen {% endif %} mx-5" id="body-screen">
     {% if user.is_authenticated %}

diff --git a/frontend/templates/splash.html b/frontend/templates/splash.html
@@ -19,13 +19,13 @@
         }
     }
     .container-mobile{
-        background: transparent;
+        background: white;
     }
 </style>
 <!-- <img src="{% static 'geraigif.gif' %}" alt="" style="height: 100vh; width: 450px;"> -->
 <div style="max-width: 450px; height: 100vh;">
     <video id="mvideo" autoplay style="width: 100%; height: 100vh;" muted>
-        <source src="{% static 'video.mp4' %}" type="video/mp4"/>
+        <source src="{% static 'video.webm' %}" type="video/webm"/>
     </video>
 </div>
 <!-- <div class="justify-center flex-1 justify-items-center h-screen flex items-center">

diff --git a/frontend/templates/termofservice.html b/frontend/templates/termofservice.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %} {% load static %} {% block content %}
 
-<div class="container p-4 h-full">
+<div class="container p-4">
     <div class="">
         <div class="grid grid-cols-1 gap-1 shadow-lg pb-2 border rounded-lg p-3">
             <h1>Website Terms and Conditions of Use</h1>

diff --git a/frontend/views/add_to_cart_view.py b/frontend/views/add_to_cart_view.py
@@ -53,6 +53,7 @@ def post(self, request, id):
             user=request.user,
             expedisi=request.POST.get("expedisi"),
             tanggal=datetime.datetime.now(),
+            catatan=request.POST.get("catatan")
         )
         cart.save()
 

diff --git a/frontend/views/jual_view.py b/frontend/views/jual_view.py
@@ -30,6 +30,8 @@ def get(self, request):
             user = user.first()
             if user.is_active_store is False:
                 return redirect(reverse("profile"))
+        else:
+            return redirect(reverse('profile'))
         kategori = Kategori.objects.all()
         typeproduk = TipeProduk.objects.all()
         warnaproduk = WarnaProduk.objects.all()

diff --git a/frontend/views/payments_cart_view.py b/frontend/views/payments_cart_view.py
@@ -58,33 +58,33 @@ def get(self, request, param):
         cart_id = request.GET.get("cart_id")
         requestjson = requestdata.json()
         result_dict = json.loads(str(json.dumps(requestjson)))
-        # try:
-        #     carts = CartItem.objects.get(pk=cart_id)
-        #     print(carts, cart_id)
-        #     CartItem.objects.get(cart__id=carts.id)
-        #     from django.core.mail import EmailMessage
-        #     from django.template.loader import render_to_string
-
-        #     # print(carts, cartitems)
-        #     subject, from_email, to = (
-        #         "Payment Success GeraiPi",
-        #         "[email protected]",
-        #         request.user.email,
-        #     )
-        #     html_message = render_to_string("mail_template.html", {"carts": carts})
-        #     # # plain_message = strip_tags(html_message)
-        #     # # mail.send_mail(subject,
-        #     # #     plain_message,
-        #     # #     from_email,
-        #     # #     [to],
-        #     # #     html_message=html_message)
-
-        #     msg = EmailMessage(subject, html_message, from_email, [to])
-        #     msg.content_subtype = "html"
-        #     msg.send()
-
-        # except CartItem.DoesNotExist or Exception as e:
-        #     print("error")
+        try:
+            carts = CartItem.objects.get(pk=cart_id)
+            print(carts, cart_id)
+            CartItem.objects.get(cart__id=carts.id)
+            from django.core.mail import EmailMessage
+            from django.template.loader import render_to_string
+
+            # print(carts, cartitems)
+            subject, from_email, to = (
+                "Payment Success GeraiPi",
+                "[email protected]",
+                request.user.email,
+            )
+            html_message = render_to_string("mail_template.html", {"carts": carts})
+            # # plain_message = strip_tags(html_message)
+            # # mail.send_mail(subject,
+            # #     plain_message,
+            # #     from_email,
+            # #     [to],
+            # #     html_message=html_message)
+
+            msg = EmailMessage(subject, html_message, from_email, [to])
+            msg.content_subtype = "html"
+            msg.send()
+
+        except CartItem.DoesNotExist or Exception as e:
+            print("error")
 
         txid = result_dict.get("transaction")
         txid = json.loads(str(json.dumps(txid)))

diff --git a/frontend/views/profile/register_member.py b/frontend/views/profile/register_member.py
@@ -16,6 +16,7 @@ def post(self, request):
         userapplied = UserAppliedMember()
         userapplied.user = userprofile
         userapplied.is_accept = False
+        userapplied.name = request.POST.get("name", request.user.username)
         userapplied.accept_date = datetime.datetime.now()
         userapplied.save()
         return redirect(reverse("register_member"))

diff --git a/produk/models.py b/produk/models.py
@@ -122,7 +122,7 @@ class Cart(models.Model):
         default=0, choices=STATUS_TOKO, blank=True, null=True
     )
     nomor_resi = models.CharField(blank=True, null=True, max_length=255)
-    catatan = models.CharField(blank=True, null=True, max_length=255)
+    catatan = models.TextField(blank=True, null=True, max_length=255)
     expedisi = models.ForeignKey(
         Expedisi, blank=True, null=True, on_delete=models.CASCADE
     )

diff --git a/profiles/models.py b/profiles/models.py
@@ -117,6 +117,7 @@ def __str__(self):
 
 class UserAppliedMember(models.Model):
     user = models.ForeignKey(UserProfile, on_delete=models.SET_NULL, blank=True, null=True)
+    name = models.CharField(blank=False, max_length=255)
     tanggal = models.DateTimeField(auto_now=True, auto_created=True)
     is_accept = models.BooleanField(default=False)
     accept_date = models.DateTimeField(auto_now=False, blank=True, null=True)