Skip to content

Commit

Permalink
my changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@zinmyoswe
zinmyoswe committed Nov 5, 2019
1 parent fe07909 commit fa773d7
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 241 deletions.
19 changes: 18 additions & 1 deletion core/admin.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib import admin

from .models import Item, OrderItem, Order, Payment, Coupon, Refund
from .models import Item, OrderItem, Order, Payment, Coupon, Refund, BillingAddress

# Register your models here.

Expand All @@ -19,12 +19,14 @@ class OrderAdmin(admin.ModelAdmin):
'received',
'refund_requested',
'refund_granted',
'shipping_address',
'billing_address',
'payment',
'coupon'
]
list_display_links = [
'user',
'shipping_address',
'billing_address',
'payment',
'coupon'
Expand All @@ -42,9 +44,24 @@ class OrderAdmin(admin.ModelAdmin):
actions = [make_refund_accepted]


class AddressAdmin(admin.ModelAdmin):
list_display = [
'user',
'street_address',
'apartment_address',
'country',
'zip',
'address_type',
'default'
]
list_filter = ['default', 'address_type', 'country']
search_fields = ['user', 'street_address', 'apartment_address', 'zip']


admin.site.register(Item)
admin.site.register(OrderItem)
admin.site.register(Order, OrderAdmin)
admin.site.register(Payment)
admin.site.register(Coupon)
admin.site.register(Refund)
admin.site.register(BillingAddress, AddressAdmin)
35 changes: 35 additions & 0 deletions core/migrations/0002_auto_20191105_0426.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Generated by Django 2.2.6 on 2019-11-05 12:26

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('core', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='billingaddress',
name='address_type',
field=models.CharField(choices=[('B', 'Billing'), ('S', 'Shipping')], default='exit', max_length=1),
preserve_default=False,
),
migrations.AddField(
model_name='billingaddress',
name='default',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='order',
name='shipping_address',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='shipping_address', to='core.BillingAddress'),
),
migrations.AlterField(
model_name='order',
name='billing_address',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='billing_address', to='core.BillingAddress'),
),
]
14 changes: 13 additions & 1 deletion core/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
('P', 'promotion')
)

ADDRESS_CHOICES = (
('B', 'Billing'),
('S', 'Shipping'),
)


class Item(models.Model):
title = models.CharField(max_length=100)
Expand Down Expand Up @@ -81,8 +86,10 @@ class Order(models.Model):
start_date = models.DateTimeField(auto_now_add=True)
ordered_date = models.DateTimeField()
ordered = models.BooleanField(default=False)
shipping_address = models.ForeignKey(
'BillingAddress', related_name='shipping_address', on_delete=models.SET_NULL, blank=True, null=True)
billing_address = models.ForeignKey(
'BillingAddress', on_delete=models.SET_NULL, blank=True, null=True)
'BillingAddress', related_name='billing_address', on_delete=models.SET_NULL, blank=True, null=True)
payment = models.ForeignKey(
'Payment', on_delete=models.SET_NULL, blank=True, null=True)
coupon = models.ForeignKey(
Expand Down Expand Up @@ -121,10 +128,15 @@ class BillingAddress(models.Model):
apartment_address = models.CharField(max_length=100)
country = CountryField(multiple=False)
zip = models.CharField(max_length=100)
address_type = models.CharField(max_length=1, choices=ADDRESS_CHOICES)
default = models.BooleanField(default=False)

def __str__(self):
return self.user.username

class Meta:
verbose_name_plural = 'BillingAddresses'


class Payment(models.Model):
stripe_charge_id = models.CharField(max_length=50)
Expand Down
3 changes: 2 additions & 1 deletion core/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ def post(self, *args, **kwargs):
street_address=street_address,
apartment_address=apartment_address,
country=country,
zip=zip
zip=zip,
address_type='B'
)
billing_address.save()
order.billing_address = billing_address
Expand Down
239 changes: 1 addition & 238 deletions templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,245 +279,8 @@ <h3 class="m-text5 t-center">
</div>
{% endfor %}

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative block2-labelpromotion">
<img src="{% static 'images/item-03.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Denim jacket blue
</a>

<span class="block2-price m-text6 p-r-5">
$92.50
</span>
</div>
</div>
</div>

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative">
<img src="{% static 'images/item-05.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Coach slim easton black
</a>

<span class="block2-price m-text6 p-r-5">
$165.90
</span>

</div>
</div>
</div>

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative block2-labelsale">
<img src="{% static 'images/item-07.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Frayed denim shorts
</a>

<span class="block2-oldprice m-text7 p-r-5">
$29.50
</span>

<span class="block2-newprice m-text8 p-r-5">
$15.90
</span>
</div>
</div>
</div>

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative block2-labelnew">
<img src="{% static 'images/item-02.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Herschel supply co 25l
</a>

<span class="block2-price m-text6 p-r-5">
$75.00
</span>
</div>
</div>
</div>

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative">
<img src="{% static 'images/item-03.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Denim jacket blue
</a>

<span class="block2-price m-text6 p-r-5">
$92.50
</span>
</div>
</div>
</div>

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative">
<img src="{% static 'images/item-05.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Coach slim easton black
</a>

<span class="block2-price m-text6 p-r-5">
$165.90
</span>
</div>
</div>
</div>

<div class="item-slick2 p-l-15 p-r-15">
<!-- Block2 -->
<div class="block2">
<div class="block2-img wrap-pic-w of-hidden pos-relative block2-labelsale">
<img src="{% static 'images/item-07.webp' %}" alt="IMG-PRODUCT">

<div class="block2-overlay trans-0-4">
<a href="#" class="block2-btn-addwishlist hov-pointer trans-0-4">
<i class="icon-wishlist icon_heart_alt" aria-hidden="true"></i>
<i class="icon-wishlist icon_heart dis-none" aria-hidden="true"></i>
</a>

<div class="block2-btn-addcart w-size1 trans-0-4">
<!-- Button -->
<button class="flex-c-m size1 bg4 bo-rad-23 hov1 s-text1 trans-0-4">
Add to Cart
</button>
</div>
</div>
</div>

<div class="block2-txt p-t-20">
<a href="product-detail.html" class="block2-name dis-block s-text3 p-b-5">
Frayed denim shorts
</a>

<span class="block2-oldprice m-text7 p-r-5">
$29.50
</span>

<span class="block2-newprice m-text8 p-r-5">
$15.90
</span>
</div>
</div>
</div>

</div>
</div>

Expand Down

0 comments on commit fa773d7

Please sign in to comment.