+ {% block content %}{% endblock %}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ecommerce/templates/base/nav.html b/ecommerce/templates/base/nav.html
new file mode 100644
index 0000000..3eb44b3
--- /dev/null
+++ b/ecommerce/templates/base/nav.html
@@ -0,0 +1,50 @@
+{% url 'products:list' as prod_list %}
+{% url 'carts:home' as cart_url %}
+
+
\ No newline at end of file
diff --git a/ecommerce/templates/bootstrap/example.html b/ecommerce/templates/bootstrap/example.html
new file mode 100644
index 0000000..8aacf07
--- /dev/null
+++ b/ecommerce/templates/bootstrap/example.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+ Hello, world!
+ + + + + + + + \ No newline at end of file diff --git a/ecommerce/urls.py b/ecommerce/urls.py new file mode 100644 index 0000000..c35c5bc --- /dev/null +++ b/ecommerce/urls.py @@ -0,0 +1,34 @@ +"""ecommerce URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/1.11/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.conf.urls import url, include + 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) +""" +from django.conf.urls import include, url +from django.conf.urls.static import static +from django.contrib import admin +from django.conf import settings +from django.views.generic import TemplateView + + +urlpatterns = [ + url(r'^admin/', admin.site.urls), + url(r'^bootstrap/?$', TemplateView.as_view(template_name='bootstrap/example.html')), + url(r'^products/', include('products.urls', namespace="products")), + url(r'^cart/', include('carts.urls', namespace="carts")), + url(r'^accounts/', include('accounts.urls', namespace="accounts")), + url(r'^address/', include('addresses.urls', namespace="addresses")), +] + +if settings.DEBUG: + urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ No newline at end of file diff --git a/ecommerce/utils.py b/ecommerce/utils.py new file mode 100644 index 0000000..b262ed4 --- /dev/null +++ b/ecommerce/utils.py @@ -0,0 +1,43 @@ +import string +import random +from django.utils.text import slugify + + +def random_string_generator(size=10, chars=string.ascii_lowercase + string.digits): + return ''.join(random.choice(chars) for _ in range(size)) + + +def unique_order_id_generator(inst): + """ + Generate unique order_id. + Model should have an order_id field to use this function. + """ + print('i am here') + order_new_id = random_string_generator() + + Klass = inst.__class__ + qs_exists = Klass.objects.filter(order_id =order_new_id).exists() + if qs_exists: + return unique_slug_generator(inst) + return order_new_id + + +def unique_slug_generator(inst, new_slug=None): + """ + Generate unique slug from title or based on provided slug. + Model should have a slug field and a title (char) field to use this function. + """ + if new_slug is not None: + slug = new_slug + else: + slug = slugify(inst.title) + + Klass = inst.__class__ + qs_exists = Klass.objects.filter(slug=slug).exists() + if qs_exists: + new_slug = "{slug}-{randstr}".format( + slug=slug, + randstr=random_string_generator(size=4) + ) + return unique_slug_generator(inst, new_slug=new_slug) + return slug \ No newline at end of file diff --git a/ecommerce/wsgi.py b/ecommerce/wsgi.py new file mode 100644 index 0000000..ccf146c --- /dev/null +++ b/ecommerce/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for ecommerce project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ecommerce.settings") + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100755 index 0000000..561bf0f --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ecommerce.settings") + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv) diff --git a/orders/__init__.py b/orders/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/orders/admin.py b/orders/admin.py new file mode 100644 index 0000000..6b1c02d --- /dev/null +++ b/orders/admin.py @@ -0,0 +1,4 @@ +from django.contrib import admin +from .models import Order + +admin.site.register(Order) diff --git a/orders/apps.py b/orders/apps.py new file mode 100644 index 0000000..384ab43 --- /dev/null +++ b/orders/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class OrdersConfig(AppConfig): + name = 'orders' diff --git a/orders/migrations/0001_initial.py b/orders/migrations/0001_initial.py new file mode 100644 index 0000000..097d16c --- /dev/null +++ b/orders/migrations/0001_initial.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-08-01 11:32 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('carts', '0002_cart_subtotal'), + ] + + operations = [ + migrations.CreateModel( + name='Order', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('order_id', models.CharField(max_length=100)), + ('status', models.CharField(choices=[('created', 'Created'), ('paid', 'Paid'), ('shipped', 'Shipped'), ('refunded', 'Refunded')], default='created', max_length=120)), + ('shipping_total', models.DecimalField(decimal_places=2, default=5.99, max_digits=100)), + ('total', models.DecimalField(decimal_places=2, default=0.0, max_digits=100)), + ('cart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='carts.Cart')), + ], + ), + ] diff --git a/orders/migrations/0002_auto_20180801_1332.py b/orders/migrations/0002_auto_20180801_1332.py new file mode 100644 index 0000000..fc76e94 --- /dev/null +++ b/orders/migrations/0002_auto_20180801_1332.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-08-01 13:32 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('orders', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='order_id', + field=models.CharField(blank=True, max_length=100), + ), + ] diff --git a/orders/migrations/0003_auto_20180802_0823.py b/orders/migrations/0003_auto_20180802_0823.py new file mode 100644 index 0000000..a1ef2f1 --- /dev/null +++ b/orders/migrations/0003_auto_20180802_0823.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-08-02 08:23 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('billing', '0002_auto_20180801_1339'), + ('orders', '0002_auto_20180801_1332'), + ] + + operations = [ + migrations.AddField( + model_name='order', + name='active', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='order', + name='billing_profile', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='billing.BillingProfile'), + ), + ] diff --git a/orders/migrations/0004_order_shipping_address.py b/orders/migrations/0004_order_shipping_address.py new file mode 100644 index 0000000..d57c20f --- /dev/null +++ b/orders/migrations/0004_order_shipping_address.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-08-02 14:17 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('addresses', '0001_initial'), + ('orders', '0003_auto_20180802_0823'), + ] + + operations = [ + migrations.AddField( + model_name='order', + name='shipping_address', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='addresses.Address'), + ), + ] diff --git a/orders/migrations/0005_auto_20180802_1436.py b/orders/migrations/0005_auto_20180802_1436.py new file mode 100644 index 0000000..6f9a41b --- /dev/null +++ b/orders/migrations/0005_auto_20180802_1436.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-08-02 14:36 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('orders', '0004_order_shipping_address'), + ] + + operations = [ + migrations.RenameField( + model_name='order', + old_name='shipping_address', + new_name='address', + ), + ] diff --git a/orders/migrations/__init__.py b/orders/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/orders/models.py b/orders/models.py new file mode 100644 index 0000000..4a59331 --- /dev/null +++ b/orders/models.py @@ -0,0 +1,102 @@ +from math import fsum + +from django.db import models +from django.db.models.signals import pre_save, post_save +from django.dispatch import receiver + +from billing.models import BillingProfile +from carts.models import Cart +from ecommerce.utils import unique_order_id_generator +from addresses.models import Address + +ORDER_STATUS_CHOICES = ( + ('created', 'Created'), + ('paid', 'Paid'), + ('shipped', 'Shipped'), + ('refunded', 'Refunded') +) + + +class OrderManager(models.Manager): + def new_or_get(self, billing_profile, cart_obj): + created = False + qs = self.get_queryset().filter(billing_profile=billing_profile, + cart=cart_obj, active=True, + status='created') + if qs.count() == 1: + obj = qs.first() + else: + obj = self.model.objects.create(billing_profile=billing_profile, + cart=cart_obj) + created = True + return obj, created + +class Order(models.Model): + billing_profile = models.ForeignKey(BillingProfile, null=True, blank=True) + order_id = models.CharField(max_length=100, blank=True) + address = models.ForeignKey(Address, null=True, blank=True) + cart = models.ForeignKey(Cart) + status = models.CharField(max_length=120, default='created', choices=ORDER_STATUS_CHOICES) + shipping_total = models.DecimalField(default=5.99, max_digits=100, decimal_places=2) + total = models.DecimalField(default=0.00, max_digits=100, decimal_places=2) + active = models.BooleanField(default=True) + + objects = OrderManager() + + def __str__(self): + return self.order_id + + def update_total(self): + cart_total = self.cart.total + shipping_total = self.shipping_total + total = fsum([cart_total, shipping_total]) + total = format(total, '.2f') + self.total = total + self.save() + return total + + def check_done(self): + billing_profile = self.billing_profile + address = self.address + total = self.total + if billing_profile and address and total > 0: + return True + return False + + def mark_paid(self): + if self.check_done(): + self.status = "paid" + self.save() + return self.status + + + + +@receiver(pre_save, sender=Order) +def create_order_id(sender, instance, *args, **kwargs): + print('ord_id') + if not instance.order_id: + instance.order_id = unique_order_id_generator(instance) + qs = Order.objects.filter(cart=instance.cart).exclude(billing_profile=instance.billing_profile) + if qs.exists(): + qs.update(active=False) + + +@receiver(post_save, sender=Cart) +def create_cart_total(sender, instance, created, *args, **kwargs): + if not created: + cart_obj = instance + cart_total = cart_obj.total + cart_id = cart_obj.id + qs = Order.objects.filter(cart__id=cart_id) + if qs.count() == 1: + order_obj = qs.first() + order_obj.update_total() + + +@receiver(post_save, sender=Order) +def create_order(sender, instance, created, *args, **kwargs): + if created: + instance.update_total() + + diff --git a/orders/tests.py b/orders/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/orders/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/orders/views.py b/orders/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/orders/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/products/__init__.py b/products/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/products/admin.py b/products/admin.py new file mode 100644 index 0000000..7f7988f --- /dev/null +++ b/products/admin.py @@ -0,0 +1,9 @@ +from django.contrib import admin + +from . models import Product + +@admin.register(Product) +class ProductAdmin(admin.ModelAdmin): + # fields = ('image_tag',) + list_display = ('title', 'slug', 'time', 'image_tag') + readonly_fields = ('image_tag',) diff --git a/products/apps.py b/products/apps.py new file mode 100644 index 0000000..864c43e --- /dev/null +++ b/products/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ProductsConfig(AppConfig): + name = 'products' diff --git a/products/migrations/0001_initial.py b/products/migrations/0001_initial.py new file mode 100644 index 0000000..3f467ae --- /dev/null +++ b/products/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-07-29 08:17 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Product', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=120)), + ('description', models.TextField()), + ('price', models.DecimalField(decimal_places=2, default=0, max_digits=10)), + ], + ), + ] diff --git a/products/migrations/0002_product_image.py b/products/migrations/0002_product_image.py new file mode 100644 index 0000000..0b6537c --- /dev/null +++ b/products/migrations/0002_product_image.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-07-29 09:19 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='image', + field=models.FileField(blank=True, null=True, upload_to='products/'), + ), + ] diff --git a/products/migrations/0003_auto_20180729_0956.py b/products/migrations/0003_auto_20180729_0956.py new file mode 100644 index 0000000..d5137d5 --- /dev/null +++ b/products/migrations/0003_auto_20180729_0956.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-07-29 09:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0002_product_image'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='image', + field=models.ImageField(blank=True, null=True, upload_to='products/'), + ), + ] diff --git a/products/migrations/0004_product_slug.py b/products/migrations/0004_product_slug.py new file mode 100644 index 0000000..c05e806 --- /dev/null +++ b/products/migrations/0004_product_slug.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-07-29 10:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0003_auto_20180729_0956'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='slug', + field=models.SlugField(blank=True), + ), + ] diff --git a/products/migrations/0005_auto_20180729_1104.py b/products/migrations/0005_auto_20180729_1104.py new file mode 100644 index 0000000..1d869ca --- /dev/null +++ b/products/migrations/0005_auto_20180729_1104.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-07-29 11:04 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0004_product_slug'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='slug', + field=models.SlugField(blank=True, unique=True), + ), + ] diff --git a/products/migrations/0006_product_time.py b/products/migrations/0006_product_time.py new file mode 100644 index 0000000..828cbab --- /dev/null +++ b/products/migrations/0006_product_time.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-07-29 13:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0005_auto_20180729_1104'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='time', + field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now), + preserve_default=False, + ), + ] diff --git a/products/migrations/__init__.py b/products/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/products/models.py b/products/models.py new file mode 100644 index 0000000..a66ad5d --- /dev/null +++ b/products/models.py @@ -0,0 +1,44 @@ +from django.db import models +from django.conf import settings +from ecommerce.utils import unique_slug_generator +from django.db.models.signals import pre_save +from django.dispatch import receiver +from django.urls import reverse + + +class ProductManager(models.Manager): + def get_by_id(self, id): + return self.get_queryset().filter(id=id).first() or None + + +class Product(models.Model): + title = models.CharField(max_length=120) + slug = models.SlugField(blank=True, unique=True) + description = models.TextField() + price = models.DecimalField(decimal_places=2, max_digits=10, default=0) + image = models.ImageField(upload_to='products/', null=True, blank=True) + time = models.DateTimeField(auto_now_add=True) + + objects = ProductManager() + + def get_absolute_url(self): + return reverse("products:details", kwargs={'slug': self.slug}) + # return "/{slug}/".format(slug=self.slug) + + + def __str__(self): + return self.title + + def image_tag(self): + if self.image: + return '
+
+{% endblock %}
\ No newline at end of file
diff --git a/products/templates/products/list.html b/products/templates/products/list.html
new file mode 100644
index 0000000..a317130
--- /dev/null
+++ b/products/templates/products/list.html
@@ -0,0 +1,19 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+ {{ object.title }}
+ {{ object.time|timesince}} ago + {{ object.description|linebreaks }}
+ {% if object.image %} +
+ {% endif %}
+
+ + {{ object.time|timesince}} ago + {{ object.description|linebreaks }}
+ {% if object.image %} +
+ {{ cart }}
+ {% include "carts/form.html" %}
+
+
+
+ {% for obj in object_list %}
+
+ {{ forloop.counter }}
+ {% include 'products/snippets/card.html' with instance=obj %}
+ {% if forloop.counter|divisibleby:2 %}
+
+ {% else %}
+
+ {% endif %}
+ {% endfor %}
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/products/templates/products/snippets/card.html b/products/templates/products/snippets/card.html
new file mode 100644
index 0000000..f4fcd81
--- /dev/null
+++ b/products/templates/products/snippets/card.html
@@ -0,0 +1,10 @@
+
+ {% if instance.image %}
+ 
+ {% endif%}
+
+
\ No newline at end of file
diff --git a/products/tests.py b/products/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/products/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/products/urls.py b/products/urls.py
new file mode 100644
index 0000000..2913136
--- /dev/null
+++ b/products/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+from .views import ProductListView, ProductDetailView
+
+urlpatterns = [
+ url(r'^$', ProductListView.as_view(), name='list'),
+ url(r'^(?P
+ {% endif%}
+
+